Minahito
minah****@users*****
2006年 8月 1日 (火) 19:41:48 JST
Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3 Tue Apr 11 15:12:45 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Tue Aug 1 19:41:48 2006
@@ -4,53 +4,47 @@
require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
-define('SMILES_SORT_KEY_DEFAULT', 0);
define('SMILES_SORT_KEY_ID', 1);
define('SMILES_SORT_KEY_CODE', 2);
define('SMILES_SORT_KEY_SMILE_URL', 3);
define('SMILES_SORT_KEY_EMOTION', 4);
define('SMILES_SORT_KEY_DISPLAY', 5);
+
+define('SMILES_SORT_KEY_DEFAULT', SMILES_SORT_KEY_ID);
define('SMILES_SORT_KEY_MAXVALUE', 5);
class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm
{
- var $mSort = 0;
var $_mSortKeys = array(
- SMILES_SORT_KEY_DEFAULT => 'id',
SMILES_SORT_KEY_ID => 'id',
SMILES_SORT_KEY_CODE => 'code',
SMILES_SORT_KEY_SMILE_URL => 'smile_url',
SMILES_SORT_KEY_EMOTION => 'emotion',
SMILES_SORT_KEY_DISPLAY => 'display'
);
- var $_mCriteria = null;
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+ $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : SMILES_SORT_KEY_DEFAULT;
- if ($this->mSort > SMILES_SORT_KEY_MAXVALUE) {
+ if (!isset($this->_mSortKeys[abs($this->mSort)])) {
$this->mSort = SMILES_SORT_KEY_DEFAULT;
}
- if (isset($_REQUEST['id'])) {
- $this->_mCriteria->add(new Criteria('id', array(XOBJ_DTYPE_INT, xoops_getrequest('id'))));
- }
-
if (isset($_REQUEST['code'])) {
- $this->_mCriteria->add(new Criteria('code', array(XOBJ_DTYPE_STRING, xoops_getrequest('code'))));
+ $this->_mCriteria->add(new Criteria('code', xoops_getrequest('code')));
}
if (isset($_REQUEST['smile_url'])) {
- $this->_mCriteria->add(new Criteria('smile_url', array(XOBJ_DTYPE_STRING, xoops_getrequest('smile_url'))));
+ $this->_mCriteria->add(new Criteria('smile_url', xoops_getrequest('smile_url')));
}
if (isset($_REQUEST['emotion'])) {
- $this->_mCriteria->add(new Criteria('emotion', array(XOBJ_DTYPE_STRING, xoops_getrequest('emotion'))));
+ $this->_mCriteria->add(new Criteria('emotion', xoops_getrequest('emotion')));
}
if (isset($_REQUEST['display'])) {
- $this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display'))));
+ $this->_mCriteria->add(new Criteria('display', xoops_getrequest('display')));
}
$this->_mCriteria->addSort($this->getSort(), $this->getOrder());