Minahito
minah****@users*****
2006年 10月 12日 (木) 20:02:11 JST
Index: xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php:1.1.2.4 Tue Aug 8 18:47:17 2006
+++ xoops2jp/html/modules/base/admin/actions/ImageListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ImageListAction.class.php,v 1.1.2.4 2006/08/08 09:47:17 minahito Exp $
+ * @version $Id: ImageListAction.class.php,v 1.1.2.4.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,9 +18,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_ImageFilterForm($navi);
+ $filter =& new Legacy_ImageFilterForm($this->_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -54,7 +54,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute("category", $this->mCategory);
}
Index: xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8.2.1
--- xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php:1.1.2.8 Tue Aug 8 18:47:04 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: CommentListAction.class.php,v 1.1.2.8 2006/08/08 09:47:04 minahito Exp $
+ * @version $Id: CommentListAction.class.php,v 1.1.2.8.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,9 +18,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_CommentFilterForm($navi);
+ $filter =& new Legacy_CommentFilterForm($this->_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -59,7 +59,7 @@
$render->setTemplateName("comment_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
$render->setAttribute("moduleArr", $moduleArr);
$render->setAttribute("statusArr", $statusArr);
}
Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.7 Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: BlockListAction.class.php,v 1.1.2.7 2006/08/18 11:30:00 minahito Exp $
+ * @version $Id: BlockListAction.class.php,v 1.1.2.7.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -27,9 +27,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_BlockFilterForm($navi);
+ $filter =& new Legacy_BlockFilterForm($this->_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -76,7 +76,7 @@
}
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
//
// Load cache-time pattern objects and set.
Index: xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php:1.1.2.3 Tue Aug 8 18:47:25 2006
+++ xoops2jp/html/modules/base/admin/actions/SmilesListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: SmilesListAction.class.php,v 1.1.2.3 2006/08/08 09:47:25 minahito Exp $
+ * @version $Id: SmilesListAction.class.php,v 1.1.2.3.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,9 +18,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_SmilesFilterForm($navi);
+ $filter =& new Legacy_SmilesFilterForm($this->_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -33,7 +33,7 @@
{
$render->setTemplateName("smiles_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
}
}
Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10.2.1
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.10 Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ModuleListAction.class.php,v 1.1.2.10 2006/08/18 11:30:00 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.10.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -25,16 +25,15 @@
function getDefaultView(&$controller, &$xoopsUser)
{
- $this->mFilter =& new Legacy_ModuleListFilterForm($this->mNavi);
+ $this->mFilter =& new Legacy_ModuleListFilterForm();
$this->mFilter->fetch();
-
- $moduleHandler =& xoops_gethandler('module');
// dmy
$criteria =& new Criteria('mid', 0, '>');
$criteria->setSort($this->mFilter->getSort());
$criteria->setOrder($this->mFilter->getOrder());
+ $moduleHandler =& xoops_gethandler('module');
$this->mModuleObjects =& $moduleHandler->getObjects($criteria);
return LEGACY_FRAME_VIEW_INDEX;
Index: xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php:1.1.2.2 Tue Aug 1 19:32:01 2006
+++ xoops2jp/html/modules/base/admin/actions/ImagecategoryListAction.class.php Thu Oct 12 20:02:10 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ImagecategoryListAction.class.php,v 1.1.2.2 2006/08/01 10:32:01 minahito Exp $
+ * @version $Id: ImagecategoryListAction.class.php,v 1.1.2.2.2.1 2006/10/12 11:02:10 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,9 +18,9 @@
return $handler;
}
- function &_getFilterForm(&$navi)
+ function &_getFilterForm()
{
- $filter =& new Legacy_ImagecategoryFilterForm($navi);
+ $filter =& new Legacy_ImagecategoryFilterForm($this->_getPageNavi(), $this->_getHandler());
return $filter;
}
@@ -33,7 +33,7 @@
{
$render->setTemplateName("imagecategory_list.html");
$render->setAttribute("objects", $this->mObjects);
- $render->setAttribute("pageNavi", $this->mNavi);
+ $render->setAttribute("pageNavi", $this->mFilter->mNavi);
}
}