Minahito
minah****@users*****
2006年 4月 11日 (火) 18:55:25 JST
Index: xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.2 Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php Tue Apr 11 18:55:25 2006
@@ -4,7 +4,6 @@
require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
-define('USER_SORT_KEY_DEFAULT', 0);
define('USER_SORT_KEY_UID', 1);
define('USER_SORT_KEY_NAME', 2);
define('USER_SORT_KEY_UNAME', 3);
@@ -38,11 +37,12 @@
define('USER_SORT_KEY_USER_MAILOK', 31);
define('USER_SORT_KEY_MAXVALUE', 31);
+define('USER_SORT_KEY_DEFAULT', USER_SORT_KEY_UID);
+
class User_UserFilterForm extends User_AbstractFilterForm
{
var $mSort = 0;
var $_mSortKeys = array(
- USER_SORT_KEY_DEFAULT => 'uid',
USER_SORT_KEY_UID => 'uid',
USER_SORT_KEY_NAME => 'name',
USER_SORT_KEY_UNAME => 'uname',
@@ -79,7 +79,7 @@
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+ $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
$this->mSort = USER_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.2 Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php Tue Apr 11 18:55:25 2006
@@ -4,7 +4,6 @@
require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
-define('RANKS_SORT_KEY_DEFAULT', 0);
define('RANKS_SORT_KEY_RANK_ID', 1);
define('RANKS_SORT_KEY_RANK_TITLE', 2);
define('RANKS_SORT_KEY_RANK_MIN', 3);
@@ -13,11 +12,12 @@
define('RANKS_SORT_KEY_RANK_IMAGE', 6);
define('RANKS_SORT_KEY_MAXVALUE', 6);
+define('RANKS_SORT_KEY_DEFAULT', RANKS_SORT_KEY_RANK_ID);
+
class User_RanksFilterForm extends User_AbstractFilterForm
{
var $mSort = 0;
var $_mSortKeys = array(
- RANKS_SORT_KEY_DEFAULT => 'rank_id',
RANKS_SORT_KEY_RANK_ID => 'rank_id',
RANKS_SORT_KEY_RANK_TITLE => 'rank_title',
RANKS_SORT_KEY_RANK_MIN => 'rank_min',
@@ -29,7 +29,7 @@
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+ $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : RANKS_SORT_KEY_DEFAULT;
if ($this->mSort > RANKS_SORT_KEY_MAXVALUE) {
$this->mSort = RANKS_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.2 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.2 Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php Tue Apr 11 18:55:25 2006
@@ -4,13 +4,14 @@
require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
-define('GROUP_SORT_KEY_DEFAULT', 0);
define('GROUP_SORT_KEY_GROUPID', 1);
define('GROUP_SORT_KEY_NAME', 2);
define('GROUP_SORT_KEY_DESCRIPTION', 3);
define('GROUP_SORT_KEY_GROUP_TYPE', 4);
define('GROUP_SORT_KEY_MAXVALUE', 4);
+define('GROUP_SORT_KEY_DEFAULT', GROUP_SORT_KEY_GROUPID);
+
class User_GroupFilterForm extends User_AbstractFilterForm
{
var $mSort = 0;
@@ -25,7 +26,7 @@
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+ $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : GROUP_SORT_KEY_DEFAULT;
if ($this->mSort > GROUP_SORT_KEY_MAXVALUE) {
$this->mSort = GROUP_SORT_KEY_DEFAULT;