Minahito
minah****@users*****
2006年 1月 14日 (土) 21:23:24 JST
Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.3 --- xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.2 Sat Jan 14 21:14:58 2006 +++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php Sat Jan 14 21:23:24 2006 @@ -18,9 +18,12 @@ TPLSET_SORT_KEY_LOCK => 'lock' ); var $_mCriteria = null; + + var $_mNavi = null; - function LegacyRender_TplsetFilterForm() + function LegacyRender_TplsetFilterForm(&$navi) { + $this->_mNavi =& $navi; $this->_mCriteria =& new CriteriaCompo(); } Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.4 --- xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php:1.1.2.3 Sat Jan 14 21:14:58 2006 +++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileFilterForm.class.php Sat Jan 14 21:23:24 2006 @@ -34,7 +34,7 @@ var $_mNavi = null; - function LegacyRender_TplfileFilterForm() + function LegacyRender_TplfileFilterForm(&$navi) { $this->_mNavi =& $navi; $this->_mCriteria =& new CriteriaCompo(); @@ -49,22 +49,22 @@ } if (isset($_REQUEST['tpl_module'])) { - $this->_mAttributes['tpl_module'] = xoops_getrequest('tpl_module'); + $this->_mNavi->addExtra('tpl_module', xoops_getrequest('tpl_module')); $this->_mCriteria->add(new Criteria('tpl_module', array(XOBJ_DTYPE_STRING, xoops_getrequest('tpl_module')))); } if (isset($_REQUEST['tpl_tplset'])) { - $this->_mAttributes['tpl_tplset'] = xoops_getrequest('tpl_tplset'); + $this->_mNavi->addExtra('tpl_tplset', xoops_getrequest('tpl_tplset')); $this->_mCriteria->add(new Criteria('tpl_tplset', array(XOBJ_DTYPE_STRING, xoops_getrequest('tpl_tplset')))); } if (isset($_REQUEST['tpl_file'])) { - $this->_mAttributes['tpl_file'] = xoops_getrequest('tpl_file'); + $this->_mNavi->addExtra('tpl_file', xoops_getrequest('tpl_file')); $this->_mCriteria->add(new Criteria('tpl_file', array(XOBJ_DTYPE_STRING, "%" . xoops_getrequest('tpl_file') . "%"), 'LIKE')); } if (isset($_REQUEST['tpl_type'])) { - $this->_mAttributes['tpl_type'] = xoops_getrequest('tpl_type'); + $this->_mNavi->addExtra('tpl_type', xoops_getrequest('tpl_type')); $this->_mCriteria->add(new Criteria('tpl_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('tpl_type')))); } } @@ -92,15 +92,6 @@ return $criteria; } - - function setNavi(&$navi) - { - if (count($this->_mAttributes) > 0) { - foreach ($this->_mAttributes as $key => $value) { - $navi->addExtra($key, $value); - } - } - } } ?>