xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/news.php

Indentation +10 added lines, -10 removed lines

@@ -5,17 +5,17 @@
  */
 class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {
 
-    public $browsable = false;
-    public $may_omit_host = true;
+	public $browsable = false;
+	public $may_omit_host = true;
 
-    public function doValidate(&$uri, $config, $context) {
-        $uri->userinfo = null;
-        $uri->host     = null;
-        $uri->port     = null;
-        $uri->query    = null;
-        // typecode check needed on path
-        return true;
-    }
+	public function doValidate(&$uri, $config, $context) {
+		$uri->userinfo = null;
+		$uri->host     = null;
+		$uri->port     = null;
+		$uri->query    = null;
+		// typecode check needed on path
+		return true;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php

Indentation +7 added lines, -7 removed lines

@@ -5,14 +5,14 @@
  */
 class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {
 
-    public $default_port = 119;
-    public $browsable = false;
+	public $default_port = 119;
+	public $browsable = false;
 
-    public function doValidate(&$uri, $config, $context) {
-        $uri->userinfo = null;
-        $uri->query    = null;
-        return true;
-    }
+	public function doValidate(&$uri, $config, $context) {
+		$uri->userinfo = null;
+		$uri->query    = null;
+		return true;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php

Indentation +50 added lines, -50 removed lines

@@ -6,62 +6,62 @@
 class HTMLPurifier_URISchemeRegistry
 {
 
-    /**
-     * Retrieve sole instance of the registry.
-     * @param $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default registry.
-     * @note Pass a registry object $prototype with a compatible interface and
-     *       the function will copy it and return it all further times.
-     */
-    public static function instance($prototype = null) {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_URISchemeRegistry();
-        }
-        return $instance;
-    }
+	/**
+	 * Retrieve sole instance of the registry.
+	 * @param $prototype Optional prototype to overload sole instance with,
+	 *                   or bool true to reset to default registry.
+	 * @note Pass a registry object $prototype with a compatible interface and
+	 *       the function will copy it and return it all further times.
+	 */
+	public static function instance($prototype = null) {
+		static $instance = null;
+		if ($prototype !== null) {
+			$instance = $prototype;
+		} elseif ($instance === null || $prototype == true) {
+			$instance = new HTMLPurifier_URISchemeRegistry();
+		}
+		return $instance;
+	}
 
-    /**
-     * Cache of retrieved schemes.
-     */
-    protected $schemes = array();
+	/**
+	 * Cache of retrieved schemes.
+	 */
+	protected $schemes = array();
 
-    /**
-     * Retrieves a scheme validator object
-     * @param $scheme String scheme name like http or mailto
-     * @param $config HTMLPurifier_Config object
-     * @param $config HTMLPurifier_Context object
-     */
-    public function getScheme($scheme, $config, $context) {
-        if (!$config) $config = HTMLPurifier_Config::createDefault();
+	/**
+	 * Retrieves a scheme validator object
+	 * @param $scheme String scheme name like http or mailto
+	 * @param $config HTMLPurifier_Config object
+	 * @param $config HTMLPurifier_Context object
+	 */
+	public function getScheme($scheme, $config, $context) {
+		if (!$config) $config = HTMLPurifier_Config::createDefault();
 
-        // important, otherwise attacker could include arbitrary file
-        $allowed_schemes = $config->get('URI.AllowedSchemes');
-        if (!$config->get('URI.OverrideAllowedSchemes') &&
-            !isset($allowed_schemes[$scheme])
-        ) {
-            return;
-        }
+		// important, otherwise attacker could include arbitrary file
+		$allowed_schemes = $config->get('URI.AllowedSchemes');
+		if (!$config->get('URI.OverrideAllowedSchemes') &&
+			!isset($allowed_schemes[$scheme])
+		) {
+			return;
+		}
 
-        if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
-        if (!isset($allowed_schemes[$scheme])) return;
+		if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
+		if (!isset($allowed_schemes[$scheme])) return;
 
-        $class = 'HTMLPurifier_URIScheme_' . $scheme;
-        if (!class_exists($class)) return;
-        $this->schemes[$scheme] = new $class();
-        return $this->schemes[$scheme];
-    }
+		$class = 'HTMLPurifier_URIScheme_' . $scheme;
+		if (!class_exists($class)) return;
+		$this->schemes[$scheme] = new $class();
+		return $this->schemes[$scheme];
+	}
 
-    /**
-     * Registers a custom scheme to the cache, bypassing reflection.
-     * @param $scheme Scheme name
-     * @param $scheme_obj HTMLPurifier_URIScheme object
-     */
-    public function register($scheme, $scheme_obj) {
-        $this->schemes[$scheme] = $scheme_obj;
-    }
+	/**
+	 * Registers a custom scheme to the cache, bypassing reflection.
+	 * @param $scheme Scheme name
+	 * @param $scheme_obj HTMLPurifier_URIScheme object
+	 */
+	public function register($scheme, $scheme_obj) {
+		$this->schemes[$scheme] = $scheme_obj;
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -35,7 +35,9 @@ 
      * @param $config HTMLPurifier_Context object
      */
     public function getScheme($scheme, $config, $context) {
-        if (!$config) $config = HTMLPurifier_Config::createDefault();
+        if (!$config) {
+        	$config = HTMLPurifier_Config::createDefault();
+        }
 
         // important, otherwise attacker could include arbitrary file
         $allowed_schemes = $config->get('URI.AllowedSchemes');
@@ -45,11 +47,17 @@ 
             return;
         }
 
-        if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
-        if (!isset($allowed_schemes[$scheme])) return;
+        if (isset($this->schemes[$scheme])) {
+        	return $this->schemes[$scheme];
+        }
+        if (!isset($allowed_schemes[$scheme])) {
+        	return;
+        }
 
         $class = 'HTMLPurifier_URIScheme_' . $scheme;
-        if (!class_exists($class)) return;
+        if (!class_exists($class)) {
+        	return;
+        }
         $this->schemes[$scheme] = new $class();
         return $this->schemes[$scheme];
     }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
         if (!isset($allowed_schemes[$scheme])) return;
 
-        $class = 'HTMLPurifier_URIScheme_' . $scheme;
+        $class = 'HTMLPurifier_URIScheme_'.$scheme;
         if (!class_exists($class)) return;
         $this->schemes[$scheme] = new $class();
         return $this->schemes[$scheme];

classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php

Indentation +89 added lines, -89 removed lines

@@ -8,95 +8,95 @@
 class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
 {
 
-    protected function parseImplementation($var, $type, $allow_null) {
-        if ($allow_null && $var === null) return null;
-        switch ($type) {
-            // Note: if code "breaks" from the switch, it triggers a generic
-            // exception to be thrown. Specific errors can be specifically
-            // done here.
-            case self::MIXED :
-            case self::ISTRING :
-            case self::STRING :
-            case self::TEXT :
-            case self::ITEXT :
-                return $var;
-            case self::INT :
-                if (is_string($var) && ctype_digit($var)) $var = (int) $var;
-                return $var;
-            case self::FLOAT :
-                if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
-                return $var;
-            case self::BOOL :
-                if (is_int($var) && ($var === 0 || $var === 1)) {
-                    $var = (bool) $var;
-                } elseif (is_string($var)) {
-                    if ($var == 'on' || $var == 'true' || $var == '1') {
-                        $var = true;
-                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {
-                        $var = false;
-                    } else {
-                        throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
-                    }
-                }
-                return $var;
-            case self::ALIST :
-            case self::HASH :
-            case self::LOOKUP :
-                if (is_string($var)) {
-                    // special case: technically, this is an array with
-                    // a single empty string item, but having an empty
-                    // array is more intuitive
-                    if ($var == '') return array();
-                    if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
-                        // simplistic string to array method that only works
-                        // for simple lists of tag names or alphanumeric characters
-                        $var = explode(',',$var);
-                    } else {
-                        $var = preg_split('/(,|[\n\r]+)/', $var);
-                    }
-                    // remove spaces
-                    foreach ($var as $i => $j) $var[$i] = trim($j);
-                    if ($type === self::HASH) {
-                        // key:value,key2:value2
-                        $nvar = array();
-                        foreach ($var as $keypair) {
-                            $c = explode(':', $keypair, 2);
-                            if (!isset($c[1])) continue;
-                            $nvar[trim($c[0])] = trim($c[1]);
-                        }
-                        $var = $nvar;
-                    }
-                }
-                if (!is_array($var)) break;
-                $keys = array_keys($var);
-                if ($keys === array_keys($keys)) {
-                    if ($type == self::ALIST) return $var;
-                    elseif ($type == self::LOOKUP) {
-                        $new = array();
-                        foreach ($var as $key) {
-                            $new[$key] = true;
-                        }
-                        return $new;
-                    } else break;
-                }
-                if ($type === self::ALIST) {
-                    trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
-                    return array_values($var);
-                }
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $key => $value) {
-                        if ($value !== true) {
-                            trigger_error("Lookup array has non-true value at key '$key'; maybe your input array was not indexed numerically", E_USER_WARNING);
-                        }
-                        $var[$key] = true;
-                    }
-                }
-                return $var;
-            default:
-                $this->errorInconsistent(__CLASS__, $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
+	protected function parseImplementation($var, $type, $allow_null) {
+		if ($allow_null && $var === null) return null;
+		switch ($type) {
+			// Note: if code "breaks" from the switch, it triggers a generic
+			// exception to be thrown. Specific errors can be specifically
+			// done here.
+			case self::MIXED :
+			case self::ISTRING :
+			case self::STRING :
+			case self::TEXT :
+			case self::ITEXT :
+				return $var;
+			case self::INT :
+				if (is_string($var) && ctype_digit($var)) $var = (int) $var;
+				return $var;
+			case self::FLOAT :
+				if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
+				return $var;
+			case self::BOOL :
+				if (is_int($var) && ($var === 0 || $var === 1)) {
+					$var = (bool) $var;
+				} elseif (is_string($var)) {
+					if ($var == 'on' || $var == 'true' || $var == '1') {
+						$var = true;
+					} elseif ($var == 'off' || $var == 'false' || $var == '0') {
+						$var = false;
+					} else {
+						throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
+					}
+				}
+				return $var;
+			case self::ALIST :
+			case self::HASH :
+			case self::LOOKUP :
+				if (is_string($var)) {
+					// special case: technically, this is an array with
+					// a single empty string item, but having an empty
+					// array is more intuitive
+					if ($var == '') return array();
+					if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
+						// simplistic string to array method that only works
+						// for simple lists of tag names or alphanumeric characters
+						$var = explode(',',$var);
+					} else {
+						$var = preg_split('/(,|[\n\r]+)/', $var);
+					}
+					// remove spaces
+					foreach ($var as $i => $j) $var[$i] = trim($j);
+					if ($type === self::HASH) {
+						// key:value,key2:value2
+						$nvar = array();
+						foreach ($var as $keypair) {
+							$c = explode(':', $keypair, 2);
+							if (!isset($c[1])) continue;
+							$nvar[trim($c[0])] = trim($c[1]);
+						}
+						$var = $nvar;
+					}
+				}
+				if (!is_array($var)) break;
+				$keys = array_keys($var);
+				if ($keys === array_keys($keys)) {
+					if ($type == self::ALIST) return $var;
+					elseif ($type == self::LOOKUP) {
+						$new = array();
+						foreach ($var as $key) {
+							$new[$key] = true;
+						}
+						return $new;
+					} else break;
+				}
+				if ($type === self::ALIST) {
+					trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);
+					return array_values($var);
+				}
+				if ($type === self::LOOKUP) {
+					foreach ($var as $key => $value) {
+						if ($value !== true) {
+							trigger_error("Lookup array has non-true value at key '$key'; maybe your input array was not indexed numerically", E_USER_WARNING);
+						}
+						$var[$key] = true;
+					}
+				}
+				return $var;
+			default:
+				$this->errorInconsistent(__CLASS__, $type);
+		}
+		$this->errorGeneric($var, $type);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                     if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
                         // simplistic string to array method that only works
                         // for simple lists of tag names or alphanumeric characters
-                        $var = explode(',',$var);
+                        $var = explode(',', $var);
                     } else {
                         $var = preg_split('/(,|[\n\r]+)/', $var);
                     }

Braces +27 added lines, -10 removed lines

@@ -9,7 +9,9 @@ 
 {
 
     protected function parseImplementation($var, $type, $allow_null) {
-        if ($allow_null && $var === null) return null;
+        if ($allow_null && $var === null) {
+        	return null;
+        }
         switch ($type) {
             // Note: if code "breaks" from the switch, it triggers a generic
             // exception to be thrown. Specific errors can be specifically
@@ -21,10 +23,14 @@ 
             case self::ITEXT :
                 return $var;
             case self::INT :
-                if (is_string($var) && ctype_digit($var)) $var = (int) $var;
+                if (is_string($var) && ctype_digit($var)) {
+                	$var = (int) $var;
+                }
                 return $var;
             case self::FLOAT :
-                if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
+                if ((is_string($var) && is_numeric($var)) || is_int($var)) {
+                	$var = (float) $var;
+                }
                 return $var;
             case self::BOOL :
                 if (is_int($var) && ($var === 0 || $var === 1)) {
@@ -46,7 +52,9 @@ 
                     // special case: technically, this is an array with
                     // a single empty string item, but having an empty
                     // array is more intuitive
-                    if ($var == '') return array();
+                    if ($var == '') {
+                    	return array();
+                    }
                     if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
                         // simplistic string to array method that only works
                         // for simple lists of tag names or alphanumeric characters
@@ -55,29 +63,38 @@ 
                         $var = preg_split('/(,|[\n\r]+)/', $var);
                     }
                     // remove spaces
-                    foreach ($var as $i => $j) $var[$i] = trim($j);
+                    foreach ($var as $i => $j) {
+                    	$var[$i] = trim($j);
+                    }
                     if ($type === self::HASH) {
                         // key:value,key2:value2
                         $nvar = array();
                         foreach ($var as $keypair) {
                             $c = explode(':', $keypair, 2);
-                            if (!isset($c[1])) continue;
+                            if (!isset($c[1])) {
+                            	continue;
+                            }
                             $nvar[trim($c[0])] = trim($c[1]);
                         }
                         $var = $nvar;
                     }
                 }
-                if (!is_array($var)) break;
+                if (!is_array($var)) {
+                	break;
+                }
                 $keys = array_keys($var);
                 if ($keys === array_keys($keys)) {
-                    if ($type == self::ALIST) return $var;
-                    elseif ($type == self::LOOKUP) {
+                    if ($type == self::ALIST) {
+                    	return $var;
+                    } elseif ($type == self::LOOKUP) {
                         $new = array();
                         foreach ($var as $key) {
                             $new[$key] = true;
                         }
                         return $new;
-                    } else break;
+                    } else {
+                    	break;
+                    }
                 }
                 if ($type === self::ALIST) {
                     trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING);

classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php

Indentation +11 added lines, -11 removed lines

@@ -8,18 +8,18 @@
 class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
 {
 
-    protected function parseImplementation($var, $type, $allow_null) {
-        return $this->evalExpression($var);
-    }
+	protected function parseImplementation($var, $type, $allow_null) {
+		return $this->evalExpression($var);
+	}
 
-    protected function evalExpression($expr) {
-        $var = null;
-        $result = eval("\$var = $expr;");
-        if ($result === false) {
-            throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
-        }
-        return $var;
-    }
+	protected function evalExpression($expr) {
+		$var = null;
+		$result = eval("\$var = $expr;");
+		if ($result === false) {
+			throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
+		}
+		return $var;
+	}
 
 }
 

classes/xml/XmlGenerator.class.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 							{
 								$body .= $this->_makexml($arrNode);
 							}
-						}
-						else if(is_object($value))
+						} else if(is_object($value))
 						{
 							$body = $this->_makexml($value);
 						}

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 	{
 		$buff = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
 
-		foreach($xml as $nodeName => $nodeItem)
+		foreach ($xml as $nodeName => $nodeItem)
 		{
 			$buff .= $this->_makexml($nodeItem);
 		}
@@ -34,16 +34,16 @@ 
 	function _makexml($node)
 	{
 		$body = '';
-		foreach($node as $key => $value)
+		foreach ($node as $key => $value)
 		{
-			switch($key)
+			switch ($key)
 			{
 				case 'node_name' : break;
 				case 'attrs' : {
 						$attrs = '';
-						if(isset($value))
+						if (isset($value))
 						{
-							foreach($value as $attrName => $attrValue)
+							foreach ($value as $attrName => $attrValue)
 							{
 								$attrs .= sprintf(' %s="%s"', $attrName, htmlspecialchars($attrValue, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 							}
@@ -54,21 +54,21 @@ 
 					$body = $value;
 					break;
 				default : {
-						if(is_array($value))
+						if (is_array($value))
 						{
-							foreach($value as $idx => $arrNode)
+							foreach ($value as $idx => $arrNode)
 							{
 								$body .= $this->_makexml($arrNode);
 							}
 						}
-						else if(is_object($value))
+						else if (is_object($value))
 						{
 							$body = $this->_makexml($value);
 						}
 					}
 			}
 		}
-		return sprintf('<%s%s>%s</%s>' . "\n", $node->node_name, $attrs, $body, $node->node_name);
+		return sprintf('<%s%s>%s</%s>'."\n", $node->node_name, $attrs, $body, $node->node_name);
 	}
 
 }

classes/xml/XmlJsFilter.class.php

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
 		if(!file_exists($this->js_file))
 		{
 			$this->_compile();
-		}
-		else if(filemtime($this->xml_file) > filemtime($this->js_file))
+		} else if(filemtime($this->xml_file) > filemtime($this->js_file))
 		{
 			$this->_compile();
 		}

Spacing +55 added lines, -55 removed lines

@@ -81,7 +81,7 @@ 
 
 	function XmlJsFilter($path, $xml_file)
 	{
-		if(substr($path, -1) !== '/')
+		if (substr($path, -1) !== '/')
 		{
 			$path .= '/';
 		}
@@ -95,15 +95,15 @@ 
 	 */
 	function compile()
 	{
-		if(!file_exists($this->xml_file))
+		if (!file_exists($this->xml_file))
 		{
 			return;
 		}
-		if(!file_exists($this->js_file))
+		if (!file_exists($this->js_file))
 		{
 			$this->_compile();
 		}
-		else if(filemtime($this->xml_file) > filemtime($this->js_file))
+		else if (filemtime($this->xml_file) > filemtime($this->js_file))
 		{
 			$this->_compile();
 		}
@@ -136,25 +136,25 @@ 
 
 
 		$field_node = $xml_obj->filter->form->node;
-		if($field_node && !is_array($field_node))
+		if ($field_node && !is_array($field_node))
 		{
 			$field_node = array($field_node);
 		}
 
 		$parameter_param = $xml_obj->filter->parameter->param;
-		if($parameter_param && !is_array($parameter_param))
+		if ($parameter_param && !is_array($parameter_param))
 		{
 			$parameter_param = array($parameter_param);
 		}
 
 		$response_tag = $xml_obj->filter->response->tag;
-		if($response_tag && !is_array($response_tag))
+		if ($response_tag && !is_array($response_tag))
 		{
 			$response_tag = array($response_tag);
 		}
 
 		// If extend_filter exists, result returned by calling the method
-		if($extend_filter)
+		if ($extend_filter)
 		{
 			// If extend_filter exists, it changes the name of cache not to use cache
 			$this->js_file .= '.nocache.js';
@@ -163,24 +163,24 @@ 
 			list($module_name, $method) = explode('.', $extend_filter);
 
 			// contibue if both module_name and methos exist.
-			if($module_name && $method)
+			if ($module_name && $method)
 			{
 				// get model object of the module
 				$oExtendFilter = getModel($module_name);
 
 				// execute if method exists
-				if(method_exists($oExtendFilter, $method))
+				if (method_exists($oExtendFilter, $method))
 				{
 					// get the result
 					$extend_filter_list = $oExtendFilter->{$method}(TRUE);
 					$extend_filter_count = count($extend_filter_list);
 
 					// apply lang_value from the result to the variable
-					for($i = 0; $i < $extend_filter_count; $i++)
+					for ($i = 0; $i < $extend_filter_count; $i++)
 					{
 						$name = $extend_filter_list[$i]->name;
 						$lang_value = $extend_filter_list[$i]->lang;
-						if($lang_value)
+						if ($lang_value)
 						{
 							$lang->{$name} = $lang_value;
 						}
@@ -200,15 +200,15 @@ 
 		$fields = array();
 
 		// create custom rule
-		if($rules && $rules->rule)
+		if ($rules && $rules->rule)
 		{
-			if(!is_array($rules->rule))
+			if (!is_array($rules->rule))
 			{
 				$rules->rule = array($rules->rule);
 			}
-			foreach($rules->rule as $r)
+			foreach ($rules->rule as $r)
 			{
-				if($r->attrs->type == 'regex')
+				if ($r->attrs->type == 'regex')
 				{
 					$js_rules[] = "v.cast('ADD_RULE', ['{$r->attrs->name}', {$r->body}]);";
 				}
@@ -217,14 +217,14 @@ 
 
 		// generates a field, which is a script of the checked item
 		$node_count = count($field_node);
-		if($node_count)
+		if ($node_count)
 		{
-			foreach($field_node as $key => $node)
+			foreach ($field_node as $key => $node)
 			{
 				$attrs = $node->attrs;
 				$target = trim($attrs->target);
 
-				if(!$target)
+				if (!$target)
 				{
 					continue;
 				}
@@ -234,34 +234,34 @@ 
 
 				$field = array();
 
-				if($attrs->required == 'true')
+				if ($attrs->required == 'true')
 				{
 					$field[] = 'required:true';
 				}
-				if($attrs->minlength > 0)
+				if ($attrs->minlength > 0)
 				{
-					$field[] = 'minlength:' . $attrs->minlength;
+					$field[] = 'minlength:'.$attrs->minlength;
 				}
-				if($attrs->maxlength > 0)
+				if ($attrs->maxlength > 0)
 				{
-					$field[] = 'maxlength:' . $attrs->maxlength;
+					$field[] = 'maxlength:'.$attrs->maxlength;
 				}
-				if($equalto)
+				if ($equalto)
 				{
 					$field[] = "equalto:'{$attrs->equalto}'";
 				}
-				if($rule)
+				if ($rule)
 				{
 					$field[] = "rule:'{$rule}'";
 				}
 
-				$fields[] = "'{$target}': {" . implode(',', $field) . "}";
+				$fields[] = "'{$target}': {".implode(',', $field)."}";
 
-				if(!in_array($target, $target_list))
+				if (!in_array($target, $target_list))
 				{
 					$target_list[] = $target;
 				}
-				if(!$target_type_list[$target])
+				if (!$target_type_list[$target])
 				{
 					$target_type_list[$target] = $filter;
 				}
@@ -271,12 +271,12 @@ 
 		// Check extend_filter_item
 		$rule_types = array('homepage' => 'homepage', 'email_address' => 'email');
 
-		for($i = 0; $i < $extend_filter_count; $i++)
+		for ($i = 0; $i < $extend_filter_count; $i++)
 		{
 			$filter_item = $extend_filter_list[$i];
 			$target = trim($filter_item->name);
 
-			if(!$target)
+			if (!$target)
 			{
 				continue;
 			}
@@ -287,21 +287,21 @@ 
 			$required = ($filter_item->required == 'true');
 
 			$field = array();
-			if($required)
+			if ($required)
 			{
 				$field[] = 'required:true';
 			}
-			if($rule)
+			if ($rule)
 			{
 				$field[] = "rule:'{$rule}'";
 			}
-			$fields[] = "\t\t'{$target}' : {" . implode(',', $field) . "}";
+			$fields[] = "\t\t'{$target}' : {".implode(',', $field)."}";
 
-			if(!in_array($target, $target_list))
+			if (!in_array($target, $target_list))
 			{
 				$target_list[] = $target;
 			}
-			if(!$target_type_list[$target])
+			if (!$target_type_list[$target])
 			{
 				$target_type_list[$target] = $type;
 			}
@@ -310,37 +310,37 @@ 
 		// generates parameter script to create dbata
 		$rename_params = array();
 		$parameter_count = count($parameter_param);
-		if($parameter_count)
+		if ($parameter_count)
 		{
 			// contains parameter of the default filter contents
-			foreach($parameter_param as $key => $param)
+			foreach ($parameter_param as $key => $param)
 			{
 				$attrs = $param->attrs;
 				$name = trim($attrs->name);
 				$target = trim($attrs->target);
 
 				//if($name && $target && ($name != $target)) $js_doc[] = "\t\tparams['{$name}'] = params['{$target}']; delete params['{$target}'];";
-				if($name && $target && ($name != $target))
+				if ($name && $target && ($name != $target))
 				{
 					$rename_params[] = "'{$target}':'{$name}'";
 				}
-				if($name && !in_array($name, $target_list))
+				if ($name && !in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
 			}
 
 			// Check extend_filter_item
-			for($i = 0; $i < $extend_filter_count; $i++)
+			for ($i = 0; $i < $extend_filter_count; $i++)
 			{
 				$filter_item = $extend_filter_list[$i];
 				$target = $name = trim($filter_item->name);
-				if(!$name || !$target)
+				if (!$name || !$target)
 				{
 					continue;
 				}
 
-				if(!in_array($name, $target_list))
+				if (!in_array($name, $target_list))
 				{
 					$target_list[] = $name;
 				}
@@ -350,7 +350,7 @@ 
 		// generates the response script
 		$response_count = count($response_tag);
 		$responses = array();
-		for($i = 0; $i < $response_count; $i++)
+		for ($i = 0; $i < $response_count; $i++)
 		{
 			$attrs = $response_tag[$i]->attrs;
 			$name = $attrs->name;
@@ -359,10 +359,10 @@ 
 
 		// writes lang values of the form field
 		$target_count = count($target_list);
-		for($i = 0; $i < $target_count; $i++)
+		for ($i = 0; $i < $target_count; $i++)
 		{
 			$target = $target_list[$i];
-			if(!$lang->{$target})
+			if (!$lang->{$target})
 			{
 				$lang->{$target} = $target;
 			}
@@ -381,9 +381,9 @@ 
 		 */
 
 		// writes error messages
-		foreach($lang->filter as $key => $val)
+		foreach ($lang->filter as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				$val = $key;
 			}
@@ -392,24 +392,24 @@ 
 		}
 
 		$callback_func = $xml_obj->filter->response->attrs->callback_func;
-		if(!$callback_func)
+		if (!$callback_func)
 		{
 			$callback_func = "filterAlertMessage";
 		}
 
 		$confirm_msg = '';
-		if($confirm_msg_code)
+		if ($confirm_msg_code)
 		{
 			$confirm_msg = $lang->{$confirm_msg_code};
 		}
 
 		$jsdoc = array();
-		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [" . implode(',', $responses) . "], '" . addslashes($confirm_msg) . "', {" . implode(',', $rename_params) . "}) };";
+		$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [".implode(',', $responses)."], '".addslashes($confirm_msg)."', {".implode(',', $rename_params)."}) };";
 		$jsdoc[] = '(function($){';
 		$jsdoc[] = "\tvar v=xe.getApp('validator')[0];if(!v)return false;";
-		$jsdoc[] = "\t" . 'v.cast("ADD_FILTER", ["' . $filter_name . '", {' . implode(',', $fields) . '}]);';
-		$jsdoc[] = "\t" . implode("\n\t", $js_rules);
-		$jsdoc[] = "\t" . implode("\n\t", $js_messages);
+		$jsdoc[] = "\t".'v.cast("ADD_FILTER", ["'.$filter_name.'", {'.implode(',', $fields).'}]);';
+		$jsdoc[] = "\t".implode("\n\t", $js_rules);
+		$jsdoc[] = "\t".implode("\n\t", $js_messages);
 		$jsdoc[] = '})(jQuery);';
 		$jsdoc = implode("\n", $jsdoc);
 
@@ -424,7 +424,7 @@ 
 	 */
 	function _getCompiledFileName($xml_file)
 	{
-		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version . $xml_file), Context::getLangType());
+		return sprintf('%s%s.%s.compiled.js', $this->compiled_path, md5($this->version.$xml_file), Context::getLangType());
 	}
 
 }

classes/xml/xmlquery/queryargument/QueryArgument.class.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 		if(strpos($name, '.') === FALSE)

 		{

 			$this->column_name = $name;

-		}

-		else

+		} else

 		{

 			list($prefix, $name) = explode('.', $name);

 			$this->column_name = $name;

@@ -159,8 +158,7 @@ 
 					, $this->argument_name

 					, $this->argument_name

 			);

-		}

-		else

+		} else

 		{

 			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"

 					, $this->argument_name

Spacing +17 added lines, -17 removed lines

@@ -63,11 +63,11 @@ 
 		static $number_of_arguments = 0;

 

 		$this->argument_name = $tag->attrs->var;

-		if(!$this->argument_name)

+		if (!$this->argument_name)

 		{

 			$this->argument_name = str_replace('.', '_', $tag->attrs->name);

 		}

-		if(!$this->argument_name)

+		if (!$this->argument_name)

 		{

 			$this->argument_name = str_replace('.', '_', $tag->attrs->column);

 		}

@@ -78,11 +78,11 @@ 
 		$this->argument_name .= $number_of_arguments;

 

 		$name = $tag->attrs->name;

-		if(!$name)

+		if (!$name)

 		{

 			$name = $tag->attrs->column;

 		}

-		if(strpos($name, '.') === FALSE)

+		if (strpos($name, '.') === FALSE)

 		{

 			$this->column_name = $name;

 		}

@@ -93,7 +93,7 @@ 
 			$this->table_name = $prefix;

 		}

 

-		if($tag->attrs->operation)

+		if ($tag->attrs->operation)

 		{

 			$this->operation = $tag->attrs->operation;

 		}

@@ -124,7 +124,7 @@ 
 

 	function isConditionArgument()

 	{

-		if($this->operation)

+		if ($this->operation)

 		{

 			return TRUE;

 		}

@@ -137,50 +137,50 @@ 
 	 */

 	function toString()

 	{

-		if($this->isConditionArgument())

+		if ($this->isConditionArgument())

 		{

 			// Instantiation

-			$arg = sprintf("\n" . '${\'%s_argument\'} = new ConditionArgument(\'%s\', %s, \'%s\');' . "\n"

+			$arg = sprintf("\n".'${\'%s_argument\'} = new ConditionArgument(\'%s\', %s, \'%s\');'."\n"

 					, $this->argument_name

 					, $this->variable_name

-					, '$args->' . $this->variable_name

+					, '$args->'.$this->variable_name

 					, $this->operation

 			);

 			// Call methods to validate argument and ensure default value

 			$arg .= $this->argument_validator->toString();

 

 			// Prepare condition string

-			$arg .= sprintf('${\'%s_argument\'}->createConditionValue();' . "\n"

+			$arg .= sprintf('${\'%s_argument\'}->createConditionValue();'."\n"

 					, $this->argument_name

 			);

 

 			// Check that argument passed validation, else return

-			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"

+			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();'."\n"

 					, $this->argument_name

 					, $this->argument_name

 			);

 		}

 		else

 		{

-			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"

+			$arg = sprintf("\n".'${\'%s_argument\'} = new Argument(\'%s\', %s);'."\n"

 					, $this->argument_name

 					, $this->variable_name

-					, $this->ignore_value ? 'NULL' : '$args->{\'' . $this->variable_name . '\'}');

+					, $this->ignore_value ? 'NULL' : '$args->{\''.$this->variable_name.'\'}');

 

 			$arg .= $this->argument_validator->toString();

 

-			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"

+			$arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();'."\n"

 					, $this->argument_name

 					, $this->argument_name

 			);

 		}

 

 		// If the argument is null, skip it

-		if($this->argument_validator->isIgnorable())

+		if ($this->argument_validator->isIgnorable())

 		{

-			$arg = sprintf("if(isset(%s)) {", '$args->' . $this->variable_name)

+			$arg = sprintf("if(isset(%s)) {", '$args->'.$this->variable_name)

 					. $arg

-					. sprintf("} else\n" . '${\'%s_argument\'} = NULL;', $this->argument_name);

+					. sprintf("} else\n".'${\'%s_argument\'} = NULL;', $this->argument_name);

 		}

 

 		return $arg;

classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 		if(isset($this->default_value))

 		{

 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);

-			if($this->default_value->isSequence())

-				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';

+			if($this->default_value->isSequence()) {
+							$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';
+			}
 			if($this->default_value->isOperation())

 			{

 				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
 

 	function isIgnorable()

 	{

-		if(isset($this->default_value) || isset($this->notnull))

+		if (isset($this->default_value) || isset($this->notnull))

 		{

 			return FALSE;

 		}

@@ -83,47 +83,47 @@ 
 	function toString()

 	{

 		$validator = '';

-		if($this->filter)

+		if ($this->filter)

 		{

-			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');' . "\n"

+			$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');'."\n"

 					, $this->argument_name

 					, $this->filter

 			);

 		}

-		if($this->min_length)

+		if ($this->min_length)

 		{

-			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);' . "\n"

+			$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);'."\n"

 					, $this->argument_name

 					, $this->min_length

 			);

 		}

-		if($this->max_length)

+		if ($this->max_length)

 		{

-			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);' . "\n"

+			$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);'."\n"

 					, $this->argument_name

 					, $this->max_length

 			);

 		}

-		if(isset($this->default_value))

+		if (isset($this->default_value))

 		{

 			$this->default_value = new DefaultValue($this->argument_name, $this->default_value);

-			if($this->default_value->isSequence())

+			if ($this->default_value->isSequence())

 				$validator .= '$db = DB::getInstance(); $sequence = $db->getNextSequence(); ';

-			if($this->default_value->isOperation())

+			if ($this->default_value->isOperation())

 			{

-				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"

+				$validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');'."\n"

 						, $this->argument_name

 						, $this->default_value->getOperation()

 				);

 			}

-			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);' . "\n"

+			$validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);'."\n"

 					, $this->argument_name

 					, $this->default_value->toString()

 			);

 		}

-		if($this->notnull)

+		if ($this->notnull)

 		{

-			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();' . "\n"

+			$validator .= sprintf('${\'%s_argument\'}->checkNotNull();'."\n"

 					, $this->argument_name

 			);

 		}