Minahito
minah****@users*****
2006年 7月 13日 (木) 19:52:34 JST
Index: xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.1 Tue Apr 11 18:16:37 2006
+++ xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php Thu Jul 13 19:52:34 2006
@@ -1,4 +1,8 @@
<?php
+/**
+ * @package user
+ * @version $Id: UserSearchFilterForm.class.php,v 1.1.2.2 2006/07/13 10:52:34 minahito Exp $
+ */
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -42,8 +46,7 @@
class User_UserSearchFilterForm extends User_AbstractFilterForm
{
- var $mSort = 0;
- var $_mSortKeys = array(
+ var $mSortKeys = array(
USER_SORT_KEY_UID => 'uid',
USER_SORT_KEY_NAME => 'name',
USER_SORT_KEY_UNAME => 'uname',
@@ -76,7 +79,6 @@
USER_SORT_KEY_USER_INTREST => 'user_intrest',
USER_SORT_KEY_USER_MAILOK => 'user_mailok'
);
- var $_mCriteria = null;
var $_mMatchFields = array ("uname", "name", "email", "user_icq", "user_aim", "user_yim", "user_msnm",
"url", "user_from", "user_occ", "user_intrest");
@@ -85,7 +87,7 @@
{
$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
- if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
+ if (!isset($this->mSortKey[abs($this->mSort)])) {
$this->mSort = USER_SORT_KEY_DEFAULT;
}
@@ -101,12 +103,12 @@
foreach ($this->_mMatchFields as $field) {
if (strlen($form->get($field)) > 0) {
- $this->mNavi->addExtra($field, $form->get($field));
+ $this->_mNavi->addExtra($field, $form->get($field));
$this->_mCriteria->add(new Criteria($field, '%' . $form->get($field) . '%', 'LIKE'));
}
}
- $this->mNavi->addExtra('mail_condition', $form->get('mail_condition'));
+ $this->_mNavi->addExtra('mail_condition', $form->get('mail_condition'));
switch ($form->get('mail_condition')) {
case 1:
$this->_mCriteria->add(new Criteria('user_mailok', 1));
@@ -117,7 +119,7 @@
break;
}
- $this->mNavi->addExtra('user_level', $form->get('user_level'));
+ $this->_mNavi->addExtra('user_level', $form->get('user_level'));
switch ($form->get('user_level')) {
case 1:
$this->_mCriteria->add(new Criteria('level', 0, '>'));
@@ -129,35 +131,35 @@
}
if (strlen($form->get('over_posts')) > 0) {
- $this->mNavi->addExtra('over_posts', $form->get('over_posts'));
+ $this->_mNavi->addExtra('over_posts', $form->get('over_posts'));
$this->_mCriteria->add(new Criteria('posts', $form->get('over_posts'), '>='));
}
if (strlen($form->get('under_posts')) > 0) {
- $this->mNavi->addExtra('under_posts', $form->get('under_posts'));
+ $this->_mNavi->addExtra('under_posts', $form->get('under_posts'));
$this->_mCriteria->add(new Criteria('posts', $form->get('under_posts'), '<='));
}
if (strlen($form->get('lastlog_more')) > 0) {
- $this->mNavi->addExtra('lastlog_more', $form->get('lastlog_more'));
+ $this->_mNavi->addExtra('lastlog_more', $form->get('lastlog_more'));
$time = time() - $form->get('lastlog_more') * 86400;
$this->_mCriteria->add(new Criteria('last_login', $time, '<='));
}
if (strlen($form->get('lastlog_less')) > 0) {
- $this->mNavi->addExtra('lastlog_less', $form->get('lastlog_less'));
+ $this->_mNavi->addExtra('lastlog_less', $form->get('lastlog_less'));
$time = time() - $form->get('lastlog_more') * 86400;
$this->_mCriteria->add(new Criteria('last_login', $time, '>='));
}
if (strlen($form->get('regdate_more')) > 0) {
- $this->mNavi->addExtra('regdate_more', $form->get('regdate_more'));
+ $this->_mNavi->addExtra('regdate_more', $form->get('regdate_more'));
$time = time() - $form->get('regdate_more') * 86400;
$this->_mCriteria->add(new Criteria('user_regdate', $time, '<='));
}
if (strlen($form->get('regdate_less')) > 0) {
- $this->mNavi->addExtra('regdate_less', $form->get('regdate_less'));
+ $this->_mNavi->addExtra('regdate_less', $form->get('regdate_less'));
$time = time() - $form->get('regdate_less') * 86400;
$this->_mCriteria->add(new Criteria('user_regdate', $time, '>='));
}