mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-14 08:49:56 +09:00
merge from 1.5.3 (~r10943)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko
parent
7aa4798373
commit
54e3a72065
334 changed files with 13011 additions and 5561 deletions
|
|
@ -2,7 +2,7 @@
|
|||
/**
|
||||
* @class ModuleHandler
|
||||
* @author NHN (developers@xpressengine.com)
|
||||
* @brief Handling modules
|
||||
* Handling modules
|
||||
*
|
||||
* @remarks This class is to excute actions of modules.
|
||||
* Constructing an instance without any parameterconstructor, it finds the target module based on Context.
|
||||
|
|
@ -23,8 +23,13 @@
|
|||
var $httpStatusCode = NULL; ///< http status code.
|
||||
|
||||
/**
|
||||
* @brief constructor
|
||||
* @remarks it prepares variables to use in moduleHandler
|
||||
* prepares variables to use in moduleHandler
|
||||
* @param string $module name of module
|
||||
* @param string $act name of action
|
||||
* @param int $mid
|
||||
* @param int $document_srl
|
||||
* @param int $module_srl
|
||||
* @return void
|
||||
**/
|
||||
function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '') {
|
||||
// If XE has not installed yet, set module as install
|
||||
|
|
@ -63,8 +68,8 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
|
||||
* @return true: OK, false: redirected
|
||||
* Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
|
||||
* @return boolean true: OK, false: redirected
|
||||
**/
|
||||
function init() {
|
||||
$oModuleModel = &getModel('module');
|
||||
|
|
@ -172,8 +177,8 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief get a module instance and execute an action
|
||||
* @return executed module instance
|
||||
* get a module instance and execute an action
|
||||
* @return ModuleObject executed module instance
|
||||
**/
|
||||
function procModule() {
|
||||
$oModuleModel = &getModel('module');
|
||||
|
|
@ -207,7 +212,17 @@
|
|||
if(!$this->act) {
|
||||
$this->error = 'msg_module_is_not_exists';
|
||||
$this->httpStatusCode = '404';
|
||||
return;
|
||||
|
||||
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
|
||||
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
|
||||
$oMessageObject->setError(-1);
|
||||
$oMessageObject->setMessage($this->error);
|
||||
$oMessageObject->dispMessage();
|
||||
if($this->httpStatusCode)
|
||||
{
|
||||
$oMessageObject->setHttpStatusCode($this->httpStatusCode);
|
||||
}
|
||||
return $oMessageObject;
|
||||
}
|
||||
|
||||
// get type, kind
|
||||
|
|
@ -266,9 +281,16 @@
|
|||
}
|
||||
|
||||
if(!is_object($oModule)) {
|
||||
$this->error = 'msg_module_is_not_exists';
|
||||
$this->httpStatusCode = '404';
|
||||
return;
|
||||
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
|
||||
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
|
||||
$oMessageObject->setError(-1);
|
||||
$oMessageObject->setMessage($this->error);
|
||||
$oMessageObject->dispMessage();
|
||||
if($this->httpStatusCode)
|
||||
{
|
||||
$oMessageObject->setHttpStatusCode($this->httpStatusCode);
|
||||
}
|
||||
return $oMessageObject;
|
||||
}
|
||||
|
||||
// If there is no such action in the module object
|
||||
|
|
@ -278,7 +300,15 @@
|
|||
if(!Context::isInstalled())
|
||||
{
|
||||
$this->error = 'msg_invalid_request';
|
||||
return;
|
||||
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
|
||||
$oMessageObject->setError(-1);
|
||||
$oMessageObject->setMessage($this->error);
|
||||
$oMessageObject->dispMessage();
|
||||
if($this->httpStatusCode)
|
||||
{
|
||||
$oMessageObject->setHttpStatusCode($this->httpStatusCode);
|
||||
}
|
||||
return $oMessageObject;
|
||||
}
|
||||
|
||||
$forward = null;
|
||||
|
|
@ -364,7 +394,9 @@
|
|||
else
|
||||
{
|
||||
$this->error = 'msg_invalid_request';
|
||||
return;
|
||||
$oModule->setError(-1);
|
||||
$oModule->setMessage($this->error);
|
||||
return $oModule;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -425,7 +457,8 @@
|
|||
|
||||
$procResult = $oModule->proc();
|
||||
|
||||
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
|
||||
$methodList = array('XMLRPC'=>1, 'JSON'=>1);
|
||||
if(!$oModule->stop_proc && !isset($methodList[Context::getRequestMethod()]))
|
||||
{
|
||||
$error = $oModule->getError();
|
||||
$message = $oModule->getMessage();
|
||||
|
|
@ -458,6 +491,10 @@
|
|||
return $oModule;
|
||||
}
|
||||
|
||||
/**
|
||||
* set error message to Session.
|
||||
* @return void
|
||||
**/
|
||||
function _setInputErrorToContext()
|
||||
{
|
||||
if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR')) Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
|
||||
|
|
@ -468,6 +505,10 @@
|
|||
$this->_clearErrorSession();
|
||||
}
|
||||
|
||||
/**
|
||||
* clear error message to Session.
|
||||
* @return void
|
||||
**/
|
||||
function _clearErrorSession()
|
||||
{
|
||||
$_SESSION['XE_VALIDATOR_ERROR'] = '';
|
||||
|
|
@ -476,6 +517,10 @@
|
|||
$_SESSION['XE_VALIDATOR_RETURN_URL'] = '';
|
||||
}
|
||||
|
||||
/**
|
||||
* occured error when, set input values to session.
|
||||
* @return void
|
||||
**/
|
||||
function _setInputValueToSession()
|
||||
{
|
||||
$requestVars = Context::getRequestVars();
|
||||
|
|
@ -484,9 +529,9 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief display contents from executed module
|
||||
* @param[in] $oModule module instance
|
||||
* @return none
|
||||
* display contents from executed module
|
||||
* @param ModuleObject $oModule module instance
|
||||
* @return void
|
||||
**/
|
||||
function displayContent($oModule = NULL) {
|
||||
// If the module is not set or not an object, set error
|
||||
|
|
@ -505,7 +550,8 @@
|
|||
if(!$output->toBool()) $this->error = $output->getMessage();
|
||||
|
||||
// Use message view object, if HTML call
|
||||
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
|
||||
$methodList = array('XMLRPC'=>1, 'JSON'=>1);
|
||||
if(!isset($methodList[Context::getRequestMethod()])) {
|
||||
|
||||
if($_SESSION['XE_VALIDATOR_RETURN_URL'])
|
||||
{
|
||||
|
|
@ -594,20 +640,20 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief returns module's path
|
||||
* @param[in] $module module name
|
||||
* @return path of the module
|
||||
* returns module's path
|
||||
* @param string $module module name
|
||||
* @return string path of the module
|
||||
**/
|
||||
function getModulePath($module) {
|
||||
return sprintf('./modules/%s/', $module);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief It creates a module instance
|
||||
* @param[in] $module module name
|
||||
* @param[in] $type instance type, (e.g., view, controller, model)
|
||||
* @param[in] $kind admin or svc
|
||||
* @return module instance (if failed it returns null)
|
||||
* It creates a module instance
|
||||
* @param string $module module name
|
||||
* @param string $type instance type, (e.g., view, controller, model)
|
||||
* @param string $kind admin or svc
|
||||
* @return ModuleObject module instance (if failed it returns null)
|
||||
* @remarks if there exists a module instance created before, returns it.
|
||||
**/
|
||||
function &getModuleInstance($module, $type = 'view', $kind = '') {
|
||||
|
|
@ -617,19 +663,19 @@
|
|||
$kind = strtolower($kind);
|
||||
$type = strtolower($type);
|
||||
|
||||
$kinds = explode(' ', 'svc admin');
|
||||
if(!in_array($kind, $kinds)) $kind = $kinds[0];
|
||||
$kinds = array('svc'=>1, 'admin'=>1);
|
||||
if(!isset($kinds[$kind])) $kind = 'svc';
|
||||
|
||||
$key = $module.'.'.($kind!='admin'?'':'admin').'.'.$type;
|
||||
|
||||
if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__'])) {
|
||||
if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__']))
|
||||
{
|
||||
$module = $extend_module = $GLOBALS['__MODULE_EXTEND__'][$key];
|
||||
}else{
|
||||
unset($parent_module);
|
||||
}
|
||||
|
||||
// if there is no instance of the module in global variable, create a new one
|
||||
if(!$GLOBALS['_loaded_module'][$module][$type][$kind]) {
|
||||
if(!isset($GLOBALS['_loaded_module'][$module][$type][$kind]))
|
||||
{
|
||||
$parent_module = $module;
|
||||
|
||||
$class_path = ModuleHandler::getModulePath($module);
|
||||
|
|
@ -696,10 +742,10 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief call a trigger
|
||||
* @param[in] $trigger_name trigger's name to call
|
||||
* @param[in] $called_position called position
|
||||
* @param[in] $obj an object as a parameter to trigger
|
||||
* call a trigger
|
||||
* @param string $trigger_name trigger's name to call
|
||||
* @param string $called_position called position
|
||||
* @param object $obj an object as a parameter to trigger
|
||||
* @return Object
|
||||
**/
|
||||
function triggerCall($trigger_name, $called_position, &$obj) {
|
||||
|
|
@ -728,7 +774,9 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @brief get http status message by http status code
|
||||
* get http status message by http status code
|
||||
* @param string $code
|
||||
* @return string
|
||||
**/
|
||||
function _setHttpStatusMessage($code) {
|
||||
$statusMessageList = array(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue