Minahito
minah****@users*****
2006年 10月 15日 (日) 01:03:00 JST
Index: xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.1 Sat Oct 14 23:55:21 2006
+++ xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php Sun Oct 15 01:03:00 2006
@@ -3,7 +3,7 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+require_once XOOPS_MODULE_PATH . "/legacy/class/Legacy_Validator.class.php";
class Legacy_BlockEditForm extends XCube_ActionForm
{
@@ -31,37 +31,37 @@
//
$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['bid']->setDependsByArray(array('required'));
- $this->mFieldProperties['bid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
+ $this->mFieldProperties['bid']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_BID);
$this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
- $this->mFieldProperties['title']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_TITLE, '255');
- $this->mFieldProperties['title']->addMessage('maxlength', _MD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_TITLE, '255');
+ $this->mFieldProperties['title']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_TITLE, '255');
+ $this->mFieldProperties['title']->addMessage('maxlength', _MD_LEGACY_ERROR_MAXLENGTH, _AD_LEGACY_LANG_TITLE, '255');
$this->mFieldProperties['title']->addVar('maxlength', '255');
$this->mFieldProperties['side'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['side']->setDependsByArray(array('required', 'objectExist'));
- $this->mFieldProperties['side']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_SIDE);
- $this->mFieldProperties['side']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_SIDE);
+ $this->mFieldProperties['side']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_SIDE);
+ $this->mFieldProperties['side']->addMessage('objectExist', _AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_SIDE);
$this->mFieldProperties['side']->addVar('handler', 'columnside');
- $this->mFieldProperties['side']->addVar('module', 'base');
+ $this->mFieldProperties['side']->addVar('module', 'legacy');
$this->mFieldProperties['weight'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['weight']->setDependsByArray(array('required', 'intRange'));
- $this->mFieldProperties['weight']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_WEIGHT);
- $this->mFieldProperties['weight']->addMessage('intRange', _AD_BASE_ERROR_INTRANGE, _AD_BASE_LANG_WEIGHT);
+ $this->mFieldProperties['weight']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_WEIGHT);
+ $this->mFieldProperties['weight']->addMessage('intRange', _AD_LEGACY_ERROR_INTRANGE, _AD_LEGACY_LANG_WEIGHT);
$this->mFieldProperties['weight']->addVar('min', '0');
$this->mFieldProperties['weight']->addVar('max', '255');
$this->mFieldProperties['bcachetime'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['bcachetime']->setDependsByArray(array('required', 'objectExist'));
- $this->mFieldProperties['bcachetime']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BCACHETIME);
- $this->mFieldProperties['bcachetime']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_BCACHETIME);
+ $this->mFieldProperties['bcachetime']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_BCACHETIME);
+ $this->mFieldProperties['bcachetime']->addMessage('objectExist', _AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_BCACHETIME);
$this->mFieldProperties['bcachetime']->addVar('handler', 'cachetime');
$this->mFieldProperties['groupid'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['groupid']->setDependsByArray(array('objectExist'));
- $this->mFieldProperties['groupid']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_GROUPID);
+ $this->mFieldProperties['groupid']->addMessage('objectExist', _AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_GROUPID);
$this->mFieldProperties['groupid']->addVar('handler', 'group');
}
@@ -69,14 +69,14 @@
{
$bmodule = $this->get('bmodule');
if (!(count($bmodule))) {
- $this->addErrorMessage(_AD_BASE_ERROR_BMODULE);
+ $this->addErrorMessage(_AD_LEGACY_ERROR_BMODULE);
}
else {
$handler =& xoops_gethandler('module');
foreach ($this->get('bmodule') as $mid) {
$module =& $handler->get($mid);
if ($mid != -1 && $mid != 0 && !is_object($module)) {
- $this->addErrorMessage(XCube_Utils::formatMessage(_AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_BMODULE));
+ $this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_BMODULE));
}
}
}
@@ -86,7 +86,7 @@
{
$groupid = $this->get('groupid');
if (!(count($groupid))) {
- $this->addErrorMessage(_AD_BASE_ERROR_GROUPID);
+ $this->addErrorMessage(_AD_LEGACY_ERROR_GROUPID);
}
}
@@ -121,7 +121,7 @@
$obj->set('last_modified', time());
$obj->mBmodule = array();
- $handler =& xoops_getmodulehandler('block_module_link', 'base');
+ $handler =& xoops_getmodulehandler('block_module_link', 'legacy');
foreach ($this->get('bmodule') as $mid) {
$t_obj =& $handler->create();
$t_obj->set('block_id', $this->get('bid'));