Minahito
minah****@users*****
2006年 7月 13日 (木) 19:50:06 JST
Index: xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.3 Tue Apr 11 18:55:25 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php Thu Jul 13 19:50:06 2006
@@ -1,4 +1,8 @@
<?php
+/**
+ * @package user
+ * @version $Id: GroupFilterForm.class.php,v 1.1.2.4 2006/07/13 10:50:06 minahito Exp $
+ */
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -14,35 +18,38 @@
class User_GroupFilterForm extends User_AbstractFilterForm
{
- var $mSort = 0;
- var $_mSortKeys = array(
+ var $mSortKeys = array(
GROUP_SORT_KEY_DEFAULT => 'groupid',
GROUP_SORT_KEY_GROUPID => 'groupid',
GROUP_SORT_KEY_NAME => 'name',
GROUP_SORT_KEY_DESCRIPTION => 'description',
GROUP_SORT_KEY_GROUP_TYPE => 'group_type'
);
- var $_mCriteria = null;
function fetch()
{
$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : GROUP_SORT_KEY_DEFAULT;
- if ($this->mSort > GROUP_SORT_KEY_MAXVALUE) {
+ if (!isset($this->mSortKeys[abs($this->mSort)])) {
$this->mSort = GROUP_SORT_KEY_DEFAULT;
}
if (isset($_REQUEST['groupid'])) {
- $this->_mCriteria->add(new Criteria('groupid', array(XOBJ_DTYPE_INT, xoops_getrequest('groupid'))));
+ $this->_mNavi->addExtra('groupid', xoops_getrequest('groupid'));
+ $this->_mCriteria->add(new Criteria('groupid', xoops_getrequest('groupid')));
}
if (isset($_REQUEST['name'])) {
- $this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+ $this->_mNavi->addExtra('name', xoops_getrequest('name'));
+ $this->_mCriteria->add(new Criteria('name', xoops_getrequest('name')));
}
if (isset($_REQUEST['group_type'])) {
- $this->_mCriteria->add(new Criteria('group_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('group_type'))));
+ $this->_mNavi->addExtra('group_type', xoops_getrequest('group_type'));
+ $this->_mCriteria->add(new Criteria('group_type', xoops_getrequest('group_type')));
}
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
}
}