xpressengine / xe-core

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

Doc Comments +3 added lines, -1 removed lines

@@ -15,6 +15,8 @@ 
 
     /**
      * @note Automatically normalizes scheme and port
+     * @param string|null $host
+     * @param integer|null $port
      */
     public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
         $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
@@ -58,7 +60,7 @@ 
      * this URI in order to get it into a compliant form.
      * @param $config Instance of HTMLPurifier_Config
      * @param $context Instance of HTMLPurifier_Context
-     * @return True if validation/filtering succeeds, false if failure
+     * @return boolean if validation/filtering succeeds, false if failure
      */
     public function validate($config, $context) {
 

Indentation +225 added lines, -225 removed lines

@@ -11,231 +11,231 @@
 class HTMLPurifier_URI
 {
 
-    public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
-
-    /**
-     * @note Automatically normalizes scheme and port
-     */
-    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
-        $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
-        $this->userinfo = $userinfo;
-        $this->host = $host;
-        $this->port = is_null($port) ? $port : (int) $port;
-        $this->path = $path;
-        $this->query = $query;
-        $this->fragment = $fragment;
-    }
-
-    /**
-     * Retrieves a scheme object corresponding to the URI's scheme/default
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Scheme object appropriate for validating this URI
-     */
-    public function getSchemeObj($config, $context) {
-        $registry = HTMLPurifier_URISchemeRegistry::instance();
-        if ($this->scheme !== null) {
-            $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
-            if (!$scheme_obj) return false; // invalid scheme, clean it out
-        } else {
-            // no scheme: retrieve the default one
-            $def = $config->getDefinition('URI');
-            $scheme_obj = $def->getDefaultScheme($config, $context);
-            if (!$scheme_obj) {
-                // something funky happened to the default scheme object
-                trigger_error(
-                    'Default scheme object "' . $def->defaultScheme . '" was not readable',
-                    E_USER_WARNING
-                );
-                return false;
-            }
-        }
-        return $scheme_obj;
-    }
-
-    /**
-     * Generic validation method applicable for all schemes. May modify
-     * this URI in order to get it into a compliant form.
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return True if validation/filtering succeeds, false if failure
-     */
-    public function validate($config, $context) {
-
-        // ABNF definitions from RFC 3986
-        $chars_sub_delims = '!$&\'()*+,;=';
-        $chars_gen_delims = ':/?#[]@';
-        $chars_pchar = $chars_sub_delims . ':@';
-
-        // validate host
-        if (!is_null($this->host)) {
-            $host_def = new HTMLPurifier_AttrDef_URI_Host();
-            $this->host = $host_def->validate($this->host, $config, $context);
-            if ($this->host === false) $this->host = null;
-        }
-
-        // validate scheme
-        // NOTE: It's not appropriate to check whether or not this
-        // scheme is in our registry, since a URIFilter may convert a
-        // URI that we don't allow into one we do.  So instead, we just
-        // check if the scheme can be dropped because there is no host
-        // and it is our default scheme.
-        if (!is_null($this->scheme) && is_null($this->host) || $this->host === '') {
-            // support for relative paths is pretty abysmal when the
-            // scheme is present, so axe it when possible
-            $def = $config->getDefinition('URI');
-            if ($def->defaultScheme === $this->scheme) {
-                $this->scheme = null;
-            }
-        }
-
-        // validate username
-        if (!is_null($this->userinfo)) {
-            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
-            $this->userinfo = $encoder->encode($this->userinfo);
-        }
-
-        // validate port
-        if (!is_null($this->port)) {
-            if ($this->port < 1 || $this->port > 65535) $this->port = null;
-        }
-
-        // validate path
-        $path_parts = array();
-        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
-        if (!is_null($this->host)) { // this catches $this->host === ''
-            // path-abempty (hier and relative)
-            // http://www.example.com/my/path
-            // //www.example.com/my/path (looks odd, but works, and
-            //                            recognized by most browsers)
-            // (this set is valid or invalid on a scheme by scheme
-            // basis, so we'll deal with it later)
-            // file:///my/path
-            // ///my/path
-            $this->path = $segments_encoder->encode($this->path);
-        } elseif ($this->path !== '') {
-            if ($this->path[0] === '/') {
-                // path-absolute (hier and relative)
-                // http:/my/path
-                // /my/path
-                if (strlen($this->path) >= 2 && $this->path[1] === '/') {
-                    // This could happen if both the host gets stripped
-                    // out
-                    // http://my/path
-                    // //my/path
-                    $this->path = '';
-                } else {
-                    $this->path = $segments_encoder->encode($this->path);
-                }
-            } elseif (!is_null($this->scheme)) {
-                // path-rootless (hier)
-                // http:my/path
-                // Short circuit evaluation means we don't need to check nz
-                $this->path = $segments_encoder->encode($this->path);
-            } else {
-                // path-noscheme (relative)
-                // my/path
-                // (once again, not checking nz)
-                $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
-                $c = strpos($this->path, '/');
-                if ($c !== false) {
-                    $this->path =
-                        $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
-                        $segments_encoder->encode(substr($this->path, $c));
-                } else {
-                    $this->path = $segment_nc_encoder->encode($this->path);
-                }
-            }
-        } else {
-            // path-empty (hier and relative)
-            $this->path = ''; // just to be safe
-        }
-
-        // qf = query and fragment
-        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-
-        if (!is_null($this->query)) {
-            $this->query = $qf_encoder->encode($this->query);
-        }
-
-        if (!is_null($this->fragment)) {
-            $this->fragment = $qf_encoder->encode($this->fragment);
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Convert URI back to string
-     * @return String URI appropriate for output
-     */
-    public function toString() {
-        // reconstruct authority
-        $authority = null;
-        // there is a rendering difference between a null authority
-        // (http:foo-bar) and an empty string authority
-        // (http:///foo-bar).
-        if (!is_null($this->host)) {
-            $authority = '';
-            if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
-            $authority .= $this->host;
-            if(!is_null($this->port))     $authority .= ':' . $this->port;
-        }
-
-        // Reconstruct the result
-        // One might wonder about parsing quirks from browsers after
-        // this reconstruction.  Unfortunately, parsing behavior depends
-        // on what *scheme* was employed (file:///foo is handled *very*
-        // differently than http:///foo), so unfortunately we have to
-        // defer to the schemes to do the right thing.
-        $result = '';
-        if (!is_null($this->scheme))    $result .= $this->scheme . ':';
-        if (!is_null($authority))       $result .=  '//' . $authority;
-        $result .= $this->path;
-        if (!is_null($this->query))     $result .= '?' . $this->query;
-        if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
-
-        return $result;
-    }
-
-    /**
-     * Returns true if this URL might be considered a 'local' URL given
-     * the current context.  This is true when the host is null, or
-     * when it matches the host supplied to the configuration.
-     *
-     * Note that this does not do any scheme checking, so it is mostly
-     * only appropriate for metadata that doesn't care about protocol
-     * security.  isBenign is probably what you actually want.
-     */
-    public function isLocal($config, $context) {
-        if ($this->host === null) return true;
-        $uri_def = $config->getDefinition('URI');
-        if ($uri_def->host === $this->host) return true;
-        return false;
-    }
-
-    /**
-     * Returns true if this URL should be considered a 'benign' URL,
-     * that is:
-     *
-     *      - It is a local URL (isLocal), and
-     *      - It has a equal or better level of security
-     */
-    public function isBenign($config, $context) {
-        if (!$this->isLocal($config, $context)) return false;
-
-        $scheme_obj = $this->getSchemeObj($config, $context);
-        if (!$scheme_obj) return false; // conservative approach
-
-        $current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
-        if ($current_scheme_obj->secure) {
-            if (!$scheme_obj->secure) {
-                return false;
-            }
-        }
-        return true;
-    }
+	public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
+
+	/**
+	 * @note Automatically normalizes scheme and port
+	 */
+	public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
+		$this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
+		$this->userinfo = $userinfo;
+		$this->host = $host;
+		$this->port = is_null($port) ? $port : (int) $port;
+		$this->path = $path;
+		$this->query = $query;
+		$this->fragment = $fragment;
+	}
+
+	/**
+	 * Retrieves a scheme object corresponding to the URI's scheme/default
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return Scheme object appropriate for validating this URI
+	 */
+	public function getSchemeObj($config, $context) {
+		$registry = HTMLPurifier_URISchemeRegistry::instance();
+		if ($this->scheme !== null) {
+			$scheme_obj = $registry->getScheme($this->scheme, $config, $context);
+			if (!$scheme_obj) return false; // invalid scheme, clean it out
+		} else {
+			// no scheme: retrieve the default one
+			$def = $config->getDefinition('URI');
+			$scheme_obj = $def->getDefaultScheme($config, $context);
+			if (!$scheme_obj) {
+				// something funky happened to the default scheme object
+				trigger_error(
+					'Default scheme object "' . $def->defaultScheme . '" was not readable',
+					E_USER_WARNING
+				);
+				return false;
+			}
+		}
+		return $scheme_obj;
+	}
+
+	/**
+	 * Generic validation method applicable for all schemes. May modify
+	 * this URI in order to get it into a compliant form.
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return True if validation/filtering succeeds, false if failure
+	 */
+	public function validate($config, $context) {
+
+		// ABNF definitions from RFC 3986
+		$chars_sub_delims = '!$&\'()*+,;=';
+		$chars_gen_delims = ':/?#[]@';
+		$chars_pchar = $chars_sub_delims . ':@';
+
+		// validate host
+		if (!is_null($this->host)) {
+			$host_def = new HTMLPurifier_AttrDef_URI_Host();
+			$this->host = $host_def->validate($this->host, $config, $context);
+			if ($this->host === false) $this->host = null;
+		}
+
+		// validate scheme
+		// NOTE: It's not appropriate to check whether or not this
+		// scheme is in our registry, since a URIFilter may convert a
+		// URI that we don't allow into one we do.  So instead, we just
+		// check if the scheme can be dropped because there is no host
+		// and it is our default scheme.
+		if (!is_null($this->scheme) && is_null($this->host) || $this->host === '') {
+			// support for relative paths is pretty abysmal when the
+			// scheme is present, so axe it when possible
+			$def = $config->getDefinition('URI');
+			if ($def->defaultScheme === $this->scheme) {
+				$this->scheme = null;
+			}
+		}
+
+		// validate username
+		if (!is_null($this->userinfo)) {
+			$encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
+			$this->userinfo = $encoder->encode($this->userinfo);
+		}
+
+		// validate port
+		if (!is_null($this->port)) {
+			if ($this->port < 1 || $this->port > 65535) $this->port = null;
+		}
+
+		// validate path
+		$path_parts = array();
+		$segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
+		if (!is_null($this->host)) { // this catches $this->host === ''
+			// path-abempty (hier and relative)
+			// http://www.example.com/my/path
+			// //www.example.com/my/path (looks odd, but works, and
+			//                            recognized by most browsers)
+			// (this set is valid or invalid on a scheme by scheme
+			// basis, so we'll deal with it later)
+			// file:///my/path
+			// ///my/path
+			$this->path = $segments_encoder->encode($this->path);
+		} elseif ($this->path !== '') {
+			if ($this->path[0] === '/') {
+				// path-absolute (hier and relative)
+				// http:/my/path
+				// /my/path
+				if (strlen($this->path) >= 2 && $this->path[1] === '/') {
+					// This could happen if both the host gets stripped
+					// out
+					// http://my/path
+					// //my/path
+					$this->path = '';
+				} else {
+					$this->path = $segments_encoder->encode($this->path);
+				}
+			} elseif (!is_null($this->scheme)) {
+				// path-rootless (hier)
+				// http:my/path
+				// Short circuit evaluation means we don't need to check nz
+				$this->path = $segments_encoder->encode($this->path);
+			} else {
+				// path-noscheme (relative)
+				// my/path
+				// (once again, not checking nz)
+				$segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
+				$c = strpos($this->path, '/');
+				if ($c !== false) {
+					$this->path =
+						$segment_nc_encoder->encode(substr($this->path, 0, $c)) .
+						$segments_encoder->encode(substr($this->path, $c));
+				} else {
+					$this->path = $segment_nc_encoder->encode($this->path);
+				}
+			}
+		} else {
+			// path-empty (hier and relative)
+			$this->path = ''; // just to be safe
+		}
+
+		// qf = query and fragment
+		$qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
+
+		if (!is_null($this->query)) {
+			$this->query = $qf_encoder->encode($this->query);
+		}
+
+		if (!is_null($this->fragment)) {
+			$this->fragment = $qf_encoder->encode($this->fragment);
+		}
+
+		return true;
+
+	}
+
+	/**
+	 * Convert URI back to string
+	 * @return String URI appropriate for output
+	 */
+	public function toString() {
+		// reconstruct authority
+		$authority = null;
+		// there is a rendering difference between a null authority
+		// (http:foo-bar) and an empty string authority
+		// (http:///foo-bar).
+		if (!is_null($this->host)) {
+			$authority = '';
+			if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
+			$authority .= $this->host;
+			if(!is_null($this->port))     $authority .= ':' . $this->port;
+		}
+
+		// Reconstruct the result
+		// One might wonder about parsing quirks from browsers after
+		// this reconstruction.  Unfortunately, parsing behavior depends
+		// on what *scheme* was employed (file:///foo is handled *very*
+		// differently than http:///foo), so unfortunately we have to
+		// defer to the schemes to do the right thing.
+		$result = '';
+		if (!is_null($this->scheme))    $result .= $this->scheme . ':';
+		if (!is_null($authority))       $result .=  '//' . $authority;
+		$result .= $this->path;
+		if (!is_null($this->query))     $result .= '?' . $this->query;
+		if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
+
+		return $result;
+	}
+
+	/**
+	 * Returns true if this URL might be considered a 'local' URL given
+	 * the current context.  This is true when the host is null, or
+	 * when it matches the host supplied to the configuration.
+	 *
+	 * Note that this does not do any scheme checking, so it is mostly
+	 * only appropriate for metadata that doesn't care about protocol
+	 * security.  isBenign is probably what you actually want.
+	 */
+	public function isLocal($config, $context) {
+		if ($this->host === null) return true;
+		$uri_def = $config->getDefinition('URI');
+		if ($uri_def->host === $this->host) return true;
+		return false;
+	}
+
+	/**
+	 * Returns true if this URL should be considered a 'benign' URL,
+	 * that is:
+	 *
+	 *      - It is a local URL (isLocal), and
+	 *      - It has a equal or better level of security
+	 */
+	public function isBenign($config, $context) {
+		if (!$this->isLocal($config, $context)) return false;
+
+		$scheme_obj = $this->getSchemeObj($config, $context);
+		if (!$scheme_obj) return false; // conservative approach
+
+		$current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
+		if ($current_scheme_obj->secure) {
+			if (!$scheme_obj->secure) {
+				return false;
+			}
+		}
+		return true;
+	}
 
 }
 

Braces +41 added lines, -13 removed lines

@@ -36,7 +36,10 @@ 
         $registry = HTMLPurifier_URISchemeRegistry::instance();
         if ($this->scheme !== null) {
             $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
-            if (!$scheme_obj) return false; // invalid scheme, clean it out
+            if (!$scheme_obj) {
+            	return false;
+            }
+            // invalid scheme, clean it out
         } else {
             // no scheme: retrieve the default one
             $def = $config->getDefinition('URI');
@@ -71,7 +74,9 @@ 
         if (!is_null($this->host)) {
             $host_def = new HTMLPurifier_AttrDef_URI_Host();
             $this->host = $host_def->validate($this->host, $config, $context);
-            if ($this->host === false) $this->host = null;
+            if ($this->host === false) {
+            	$this->host = null;
+            }
         }
 
         // validate scheme
@@ -97,7 +102,9 @@ 
 
         // validate port
         if (!is_null($this->port)) {
-            if ($this->port < 1 || $this->port > 65535) $this->port = null;
+            if ($this->port < 1 || $this->port > 65535) {
+            	$this->port = null;
+            }
         }
 
         // validate path
@@ -178,9 +185,13 @@ 
         // (http:///foo-bar).
         if (!is_null($this->host)) {
             $authority = '';
-            if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
+            if(!is_null($this->userinfo)) {
+            	$authority .= $this->userinfo . '@';
+            }
             $authority .= $this->host;
-            if(!is_null($this->port))     $authority .= ':' . $this->port;
+            if(!is_null($this->port)) {
+            	$authority .= ':' . $this->port;
+            }
         }
 
         // Reconstruct the result
@@ -190,11 +201,19 @@ 
         // differently than http:///foo), so unfortunately we have to
         // defer to the schemes to do the right thing.
         $result = '';
-        if (!is_null($this->scheme))    $result .= $this->scheme . ':';
-        if (!is_null($authority))       $result .=  '//' . $authority;
+        if (!is_null($this->scheme)) {
+        	$result .= $this->scheme . ':';
+        }
+        if (!is_null($authority)) {
+        	$result .=  '//' . $authority;
+        }
         $result .= $this->path;
-        if (!is_null($this->query))     $result .= '?' . $this->query;
-        if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
+        if (!is_null($this->query)) {
+        	$result .= '?' . $this->query;
+        }
+        if (!is_null($this->fragment)) {
+        	$result .= '#' . $this->fragment;
+        }
 
         return $result;
     }
@@ -209,9 +228,13 @@ 
      * security.  isBenign is probably what you actually want.
      */
     public function isLocal($config, $context) {
-        if ($this->host === null) return true;
+        if ($this->host === null) {
+        	return true;
+        }
         $uri_def = $config->getDefinition('URI');
-        if ($uri_def->host === $this->host) return true;
+        if ($uri_def->host === $this->host) {
+        	return true;
+        }
         return false;
     }
 
@@ -223,10 +246,15 @@ 
      *      - It has a equal or better level of security
      */
     public function isBenign($config, $context) {
-        if (!$this->isLocal($config, $context)) return false;
+        if (!$this->isLocal($config, $context)) {
+        	return false;
+        }
 
         $scheme_obj = $this->getSchemeObj($config, $context);
-        if (!$scheme_obj) return false; // conservative approach
+        if (!$scheme_obj) {
+        	return false;
+        }
+        // conservative approach
 
         $current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
         if ($current_scheme_obj->secure) {

Spacing +13 added lines, -13 removed lines

@@ -44,7 +44,7 @@ 
             if (!$scheme_obj) {
                 // something funky happened to the default scheme object
                 trigger_error(
-                    'Default scheme object "' . $def->defaultScheme . '" was not readable',
+                    'Default scheme object "'.$def->defaultScheme.'" was not readable',
                     E_USER_WARNING
                 );
                 return false;
@@ -65,7 +65,7 @@ 
         // ABNF definitions from RFC 3986
         $chars_sub_delims = '!$&\'()*+,;=';
         $chars_gen_delims = ':/?#[]@';
-        $chars_pchar = $chars_sub_delims . ':@';
+        $chars_pchar = $chars_sub_delims.':@';
 
         // validate host
         if (!is_null($this->host)) {
@@ -91,7 +91,7 @@ 
 
         // validate username
         if (!is_null($this->userinfo)) {
-            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
+            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims.':');
             $this->userinfo = $encoder->encode($this->userinfo);
         }
 
@@ -102,7 +102,7 @@ 
 
         // validate path
         $path_parts = array();
-        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
+        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar.'/');
         if (!is_null($this->host)) { // this catches $this->host === ''
             // path-abempty (hier and relative)
             // http://www.example.com/my/path
@@ -136,11 +136,11 @@ 
                 // path-noscheme (relative)
                 // my/path
                 // (once again, not checking nz)
-                $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
+                $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims.'@');
                 $c = strpos($this->path, '/');
                 if ($c !== false) {
                     $this->path =
-                        $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
+                        $segment_nc_encoder->encode(substr($this->path, 0, $c)).
                         $segments_encoder->encode(substr($this->path, $c));
                 } else {
                     $this->path = $segment_nc_encoder->encode($this->path);
@@ -152,7 +152,7 @@ 
         }
 
         // qf = query and fragment
-        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
+        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar.'/?');
 
         if (!is_null($this->query)) {
             $this->query = $qf_encoder->encode($this->query);
@@ -178,9 +178,9 @@ 
         // (http:///foo-bar).
         if (!is_null($this->host)) {
             $authority = '';
-            if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
+            if (!is_null($this->userinfo)) $authority .= $this->userinfo.'@';
             $authority .= $this->host;
-            if(!is_null($this->port))     $authority .= ':' . $this->port;
+            if (!is_null($this->port))     $authority .= ':'.$this->port;
         }
 
         // Reconstruct the result
@@ -190,11 +190,11 @@ 
         // differently than http:///foo), so unfortunately we have to
         // defer to the schemes to do the right thing.
         $result = '';
-        if (!is_null($this->scheme))    $result .= $this->scheme . ':';
-        if (!is_null($authority))       $result .=  '//' . $authority;
+        if (!is_null($this->scheme))    $result .= $this->scheme.':';
+        if (!is_null($authority))       $result .= '//'.$authority;
         $result .= $this->path;
-        if (!is_null($this->query))     $result .= '?' . $this->query;
-        if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
+        if (!is_null($this->query))     $result .= '?'.$this->query;
+        if (!is_null($this->fragment))  $result .= '#'.$this->fragment;
 
         return $result;
     }

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

Doc Comments +3 added lines

@@ -109,6 +109,7 @@ 
     /**
      * Actually implements the parsing. Base implementation is to not
      * do anything to $var. Subclasses should overload this!
+     * @param boolean $allow_null
      */
     protected function parseImplementation($var, $type, $allow_null) {
         return $var;
@@ -116,6 +117,7 @@ 
 
     /**
      * Throws an exception.
+     * @param string $msg
      */
     protected function error($msg) {
         throw new HTMLPurifier_VarParserException($msg);
@@ -126,6 +128,7 @@ 
      * @note This should not ever be called. It would be called if we
      *       extend the allowed values of HTMLPurifier_VarParser without
      *       updating subclasses.
+     * @param string $class
      */
     protected function errorInconsistent($class, $type) {
         throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");

Indentation +133 added lines, -133 removed lines

@@ -7,147 +7,147 @@
 class HTMLPurifier_VarParser
 {
 
-    const STRING    = 1;
-    const ISTRING   = 2;
-    const TEXT      = 3;
-    const ITEXT     = 4;
-    const INT       = 5;
-    const FLOAT     = 6;
-    const BOOL      = 7;
-    const LOOKUP    = 8;
-    const ALIST     = 9;
-    const HASH      = 10;
-    const MIXED     = 11;
+	const STRING    = 1;
+	const ISTRING   = 2;
+	const TEXT      = 3;
+	const ITEXT     = 4;
+	const INT       = 5;
+	const FLOAT     = 6;
+	const BOOL      = 7;
+	const LOOKUP    = 8;
+	const ALIST     = 9;
+	const HASH      = 10;
+	const MIXED     = 11;
 
-    /**
-     * Lookup table of allowed types. Mainly for backwards compatibility, but
-     * also convenient for transforming string type names to the integer constants.
-     */
-    static public $types = array(
-        'string'    => self::STRING,
-        'istring'   => self::ISTRING,
-        'text'      => self::TEXT,
-        'itext'     => self::ITEXT,
-        'int'       => self::INT,
-        'float'     => self::FLOAT,
-        'bool'      => self::BOOL,
-        'lookup'    => self::LOOKUP,
-        'list'      => self::ALIST,
-        'hash'      => self::HASH,
-        'mixed'     => self::MIXED
-    );
+	/**
+	 * Lookup table of allowed types. Mainly for backwards compatibility, but
+	 * also convenient for transforming string type names to the integer constants.
+	 */
+	static public $types = array(
+		'string'    => self::STRING,
+		'istring'   => self::ISTRING,
+		'text'      => self::TEXT,
+		'itext'     => self::ITEXT,
+		'int'       => self::INT,
+		'float'     => self::FLOAT,
+		'bool'      => self::BOOL,
+		'lookup'    => self::LOOKUP,
+		'list'      => self::ALIST,
+		'hash'      => self::HASH,
+		'mixed'     => self::MIXED
+	);
 
-    /**
-     * Lookup table of types that are string, and can have aliases or
-     * allowed value lists.
-     */
-    static public $stringTypes = array(
-        self::STRING    => true,
-        self::ISTRING   => true,
-        self::TEXT      => true,
-        self::ITEXT     => true,
-    );
+	/**
+	 * Lookup table of types that are string, and can have aliases or
+	 * allowed value lists.
+	 */
+	static public $stringTypes = array(
+		self::STRING    => true,
+		self::ISTRING   => true,
+		self::TEXT      => true,
+		self::ITEXT     => true,
+	);
 
-    /**
-     * Validate a variable according to type. Throws
-     * HTMLPurifier_VarParserException if invalid.
-     * It may return NULL as a valid type if $allow_null is true.
-     *
-     * @param $var Variable to validate
-     * @param $type Type of variable, see HTMLPurifier_VarParser->types
-     * @param $allow_null Whether or not to permit null as a value
-     * @return Validated and type-coerced variable
-     */
-    final public function parse($var, $type, $allow_null = false) {
-        if (is_string($type)) {
-            if (!isset(HTMLPurifier_VarParser::$types[$type])) {
-                throw new HTMLPurifier_VarParserException("Invalid type '$type'");
-            } else {
-                $type = HTMLPurifier_VarParser::$types[$type];
-            }
-        }
-        $var = $this->parseImplementation($var, $type, $allow_null);
-        if ($allow_null && $var === null) return null;
-        // These are basic checks, to make sure nothing horribly wrong
-        // happened in our implementations.
-        switch ($type) {
-            case (self::STRING):
-            case (self::ISTRING):
-            case (self::TEXT):
-            case (self::ITEXT):
-                if (!is_string($var)) break;
-                if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
-                return $var;
-            case (self::INT):
-                if (!is_int($var)) break;
-                return $var;
-            case (self::FLOAT):
-                if (!is_float($var)) break;
-                return $var;
-            case (self::BOOL):
-                if (!is_bool($var)) break;
-                return $var;
-            case (self::LOOKUP):
-            case (self::ALIST):
-            case (self::HASH):
-                if (!is_array($var)) break;
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
-                } elseif ($type === self::ALIST) {
-                    $keys = array_keys($var);
-                    if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
-                }
-                return $var;
-            case (self::MIXED):
-                return $var;
-            default:
-                $this->errorInconsistent(get_class($this), $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
+	/**
+	 * Validate a variable according to type. Throws
+	 * HTMLPurifier_VarParserException if invalid.
+	 * It may return NULL as a valid type if $allow_null is true.
+	 *
+	 * @param $var Variable to validate
+	 * @param $type Type of variable, see HTMLPurifier_VarParser->types
+	 * @param $allow_null Whether or not to permit null as a value
+	 * @return Validated and type-coerced variable
+	 */
+	final public function parse($var, $type, $allow_null = false) {
+		if (is_string($type)) {
+			if (!isset(HTMLPurifier_VarParser::$types[$type])) {
+				throw new HTMLPurifier_VarParserException("Invalid type '$type'");
+			} else {
+				$type = HTMLPurifier_VarParser::$types[$type];
+			}
+		}
+		$var = $this->parseImplementation($var, $type, $allow_null);
+		if ($allow_null && $var === null) return null;
+		// These are basic checks, to make sure nothing horribly wrong
+		// happened in our implementations.
+		switch ($type) {
+			case (self::STRING):
+			case (self::ISTRING):
+			case (self::TEXT):
+			case (self::ITEXT):
+				if (!is_string($var)) break;
+				if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
+				return $var;
+			case (self::INT):
+				if (!is_int($var)) break;
+				return $var;
+			case (self::FLOAT):
+				if (!is_float($var)) break;
+				return $var;
+			case (self::BOOL):
+				if (!is_bool($var)) break;
+				return $var;
+			case (self::LOOKUP):
+			case (self::ALIST):
+			case (self::HASH):
+				if (!is_array($var)) break;
+				if ($type === self::LOOKUP) {
+					foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
+				} elseif ($type === self::ALIST) {
+					$keys = array_keys($var);
+					if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
+				}
+				return $var;
+			case (self::MIXED):
+				return $var;
+			default:
+				$this->errorInconsistent(get_class($this), $type);
+		}
+		$this->errorGeneric($var, $type);
+	}
 
-    /**
-     * Actually implements the parsing. Base implementation is to not
-     * do anything to $var. Subclasses should overload this!
-     */
-    protected function parseImplementation($var, $type, $allow_null) {
-        return $var;
-    }
+	/**
+	 * Actually implements the parsing. Base implementation is to not
+	 * do anything to $var. Subclasses should overload this!
+	 */
+	protected function parseImplementation($var, $type, $allow_null) {
+		return $var;
+	}
 
-    /**
-     * Throws an exception.
-     */
-    protected function error($msg) {
-        throw new HTMLPurifier_VarParserException($msg);
-    }
+	/**
+	 * Throws an exception.
+	 */
+	protected function error($msg) {
+		throw new HTMLPurifier_VarParserException($msg);
+	}
 
-    /**
-     * Throws an inconsistency exception.
-     * @note This should not ever be called. It would be called if we
-     *       extend the allowed values of HTMLPurifier_VarParser without
-     *       updating subclasses.
-     */
-    protected function errorInconsistent($class, $type) {
-        throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");
-    }
+	/**
+	 * Throws an inconsistency exception.
+	 * @note This should not ever be called. It would be called if we
+	 *       extend the allowed values of HTMLPurifier_VarParser without
+	 *       updating subclasses.
+	 */
+	protected function errorInconsistent($class, $type) {
+		throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");
+	}
 
-    /**
-     * Generic error for if a type didn't work.
-     */
-    protected function errorGeneric($var, $type) {
-        $vtype = gettype($var);
-        $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype");
-    }
+	/**
+	 * Generic error for if a type didn't work.
+	 */
+	protected function errorGeneric($var, $type) {
+		$vtype = gettype($var);
+		$this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype");
+	}
 
-    static public function getTypeName($type) {
-        static $lookup;
-        if (!$lookup) {
-            // Lazy load the alternative lookup table
-            $lookup = array_flip(HTMLPurifier_VarParser::$types);
-        }
-        if (!isset($lookup[$type])) return 'unknown';
-        return $lookup[$type];
-    }
+	static public function getTypeName($type) {
+		static $lookup;
+		if (!$lookup) {
+			// Lazy load the alternative lookup table
+			$lookup = array_flip(HTMLPurifier_VarParser::$types);
+		}
+		if (!isset($lookup[$type])) return 'unknown';
+		return $lookup[$type];
+	}
 
 }
 

Braces +30 added lines, -10 removed lines

@@ -67,7 +67,9 @@ 
             }
         }
         $var = $this->parseImplementation($var, $type, $allow_null);
-        if ($allow_null && $var === null) return null;
+        if ($allow_null && $var === null) {
+        	return null;
+        }
         // These are basic checks, to make sure nothing horribly wrong
         // happened in our implementations.
         switch ($type) {
@@ -75,27 +77,43 @@ 
             case (self::ISTRING):
             case (self::TEXT):
             case (self::ITEXT):
-                if (!is_string($var)) break;
-                if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
+                if (!is_string($var)) {
+                	break;
+                }
+                if ($type == self::ISTRING || $type == self::ITEXT) {
+                	$var = strtolower($var);
+                }
                 return $var;
             case (self::INT):
-                if (!is_int($var)) break;
+                if (!is_int($var)) {
+                	break;
+                }
                 return $var;
             case (self::FLOAT):
-                if (!is_float($var)) break;
+                if (!is_float($var)) {
+                	break;
+                }
                 return $var;
             case (self::BOOL):
-                if (!is_bool($var)) break;
+                if (!is_bool($var)) {
+                	break;
+                }
                 return $var;
             case (self::LOOKUP):
             case (self::ALIST):
             case (self::HASH):
-                if (!is_array($var)) break;
+                if (!is_array($var)) {
+                	break;
+                }
                 if ($type === self::LOOKUP) {
-                    foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
+                    foreach ($var as $k) {
+                    	if ($k !== true) $this->error('Lookup table contains value other than true');
+                    }
                 } elseif ($type === self::ALIST) {
                     $keys = array_keys($var);
-                    if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
+                    if (array_keys($keys) !== $keys) {
+                    	$this->error('Indices for list are not uniform');
+                    }
                 }
                 return $var;
             case (self::MIXED):
@@ -145,7 +163,9 @@ 
             // Lazy load the alternative lookup table
             $lookup = array_flip(HTMLPurifier_VarParser::$types);
         }
-        if (!isset($lookup[$type])) return 'unknown';
+        if (!isset($lookup[$type])) {
+        	return 'unknown';
+        }
         return $lookup[$type];
     }
 

classes/security/UploadFileFilter.class.php

Doc Comments +3 added lines

@@ -5,6 +5,9 @@
 {
 	private static $_block_list = array ('exec', 'system', 'passthru', 'show_source', 'phpinfo', 'fopen', 'file_get_contents', 'file_put_contents', 'fwrite', 'proc_open', 'popen');
 
+	/**
+	 * @param string $file
+	 */
 	public function check($file)
 	{
 		// TODO: 기능개선후 enable

Spacing +11 added lines, -11 removed lines

@@ -3,38 +3,38 @@
 
 class UploadFileFilter
 {
-	private static $_block_list = array ('exec', 'system', 'passthru', 'show_source', 'phpinfo', 'fopen', 'file_get_contents', 'file_put_contents', 'fwrite', 'proc_open', 'popen');
+	private static $_block_list = array('exec', 'system', 'passthru', 'show_source', 'phpinfo', 'fopen', 'file_get_contents', 'file_put_contents', 'fwrite', 'proc_open', 'popen');
 
 	public function check($file)
 	{
 		// TODO: 기능개선후 enable
 
 		return TRUE; // disable
-		if (! $file || ! FileHandler::exists($file)) return TRUE;
-		return self::_check ( $file );
+		if (!$file || !FileHandler::exists($file)) return TRUE;
+		return self::_check($file);
 	}
 
 	private function _check($file)
 	{
-		if (! ($fp = fopen ( $file, 'r' ))) return FALSE;
+		if (!($fp = fopen($file, 'r'))) return FALSE;
 
 		$has_php_tag = FALSE;
 
-		while ( ! feof ( $fp ) )
+		while (!feof($fp))
 		{
-			$content = fread ( $fp, 8192 );
-			if (FALSE === $has_php_tag) $has_php_tag = strpos ( $content, '<?' );
-			foreach ( self::$_block_list as $v )
+			$content = fread($fp, 8192);
+			if (FALSE === $has_php_tag) $has_php_tag = strpos($content, '<?');
+			foreach (self::$_block_list as $v)
 			{
-				if (FALSE !== $has_php_tag && FALSE !== strpos ( $content, $v ))
+				if (FALSE !== $has_php_tag && FALSE !== strpos($content, $v))
 				{
-					fclose ( $fp );
+					fclose($fp);
 					return FALSE;
 				}
 			}
 		}
 
-		fclose ( $fp );
+		fclose($fp);
 
 		return TRUE;
 	}

Braces +9 added lines, -3 removed lines

@@ -10,20 +10,26 @@
 		// TODO: 기능개선후 enable
 
 		return TRUE; // disable
-		if (! $file || ! FileHandler::exists($file)) return TRUE;
+		if (! $file || ! FileHandler::exists($file)) {
+			return TRUE;
+		}
 		return self::_check ( $file );
 	}
 
 	private function _check($file)
 	{
-		if (! ($fp = fopen ( $file, 'r' ))) return FALSE;
+		if (! ($fp = fopen ( $file, 'r' ))) {
+			return FALSE;
+		}
 
 		$has_php_tag = FALSE;
 
 		while ( ! feof ( $fp ) )
 		{
 			$content = fread ( $fp, 8192 );
-			if (FALSE === $has_php_tag) $has_php_tag = strpos ( $content, '<?' );
+			if (FALSE === $has_php_tag) {
+				$has_php_tag = strpos ( $content, '<?' );
+			}
 			foreach ( self::$_block_list as $v )
 			{
 				if (FALSE !== $has_php_tag && FALSE !== strpos ( $content, $v ))

classes/template/TemplateHandler.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 	/**
 	 * constructor
-	 * @return void
+	 * @return string
 	 */
 	public function __construct()
 	{

Indentation +9 added lines, -9 removed lines

@@ -462,7 +462,7 @@ 
 				//parse error
 				if ($error_info['type'] == 4)
 				{
-				    throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
+					throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
 				}
 			}
 			else
@@ -478,7 +478,7 @@ 
 			//parse error
 			if ($error_info['type'] == 4)
 			{
-			    throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
+				throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
 			}
 		}
 
@@ -1023,8 +1023,8 @@ 
 	}
 
 	/**
- 	 * Apply escape option to an expression.
- 	 */
+	 * Apply escape option to an expression.
+	 */
  	private function _applyEscapeOption($str, $escape_option = 'noescape')
  	{
  		switch($escape_option)
@@ -1080,11 +1080,11 @@ 
 	}
 
 	/**
- 	 * Check if a string seems to contain a variable.
- 	 * 
- 	 * @param string $str
- 	 * @return bool
- 	 */
+	 * Check if a string seems to contain a variable.
+	 * 
+	 * @param string $str
+	 * @return bool
+	 */
  	private static function _isVar($str)
  	{
  		return preg_match('@(?<!::|\\\\|(?<!eval\()\')\$([a-z_][a-z0-9_]*)@i', $str) ? true : false;

Braces +31 added lines, -48 removed lines

@@ -106,8 +106,7 @@ 
 			if(!isset($GLOBALS['__TemplateHandlerCalled__']))
 			{
 				$GLOBALS['__TemplateHandlerCalled__'] = 1;
-			}
-			else
+			} else
 			{
 				$GLOBALS['__TemplateHandlerCalled__']++;
 			}
@@ -212,8 +211,7 @@ 
 		{
 			$cache_key = 'template:' . $this->file;
 			$buff = $oCacheHandler->get($cache_key, $latest_mtime);
-		}
-		else
+		} else
 		{
 			if(is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
 			{
@@ -227,8 +225,7 @@ 
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $buff);
-			}
-			else
+			} else
 			{
 				FileHandler::writeFile($this->compiled_file, $buff);
 			}
@@ -313,7 +310,9 @@ 
 			}
 		}
 
-		if($this->config->autoescape === 'on') $this->safeguard = true;
+		if($this->config->autoescape === 'on') {
+			$this->safeguard = true;
+		}
 
 		// replace comments
 		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);
@@ -372,8 +371,7 @@ 
 				{
 					$path = str_replace('@', '', $m[1]);
 					$path = './files/ruleset/' . $path . '.xml';
-				}
-				else if(strpos($m[1], '#') !== FALSE)
+				} else if(strpos($m[1], '#') !== FALSE)
 				{
 					$fileName = str_replace('#', '', $m[1]);
 					$fileName = str_replace('<?php echo ', '', $fileName);
@@ -385,8 +383,7 @@ 
 					list($rulsetFile) = explode('.', $fileName);
 					$autoPath = $module_path . '/ruleset/' . $rulsetFile . '.xml';
 					$m[1] = $rulsetFile;
-				}
-				else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
+				} else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
 				{
 					$module_path = $mm[1];
 					$path = $module_path . '/ruleset/' . $m[1] . '.xml';
@@ -416,10 +413,10 @@ 
 		if(!preg_match('/no-error-return-url="true"/i', $matches[1]))
 		{
 			preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
-			if(!$m3[0])
-				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
-		}
-		else
+			if(!$m3[0]) {
+							$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
+			}
+		} else
 		{
 			$matches[1] = preg_replace('/no-error-return-url="true"/i', '', $matches[1]);
 		}
@@ -464,13 +461,11 @@ 
 				{
 				    throw new Exception("Error Parsing Template - {$error_info['message']} in template file {$this->file}");
 				}
-			}
-			else
+			} else
 			{
 				include(substr($buff, 7));
 			}
-		}
-		else
+		} else
 		{
 			$eval_str = "?>" . $buff;
 			@eval($eval_str);
@@ -596,12 +591,10 @@ 
 									$expr_m[2] .= '=>' . trim($expr_m[3]);
 								}
 								$nodes[$idx - 1] .= "<?php if({$expr_m[1]}&&count({$expr_m[1]}))foreach({$expr_m[1]} as {$expr_m[2]}){ ?>";
-							}
-							elseif($expr_m[4])
+							} elseif($expr_m[4])
 							{
 								$nodes[$idx - 1] .= "<?php for({$expr_m[4]}){ ?>";
-							}
-							elseif($expr_m[5])
+							} elseif($expr_m[5])
 							{
 								$nodes[$idx - 1] .= "<?php while({$expr_m[5]}={$expr_m[6]}){ ?>";
 							}
@@ -616,8 +609,7 @@ 
 				if($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
 				{
 					$nodes[$idx + 1] = $close_php . $nodes[$idx + 1];
-				}
-				else
+				} else
 				{
 					$depth = 1;
 					for($i = $idx + 2; $i < $node_len; $i+=2)
@@ -626,8 +618,7 @@ 
 						if(strpos($nd, $tag) === 1)
 						{
 							$depth++;
-						}
-						elseif(strpos($nd, '/' . $tag) === 1)
+						} elseif(strpos($nd, '/' . $tag) === 1)
 						{
 							$depth--;
 							if(!$depth)
@@ -690,8 +681,7 @@ 
 			{
 				$m[1] = $this->_replaceVar(substr($m[1], 1));
 				return "<?php {$m[1]} ?>";
-			}
-			else
+			} else
 			{
 				// Get escape options.
 				foreach ($this->ignoreEscape as $key => $value)
@@ -708,8 +698,7 @@ 
 				{
 					$m[1] = $mm[1];
 					$filters = array_map('trim', explode_with_escape('|', substr($mm[2], 1)));
-				}
-				else
+				} else
 				{
 					$filters = array();
 				}
@@ -728,13 +717,11 @@ 
 						if (!self::_isVar($filter_option) && !preg_match("/^'.*'$/", $filter_option) && !preg_match('/^".*"$/', $filter_option))
 						{
 							$filter_option = "'" . escape_sqstr($filter_option) . "'";
-						}
-						else
+						} else
 						{
 							$filter_option = self::_replaceVar($filter_option);
 						}
-					}
-					else
+					} else
 					{
 						$filter_option = null;
 					}
@@ -810,8 +797,7 @@ 
 							{
 								$filter_option = $this->_applyEscapeOption($filter_option, 'autoescape');
 								$var = "'<a href=\"' . {$filter_option} . '\">' . {$var} . '</a>'";
-							}
-							else
+							} else
 							{
 								$var = "'<a href=\"' . {$var} . '\">' . {$var} . '</a>'";
 							}
@@ -843,8 +829,7 @@ 
 					}
 				}
 				$attr['target'] = $m[5];
-			}
-			else
+			} else
 			{
 				if(!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
 				{
@@ -923,8 +908,7 @@ 
 							if($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
 							{
 								$result = "Context::loadLang('{$relativeDir}');";
-							}
-							else
+							} else
 							{
 								$result = "require_once('./classes/xml/XmlJsFilter.class.php');\$__xmlFilter=new XmlJsFilter('{$relativeDir}','{$pathinfo['basename']}');\$__xmlFilter->compile();";
 							}
@@ -933,8 +917,7 @@ 
 							if($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
-							}
-							else
+							} else
 							{
 								$metafile = $attr['target'];
 								$result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
@@ -944,8 +927,7 @@ 
 							if($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');";
-							}
-							else
+							} else
 							{
 								$metafile = $attr['target'];
 								$result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
@@ -997,8 +979,7 @@ 
 				if($mm[1] == 'switch')
 				{
 					$m[9] = '';
-				}
-				elseif($mm[1] == 'foreach')
+				} elseif($mm[1] == 'foreach')
 				{
 					$var = preg_replace('/^\s*\(\s*(.+?) .*$/', '$1', $m[8]);
 					$precheck = "if({$var}&&count({$var}))";
@@ -1106,7 +1087,9 @@ 
 
 	function isSafeguard()
 	{
-		if ($this->dbinfo->safeguard === 'Y') return true;
+		if ($this->dbinfo->safeguard === 'Y') {
+			return true;
+		}
 
 		$absPath = str_replace(_XE_PATH_, '', $this->path);
 		$modules = '(addon|admin|adminlogging|autoinstall|board|comment|communication|counter|document|editor|file|importer|install|integration_search|krzip|layout|member|menu|message|module|page|point|poll|rss|seo|session|spamfilter|syndication|tag|trash|widget)';

Spacing +152 added lines, -152 removed lines

@@ -16,7 +16,7 @@ 
 	private $path = NULL; ///< target directory
 	private $filename = NULL; ///< target filename
 	private $file = NULL; ///< target file (fullpath)
-	private $xe_path = NULL;  ///< XpressEngine base path
+	private $xe_path = NULL; ///< XpressEngine base path
 	private $web_path = NULL; ///< tpl file web path
 	private $compiled_file = NULL; ///< tpl file web path
 	private $config = NULL;
@@ -33,11 +33,11 @@ 
 	{
 		ini_set('pcre.jit', "0");
 		$this->xe_path = rtrim(getScriptPath(), '/');
-		$this->compiled_path = _XE_PATH_ . $this->compiled_path;
+		$this->compiled_path = _XE_PATH_.$this->compiled_path;
 		$this->config = new stdClass();
 
 		$this->ignoreEscape = array(
-			'html_content' => function ($m) {
+			'html_content' => function($m) {
 				$list = array(
 					'$content', // 레이아웃 등
 					'$editor', // 에디터 출력
@@ -54,7 +54,7 @@ 
 				);
 				return in_array($m[1], $list);
 			},
-			'url' => function ($m) {
+			'url' => function($m) {
 				$list = array(
 					'getUrl',
 					'getNotEncodedUrl',
@@ -69,7 +69,7 @@ 
 				);
 				return in_array(array_shift(explode('(', $m[1])), $list);
 			},
-			'methods' => function ($m) {
+			'methods' => function($m) {
 				$list = array(
 					'getEditor',
 					'getCommentEditor',
@@ -81,16 +81,16 @@ 
 					'getSignature', // 회원 서명
 					'printExtraImages', // new, file 아이콘 등
 				);
-				return preg_match('/\-\>(' . implode('|', $list) . ')\(/', $m[1]);
+				return preg_match('/\-\>('.implode('|', $list).')\(/', $m[1]);
 			},
-			'functions' => function ($m) {
+			'functions' => function($m) {
 				$list = array(
 					'htmlspecialchars',
 					'nl2br',
 				);
-				return preg_match('/^(' . implode('|', $list) . ')\(/', $m[1]);
+				return preg_match('/^('.implode('|', $list).')\(/', $m[1]);
 			},
-			'lang' => function ($m) {
+			'lang' => function($m) {
 				// 다국어
 				return preg_match('/^\$lang\-\>/', trim($m[1]));
 			}
@@ -107,9 +107,9 @@ 
 	{
 		static $oTemplate = NULL;
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
-			if(!isset($GLOBALS['__TemplateHandlerCalled__']))
+			if (!isset($GLOBALS['__TemplateHandlerCalled__']))
 			{
 				$GLOBALS['__TemplateHandlerCalled__'] = 1;
 			}
@@ -119,7 +119,7 @@ 
 			}
 		}
 
-		if(!$oTemplate)
+		if (!$oTemplate)
 		{
 			$oTemplate = new TemplateHandler();
 		}
@@ -137,23 +137,23 @@ 
 	protected function init($tpl_path, $tpl_filename, $tpl_file = '')
 	{
 		// verify arguments
-		if(substr($tpl_path, -1) != '/')
+		if (substr($tpl_path, -1) != '/')
 		{
 			$tpl_path .= '/';
 		}
-		if(!is_dir($tpl_path))
+		if (!is_dir($tpl_path))
 		{
 			return;
 		}
-		if(!file_exists($tpl_path . $tpl_filename) && file_exists($tpl_path . $tpl_filename . '.html'))
+		if (!file_exists($tpl_path.$tpl_filename) && file_exists($tpl_path.$tpl_filename.'.html'))
 		{
 			$tpl_filename .= '.html';
 		}
 
 		// create tpl_file variable
-		if(!$tpl_file)
+		if (!$tpl_file)
 		{
-			$tpl_file = $tpl_path . $tpl_filename;
+			$tpl_file = $tpl_path.$tpl_filename;
 		}
 
 		// set template file infos.
@@ -161,10 +161,10 @@ 
 		$this->filename = $tpl_filename;
 		$this->file = $tpl_file;
 
-		$this->web_path = $this->xe_path . '/' . ltrim(preg_replace('@^' . preg_quote(_XE_PATH_, '@') . '|\./@', '', $this->path), '/');
+		$this->web_path = $this->xe_path.'/'.ltrim(preg_replace('@^'.preg_quote(_XE_PATH_, '@').'|\./@', '', $this->path), '/');
 
 		// get compiled file name
-		$hash = md5($this->file . __XE_VERSION__);
+		$hash = md5($this->file.__XE_VERSION__);
 		$this->compiled_file = "{$this->compiled_path}{$hash}.compiled.php";
 
 		$this->safeguard = $this->isSafeguard();
@@ -187,7 +187,7 @@ 
 		$buff = false;
 
 		// store the starting time for debug information
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -196,13 +196,13 @@ 
 		$this->init($tpl_path, $tpl_filename, $tpl_file);
 
 		// if target file does not exist exit
-		if(!$this->file || !file_exists($this->file))
+		if (!$this->file || !file_exists($this->file))
 		{
 			return "Err : '{$this->file}' template file does not exists.";
 		}
 
 		// for backward compatibility
-		if(is_null(self::$rootTpl))
+		if (is_null(self::$rootTpl))
 		{
 			self::$rootTpl = $this->file;
 		}
@@ -214,23 +214,23 @@ 
 		$oCacheHandler = CacheHandler::getInstance('template');
 
 		// get cached buff
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'template:' . $this->file;
+			$cache_key = 'template:'.$this->file;
 			$buff = $oCacheHandler->get($cache_key, $latest_mtime);
 		}
 		else
 		{
-			if(is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
+			if (is_readable($this->compiled_file) && filemtime($this->compiled_file) > $latest_mtime && filesize($this->compiled_file))
 			{
-				$buff = 'file://' . $this->compiled_file;
+				$buff = 'file://'.$this->compiled_file;
 			}
 		}
 
-		if($buff === FALSE)
+		if ($buff === FALSE)
 		{
 			$buff = $this->parse();
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $buff);
 			}
@@ -242,13 +242,13 @@ 
 
 		$output = $this->_fetch($buff);
 
-		if($__templatehandler_root_tpl == $this->file)
+		if ($__templatehandler_root_tpl == $this->file)
 		{
 			$__templatehandler_root_tpl = null;
 		}
 
 		// store the ending time for debug information
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
 		}
@@ -267,7 +267,7 @@ 
 		$this->init($tpl_path, $tpl_filename, null);
 
 		// if target file does not exist exit
-		if(!$this->file || !file_exists($this->file))
+		if (!$this->file || !file_exists($this->file))
 		{
 			Context::close();
 			exit("Cannot find the template file: '{$this->file}'");
@@ -283,9 +283,9 @@ 
 	 */
 	protected function parse($buff = null)
 	{
-		if(is_null($buff))
+		if (is_null($buff))
 		{
-			if(!is_readable($this->file))
+			if (!is_readable($this->file))
 			{
 				return;
 			}
@@ -295,7 +295,7 @@ 
 		}
 
 		// HTML tags to skip
-		if(is_null($this->skipTags))
+		if (is_null($this->skipTags))
 		{
 			$this->skipTags = array('marquee');
 		}
@@ -305,13 +305,13 @@ 
 		$this->config = new stdClass();
 		$this->config->autoescape = null;
 
-		if(preg_match('/\<config( [^\>\/]+)/', $buff, $config_match))
+		if (preg_match('/\<config( [^\>\/]+)/', $buff, $config_match))
 		{
-			if(preg_match_all('@ (?<name>\w+)="(?<value>[^"]+)"@', $config_match[1], $config_matches, PREG_SET_ORDER))
+			if (preg_match_all('@ (?<name>\w+)="(?<value>[^"]+)"@', $config_match[1], $config_matches, PREG_SET_ORDER))
 			{
-				foreach($config_matches as $config_match)
+				foreach ($config_matches as $config_match)
 				{
-					if($config_match['name'] === 'autoescape')
+					if ($config_match['name'] === 'autoescape')
 					{
 						$this->config->autoescape = $config_match['value'];
 					}
@@ -319,7 +319,7 @@ 
 			}
 		}
 
-		if($this->config->autoescape === 'on') $this->safeguard = true;
+		if ($this->config->autoescape === 'on') $this->safeguard = true;
 
 		// replace comments
 		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);
@@ -338,13 +338,13 @@ 
 
 		// form auto generation
 		$temp = preg_replace_callback('/(<form(?:<\?php.+?\?>|[^<>]+)*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff);
-		if($temp)
+		if ($temp)
 		{
 			$buff = $temp;
 		}
 
 		// prevent from calling directly before writing into file
-		$buff = '<?php if(!defined("__XE__"))exit;?>' . $buff;
+		$buff = '<?php if(!defined("__XE__"))exit;?>'.$buff;
 
 		// remove php script reopening
 		$buff = preg_replace(array('/(\n|\r\n)+/', '/(;)?( )*\?\>\<\?php([\n\t ]+)?/'), array("\n", ";\n"), $buff);
@@ -367,40 +367,40 @@ 
 	private function _compileFormAuthGeneration($matches)
 	{
 		// form ruleset attribute move to hidden tag
-		if($matches[1])
+		if ($matches[1])
 		{
 			preg_match('/ruleset="([^"]*?)"/is', $matches[1], $m);
-			if($m[0])
+			if ($m[0])
 			{
-				$matches[1] = preg_replace('/' . addcslashes($m[0], '?$') . '/i', '', $matches[1]);
+				$matches[1] = preg_replace('/'.addcslashes($m[0], '?$').'/i', '', $matches[1]);
 
-				if(strpos($m[1], '@') !== FALSE)
+				if (strpos($m[1], '@') !== FALSE)
 				{
 					$path = str_replace('@', '', $m[1]);
-					$path = './files/ruleset/' . $path . '.xml';
+					$path = './files/ruleset/'.$path.'.xml';
 				}
-				else if(strpos($m[1], '#') !== FALSE)
+				else if (strpos($m[1], '#') !== FALSE)
 				{
 					$fileName = str_replace('#', '', $m[1]);
 					$fileName = str_replace('<?php echo ', '', $fileName);
 					$fileName = str_replace(' ?>', '', $fileName);
-					$path = '#./files/ruleset/' . $fileName . '.xml';
+					$path = '#./files/ruleset/'.$fileName.'.xml';
 
 					preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm);
 					$module_path = $mm[1];
 					list($rulsetFile) = explode('.', $fileName);
-					$autoPath = $module_path . '/ruleset/' . $rulsetFile . '.xml';
+					$autoPath = $module_path.'/ruleset/'.$rulsetFile.'.xml';
 					$m[1] = $rulsetFile;
 				}
-				else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
+				else if (preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm))
 				{
 					$module_path = $mm[1];
-					$path = $module_path . '/ruleset/' . $m[1] . '.xml';
+					$path = $module_path.'/ruleset/'.$m[1].'.xml';
 				}
 
-				$matches[2] = '<input type="hidden" name="ruleset" value="' . $m[1] . '" />' . $matches[2];
+				$matches[2] = '<input type="hidden" name="ruleset" value="'.$m[1].'" />'.$matches[2];
 				//assign to addJsFile method for js dynamic recache
-				$matches[1] = '<?php Context::addJsFile("' . $path . '", FALSE, "", 0, "body", TRUE, "' . $autoPath . '") ?' . '>' . $matches[1];
+				$matches[1] = '<?php Context::addJsFile("'.$path.'", FALSE, "", 0, "body", TRUE, "'.$autoPath.'") ?'.'>'.$matches[1];
 			}
 		}
 
@@ -408,22 +408,22 @@ 
 		preg_match_all('/<input[^>]* name="(act|mid|vid)"/is', $matches[2], $m2);
 		$checkVar = array('act', 'mid', 'vid');
 		$resultArray = array_diff($checkVar, $m2[1]);
-		if(is_array($resultArray))
+		if (is_array($resultArray))
 		{
 			$generatedHidden = '';
-			foreach($resultArray AS $key => $value)
+			foreach ($resultArray AS $key => $value)
 			{
-				$generatedHidden .= '<input type="hidden" name="' . $value . '" value="<?php echo $__Context->' . $value . ' ?>" />';
+				$generatedHidden .= '<input type="hidden" name="'.$value.'" value="<?php echo $__Context->'.$value.' ?>" />';
 			}
-			$matches[2] = $generatedHidden . $matches[2];
+			$matches[2] = $generatedHidden.$matches[2];
 		}
 
 		// return url generate
-		if(!preg_match('/no-error-return-url="true"/i', $matches[1]))
+		if (!preg_match('/no-error-return-url="true"/i', $matches[1]))
 		{
 			preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
-			if(!$m3[0])
-				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />' . $matches[2];
+			if (!$m3[0])
+				$matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo htmlspecialchars(getRequestUriByServerEnviroment(), ENT_COMPAT | ENT_HTML401, \'UTF-8\', false) ?>" />'.$matches[2];
 		}
 		else
 		{
@@ -441,7 +441,7 @@ 
 	 */
 	private function _fetch($buff)
 	{
-		if(!$buff)
+		if (!$buff)
 		{
 			return;
 		}
@@ -449,20 +449,20 @@ 
 		$__Context = &$GLOBALS['__Context__'];
 		$__Context->tpl_path = $this->path;
 
-		if($_SESSION['is_logged'])
+		if ($_SESSION['is_logged'])
 		{
 			$__Context->logged_info = Context::get('logged_info');
 		}
 
 		$level = ob_get_level();
 		ob_start();
-		if(substr($buff, 0, 7) == 'file://')
+		if (substr($buff, 0, 7) == 'file://')
 		{
-			if(__DEBUG__)
+			if (__DEBUG__)
 			{
 				//load cache file from disk
 				$eval_str = FileHandler::readFile(substr($buff, 7));
-				$eval_str_buffed = "?>" . $eval_str;
+				$eval_str_buffed = "?>".$eval_str;
 				@eval($eval_str_buffed);
 				$error_info = error_get_last();
 				//parse error
@@ -478,7 +478,7 @@ 
 		}
 		else
 		{
-			$eval_str = "?>" . $buff;
+			$eval_str = "?>".$buff;
 			@eval($eval_str);
 			$error_info = error_get_last();
 			//parse error
@@ -507,31 +507,31 @@ 
 	private function _replacePath($match)
 	{
 		//return origin conde when src value started '${'.
-		if(preg_match('@^\${@', $match[1]))
+		if (preg_match('@^\${@', $match[1]))
 		{
 			return $match[0];
 		}
 
 		//return origin code when src value include variable.
-		if(preg_match('@^[\'|"]\s*\.\s*\$@', $match[1]))
+		if (preg_match('@^[\'|"]\s*\.\s*\$@', $match[1]))
 		{
 			return $match[0];
 		}
 
 		$src = preg_replace('@^(\./)+@', '', trim($match[1]));
 
-		$src = $this->web_path . $src;
+		$src = $this->web_path.$src;
 		$src = str_replace('/./', '/', $src);
 
 		// for backward compatibility
 		$src = preg_replace('@/((?:[\w-]+/)+)\1@', '/\1', $src);
 
-		while(($tmp = preg_replace('@[^/]+/\.\./@', '', $src, 1)) !== $src)
+		while (($tmp = preg_replace('@[^/]+/\.\./@', '', $src, 1)) !== $src)
 		{
 			$src = $tmp;
 		}
 
-		return substr($match[0], 0, -strlen($match[1]) - 6) . "src=\"{$src}\"";
+		return substr($match[0], 0, -strlen($match[1]) - 6)."src=\"{$src}\"";
 	}
 
 	/**
@@ -541,19 +541,19 @@ 
 	 */
 	private function _parseInline($buff)
 	{
-		if(!preg_match_all('/<([a-zA-Z]+\d?)(?:\s)/', $buff, $match))
+		if (!preg_match_all('/<([a-zA-Z]+\d?)(?:\s)/', $buff, $match))
 		{
 			return $buff;
 		}
 
 		$tags = array_diff(array_unique($match[1]), $this->skipTags);
 
-		if(!count($tags))
+		if (!count($tags))
 		{
 			return $buff;
 		}
 
-		$tags = '(?:' . implode('|', $tags) . ')';
+		$tags = '(?:'.implode('|', $tags).')';
 		$split_regex = "@(<(?>/?{$tags})(?>[^<>\{\}\"']+|<!--.*?-->|{[^}]+}|\".*?\"|'.*?'|.)*?>)@s";
 
 		$nodes = preg_split($split_regex, $buff, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -561,14 +561,14 @@ 
 		// list of self closing tags
 		$self_closing = array('area' => 1, 'base' => 1, 'basefont' => 1, 'br' => 1, 'hr' => 1, 'input' => 1, 'img' => 1, 'link' => 1, 'meta' => 1, 'param' => 1, 'frame' => 1, 'col' => 1);
 
-		for($idx = 1, $node_len = count($nodes); $idx < $node_len; $idx+=2)
+		for ($idx = 1, $node_len = count($nodes); $idx < $node_len; $idx += 2)
 		{
-			if(!($node = $nodes[$idx]))
+			if (!($node = $nodes[$idx]))
 			{
 				continue;
 			}
 
-			if(preg_match_all('@\s(loop|cond)="([^"]+)"@', $node, $matches))
+			if (preg_match_all('@\s(loop|cond)="([^"]+)"@', $node, $matches))
 			{
 				// this tag
 				$tag = substr($node, 1, strpos($node, ' ') - 1);
@@ -577,37 +577,37 @@ 
 				$closing = 0;
 
 				// process opening tag
-				foreach($matches[1] as $n => $stmt)
+				foreach ($matches[1] as $n => $stmt)
 				{
 					$expr = $matches[2][$n];
 					$expr = $this->_replaceVar($expr);
 					$closing++;
 
-					switch($stmt)
+					switch ($stmt)
 					{
 						case 'cond':
 							$nodes[$idx - 1] .= "<?php if({$expr}){ ?>";
 							break;
 						case 'loop':
-							if(!preg_match('@^(?:(.+?)=>(.+?)(?:,(.+?))?|(.*?;.*?;.*?)|(.+?)\s*=\s*(.+?))$@', $expr, $expr_m))
+							if (!preg_match('@^(?:(.+?)=>(.+?)(?:,(.+?))?|(.*?;.*?;.*?)|(.+?)\s*=\s*(.+?))$@', $expr, $expr_m))
 							{
 								break;
 							}
-							if($expr_m[1])
+							if ($expr_m[1])
 							{
 								$expr_m[1] = trim($expr_m[1]);
 								$expr_m[2] = trim($expr_m[2]);
-								if($expr_m[3])
+								if ($expr_m[3])
 								{
-									$expr_m[2] .= '=>' . trim($expr_m[3]);
+									$expr_m[2] .= '=>'.trim($expr_m[3]);
 								}
 								$nodes[$idx - 1] .= "<?php if({$expr_m[1]}&&count({$expr_m[1]}))foreach({$expr_m[1]} as {$expr_m[2]}){ ?>";
 							}
-							elseif($expr_m[4])
+							elseif ($expr_m[4])
 							{
 								$nodes[$idx - 1] .= "<?php for({$expr_m[4]}){ ?>";
 							}
-							elseif($expr_m[5])
+							elseif ($expr_m[5])
 							{
 								$nodes[$idx - 1] .= "<?php while({$expr_m[5]}={$expr_m[6]}){ ?>";
 							}
@@ -617,28 +617,28 @@ 
 				$node = preg_replace('@\s(loop|cond)="([^"]+)"@', '', $node);
 
 				// find closing tag
-				$close_php = '<?php ' . str_repeat('}', $closing) . ' ?>';
+				$close_php = '<?php '.str_repeat('}', $closing).' ?>';
 				//  self closing tag
-				if($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
+				if ($node{1} == '!' || substr($node, -2, 1) == '/' || isset($self_closing[$tag]))
 				{
-					$nodes[$idx + 1] = $close_php . $nodes[$idx + 1];
+					$nodes[$idx + 1] = $close_php.$nodes[$idx + 1];
 				}
 				else
 				{
 					$depth = 1;
-					for($i = $idx + 2; $i < $node_len; $i+=2)
+					for ($i = $idx + 2; $i < $node_len; $i += 2)
 					{
 						$nd = $nodes[$i];
-						if(strpos($nd, $tag) === 1)
+						if (strpos($nd, $tag) === 1)
 						{
 							$depth++;
 						}
-						elseif(strpos($nd, '/' . $tag) === 1)
+						elseif (strpos($nd, '/'.$tag) === 1)
 						{
 							$depth--;
-							if(!$depth)
+							if (!$depth)
 							{
-								$nodes[$i - 1] .= $nodes[$i] . $close_php;
+								$nodes[$i - 1] .= $nodes[$i].$close_php;
 								$nodes[$i] = '';
 								break;
 							}
@@ -647,13 +647,13 @@ 
 				}
 			}
 
-			if(strpos($node, '|cond="') !== false)
+			if (strpos($node, '|cond="') !== false)
 			{
 				$node = preg_replace('@(\s[-\w:]+(?:="[^"]+?")?)\|cond="(.+?)"@s', '<?php if($2){ ?>$1<?php } ?>', $node);
 				$node = $this->_replaceVar($node);
 			}
 
-			if($nodes[$idx] != $node)
+			if ($nodes[$idx] != $node)
 			{
 				$nodes[$idx] = $node;
 			}
@@ -674,7 +674,7 @@ 
 	{
 		$escape_option = 'noescape';
 
-		if($this->safeguard)
+		if ($this->safeguard)
 		{
 			$escape_option = 'autoescape';
 		}
@@ -685,14 +685,14 @@ 
 		}
 
 		// {@ ... } or {$var} or {func(...)}
-		if($m[1])
+		if ($m[1])
 		{
-			if(preg_match('@^(\w+)\(@', $m[1], $mm) && !function_exists($mm[1]))
+			if (preg_match('@^(\w+)\(@', $m[1], $mm) && !function_exists($mm[1]))
 			{
 				return $m[0];
 			}
 			
-			if($m[1]{0} == '@')
+			if ($m[1]{0} == '@')
 			{
 				$m[1] = $this->_replaceVar(substr($m[1], 1));
 				return "<?php {$m[1]} ?>";
@@ -702,7 +702,7 @@ 
 				// Get escape options.
 				foreach ($this->ignoreEscape as $key => $value)
 				{
-					if($this->ignoreEscape[$key]($m))
+					if ($this->ignoreEscape[$key]($m))
 					{
 						$escape_option = 'noescape';
 						break;
@@ -733,7 +733,7 @@ 
 						$filter_option = $matches[2];
 						if (!self::_isVar($filter_option) && !preg_match("/^'.*'$/", $filter_option) && !preg_match('/^".*"$/', $filter_option))
 						{
-							$filter_option = "'" . escape_sqstr($filter_option) . "'";
+							$filter_option = "'".escape_sqstr($filter_option)."'";
 						}
 						else
 						{
@@ -832,18 +832,18 @@ 
 				}
 
 				// Apply the escape option and return.
-				return '<?php echo ' . $this->_applyEscapeOption($var, $escape_option) . ' ?>';
+				return '<?php echo '.$this->_applyEscapeOption($var, $escape_option).' ?>';
 			}
 		}
 
-		if($m[3])
+		if ($m[3])
 		{
 			$attr = array();
-			if($m[5])
+			if ($m[5])
 			{
-				if(preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm))
+				if (preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm))
 				{
-					foreach($mm[1] as $idx => $name)
+					foreach ($mm[1] as $idx => $name)
 					{
 						$attr[$name] = $mm[2][$idx];
 					}
@@ -852,21 +852,21 @@ 
 			}
 			else
 			{
-				if(!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
+				if (!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm))
 				{
 					return $m[0];
 				}
-				foreach($mm[1] as $idx => $name)
+				foreach ($mm[1] as $idx => $name)
 				{
 					$attr[$name] = $mm[2][$idx];
 				}
 			}
 
-			switch($m[3])
+			switch ($m[3])
 			{
 				// <!--#include--> or <include ..>
 				case 'include':
-					if(!$this->file || !$attr['target'])
+					if (!$this->file || !$attr['target'])
 					{
 						return '';
 					}
@@ -874,7 +874,7 @@ 
 					$pathinfo = pathinfo($attr['target']);
 					$fileDir = $this->_getRelativeDir($pathinfo['dirname']);
 
-					if(!$fileDir)
+					if (!$fileDir)
 					{
 						return '';
 					}
@@ -884,7 +884,7 @@ 
 				case 'load_js_plugin':
 					$plugin = $this->_replaceVar($m[5]);
 					$s = "<!--#JSPLUGIN:{$plugin}-->";
-					if(strpos($plugin, '$__Context') === false)
+					if (strpos($plugin, '$__Context') === false)
 					{
 						$plugin = "'{$plugin}'";
 					}
@@ -900,13 +900,13 @@ 
 					$doUnload = ($m[3] === 'unload');
 					$isRemote = !!preg_match('@^(https?:)?//@i', $attr['target']);
 
-					if(!$isRemote)
+					if (!$isRemote)
 					{
-						if(!preg_match('@^\.?/@', $attr['target']))
+						if (!preg_match('@^\.?/@', $attr['target']))
 						{
-							$attr['target'] = './' . $attr['target'];
+							$attr['target'] = './'.$attr['target'];
 						}
-						if(substr($attr['target'], -5) == '/lang')
+						if (substr($attr['target'], -5) == '/lang')
 						{
 							$pathinfo['dirname'] .= '/lang';
 							$pathinfo['basename'] = '';
@@ -915,18 +915,18 @@ 
 
 						$relativeDir = $this->_getRelativeDir($pathinfo['dirname']);
 
-						$attr['target'] = $relativeDir . '/' . $pathinfo['basename'];
+						$attr['target'] = $relativeDir.'/'.$pathinfo['basename'];
 					}
 
-					switch($pathinfo['extension'])
+					switch ($pathinfo['extension'])
 					{
 						case 'xml':
-							if($isRemote || $doUnload)
+							if ($isRemote || $doUnload)
 							{
 								return '';
 							}
 							// language file?
-							if($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
+							if ($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'], -5) == '/lang')
 							{
 								$result = "Context::loadLang('{$relativeDir}');";
 							}
@@ -936,7 +936,7 @@ 
 							}
 							break;
 						case 'js':
-							if($doUnload)
+							if ($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
 							}
@@ -947,7 +947,7 @@ 
 							}
 							break;
 						case 'css':
-							if($doUnload)
+							if ($doUnload)
 							{
 								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');";
 							}
@@ -960,20 +960,20 @@ 
 					}
 
 					$result = "<?php {$result} ?>";
-					if($metafile)
+					if ($metafile)
 					{
-						$result = "<!--#Meta:{$metafile}-->" . $result;
+						$result = "<!--#Meta:{$metafile}-->".$result;
 					}
 
 					return $result;
 				// <config ...>
 				case 'config':
 					$result = '';
-					if(preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $config_matches, PREG_SET_ORDER))
+					if (preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $config_matches, PREG_SET_ORDER))
 					{
-						foreach($config_matches as $config_match)
+						foreach ($config_matches as $config_match)
 						{
-							$result .= "\$this->config->{$config_match[1]} = '" . trim(strtolower($config_match[2])) . "';";
+							$result .= "\$this->config->{$config_match[1]} = '".trim(strtolower($config_match[2]))."';";
 						}
 					}
 					return "<?php {$result} ?>";
@@ -981,45 +981,45 @@ 
 		}
 
 		// <!--@..--> such as <!--@if($cond)-->, <!--@else-->, <!--@end-->
-		if($m[7])
+		if ($m[7])
 		{
 			$m[7] = substr($m[7], 1);
-			if(!$m[7])
+			if (!$m[7])
 			{
-				return '<?php ' . $this->_replaceVar($m[8]) . '{ ?>' . $m[9];
+				return '<?php '.$this->_replaceVar($m[8]).'{ ?>'.$m[9];
 			}
-			if(!preg_match('/^(?:((?:end)?(?:if|switch|for(?:each)?|while)|end)|(else(?:if)?)|(break@)?(case|default)|(break))$/', $m[7], $mm))
+			if (!preg_match('/^(?:((?:end)?(?:if|switch|for(?:each)?|while)|end)|(else(?:if)?)|(break@)?(case|default)|(break))$/', $m[7], $mm))
 			{
 				return '';
 			}
-			if($mm[1])
+			if ($mm[1])
 			{
-				if($mm[1]{0} == 'e')
+				if ($mm[1]{0} == 'e')
 				{
-					return '<?php } ?>' . $m[9];
+					return '<?php } ?>'.$m[9];
 				}
 
 				$precheck = '';
-				if($mm[1] == 'switch')
+				if ($mm[1] == 'switch')
 				{
 					$m[9] = '';
 				}
-				elseif($mm[1] == 'foreach')
+				elseif ($mm[1] == 'foreach')
 				{
 					$var = preg_replace('/^\s*\(\s*(.+?) .*$/', '$1', $m[8]);
 					$precheck = "if({$var}&&count({$var}))";
 				}
-				return '<?php ' . $this->_replaceVar($precheck . $m[7] . $m[8]) . '{ ?>' . $m[9];
+				return '<?php '.$this->_replaceVar($precheck.$m[7].$m[8]).'{ ?>'.$m[9];
 			}
-			if($mm[2])
+			if ($mm[2])
 			{
-				return "<?php }{$m[7]}" . $this->_replaceVar($m[8]) . "{ ?>" . $m[9];
+				return "<?php }{$m[7]}".$this->_replaceVar($m[8])."{ ?>".$m[9];
 			}
-			if($mm[4])
+			if ($mm[4])
 			{
-				return "<?php " . ($mm[3] ? 'break;' : '') . "{$m[7]} " . trim($m[8], '()') . ": ?>" . $m[9];
+				return "<?php ".($mm[3] ? 'break;' : '')."{$m[7]} ".trim($m[8], '()').": ?>".$m[9];
 			}
-			if($mm[5])
+			if ($mm[5])
 			{
 				return "<?php break; ?>";
 			}
@@ -1033,7 +1033,7 @@ 
  	 */
  	private function _applyEscapeOption($str, $escape_option = 'noescape')
  	{
- 		switch($escape_option)
+ 		switch ($escape_option)
  		{
  			case 'escape':
  				return "escape({$str}, true)";
@@ -1057,30 +1057,30 @@ 
 		$_path = $path;
 
 		$fileDir = strtr(realpath($this->path), '\\', '/');
-		if($path{0} != '/')
+		if ($path{0} != '/')
 		{
-			$path = strtr(realpath($fileDir . '/' . $path), '\\', '/');
+			$path = strtr(realpath($fileDir.'/'.$path), '\\', '/');
 		}
 
 		// for backward compatibility
-		if(!$path)
+		if (!$path)
 		{
 			$dirs = explode('/', $fileDir);
 			$paths = explode('/', $_path);
 			$idx = array_search($paths[0], $dirs);
 
-			if($idx !== false)
+			if ($idx !== false)
 			{
-				while($dirs[$idx] && $dirs[$idx] === $paths[0])
+				while ($dirs[$idx] && $dirs[$idx] === $paths[0])
 				{
 					array_splice($dirs, $idx, 1);
 					array_shift($paths);
 				}
-				$path = strtr(realpath($fileDir . '/' . implode('/', $paths)), '\\', '/');
+				$path = strtr(realpath($fileDir.'/'.implode('/', $paths)), '\\', '/');
 			}
 		}
 
-		$path = preg_replace('/^' . preg_quote(_XE_PATH_, '/') . '/', '', $path);
+		$path = preg_replace('/^'.preg_quote(_XE_PATH_, '/').'/', '', $path);
 
 		return $path;
 	}
@@ -1103,7 +1103,7 @@ 
 	 */
 	function _replaceVar($php)
 	{
-		if(!strlen($php))
+		if (!strlen($php))
 		{
 			return '';
 		}
@@ -1118,7 +1118,7 @@ 
 		$modules = '(addon|admin|adminlogging|autoinstall|board|comment|communication|counter|document|editor|file|importer|install|integration_search|krzip|layout|member|menu|message|module|page|point|poll|rss|seo|session|spamfilter|syndication|tag|trash|widget)';
 
 		// admin, common layout
-		if(preg_match('/^(\.\/)?(modules\/' . $modules . '|common)\/tpl\//', $absPath))
+		if (preg_match('/^(\.\/)?(modules\/'.$modules.'|common)\/tpl\//', $absPath))
 		{
 			return true;
 		}

classes/validator/Validator.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -239,7 +239,7 @@ 
 
 	/**
 	 * Validate the fields. If the fields aren't passed, validation will be execute on the Context variables.
-	 * @param array $fields Target fields. The keys of the array represents field's name, its values represents field's value.
+	 * @param array $fields_ Target fields. The keys of the array represents field's name, its values represents field's value.
 	 * @return boolean TRUE if it is valid, FALSE otherwise.
 	 */
 	function validate($fields_ = null)
@@ -456,7 +456,7 @@ 
 
 	/**
 	 * Log an error
-	 * @param $msg error message
+	 * @param string $msg error message
 	 * @return boolean always false
 	 */
 	function error($field, $msg)

Braces +15 added lines, -26 removed lines

@@ -81,8 +81,9 @@ 
 		$this->_filters = array();
 		$this->_xml_ruleset = NULL;
 
-		if($xml_path)
-			$this->load($xml_path);
+		if($xml_path) {
+					$this->load($xml_path);
+		}
 
 		// predefined rules
 		$this->addRule(array(
@@ -247,8 +248,7 @@ 
 		if(is_array($fields_))
 		{
 			$fields = $fields_;
-		}
-		else
+		} else
 		{
 			$args = array_keys($this->_filters);
 			$fields = (array) Context::getRequestVars();
@@ -281,13 +281,11 @@ 
 			if($key{0} == '^')
 			{
 				$names = preg_grep('/^' . preg_quote(substr($key, 1)) . '/', $field_names);
-			}
-			elseif(substr($key, -2) == '[]')
+			} elseif(substr($key, -2) == '[]')
 			{
 				$filters[substr($key, 0, -2)] = $filter;
 				unset($filters[$key]);
-			}
-			else
+			} else
 			{
 				$filters[$key] = $filter;
 			}
@@ -313,8 +311,7 @@ 
 			{
 				$exists = array_key_exists($matches[1], $fields);
 				$value = $exists ? $fields[$matches[1]][$matches[2]] : NULL;
-			}
-			else
+			} else
 			{
 				$exists = array_key_exists($key, $fields);
 				$value = $exists ? $fields[$fname] : NULL;
@@ -325,8 +322,7 @@ 
 				if(!isset($value[tmp_name]))
 				{
 					$value = implode('', $value);
-				}
-				else
+				} else
 				{
 					$value = $value['name'];
 				}
@@ -356,8 +352,7 @@ 
 				if(is_null($fields_))
 				{
 					Context::set($fname, $value);
-				}
-				else
+				} else
 				{
 					$fields_[$fname] = $value;
 				}
@@ -464,8 +459,7 @@ 
 		if(isset($this->_message[$msg]))
 		{
 			$msg = $this->_message[$msg];
-		}
-		else
+		} else
 		{
 			$lang_filter = Context::getLang('filter');
 			$msg = isset($lang_filter->{$msg}) ? $lang_filter->{$msg} : $lang_filter->invalid;
@@ -474,8 +468,7 @@ 
 		if(isset($this->_fieldNames[$field]))
 		{
 			$fieldName = $this->_fieldNames[$field];
-		}
-		else
+		} else
 		{
 			$fieldName = Context::getLang($field);
 		}
@@ -507,8 +500,7 @@ 
 		if(is_array($name))
 		{
 			$args = $name;
-		}
-		else
+		} else
 		{
 			$args = array($name => $rule);
 		}
@@ -555,8 +547,7 @@ 
 		if(is_array($name))
 		{
 			$args = $name;
-		}
-		else
+		} else
 		{
 			$args = array($name => $filter);
 		}
@@ -577,8 +568,7 @@ 
 					{
 						$filter['if'] = array($filter['if']);
 					}
-				}
-				else
+				} else
 				{
 					unset($filter['if']);
 				}
@@ -753,8 +743,7 @@ 
 			{
 				$field_lang = addslashes($filter['title']);
 				$messages[] = "v.cast('ADD_MESSAGE',['{$name}','{$field_lang}']);";
-			}
-			elseif(isset($lang->{$name}))
+			} elseif(isset($lang->{$name}))
 			{
 				$field_lang = addslashes($lang->{$name});
 				$messages[] = "v.cast('ADD_MESSAGE',['{$name}','{$field_lang}']);";

Spacing +104 added lines, -104 removed lines

@@ -81,7 +81,7 @@ 
 		$this->_filters = array();
 		$this->_xml_ruleset = NULL;
 
-		if($xml_path)
+		if ($xml_path)
 			$this->load($xml_path);
 
 		// predefined rules
@@ -96,7 +96,7 @@ 
 		));
 
 		$this->_has_mb_func = is_callable('mb_strlen');
-		$this->setCacheDir(_XE_PATH_ . 'files/cache');
+		$this->setCacheDir(_XE_PATH_.'files/cache');
 	}
 
 	/**
@@ -119,32 +119,32 @@ 
 		$this->_xml_ruleset = NULL;
 
 		$xml_path = realpath($xml_path);
-		if(!is_readable($xml_path))
+		if (!is_readable($xml_path))
 		{
 			return FALSE;
 		}
 
 		$parser = new XmlParser();
 		$xml = $parser->loadXmlFile($xml_path);
-		if(!isset($xml->ruleset) || !isset($xml->ruleset->fields) || !isset($xml->ruleset->fields->field))
+		if (!isset($xml->ruleset) || !isset($xml->ruleset->fields) || !isset($xml->ruleset->fields->field))
 		{
 			return FALSE;
 		}
 
 		// custom rules
-		if(isset($xml->ruleset->customrules) && isset($xml->ruleset->customrules->rule))
+		if (isset($xml->ruleset->customrules) && isset($xml->ruleset->customrules->rule))
 		{
 			$customrules = $xml->ruleset->customrules->rule;
-			if(!is_array($customrules))
+			if (!is_array($customrules))
 			{
 				$customrules = array($customrules);
 			}
 
 			$rules = array();
 			$messages = array();
-			foreach($customrules as $rule)
+			foreach ($customrules as $rule)
 			{
-				if(!isset($rule->attrs) || !isset($rule->attrs->name))
+				if (!isset($rule->attrs) || !isset($rule->attrs->name))
 				{
 					continue;
 				}
@@ -156,12 +156,12 @@ 
 				unset($rule['name']);
 
 				$rules[$name] = $rule;
-				if(isset($message))
+				if (isset($message))
 				{
-					$messages['invalid_' . $name] = $message;
+					$messages['invalid_'.$name] = $message;
 				}
 			}
-			if(count($rules))
+			if (count($rules))
 			{
 				$this->addRule($rules);
 			}
@@ -169,19 +169,19 @@ 
 
 		// filters
 		$fields = $xml->ruleset->fields->field;
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			$fields = array($fields);
 		}
 
 		$filters = array();
 		$fieldsNames = array();
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			$name = '';
 			$filter = array();
 
-			if(!isset($field->attrs) || !isset($field->attrs->name))
+			if (!isset($field->attrs) || !isset($field->attrs->name))
 			{
 				continue;
 			}
@@ -191,7 +191,7 @@ 
 			$filter['title'] = $title;
 
 			$name = $filter['name'];
-			if(isset($title))
+			if (isset($title))
 			{
 				$fieldsNames[$name] = $title;
 			}
@@ -199,14 +199,14 @@ 
 			unset($filter['name']);
 
 			// conditional statement
-			if(isset($field->if))
+			if (isset($field->if))
 			{
 				$if = $field->if;
-				if(!is_array($if))
+				if (!is_array($if))
 				{
 					$if = array($if);
 				}
-				foreach($if as $idx => $cond)
+				foreach ($if as $idx => $cond)
 				{
 					$if[$idx] = (array) $cond->attrs;
 				}
@@ -232,7 +232,7 @@ 
 	 */
 	function setCacheDir($cache_dir)
 	{
-		if(is_dir($cache_dir))
+		if (is_dir($cache_dir))
 		{
 			$this->_cache_dir = preg_replace('@/$@', '', $cache_dir);
 		}
@@ -245,7 +245,7 @@ 
 	 */
 	function validate($fields_ = null)
 	{
-		if(is_array($fields_))
+		if (is_array($fields_))
 		{
 			$fields = $fields_;
 		}
@@ -255,7 +255,7 @@ 
 			$fields = (array) Context::getRequestVars();
 		}
 
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			return TRUE;
 		}
@@ -276,14 +276,14 @@ 
 		$filters = array();
 
 		// get field names matching patterns
-		foreach($this->_filters as $key => $filter)
+		foreach ($this->_filters as $key => $filter)
 		{
 			$names = array();
-			if($key{0} == '^')
+			if ($key{0} == '^')
 			{
-				$names = preg_grep('/^' . preg_quote(substr($key, 1)) . '/', $field_names);
+				$names = preg_grep('/^'.preg_quote(substr($key, 1)).'/', $field_names);
 			}
-			elseif(substr($key, -2) == '[]')
+			elseif (substr($key, -2) == '[]')
 			{
 				$filters[substr($key, 0, -2)] = $filter;
 				unset($filters[$key]);
@@ -293,24 +293,24 @@ 
 				$filters[$key] = $filter;
 			}
 
-			if(!count($names))
+			if (!count($names))
 			{
 				continue;
 			}
 
-			foreach($names as $name)
+			foreach ($names as $name)
 			{
 				$filters[$name] = $filter;
 			}
 			unset($filters[$key]);
 		}
 
-		foreach($filters as $key => $filter)
+		foreach ($filters as $key => $filter)
 		{
 			$fname = preg_replace('/\[\]$/', '', $key);
 			$filter = array_merge($filter_default, $filter);
 
-			if(preg_match("/(^[a-z_]*)[\[](?:\'|\")?([a-z_]*)(?:\'|\")?[\]]$/i", $key, $matches))
+			if (preg_match("/(^[a-z_]*)[\[](?:\'|\")?([a-z_]*)(?:\'|\")?[\]]$/i", $key, $matches))
 			{
 				$exists = array_key_exists($matches[1], $fields);
 				$value = $exists ? $fields[$matches[1]][$matches[2]] : NULL;
@@ -321,9 +321,9 @@ 
 				$value = $exists ? $fields[$fname] : NULL;
 			}
 
-			if(is_array($value))
+			if (is_array($value))
 			{
-				if(!isset($value[tmp_name]))
+				if (!isset($value[tmp_name]))
 				{
 					$value = implode('', $value);
 				}
@@ -334,9 +334,9 @@ 
 			}
 
 			// conditional statement
-			foreach($filter['if'] as $cond)
+			foreach ($filter['if'] as $cond)
 			{
-				if(!isset($cond['test']) || !isset($cond['attr']))
+				if (!isset($cond['test']) || !isset($cond['attr']))
 				{
 					continue;
 				}
@@ -344,17 +344,17 @@ 
 				$func_body = preg_replace('/\\$(\w+)/', '$c[\'$1\']', $cond['test']);
 				$func = create_function('$c', "return !!({$func_body});");
 
-				if($func($fields))
+				if ($func($fields))
 				{
 					$filter[$cond['attr']] = $cond['value'];
 				}
 			}
 
 			// attr : default
-			if(!$value && strlen($default = trim($filter['default'])))
+			if (!$value && strlen($default = trim($filter['default'])))
 			{
 				$value = $default;
-				if(is_null($fields_))
+				if (is_null($fields_))
 				{
 					Context::set($fname, $value);
 				}
@@ -366,25 +366,25 @@ 
 			$value_len = strlen($value);
 
 			// attr : modifier
-			if(is_string($modifiers = $filter['modifiers']))
+			if (is_string($modifiers = $filter['modifiers']))
 			{
 				$modifiers = explode(',', trim($modifiers));
 			}
 
 			// attr : required
-			if($filter['required'] === 'true' && !$value_len)
+			if ($filter['required'] === 'true' && !$value_len)
 			{
 				return $this->error($key, 'isnull');
 			}
 
 			// if the field wasn't passed, ignore this value
-			if(!$exists && !$value_len)
+			if (!$exists && !$value_len)
 			{
 				continue;
 			}
 
 			// attr : length
-			if($length = $filter['length'])
+			if ($length = $filter['length'])
 			{
 				list($min, $max) = explode(':', trim($length));
 				$is_min_b = (substr($min, -1) === 'b');
@@ -392,41 +392,41 @@ 
 				list($min, $max) = array((int) $min, (int) $max);
 
 				$strbytes = strlen($value);
-				if(!$is_min_b || !$is_max_b)
+				if (!$is_min_b || !$is_max_b)
 				{
 					$strlength = $this->_has_mb_func ? mb_strlen($value, 'utf-8') : $this->mbStrLen($value);
 				}
 
-				if(($min && $min > ($is_min_b ? $strbytes : $strlength)) || ($max && $max < ($is_max_b ? $strbytes : $strlength)))
+				if (($min && $min > ($is_min_b ? $strbytes : $strlength)) || ($max && $max < ($is_max_b ? $strbytes : $strlength)))
 				{
 					return $this->error($key, 'outofrange');
 				}
 			}
 
 			// equalto
-			if($equalto = $filter['equalto'])
+			if ($equalto = $filter['equalto'])
 			{
-				if(!array_key_exists($equalto, $fields) || trim($fields[$equalto]) !== $value)
+				if (!array_key_exists($equalto, $fields) || trim($fields[$equalto]) !== $value)
 				{
 					return $this->error($key, 'equalto');
 				}
 			}
 
 			// rules
-			if($rules = $filter['rule'])
+			if ($rules = $filter['rule'])
 			{
 				$rules = explode(',', $rules);
-				foreach($rules as $rule)
+				foreach ($rules as $rule)
 				{
 					$result = $this->applyRule($rule, $value);
 					// apply the 'not' modifier
-					if(in_array('not', $modifiers))
+					if (in_array('not', $modifiers))
 					{
 						$result = !$result;
 					}
-					if(!$result)
+					if (!$result)
 					{
-						return $this->error($key, 'invalid_' . $rule);
+						return $this->error($key, 'invalid_'.$rule);
 					}
 				}
 			}
@@ -442,12 +442,12 @@ 
 	 */
 	function arrayTrim($array)
 	{
-		if(!is_array($array))
+		if (!is_array($array))
 		{
 			return trim($array);
 		}
 
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
 			$array[$key] = $this->arrayTrim($value);
 		}
@@ -462,7 +462,7 @@ 
 	 */
 	function error($field, $msg)
 	{
-		if(isset($this->_message[$msg]))
+		if (isset($this->_message[$msg]))
 		{
 			$msg = $this->_message[$msg];
 		}
@@ -472,7 +472,7 @@ 
 			$msg = isset($lang_filter->{$msg}) ? $lang_filter->{$msg} : $lang_filter->invalid;
 		}
 
-		if(isset($this->_fieldNames[$field]))
+		if (isset($this->_fieldNames[$field]))
 		{
 			$fieldName = $this->_fieldNames[$field];
 		}
@@ -505,7 +505,7 @@ 
 	 */
 	function addRule($name, $rule = '')
 	{
-		if(is_array($name))
+		if (is_array($name))
 		{
 			$args = $name;
 		}
@@ -514,18 +514,18 @@ 
 			$args = array($name => $rule);
 		}
 
-		foreach($args as $name => $rule)
+		foreach ($args as $name => $rule)
 		{
-			if(!$rule)
+			if (!$rule)
 			{
 				continue;
 			}
-			if(is_string($rule))
+			if (is_string($rule))
 			{
 				$rule = array('type' => 'regex', 'test' => $rule);
 			}
 
-			if($rule['type'] == 'enum')
+			if ($rule['type'] == 'enum')
 			{
 				$delim = isset($rule['delim']) ? $rule['delim'] : ',';
 				$rule['test'] = explode($delim, $rule['test']);
@@ -553,7 +553,7 @@ 
 	 */
 	function addFilter($name, $filter = '')
 	{
-		if(is_array($name))
+		if (is_array($name))
 		{
 			$args = $name;
 		}
@@ -562,19 +562,19 @@ 
 			$args = array($name => $filter);
 		}
 
-		foreach($args as $name => $filter)
+		foreach ($args as $name => $filter)
 		{
-			if(!$filter)
+			if (!$filter)
 			{
 				continue;
 			}
 
-			if(isset($filter['if']))
+			if (isset($filter['if']))
 			{
-				if(is_array($filter['if']) && count($filter['if']))
+				if (is_array($filter['if']) && count($filter['if']))
 				{
 					$key = key($filter['if']);
-					if(!is_int($key))
+					if (!is_int($key))
 					{
 						$filter['if'] = array($filter['if']);
 					}
@@ -609,21 +609,21 @@ 
 	{
 		$rule = $this->_rules[$name];
 
-		if(is_array($value) && isset($value['tmp_name']))
+		if (is_array($value) && isset($value['tmp_name']))
 		{
 			$value = $value['name'];
 		}
 
-		switch($rule['type'])
+		switch ($rule['type'])
 		{
 			case 'regex':
 				return (preg_match($rule['test'], $value) > 0);
 			case 'enum':
 				return in_array($value, $rule['test']);
 			case 'expr':
-				if(!$rule['func_test'])
+				if (!$rule['func_test'])
 				{
-					$rule['func_test'] = create_function('$a', 'return (' . preg_replace('/\$\$/', '$a', html_entity_decode($rule['test'])) . ');');
+					$rule['func_test'] = create_function('$a', 'return ('.preg_replace('/\$\$/', '$a', html_entity_decode($rule['test'])).');');
 				}
 				return $rule['func_test']($value);
 		}
@@ -639,7 +639,7 @@ 
 	function mbStrLen($str)
 	{
 		$arr = count_chars($str);
-		for($i = 0x80; $i < 0xc0; $i++)
+		for ($i = 0x80; $i < 0xc0; $i++)
 		{
 			unset($arr[$i]);
 		}
@@ -652,17 +652,17 @@ 
 	 */
 	function getJsPath()
 	{
-		if(!$this->_cache_dir)
+		if (!$this->_cache_dir)
 		{
 			return FALSE;
 		}
 
-		$dir = $this->_cache_dir . '/ruleset';
-		if(!is_dir($dir) && !mkdir($dir))
+		$dir = $this->_cache_dir.'/ruleset';
+		if (!is_dir($dir) && !mkdir($dir))
 		{
 			return FALSE;
 		}
-		if(!$this->_xml_path)
+		if (!$this->_xml_path)
 		{
 			return FALSE;
 		}
@@ -671,14 +671,14 @@ 
 		$lang_type = class_exists('Context', false) ? Context::getLangType() : 'en';
 
 		// check the file
-		$filepath = $dir . '/' . md5($this->_version . ' ' . $this->_xml_path) . ".{$lang_type}.js";
-		if(is_readable($filepath) && filemtime($filepath) > filemtime($this->_xml_path))
+		$filepath = $dir.'/'.md5($this->_version.' '.$this->_xml_path).".{$lang_type}.js";
+		if (is_readable($filepath) && filemtime($filepath) > filemtime($this->_xml_path))
 		{
 			return $filepath;
 		}
 
 		$content = $this->_compile2js();
-		if($content === FALSE)
+		if ($content === FALSE)
 		{
 			return FALSE;
 		}
@@ -699,9 +699,9 @@ 
 		$ruleset = basename($this->_xml_path, '.xml');
 		$content = array();
 
-		if(preg_match('@(^|/)files/ruleset/\w+\.xml$@i', $this->_xml_path))
+		if (preg_match('@(^|/)files/ruleset/\w+\.xml$@i', $this->_xml_path))
 		{
-			$ruleset = '@' . $ruleset;
+			$ruleset = '@'.$ruleset;
 		}
 
 		list($ruleset) = explode('.', $ruleset);
@@ -711,22 +711,22 @@ 
 
 		// custom rulesets
 		$addrules = array();
-		foreach($this->_rules as $name => $rule)
+		foreach ($this->_rules as $name => $rule)
 		{
 			$name = strtolower($name);
 
-			if(in_array($name, array('email', 'userid', 'url', 'alpha', 'alpha_number', 'number', 'float')))
+			if (in_array($name, array('email', 'userid', 'url', 'alpha', 'alpha_number', 'number', 'float')))
 			{
 				continue;
 			}
 
-			switch($rule['type'])
+			switch ($rule['type'])
 			{
 				case 'regex':
 					$addrules[] = "v.cast('ADD_RULE', ['{$name}', {$rule['test']}]);";
 					break;
 				case 'enum':
-					$enums = '"' . implode('","', $rule['test']) . '"';
+					$enums = '"'.implode('","', $rule['test']).'"';
 					$addrules[] = "v.cast('ADD_RULE', ['{$name}', function($$){ return ($.inArray($$,[{$enums}]) > -1); }]);";
 					break;
 				case 'expr':
@@ -735,7 +735,7 @@ 
 			}
 
 			// if have a message, add message
-			if(isset($rule['message']))
+			if (isset($rule['message']))
 			{
 				$text = preg_replace('@\r?\n@', '\\n', addslashes($rule['message']));
 				$addrules[] = "v.cast('ADD_MESSAGE',['invalid_{$name}','{$text}']);";
@@ -746,79 +746,79 @@ 
 		// filters
 		$content = array();
 		$messages = array();
-		foreach($this->_filters as $name => $filter)
+		foreach ($this->_filters as $name => $filter)
 		{
 			$field = array();
 
 			// form filed name
-			if(isset($filter['title']))
+			if (isset($filter['title']))
 			{
 				$field_lang = addslashes($filter['title']);
 				$messages[] = "v.cast('ADD_MESSAGE',['{$name}','{$field_lang}']);";
 			}
-			elseif(isset($lang->{$name}))
+			elseif (isset($lang->{$name}))
 			{
 				$field_lang = addslashes($lang->{$name});
 				$messages[] = "v.cast('ADD_MESSAGE',['{$name}','{$field_lang}']);";
 			}
 
-			if($filter['required'] == 'true')
+			if ($filter['required'] == 'true')
 			{
 				$field[] = 'required:true';
 			}
-			if($filter['rule'])
+			if ($filter['rule'])
 			{
-				$field[] = "rule:'" . strtolower($filter['rule']) . "'";
+				$field[] = "rule:'".strtolower($filter['rule'])."'";
 			}
-			if($filter['default'])
+			if ($filter['default'])
 			{
 				$field[] = "default:'{$filter['default']}'";
 			}
-			if($filter['modifier'])
+			if ($filter['modifier'])
 			{
 				$field[] = "modifier:'{$filter['modifier']}'";
 			}
-			if($filter['length'])
+			if ($filter['length'])
 			{
 				list($min, $max) = explode(':', $filter['length']);
-				if($min)
+				if ($min)
 				{
 					$field[] = "minlength:'{$min}'";
 				}
-				if($max)
+				if ($max)
 				{
 					$field[] = "maxlength:'{$max}'";
 				}
 			}
-			if($filter['if'])
+			if ($filter['if'])
 			{
 				$ifs = array();
-				if(!isset($filter['if'][0]))
+				if (!isset($filter['if'][0]))
 				{
 					$filter['if'] = array($filter['if']);
 				}
-				foreach($filter['if'] as $if)
+				foreach ($filter['if'] as $if)
 				{
-					$ifs[] = "{test:'" . addslashes($if['test']) . "', attr:'{$if['attr']}', value:'" . addslashes($if['value']) . "'}";
+					$ifs[] = "{test:'".addslashes($if['test'])."', attr:'{$if['attr']}', value:'".addslashes($if['value'])."'}";
 				}
-				$field[] = "'if':[" . implode(',', $ifs) . "]";
+				$field[] = "'if':[".implode(',', $ifs)."]";
 			}
-			if(count($field))
+			if (count($field))
 			{
-				$field = '{' . implode(',', $field) . '}';
+				$field = '{'.implode(',', $field).'}';
 				$content[] = "'{$name}':{$field}";
 			}
 		}
 
-		if(!$content)
+		if (!$content)
 		{
 			return '/* Error : empty ruleset  */';
 		}
 
 		// error messages
-		foreach($lang->filter as $key => $text)
+		foreach ($lang->filter as $key => $text)
 		{
-			if($text)
+			if ($text)
 			{
 				$text = preg_replace('@\r?\n@', '\\n', addslashes($text));
 				$messages[] = "v.cast('ADD_MESSAGE',['{$key}','{$text}']);";

classes/xml/GeneralXmlParser.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 	/**
 	 * Character data handler
 	 * Variable in the last element of this->output
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $body a data to be added
 	 * @return void
 	 */
@@ -73,7 +73,7 @@ 
 
 	/**
 	 * End element handler
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $node_name name of xml node
 	 * @return void
 	 */

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 		xml_parse($oParser, $input);
 		xml_parser_free($oParser);
 
-		if(count($this->output) < 1)
+		if (count($this->output) < 1)
 		{
 			return;
 		}
@@ -84,9 +84,9 @@ 
 		$parent_obj = &$this->output[count($this->output) - 1];
 		$tmp_obj = &$parent_obj->childNodes[$node_name];
 
-		if($tmp_obj)
+		if ($tmp_obj)
 		{
-			if(is_array($tmp_obj))
+			if (is_array($tmp_obj))
 			{
 				$tmp_obj[] = $cur_obj;
 			}

Braces +2 added lines, -4 removed lines

@@ -89,13 +89,11 @@
 			if(is_array($tmp_obj))
 			{
 				$tmp_obj[] = $cur_obj;
-			}
-			else
+			} else
 			{
 				$tmp_obj = array($tmp_obj, $cur_obj);
 			}
-		}
-		else
+		} else
 		{
 			$tmp_obj = $cur_obj;
 		}

classes/xml/XmlLangParser.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 
 	/**
 	 * compile a xml_file only when a corresponding php lang file does not exists or is outdated
-	 * @return string|bool Returns compiled php file.
+	 * @return false|string Returns compiled php file.
 	 */
 	function compile()
 	{
@@ -133,7 +133,7 @@ 
 
 	/**
 	 * Writing cache file
-	 * @return void|bool
+	 * @return null|false
 	 */
 	function _writeFile()
 	{

Braces +6 added lines, -12 removed lines

@@ -73,14 +73,12 @@ 
 		if(!file_exists($this->php_file))
 		{
 			$this->_compile();
-		}
-		else
+		} else
 		{
 			if(filemtime($this->xml_file) > filemtime($this->php_file))
 			{
 				$this->_compile();
-			}
-			else
+			} else
 			{
 				return $this->php_file;
 			}
@@ -168,8 +166,7 @@ 
 				$this->code .= "	{$var} = array();\n";
 				$this->code .= "}\n";
 				$var .= '[\'%s\']';
-			}
-			else
+			} else
 			{
 				$this->code .= "if(!is_object({$var})){\n";
 				$this->code .= "	{$var} = new stdClass();\n";
@@ -186,8 +183,7 @@ 
 			{
 				$this->_parseItem($item, $var);
 			}
-		}
-		else
+		} else
 		{
 			$code = $this->_parseValues($value, $var);
 			$this->code .= $code;
@@ -220,12 +216,10 @@ 
 		if($value[$this->lang_type])
 		{
 			return $value[$this->lang_type];
-		}
-		else if($value['en'])
+		} else if($value['en'])
 		{
 			return $value['en'];
-		}
-		else if($value['ko'])
+		} else if($value['ko'])
 		{
 			return $value['ko'];
 		}

Spacing +23 added lines, -23 removed lines

@@ -66,17 +66,17 @@ 
 	 */
 	function compile()
 	{
-		if(!file_exists($this->xml_file))
+		if (!file_exists($this->xml_file))
 		{
 			return FALSE;
 		}
-		if(!file_exists($this->php_file))
+		if (!file_exists($this->php_file))
 		{
 			$this->_compile();
 		}
 		else
 		{
-			if(filemtime($this->xml_file) > filemtime($this->php_file))
+			if (filemtime($this->xml_file) > filemtime($this->php_file))
 			{
 				$this->_compile();
 			}
@@ -95,7 +95,7 @@ 
 	 */
 	function getCompileContent()
 	{
-		if(!file_exists($this->xml_file))
+		if (!file_exists($this->xml_file))
 		{
 			return FALSE;
 		}
@@ -121,11 +121,11 @@ 
 		$xml_obj = parent::parse($buff);
 
 		$item = $xml_obj->lang->item;
-		if(!is_array($item))
+		if (!is_array($item))
 		{
 			$item = array($item);
 		}
-		foreach($item as $i)
+		foreach ($item as $i)
 		{
 			$this->_parseItem($i, $var = '$lang->%s');
 		}
@@ -137,11 +137,11 @@ 
 	 */
 	function _writeFile()
 	{
-		if(!$this->code)
+		if (!$this->code)
 		{
 			return;
 		}
-		FileHandler::writeFile($this->php_file, "<?php\n" . $this->code);
+		FileHandler::writeFile($this->php_file, "<?php\n".$this->code);
 		return false;
 	}
 
@@ -157,12 +157,12 @@ 
 		$value = $item->value;
 		$var = sprintf($var, $name);
 
-		if($item->item)
+		if ($item->item)
 		{
 			$type = $item->attrs->type;
 			$mode = $item->attrs->mode;
 
-			if($type == 'array')
+			if ($type == 'array')
 			{
 				$this->code .= "if(!is_array({$var})){\n";
 				$this->code .= "	{$var} = array();\n";
@@ -178,11 +178,11 @@ 
 			}
 
 			$items = $item->item;
-			if(!is_array($items))
+			if (!is_array($items))
 			{
 				$items = array($items);
 			}
-			foreach($items as $item)
+			foreach ($items as $item)
 			{
 				$this->_parseItem($item, $var);
 			}
@@ -202,41 +202,41 @@ 
 	 */
 	function _parseValues($nodes, $var)
 	{
-		if(!is_array($nodes))
+		if (!is_array($nodes))
 		{
 			$nodes = array($nodes);
 		}
 
 		$value = array();
-		foreach($nodes as $node)
+		foreach ($nodes as $node)
 		{
 			$return = $this->_parseValue($node, $var);
-			if($return && is_array($return))
+			if ($return && is_array($return))
 			{
 				$value = array_merge($value, $return);
 			}
 		}
 
-		if($value[$this->lang_type])
+		if ($value[$this->lang_type])
 		{
 			return $value[$this->lang_type];
 		}
-		else if($value['en'])
+		else if ($value['en'])
 		{
 			return $value['en'];
 		}
-		else if($value['ko'])
+		else if ($value['ko'])
 		{
 			return $value['ko'];
 		}
 
-		foreach($this->lang_types as $lang_type)
+		foreach ($this->lang_types as $lang_type)
 		{
-			if($lang_type == 'en' || $lang_type == 'ko' || $lang_type == $this->lang_type)
+			if ($lang_type == 'en' || $lang_type == 'ko' || $lang_type == $this->lang_type)
 			{
 				continue;
 			}
-			if($value[$lang_type])
+			if ($value[$lang_type])
 			{
 				return $value[$lang_type];
 			}
@@ -255,12 +255,12 @@ 
 	{
 		$lang_type = $node->attrs->xml_lang;
 		$value = $node->body;
-		if(!$value)
+		if (!$value)
 		{
 			return false;
 		}
 
-		$var .= '=\'' . str_replace("'", "\'", $value) . "';\n";
+		$var .= '=\''.str_replace("'", "\'", $value)."';\n";
 		return array($lang_type => $var);
 	}
 

classes/xml/XmlParser.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
 
 	/**
 	 * Start element handler.
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $node_name a name of node
 	 * @param array $attrs attributes to be set
 	 * @return array
@@ -168,7 +168,7 @@ 
 	/**
 	 * Character data handler
 	 * Variable in the last element of this->output
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $body a data to be added
 	 * @return void
 	 */
@@ -180,7 +180,7 @@ 
 
 	/**
 	 * End element handler
-	 * @param resource $parse an instance of parser
+	 * @param resource $parser an instance of parser
 	 * @param string $node_name name of xml node
 	 * @return void
 	 */

Spacing +13 added lines, -13 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	function loadXmlFile($filename)
 	{
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			return;
 		}
@@ -89,7 +89,7 @@ 
 	function parse($input = '', $arg1 = NULL, $arg2 = NULL)
 	{
 		// Save the compile starting time for debugging
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -103,13 +103,13 @@ 
 		preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
 
 		// extracts the supported lanuage when xml:lang is used
-		if(count($matches[1]) && $supported_lang = array_unique($matches[1]))
+		if (count($matches[1]) && $supported_lang = array_unique($matches[1]))
 		{
 			$tmpLangList = array_flip($supported_lang);
 			// if lang of the first log-in user doesn't exist, apply en by default if exists. Otherwise apply the first lang.
-			if(!isset($tmpLangList[$this->lang]))
+			if (!isset($tmpLangList[$this->lang]))
 			{
-				if(isset($tmpLangList['en']))
+				if (isset($tmpLangList['en']))
 				{
 					$this->lang = 'en';
 				}
@@ -134,14 +134,14 @@ 
 		xml_parse($this->oParser, $this->input);
 		xml_parser_free($this->oParser);
 
-		if(!count($this->output))
+		if (!count($this->output))
 		{
 			return;
 		}
 
 		$output = array_shift($this->output);
 		// Save compile starting time for debugging
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__xmlparse_elapsed__'] += getMicroTime() - $start;
 		}
@@ -189,19 +189,19 @@ 
 		$node_name = strtolower($node_name);
 		$cur_obj = array_pop($this->output);
 		$parent_obj = &$this->output[count($this->output) - 1];
-		if($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
+		if ($this->lang && $cur_obj->attrs->{'xml:lang'} && $cur_obj->attrs->{'xml:lang'} != $this->lang)
 		{
 			return;
 		}
-		if($this->lang && $parent_obj->{$node_name}->attrs->{'xml:lang'} && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
+		if ($this->lang && $parent_obj->{$node_name}->attrs->{'xml:lang'} && $parent_obj->{$node_name}->attrs->{'xml:lang'} != $this->lang)
 		{
 			return;
 		}
 
-		if(isset($parent_obj->{$node_name}))
+		if (isset($parent_obj->{$node_name}))
 		{
 			$tmp_obj = $parent_obj->{$node_name};
-			if(is_array($tmp_obj))
+			if (is_array($tmp_obj))
 			{
 				$parent_obj->{$node_name}[] = $cur_obj;
 			}
@@ -212,7 +212,7 @@ 
 		}
 		else
 		{
-			if(!is_object($parent_obj))
+			if (!is_object($parent_obj))
 			{
 				$parent_obj = (object) $parent_obj;
 			}
@@ -229,7 +229,7 @@ 
 	function _arrToAttrsObj($arr)
 	{
 		$output = new Xml_Node_();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			$key = strtolower($key);
 			$output->{$key} = $val;

Braces +4 added lines, -8 removed lines

@@ -112,15 +112,13 @@ 
 				if(isset($tmpLangList['en']))
 				{
 					$this->lang = 'en';
-				}
-				else
+				} else
 				{
 					$this->lang = array_shift($supported_lang);
 				}
 			}
 			// uncheck the language if no specific language is set.
-		}
-		else
+		} else
 		{
 			$this->lang = '';
 		}
@@ -204,13 +202,11 @@ 
 			if(is_array($tmp_obj))
 			{
 				$parent_obj->{$node_name}[] = $cur_obj;
-			}
-			else
+			} else
 			{
 				$parent_obj->{$node_name} = array($tmp_obj, $cur_obj);
 			}
-		}
-		else
+		} else
 		{
 			if(!is_object($parent_obj))
 			{

classes/xml/xmlquery/argument/Argument.class.php

Doc Comments +6 added lines

@@ -90,6 +90,9 @@ 
 		$this->type = $value;
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	function setColumnOperation($operation)
 	{
 		$this->column_operation = $operation;
@@ -282,6 +285,9 @@ 
 		return $this->errorMessage;
 	}
 
+	/**
+	 * @param integer $default_value
+	 */
 	function ensureDefaultValue($default_value)
 	{
 		if($this->value === NULL || $this->value === '')

Braces +4 added lines, -8 removed lines

@@ -180,8 +180,7 @@ 
 			if(!is_array($value))
 			{
 				$value = $this->_escapeStringValue($value);
-			}
-			else
+			} else
 			{
 				foreach($value as $key=>$val)
 				{
@@ -204,8 +203,7 @@ 
 						$value[$key] = (int) $val;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$value = (int) $value;
 			}
@@ -236,8 +234,7 @@ 
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
-		}
-		else if(strlen($captures[2]))
+		} else if(strlen($captures[2]))
 		{
 			// Remove user defined area
 			if("\xF3\xB0\x80\x80" <= $captures[2])
@@ -246,8 +243,7 @@ 
 			}
 
 			return $captures[2];
-		}
-		else
+		} else
 		{
 			return;
 		}

Spacing +38 added lines, -38 removed lines

@@ -73,11 +73,11 @@ 
 
 	function getType()
 	{
-		if(isset($this->type))
+		if (isset($this->type))
 		{
 			return $this->type;
 		}
-		if(is_string($this->value))
+		if (is_string($this->value))
 		{
 			return 'column_name';
 		}
@@ -102,7 +102,7 @@ 
 
 	function getValue()
 	{
-		if(!isset($this->_value))
+		if (!isset($this->_value))
 		{
 			$value = $this->getEscapedValue();
 			$this->_value = $this->toString($value);
@@ -127,7 +127,7 @@ 
 
 	function getUnescapedValue()
 	{
-		if($this->value === 'null')
+		if ($this->value === 'null')
 		{
 			return null;
 		}
@@ -141,17 +141,17 @@ 
 	 */
 	function toString($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 		{
-			if(count($value) === 0)
+			if (count($value) === 0)
 			{
 				return '';
 			}
-			if(count($value) === 1 && $value[0] === '')
+			if (count($value) === 1 && $value[0] === '')
 			{
 				return '';
 			}
-			return '(' . implode(',', $value) . ')';
+			return '('.implode(',', $value).')';
 		}
 		return $value;
 	}
@@ -164,42 +164,42 @@ 
 	function escapeValue($value)
 	{
 		$column_type = $this->getType();
-		if($column_type == 'column_name')
+		if ($column_type == 'column_name')
 		{
 			$dbParser = DB::getParser();
 			return $dbParser->parseExpression($value);
 		}
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return null;
 		}
 
 		$columnTypeList = array('date' => 1, 'varchar' => 1, 'char' => 1, 'text' => 1, 'bigtext' => 1);
-		if(isset($columnTypeList[$column_type]))
+		if (isset($columnTypeList[$column_type]))
 		{
-			if(!is_array($value))
+			if (!is_array($value))
 			{
 				$value = $this->_escapeStringValue($value);
 			}
 			else
 			{
-				foreach($value as $key=>$val)
+				foreach ($value as $key=>$val)
 				{
 					$value[$key] = $this->_escapeStringValue($val);
 				}
 			}
 		}
-		if($this->uses_default_value)
+		if ($this->uses_default_value)
 		{
 			return $value;
 		}
-		if($column_type == 'number')
+		if ($column_type == 'number')
 		{
-			if(is_array($value))
+			if (is_array($value))
 			{
-				foreach($value AS $key => $val)
+				foreach ($value AS $key => $val)
 				{
-					if(isset($val) && $val !== '')
+					if (isset($val) && $val !== '')
 					{
 						$value[$key] = (int) $val;
 					}
@@ -227,20 +227,20 @@ 
 		$value = preg_replace_callback($regex, array($this, 'utf8Replacer'), $value);
 		$db = DB::getInstance();
 		$value = $db->addQuotes($value);
-		return '\'' . $value . '\'';
+		return '\''.$value.'\'';
 	}
 
 	function utf8Replacer($captures)
 	{
-		if(strlen($captures[1]))
+		if (strlen($captures[1]))
 		{
 			// Valid byte sequence. Return unmodified.
 			return $captures[1];
 		}
-		else if(strlen($captures[2]))
+		else if (strlen($captures[2]))
 		{
 			// Remove user defined area
-			if("\xF3\xB0\x80\x80" <= $captures[2])
+			if ("\xF3\xB0\x80\x80" <= $captures[2])
 			{
 				return;
 			}
@@ -262,15 +262,15 @@ 
 	{
 		$type = $this->getType();
 		$value = $this->getUnescapedValue();
-		if($type == 'column_name')
+		if ($type == 'column_name')
 		{
 			return TRUE;
 		}
-		if($type == 'number' && is_null($value))
+		if ($type == 'number' && is_null($value))
 		{
 			return FALSE;
 		}
-		if($type == 'number' && !is_numeric($value) && $this->uses_default_value)
+		if ($type == 'number' && !is_numeric($value) && $this->uses_default_value)
 		{
 			return TRUE;
 		}
@@ -284,7 +284,7 @@ 
 
 	function ensureDefaultValue($default_value)
 	{
-		if($this->value === NULL || $this->value === '')
+		if ($this->value === NULL || $this->value === '')
 		{
 			$this->value = $default_value;
 			$this->uses_default_value = TRUE;
@@ -298,23 +298,23 @@ 
 	 */
 	function checkFilter($filter_type)
 	{
-		if(isset($this->value) && $this->value != '')
+		if (isset($this->value) && $this->value != '')
 		{
 			global $lang;
 			$val = $this->value;
 			$key = $this->name;
-			switch($filter_type)
+			switch ($filter_type)
 			{
 				case 'email' :
 				case 'email_address' :
-					if(!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
+					if (!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'homepage' :
-					if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
+					if (!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
@@ -322,7 +322,7 @@ 
 					break;
 				case 'userid' :
 				case 'user_id' :
-					if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
+					if (!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
@@ -330,25 +330,25 @@ 
 					break;
 				case 'number' :
 				case 'numbers' :
-					if(is_array($val))
+					if (is_array($val))
 					{
 						$val = join(',', $val);
 					}
-					if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
+					if (!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha' :
-					if(!preg_match('/^[a-z]+$/is', $val))
+					if (!preg_match('/^[a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
 					}
 					break;
 				case 'alpha_number' :
-					if(!preg_match('/^[0-9a-z]+$/is', $val))
+					if (!preg_match('/^[0-9a-z]+$/is', $val))
 					{
 						$this->isValid = FALSE;
 						$this->errorMessage = new BaseObject(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
@@ -360,7 +360,7 @@ 
 
 	function checkMaxLength($length)
 	{
-		if($this->value && (strlen($this->value) > $length))
+		if ($this->value && (strlen($this->value) > $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -371,7 +371,7 @@ 
 
 	function checkMinLength($length)
 	{
-		if($this->value && (strlen($this->value) < $length))
+		if ($this->value && (strlen($this->value) < $length))
 		{
 			global $lang;
 			$this->isValid = FALSE;
@@ -382,7 +382,7 @@ 
 
 	function checkNotNull()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			global $lang;
 			$this->isValid = FALSE;