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

Back to archive index

Minahito minah****@users*****
2006年 10月 13日 (金) 14:11:09 JST


Index: xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.9.2.2 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.9.2.3
--- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.9.2.2	Fri Sep 29 17:14:45 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php	Fri Oct 13 14:11:09 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: GroupPropertyAction.class.php,v 1.1.2.9.2.2 2006/09/29 08:14:45 minahito Exp $
+ * @version $Id: GroupPropertyAction.class.php,v 1.1.2.9.2.3 2006/10/13 05:11:09 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -47,7 +47,8 @@
 		$memberHandler =& xoops_gethandler('member');
 
 		$total = $memberHandler->getUserCountByGroup($this->mGroup->getVar('groupid'));
-		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=RankList", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=RankList", XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi->setTotalItems($total);
 
 		$this->mPageNavi->fetch();
 		
Index: xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.4.2.2 xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.4.2.3
--- xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.4.2.2	Fri Sep 29 17:14:45 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php	Fri Oct 13 14:11:09 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: GroupMemberAction.class.php,v 1.1.2.4.2.2 2006/09/29 08:14:45 minahito Exp $
+ * @version $Id: GroupMemberAction.class.php,v 1.1.2.4.2.3 2006/10/13 05:11:09 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -62,7 +62,8 @@
 		//
 		$total = $memberHandler->getUserCountByGroup($groupid);
 
-		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=GroupMember", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=GroupMember", XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi->setTotalItems($total);
 		$this->mPageNavi->addExtra('groupid', $groupid);
 		$this->mPageNavi->setPerpage(USER_GROUPMEMBER_DEFAULT_PERPAGE);
 
@@ -75,7 +76,8 @@
 		//
 		$total = $memberHandler->getUserCountByNoGroup($groupid);
 
-		$this->mNoPageNavi=new XCube_PageNavigator("./index.php?action=GroupMember", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mNoPageNavi=new XCube_PageNavigator("./index.php?action=GroupMember", XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mNoPageNavi->setTotalItems($total);
 		$this->mNoPageNavi->addExtra('groupid', $groupid);
 		$this->mNoPageNavi->setPrefix("no");
 		$this->mNoPageNavi->setPerpage(USER_GROUPMEMBER_DEFAULT_PERPAGE);
Index: xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.5.2.1
--- xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.5	Mon Sep 25 18:41:04 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php	Fri Oct 13 14:11:09 2006
@@ -1,14 +1,15 @@
 <?php
 /**
  * @package user
- * @version $Id: MailjobEditAction.class.php,v 1.1.2.5 2006/09/25 09:41:04 minahito Exp $
+ * @version $Id: MailjobEditAction.class.php,v 1.1.2.5.2.1 2006/10/13 05:11:09 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_ROOT_PATH . "/core/XCube_PageNavigator.class.php";
+
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/MailjobAdminEditForm.class.php";
-require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserSearchFilterForm.class.php";
 
 class User_MailjobEditAction extends User_AbstractEditAction
@@ -32,10 +33,13 @@
 		$this->mActionForm =& new User_MailjobAdminEditForm();
 		$this->mActionForm->prepare();
 
-		$this->mPageNavi =& new User_PageNavigator('./index?action=MailjobEdit', 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
-		$this->mFilter =& new User_UserSearchFilterForm($this->mPageNavi);
+		$this->mPageNavi =& new XCube_PageNavigator('./index?action=MailjobEdit', XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
+		$this->mFilter =& new User_UserSearchFilterForm($this->mPageNavi, xoops_getmodulehandler('users_search', 'user'));
 		
 		$this->mFilter->fetch();
+
+		$root =& XCube_Root::getSingleton();
+		$root->mDelegateManager->add('Legacy.Event.Explaceholder.Get.UserPagenaviHidden', 'User_MailjobEditAction::renderHiddenControl');
 	}
 	
 	function execute(&$controller, &$xoopsUser)
@@ -86,6 +90,21 @@
 	{
 		$controller->executeForward("./index.php?action=MailjobList");
 	}
+	
+	function renderHiddenControl(&$buf, $params)
+	{
+		if (isset($params['pagenavi']) && is_object($params['pagenavi'])) {
+			$navi =& $params['pagenavi'];
+			$mask = isset($params['mask']) ? $params['mask'] : null;
+			
+			foreach ($navi->mExtra as $key => $value) {
+				if ($key != $mask) {
+					$value = htmlspecialchars($value, ENT_QUOTES);
+					$buf .= "<input type=\"hidden\" name=\"${key}\" value=\"${value}\" />";
+				}
+			}
+		}
+	}
 }
 
 ?>


xoops-cvslog メーリングリストの案内
Back to archive index