Minahito
minah****@users*****
2006年 10月 12日 (木) 20:02:52 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.6 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.6 Sat Aug 5 15:18:18 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -22,32 +22,33 @@
SMILES_SORT_KEY_EMOTION => 'emotion',
SMILES_SORT_KEY_DISPLAY => 'display'
);
+
+ function getDefaultSortKey()
+ {
+ return SMILES_SORT_KEY_DEFAULT;
+ }
function fetch()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : SMILES_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = SMILES_SORT_KEY_DEFAULT;
- }
+ parent::fetch();
if (isset($_REQUEST['code'])) {
- $this->_mNavi->addExtra('code', xoops_getrequest('code'));
+ $this->mNavi->addExtra('code', xoops_getrequest('code'));
$this->_mCriteria->add(new Criteria('code', xoops_getrequest('code')));
}
if (isset($_REQUEST['smile_url'])) {
- $this->_mNavi->addExtra('smile_url', xoops_getrequest('smile_url'));
+ $this->mNavi->addExtra('smile_url', xoops_getrequest('smile_url'));
$this->_mCriteria->add(new Criteria('smile_url', xoops_getrequest('smile_url')));
}
if (isset($_REQUEST['emotion'])) {
- $this->_mNavi->addExtra('emotion', xoops_getrequest('emotion'));
+ $this->mNavi->addExtra('emotion', xoops_getrequest('emotion'));
$this->_mCriteria->add(new Criteria('emotion', xoops_getrequest('emotion')));
}
if (isset($_REQUEST['display'])) {
- $this->_mNavi->addExtra('display', xoops_getrequest('display'));
+ $this->mNavi->addExtra('display', xoops_getrequest('display'));
$this->_mCriteria->add(new Criteria('display', xoops_getrequest('display')));
}
Index: xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php:1.1.2.2 Tue Aug 1 19:40:05 2006
+++ xoops2jp/html/modules/base/admin/forms/ImagecategoryFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: ImagecategoryFilterForm.class.php,v 1.1.2.2 2006/08/01 10:40:05 minahito Exp $
+ * @version $Id: ImagecategoryFilterForm.class.php,v 1.1.2.2.2.1 2006/10/12 11:02:52 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -35,31 +35,32 @@
IMAGECATEGORY_SORT_KEY_IMGCAT_STORETYPE => 'imgcat_storetype'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGECATEGORY_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = IMAGECATEGORY_SORT_KEY_DEFAULT;
- }
+ return IMAGECATEGORY_SORT_KEY_DEFAULT;
+ }
+ function fetch()
+ {
+ parent::fetch();
+
if (isset($_REQUEST['imgcat_name'])) {
- $this->_mNavi->addExtra('imgcat_name', xoops_getrequest('imgcat_name'));
+ $this->mNavi->addExtra('imgcat_name', xoops_getrequest('imgcat_name'));
$this->_mCriteria->add(new Criteria('imgcat_name', xoops_getrequest('imgcat_name')));
}
if (isset($_REQUEST['imgcat_display'])) {
- $this->_mNavi->addExtra('imgcat_display', xoops_getrequest('imgcat_display'));
+ $this->mNavi->addExtra('imgcat_display', xoops_getrequest('imgcat_display'));
$this->_mCriteria->add(new Criteria('imgcat_display', xoops_getrequest('imgcat_display')));
}
if (isset($_REQUEST['imgcat_type'])) {
- $this->_mNavi->addExtra('imgcat_type', xoops_getrequest('imgcat_type'));
+ $this->mNavi->addExtra('imgcat_type', xoops_getrequest('imgcat_type'));
$this->_mCriteria->add(new Criteria('imgcat_type', xoops_getrequest('imgcat_type')));
}
if (isset($_REQUEST['imgcat_storetype'])) {
- $this->_mNavi->addExtra('imgcat_storetype', xoops_getrequest('imgcat_storetype'));
+ $this->mNavi->addExtra('imgcat_storetype', xoops_getrequest('imgcat_storetype'));
$this->_mCriteria->add(new Criteria('imgcat_storetype', xoops_getrequest('imgcat_storetype')));
}
Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.7 Tue Aug 1 19:39:11 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: CommentFilterForm.class.php,v 1.1.2.7 2006/08/01 10:39:11 minahito Exp $
+ * @version $Id: CommentFilterForm.class.php,v 1.1.2.7.2.1 2006/10/12 11:02:52 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -57,20 +57,21 @@
COMMENT_SORT_KEY_DOBR => 'dobr'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : COMMENT_SORT_KEY_DEFAULT;
+ return COMMENT_SORT_KEY_DEFAULT;
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = COMMENT_SORT_KEY_DEFAULT;
- }
+ function fetch()
+ {
+ parent::fetch();
if (isset($_REQUEST['com_modid']) && intval(xoops_getrequest('com_modid')) > 0) {
- $this->_mNavi->addExtra('com_modid', xoops_getrequest('com_modid'));
+ $this->mNavi->addExtra('com_modid', xoops_getrequest('com_modid'));
$this->_mCriteria->add(new Criteria('com_modid', xoops_getrequest('com_modid')));
}
elseif (isset($_REQUEST['dirname'])) {
- $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+ $this->mNavi->addExtra('dirname', xoops_getrequest('dirname'));
$handler =& xoops_gethandler('module');
$module =& $handler->getByDirname(xoops_getrequest('dirname'));
@@ -80,22 +81,22 @@
}
if (isset($_REQUEST['com_icon'])) {
- $this->_mNavi->addExtra('com_icon', xoops_getrequest('com_icon'));
+ $this->mNavi->addExtra('com_icon', xoops_getrequest('com_icon'));
$this->_mCriteria->add(new Criteria('com_icon', xoops_getrequest('com_icon')));
}
if (isset($_REQUEST['com_uid'])) {
- $this->_mNavi->addExtra('com_uid', xoops_getrequest('com_uid'));
+ $this->mNavi->addExtra('com_uid', xoops_getrequest('com_uid'));
$this->_mCriteria->add(new Criteria('com_uid', xoops_getrequest('com_uid')));
}
if (isset($_REQUEST['com_ip'])) {
- $this->_mNavi->addExtra('com_ip', xoops_getrequest('com_ip'));
+ $this->mNavi->addExtra('com_ip', xoops_getrequest('com_ip'));
$this->_mCriteria->add(new Criteria('com_ip', xoops_getrequest('com_ip')));
}
if (xoops_getrequest('com_status') > 0) {
- $this->_mNavi->addExtra('com_status', xoops_getrequest('com_status'));
+ $this->mNavi->addExtra('com_status', xoops_getrequest('com_status'));
$this->_mCriteria->add(new Criteria('com_status', xoops_getrequest('com_status')));
}
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7.2.1
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.7 Tue Aug 1 19:37:25 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: BlockFilterForm.class.php,v 1.1.2.7 2006/08/01 10:37:25 minahito Exp $
+ * @version $Id: BlockFilterForm.class.php,v 1.1.2.7.2.1 2006/10/12 11:02:52 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -50,41 +50,42 @@
NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified'
);
- function fetch()
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
-
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
- }
+ return NEWBLOCKS_SORT_KEY_DEFAULT;
+ }
+ function fetch()
+ {
+ parent::fetch();
+
if (isset($_REQUEST['mid'])) {
- $this->_mNavi->addExtra('mid', xoops_getrequest('mid'));
+ $this->mNavi->addExtra('mid', xoops_getrequest('mid'));
$this->_mCriteria->add(new Criteria('mid', xoops_getrequest('mid')));
}
if (isset($_REQUEST['side'])) {
- $this->_mNavi->addExtra('side', xoops_getrequest('side'));
+ $this->mNavi->addExtra('side', xoops_getrequest('side'));
$this->_mCriteria->add(new Criteria('side', xoops_getrequest('side')));
}
if (isset($_REQUEST['weight'])) {
- $this->_mNavi->addExtra('weight', xoops_getrequest('weight'));
+ $this->mNavi->addExtra('weight', xoops_getrequest('weight'));
$this->_mCriteria->add(new Criteria('weight', xoops_getrequest('weight')));
}
if (isset($_REQUEST['block_type'])) {
- $this->_mNavi->addExtra('block_type', xoops_getrequest('block_type'));
+ $this->mNavi->addExtra('block_type', xoops_getrequest('block_type'));
$this->_mCriteria->add(new Criteria('block_type', xoops_getrequest('block_type')));
}
if (isset($_REQUEST['c_type'])) {
- $this->_mNavi->addExtra('c_type', xoops_getrequest('c_type'));
+ $this->mNavi->addExtra('c_type', xoops_getrequest('c_type'));
$this->_mCriteria->add(new Criteria('c_type', xoops_getrequest('c_type')));
}
if (isset($_REQUEST['dirname'])) {
- $this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+ $this->mNavi->addExtra('dirname', xoops_getrequest('dirname'));
$this->_mCriteria->add(new Criteria('dirname', xoops_getrequest('dirname')));
}
Index: xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php:1.1.2.6 Sun Sep 3 01:20:48 2006
+++ xoops2jp/html/modules/base/admin/forms/ModuleListFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -1,7 +1,7 @@
<?php
/**
* This file is generated by Sort Filter Unit Class Maker.
- * @version $Id: ModuleListFilterForm.class.php,v 1.1.2.6 2006/09/02 16:20:48 minahito Exp $
+ * @version $Id: ModuleListFilterForm.class.php,v 1.1.2.6.2.1 2006/10/12 11:02:52 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -46,13 +46,19 @@
MODULE_SORT_KEY_HASCOMMENTS => "hascomments"
);
- function fetch()
+ function Legacy_ModuleListFilterForm()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : MODULE_SORT_KEY_DEFAULT;
+ $this->_mCriteria =& new CriteriaCompo();
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = MODULE_SORT_KEY_DEFAULT;
- }
+ function getDefaultSortKey()
+ {
+ return MODULE_SORT_KEY_DEFAULT;
+ }
+
+ function fetch()
+ {
+ $this->fetchSort();
if (isset($_REQUEST['special'])) {
$this->mSpecial = intval(xoops_getreqeust('special'));
Index: xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php:1.1.2.2 Tue Aug 1 19:40:18 2006
+++ xoops2jp/html/modules/base/admin/forms/ImageFilterForm.class.php Thu Oct 12 20:02:52 2006
@@ -28,21 +28,23 @@
IMAGE_SORT_KEY_IMAGE_WEIGHT => 'image_weight',
IMAGE_SORT_KEY_IMGCAT_ID => 'imgcat_id'
);
- function fetch()
+
+ function getDefaultSortKey()
{
- $this->mSort = isset($_REQUEST['sort']) ? intval(xoops_getrequest('sort')) : IMAGE_SORT_KEY_DEFAULT;
+ return IMAGE_SORT_KEY_DEFAULT;
+ }
- if (!isset($this->mSortKeys[abs($this->mSort)])) {
- $this->mSort = IMAGE_SORT_KEY_DEFAULT;
- }
+ function fetch()
+ {
+ parent::fetch();
if (isset($_REQUEST['image_display'])) {
- $this->_mNavi->addExtra('image_display', xoops_getrequest('image_display'));
+ $this->mNavi->addExtra('image_display', xoops_getrequest('image_display'));
$this->_mCriteria->add(new Criteria('image_display', xoops_getrequest('image_display')));
}
if (isset($_REQUEST['imgcat_id'])) {
- $this->_mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
+ $this->mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
$this->_mCriteria->add(new Criteria('imgcat_id', xoops_getrequest('imgcat_id')));
}