Minahito
minah****@users*****
2006年 7月 13日 (木) 19:50:53 JST
Index: xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.3 Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php Thu Jul 13 19:50:53 2006
@@ -18,7 +18,6 @@
class User_MailjobFilterForm extends User_AbstractFilterForm
{
- var $mSort = 0;
var $mSortKeys = array(
MAILJOB_SORT_KEY_MAILJOB_ID => 'mailjob_id',
MAILJOB_SORT_KEY_TITLE => 'title',
@@ -29,13 +28,12 @@
MAILJOB_SORT_KEY_IS_MAIL => 'is_mail',
MAILJOB_SORT_KEY_CREATE_UNIXTIME => 'create_unixtime'
);
- var $_mCriteria = null;
function fetch()
{
$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : MAILJOB_SORT_KEY_DEFAULT;
- if ($this->mSort > MAILJOB_SORT_KEY_MAXVALUE) {
+ if (!isset($this->mSortKeys[abs($this->mSort)])) {
$this->mSort = MAILJOB_SORT_KEY_DEFAULT;
}
@@ -49,12 +47,12 @@
if (isset($_REQUEST['is_pm'])) {
$this->_mNavi->addExtra('is_pm', xoops_getrequest('is_pm'));
- $this->_mCriteria->add(new Criteria('is_pm', array(XOBJ_DTYPE_BOOL, xoops_getrequest('is_pm'))));
+ $this->_mCriteria->add(new Criteria('is_pm', xoops_getrequest('is_pm')));
}
if (isset($_REQUEST['is_mail'])) {
$this->_mNavi->addExtra('is_mail', xoops_getrequest('is_mail'));
- $this->_mCriteria->add(new Criteria('is_mail', array(XOBJ_DTYPE_BOOL, xoops_getrequest('is_mail'))));
+ $this->_mCriteria->add(new Criteria('is_mail', xoops_getrequest('is_mail')));
}
$this->_mCriteria->addSort($this->getSort(), $this->getOrder());