fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-04 17:44:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

fixed check module grant

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-10-13 02:04:38 +00:00
parent 28efdf9307
commit 289f077588
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/module/ModuleHandler.class.php
View file

@ -516,7 +516,6 @@
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view'; $type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type); $oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
$oMessageObject->setError(-1); $oMessageObject->setError(-1);
debugPrint($this->error);
$oMessageObject->setMessage($this->error); $oMessageObject->setMessage($this->error);
$oMessageObject->dispMessage(); $oMessageObject->dispMessage();

7
classes/module/ModuleObject.class.php
View file

@ -135,11 +135,10 @@
$grant = $oModuleModel->getGrant($request_module, $logged_info); $grant = $oModuleModel->getGrant($request_module, $logged_info);
} }
} else { } else {
$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
// have at least access grant // have at least access grant
if ($module_info->module == 'admin' || $this->module == $module_info->module) if( substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info); $grant->access = 1;
else
$grant->access = 1;
} }
// display no permission if the current module doesn't have an access privilege // display no permission if the current module doesn't have an access privilege
//if(!$grant->access) return $this->stop("msg_not_permitted"); //if(!$grant->access) return $this->stop("msg_not_permitted");

7
classes/validator/Validator.class.php
View file

@ -159,6 +159,9 @@ class Validator
$names = array(); $names = array();
if($key{0} == '^') { if($key{0} == '^') {
$names = preg_grep('/^'.preg_quote(substr($key,1)).'/', $field_names); $names = preg_grep('/^'.preg_quote(substr($key,1)).'/', $field_names);
}elseif(substr($key,-2) == '[]'){
$filters[substr($key,0,-2)] = $filter;
unset($filters[$key]);
} }
if(!count($names)) continue; if(!count($names)) continue;
@ -171,11 +174,13 @@ class Validator
} }
foreach($filters as $key=>$filter) { foreach($filters as $key=>$filter) {
$fname = $key; $fname = preg_replace('/\[\]$/', '', $key);
$exists = array_key_exists($key, $fields); $exists = array_key_exists($key, $fields);
$filter = array_merge($filter_default, $filter); $filter = array_merge($filter_default, $filter);
$value = $exists ? $fields[$fname] : null; $value = $exists ? $fields[$fname] : null;
if(is_array($value)) $value = implode('', $value);
// conditional statement // conditional statement
foreach($filter['if'] as $cond) { foreach($filter['if'] as $cond) {
if(!isset($cond['test']) || !isset($cond['attr'])) continue; if(!isset($cond['test']) || !isset($cond['attr'])) continue;