Minahito
minah****@users*****
2006年 7月 12日 (水) 19:50:48 JST
Index: xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php
diff -u 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.4
--- xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.3 Tue Apr 11 18:55:25 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php Wed Jul 12 19:50:47 2006
@@ -1,4 +1,8 @@
<?php
+/**
+ * @package legacyRender
+ * @version $Id: RanksFilterForm.class.php,v 1.1.2.4 2006/07/12 10:50:47 minahito Exp $
+ */
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -9,55 +13,34 @@
define('RANKS_SORT_KEY_RANK_MIN', 3);
define('RANKS_SORT_KEY_RANK_MAX', 4);
define('RANKS_SORT_KEY_RANK_SPECIAL', 5);
-define('RANKS_SORT_KEY_RANK_IMAGE', 6);
-define('RANKS_SORT_KEY_MAXVALUE', 6);
+define('RANKS_SORT_KEY_MAXVALUE', 5);
define('RANKS_SORT_KEY_DEFAULT', RANKS_SORT_KEY_RANK_ID);
class User_RanksFilterForm extends User_AbstractFilterForm
{
- var $mSort = 0;
- var $_mSortKeys = array(
+ var $mSortKeys = array(
RANKS_SORT_KEY_RANK_ID => 'rank_id',
RANKS_SORT_KEY_RANK_TITLE => 'rank_title',
RANKS_SORT_KEY_RANK_MIN => 'rank_min',
RANKS_SORT_KEY_RANK_MAX => 'rank_max',
- RANKS_SORT_KEY_RANK_SPECIAL => 'rank_special',
- RANKS_SORT_KEY_RANK_IMAGE => 'rank_image'
+ RANKS_SORT_KEY_RANK_SPECIAL => 'rank_special'
);
- var $_mCriteria = null;
function fetch()
{
$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : RANKS_SORT_KEY_DEFAULT;
- if ($this->mSort > RANKS_SORT_KEY_MAXVALUE) {
+ if (!isset($this->mSortKeys[$this->mSort])) {
$this->mSort = RANKS_SORT_KEY_DEFAULT;
}
- if (isset($_REQUEST['rank_id'])) {
- $this->_mCriteria->add(new Criteria('rank_id', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_id'))));
- }
-
- if (isset($_REQUEST['rank_title'])) {
- $this->_mCriteria->add(new Criteria('rank_title', array(XOBJ_DTYPE_STRING, xoops_getrequest('rank_title'))));
- }
-
- if (isset($_REQUEST['rank_min'])) {
- $this->_mCriteria->add(new Criteria('rank_min', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_min'))));
- }
-
- if (isset($_REQUEST['rank_max'])) {
- $this->_mCriteria->add(new Criteria('rank_max', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_max'))));
- }
-
if (isset($_REQUEST['rank_special'])) {
- $this->_mCriteria->add(new Criteria('rank_special', array(XOBJ_DTYPE_BOOL, xoops_getrequest('rank_special'))));
- }
-
- if (isset($_REQUEST['rank_image'])) {
- $this->_mCriteria->add(new Criteria('rank_image', array(XOBJ_DTYPE_STRING, xoops_getrequest('rank_image'))));
+ $this->_mNavi->addExtra('rank_special', xoops_getrequest('rank_special'));
+ $this->_mCriteria->add(new Criteria('rank_special', xoops_getrequest('rank_special')));
}
+
+ $this->_mCriteria->addSort($this->getSort(), $this->getOrder());
}
}
Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.2 Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php Wed Jul 12 19:50:48 2006
@@ -7,7 +7,7 @@
/**
* This class is generated by makeActionForm tool.
*/
-class RanksAdminEditForm extends XCube_ActionForm
+class User_RanksAdminEditForm extends XCube_ActionForm
{
var $mOldFileName = null;
var $_mIsNew = false;
@@ -15,7 +15,7 @@
function getTokenName()
{
- return "module.user.RanksAdminEditForm.TOKEN";
+ return "module.user.RanksAdminEditForm.TOKEN" . $this->get('rank_id');
}
function prepare()
@@ -44,12 +44,24 @@
$this->mFieldProperties['rank_title']->addVar('maxlength', 50);
$this->mFieldProperties['rank_min'] =& new XCube_FieldProperty($this);
- $this->mFieldProperties['rank_min']->setDependsByArray(array('required'));
+ $this->mFieldProperties['rank_min']->setDependsByArray(array('required', 'min'));
$this->mFieldProperties['rank_min']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN);
+ $this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MIN, 0);
+ $this->mFieldProperties['rank_min']->addVar('min', 0);
$this->mFieldProperties['rank_max'] =& new XCube_FieldProperty($this);
- $this->mFieldProperties['rank_max']->setDependsByArray(array('required'));
+ $this->mFieldProperties['rank_max']->setDependsByArray(array('required', 'min'));
$this->mFieldProperties['rank_max']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX);
+ $this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MAX, 0);
+ $this->mFieldProperties['rank_max']->addVar('min', 0);
+ }
+
+ function validateRank_max()
+ {
+ die();
+ if ($this->get('max') < $this->get('min')) {
+ $this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX);
+ }
}
function validateRank_image()