fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 21:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

fixed wrong return value in proc()

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8915 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-08-26 07:59:10 +00:00
parent 83a38b61fa
commit 68afb4b5ad
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
var $mid = NULL; ///< string to represent run-time instance of Module (XE Module) var $mid = NULL; ///< string to represent run-time instance of Module (XE Module)
var $module = NULL; ///< Class name of Xe Module that is identified by mid var $module = NULL; ///< Class name of Xe Module that is identified by mid
var $module_srl = NULL; ///< integer value to represent a run-time instance of Module (XE Module) var $module_srl = NULL; ///< integer value to represent a run-time instance of Module (XE Module)
var $module_info = NULL; ///< an object containing the module information var $module_info = NULL; ///< an object containing the module information
var $origin_module_info = NULL; var $origin_module_info = NULL;
var $xml_info = NULL; ///< an object containing the module description extracted from XML file var $xml_info = NULL; ///< an object containing the module description extracted from XML file
@ -54,14 +54,14 @@
function setRedirectUrl($url='./') { function setRedirectUrl($url='./') {
$this->add('redirect_url', $url); $this->add('redirect_url', $url);
} }
/** /**
* @brief get url for redirection * @brief get url for redirection
**/ **/
function getRedirectUrl(){ function getRedirectUrl(){
return $this->get('redirect_url'); return $this->get('redirect_url');
} }
/** /**
* @brief set message * @brief set message
* @param $message a message string * @param $message a message string
@ -71,7 +71,7 @@
parent::setMessage($message); parent::setMessage($message);
$this->setMessageType($type); $this->setMessageType($type);
} }
/** /**
* @brief set type of message * @brief set type of message
* @param $type type of message (error, info, update) * @param $type type of message (error, info, update)
@ -79,7 +79,7 @@
function setMessageType($type){ function setMessageType($type){
$this->add('message_type', $type); $this->add('message_type', $type);
} }
/** /**
* @brief get type of message * @brief get type of message
**/ **/
@ -127,7 +127,7 @@
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// module model create an object // module model create an object
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
// permission settings. access, manager(== is_admin) are fixed and privilege name in XE // permission settings. access, manager(== is_admin) are fixed and privilege name in XE
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
if(!$module_info->mid && preg_match('/^([0-9]+)$/',$module_srl)) { if(!$module_info->mid && preg_match('/^([0-9]+)$/',$module_srl)) {
$request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
@ -170,7 +170,7 @@
/** /**
* @brief set the stop_proc and approprate message for msg_code * @brief set the stop_proc and approprate message for msg_code
* @param $msg_code an error code * @param $msg_code an error code
**/ **/
function stop($msg_code) { function stop($msg_code) {
// flag setting to stop the proc processing // flag setting to stop the proc processing
@ -270,7 +270,7 @@
} }
/** /**
* @brief excute the member method specified by $act variable * @brief excute the member method specified by $act variable
* *
**/ **/
function proc() { function proc() {
@ -300,7 +300,7 @@
Context::set('module_info', $this->module_info); Context::set('module_info', $this->module_info);
// Run // Run
$output = $this->{$this->act}(); $output = $this->{$this->act}();
} }
else { else {
return false; return false;
} }
@ -312,7 +312,7 @@
$this->setMessage($triggerOutput->getMessage()); $this->setMessage($triggerOutput->getMessage());
return false; return false;
} }
// execute an addon(call called_position as after_module_proc) // execute an addon(call called_position as after_module_proc)
$called_position = 'after_module_proc'; $called_position = 'after_module_proc';
$oAddonController = &getController('addon'); $oAddonController = &getController('addon');
@ -322,7 +322,8 @@
if(is_a($output, 'Object') || is_subclass_of($output, 'Object')) { if(is_a($output, 'Object') || is_subclass_of($output, 'Object')) {
$this->setError($output->getError()); $this->setError($output->getError());
$this->setMessage($output->getMessage()); $this->setMessage($output->getMessage());
return false;
if (!$output->toBool()) return false;
} }
// execute api methos of the module if view action is and result is XMLRPC or JSON // execute api methos of the module if view action is and result is XMLRPC or JSON
if($this->module_info->module_type == 'view'){ if($this->module_info->module_type == 'view'){