fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 37 Server Side Validator apply core code

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8477 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-06-14 02:16:44 +00:00
parent 32d69fdeff
commit b17464e1c1
6 changed files with 121 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,8 +297,23 @@
if(!empty($rulesetFile))
{
$Validator = new Validator($rulesetFile);
if(!$Validator->validate())
return $Validator->getLastError();
$result = $Validator->validate();
if(!$result)
{
$lastError = $Validator->getLastError();
$returnUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl();
$errorMsg = $lastError['msg'] ? $lastError['msg'] : 'validation error';
//for xml response
$oModule->setError(-1);
$oModule->setMessage($errorMsg);
//for html redirect
$this->error = $errorMsg;
$_SESSION['XE_VALIDATOR_ERROR'] = $this->error;
$_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] = $returnUrl;
$this->_setInputValueToSession();
return $oModule;
}
}
}
@ -315,11 +330,37 @@
}
// execute the action, and if failed, set error
if(!$oModule->proc()) $this->error = $oModule->getMessage();
if(!$oModule->proc())
{
// case post, redirect page
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
$this->_setInputValueToSession();
$returnUrl = Context::get('error_return_url')?Context::get('error_return_url'):getUrl();
header('location:'.$returnUrl);
return;
}
// case exec xml, return xml response
else $this->error = $oModule->getMessage();
}
else
{
if(count($_SESSION['INPUT_ERROR']))
{
Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']);
$_SESSION['INPUT_ERROR'] = '';
}
}
return $oModule;
}
function _setInputValueToSession()
{
$requestVars = Context::getRequestVars();
foreach($requestVars AS $key=>$value) $_SESSION['INPUT_ERROR'][$key] = $value;
}
/**
* @brief display contents from executed module
* @param[in] $oModule module instance
@ -344,6 +385,12 @@
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
// If error occurred, handle it
if($this->error) {
if($_SESSION['XE_VALIDATOR_ERROR'] && $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'])
{
header('location:'.$_SESSION['XE_VALIDATOR_ERROR_RETURN_URL']);
return;
}
// display content with message module instance
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
@ -353,9 +400,8 @@
// If module was called normally, change the templates of the module into ones of the message view module
if($oModule) {
$oModule->setTemplatePath($oMessageObject->getTemplatePath());
$oModule->setTemplateFile($oMessageObject->getTemplateFile());
$oModule->setTemplatePath($oMessageObject->getTemplatePath());
$oModule->setTemplateFile($oMessageObject->getTemplateFile());
// Otherwise, set message instance as the target module
} else {
$oModule = $oMessageObject;
@ -410,9 +456,15 @@
}
}
if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR')) Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
if($_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] && !Context::get('XE_VALIDATOR_ERROR_RETURN_URL')) Context::set('XE_VALIDATOR_ERROR_RETURN_URL', $_SESSION['XE_VALIDATOR_ERROR_RETURN_URL']);
// Display contents
$oDisplayHandler = new DisplayHandler();
$oDisplayHandler->printContent($oModule);
$_SESSION['XE_VALIDATOR_ERROR'] = '';
$_SESSION['XE_VALIDATOR_ERROR_RETURN_URL'] = '';
}
/**