issue 2662 coding convention

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12220 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-14 09:59:39 +00:00
parent f9ca200edf
commit 15fa10dc39
11 changed files with 697 additions and 522 deletions

View file

@ -11,7 +11,7 @@ class Security
/**
* Action target variable. If this value is null, the method will use Context variables
* @var mixed
**/
*/
var $_targetVar = null;
/**
@ -37,32 +37,44 @@ class Security
if(count($varNames) < 0) return false;
$use_context = is_null($this->_targetVar);
if(!$use_context) {
if(!$use_context)
{
if(!count($varNames) || (!is_object($this->_targetVar) && !is_array($this->_targetVar)) ) return $this->_encodeHTML($this->_targetVar);
$is_object = is_object($this->_targetVar);
}
foreach($varNames as $varName) {
foreach($varNames as $varName)
{
$varName = explode('.', $varName);
$varName0 = array_shift($varName);
if($use_context) {
if($use_context)
{
$var = Context::get($varName0);
} elseif($varName0) {
}
elseif($varName0)
{
$var = $is_object ? $this->_targetVar->{$varName0} : $this->_targetVar[$varName0];
} else {
}
else
{
$var = $this->_targetVar;
}
$var = $this->_encodeHTML($var, $varName);
if($var === false) continue;
if($use_context) {
if($use_context)
{
Context::set($varName0, $var);
} elseif($varName0) {
}
elseif($varName0)
{
if($is_object) $this->_targetVar->{$varName0} = $var;
else $this->_targetVar[$varName0] = $var;
} else {
}
else
{
$this->_targetVar = $var;
}
}
@ -78,7 +90,8 @@ class Security
*/
function _encodeHTML($var, $name=array())
{
if(is_string($var)) {
if(is_string($var))
{
if (!preg_match('/^\$user_lang->/', $var)) $var = htmlspecialchars($var);
return $var;
}
@ -88,7 +101,8 @@ class Security
$is_object = is_object($var);
$name0 = array_shift($name);
if(strlen($name0)) {
if(strlen($name0))
{
$target = $is_object ? $var->{$name0} : $var[$name0];
$target = $this->_encodeHTML($target, $name);
@ -100,7 +114,8 @@ class Security
return $var;
}
foreach($var as $key=>$target) {
foreach($var as $key=>$target)
{
$cloned_name = array_slice($name, 0);
$target = $this->_encodeHTML($target, $name);
$name = $cloned_name;
@ -116,3 +131,4 @@ class Security
}
/* End of file : Security.class.php */
/* Location: ./classes/security/Security.class.php */