CVS update: xoops2jp/html/modules/user/admin/actions (xoops-cvslog 4959) - XOOPS

Index: xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.3.2.1

--- xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.3	Thu Jul 13 19:44:06 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -2,7 +2,6 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/GroupFilterForm.class.php";
 
@@ -14,9 +13,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_GroupFilterForm($navi);
+		$filter =& new User_GroupFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 
@@ -29,7 +28,7 @@
 	{
 		$render->setTemplateName("group_list.html");
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/actions/UserListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.4	Thu Jul 13 19:47:17 2006
+++ xoops2jp/html/modules/user/admin/actions/UserListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -1,12 +1,11 @@
 <?php
 /**
  * @package user
- * @version $Id: UserListAction.class.php,v 1.1.2.4 2006/07/13 10:47:17 minahito Exp $
+ * @version $Id: UserListAction.class.php,v 1.1.2.4.2.1 2006/10/12 14:45:20 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserFilterForm.class.php";
 
@@ -18,9 +17,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_UserFilterForm($navi);
+		$filter =& new User_UserFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 
@@ -33,7 +32,7 @@
 	{
 		$render->setTemplateName("user_list.html");
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/actions/RanksListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/RanksListAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/RanksListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/user/admin/actions/RanksListAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/RanksListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -2,7 +2,6 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/RanksFilterForm.class.php";
 
@@ -14,9 +13,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_RanksFilterForm($navi);
+		$filter =& new User_RanksFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 
@@ -29,7 +28,7 @@
 	{
 		$render->setTemplateName("ranks_list.html");
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.3	Wed Jul 19 19:20:53 2006
+++ xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -1,12 +1,11 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarListAction.class.php,v 1.1.2.3 2006/07/19 10:20:53 minahito Exp $
+ * @version $Id: AvatarListAction.class.php,v 1.1.2.3.2.1 2006/10/12 14:45:20 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/AvatarFilterForm.class.php";
 
@@ -18,9 +17,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_AvatarFilterForm($navi);
+		$filter =& new User_AvatarFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 
@@ -33,7 +32,7 @@
 	{
 		$render->setTemplateName("avatar_list.html");
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.4	Mon Sep 25 18:41:04 2006
+++ xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -1,12 +1,11 @@
 <?php
 /**
  * @package user
- * @version $Id: UserSearchListAction.class.php,v 1.1.2.4 2006/09/25 09:41:04 minahito Exp $
+ * @version $Id: UserSearchListAction.class.php,v 1.1.2.4.2.1 2006/10/12 14:45:20 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserSearchFilterForm.class.php";
 
@@ -18,9 +17,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_UserSearchFilterForm($navi);
+		$filter =& new User_UserSearchFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 	
@@ -36,9 +35,39 @@
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
+		$controller->mRoot->mDelegateManager->add('Legacy.Event.Explaceholder.Get.UserPagenaviOtherUrl',
+'User_UserSearchListAction::renderOtherUrlControl');
+
 		$render->setTemplateName("user_search_list.html");
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
+	}
+	
+	function renderOtherUrlControl(&$buf, $params)
+	{
+		if (isset($params['pagenavi']) && is_object($params['pagenavi'])) {
+			$navi =& $params['pagenavi'];
+			$url = $params['url'];
+			if(count($navi->mExtra) > 0) {
+				$t_arr = array();
+			
+				foreach($navi->mExtra as $key => $value) {
+					$t_arr[] = $key . "=" . urlencode($value);
+				}
+			
+				if (count($t_arr) == 0) {
+					$buf = $url;
+					return;
+				}
+			
+				if (strpos($url,"?")!==false) {
+					$buf = $url . "&amp;" . implode("&amp;", $t_arr);
+				}
+				else {
+					$buf = $url . "?" . implode("&amp;", $t_arr);
+				}
+			}
+		}
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.2	Wed Jul 19 19:20:53 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php	Thu Oct 12 23:45:20 2006
@@ -1,12 +1,11 @@
 <?php
 /**
  * @package user
- * @version $Id: MailjobListAction.class.php,v 1.1.2.2 2006/07/19 10:20:53 minahito Exp $
+ * @version $Id: MailjobListAction.class.php,v 1.1.2.2.2.1 2006/10/12 14:45:20 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/MailjobFilterForm.class.php";
 
@@ -18,9 +17,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
-		$filter =& new User_MailjobFilterForm($navi);
+		$filter =& new User_MailjobFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;
 	}
 
@@ -38,7 +37,7 @@
 		}
 
 		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
 	}
 }
 


XOOPS

[xoops-cvslog 4959] CVS update: xoops2jp/html/modules/user/admin/actions