EGroupware / egroupware

api/src/Framework/Template.php

Doc Comments +7 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
 	 * @param string $parent name of tempalte containing $handle
 	 * @param string $handle name of part
 	 * @param string $name name of variable/placeholder
-	 * @return boolean
+	 * @return false|null
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
@@ -311,6 +311,8 @@ 
 
 	/**
 	 * This is short for finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function fp($target, $handle, $append = False)
 	{
@@ -319,6 +321,8 @@ 
 
 	/**
 	 * This is a short cut for print finish parse
+	 * @param string $target
+	 * @param string $handle
 	 */
 	function pfp($target, $handle, $append = False)
 	{
@@ -365,6 +369,7 @@ 
 	 * Return undefined variables/placeholders of a handle
 	 *
 	 * @param string handle handle of a template
+	 * @param string $handle
 	 * @return array|boolean array with undefined variables as key and value, or false if none
 	 */
 	function get_undefined($handle)
@@ -564,7 +569,7 @@ 
 	 * get template dir of an application
 	 *
 	 * @param $appname appication name optional can be derived from $GLOBALS['egw_info']['flags']['currentapp'];
-	 * @return string|boolean dir or false if no dir is found
+	 * @return string|false dir or false if no dir is found
 	 */
 	static function get_dir($appname = '')
 	{

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
 	 *	- function-name like set_var to get eg. all assignments or
 	 *	- handle- / variable-names - if you are only interested in some variables ;-)
 	 */
-	var $debug = False;	// array('cat_list','cat_list_t');
+	var $debug = False; // array('cat_list','cat_list_t');
 
 	/**
 	 * $file[handle] = 'filename';
@@ -128,9 +128,9 @@ 
 	 */
 	function set_file($handle, $filename = '')
 	{
-		if ($this->debug && $this->check_debug('set_file',$handle,$filename))
+		if ($this->debug && $this->check_debug('set_file', $handle, $filename))
 		{
-			echo "<p>Template::set_file('".print_r($handle,true)."','$filename')</p>\n";
+			echo "<p>Template::set_file('".print_r($handle, true)."','$filename')</p>\n";
 		}
 		if (!is_array($handle))
 		{
@@ -143,7 +143,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h => $f)
+			foreach ($handle as $h => $f)
 			{
 				$this->file[$h] = $this->filename($f);
 			}
@@ -160,7 +160,7 @@ 
 	 */
 	function set_block($parent, $handle, $name = '')
 	{
-		if ($this->debug && $this->check_debug('set_block',$parent,$handle,$name))
+		if ($this->debug && $this->check_debug('set_block', $parent, $handle, $name))
 		{
 			echo "<p>Template::set_block('$parent','$handle','$name')</p>\n";
 		}
@@ -177,14 +177,14 @@ 
 		$qhandle = preg_quote($handle);
 		$reg = "/<!--\\s+BEGIN $qhandle\\s+-->(.*)\n\\s*<!--\\s+END $qhandle\\s+-->/s";
 		$match = null;
-		if (!preg_match($reg,$str,$match))
+		if (!preg_match($reg, $str, $match))
 		{
 			// unfortunaly some apps set non-existing blocks, therefor I have to disable this diagnostics again for now
 			$this->halt("set_block: unable to find block '$handle' in '$parent'=<pre>".htmlspecialchars($str)."</pre> this->root=$this->root");
 			// return False;
 		}
-		$this->set_var($handle,$match[1]);
-		$this->set_var($parent,preg_replace($reg, '{' . "$name}",$str));
+		$this->set_var($handle, $match[1]);
+		$this->set_var($parent, preg_replace($reg, '{'."$name}", $str));
 	}
 
 	/* public: set_var(array $values)
@@ -205,18 +205,18 @@ 
 				$varname => $value
 			);
 		}
-		foreach($varname as $k => $v)
+		foreach ($varname as $k => $v)
 		{
 			if (!empty($k))
 			{
-				if ($this->debug && $this->check_debug('set_var',$k))
+				if ($this->debug && $this->check_debug('set_var', $k))
 				{
 					echo "<p>Template::set_var('$k','$v')</p>\n";
 				}
 				$this->varkeys[$k] = $this->varname($k);
 				$this->varvals[$k] = $this->egroupware_hack ? str_replace(
-					array('phpGroupWare','www.phpgroupware.org'),
-					array('eGroupWare','www.eGroupWare.org'),$v
+					array('phpGroupWare', 'www.phpgroupware.org'),
+					array('eGroupWare', 'www.eGroupWare.org'), $v
 				) : $v;
 			}
 		}
@@ -230,7 +230,7 @@ 
 	 */
 	function subst($handle)
 	{
-		if ($this->debug && $this->check_debug('subst',$handle))
+		if ($this->debug && $this->check_debug('subst', $handle))
 		{
 			echo "<p>Template::subst('$handle')</p>\n";
 		}
@@ -241,7 +241,7 @@ 
 		}
 
 		$str = $this->get_var($handle);
-		foreach($this->varkeys as $k => $v)
+		foreach ($this->varkeys as $k => $v)
 		{
 			$str = str_replace($v, $this->varvals[$k], $str);
 		}
@@ -276,7 +276,7 @@ 
 			$str = $this->subst($handle);
 			if ($append)
 			{
-				$this->set_var($target, $this->get_var($target) . $str);
+				$this->set_var($target, $this->get_var($target).$str);
 			}
 			else
 			{
@@ -285,7 +285,7 @@ 
 		}
 		else
 		{
-			foreach($handle as $h)
+			foreach ($handle as $h)
 			{
 				$str = $this->subst($h);
 				$this->set_var($target, $str);
@@ -332,7 +332,7 @@ 
 	 */
 	function get_vars()
 	{
-		foreach(array_keys($this->varkeys) as $k)
+		foreach (array_keys($this->varkeys) as $k)
 		{
 			$result[$k] = $this->varvals[$k];
 		}
@@ -353,7 +353,7 @@ 
 		}
 		else
 		{
-			foreach(array_keys($varname) as $k)
+			foreach (array_keys($varname) as $k)
 			{
 				$result[$k] = $this->varvals[$k];
 			}
@@ -382,7 +382,7 @@ 
 		{
 			return false;
 		}
-		foreach($m as $v)
+		foreach ($m as $v)
 		{
 			if (!isset($this->varkeys[$v]))
 			{
@@ -448,15 +448,15 @@ 
 	 * @param string $root ='' default $this->root
 	 * @param int $time =1
 	 */
-	protected function filename($filename,$root='',$time=1)
+	protected function filename($filename, $root = '', $time = 1)
 	{
-		if($root == '')
+		if ($root == '')
 		{
 			$root = $this->root;
 		}
-		if(substr($filename, 0, 1) != '/')
+		if (substr($filename, 0, 1) != '/')
 		{
-			$new_filename = $root . '/' . $filename;
+			$new_filename = $root.'/'.$filename;
 		}
 		else
 		{
@@ -465,14 +465,14 @@ 
 
 		if (!file_exists($new_filename))
 		{
-			if($time==2)
+			if ($time == 2)
 			{
 				$this->halt("filename: file $new_filename does not exist.");
 			}
 			else
 			{
-				$new_root = dirname($root) . DIRECTORY_SEPARATOR . 'default';
-				$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+				$new_root = dirname($root).DIRECTORY_SEPARATOR.'default';
+				$new_filename = $this->filename(str_replace($root.'/', '', $new_filename), $new_root, 2);
 			}
 		}
 		return $new_filename;
@@ -491,9 +491,9 @@ 
 	 */
 	function loadfile($handle)
 	{
-		if ($this->debug && $this->check_debug('loadfile',$handle))
+		if ($this->debug && $this->check_debug('loadfile', $handle))
 		{
-			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file,True)."</pre>\n";
+			echo "<p>Template::loadfile('$handle') file=<pre>\n".print_r($this->file, True)."</pre>\n";
 			echo "<p>backtrace: ".function_backtrace()."</p>\n";
 		}
 		if (isset($this->varkeys[$handle]) && !empty($this->varvals[$handle]))
@@ -502,9 +502,9 @@ 
 		}
 		if (!isset($this->file[$handle]))
 		{
-			if ($this->debug && $this->check_debug('loadfile',$handle))
+			if ($this->debug && $this->check_debug('loadfile', $handle))
 			{
-				echo "varkeys =<pre>".print_r($this->varkeys,True)."</pre>varvals =<pre>".print_r($this->varvals,True)."</pre>\n";
+				echo "varkeys =<pre>".print_r($this->varkeys, True)."</pre>varvals =<pre>".print_r($this->varvals, True)."</pre>\n";
 			}
 			$this->halt("loadfile: $handle is not a valid handle.");
 			return false;
@@ -549,10 +549,10 @@ 
 	{
 		if (!$this->debug) return False;
 
-		foreach(func_get_args() as $arg)
+		foreach (func_get_args() as $arg)
 		{
 			if (!is_array($this->debug) && $this->debug === $arg ||
-				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg,$this->debug,True))))
+				(is_array($this->debug) && (@$this->debug[$arg] || in_array($arg, $this->debug, True))))
 			{
 				return True;
 			}
@@ -601,8 +601,8 @@ 
 		{
 			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
 		}
-		$tpldir         = EGW_SERVER_ROOT . '/' . $appname . '/templates/' . $GLOBALS['egw_info']['server']['template_set'];
-		$tpldir_default = EGW_SERVER_ROOT . '/' . $appname . '/templates/default';
+		$tpldir         = EGW_SERVER_ROOT.'/'.$appname.'/templates/'.$GLOBALS['egw_info']['server']['template_set'];
+		$tpldir_default = EGW_SERVER_ROOT.'/'.$appname.'/templates/default';
 
 		if (@is_dir($tpldir))
 		{

Braces +4 added lines, -1 removed lines

@@ -547,7 +547,10 @@
 
 	function check_debug()
 	{
-		if (!$this->debug) return False;
+		if (!$this->debug)
+		{
+			return False;
+		}
 
 		foreach(func_get_args() as $arg)
 		{

api/src/Framework/Updates.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	/**
 	 * Get versions of available updates
 	 *
-	 * @return array verions for keys "current" and "security"
+	 * @return string verions for keys "current" and "security"
 	 */
 	public static function available()
 	{

Spacing +4 added lines, -4 removed lines

@@ -51,8 +51,8 @@ 
 				list($current, $security) = explode("\n", $remote);
 				if (empty($security)) $security = $current;
 				$versions = array(
-					'current'  => $current,		// last maintenance update
-					'security' => $security,	// last security update
+					'current'  => $current, // last maintenance update
+					'security' => $security, // last security update
 				);
 			}
 			return $versions;
@@ -113,7 +113,7 @@ 
 	 */
 	protected static function update_older($version, $days)
 	{
-		list(,,$date) = explode('.', $version);
+		list(,, $date) = explode('.', $version);
 		if ($date < 20140000) return false;
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
@@ -126,7 +126,7 @@ 
 	 * @param string &$changelog on return path to changelog
 	 * @return string
 	 */
-	public static function api_version(&$changelog=null)
+	public static function api_version(&$changelog = null)
 	{
 		$changelog = EGW_SERVER_ROOT.'/doc/rpm-build/debian.changes';
 

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 			if (($remote = file_get_contents(self::CURRENT_VERSION_URL, false, Api\Framework::proxy_context())))
 			{
 				list($current, $security) = explode("\n", $remote);
-				if (empty($security)) $security = $current;
+				if (empty($security))
+				{
+					$security = $current;
+				}
 				$versions = array(
 					'current'  => $current,		// last maintenance update
 					'security' => $security,	// last security update
@@ -114,7 +117,10 @@ 
 	protected static function update_older($version, $days)
 	{
 		list(,,$date) = explode('.', $version);
-		if ($date < 20140000) return false;
+		if ($date < 20140000)
+		{
+			return false;
+		}
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
 		return (time() - $version_timestamp) / 86400 > $days;

api/src/Header/Authenticate.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 	 * @param string $realm
 	 * @param string $username
 	 * @param string &$password=null password to use or if null, on return stored password
-	 * @return string|boolean false if $password not given and can NOT be read
+	 * @return false|string false if $password not given and can NOT be read
 	 */
 	static private function get_digest_A1($realm,$username,&$password=null)
 	{

Indentation +12 added lines, -12 removed lines

@@ -255,20 +255,20 @@
 	 */
 	static public function parse_digest($txt)
 	{
-	    // protect against missing data
-	    $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-	    $data = array();
-	    $keys = implode('|', array_keys($needed_parts));
+		// protect against missing data
+		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+		$data = array();
+		$keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
-	    foreach ($matches as $m)
-	    {
-	        $data[$m[1]] = $m[3] ? $m[3] : $m[4];
-	        unset($needed_parts[$m[1]]);
-	    }
-	    //error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
-	    return $needed_parts ? false : $data;
+		foreach ($matches as $m)
+		{
+			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
+			unset($needed_parts[$m[1]]);
+		}
+		//error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
+		return $needed_parts ? false : $data;
 	}
 }

Spacing +19 added lines, -19 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	static public function autocreate_session_callback(&$account)
 	{
-		unset($account);	// not used, but required by function signature
+		unset($account); // not used, but required by function signature
 		if (self::ERROR_LOG)
 		{
 			$pw = self::ERROR_LOG > 1 ? $_SERVER['PHP_AUTH_PW'] : '**********';
@@ -86,15 +86,15 @@ 
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
-		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],'Basic ') === 0)
+		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 'Basic ') === 0)
 		{
-			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],6));
+			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6));
 			if (strpos($hash, ':') !== false)
 			{
 				list($username, $password) = explode(':', $hash, 2);
 			}
 		}
-		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm,$_SERVER['PHP_AUTH_DIGEST'],$username,$password))
+		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm, $_SERVER['PHP_AUTH_DIGEST'], $username, $password))
 		{
 			unset($password);
 		}
@@ -111,7 +111,7 @@ 
 			// if the session class gives a reason why the login failed --> append it to the REALM
 			if ($GLOBALS['egw']->session->reason) $realm .= ': '.$GLOBALS['egw']->session->reason;
 
-			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
+			header('WWW-Authenticate: Basic realm="'.$realm.'"'); // draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
 			self::digest_header($realm);
 			header('HTTP/1.1 401 Unauthorized');
 			header('X-WebDAV-Status: 401 Unauthorized', true);
@@ -135,7 +135,7 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches) {
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -157,24 +157,24 @@ 
 	 * @param string &$user_pw =null stored cleartext password, if $username given AND function returns true
 	 * @return boolean true if digest auth is available, false otherwise
 	 */
-	static public function digest_auth_available($realm,$username=null,&$user_pw=null)
+	static public function digest_auth_available($realm, $username = null, &$user_pw = null)
 	{
 		// we currently require plaintext passwords!
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
 			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
-			return false;	// no plain-text passwords used
+			return false; // no plain-text passwords used
 		}
 		// check for specific user, if given
-		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username,'account_pwd','u')) ||
-			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
+		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username, 'account_pwd', 'u')) ||
+			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw, 0, 7) != '{PLAIN}'))
 		{
 			unset($user_pw);
 			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
-			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
+			return false; // user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw, 0, 7) == '{PLAIN}') $user_pw = substr($user_pw, 7);
 
 		if (self::ERROR_LOG)
 		{
@@ -190,7 +190,7 @@ 
 	 * @param string $realm
 	 * @param string &$nonce=null on return
 	 */
-	static public function digest_header($realm,&$nonce=null)
+	static public function digest_header($realm, &$nonce = null)
 	{
 		if (self::digest_auth_available($realm))
 		{
@@ -209,13 +209,13 @@ 
 	 * @param string &$password on return cleartext password
 	 * @return boolean true if digest is correct, false otherwise
 	 */
-	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
+	static public function is_valid($realm, $auth_digest = null, &$username = null, &$password = null)
 	{
 		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
 
 		$data = self::parse_digest($auth_digest);
 
-		if (!$data || !($A1 = self::get_digest_A1($realm,$username=$data['username'],$password=null)))
+		if (!$data || !($A1 = self::get_digest_A1($realm, $username = $data['username'], $password = null)))
 		{
 			error_log(__METHOD__."('$realm','$auth_digest','$username') returning FALSE");
 			return false;
@@ -236,16 +236,16 @@ 
 	 * @param string &$password=null password to use or if null, on return stored password
 	 * @return string|boolean false if $password not given and can NOT be read
 	 */
-	static private function get_digest_A1($realm,$username,&$password=null)
+	static private function get_digest_A1($realm, $username, &$password = null)
 	{
 		$user_pw = null;
-		if (empty($username) || empty($realm) || !self::digest_auth_available($realm,$username,$user_pw))
+		if (empty($username) || empty($realm) || !self::digest_auth_available($realm, $username, $user_pw))
 		{
 			return false;
 		}
 		if (is_null($password)) $password = $user_pw;
 
-		$A1 = md5($username . ':' . $realm . ':' . $password);
+		$A1 = md5($username.':'.$realm.':'.$password);
 		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
 		return $A1;
 	}
@@ -261,7 +261,7 @@ 
 	    $keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+	    preg_match_all('@('.$keys.')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
 	    foreach ($matches as $m)
 	    {

Braces +42 added lines, -11 removed lines

@@ -82,7 +82,10 @@ 
 			error_log(__METHOD__.'() PHP_AUTH_USER='.array2string($_SERVER['PHP_AUTH_USER']).', PHP_AUTH_PW='.array2string($pw).', PHP_AUTH_DIGEST='.array2string($_SERVER['PHP_AUTH_DIGEST']));
 		}
 		$realm = $GLOBALS['egw_info']['flags']['auth_realm'];
-		if (empty($realm)) $realm = 'EGroupware';
+		if (empty($realm))
+		{
+			$realm = 'EGroupware';
+		}
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
@@ -109,7 +112,10 @@ 
 		if (!isset($username) || !($sessionid = $GLOBALS['egw']->session->create($username, $password, 'text', true)))
 		{
 			// if the session class gives a reason why the login failed --> append it to the REALM
-			if ($GLOBALS['egw']->session->reason) $realm .= ': '.$GLOBALS['egw']->session->reason;
+			if ($GLOBALS['egw']->session->reason)
+			{
+				$realm .= ': '.$GLOBALS['egw']->session->reason;
+			}
 
 			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
 			self::digest_header($realm);
@@ -135,7 +141,8 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches)
+				{
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -163,7 +170,10 @@ 
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
-			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			}
 			return false;	// no plain-text passwords used
 		}
 		// check for specific user, if given
@@ -171,10 +181,16 @@ 
 			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
 		{
 			unset($user_pw);
-			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			}
 			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw,0,7) == '{PLAIN}')
+		{
+			$user_pw = substr($user_pw,7);
+		}
 
 		if (self::ERROR_LOG)
 		{
@@ -196,7 +212,10 @@ 
 		{
 			$nonce = uniqid();
    			header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
-			if (self::ERROR_LOG) error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			}
 		}
 	}
 
@@ -211,7 +230,10 @@ 
 	 */
 	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
 	{
-		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		if (is_null($auth_digest))
+		{
+			$auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		}
 
 		$data = self::parse_digest($auth_digest);
 
@@ -224,7 +246,10 @@ 
 
 		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
 
-		if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		if (self::ERROR_LOG)
+		{
+			error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		}
 		return $data['response'] === $valid_response;
 	}
 
@@ -243,10 +268,16 @@ 
 		{
 			return false;
 		}
-		if (is_null($password)) $password = $user_pw;
+		if (is_null($password))
+		{
+			$password = $user_pw;
+		}
 
 		$A1 = md5($username . ':' . $realm . ':' . $password);
-		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		if (self::ERROR_LOG > 1)
+		{
+			error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		}
 		return $A1;
 	}
 

api/src/Header/ContentSecurityPolicy.php

Doc Comments -1 removed lines

@@ -41,7 +41,6 @@
 	 *
 	 * Calling this method with an empty array for frame-src, sets no defaults but "'self'"!
 	 *
-	 * @param string|array $set =array() URL (incl. protocol!)
 	 * @param string $source valid CSP source types like 'script-src', 'style-src', 'connect-src', 'frame-src', ...
 	 * @param string|array $attrs 'unsafe-eval' and/or 'unsafe-inline' (without quotes!) or URL (incl. protocol!)
 	 */

Spacing +11 added lines, -11 removed lines

@@ -33,7 +33,7 @@ 
 		'script-src'  => array("'unsafe-eval'"),
 		'style-src'   => array("'unsafe-inline'"),
 		'connect-src' => array(),
-		'frame-src'   => null,	// NOT array(), to allow setting no default frame-src!
+		'frame-src'   => null, // NOT array(), to allow setting no default frame-src!
 	);
 
 	/**
@@ -55,7 +55,7 @@ 
 				$attrs = array('www.egroupware.org');
 				if (($app_additional = Api\Hooks::process('csp-frame-src')))
 				{
-					foreach($app_additional as $addtional)
+					foreach ($app_additional as $addtional)
 					{
 						if ($addtional) $attrs = array_unique(array_merge($attrs, $addtional));
 					}
@@ -63,11 +63,11 @@ 
 			}
 			self::$sources[$source] = array();
 		}
-		foreach((array)$attrs as $attr)
+		foreach ((array)$attrs as $attr)
 		{
 			if (in_array($attr, array('none', 'self', 'unsafe-eval', 'unsafe-inline')))
 			{
-				$attr = "'$attr'";	// automatic add quotes
+				$attr = "'$attr'"; // automatic add quotes
 			}
 			if (!in_array($attr, self::$sources[$source]))
 			{
@@ -88,7 +88,7 @@ 
 	 *
 	 * @param string|array $set =array() 'unsafe-eval' and/or 'unsafe-inline' (without quotes!) or URL (incl. protocol!)
 	 */
-	public static function add_script_src($set=null)
+	public static function add_script_src($set = null)
 	{
 		self::add('script-src', $set);
 	}
@@ -100,7 +100,7 @@ 
 	 *
 	 * @param string|array $set =array() 'unsafe-inline' (without quotes!) and/or URL (incl. protocol!)
 	 */
-	public static function add_style_src($set=null)
+	public static function add_style_src($set = null)
 	{
 		self::add('style-src', $set);
 	}
@@ -110,7 +110,7 @@ 
 	 *
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 */
-	public static function add_connect_src($set=null)
+	public static function add_connect_src($set = null)
 	{
 		self::add('connect-src', $set);
 	}
@@ -123,7 +123,7 @@ 
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-inline'"
 	 */
-	public static function add_frame_src($set=null)
+	public static function add_frame_src($set = null)
 	{
 		self::add('frame-src', $set);
 	}
@@ -135,10 +135,10 @@ 
 	 */
 	public static function send()
 	{
-		self::add('frame-src', null);	// set defaults for frame-src
+		self::add('frame-src', null); // set defaults for frame-src
 
 		$policies = array();
-		foreach(self::$sources as $source => $urls)
+		foreach (self::$sources as $source => $urls)
 		{
 			$policies[] = "$source 'self' ".implode(' ', $urls);
 		}
@@ -152,7 +152,7 @@ 
 		// recommendaton ist to not send regular AND deprecated headers together, as they can cause unexpected behavior
 		if ($user_agent == 'chrome' && $version < 25 || $user_agent == 'safari' && $version < 7)
 		{
-			header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+			header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 		}
 		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')	// Edge is reported as 'edge'!
 		{

Braces +8 added lines, -2 removed lines

@@ -57,7 +57,10 @@ 
 				{
 					foreach($app_additional as $addtional)
 					{
-						if ($addtional) $attrs = array_unique(array_merge($attrs, $addtional));
+						if ($addtional)
+						{
+							$attrs = array_unique(array_merge($attrs, $addtional));
+						}
 					}
 				}
 			}
@@ -154,10 +157,13 @@ 
 		{
 			header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 		}
-		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')	// Edge is reported as 'edge'!
+		elseif ($user_agent == 'firefox' && $version < 23 || $user_agent == 'msie')
+		{
+			// Edge is reported as 'edge'!
 		{
 			header("X-Content-Security-Policy: $csp");
 		}
+		}
 		else
 		{
 			header("Content-Security-Policy: $csp");

api/src/Hooks.php

Doc Comments +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
 
 	/**
 	 * Static function to build pgp encryption sidebox menu
-	 * @param type $appname application name
+	 * @param string $appname application name
 	 */
 	public static function pgp_encryption_menu($appname)
 	{

Spacing +14 added lines, -14 removed lines

@@ -64,22 +64,22 @@ 
 
 		if (!isset(self::$locations)) self::read();
 		$hooks = self::$locations[$location];
-		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
+		if (!isset($hooks) || empty($hooks)) return array(); // not a single app implements that hook
 
 		$apps = array_keys($hooks);
 		if (!$no_permission_check)
 		{
 			// on install of a new egroupware both hook-apps and user apps may be empty/not set
-			$apps = array_intersect((array)$apps,array_keys((array)$GLOBALS['egw_info']['user']['apps']));
+			$apps = array_intersect((array)$apps, array_keys((array)$GLOBALS['egw_info']['user']['apps']));
 		}
 		if ($order)
 		{
-			$apps = array_unique(array_merge((array)$order,$apps));
+			$apps = array_unique(array_merge((array)$order, $apps));
 		}
 		$results = array();
-		foreach((array)$apps as $appname)
+		foreach ((array)$apps as $appname)
 		{
-			$results[$appname] = self::single($args,$appname,$no_permission_check);
+			$results[$appname] = self::single($args, $appname, $no_permission_check);
 		}
 		return $results;
 	}
@@ -115,7 +115,7 @@ 
 		}
 
 		$ret = array();
-		foreach((array)self::$locations[$location][$appname] as $hook)
+		foreach ((array)self::$locations[$location][$appname] as $hook)
 		{
 			try {
 				// old style file hook
@@ -149,7 +149,7 @@ 
 		}
 
 		// hooks only existing in filesystem used by setup
-		if (!$ret && $try_unregistered && file_exists(EGW_SERVER_ROOT.($hook='/'.$appname.'/inc/hook_'.$location.'.inc.php')))
+		if (!$ret && $try_unregistered && file_exists(EGW_SERVER_ROOT.($hook = '/'.$appname.'/inc/hook_'.$location.'.inc.php')))
 		{
 			include(EGW_SERVER_ROOT.$hook);
 			return true;
@@ -181,7 +181,7 @@ 
 	 * @param boolean $return_methods =false true: return hook-method(s)
 	 * @return int|array the number of found hooks or for $return_methods array with methods
 	 */
-	public static function exists($location, $app, $return_methods=false)
+	public static function exists($location, $app, $return_methods = false)
 	{
 		if (!isset(self::$locations)) self::read();
 
@@ -208,7 +208,7 @@ 
 	 *
 	 * @param boolan $force_rescan =false true: do not use instance cache
 	 */
-	public static function read($force_rescan=false)
+	public static function read($force_rescan = false)
 	{
 		//$starttime = microtime(true);
 		if ($force_rescan) Cache::unsetInstance(__CLASS__, 'locations');
@@ -224,18 +224,18 @@ 
 
 			// read all apps using just filesystem data
 			$locations = array();
-			foreach(array_merge(array('api'), array_keys($GLOBALS['egw_info']['apps'])) as $appname)
+			foreach (array_merge(array('api'), array_keys($GLOBALS['egw_info']['apps'])) as $appname)
 			{
 				if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
 
-				$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
+				$f = EGW_SERVER_ROOT.'/'.$appname.'/setup/setup.inc.php';
 				$setup_info = array($appname => array());
-				if(@file_exists($f)) include($f);
+				if (@file_exists($f)) include($f);
 
 				// some apps have setup_info for more then themselfs (eg. api for groupdav)
-				foreach($setup_info as $appname => $data)
+				foreach ($setup_info as $appname => $data)
 				{
-					foreach((array)$data['hooks'] as $location => $methods)
+					foreach ((array)$data['hooks'] as $location => $methods)
 					{
 						if (is_int($location))
 						{

Braces +53 added lines, -13 removed lines

@@ -62,9 +62,16 @@ 
 		//echo "<p>".__METHOD__.'('.array2string($args).','.array2string($order).','.array2string($no_permission_check).")</p>\n";
 		$location = is_array($args) ? (isset($args['hook_location']) ? $args['hook_location'] : $args['location']) : $args;
 
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 		$hooks = self::$locations[$location];
-		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
+		if (!isset($hooks) || empty($hooks))
+		{
+			return array();
+		}
+		// not a single app implements that hook
 
 		$apps = array_keys($hooks);
 		if (!$no_permission_check)
@@ -99,9 +106,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')");
 
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
-		if (!is_array($args)) $args = array('location' => $args);
+		if (!is_array($args))
+		{
+			$args = array('location' => $args);
+		}
 		$location = isset($args['hook_location']) ? $args['hook_location'] : $args['location'];
 
 		if (!$appname)
@@ -135,7 +148,10 @@ 
 				// static method of an autoloadable class
 				if (isset($method) && class_exists($class))
 				{
-					if (is_callable($hook)) $ret[] = call_user_func($hook, $args);
+					if (is_callable($hook))
+					{
+						$ret[] = call_user_func($hook, $args);
+					}
 				}
 				// app.class.method or not autoloadable class
 				else
@@ -155,7 +171,10 @@ 
 			return true;
 		}
 
-		if (!$ret) return false;
+		if (!$ret)
+		{
+			return false;
+		}
 
 		return count($ret) == 1 ? $ret[0] : $ret;
 	}
@@ -168,7 +187,10 @@ 
 	 */
 	public static function count($location)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		return count(self::$locations[$location]);
 	}
@@ -183,7 +205,10 @@ 
 	 */
 	public static function exists($location, $app, $return_methods=false)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		//error_log(__METHOD__.__LINE__.array2string(self::$locations[$location]));
 		return $return_methods ? self::$locations[$location][$app] : count(self::$locations[$location][$app]);
@@ -197,7 +222,10 @@ 
 	 */
 	public static function implemented($location)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		//error_log(__METHOD__.__LINE__.array2string(self::$locations[$location]));
 		return isset(self::$locations[$location]) ? array_keys(self::$locations[$location]) : array();
@@ -211,7 +239,10 @@ 
 	public static function read($force_rescan=false)
 	{
 		//$starttime = microtime(true);
-		if ($force_rescan) Cache::unsetInstance(__CLASS__, 'locations');
+		if ($force_rescan)
+		{
+			Cache::unsetInstance(__CLASS__, 'locations');
+		}
 
 		self::$locations = Cache::getInstance(__CLASS__, 'locations', function()
 		{
@@ -226,11 +257,17 @@ 
 			$locations = array();
 			foreach(array_merge(array('api'), array_keys($GLOBALS['egw_info']['apps'])) as $appname)
 			{
-				if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname)) continue;
+				if ($appname[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$appname))
+				{
+					continue;
+				}
 
 				$f = EGW_SERVER_ROOT . '/' . $appname . '/setup/setup.inc.php';
 				$setup_info = array($appname => array());
-				if(@file_exists($f)) include($f);
+				if(@file_exists($f))
+				{
+					include($f);
+				}
 
 				// some apps have setup_info for more then themselfs (eg. api for groupdav)
 				foreach($setup_info as $appname => $data)
@@ -258,7 +295,10 @@ 
 	 */
 	public static function pgp_encryption_menu($appname)
 	{
-		if (Header\UserAgent::mobile()) return;
+		if (Header\UserAgent::mobile())
+		{
+			return;
+		}
 
 		// PGP Encryption (Mailvelope plugin) restore/backup menu
 		$file = Array(

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

api/src/Html.php

Doc Comments +3 added lines, -5 removed lines

@@ -139,7 +139,7 @@ 
 	 *
 	 * @param string $name	string with name of the submitted var which holds the key of the selected item form array
 	 * @param string|array $key key(s) of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
-	 * @param array $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
+	 * @param integer $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
 	 * @param boolean $no_lang NOT run the labels of the options through lang(), default false=use lang()
 	 * @param string $options additional options (e.g. 'width')
 	 * @param int $multiple number of lines for a multiselect, default 0 = no multiselect, < 0 sets size without multiple
@@ -227,7 +227,7 @@ 
 	 *
 	 * @param string $name	string with name of the submitted var which holds the key of the selected item form array
 	 * @param string|array $key key(s) of already selected item(s) from $arr, eg. '1' or '1,2' or array with keys
-	 * @param array $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
+	 * @param integer $arr array with items to select, eg. $arr = array ( 'y' => 'yes','n' => 'no','m' => 'maybe');
 	 * @param boolean $no_lang NOT run the labels of the options through lang(), default false=use lang()
 	 * @param string $options additional options (e.g. 'width')
 	 * @param int $multiple number of lines for a multiselect, default 3
@@ -313,7 +313,7 @@ 
 	 * @param string $value value
 	 * @param string $label label
 	 * @param mixed $selected value or array of values of options to mark as selected
-	 * @param boolean $no_lang NOT running the label through lang(), default false=use lang()
+	 * @param integer $no_lang NOT running the label through lang(), default false=use lang()
 	 * @param string $extra extra text, e.g.: style="", default: ''
 	 * @return string html
 	 */
@@ -386,7 +386,6 @@ 
 	 *
 	 * @param string $name name attr. of the tag
 	 * @param string $value default
-	 * @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @param string html
 	 */
@@ -741,7 +740,6 @@ 
 	 * @param array $hidden_vars array with name-value pairs for hidden input fields
 	 * @param string $url eGW relative URL, will be run through the link function
 	 * @param string|array $url_vars parameters for the URL, send to link static function too
-	 * @param string $options attributes for the tag, default ''=none
 	 * @param string $form_name name of the form, defaul ''=none
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html

Indentation +29 added lines, -29 removed lines

@@ -425,20 +425,20 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for fckEditor to create some reuseable layouts
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param array  $_options (toolbar_expanded true/false)
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param string $_start_path ='' if passed activates the browser for image at absolute path passed
-	* @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for fckEditor to create some reuseable layouts
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_content of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param array  $_options (toolbar_expanded true/false)
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param string $_start_path ='' if passed activates the browser for image at absolute path passed
+	 * @param boolean $_purify =true run $_content through htmlpurifier before handing it to fckEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
 		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
 	{
@@ -509,21 +509,21 @@ 
 	}
 
 	/**
-	* this static function is a wrapper for tinymce to create some reuseable layouts
-	*
-	* Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
-	*
-	* @param string $_name name and id of the input-field
-	* @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
-	* @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
-	* @param string $_height ='400px'
-	* @param string $_width ='100%'
-	* @param boolean $_purify =true
-	* @param string $_border ='0px' NOT used for CKEditor
-	* @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
-	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
-	* @return string the necessary html for the textarea
-	*/
+	 * this static function is a wrapper for tinymce to create some reuseable layouts
+	 *
+	 * Please note: if you did not run init_tinymce already you this static function need to be called before the call to phpgw_header() !!!
+	 *
+	 * @param string $_name name and id of the input-field
+	 * @param string $_mode display mode of the tinymce editor can be: simple, extended or advanced
+	 * @param string $_content ='' of the tinymce (will be run through htmlspecialchars !!!), default ''
+	 * @param string $_height ='400px'
+	 * @param string $_width ='100%'
+	 * @param boolean $_purify =true
+	 * @param string $_border ='0px' NOT used for CKEditor
+	 * @param mixed (boolean/string) $_focusToBody=false USED only for CKEDIOR true means yes, focus on top, you may specify TOP or BOTTOM (to focus on the end of the editor area)
+	 * @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
+	 * @return string the necessary html for the textarea
+	 */
 	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')

Spacing +179 added lines, -179 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	static function activate_links($content)
 	{
-		if (!$content || strlen($content) < 20) return $content;	// performance
+		if (!$content || strlen($content) < 20) return $content; // performance
 
 		// Exclude everything which is already a link
 		$NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)';
@@ -46,73 +46,73 @@ 
 
 		//  First match things beginning with http:// (or other protocols)
 		$optBracket0 = '(<|&lt;)';
-		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';	// only http:// gets removed, other protocolls are shown
+		$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
 		$Domain = '([\w-]+\.[\w-.]+)';
 		$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 		$optBracket = '(>|&gt;)';
-		$Expr = '/' .$optBracket0. $NotAnchor . $Protocol . $Domain . $Subdir . $optBracket . '/i';
+		$Expr = '/'.$optBracket0.$NotAnchor.$Protocol.$Domain.$Subdir.$optBracket.'/i';
 		// use preg_replace_callback as we experienced problems with https links
-		$result2 = preg_replace_callback($Expr, function ($match)
+		$result2 = preg_replace_callback($Expr, function($match)
 		{
-			return $match[1]."<a href=\"".($match[2]&&!$match[3]?$match[2]:'').($match[3]?$match[3]:'').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
+			return $match[1]."<a href=\"".($match[2] && !$match[3] ? $match[2] : '').($match[3] ? $match[3] : '').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
 		}, $result);
 
 		if (true)	// hack to keep IDE from complaing about double assignments
 		{
 			//  First match things beginning with http:// (or other protocols)
-			$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';	// only http:// gets removed, other protocolls are shown
+			$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))'; // only http:// gets removed, other protocolls are shown
 			$Domain = '([\w-]+\.[\w-.]+)';
 			$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 			$optStuff = '(&quot;|&quot|;)?';
-			$Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . $optStuff . '/i';
+			$Expr = '/'.$NotAnchor.$Protocol.$Domain.$Subdir.$optStuff.'/i';
 			// use preg_replace_callback as we experienced problems with https links
-			$result3 = preg_replace_callback($Expr, function ($match)
+			$result3 = preg_replace_callback($Expr, function($match)
 			{
-				$additionalQuote="";//at the end, ...
+				$additionalQuote = ""; //at the end, ...
 				// only one &quot at the end is found. chance is, it is not belonging to the URL
-				if ($match[5]==';' && (strlen($match[4])-6) >=0 && strpos($match[4],'&quot',strlen($match[4])-6)!==false && strpos(substr($match[4],0,strlen($match[4])-6),'&quot')===false)
+				if ($match[5] == ';' && (strlen($match[4]) - 6) >= 0 && strpos($match[4], '&quot', strlen($match[4]) - 6) !== false && strpos(substr($match[4], 0, strlen($match[4]) - 6), '&quot') === false)
 				{
-					$match[4] = substr($match[4],0,strpos($match[4],'&quot',strlen($match[4])-6));
+					$match[4] = substr($match[4], 0, strpos($match[4], '&quot', strlen($match[4]) - 6));
 					$additionalQuote = "&quot;";
 				}
 				// if there is quoted stuff within the URL then we have at least one more &quot; in match[4], so chance is the last &quot is matched by the one within
-				if ($match[5]==';' && (strlen($match[4])-6) >=0 && strpos($match[4],'&quot',strlen($match[4])-6)!==false && strpos(substr($match[4],0,strlen($match[4])-6),'&quot')!==false)
+				if ($match[5] == ';' && (strlen($match[4]) - 6) >= 0 && strpos($match[4], '&quot', strlen($match[4]) - 6) !== false && strpos(substr($match[4], 0, strlen($match[4]) - 6), '&quot') !== false)
 				{
 					$match[4] .= $match[5];
 				}
-				if ($match[5]==';'&&$match[4]=="&quot")
+				if ($match[5] == ';' && $match[4] == "&quot")
 				{
-					$match[4] ='';
+					$match[4] = '';
 					$additionalQuote = "&quot;";
 				}
 				//error_log(__METHOD__.__LINE__.array2string($match));
-				return "<a href=\"".($match[1]&&!$match[2]?$match[1]:'').($match[2]?$match[2]:'').$match[3].$match[4]."\" target=\"_blank\">".$match[3].$match[4]."</a>$additionalQuote";
+				return "<a href=\"".($match[1] && !$match[2] ? $match[1] : '').($match[2] ? $match[2] : '').$match[3].$match[4]."\" target=\"_blank\">".$match[3].$match[4]."</a>$additionalQuote";
 			}, $result2);
 
 			//  Now match things beginning with www.
 			$optBracket0 = '(<|&lt;)?';
-			$NotHTTP = '(?<!:\/\/|" target=\"_blank\">)';	//	avoid running again on http://www links already handled above
+			$NotHTTP = '(?<!:\/\/|" target=\"_blank\">)'; //	avoid running again on http://www links already handled above
 			$Domain2 = 'www(\.[\w-.]+)';
 			$Subdir2 = '([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 			$optBracket = '(>|&gt;|&gt|;)?';
-			$Expr = '/' .$optBracket0. $NotAnchor . $NotHTTP . $Domain2 . $Subdir2 .$optBracket. '/i';
+			$Expr = '/'.$optBracket0.$NotAnchor.$NotHTTP.$Domain2.$Subdir2.$optBracket.'/i';
 			//$Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . $optBracket . '/i';
 			// use preg_replace_callback as we experienced problems with links such as <www.example.tld/pfad/zu/einer/pdf-Datei.pdf>
-			$result4 = preg_replace_callback( $Expr, function ($match) {
+			$result4 = preg_replace_callback($Expr, function($match) {
 					//error_log(__METHOD__.__LINE__.array2string($match));
-					if ($match[4]==';' && (strlen($match[3])-4) >=0 && strpos($match[3],'&gt',strlen($match[3])-4)!==false)
+					if ($match[4] == ';' && (strlen($match[3]) - 4) >= 0 && strpos($match[3], '&gt', strlen($match[3]) - 4) !== false)
 					{
-						$match[3] = substr($match[3],0,strpos($match[3],'&gt',strlen($match[3])-4));
+						$match[3] = substr($match[3], 0, strpos($match[3], '&gt', strlen($match[3]) - 4));
 						$match[4] = "&gt;";
 					}
-					if ($match[4]==';'&&$match[3]=="&gt")
+					if ($match[4] == ';' && $match[3] == "&gt")
 					{
-						$match[3] ='';
+						$match[3] = '';
 						$match[4] = "&gt;";
 					}
 					//error_log(__METHOD__.__LINE__.array2string($match));
 					return $match[1]."<a href=\"http://www".$match[2].$match[3]."\" target=\"_blank\">"."www".$match[2].$match[3]."</a>".$match[4];
-				}, $result3 );
+				}, $result3);
 		}
 		return $result4;
 	}
@@ -129,9 +129,9 @@ 
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @return string
 	 */
-	static function htmlspecialchars($str, $double_encoding=false)
+	static function htmlspecialchars($str, $double_encoding = false)
 	{
-		return htmlspecialchars($str,ENT_COMPAT,Translation::charset(),$double_encoding);
+		return htmlspecialchars($str, ENT_COMPAT, Translation::charset(), $double_encoding);
 	}
 
 	/**
@@ -146,36 +146,36 @@ 
 	 * @param boolean $enhanced Use enhanced selectbox with search.  Null for default yes if more than 12 options.
 	 * @return string to set for a template or to echo into html page
 	 */
-	static function select($name, $key, $arr=0,$no_lang=false,$options='',$multiple=0,$enhanced=null)
+	static function select($name, $key, $arr = 0, $no_lang = false, $options = '', $multiple = 0, $enhanced = null)
 	{
-		if(is_null($enhanced)) $enhanced = false;	//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if (is_null($enhanced)) $enhanced = false; //disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
-			$arr = array('no','yes');
+			$arr = array('no', 'yes');
 		}
 		if ((int)$multiple > 0)
 		{
 			$options .= ' multiple="1" size="'.(int)$multiple.'"';
-			if (substr($name,-2) != '[]')
+			if (substr($name, -2) != '[]')
 			{
 				$name .= '[]';
 			}
 		}
-		elseif($multiple < 0)
+		elseif ($multiple < 0)
 		{
 			$options .= ' size="'.abs($multiple).'"';
 		}
 		// fix width for MSIE < 9 in/for selectboxes
 		if (Header\UserAgent::type() == 'msie' && Header\UserAgent::version() < 9)
 		{
-			if (stripos($options,'onfocus="') === false)
+			if (stripos($options, 'onfocus="') === false)
 			{
 				$options .= ' onfocus="window.dropdown_menu_hack(this);" ';
 			}
 			else
 			{
-				$options = str_ireplace('onfocus="','onfocus="window.dropdown_menu_hack(this);',$options);
+				$options = str_ireplace('onfocus="', 'onfocus="window.dropdown_menu_hack(this);', $options);
 			}
 		}
 		$out = "<select name=\"$name\" $options>\n";
@@ -183,14 +183,14 @@ 
 		if (!is_array($key))
 		{
 			// explode on ',' only if multiple values expected and the key contains just numbers and commas
-			$key = $multiple > 0 && preg_match('/^[,0-9]+$/',$key) ? explode(',',$key) : array($key);
+			$key = $multiple > 0 && preg_match('/^[,0-9]+$/', $key) ? explode(',', $key) : array($key);
 		}
-		foreach($arr as $k => $data)
+		foreach ($arr as $k => $data)
 		{
 			if (!is_array($data) || count($data) == 2 && isset($data['label']) && isset($data['title']))
 			{
-				$out .= self::select_option($k,is_array($data)?$data['label']:$data,$key,$no_lang,
-					is_array($data)?$data['title']:'');
+				$out .= self::select_option($k, is_array($data) ? $data['label'] : $data, $key, $no_lang,
+					is_array($data) ? $data['title'] : '');
 			}
 			else
 			{
@@ -201,19 +201,19 @@ 
 				}
 				$out .= '<optgroup label="'.self::htmlspecialchars($no_lang || $k == '' ? $k : lang($k))."\">\n";
 
-				foreach($data as $k => $label)
+				foreach ($data as $k => $label)
 				{
-					$out .= self::select_option($k,is_array($label)?$label['label']:$label,$key,$no_lang,
-						is_array($label)?$label['title']:'');
+					$out .= self::select_option($k, is_array($label) ? $label['label'] : $label, $key, $no_lang,
+						is_array($label) ? $label['title'] : '');
 				}
 				$out .= "</optgroup>\n";
 			}
 		}
 		$out .= "</select>\n";
 
-		if($enhanced) {
+		if ($enhanced) {
 			Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js');
-			Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
+			Framework::includeCSS('/api/js/jquery/chosen/chosen.css', null, false);
 			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
 		}
 		return $out;
@@ -235,39 +235,39 @@ 
 	 * @param string $style ='' extra style settings like "width: 100%", default '' none
 	 * @return string to set for a template or to echo into html page
 	 */
-	static function checkbox_multiselect($name, $key, $arr=0,$no_lang=false,$options='',$multiple=3,$selected_first=true,$style='',$enhanced = null)
+	static function checkbox_multiselect($name, $key, $arr = 0, $no_lang = false, $options = '', $multiple = 3, $selected_first = true, $style = '', $enhanced = null)
 	{
 		//echo "<p align=right>checkbox_multiselect('$name',".array2string($key).",".array2string($arr).",$no_lang,'$options',$multiple,$selected_first,'$style')</p>\n";
-		if(is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if (is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
-			$arr = array('no','yes');
+			$arr = array('no', 'yes');
 		}
 		if ((int)$multiple <= 0) $multiple = 1;
 
-		if (substr($name,-2) != '[]')
+		if (substr($name, -2) != '[]')
 		{
 			$name .= '[]';
 		}
-		$base_name = substr($name,0,-2);
+		$base_name = substr($name, 0, -2);
 
-		if($enhanced) return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		if ($enhanced) return self::select($name, $key, $arr, $no_lang, $options." style=\"$style\" ", $multiple, $enhanced);
 
 		if (!is_array($key))
 		{
 			// explode on ',' only if multiple values expected and the key contains just numbers and commas
-			$key = preg_match('/^[,0-9]+$/',$key) ? explode(',',$key) : array($key);
+			$key = preg_match('/^[,0-9]+$/', $key) ? explode(',', $key) : array($key);
 		}
 		$html = '';
-		$options_no_id = preg_replace('/id="[^"]+"/i','',$options);
+		$options_no_id = preg_replace('/id="[^"]+"/i', '', $options);
 
 		if ($selected_first)
 		{
 			$selected = $not_selected = array();
-			foreach($arr as $val => $label)
+			foreach ($arr as $val => $label)
 			{
-				if (in_array((string)$val,$key))
+				if (in_array((string)$val, $key))
 				{
 					$selected[$val] = $label;
 				}
@@ -279,7 +279,7 @@ 
 			$arr = $selected + $not_selected;
 		}
 		$max_len = 0;
-		foreach($arr as $val => $label)
+		foreach ($arr as $val => $label)
 		{
 			if (is_array($label))
 			{
@@ -295,16 +295,16 @@ 
 
 			if (strlen($label) > $max_len) $max_len = strlen($label);
 
-			$html .= self::label(self::checkbox($name,in_array((string)$val,$key),$val,$options_no_id.
+			$html .= self::label(self::checkbox($name, in_array((string)$val, $key), $val, $options_no_id.
 				' id="'.$base_name.'['.$val.']'.'"').self::htmlspecialchars($label),
-				$base_name.'['.$val.']','',($title ? 'title="'.self::htmlspecialchars($title).'" ':''))."<br />\n";
+				$base_name.'['.$val.']', '', ($title ? 'title="'.self::htmlspecialchars($title).'" ' : ''))."<br />\n";
 		}
-		if ($style && substr($style,-1) != ';') $style .= '; ';
-		if (strpos($style,'height')===false) $style .= 'height: '.(1.7*$multiple).'em; ';
-		if (strpos($style,'width')===false)  $style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		if ($style && substr($style, -1) != ';') $style .= '; ';
+		if (strpos($style, 'height') === false) $style .= 'height: '.(1.7 * $multiple).'em; ';
+		if (strpos($style, 'width') === false)  $style .= 'width: '.(4 + $max_len * ($max_len < 15 ? 0.65 : 0.6)).'em; ';
 		$style .= 'background-color: white; overflow: auto; border: lightgray 2px inset; text-align: left;';
 
-		return self::div($html,$options,'',$style);
+		return self::div($html, $options, '', $style);
 	}
 
 	/**
@@ -317,23 +317,23 @@ 
 	 * @param string $extra extra text, e.g.: style="", default: ''
 	 * @return string html
 	 */
-	static function select_option($value,$label,$selected,$no_lang=0,$title='',$extra='')
+	static function select_option($value, $label, $selected, $no_lang = 0, $title = '', $extra = '')
 	{
 		// the following compares strict as strings, to archive: '0' == 0 != ''
 		// the first non-strict search via array_search, is for performance reasons, to not always search the whole array with php
-		if (($found = ($key = array_search($value,$selected)) !== false) && (string) $value !== (string) $selected[$key])
+		if (($found = ($key = array_search($value, $selected)) !== false) && (string)$value !== (string)$selected[$key])
 		{
 			$found = false;
-			foreach($selected as $sel)
+			foreach ($selected as $sel)
 			{
-				if (($found = (((string) $value) === ((string) $selected[$key])))) break;
+				if (($found = (((string)$value) === ((string)$selected[$key])))) break;
 			}
 			unset($sel);
 		}
-		return '<option value="'.self::htmlspecialchars($value).'"'.($found  ? ' selected="selected"' : '') .
-			($title ? ' title="'.self::htmlspecialchars($no_lang ? $title : lang($title)).'"' : '') .
-			($extra ? ' ' . $extra : '') . '>'.
-			self::htmlspecialchars($no_lang || $label == '' ? $label : lang($label)) . "</option>\n";
+		return '<option value="'.self::htmlspecialchars($value).'"'.($found ? ' selected="selected"' : '').
+			($title ? ' title="'.self::htmlspecialchars($no_lang ? $title : lang($title)).'"' : '').
+			($extra ? ' '.$extra : '').'>'.
+			self::htmlspecialchars($no_lang || $label == '' ? $label : lang($label))."</option>\n";
 	}
 
 	/**
@@ -345,7 +345,7 @@ 
 	 * @param string $style css-styles attribute, default ''=none
 	 * @return string html
 	 */
-	static function div($content,$options='',$class='',$style='')
+	static function div($content, $options = '', $class = '', $style = '')
 	{
 		if ($class) $options .= ' class="'.$class.'"';
 		if ($style) $options .= ' style="'.$style.'"';
@@ -361,13 +361,13 @@ 
 	 * @param boolean $ignore_empty if true all empty, zero (!) or unset values, plus filer=none
 	 * @param string html
 	 */
-	static function input_hidden($vars,$value='',$ignore_empty=True)
+	static function input_hidden($vars, $value = '', $ignore_empty = True)
 	{
 		if (!is_array($vars))
 		{
-			$vars = array( $vars => $value );
+			$vars = array($vars => $value);
 		}
-		foreach($vars as $name => $value)
+		foreach ($vars as $name => $value)
 		{
 			if (is_array($value))
 			{
@@ -390,9 +390,9 @@ 
 	 * @param boolean $double_encoding =false do we want double encoding or not, default no
 	 * @param string html
 	 */
-	static function textarea($name,$value='',$options='',$double_encoding=false)
+	static function textarea($name, $value = '', $options = '', $double_encoding = false)
 	{
-		return "<textarea name=\"$name\" $options>".self::htmlspecialchars($value,$double_encoding)."</textarea>\n";
+		return "<textarea name=\"$name\" $options>".self::htmlspecialchars($value, $double_encoding)."</textarea>\n";
 	}
 
 	/**
@@ -415,7 +415,7 @@ 
 	 *
 	 * creates a textarea inputfield for the htmlarea js-widget (returns the necessary html and js)
 	 */
-	static function htmlarea($name,$content='',$style='',$base_href=''/*,$plugins='',$custom_toolbar='',$set_width_height_in_config=false*/)
+	static function htmlarea($name, $content = '', $style = '', $base_href = ''/*,$plugins='',$custom_toolbar='',$set_width_height_in_config=false*/)
 	{
 		/*if (!self::htmlarea_availible())
 		{
@@ -439,16 +439,16 @@ 
 	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
 	* @return string the necessary html for the textarea
 	*/
-	static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
-		$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
+	static function fckEditor($_name, $_content, $_mode, $_options = array('toolbar_expanded' =>'true'),
+		$_height = '400px', $_width = '100%', $_start_path = '', $_purify = true, $_focusToBody = false, $_executeJSAfterInit = '')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')
 		{
-			return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
+			return self::textarea($_name, $_content, 'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
 		}
 
 		//include the ckeditor js file
-		Framework::includeJS('ckeditor','ckeditor','phpgwapi');
+		Framework::includeJS('ckeditor', 'ckeditor', 'phpgwapi');
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
@@ -465,13 +465,13 @@ 
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = Html\CkEditorConfig::font_size_from_prefs();
-		$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
+		$font_span = '<span '.($font || $font_size ? 'style=\"' : '').($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').'\">';
 		if (empty($font) && empty($font_size)) $font_span = '';
 
 		// we need to enable double encoding here, as ckEditor has to undo one level of encoding
 		// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
 		//error_log(__METHOD__.__LINE__.' '.Header\UserAgent::type().','.Header\UserAgent::version());
-		return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true).	// true = double encoding
+		return self::textarea($_name, $_content, 'id="'.htmlspecialchars($_name).'"', true).// true = double encoding
 '
 <script type="text/javascript">
 window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/";
@@ -484,22 +484,22 @@ 
 		function (ev)
 		{
 			//alert("CKEditorLoad:"+"'.$_focusToBody.'");
-'.($_focusToBody?'
+'.($_focusToBody ? '
 			ev.editor.focus();':'').'
 			var d = ev.editor.document;
 			var r = new CKEDITOR.dom.range(d);
 			r.collapse(true);
 			r.selectNodeContents(d.getBody());
-			r.collapse('.($_focusToBody==='BOTTOM'?'false':'true').');
-			r.select();'.($font_span?'
+			r.collapse('.($_focusToBody === 'BOTTOM' ? 'false' : 'true').');
+			r.select();'.($font_span ? '
 			//this stuff is needed, as the above places the caret just before the span tag
 			var sN = r.startContainer.getNextSourceNode();
 			//FF is selecting the span with getNextSourceNode, other browsers need to fetch it with getNext
 			r.selectNodeContents(((typeof sN.getName==="function") && sN.getName()=="span"?r.startContainer.getNextSourceNode():r.startContainer.getNextSourceNode().getNext()));
 			r.collapse(true);
-			r.select();'.'':'').'
+			r.select();'.'' : '').'
 			ev.editor.resize("100%", '.str_replace('px', '', $pxheight).');
-'.($_executeJSAfterInit?$_executeJSAfterInit:'').'
+'.($_executeJSAfterInit ? $_executeJSAfterInit : '').'
 		}
 	);'.
 	(trim($_content) == '' && $font_span ? 'CKEDITOR.instances["'.$_name.'"].setData("'.$font_span.'&#8203;</span>");' : '').
@@ -524,16 +524,16 @@ 
 	* @param string $_executeJSAfterInit ='' Javascript to be executed after InstanceReady of CKEditor
 	* @return string the necessary html for the textarea
 	*/
-	static function fckEditorQuick($_name, $_mode, $_content='', $_height='400px', $_width='100%',$_purify=true, $_border='0px',$_focusToBody=false,$_executeJSAfterInit='')
+	static function fckEditorQuick($_name, $_mode, $_content = '', $_height = '400px', $_width = '100%', $_purify = true, $_border = '0px', $_focusToBody = false, $_executeJSAfterInit = '')
 	{
 		if (!self::htmlarea_availible() || $_mode == 'ascii')
 		{
 			//TODO: use self::textarea
-			return "<textarea name=\"$_name\" style=\"".($_width?" width:".$_width.';':" width:100%;").($_height?" height:".$_height.';':" height:400px;").($_border?" border:".$_border.';':" border:0px;")."\">$_content</textarea>";
+			return "<textarea name=\"$_name\" style=\"".($_width ? " width:".$_width.';' : " width:100%;").($_height ? " height:".$_height.';' : " height:400px;").($_border ? " border:".$_border.';' : " border:0px;")."\">$_content</textarea>";
 		}
 		else
 		{
-			return self::fckEditor($_name, $_content, $_mode, array(), $_height, $_width,'',$_purify,$_focusToBody,$_executeJSAfterInit);
+			return self::fckEditor($_name, $_content, $_mode, array(), $_height, $_width, '', $_purify, $_focusToBody, $_executeJSAfterInit);
 		}
 	}
 
@@ -545,7 +545,7 @@ 
 	 * @param string $type type, default ''=not specified = text
 	 * @param string $options attributes for the tag, default ''=none
 	 */
-	static function input($name,$value='',$type='',$options='' )
+	static function input($name, $value = '', $type = '', $options = '')
 	{
 		switch ((string)$type)
 		{
@@ -572,12 +572,12 @@ 
 		'cancelled' => '/no(&|\]|$)/',
 		'ok'     => '/ok(&|\]|$)/',
 		'close'  => '/close(&|\]|$)/',
-		'add'    => '/(add(&|\]|$)|create)/',	// customfields use create*
+		'add'    => '/(add(&|\]|$)|create)/', // customfields use create*
 	);
 
 	static protected $default_classes = array(
-		'et2_button_cancel'   => '/cancel(&|\]|$)/',	// yellow
-		'et2_button_question' => '/(yes|no)(&|\]|$)/',	// yellow
+		'et2_button_cancel'   => '/cancel(&|\]|$)/', // yellow
+		'et2_button_question' => '/(yes|no)(&|\]|$)/', // yellow
 		'et2_button_delete'   => '/delete(&|\]|$)/'		// red
 	);
 
@@ -594,7 +594,7 @@ 
 	 * @param string $buttontype which type of html button (button|submit), default ='submit'
 	 * @return string html
 	 */
-	static function submit_button($name,$label,$onClick='',$no_lang=false,$options='',$image='',$app='phpgwapi', $buttontype='submit')
+	static function submit_button($name, $label, $onClick = '', $no_lang = false, $options = '', $image = '', $app = 'phpgwapi', $buttontype = 'submit')
 	{
 		// workaround for idots and IE button problem (wrong cursor-image)
 		if (Header\UserAgent::type() == 'msie')
@@ -606,11 +606,11 @@ 
 
 		if ($image != '')
 		{
-			$image = str_replace(array('.gif','.GIF','.png','.PNG'),'',$image);
+			$image = str_replace(array('.gif', '.GIF', '.png', '.PNG'), '', $image);
 
 			if (!($path = Image::find($app, $image)))
 			{
-				$path = $image;		// name may already contain absolut path
+				$path = $image; // name may already contain absolut path
 			}
 			$image = ' src="'.$path.'"';
 			$classes[] = 'image_button';
@@ -619,11 +619,11 @@ 
 		{
 			$label = lang($label);
 		}
-		if (($accesskey = @strstr($label,'&')) && $accesskey[1] != ' ' &&
-			(($pos = strpos($accesskey,';')) === false || $pos > 5))
+		if (($accesskey = @strstr($label, '&')) && $accesskey[1] != ' ' &&
+			(($pos = strpos($accesskey, ';')) === false || $pos > 5))
 		{
-			$label_u = str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);
-			$label = str_replace('&','',$label);
+			$label_u = str_replace('&'.$accesskey[1], '<u>'.$accesskey[1].'</u>', $label);
+			$label = str_replace('&', '', $label);
 			$options .= ' accesskey="'.$accesskey[1].'" '.$options;
 		}
 		else
@@ -631,10 +631,10 @@ 
 			$accesskey = '';
 			$label_u = $label;
 		}
-		if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		if ($onClick) $options .= ' onclick="'.str_replace('"', '\\"', $onClick).'"';
 
 		// add default background-image to get et2 like buttons
-		foreach(self::$default_background_images as $img => $reg_exp)
+		foreach (self::$default_background_images as $img => $reg_exp)
 		{
 			if (preg_match($reg_exp, $name) && ($url = Image::find($GLOBALS['egw_info']['flags']['currentapp'], $img)))
 			{
@@ -644,7 +644,7 @@ 
 			}
 		}
 		// add default class for cancel, delete or yes/no buttons
-		foreach(self::$default_classes as $class => $reg_exp)
+		foreach (self::$default_classes as $class => $reg_exp)
 		{
 			if (preg_match($reg_exp, $name))
 			{
@@ -678,19 +678,19 @@ 
 	 * @param array|string $vars query or array ('name' => 'value', ...) with query
 	 * @return string absolut link already run through $phpgw->link
 	 */
-	static function link($_url,$vars='')
+	static function link($_url, $vars = '')
 	{
 		if (!is_array($vars))
 		{
-			parse_str($vars,$vars);
+			parse_str($vars, $vars);
 		}
-		list($url,$v) = explode('?', $_url);	// url may contain additional vars
+		list($url, $v) = explode('?', $_url); // url may contain additional vars
 		if ($v)
 		{
-			parse_str($v,$v);
+			parse_str($v, $v);
 			$vars += $v;
 		}
-		return Framework::link($url,$vars);
+		return Framework::link($url, $vars);
 	}
 
 	/**
@@ -702,9 +702,9 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string html
 	 */
-	static function checkbox($name,$checked=false,$value='True',$options='')
+	static function checkbox($name, $checked = false, $value = 'True', $options = '')
 	{
-		return '<input type="checkbox" name="'.$name.'" value="'.self::htmlspecialchars($value).'"' .($checked ? ' checked="1"' : '') . "$options />\n";
+		return '<input type="checkbox" name="'.$name.'" value="'.self::htmlspecialchars($value).'"'.($checked ? ' checked="1"' : '')."$options />\n";
 	}
 
 	/**
@@ -719,7 +719,7 @@ 
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html
 	 */
-	static function form($content,$hidden_vars,$_url,$url_vars='',$name='',$options='',$method='POST')
+	static function form($content, $hidden_vars, $_url, $url_vars = '', $name = '', $options = '', $method = 'POST')
 	{
 		$url = $_url ? self::link($_url, $url_vars) : $_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'];
 		$html = "<form method=\"$method\" ".($name != '' ? "name=\"$name\" " : '')."action=\"$url\" $options>\n";
@@ -746,9 +746,9 @@ 
 	 * @param string $method method of the form, default 'POST'
 	 * @return string html
 	 */
-	static function form_1button($name,$label,$hidden_vars,$url,$url_vars='',$form_name='',$method='POST')
+	static function form_1button($name, $label, $hidden_vars, $url, $url_vars = '', $form_name = '', $method = 'POST')
 	{
-		return self::form(self::submit_button($name,$label),$hidden_vars,$url,$url_vars,$form_name,' style="display: inline-block"',$method);
+		return self::form(self::submit_button($name, $label), $hidden_vars, $url, $url_vars, $form_name, ' style="display: inline-block"', $method);
 	}
 
 	const THEAD = 1;
@@ -781,34 +781,34 @@ 
 	 * @param boolean $no_table_tr dont return the table- and outmost tr-tabs, default false=return table+tr
 	 * @return string with html-code of the table
 	 */
-	static function table($rows,$options = '',$no_table_tr=False)
+	static function table($rows, $options = '', $no_table_tr = False)
 	{
 		$html = $no_table_tr ? '' : "<table $options>\n";
 
 		$part = 0;
-		foreach($rows as $key => $row)
+		foreach ($rows as $key => $row)
 		{
 			if (!is_array($row))
 			{
-				continue;					// parameter
+				continue; // parameter
 			}
 			// get the current part from the optional 'h' or 'f' prefix of the key
 			$p = $key[0] == 'h' ? self::THEAD : ($key[0] == 'f' ? self::TFOOT : self::TBODY);
 			if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
 			{
 				if ($part) $html .= '</'.self::$part2tag[$part].">\n";
-				$html .= '<'.self::$part2tag[$part=$p].">\n";
+				$html .= '<'.self::$part2tag[$part = $p].">\n";
 			}
 			$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
 
-			foreach($row as $key => $cell)
+			foreach ($row as $key => $cell)
 			{
 				if ($key[0] == '.')
 				{
-					continue;				// parameter
+					continue; // parameter
 				}
-				$table_pos = strpos($cell,'<table');
-				$td_pos = strpos($cell,'<td');
+				$table_pos = strpos($cell, '<table');
+				$td_pos = strpos($cell, '<td');
 				if ($td_pos !== False && ($table_pos === False || $td_pos < $table_pos))
 				{
 					$html .= $cell;
@@ -832,7 +832,7 @@ 
 
 		if ($no_table_tr)
 		{
-			$html = substr($html,0,-16);
+			$html = substr($html, 0, -16);
 		}
 		return $html;
 	}
@@ -844,12 +844,12 @@ 
 	 * @param boolean $no_script if true generate a submit-button if javascript is off
 	 * @return string html
 	 */
-	static function sbox_submit( $sbox,$no_script=false )
+	static function sbox_submit($sbox, $no_script = false)
 	{
-		$html = str_replace('<select','<select onchange="this.form.submit()" ',$sbox);
+		$html = str_replace('<select', '<select onchange="this.form.submit()" ', $sbox);
 		if ($no_script)
 		{
-			$html .= '<noscript>'.self::submit_button('send','>').'</noscript>';
+			$html .= '<noscript>'.self::submit_button('send', '>').'</noscript>';
 		}
 		return $html;
 	}
@@ -865,11 +865,11 @@ 
 	 * @param string $height height, default 5px
 	 * @return string html
 	 */
-	static function progressbar($_percent, $_title='',$options='',$width='',$color='',$height='' )
+	static function progressbar($_percent, $_title = '', $options = '', $width = '', $color = '', $height = '')
 	{
 		$percent = (int)$_percent;
 		if (!$width) $width = '30px';
-		if (!$height)$height= '5px';
+		if (!$height)$height = '5px';
 		if (!$color) $color = '#D00000';
 		$title = $_title ? self::htmlspecialchars($_title) : $percent.'%';
 
@@ -879,7 +879,7 @@ 
 		}
 		return '<div class="onlyPrint">'.$title.'</div><div class="noPrint" title="'.$title.'" '.$options.
 			' style="height: '.$height.'; width: '.$width.'; border: 1px solid black; padding: 1px; text-align: left;'.
-			(@stristr($options,'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
+			(@stristr($options, 'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
 			'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n";
 	}
 
@@ -897,32 +897,32 @@ 
 	 * @param string $options further options for the tag, default '' = none
 	 * @return string the html
 	 */
-	static function image( $app,$name,$title='',$options='' )
+	static function image($app, $name, $title = '', $options = '')
 	{
 		if (is_array($name))	// menuaction and other get-vars
 		{
-			$name = $GLOBALS['egw']->link('/index.php',$name);
+			$name = $GLOBALS['egw']->link('/index.php', $name);
 		}
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		if (substr($name, 0, 5) == 'vfs:/')	// vfs pseudo protocoll
 		{
-			$name = Framework::link(Vfs::download_url(substr($name,4)));
+			$name = Framework::link(Vfs::download_url(substr($name, 4)));
 		}
-		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'api/thumbnail.php') )
+		if ($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://' || stripos($name, 'api/thumbnail.php'))
 		{
-			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
+			if (!($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://')) $name = '/'.$name;
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
 		{
-			$name = str_replace(array('.gif','.GIF','.png','.PNG'),'',$name);
+			$name = str_replace(array('.gif', '.GIF', '.png', '.PNG'), '', $name);
 
-			if (!($url = Image::find($app,$name)))
+			if (!($url = Image::find($app, $name)))
 			{
-				$url = $name;		// name may already contain absolut path
+				$url = $name; // name may already contain absolut path
 			}
-			if($GLOBALS['egw_info']['server']['webserver_url'])
+			if ($GLOBALS['egw_info']['server']['webserver_url'])
 			{
-				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
+				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'], $url);
 
 				if (!is_null($path)) $path = EGW_SERVER_ROOT.$path;
 			}
@@ -931,12 +931,12 @@ 
 				$path = EGW_SERVER_ROOT.$url;
 			}
 
-			if (is_null($path) || (!@is_readable($path) && stripos($path,'webdav.php')===false))
+			if (is_null($path) || (!@is_readable($path) && stripos($path, 'webdav.php') === false))
 			{
 				// if the image-name is a percentage, use a progressbar
-				if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
+				if (substr($name, -1) == '%' && is_numeric($percent = substr($name, 0, -1)))
 				{
-					return self::progressbar($percent,$title);
+					return self::progressbar($percent, $title);
 				}
 				return $title;
 			}
@@ -947,12 +947,12 @@ 
 		}
 
 		// This block makes pngfix.js useless, adding a check on disable_pngfix to have pngfix.js do its thing
-		if (Header\UserAgent::type() == 'msie' && Header\UserAgent::version() < 7.0 && substr($url,-4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
+		if (Header\UserAgent::type() == 'msie' && Header\UserAgent::version() < 7.0 && substr($url, -4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
 		{
 			$extra_styles = "display: inline-block; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$url',sizingMethod='image'); width: 1px; height: 1px;";
-			if (false!==strpos($options,'style="'))
+			if (false !== strpos($options, 'style="'))
 			{
-				$options = str_replace('style="','style="'.$extra_styles, $options);
+				$options = str_replace('style="', 'style="'.$extra_styles, $options);
 			}
 			else
 			{
@@ -972,24 +972,24 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function a_href( $content,$url,$vars='',$options='')
+	static function a_href($content, $url, $vars = '', $options = '')
 	{
 		if (is_array($url))
 		{
 			$vars = $url;
 			$url = '/index.php';
 		}
-		elseif (strpos($url,'/')===false &&
-			count(explode('.',$url)) >= 3 &&
-			!(strpos($url,'mailto:')!==false ||
-			strpos($url,'://')!==false ||
-			strpos($url,'javascript:')!==false))
+		elseif (strpos($url, '/') === false &&
+			count(explode('.', $url)) >= 3 &&
+			!(strpos($url, 'mailto:') !== false ||
+			strpos($url, '://') !== false ||
+			strpos($url, 'javascript:') !== false))
 		{
 			$url = "/index.php?menuaction=$url";
 		}
 		if ($url[0] == '/')		// link relative to eGW
 		{
-			$url = self::link($url,$vars);
+			$url = self::link($url, $vars);
 		}
 		//echo "<p>self::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
 		return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';
@@ -1003,7 +1003,7 @@ 
 	 */
 	static function bold($content)
 	{
-		return '<b>'.($content?$content.'</b>':'');
+		return '<b>'.($content ? $content.'</b>' : '');
 	}
 
 	/**
@@ -1013,7 +1013,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function hr($width='',$options='')
+	static function hr($width = '', $options = '')
 	{
 		if ($width) $options .= " width=\"$width\"";
 
@@ -1029,12 +1029,12 @@ 
 	 * @param mixed $names String (or Array) with the option-names eg. 'WIDTH,HEIGHT,BORDER'
 	 * @return string with options/attributes
 	 */
-	static function formatOptions($options,$names)
+	static function formatOptions($options, $names)
 	{
-		if (!is_array($options)) $options = explode(',',$options);
-		if (!is_array($names))   $names   = explode(',',$names);
+		if (!is_array($options)) $options = explode(',', $options);
+		if (!is_array($names))   $names   = explode(',', $names);
 
-		foreach($options as $n => $val)
+		foreach ($options as $n => $val)
 		{
 			if ($val != '' && $names[$n] != '')
 			{
@@ -1064,7 +1064,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function label($content,$id='',$accesskey='',$options='')
+	static function label($content, $id = '', $accesskey = '', $options = '')
 	{
 		if ($id != '')
 		{
@@ -1085,7 +1085,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function fieldset($content,$legend='',$options='')
+	static function fieldset($content, $legend = '', $options = '')
 	{
 		$html = "<fieldset $options>".($legend ? '<legend>'.self::htmlspecialchars($legend).'</legend>' : '')."\n";
 
@@ -1119,9 +1119,9 @@ 
 	 *
 	 * @return string the html code, to be added into the template
 	 */
-	static function tree($_folders,$_selected,$_topFolder=false,$_onNodeSelect="null",$tree='foldertree',$_divClass='',
-		$_leafImage='',$_onCheckHandler=false,$delimiter='/',$folderImageDir=null,$autoLoading=null,$dataMode='JSON',
-		$dragndrop=false)
+	static function tree($_folders, $_selected, $_topFolder = false, $_onNodeSelect = "null", $tree = 'foldertree', $_divClass = '',
+		$_leafImage = '', $_onCheckHandler = false, $delimiter = '/', $folderImageDir = null, $autoLoading = null, $dataMode = 'JSON',
+		$dragndrop = false)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($folderImageDir))
@@ -1144,7 +1144,7 @@ 
 			//error_log(__METHOD__."() setting templated image-path: $folderImageDir");
 		}
 
-		static $tree_initialised=false;
+		static $tree_initialised = false;
 		if (!$tree_initialised)
 		{
 			Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlxtree.css');
@@ -1154,16 +1154,16 @@ 
 			$tree_initialised = true;
 			if (!$_folders && !$autoLoading) return null;
 		}
-		$html = self::div("\n",'id="'.$tree.'"',$_divClass).$html;
+		$html = self::div("\n", 'id="'.$tree.'"', $_divClass).$html;
 		$html .= "<script type='text/javascript'>\n";
 		$html .= "var $tree;";
 		$html .= "egw_LAB.wait(function() {";
 		$html .= "$tree = new"." dhtmlXTreeObject('$tree','100%','100%',0);\n";
-		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
+		$html .= "$tree.parentObject.style.overflow='auto';\n"; // dhtmlXTree constructor has hidden hardcoded
 		if (Translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
 		$html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";
 
-		if($_onCheckHandler)
+		if ($_onCheckHandler)
 		{
 			$html .= "$tree.enableCheckBoxes(1);\n";
 			$html .= "$tree.setOnCheckHandler('$_onCheckHandler');\n";
@@ -1174,7 +1174,7 @@ 
 		if ($autoLoading)
 		{
 			$autoLoading = is_array($autoLoading) ?
-				Framework::link('/index.php',$autoLoading) : Framework::link($autoLoading);
+				Framework::link('/index.php', $autoLoading) : Framework::link($autoLoading);
 			$html .= "$tree.setXMLAutoLoading('$autoLoading');\n";
 			if ($dataMode != 'XML') $html .= "$tree.setDataMode('$dataMode');\n";
 
@@ -1215,7 +1215,7 @@ 
 		}
 		if (is_string($_folders))
 		{
-			switch($dataMode)
+			switch ($dataMode)
 			{
 				case 'JSON':
 					$html .= "$tree.loadJSONObject($_folders);\n"; break;
@@ -1226,10 +1226,10 @@ 
 		else
 		{
 			// evtl. remove leading delimiter
-			if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
+			if ($_selected[0] == $delimiter) $_selected = substr($_selected, 1);
 
 			$n = 0;
-			foreach($_folders as $path => $data)
+			foreach ($_folders as $path => $data)
 			{
 				if (!is_array($data))
 				{
@@ -1241,10 +1241,10 @@ 
 				if ($_leafImage)
 				{
 					$image1 = $image2 = $image3 = "'".$_leafImage."'";
-					if (($next_item = array_slice($_folders, $n+1, 1, true)))
+					if (($next_item = array_slice($_folders, $n + 1, 1, true)))
 					{
 						list($next_path) = each($next_item);
-						if (substr($next_path,0,strlen($path)+1) == $path.'/')
+						if (substr($next_path, 0, strlen($path) + 1) == $path.'/')
 						{
 							$image1 = $image2 = $image3 = '0';
 						}
@@ -1255,22 +1255,22 @@ 
 					$image1 = $image2 = $image3 = "'".$data['image']."'";
 				}
 				// evtl. remove leading delimiter
-				if ($path[0] == $delimiter) $path = substr($path,1);
-				$folderParts = explode($delimiter,$path);
+				if ($path[0] == $delimiter) $path = substr($path, 1);
+				$folderParts = explode($delimiter, $path);
 
 				//get rightmost folderpart
 				$label = array_pop($folderParts);
 				if (isset($data['label'])) $label = $data['label'];
 
 				// the rest of the array is the name of the parent
-				$parentName = implode((array)$folderParts,$delimiter);
-				if(empty($parentName)) $parentName = $top;
+				$parentName = implode((array)$folderParts, $delimiter);
+				if (empty($parentName)) $parentName = $top;
 
 				$entryOptions = !isset($data['child']) || $data['child'] ? 'CHILD' : '';
 				if ($_onCheckHandler && $_selected)	// check selected items on multi selection
 				{
-					if (!is_array($_selected)) $_selected = explode(',',$_selected);
-					if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
+					if (!is_array($_selected)) $_selected = explode(',', $_selected);
+					if (array_search("$path", $_selected) !== false) $entryOptions .= ',CHECKED';
 					//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
 				}
 				// highlight current item
@@ -1290,7 +1290,7 @@ 
 		$html .= "$tree.closeAllItems(0);\n";
 		if ($_selected)
 		{
-			foreach(is_array($_selected)?$_selected:array($_selected) as $path)
+			foreach (is_array($_selected) ? $_selected : array($_selected) as $path)
 			{
 				$html .= "$tree.openItem('".addslashes($path)."');\n";
 			}
@@ -1315,7 +1315,7 @@ 
 	 *		or to restrict the attribute's values
 	 * @param boolean $_force =null - force the config passed to be used without merging to the default
 	 */
-	static function purify($html,$config=null,$spec=array(),$_force=false)
+	static function purify($html, $config = null, $spec = array(), $_force = false)
 	{
 		return Html\HtmLawed::purify($html, $config, $spec, $_force);
 	}

Braces +183 added lines, -47 removed lines

@@ -34,7 +34,11 @@ 
 	 */
 	static function activate_links($content)
 	{
-		if (!$content || strlen($content) < 20) return $content;	// performance
+		if (!$content || strlen($content) < 20)
+		{
+			return $content;
+		}
+		// performance
 
 		// Exclude everything which is already a link
 		$NotAnchor = '(?<!"|href=|href\s=\s|href=\s|href\s=)';
@@ -57,10 +61,14 @@ 
 			return $match[1]."<a href=\"".($match[2]&&!$match[3]?$match[2]:'').($match[3]?$match[3]:'').$match[4].$match[5]."\" target=\"_blank\">".$match[4].$match[5]."</a>".$match[6];
 		}, $result);
 
-		if (true)	// hack to keep IDE from complaing about double assignments
+		if (true)
+		{
+			// hack to keep IDE from complaing about double assignments
 		{
 			//  First match things beginning with http:// (or other protocols)
-			$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';	// only http:// gets removed, other protocolls are shown
+			$Protocol = '(http:\/\/|(ftp:\/\/|https:\/\/))';
+		}
+		// only http:// gets removed, other protocolls are shown
 			$Domain = '([\w-]+\.[\w-.]+)';
 			$Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?';
 			$optStuff = '(&quot;|&quot|;)?';
@@ -98,7 +106,8 @@ 
 			$Expr = '/' .$optBracket0. $NotAnchor . $NotHTTP . $Domain2 . $Subdir2 .$optBracket. '/i';
 			//$Expr = '/' . $NotAnchor . $NotHTTP . $Domain . $Subdir . $optBracket . '/i';
 			// use preg_replace_callback as we experienced problems with links such as <www.example.tld/pfad/zu/einer/pdf-Datei.pdf>
-			$result4 = preg_replace_callback( $Expr, function ($match) {
+			$result4 = preg_replace_callback( $Expr, function ($match)
+			{
 					//error_log(__METHOD__.__LINE__.array2string($match));
 					if ($match[4]==';' && (strlen($match[3])-4) >=0 && strpos($match[3],'&gt',strlen($match[3])-4)!==false)
 					{
@@ -148,7 +157,11 @@ 
 	 */
 	static function select($name, $key, $arr=0,$no_lang=false,$options='',$multiple=0,$enhanced=null)
 	{
-		if(is_null($enhanced)) $enhanced = false;	//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if(is_null($enhanced))
+		{
+			$enhanced = false;
+		}
+		//disabled by default (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
 
 		if (!is_array($arr))
 		{
@@ -211,7 +224,8 @@ 
 		}
 		$out .= "</select>\n";
 
-		if($enhanced) {
+		if($enhanced)
+		{
 			Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js');
 			Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
 			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
@@ -238,13 +252,19 @@ 
 	static function checkbox_multiselect($name, $key, $arr=0,$no_lang=false,$options='',$multiple=3,$selected_first=true,$style='',$enhanced = null)
 	{
 		//echo "<p align=right>checkbox_multiselect('$name',".array2string($key).",".array2string($arr).",$no_lang,'$options',$multiple,$selected_first,'$style')</p>\n";
-		if(is_null($enhanced)) $enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		if(is_null($enhanced))
+		{
+			$enhanced = (count($arr) > self::SELECT_ENHANCED_ROW_COUNT);
+		}
 
 		if (!is_array($arr))
 		{
 			$arr = array('no','yes');
 		}
-		if ((int)$multiple <= 0) $multiple = 1;
+		if ((int)$multiple <= 0)
+		{
+			$multiple = 1;
+		}
 
 		if (substr($name,-2) != '[]')
 		{
@@ -252,7 +272,10 @@ 
 		}
 		$base_name = substr($name,0,-2);
 
-		if($enhanced) return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		if($enhanced)
+		{
+			return self::select($name, $key, $arr,$no_lang,$options." style=\"$style\" ",$multiple,$enhanced);
+		}
 
 		if (!is_array($key))
 		{
@@ -290,18 +313,36 @@ 
 			{
 				$title = '';
 			}
-			if ($label && !$no_lang) $label = lang($label);
-			if ($title && !$no_lang) $title = lang($title);
+			if ($label && !$no_lang)
+			{
+				$label = lang($label);
+			}
+			if ($title && !$no_lang)
+			{
+				$title = lang($title);
+			}
 
-			if (strlen($label) > $max_len) $max_len = strlen($label);
+			if (strlen($label) > $max_len)
+			{
+				$max_len = strlen($label);
+			}
 
 			$html .= self::label(self::checkbox($name,in_array((string)$val,$key),$val,$options_no_id.
 				' id="'.$base_name.'['.$val.']'.'"').self::htmlspecialchars($label),
 				$base_name.'['.$val.']','',($title ? 'title="'.self::htmlspecialchars($title).'" ':''))."<br />\n";
 		}
-		if ($style && substr($style,-1) != ';') $style .= '; ';
-		if (strpos($style,'height')===false) $style .= 'height: '.(1.7*$multiple).'em; ';
-		if (strpos($style,'width')===false)  $style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		if ($style && substr($style,-1) != ';')
+		{
+			$style .= '; ';
+		}
+		if (strpos($style,'height')===false)
+		{
+			$style .= 'height: '.(1.7*$multiple).'em; ';
+		}
+		if (strpos($style,'width')===false)
+		{
+			$style .= 'width: '.(4+$max_len*($max_len < 15 ? 0.65 : 0.6)).'em; ';
+		}
 		$style .= 'background-color: white; overflow: auto; border: lightgray 2px inset; text-align: left;';
 
 		return self::div($html,$options,'',$style);
@@ -326,7 +367,10 @@ 
 			$found = false;
 			foreach($selected as $sel)
 			{
-				if (($found = (((string) $value) === ((string) $selected[$key])))) break;
+				if (($found = (((string) $value) === ((string) $selected[$key]))))
+				{
+					break;
+				}
 			}
 			unset($sel);
 		}
@@ -347,8 +391,14 @@ 
 	 */
 	static function div($content,$options='',$class='',$style='')
 	{
-		if ($class) $options .= ' class="'.$class.'"';
-		if ($style) $options .= ' style="'.$style.'"';
+		if ($class)
+		{
+			$options .= ' class="'.$class.'"';
+		}
+		if ($style)
+		{
+			$options .= ' style="'.$style.'"';
+		}
 
 		return "<div $options>\n".($content ? "$content</div>\n" : '');
 	}
@@ -373,10 +423,13 @@ 
 			{
 				$value = json_encode($value);
 			}
-			if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none'))	// dont need to send all the empty vars
+			if (!$ignore_empty || $value && !($name == 'filter' && $value == 'none'))
+			{
+				// dont need to send all the empty vars
 			{
 				$html .= "<input type=\"hidden\" name=\"$name\" value=\"".self::htmlspecialchars($value)."\" />\n";
 			}
+			}
 		}
 		return $html;
 	}
@@ -452,7 +505,9 @@ 
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
-			$_content = self::purify($_content);
+		{
+					$_content = self::purify($_content);
+		}
 
 		// By default the editor start expanded
 		$expanded = isset($_options['toolbar_expanded']) ?
@@ -466,7 +521,10 @@ 
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = Html\CkEditorConfig::font_size_from_prefs();
 		$font_span = '<span '.($font||$font_size?'style=\"':'').($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'\">';
-		if (empty($font) && empty($font_size)) $font_span = '';
+		if (empty($font) && empty($font_size))
+		{
+			$font_span = '';
+		}
 
 		// we need to enable double encoding here, as ckEditor has to undo one level of encoding
 		// otherwise < and > chars eg. from html markup entered in regular (not source) input, will turn into html!
@@ -631,7 +689,10 @@ 
 			$accesskey = '';
 			$label_u = $label;
 		}
-		if ($onClick) $options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		if ($onClick)
+		{
+			$options .= ' onclick="'.str_replace('"','\\"',$onClick).'"';
+		}
 
 		// add default background-image to get et2 like buttons
 		foreach(self::$default_background_images as $img => $reg_exp)
@@ -794,9 +855,12 @@ 
 			}
 			// get the current part from the optional 'h' or 'f' prefix of the key
 			$p = $key[0] == 'h' ? self::THEAD : ($key[0] == 'f' ? self::TFOOT : self::TBODY);
-			if ($part < $p && ($part || $p < self::TBODY))	// add only allowed and neccessary transitions
+			if ($part < $p && ($part || $p < self::TBODY))
+			{
+				// add only allowed and neccessary transitions
 			{
 				if ($part) $html .= '</'.self::$part2tag[$part].">\n";
+			}
 				$html .= '<'.self::$part2tag[$part=$p].">\n";
 			}
 			$html .= $no_table_tr && $key == 1 ? '' : "\t<tr ".$rows['.'.$key].">\n";
@@ -824,10 +888,13 @@ 
 		{
 			echo "<p>".function_backtrace()."</p>\n";
 		}
-		if ($part)	// close current part
+		if ($part)
+		{
+			// close current part
 		{
 			$html .= "</".self::$part2tag[$part].">\n";
 		}
+		}
 		$html .= "</table>\n";
 
 		if ($no_table_tr)
@@ -868,9 +935,18 @@ 
 	static function progressbar($_percent, $_title='',$options='',$width='',$color='',$height='' )
 	{
 		$percent = (int)$_percent;
-		if (!$width) $width = '30px';
-		if (!$height)$height= '5px';
-		if (!$color) $color = '#D00000';
+		if (!$width)
+		{
+			$width = '30px';
+		}
+		if (!$height)
+		{
+			$height= '5px';
+		}
+		if (!$color)
+		{
+			$color = '#D00000';
+		}
 		$title = $_title ? self::htmlspecialchars($_title) : $percent.'%';
 
 		if (self::$netscape4)
@@ -899,17 +975,26 @@ 
 	 */
 	static function image( $app,$name,$title='',$options='' )
 	{
-		if (is_array($name))	// menuaction and other get-vars
+		if (is_array($name))
+		{
+			// menuaction and other get-vars
 		{
 			$name = $GLOBALS['egw']->link('/index.php',$name);
 		}
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		}
+		if (substr($name,0,5) == 'vfs:/')
+		{
+			// vfs pseudo protocoll
 		{
 			$name = Framework::link(Vfs::download_url(substr($name,4)));
 		}
+		}
 		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'api/thumbnail.php') )
 		{
-			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
+			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://'))
+			{
+				$name = '/'.$name;
+			}
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
@@ -924,7 +1009,10 @@ 
 			{
 				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
 
-				if (!is_null($path)) $path = EGW_SERVER_ROOT.$path;
+				if (!is_null($path))
+				{
+					$path = EGW_SERVER_ROOT.$path;
+				}
 			}
 			else
 			{
@@ -987,10 +1075,13 @@ 
 		{
 			$url = "/index.php?menuaction=$url";
 		}
-		if ($url[0] == '/')		// link relative to eGW
+		if ($url[0] == '/')
+		{
+			// link relative to eGW
 		{
 			$url = self::link($url,$vars);
 		}
+		}
 		//echo "<p>self::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
 		return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';
 	}
@@ -1015,7 +1106,10 @@ 
 	 */
 	static function hr($width='',$options='')
 	{
-		if ($width) $options .= " width=\"$width\"";
+		if ($width)
+		{
+			$options .= " width=\"$width\"";
+		}
 
 		return "<hr $options />\n";
 	}
@@ -1031,8 +1125,14 @@ 
 	 */
 	static function formatOptions($options,$names)
 	{
-		if (!is_array($options)) $options = explode(',',$options);
-		if (!is_array($names))   $names   = explode(',',$names);
+		if (!is_array($options))
+		{
+			$options = explode(',',$options);
+		}
+		if (!is_array($names))
+		{
+			$names   = explode(',',$names);
+		}
 
 		foreach($options as $n => $val)
 		{
@@ -1150,9 +1250,15 @@ 
 			Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlxtree.css');
 			Framework::includeJS('/api/js/dhtmlxtree/codebase/dhtmlxcommon.js');
 			Framework::includeJS('/api/js/dhtmlxtree/sources/dhtmlxtree.js');
-			if ($autoLoading && $dataMode != 'XML') Framework::includeJS('/api/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
+			if ($autoLoading && $dataMode != 'XML')
+			{
+				Framework::includeJS('/api/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
+			}
 			$tree_initialised = true;
-			if (!$_folders && !$autoLoading) return null;
+			if (!$_folders && !$autoLoading)
+			{
+				return null;
+			}
 		}
 		$html = self::div("\n",'id="'.$tree.'"',$_divClass).$html;
 		$html .= "<script type='text/javascript'>\n";
@@ -1160,7 +1266,10 @@ 
 		$html .= "egw_LAB.wait(function() {";
 		$html .= "$tree = new"." dhtmlXTreeObject('$tree','100%','100%',0);\n";
 		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
-		if (Translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
+		if (Translation::charset() == 'utf-8')
+		{
+			$html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
+		}
 		$html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";
 
 		if($_onCheckHandler)
@@ -1169,19 +1278,28 @@ 
 			$html .= "$tree.setOnCheckHandler('$_onCheckHandler');\n";
 		}
 
-		if ($dragndrop) $html .= "$tree.enableDragAndDrop(true);\n";
+		if ($dragndrop)
+		{
+			$html .= "$tree.enableDragAndDrop(true);\n";
+		}
 
 		if ($autoLoading)
 		{
 			$autoLoading = is_array($autoLoading) ?
 				Framework::link('/index.php',$autoLoading) : Framework::link($autoLoading);
 			$html .= "$tree.setXMLAutoLoading('$autoLoading');\n";
-			if ($dataMode != 'XML') $html .= "$tree.setDataMode('$dataMode');\n";
+			if ($dataMode != 'XML')
+			{
+				$html .= "$tree.setDataMode('$dataMode');\n";
+			}
 
 			// if no folders given, use xml url to load root, incl. setting of selected folder
 			if (!$_folders)
 			{
-				if ($_selected) $autoLoading .= '&selected='.urlencode($_selected);
+				if ($_selected)
+				{
+					$autoLoading .= '&selected='.urlencode($_selected);
+				}
 				unset($_selected);
 				$html .= "$tree.loadXML('$autoLoading');\n";
 				$html .= "});";
@@ -1226,7 +1344,10 @@ 
 		else
 		{
 			// evtl. remove leading delimiter
-			if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
+			if ($_selected[0] == $delimiter)
+			{
+				$_selected = substr($_selected,1);
+			}
 
 			$n = 0;
 			foreach($_folders as $path => $data)
@@ -1255,22 +1376,37 @@ 
 					$image1 = $image2 = $image3 = "'".$data['image']."'";
 				}
 				// evtl. remove leading delimiter
-				if ($path[0] == $delimiter) $path = substr($path,1);
+				if ($path[0] == $delimiter)
+				{
+					$path = substr($path,1);
+				}
 				$folderParts = explode($delimiter,$path);
 
 				//get rightmost folderpart
 				$label = array_pop($folderParts);
-				if (isset($data['label'])) $label = $data['label'];
+				if (isset($data['label']))
+				{
+					$label = $data['label'];
+				}
 
 				// the rest of the array is the name of the parent
 				$parentName = implode((array)$folderParts,$delimiter);
-				if(empty($parentName)) $parentName = $top;
+				if(empty($parentName))
+				{
+					$parentName = $top;
+				}
 
 				$entryOptions = !isset($data['child']) || $data['child'] ? 'CHILD' : '';
-				if ($_onCheckHandler && $_selected)	// check selected items on multi selection
+				if ($_onCheckHandler && $_selected)
+				{
+					// check selected items on multi selection
 				{
 					if (!is_array($_selected)) $_selected = explode(',',$_selected);
-					if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
+				}
+					if (array_search("$path",$_selected)!==false)
+					{
+						$entryOptions .= ',CHECKED';
+					}
 					//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
 				}
 				// highlight current item

api/src/Html/CkEditorConfig.php

Doc Comments +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * Only return skins existing in filesystem, as we disable / remove them if not compatible with supported browsers.
 	 *
-	 * @return array skin => label pairs alphabetical sorted with default moono first
+	 * @return string skin => label pairs alphabetical sorted with default moono first
 	 */
 	public static function getAvailableCKEditorSkins()
 	{
@@ -259,7 +259,7 @@ 
 	 * Adds all "easy to write" options to the configuration
 	 *
 	 * @param array& $config array were config get's added to
-	 * @param int|string $height integer height in pixel or string with css unit
+	 * @param integer $height integer height in pixel or string with css unit
 	 * @param boolean|string $expanded_toolbar show toolbar expanded, boolean value, string "false", or string casted to boolean
 	 * @param string $start_path start path for file browser
 	 */
@@ -451,7 +451,7 @@ 
 	/**
 	 * Adds extra
 	 * @param array $config
-	 * @param array $plugins plugins name which needs to be appended into extraPlugins
+	 * @param string[] $plugins plugins name which needs to be appended into extraPlugins
 	 */
 	public static function append_extraPlugins_config_array (&$config, $plugins)
 	{

Spacing +39 added lines, -41 removed lines

@@ -75,7 +75,7 @@ 
 		);
 		$skins = array();
 
-		foreach(scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
+		foreach (scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
 		{
 			if ($skin[0] == '.') continue;
 
@@ -95,7 +95,7 @@ 
 		if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']);
 
 		// return our default "moono" first
-		return isset($skins['moono']) ? array('moono' => $skins['moono'])+$skins : $skins;
+		return isset($skins['moono']) ? array('moono' => $skins['moono']) + $skins : $skins;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 * @param string &$unit =null on return just unit
 	 * @return string font-size including unit
 	 */
-	public static function font_size_from_prefs(array $prefs=null, &$size=null, &$unit=null)
+	public static function font_size_from_prefs(array $prefs = null, &$size = null, &$unit = null)
 	{
 		if (is_null($prefs)) $prefs = $GLOBALS['egw_info']['user']['preferences'];
 
@@ -117,7 +117,7 @@ 
 			$unit = 'px';
 			$size = (string)(int)$size;
 		}
-		return $size.($size?$unit:'');
+		return $size.($size ? $unit : '');
 	}
 
 	/**
@@ -128,12 +128,11 @@ 
 	{
 		//use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang
 		self::$lang = ($GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang'] ?
-			$GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang']:
-			$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
+			$GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang'] : $GLOBALS['egw_info']['user']['preferences']['common']['lang']);
 
 		self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 
-		if (!(strpos(self::$lang, '-')===false))
+		if (!(strpos(self::$lang, '-') === false))
 			list(self::$lang, self::$country) = explode('-', self::$lang);
 	}
 
@@ -238,7 +237,7 @@ 
 				$skin = "moono"; //this is the basic skin for ckeditor
 			}
 			// Skin used for mobile template
-			self::$skin = \EGroupware\Api\Header\UserAgent::mobile()?'flat':$skin;
+			self::$skin = \EGroupware\Api\Header\UserAgent::mobile() ? 'flat' : $skin;
 		}
 
 		return self::$skin;
@@ -279,8 +278,7 @@ 
 		$config['removePlugins'] = 'elementspath';
 
 		$config['toolbarCanCollapse'] = true;
-		$config['toolbarStartupExpanded'] = is_bool($expanded_toolbar) ? $expanded_toolbar :
-			($expanded_toolbar === 'false' ? false : (boolean)$expanded_toolbar);
+		$config['toolbarStartupExpanded'] = is_bool($expanded_toolbar) ? $expanded_toolbar : ($expanded_toolbar === 'false' ? false : (boolean)$expanded_toolbar);
 
 		$config['filebrowserBrowseUrl'] = self::get_filebrowserBrowseUrl($start_path);
 		$config['filebrowserWindowHeight'] = 640;
@@ -293,7 +291,7 @@ 
 		$config['fontSize_sizes'] = '';
 		$unit = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'];
 		if (empty($unit)) $unit = 'px';
-		foreach(self::$font_size_options as $k => $v)
+		foreach (self::$font_size_options as $k => $v)
 		{
 			$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
 		}
@@ -350,48 +348,48 @@ 
 	 * Writes the toolbar configuration to the options which depends on the chosen
 	 * mode and the spellchecker_button written by the add_spellchecker_options button
 	 */
-	private static function add_toolbar_options(&$config, $mode, $spellchecker_button, $scayt_button=false)
+	private static function add_toolbar_options(&$config, $mode, $spellchecker_button, $scayt_button = false)
 	{
 		$config['toolbar'] = array();
 		switch ($mode)
 		{
 			case 'advanced':
-				$config['toolbar'][] = array('name' => 'document', 'items' => array('Source','DocProps','-','Preview','-','Templates'));
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'));
-				if ($spellchecker_button||$scayt_button)
+				$config['toolbar'][] = array('name' => 'document', 'items' => array('Source', 'DocProps', '-', 'Preview', '-', 'Templates'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Print'));
+				if ($spellchecker_button || $scayt_button)
 				{
 					$configArray = array();
 					if ($spellchecker_button) $configArray[] = $spellchecker_button;
 					if ($scayt_button) $configArray[] = $scayt_button;
 					$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 				}
-				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'));
+				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo', 'Redo', '-', 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'));
 
 				$config['toolbar'][] = '/';
 
-				$config['toolbar'][] = array('name' => 'basicstyles', 'items' => array('Bold','Italic','Underline','Strike','-','Subscript','Superscript'));
-				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'));
-				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList','NumberedList','-','Outdent','Indent'));
-				$config['toolbar'][] = array('name' => 'links', 'items' => array('Link','Unlink','Anchor'));
-				$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize','Image','Table','HorizontalRule','SpecialChar'/*,'Smiley'*/));
+				$config['toolbar'][] = array('name' => 'basicstyles', 'items' => array('Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript'));
+				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'));
+				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList', 'NumberedList', '-', 'Outdent', 'Indent'));
+				$config['toolbar'][] = array('name' => 'links', 'items' => array('Link', 'Unlink', 'Anchor'));
+				$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize', 'Image', 'Table', 'HorizontalRule', 'SpecialChar'/*,'Smiley'*/));
 
 				$config['toolbar'][] = '/';
 
-				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Style','Format','Font','FontSize'));
-				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
-				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
+				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Style', 'Format', 'Font', 'FontSize'));
+				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor', 'BGColor'));
+				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks', '-', 'About'));
 				break;
 
 			case 'extended': default:
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Bold','Italic','Underline'));
-				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'));
-				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList','NumberedList'/*,'Smiley'*/,'Outdent','Indent','Undo','Redo'));
-				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Bold', 'Italic', 'Underline'));
+				$config['toolbar'][] = array('name' => 'justify', 'items' => array('JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'));
+				$config['toolbar'][] = array('name' => 'paragraph', 'items' => array('BulletedList', 'NumberedList'/*,'Smiley'*/, 'Outdent', 'Indent', 'Undo', 'Redo'));
+				$config['toolbar'][] = array('name' => 'clipboard', 'items' => array('Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Print'));
 
 				if ($mode == 'extended')
 				{
-					$config['toolbar'][] = array('name' => 'insert', 'items' => array('Image','Link','Unlink','Anchor'));
-					if ($spellchecker_button||$scayt_button)
+					$config['toolbar'][] = array('name' => 'insert', 'items' => array('Image', 'Link', 'Unlink', 'Anchor'));
+					if ($spellchecker_button || $scayt_button)
 					{
 						$configArray = array('Maximize');
 						if ($spellchecker_button) $configArray[] = $spellchecker_button;
@@ -399,13 +397,13 @@ 
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
 					else
-						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));//, 'Image', 'Table');
+						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize')); //, 'Image', 'Table');
 
 					$config['toolbar'][count($config['toolbar']) - 1][] = array('name' => 'insert', 'items' => array('Image', 'Table'));
 				}
 				else
 				{
-					if ($spellchecker_button||$scayt_button)
+					if ($spellchecker_button || $scayt_button)
 					{
 						$configArray = array('Maximize');
 						if ($spellchecker_button) $configArray[] = $spellchecker_button;
@@ -417,11 +415,11 @@ 
 				}
 
 				$config['toolbar'][] = '/';
-				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find','Replace','-','SelectAll','RemoveFormat'));
-				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
-				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format','Font','FontSize'));
-				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
-				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
+				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'));
+				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image', 'Link', 'Unlink'));
+				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format', 'Font', 'FontSize'));
+				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor', 'BGColor'));
+				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks', '-', 'About'));
 		}
 	}
 
@@ -434,7 +432,7 @@ 
 		self::set_csp_script_src_attrs();
 
 		// If not explicitly set, use preference for toolbar mode
-		if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		if (!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
 		$config = array();
 		$spellchecker_button = null;
 
@@ -444,7 +442,7 @@ 
 		self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button);
 		//error_log(__METHOD__."('$mode', $height, ".array2string($expanded_toolbar).") returning ".array2string($config));
 		// Add extra plugins
-		self::append_extraPlugins_config_array($config, array('uploadimage','uploadwidget','widget','notification','notificationaggregator','lineutils'));
+		self::append_extraPlugins_config_array($config, array('uploadimage', 'uploadwidget', 'widget', 'notification', 'notificationaggregator', 'lineutils'));
 		return $config;
 	}
 
@@ -453,7 +451,7 @@ 
 	 * @param array $config
 	 * @param array $plugins plugins name which needs to be appended into extraPlugins
 	 */
-	public static function append_extraPlugins_config_array (&$config, $plugins)
+	public static function append_extraPlugins_config_array(&$config, $plugins)
 	{
 		if (is_array($plugins))
 		{
@@ -461,7 +459,7 @@ 
 			{
 				if (!empty($config['extraPlugins']) && $config['extraPlugins'] !== '')
 				{
-					$config['extraPlugins'] .= ',' . $plugin;
+					$config['extraPlugins'] .= ','.$plugin;
 				}
 				else
 				{

Braces +64 added lines, -19 removed lines

@@ -77,7 +77,10 @@ 
 
 		foreach(scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
 		{
-			if ($skin[0] == '.') continue;
+			if ($skin[0] == '.')
+			{
+				continue;
+			}
 
 			if (isset($labels[$skin]))
 			{
@@ -92,7 +95,10 @@ 
 		
 		// flat skin is reserved for mobile template, although we are not
 		// supporting it on desktop (becuase FF has problem with action icons)
-		if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']);
+		if (!\EGroupware\Api\Header\UserAgent::mobile())
+		{
+			unset($skins['flat']);
+		}
 
 		// return our default "moono" first
 		return isset($skins['moono']) ? array('moono' => $skins['moono'])+$skins : $skins;
@@ -108,7 +114,10 @@ 
 	 */
 	public static function font_size_from_prefs(array $prefs=null, &$size=null, &$unit=null)
 	{
-		if (is_null($prefs)) $prefs = $GLOBALS['egw_info']['user']['preferences'];
+		if (is_null($prefs))
+		{
+			$prefs = $GLOBALS['egw_info']['user']['preferences'];
+		}
 
 		$size = $prefs['common']['rte_font_size'];
 		$unit = $prefs['common']['rte_font_unit'];
@@ -134,7 +143,9 @@ 
 		self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 
 		if (!(strpos(self::$lang, '-')===false))
-			list(self::$lang, self::$country) = explode('-', self::$lang);
+		{
+					list(self::$lang, self::$country) = explode('-', self::$lang);
+		}
 	}
 
 	/**
@@ -143,7 +154,9 @@ 
 	private static function get_lang()
 	{
 		if (self::$lang == null || self::$country == null)
-			self::read_lang_country();
+		{
+					self::read_lang_country();
+		}
 
 		return self::$lang;
 	}
@@ -154,7 +167,9 @@ 
 	private static function get_country()
 	{
 		if (self::$lang == null || self::$country == null)
-			self::read_lang_country();
+		{
+					self::read_lang_country();
+		}
 
 		return strtoupper(self::$country);
 	}
@@ -292,7 +307,10 @@ 
 
 		$config['fontSize_sizes'] = '';
 		$unit = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font_unit'];
-		if (empty($unit)) $unit = 'px';
+		if (empty($unit))
+		{
+			$unit = 'px';
+		}
 		foreach(self::$font_size_options as $k => $v)
 		{
 			$config['fontSize_sizes'] .= $v.$unit.'/'.$k.$unit.';';
@@ -361,8 +379,14 @@ 
 				if ($spellchecker_button||$scayt_button)
 				{
 					$configArray = array();
-					if ($spellchecker_button) $configArray[] = $spellchecker_button;
-					if ($scayt_button) $configArray[] = $scayt_button;
+					if ($spellchecker_button)
+					{
+						$configArray[] = $spellchecker_button;
+					}
+					if ($scayt_button)
+					{
+						$configArray[] = $scayt_button;
+					}
 					$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 				}
 				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'));
@@ -394,12 +418,20 @@ 
 					if ($spellchecker_button||$scayt_button)
 					{
 						$configArray = array('Maximize');
-						if ($spellchecker_button) $configArray[] = $spellchecker_button;
-						if ($scayt_button) $configArray[] = $scayt_button;
+						if ($spellchecker_button)
+						{
+							$configArray[] = $spellchecker_button;
+						}
+						if ($scayt_button)
+						{
+							$configArray[] = $scayt_button;
+						}
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
-					else
-						$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));//, 'Image', 'Table');
+					else {
+											$config['toolbar'][] = array('name' => 'insert', 'items' => array('Maximize'));
+					}
+					//, 'Image', 'Table');
 
 					$config['toolbar'][count($config['toolbar']) - 1][] = array('name' => 'insert', 'items' => array('Image', 'Table'));
 				}
@@ -408,17 +440,27 @@ 
 					if ($spellchecker_button||$scayt_button)
 					{
 						$configArray = array('Maximize');
-						if ($spellchecker_button) $configArray[] = $spellchecker_button;
-						if ($scayt_button) $configArray[] = $scayt_button;
+						if ($spellchecker_button)
+						{
+							$configArray[] = $spellchecker_button;
+						}
+						if ($scayt_button)
+						{
+							$configArray[] = $scayt_button;
+						}
 						$config['toolbar'][] = array('name' => 'tools', 'items' => $configArray);
 					}
-					else
-						$config['toolbar'][] = array('name' => 'tools', 'items' => array('Maximize'));
+					else {
+											$config['toolbar'][] = array('name' => 'tools', 'items' => array('Maximize'));
+					}
 				}
 
 				$config['toolbar'][] = '/';
 				$config['toolbar'][] = array('name' => 'edit', 'items' => array('Find','Replace','-','SelectAll','RemoveFormat'));
-				if ($mode == 'simple-withimage') $config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
+				if ($mode == 'simple-withimage')
+				{
+					$config['toolbar'][] = array('name' => 'links', 'items' => array('Image','Link','Unlink'));
+				}
 				$config['toolbar'][] = array('name' => 'styles', 'items' => array('Format','Font','FontSize'));
 				$config['toolbar'][] = array('name' => 'colors', 'items' => array('TextColor','BGColor'));
 				$config['toolbar'][] = array('name' => 'tools', 'items' => array('ShowBlocks','-','About'));
@@ -434,7 +476,10 @@ 
 		self::set_csp_script_src_attrs();
 
 		// If not explicitly set, use preference for toolbar mode
-		if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		if(!$mode || trim($mode) == '')
+		{
+			$mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
+		}
 		$config = array();
 		$spellchecker_button = null;
 

api/src/Html/HtmLawed.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * @param varchar $html2check =text input Text to check
 	 * @param mixed $Config = text or array
 	 * @param mixed $Spec =text or array; The '$spec' argument can be used to disallow an otherwise legal attribute for an element
-	 * @return varchar cleaned/fixed html
+	 * @return string cleaned/fixed html
 	 */
 	function run($html2check, $Config=null, $Spec=array())
 	{

Spacing +78 added lines, -78 removed lines

@@ -85,8 +85,8 @@ 
 		*/
 
 		$this->Configuration = array('comment'=>1, //remove comments
-			'make_tag_strict'=>3,//3 is a new own config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
-			'balance'=>0,//turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
+			'make_tag_strict'=>3, //3 is a new own config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
+			'balance'=>0, //turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
 			// tidy eats away even some wanted whitespace, so we switch it off;
 			// we used it for its compacting and beautifying capabilities, which resulted in better html for further processing
 			'tidy'=>0,
@@ -106,7 +106,7 @@ 
 	 * @param mixed $Spec =text or array; The '$spec' argument can be used to disallow an otherwise legal attribute for an element
 	 * @return varchar cleaned/fixed html
 	 */
-	function run($html2check, $Config=null, $Spec=array())
+	function run($html2check, $Config = null, $Spec = array())
 	{
 		//error_log(__METHOD__.__LINE__.' Input:'.$html2check);
 		if (is_array($Config) && is_array($this->Configuration)) $Config = array_merge($this->Configuration, $Config);
@@ -121,11 +121,11 @@ 
 		//error_log(__METHOD__.__LINE__.' Config:'.array2string($Config));
 
 		// mind our namespace when defining a function as hook. we handle our own defined hooks here.
-		if ($Config['hook_tag']=="hl_my_tag_transform" || $Config['hook_tag']=="hl_email_tag_transform")
+		if ($Config['hook_tag'] == "hl_my_tag_transform" || $Config['hook_tag'] == "hl_email_tag_transform")
 		{
-			$Config['hook_tag']=__NAMESPACE__.'\\'.$Config['hook_tag'];
+			$Config['hook_tag'] = __NAMESPACE__.'\\'.$Config['hook_tag'];
 		}
-		return ($styles?$styles:'').htmLawed($html2check, $Config, $Spec);
+		return ($styles ? $styles : '').htmLawed($html2check, $Config, $Spec);
 	}
 
 	/**
@@ -137,16 +137,16 @@ 
 	 */
 	static function getStyles(&$html)
 	{
-		$ct=0;
+		$ct = 0;
 		$newStyle = null;
-		if (stripos($html,'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
-		if ($ct>0)
+		if (stripos($html, '<style') !== false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		if ($ct > 0)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($newStyle[0]));
-			$style2buffer = implode('',$newStyle[0]);
+			$style2buffer = implode('', $newStyle[0]);
 			// only replace what we have found, we use it here, as we use the same routine in Api\Mail\Html::replaceTagsCompletley
 			// no need to do the extra routine
-			$html = str_ireplace($newStyle[0],'',$html);
+			$html = str_ireplace($newStyle[0], '', $html);
 		}
 		if ($style2buffer)
 		{
@@ -154,7 +154,7 @@ 
 			$test = json_encode($style2buffer);
 			//error_log(__METHOD__.__LINE__.'#'.$test.'# ->'.strlen($style2buffer).' Error:'.json_last_error());
 			//if (json_last_error() != JSON_ERROR_NONE && strlen($style2buffer)>0)
-			if ($test=="null" && strlen($style2buffer)>0)
+			if ($test == "null" && strlen($style2buffer) > 0)
 			{
 				// this should not be needed, unless something fails with charset detection/ wrong charset passed
 				error_log(__METHOD__.__LINE__.' Found Invalid sequence for utf-8 in CSS:'.$style2buffer.' Carset Detected:'.Api\Translation::detect_encoding($style2buffer));
@@ -164,19 +164,19 @@ 
 		$style .= $style2buffer;
 		// clean out comments and stuff
 		$search = array(
-			'@url\(http:\/\/[^\)].*?\)@si',  // url calls e.g. in style definitions
+			'@url\(http:\/\/[^\)].*?\)@si', // url calls e.g. in style definitions
 //			'@<!--[\s\S]*?[ \t\n\r]*-->@',   // Strip multi-line comments including CDATA
 //			'@<!--[\s\S]*?[ \t\n\r]*--@',    // Strip broken multi-line comments including CDATA
 		);
-		$style = preg_replace($search,"",$style);
+		$style = preg_replace($search, "", $style);
 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
-		$css = preg_replace('/(javascript|expession|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) Api\Mail\Html::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		$css = preg_replace('/(javascript|expession|-moz-binding)/i', '', $style);
+		if (stripos($css, 'script') !== false) Api\Mail\Html::replaceTagsCompletley($css, 'script'); // Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
-		$css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
+		$css_no_comment = str_replace(array(':', '<!--', '-->'), array(': ', '', ''), $css);
 		//error_log(__METHOD__.__LINE__.$css);
 		// we already removed what we have found, above, as we used pretty much the same routine as in Api\Mail\Html::replaceTagsCompletley
 		// no need to do the extra routine
@@ -195,15 +195,15 @@ 
 	 *		or to restrict the attribute's values
 	 * @param boolean $_force =null - force the config passed to be used without merging to the default
 	 */
-	static function purify($html,$config=null,$spec=array(),$_force=false)
+	static function purify($html, $config = null, $spec = array(), $_force = false)
 	{
-		$defaultConfig = array('valid_xhtml'=>1,'safe'=>1);
+		$defaultConfig = array('valid_xhtml'=>1, 'safe'=>1);
 
-		if (empty($html)) return $html;	// no need to process further
+		if (empty($html)) return $html; // no need to process further
 		if (!empty($config) && is_string($config))
 		{
 			//error_log(__METHOD__.__LINE__.$config);
-			$config = json_decode($config,true);
+			$config = json_decode($config, true);
 			if (is_null($config)) error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
 		}
 
@@ -213,15 +213,15 @@ 
 
 		// Check for "blank" = just user preference span - for some reason we can't match on the entity, so approximate
 		$regex = '#^<span style="font-family:'.$font.';font-size:'.$font_size.';">.?</span>$#us';
-		if(preg_match($regex,$html))
+		if (preg_match($regex, $html))
 		{
 			return '';
 		}
 		$htmLawed = new HtmLawed();
-		if (is_array($config) && $_force===false) $config = array_merge($defaultConfig, $config);
+		if (is_array($config) && $_force === false) $config = array_merge($defaultConfig, $config);
 		if (empty($config)) $config = $defaultConfig;
 		//error_log(__METHOD__.__LINE__.array2string($config));
-		return $htmLawed->run($html,$config,$spec);
+		return $htmLawed->run($html, $config, $spec);
 	}
 }
 
@@ -233,17 +233,17 @@ 
  * 						a checking for title, replacing @
  * 						blockquote checking for cite, replacing @
  */
-function hl_my_tag_transform($element, $attribute_array=0)
+function hl_my_tag_transform($element, $attribute_array = 0)
 {
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
+	if (is_numeric($attribute_array)) {
 		return "</$element>";
 	}
 
 	//if ($element=='img') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array));
-	if ($element=='td' && isset($attribute_array['background']))
+	if ($element == 'td' && isset($attribute_array['background']))
 	{
-		if (is_object($GLOBALS['egw']) && stripos($attribute_array['background'],$GLOBALS['egw']->link('/index.php'))!==false)
+		if (is_object($GLOBALS['egw']) && stripos($attribute_array['background'], $GLOBALS['egw']->link('/index.php')) !== false)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 			//$attribute_array['background'] = 'url('.$attribute_array['background'].');';
@@ -251,25 +251,25 @@ 
 		else
 		{
 			// $attribute_array['background']='denied:'.$attribute_array['background'];
-			unset($attribute_array['background']);// only internal background images are allowed
+			unset($attribute_array['background']); // only internal background images are allowed
 		}
 	}
 	// Elements other than 'img' or 'img' without a 'img' attribute are returned unchanged
-	if($element == 'img')
+	if ($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt'] == 'image' ? '' : $attribute_array['alt']);
+		if (isset($attribute_array['alt']) && strpos($attribute_array['alt'], '@') !== false) $attribute_array['alt'] = str_replace('@', '(at)', $attribute_array['alt']);
 	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'], '@') !== false) $attribute_array['title'] = str_replace('@', '(at)', $attribute_array['title']);
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'], '@') !== false) $attribute_array['cite'] = str_replace('@', '(at)', $attribute_array['cite']);
 		}
 	}
 	/*
@@ -301,31 +301,31 @@ 
 		$attribute_array['style'] = implode('; ', $style);
 	}
 	*/
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
-	if($element == 'a')
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'], 'script') !== false) $attribute_array['style'] = str_ireplace('script', '', $attribute_array['style']);
+	if ($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 		// rebuild Anchors, if processed by hl_email_tag_transform
-		if (strpos($attribute_array['href'],"denied:javascript:GoToAnchor('")===0)
+		if (strpos($attribute_array['href'], "denied:javascript:GoToAnchor('") === 0)
 		{
-			$attribute_array['href']=str_ireplace("');",'',str_ireplace("denied:javascript:GoToAnchor('","#",$attribute_array['href']));
+			$attribute_array['href'] = str_ireplace("');", '', str_ireplace("denied:javascript:GoToAnchor('", "#", $attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],"javascript:GoToAnchor('")===0)
+		if (strpos($attribute_array['href'], "javascript:GoToAnchor('") === 0)
 		{
-			$attribute_array['href']=str_ireplace("');",'',str_ireplace("javascript:GoToAnchor('","#",$attribute_array['href']));
+			$attribute_array['href'] = str_ireplace("');", '', str_ireplace("javascript:GoToAnchor('", "#", $attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'], 'denied:javascript') === 0) $attribute_array['href'] = '';
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach ($attribute_array as $k=>$v) {
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
 	// Return the opening tag with attributes
 	static $empty_elements = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1);
-	return "<{$element}{$attributes}". (isset($empty_elements[$element]) ? ' /' : ''). '>';
+	return "<{$element}{$attributes}".(isset($empty_elements[$element]) ? ' /' : '').'>';
 }
 
 /**
@@ -339,22 +339,22 @@ 
  * 						blockquote -checking for cite, replacing @
  * 						throwing away excess div elements, that carry no style or class or id info
  */
-function hl_email_tag_transform($element, $attribute_array=0)
+function hl_email_tag_transform($element, $attribute_array = 0)
 {
 	//error_log(__METHOD__.__LINE__.$element.'=>'.array2string($attribute_array));
 	static $lastelement = null;
 	static $throwawaycounter = null;
-	if (is_null($lastelement)) $lastelement='';
+	if (is_null($lastelement)) $lastelement = '';
 	if (is_null($throwawaycounter)) $throwawaycounter = 0;
 	//if ($throwawaycounter>1) error_log(__METHOD__.__LINE__.' '.$throwawaycounter.$element.array2string($attribute_array));
-	if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
+	if ($element == 'div' && $element == $lastelement && ($attribute_array == 0 || empty($attribute_array)))
 	{
 		if (is_array($attribute_array)) $throwawaycounter++;
-		if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
-		if ($throwawaycounter>1) return '';
+		if ($attribute_array == 0 && $throwawaycounter > 0) $throwawaycounter--;
+		if ($throwawaycounter > 1) return '';
 	}
-	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
-	if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
+	if ($lastelement == 'div' && $element != $lastelement && is_array($attribute_array)) $throwawaycounter = 0;
+	if (is_array($attribute_array) && !empty($attribute_array) && $element == 'div')
 	{
 		$lastelement = 'div_with_attr';
 	}
@@ -363,15 +363,15 @@ 
 		if (is_array($attribute_array)) $lastelement = $element;
 	}
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
-		if($element==$lastelement) $lastelement='';
+	if (is_numeric($attribute_array)) {
+		if ($element == $lastelement) $lastelement = '';
 		return "</$element>";
 	}
 
 	//if ($element=='a') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array));
-	if ($element=='td' && isset($attribute_array['background']))
+	if ($element == 'td' && isset($attribute_array['background']))
 	{
-		if (stripos($attribute_array['background'],'cid:')!==false)
+		if (stripos($attribute_array['background'], 'cid:') !== false)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 			//$attribute_array['background'] = 'url('.$attribute_array['background'].');';
@@ -379,77 +379,77 @@ 
 		else
 		{
 			// $attribute_array['background']='denied:'.$attribute_array['background'];
-			unset($attribute_array['background']);// only cid style background images are allowed
+			unset($attribute_array['background']); // only cid style background images are allowed
 		}
 	}
 	// Elements other than 'img' or 'img' without a 'img' attribute are returned unchanged
-	if($element == 'img')
+	if ($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt'] == 'image' ? '' : $attribute_array['alt']);
+		if (isset($attribute_array['alt']) && strpos($attribute_array['alt'], '@') !== false) $attribute_array['alt'] = str_replace('@', '(at)', $attribute_array['alt']);
 		// $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] ? '' : 'match' => '/^cid:.*/'),
 		if (isset($attribute_array['src']))
 		{
-			if (!(strlen($attribute_array['src'])>4 && strlen($attribute_array['src']<400)))
+			if (!(strlen($attribute_array['src']) > 4 && strlen($attribute_array['src'] < 400)))
 			{
-					$attribute_array['alt']= $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
-					$attribute_array['src']=Api\Image::find('phpgwapi','dialog_error');
+					$attribute_array['alt'] = $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
+					if (!isset($attribute_array['title'])) $attribute_array['title'] = $attribute_array['alt'];
+					$attribute_array['src'] = Api\Image::find('phpgwapi', 'dialog_error');
 			}
-			if (!preg_match('/^cid:.*/',$attribute_array['src']))
+			if (!preg_match('/^cid:.*/', $attribute_array['src']))
 			{
 				if (!$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'])
 				{
 					//the own webserver url is not external, so it should be allowed
-					if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src']))
+					if (empty($GLOBALS['egw_info']['server']['webserver_url']) || !preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$", $attribute_array['src']))
 					{
-						$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
-						if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
-						$attribute_array['src']=Api\Image::find('mail','no-image-shown');
+						$attribute_array['alt'] = $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
+						if (!isset($attribute_array['title'])) $attribute_array['title'] = $attribute_array['alt'];
+						$attribute_array['src'] = Api\Image::find('mail', 'no-image-shown');
 						$attribute_array['border'] = 1;
 						if ($attribute_array['style'])
 						{
-							if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+							if (stripos($attribute_array['style'], 'border') !== false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si', '', $attribute_array['style']);
 						}
 					}
 				}
 			}
 		}
 	}
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'], 'script') !== false) $attribute_array['style'] = str_ireplace('script', '', $attribute_array['style']);
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'], '@') !== false) $attribute_array['title'] = str_replace('@', '(at)', $attribute_array['title']);
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'], '@') !== false) $attribute_array['cite'] = str_replace('@', '(at)', $attribute_array['cite']);
 		}
 	}
-	if($element == 'a')
+	if ($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'], 'denied:javascript') === 0) $attribute_array['href'] = '';
 		if (isset($attribute_array['name']) && isset($attribute_array['id'])) $attribute_array['id'] = $attribute_array['name'];
-		if (strpos($attribute_array['href'],'@')!==false) $attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
-		if (strpos($attribute_array['href'],'#')===0 && (isset(Api\Mail::$htmLawed_config['transform_anchor']) && Api\Mail::$htmLawed_config['transform_anchor']===true))
+		if (strpos($attribute_array['href'], '@') !== false) $attribute_array['href'] = str_replace('@', '%40', $attribute_array['href']);
+		if (strpos($attribute_array['href'], '#') === 0 && (isset(Api\Mail::$htmLawed_config['transform_anchor']) && Api\Mail::$htmLawed_config['transform_anchor'] === true))
 		{
-			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'],1))."');";
+			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'], 1))."');";
 		}
 
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach ($attribute_array as $k=>$v) {
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
 	// Return the opening tag with attributes
 	static $empty_elements = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1);
-	return "<{$element}{$attributes}". (isset($empty_elements[$element]) ? ' /' : ''). '>';
+	return "<{$element}{$attributes}".(isset($empty_elements[$element]) ? ' /' : '').'>';
 }
 

Braces +146 added lines, -38 removed lines

@@ -109,9 +109,18 @@ 
 	function run($html2check, $Config=null, $Spec=array())
 	{
 		//error_log(__METHOD__.__LINE__.' Input:'.$html2check);
-		if (is_array($Config) && is_array($this->Configuration)) $Config = array_merge($this->Configuration, $Config);
-		if (empty($Config)) $Config = $this->Configuration;
-		if (empty($Spec)) $Spec = $this->Spec;
+		if (is_array($Config) && is_array($this->Configuration))
+		{
+			$Config = array_merge($this->Configuration, $Config);
+		}
+		if (empty($Config))
+		{
+			$Config = $this->Configuration;
+		}
+		if (empty($Spec))
+		{
+			$Spec = $this->Spec;
+		}
 		// If we are processing mails, we take out stuff in <style> stuff </style> tags and
 		// put it back in after purifying; styles are processed for known security risks
 		// in self::getStyles
@@ -139,7 +148,10 @@ 
 	{
 		$ct=0;
 		$newStyle = null;
-		if (stripos($html,'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		if (stripos($html,'<style')!==false)
+		{
+			$ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		}
 		if ($ct>0)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($newStyle[0]));
@@ -173,7 +185,11 @@ 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
 		$css = preg_replace('/(javascript|expession|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) Api\Mail\Html::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		if (stripos($css,'script')!==false)
+		{
+			Api\Mail\Html::replaceTagsCompletley($css,'script');
+		}
+		// Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
 		$css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
@@ -199,12 +215,19 @@ 
 	{
 		$defaultConfig = array('valid_xhtml'=>1,'safe'=>1);
 
-		if (empty($html)) return $html;	// no need to process further
+		if (empty($html))
+		{
+			return $html;
+		}
+		// no need to process further
 		if (!empty($config) && is_string($config))
 		{
 			//error_log(__METHOD__.__LINE__.$config);
 			$config = json_decode($config,true);
-			if (is_null($config)) error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			if (is_null($config))
+			{
+				error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			}
 		}
 
 		// User preferences
@@ -218,8 +241,14 @@ 
 			return '';
 		}
 		$htmLawed = new HtmLawed();
-		if (is_array($config) && $_force===false) $config = array_merge($defaultConfig, $config);
-		if (empty($config)) $config = $defaultConfig;
+		if (is_array($config) && $_force===false)
+		{
+			$config = array_merge($defaultConfig, $config);
+		}
+		if (empty($config))
+		{
+			$config = $defaultConfig;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($config));
 		return $htmLawed->run($html,$config,$spec);
 	}
@@ -236,7 +265,8 @@ 
 function hl_my_tag_transform($element, $attribute_array=0)
 {
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
+	if(is_numeric($attribute_array))
+	{
 		return "</$element>";
 	}
 
@@ -258,18 +288,30 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	/*
@@ -301,7 +343,10 @@ 
 		$attribute_array['style'] = implode('; ', $style);
 	}
 	*/
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
@@ -314,12 +359,16 @@ 
 		{
 			$attribute_array['href']=str_ireplace("');",'',str_ireplace("javascript:GoToAnchor('","#",$attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
@@ -344,27 +393,52 @@ 
 	//error_log(__METHOD__.__LINE__.$element.'=>'.array2string($attribute_array));
 	static $lastelement = null;
 	static $throwawaycounter = null;
-	if (is_null($lastelement)) $lastelement='';
-	if (is_null($throwawaycounter)) $throwawaycounter = 0;
+	if (is_null($lastelement))
+	{
+		$lastelement='';
+	}
+	if (is_null($throwawaycounter))
+	{
+		$throwawaycounter = 0;
+	}
 	//if ($throwawaycounter>1) error_log(__METHOD__.__LINE__.' '.$throwawaycounter.$element.array2string($attribute_array));
 	if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
 	{
-		if (is_array($attribute_array)) $throwawaycounter++;
-		if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
-		if ($throwawaycounter>1) return '';
+		if (is_array($attribute_array))
+		{
+			$throwawaycounter++;
+		}
+		if ($attribute_array==0 && $throwawaycounter>0)
+		{
+			$throwawaycounter--;
+		}
+		if ($throwawaycounter>1)
+		{
+			return '';
+		}
+	}
+	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array))
+	{
+		$throwawaycounter = 0;
 	}
-	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
 	if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
 	{
 		$lastelement = 'div_with_attr';
 	}
 	else
 	{
-		if (is_array($attribute_array)) $lastelement = $element;
+		if (is_array($attribute_array))
+		{
+			$lastelement = $element;
+		}
 	}
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
-		if($element==$lastelement) $lastelement='';
+	if(is_numeric($attribute_array))
+	{
+		if($element==$lastelement)
+		{
+			$lastelement='';
+		}
 		return "</$element>";
 	}
 
@@ -386,15 +460,24 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 		// $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] ? '' : 'match' => '/^cid:.*/'),
 		if (isset($attribute_array['src']))
 		{
 			if (!(strlen($attribute_array['src'])>4 && strlen($attribute_array['src']<400)))
 			{
 					$attribute_array['alt']= $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+					if (!isset($attribute_array['title']))
+					{
+						$attribute_array['title']=$attribute_array['alt'];
+					}
 					$attribute_array['src']=Api\Image::find('phpgwapi','dialog_error');
 			}
 			if (!preg_match('/^cid:.*/',$attribute_array['src']))
@@ -405,36 +488,60 @@ 
 					if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src']))
 					{
 						$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
-						if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+						if (!isset($attribute_array['title']))
+						{
+							$attribute_array['title']=$attribute_array['alt'];
+						}
 						$attribute_array['src']=Api\Image::find('mail','no-image-shown');
 						$attribute_array['border'] = 1;
 						if ($attribute_array['style'])
 						{
-							if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+							if (stripos($attribute_array['style'],'border')!==false)
+							{
+								$attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
-		if (isset($attribute_array['name']) && isset($attribute_array['id'])) $attribute_array['id'] = $attribute_array['name'];
-		if (strpos($attribute_array['href'],'@')!==false) $attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
+		if (isset($attribute_array['name']) && isset($attribute_array['id']))
+		{
+			$attribute_array['id'] = $attribute_array['name'];
+		}
+		if (strpos($attribute_array['href'],'@')!==false)
+		{
+			$attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		}
 		if (strpos($attribute_array['href'],'#')===0 && (isset(Api\Mail::$htmLawed_config['transform_anchor']) && Api\Mail::$htmLawed_config['transform_anchor']===true))
 		{
 			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'],1))."');";
@@ -444,7 +551,8 @@ 
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 

api/src/Html/htmLawed/htmLawed.php

Doc Comments +4 added lines

@@ -625,6 +625,10 @@
 // eof
 }
 
+/**
+ * @param string $e
+ * @param string $a
+ */
 function hl_tag2(&$e, &$a, $t=1){
 // transform tag
 if($e == 'center'){$e = 'div'; return 'text-align: center;';}

Indentation +27 added lines, -27 removed lines

@@ -204,7 +204,7 @@ 
   elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
   elseif(strpos($x, "\x02\x04")){
    foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
-    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
+	echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
   }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
  }
@@ -357,7 +357,7 @@ 
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
    while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
-    $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
+	$p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
    $p = $m[1]. $p;
   }
@@ -471,20 +471,20 @@ 
  switch($mode){
   case 0: // Name
    if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
-    $nm = strtolower($m[0]);
-    $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
+	$nm = strtolower($m[0]);
+	$w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
    if($a[0] == '='){ // =
-    $w = 1; $mode = 2; $a = ltrim($a, '= ');
+	$w = 1; $mode = 2; $a = ltrim($a, '= ');
    }else{ // No val
-    $w = 1; $mode = 0; $a = ltrim($a);
-    $aA[$nm] = '';
+	$w = 1; $mode = 0; $a = ltrim($a);
+	$aA[$nm] = '';
    }
   break; case 2: // Val
    if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
-    $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
-    $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
+	$a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
+	$aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
    }
   break;
  }
@@ -507,8 +507,8 @@ 
   }
   if($k == 'style' && !$C['style_pass']){
    if(false !== strpos($v, '&#')){
-    static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
-    $v = strtr($v, $sC);
+	static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
+	$v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
@@ -516,20 +516,20 @@ 
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
    $v = hl_prot($v, $k);
    if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
-     $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
-     $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
-     $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
-     }
-    }
+	if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+	 $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
+	}elseif($C['anti_link_spam']){
+	 $r1 = $C['anti_link_spam'][1];
+	 if(!empty($r1) && preg_match($r1, $v)){continue;}
+	 $r0 = $C['anti_link_spam'][0];
+	 if(!empty($r0) && preg_match($r0, $v)){
+	  if(isset($a['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
+	  }elseif(isset($aA['rel'])){
+	   if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
+	  }else{$a['rel'] = 'nofollow';}
+	 }
+	}
    }
   }
   if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
@@ -685,8 +685,8 @@ 
   $e = "<$e>";
   if(isset($d[$y])){
    if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+	if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
+	else{++$N; ob_end_clean(); continue 2;}
    }
    else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
    echo $r; continue;

Spacing +295 added lines, -295 removed lines

@@ -9,36 +9,36 @@ 
 See htmLawed_README.txt/htm
 */
 
-function htmLawed($t, $C=1, $S=array()){
+function htmLawed($t, $C = 1, $S = array()) {
 $C = is_array($C) ? $C : array();
-if(!empty($C['valid_xhtml'])){
+if (!empty($C['valid_xhtml'])) {
  $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements'];
  $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
  $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
 }
 // config eles
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby
-if(!empty($C['safe'])){
+if (!empty($C['safe'])) {
  unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']);
 }
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
- if(isset($x[1])){
+if ($x == '-*') {$e = array(); }
+elseif (strpos($x, '*') === false) {$e = array_flip(explode(',', $x)); }
+else {
+ if (isset($x[1])) {
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
+  for ($i = count($m); --$i >= 0;) {$m[$i] = $m[$i][0]; }
+  foreach ($m as $v) {
+   if ($v[0] == '+') {$e[substr($v, 1)] = 1; }
+   if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'.$v, $m)) {unset($e[$v]); }
   }
  }
 }
-$C['elements'] =& $e;
+$C['elements'] = & $e;
 // config attrs
 $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
-$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
-if(isset($x['on*'])){
+$x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x.(!empty($C['safe']) ? ',on*' : '')));
+if (isset($x['on*'])) {
  unset($x['on*']);
  $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
 }
@@ -46,14 +46,14 @@ 
 // config URL
 $x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https';
 $C['schemes'] = array();
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
+foreach (explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v) {
  $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
+ if ($x2) {$C['schemes'][$x] = array_flip(explode(',', $x2)); }
 }
-if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);}
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
+if (!isset($C['schemes']['*'])) {$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,); }
+if (!empty($C['safe']) && empty($C['schemes']['style'])) {$C['schemes']['style'] = array('!'=>1); }
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
+if (!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])) {
  $C['base_url'] = $C['abs_url'] = 0;
 }
 // config rest
@@ -82,25 +82,25 @@ 
 $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 0;
 // own config options
 // block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
-$C['allow_for_inline'] = isset($C['allow_for_inline'])?$C['allow_for_inline']:0;
+$C['allow_for_inline'] = isset($C['allow_for_inline']) ? $C['allow_for_inline'] : 0;
 
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];}
+if (isset($GLOBALS['C'])) {$reC = $GLOBALS['C']; }
 $GLOBALS['C'] = $C;
 $S = is_array($S) ? $S : hl_spec($S);
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];}
+if (isset($GLOBALS['S'])) {$reS = $GLOBALS['S']; }
 $GLOBALS['S'] = $S;
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
-if($C['clean_ms_char']){
+if ($C['clean_ms_char']) {
  $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
  $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
  $t = strtr($t, $x);
 }
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);}
+if ($C['cdata'] or $C['comment']) {$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t); }
 $t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&amp;', $t));
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
-if($C['hook']){$t = $C['hook']($t, $C, $S);}
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
+if ($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])) {$GLOBALS['hl_Ids'] = array(); }
+if ($C['hook']) {$t = $C['hook']($t, $C, $S); }
+if ($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])) {
  $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
 }
 // main
@@ -109,41 +109,41 @@ 
 $t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t;
 $t = $C['tidy'] ? hl_tidy($t, $C['tidy'], $C['parent']) : $t;
 unset($C, $e);
-if(isset($reC)){$GLOBALS['C'] = $reC;}
-if(isset($reS)){$GLOBALS['S'] = $reS;}
+if (isset($reC)) {$GLOBALS['C'] = $reC; }
+if (isset($reS)) {$GLOBALS['S'] = $reS; }
 return $t;
 // eof
 }
 
-function hl_attrval($t, $p){
+function hl_attrval($t, $p) {
 // check attr val against $S
 $o = 1; $l = strlen($t);
-foreach($p as $k=>$v){
- switch($k){
-  case 'maxlen':if($l > $v){$o = 0;}
-  break; case 'minlen': if($l < $v){$o = 0;}
-  break; case 'maxval': if((float)($t) > $v){$o = 0;}
-  break; case 'minval': if((float)($t) < $v){$o = 0;}
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;}
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;}
+foreach ($p as $k=>$v) {
+ switch ($k) {
+  case 'maxlen':if ($l > $v) {$o = 0; }
+  break; case 'minlen': if ($l < $v) {$o = 0; }
+  break; case 'maxval': if ((float)($t) > $v) {$o = 0; }
+  break; case 'minval': if ((float)($t) < $v) {$o = 0; }
+  break; case 'match': if (!preg_match($v, $t)) {$o = 0; }
+  break; case 'nomatch': if (preg_match($v, $t)) {$o = 0; }
   break; case 'oneof':
    $m = 0;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}}
+   foreach (explode('|', $v) as $n) {if ($t == $n) {$m = 1; break; }}
    $o = $m;
   break; case 'noneof':
    $m = 1;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}}
+   foreach (explode('|', $v) as $n) {if ($t == $n) {$m = 0; break; }}
    $o = $m;
   break; default:
   break;
  }
- if(!$o){break;}
+ if (!$o) {break; }
 }
 return ($o ? $t : (isset($p['default']) ? $p['default'] : 0));
 // eof
 }
 
-function hl_bal($t, $do=1, $in='div'){
+function hl_bal($t, $do = 1, $in = 'div') {
 // balance tags
 // by content
 $cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block
@@ -154,212 +154,212 @@ 
 $cN2 = array_keys($cN);
 $cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
 $cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);}
+if ($GLOBALS['C']['direct_list_nest']) {$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1); }
 $cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other
 $cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
 // block/inline type; ins & del both type; #pcdata: text
 $eB = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'isindex'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'table'=>1, 'ul'=>1);
 $eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
-if($GLOBALS['C']['allow_for_inline'] && is_array($GLOBALS['C']['allow_for_inline'])) foreach($GLOBALS['C']['allow_for_inline'] as $khai => $vhai) {$eI[$vhai]=1;}//allow table as if it was an inline element as <span> some Text <table>...</table> more text</span> is quite common
+if ($GLOBALS['C']['allow_for_inline'] && is_array($GLOBALS['C']['allow_for_inline'])) foreach ($GLOBALS['C']['allow_for_inline'] as $khai => $vhai) {$eI[$vhai] = 1; }//allow table as if it was an inline element as <span> some Text <table>...</table> more text</span> is quite common
 $eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
 $eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
 $eF = $eB + $eI;
 
 // $in sets allowed child
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
-if(isset($cE[$in])){
+if (isset($cE[$in])) {
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
 }
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
+if (isset($cS[$in])) {$inOk = $cS[$in]; }
+elseif (isset($cI[$in])) {$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+elseif (isset($cF[$in])) {$inOk = $eF; unset($cI['del'], $cI['ins']); }
+elseif (isset($cB[$in])) {$inOk = $eB; unset($cI['del'], $cI['ins']); }
+if (isset($cO[$in])) {$inOk = $inOk + $cO[$in]; }
+if (isset($cN[$in])) {$inOk = array_diff_assoc($inOk, $cN[$in]); }
 
 $t = explode('<', $t);
 $ok = $q = array(); // $q seq list of open non-empty ele
 ob_start();
 
-for($i=-1, $ci=count($t); ++$i<$ci;){
+for ($i = -1, $ci = count($t); ++$i < $ci;) {
  // allowed $ok in parent $p
- if($ql = count($q)){
+ if ($ql = count($q)) {
   $p = array_pop($q);
   $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+  if (isset($cS[$p])) {$ok = $cS[$p]; }
+  elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+  elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); }
+  elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); }
+  if (isset($cO[$p])) {$ok = $ok + $cO[$p]; }
+  if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); }
+ } else {$ok = $inOk; unset($cI['del'], $cI['ins']); }
  // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) {
   echo '&lt;', $s, $e, $a, '&gt;';
  }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+ if (isset($x[0])) {
+  if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) {
    echo '<div>', $x, '</div>';
   }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+  elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; }
+  elseif (strpos($x, "\x02\x04")) {
+   foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY) as $v) {
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+  }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); }
  }
  // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
+ if (!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)) {$x = $t[$i]; continue; }
  $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
  // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
+ if ($s) {
+  if (isset($cE[$e]) or !in_array($e, $q)) {continue; } // Empty/unopen
+  if ($p == $e) {array_pop($q); echo '</', $e, '>'; unset($e); continue; } // Last open
   $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
+  for ($j = -1, $cj = count($q); ++$j < $cj;) {
+   if (($d = array_pop($q)) == $e) {break; }
+   else {$add .= "</{$d}>"; }
   }
   echo $add, '</', $e, '>'; unset($e); continue;
  }
  // open tag
  // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
+ if (isset($cB[$e]) && strlen(trim($x))) {
   $t[$i] = "{$e}{$a}>";
-  array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
+  array_splice($t, $i + 1, 0, 'div>'.$x); unset($e, $x); ++$ci; --$i; continue;
  }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
+ if ((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])) {
   array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
  }
- if($e == 'div' && !isset($ok['div']) && strpos($a, '-htmlawed-transform')){
+ if ($e == 'div' && !isset($ok['div']) && strpos($a, '-htmlawed-transform')) {
   $t[$i] = "span{$a}>{$x}"; unset($e, $x); --$i; continue;
  }
  // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
+ if (!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)) {
+  if (!isset($ok[$e])) {
+   if ($ql && isset($cT[$p])) {echo '</', array_pop($q), '>'; unset($e, $x); --$i; }
    continue;
   }
-  if(!isset($cE[$e])){$q[] = $e;}
+  if (!isset($cE[$e])) {$q[] = $e; }
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
+ if (isset($cS[$p][$e])) {
+  if (!isset($cE[$e])) {$q[] = $e; }
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // nesting
  $add = '';
  $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
+ for ($k = -1, $kc = count($q); ++$k < $kc;) {
   $d = $q[$k];
   $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
+  if (isset($cS[$d])) {$q2[] = $d; continue; }
   $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
+  if (isset($cO[$d])) {$ok2 = $ok2 + $cO[$d]; }
+  if (isset($cN[$d])) {$ok2 = array_diff_assoc($ok2, $cN[$d]); }
+  if (!isset($ok2[$e])) {
+   if (!$k && !isset($inOk[$e])) {continue 2; }
    $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
+   for (;++$k < $kc;) {$add = "</{$q[$k]}>{$add}"; }
    break;
   }
-  else{$q2[] = $d;}
+  else {$q2[] = $d; }
  }
  $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
+ if (!isset($cE[$e])) {$q[] = $e; }
  echo $add, '<', $e, $a, '>'; unset($e); continue;
 }
 
 // end
-if($ql = count($q)){
+if ($ql = count($q)) {
  $p = array_pop($q);
  $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if (isset($cS[$p])) {$ok = $cS[$p]; }
+ elseif (isset($cI[$p])) {$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1; }
+ elseif (isset($cF[$p])) {$ok = $eF; unset($cI['del'], $cI['ins']); }
+ elseif (isset($cB[$p])) {$ok = $eB; unset($cI['del'], $cI['ins']); }
+ if (isset($cO[$p])) {$ok = $ok + $cO[$p]; }
+ if (isset($cN[$p])) {$ok = array_diff_assoc($ok, $cN[$p]); }
+} else {$ok = $inOk; unset($cI['del'], $cI['ins']); }
+if (isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))) {
  echo '&lt;', $s, $e, $a, '&gt;';
 }
-if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+if (isset($x[0])) {
+ if (strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))) {
   echo '<div>', $x, '</div>';
  }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+ elseif ($do < 3 or isset($ok['#pcdata'])) {echo $x; }
+ elseif (strpos($x, "\x02\x04")) {
+  foreach (preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY) as $v) {
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
   }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+ }elseif ($do > 4) {echo preg_replace('`\S`', '', $x); }
 }
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
+while (!empty($q) && ($e = array_pop($q))) {echo '</', $e, '>'; }
 $o = ob_get_contents();
 ob_end_clean();
 return $o;
 // eof
 }
 
-function hl_cmtcd($t){
+function hl_cmtcd($t) {
 // comment/CDATA sec handler
 $t = $t[0];
 global $C;
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
-if($v == 1){return '';}
-if($n == 'comment'){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
+if (!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])) {return $t; }
+if ($v == 1) {return ''; }
+if ($n == 'comment') {
+ if (substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ') {$t .= ' '; }
 }
-else{$t = substr($t, 1, -1);}
+else {$t = substr($t, 1, -1); }
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
 // eof
 }
 
-function hl_ent($t){
+function hl_ent($t) {
 // entitity handler
 global $C;
 $t = $t[1];
-static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
-if($t[0] != '#'){
- return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
+static $U = array('quot'=>1, 'amp'=>1, 'lt'=>1, 'gt'=>1);
+static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39', 'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
+if ($t[0] != '#') {
+ return ($C['and_mark'] ? "\x06" : '&').(isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'.($C['hexdec_entity'] > 1 ? 'x'.dechex($N[$t]) : $N[$t]) : $t) : 'amp;'.$t)).';';
 }
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
- return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
+if (($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))) {
+ return ($C['and_mark'] ? "\x06" : '&')."amp;#{$t};";
 }
-return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+return ($C['and_mark'] ? "\x06" : '&').'#'.(((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'.dechex($n)).';';
 // eof
 }
 
-function hl_prot($p, $c=null){
+function hl_prot($p, $c = null) {
 // check URL scheme
 global $C;
 $b = $a = '';
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
+if ($c == null) {$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]); }
 $c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*'];
 static $d = 'denied:';
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
-if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
+if (isset($c['!']) && substr($p, 0, 7) != $d) {$p = "$d$p"; }
+if (isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)) {return "{$b}{$p}{$a}"; } // All ok, frag, query, param
+if (preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])) { // Denied prot
  return "{$b}{$d}{$p}{$a}";
 }
-if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
+if ($C['abs_url']) {
+ if ($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0) { // Make url rel
   $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
+ }elseif (empty($m[1])) { // Make URL abs
+  if (substr($p, 0, 2) == '//') {$p = substr($C['base_url'], 0, strpos($C['base_url'], ':') + 1).$p; }
+  elseif ($p[0] == '/') {$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']).$p; }
+  elseif (strcspn($p, './')) {$p = $C['base_url'].$p; }
+  else {
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-   $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
+   $p = preg_replace('`(?<=/)\./`', '', $m[2].$p);
+   while (preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)) {
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
-   $p = $m[1]. $p;
+   $p = $m[1].$p;
   }
  }
 }
@@ -367,88 +367,88 @@ 
 // eof
 }
 
-function hl_regex($p){
+function hl_regex($p) {
 // ?regex
-if(empty($p)){return 0;}
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
-else{ini_set('track_errors', 1);}
+if (empty($p)) {return 0; }
+if ($t = ini_get('track_errors')) {$o = isset($php_errormsg) ? $php_errormsg : null; }
+else {ini_set('track_errors', 1); }
 unset($php_errormsg);
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
+if (($d = ini_get('display_errors'))) {ini_set('display_errors', 0); }
 preg_match($p, '');
-if($d){ini_set('display_errors', 1);}
+if ($d) {ini_set('display_errors', 1); }
 $r = isset($php_errormsg) ? 0 : 1;
-if($t){$php_errormsg = isset($o) ? $o : null;}
-else{ini_set('track_errors', 0);}
+if ($t) {$php_errormsg = isset($o) ? $o : null; }
+else {ini_set('track_errors', 0); }
 return $r;
 // eof
 }
 
-function hl_spec($t){
+function hl_spec($t) {
 // final $spec
 $s = array();
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t)));
-for($i = count(($t = explode(';', $t))); --$i>=0;){
+for ($i = count(($t = explode(';', $t))); --$i >= 0;) {
  $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
+ if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a = substr($w, $e + 1)))) {continue; }
  $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
-   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
+ foreach (explode(',', $a) as $v) {
+  if (!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)) {continue; }
+  if (($x = strtolower($m[1])) == '-*') {$n['*'] = 1; continue; }
+  if ($x[0] == '-') {$n[substr($x, 1)] = 1; continue; }
+  if (!isset($m[2])) {$y[$x] = 1; continue; }
+  foreach (explode('/', $m[2]) as $m) {
+   if (empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5) {$y[$x] = 1; continue; }
+   $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p + 1));
   }
-  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
+  if (isset($y[$x]['match']) && !hl_regex($y[$x]['match'])) {unset($y[$x]['match']); }
+  if (isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])) {unset($y[$x]['nomatch']); }
  }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){$s[$v] = $y;}
-  if(count($n)){$s[$v]['n'] = $n;}
+ if (!count($y) && !count($n)) {continue; }
+ foreach (explode(',', substr($w, 0, $e)) as $v) {
+  if (!strlen(($v = strtolower($v)))) {continue; }
+  if (count($y)) {$s[$v] = $y; }
+  if (count($n)) {$s[$v]['n'] = $n; }
  }
 }
 return $s;
 // eof
 }
 
-function hl_tag($t){
+function hl_tag($t) {
 // tag/attribute handler
 global $C;
 $t = $t[0];
 // invalid < >
-if($t == '< '){return '&lt; ';}
-if($t == '>'){return '&gt;';}
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
+if ($t == '< ') {return '&lt; '; }
+if ($t == '>') {return '&gt;'; }
+if (!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)) {
  //return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
- return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+ return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+}elseif (!isset($C['elements'][($e = strtolower($m[2]))])) {
+ return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
 }
 // attr string
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
 // tag transform
 static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){
+if ($C['make_tag_strict'] && isset($eD[$e])) {
  $trt = hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
+ if (!$e) {return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''); }
 }
 // close tag
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
-if(!empty($m[1])){
- return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
+if (!empty($m[1])) {
+ return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad']) % 2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
 }
 
 // open tag & attr
 static $aN = array('abbr'=>array('td'=>1, 'th'=>1), 'accept-charset'=>array('form'=>1), 'accept'=>array('form'=>1, 'input'=>1), 'accesskey'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'legend'=>1, 'textarea'=>1), 'action'=>array('form'=>1), 'align'=>array('caption'=>1, 'embed'=>1, 'applet'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'legend'=>1, 'table'=>1, 'hr'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'p'=>1, 'col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'alt'=>array('applet'=>1, 'area'=>1, 'img'=>1, 'input'=>1), 'archive'=>array('applet'=>1, 'object'=>1), 'axis'=>array('td'=>1, 'th'=>1), 'bgcolor'=>array('embed'=>1, 'table'=>1, 'tr'=>1, 'td'=>1, 'th'=>1), 'border'=>array('table'=>1, 'img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'cellpadding'=>array('table'=>1), 'cellspacing'=>array('table'=>1), 'char'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charoff'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'charset'=>array('a'=>1, 'script'=>1), 'checked'=>array('input'=>1), 'cite'=>array('blockquote'=>1, 'q'=>1, 'del'=>1, 'ins'=>1), 'classid'=>array('object'=>1), 'clear'=>array('br'=>1), 'code'=>array('applet'=>1), 'codebase'=>array('object'=>1, 'applet'=>1), 'codetype'=>array('object'=>1), 'color'=>array('font'=>1), 'cols'=>array('textarea'=>1), 'colspan'=>array('td'=>1, 'th'=>1), 'compact'=>array('dir'=>1, 'dl'=>1, 'menu'=>1, 'ol'=>1, 'ul'=>1), 'coords'=>array('area'=>1, 'a'=>1), 'data'=>array('object'=>1), 'datetime'=>array('del'=>1, 'ins'=>1), 'declare'=>array('object'=>1), 'defer'=>array('script'=>1), 'dir'=>array('bdo'=>1), 'disabled'=>array('button'=>1, 'input'=>1, 'optgroup'=>1, 'option'=>1, 'select'=>1, 'textarea'=>1), 'enctype'=>array('form'=>1), 'face'=>array('font'=>1), 'flashvars'=>array('embed'=>1), 'for'=>array('label'=>1), 'frame'=>array('table'=>1), 'frameborder'=>array('iframe'=>1), 'headers'=>array('td'=>1, 'th'=>1), 'height'=>array('embed'=>1, 'iframe'=>1, 'td'=>1, 'th'=>1, 'img'=>1, 'object'=>1, 'applet'=>1), 'href'=>array('a'=>1, 'area'=>1), 'hreflang'=>array('a'=>1), 'hspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'ismap'=>array('img'=>1, 'input'=>1), 'label'=>array('option'=>1, 'optgroup'=>1), 'language'=>array('script'=>1), 'longdesc'=>array('img'=>1, 'iframe'=>1), 'marginheight'=>array('iframe'=>1), 'marginwidth'=>array('iframe'=>1), 'maxlength'=>array('input'=>1), 'method'=>array('form'=>1), 'model'=>array('embed'=>1), 'multiple'=>array('select'=>1), 'name'=>array('button'=>1, 'embed'=>1, 'textarea'=>1, 'applet'=>1, 'select'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'a'=>1, 'input'=>1, 'object'=>1, 'map'=>1, 'param'=>1), 'nohref'=>array('area'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'object'=>array('applet'=>1), 'onblur'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onchange'=>array('input'=>1, 'select'=>1, 'textarea'=>1), 'onfocus'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'label'=>1, 'select'=>1, 'textarea'=>1), 'onreset'=>array('form'=>1), 'onselect'=>array('input'=>1, 'textarea'=>1), 'onsubmit'=>array('form'=>1), 'pluginspage'=>array('embed'=>1), 'pluginurl'=>array('embed'=>1), 'prompt'=>array('isindex'=>1), 'readonly'=>array('textarea'=>1, 'input'=>1), 'rel'=>array('a'=>1), 'rev'=>array('a'=>1), 'rows'=>array('textarea'=>1), 'rowspan'=>array('td'=>1, 'th'=>1), 'rules'=>array('table'=>1), 'scope'=>array('td'=>1, 'th'=>1), 'scrolling'=>array('iframe'=>1), 'selected'=>array('option'=>1), 'shape'=>array('area'=>1, 'a'=>1), 'size'=>array('hr'=>1, 'font'=>1, 'input'=>1, 'select'=>1), 'span'=>array('col'=>1, 'colgroup'=>1), 'src'=>array('embed'=>1, 'script'=>1, 'input'=>1, 'iframe'=>1, 'img'=>1), 'standby'=>array('object'=>1), 'start'=>array('ol'=>1), 'summary'=>array('table'=>1), 'tabindex'=>array('a'=>1, 'area'=>1, 'button'=>1, 'input'=>1, 'object'=>1, 'select'=>1, 'textarea'=>1), 'target'=>array('a'=>1, 'area'=>1, 'form'=>1), 'type'=>array('a'=>1, 'embed'=>1, 'object'=>1, 'param'=>1, 'script'=>1, 'input'=>1, 'li'=>1, 'ol'=>1, 'ul'=>1, 'button'=>1), 'usemap'=>array('img'=>1, 'input'=>1, 'object'=>1), 'valign'=>array('col'=>1, 'colgroup'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1), 'value'=>array('input'=>1, 'option'=>1, 'param'=>1, 'button'=>1, 'li'=>1), 'valuetype'=>array('param'=>1), 'vspace'=>array('applet'=>1, 'img'=>1, 'object'=>1), 'width'=>array('embed'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'object'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'applet'=>1, 'col'=>1, 'colgroup'=>1, 'pre'=>1), 'wmode'=>array('embed'=>1), 'xml:space'=>array('pre'=>1, 'script'=>1, 'style'=>1)); // Ele-specific
-$aN['background']=(isset($aN['background'])?array_merge($aN['background'],array('td'=>1)):array('td'=>1));//allow attribute background for (additional) elements, its not allowed by HTML Standards exept for body, but used anyway; one should check for the url to be allowed by application means
+$aN['background'] = (isset($aN['background']) ? array_merge($aN['background'], array('td'=>1)) : array('td'=>1)); //allow attribute background for (additional) elements, its not allowed by HTML Standards exept for body, but used anyway; one should check for the url to be allowed by application means
 static $aNE = array('checked'=>1, 'compact'=>1, 'declare'=>1, 'defer'=>1, 'disabled'=>1, 'ismap'=>1, 'multiple'=>1, 'nohref'=>1, 'noresize'=>1, 'noshade'=>1, 'nowrap'=>1, 'readonly'=>1, 'selected'=>1); // Empty
 static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src
 static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions
 
-if($C['lc_std_val']){
+if ($C['lc_std_val']) {
  // predef attr vals for $eAL & $aNE ele
  static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1);
  static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1);
@@ -456,7 +456,7 @@ 
 }
 
 $depTr = 0;
-if($C['no_deprecated_attr']){
+if ($C['no_deprecated_attr']) {
  // dep attr:applicable ele
  static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1));
  static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
@@ -464,203 +464,203 @@ 
 }
 
 // attr name-vals
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
+if (strpos($a, "\x01") !== false) {$a = preg_replace('`\x01[^\x01]*\x01`', '', $a); } // No comment/CDATA sec
 $mode = 0; $a = trim($a, ' /'); $aA = array();
-while(strlen($a)){
+while (strlen($a)) {
  $w = 0;
- switch($mode){
+ switch ($mode) {
   case 0: // Name
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
+   if (preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)) {
     $nm = strtolower($m[0]);
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
-   if($a[0] == '='){ // =
+   if ($a[0] == '=') { // =
     $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
+   } else { // No val
     $w = 1; $mode = 0; $a = ltrim($a);
     $aA[$nm] = '';
    }
   break; case 2: // Val
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
+   if (preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)) {
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
     $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
    }
   break;
  }
- if($w == 0){ // Parse errs, deal with space, " & '
+ if ($w == 0) { // Parse errs, deal with space, " & '
   $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
   $mode = 0;
  }
 }
-if($mode == 1){$aA[$nm] = '';}
+if ($mode == 1) {$aA[$nm] = ''; }
 
 // clean attrs
 global $S;
 $rl = isset($S[$e]) ? $S[$e] : array();
 $a = array(); $nfr = 0;
-foreach($aA as $k=>$v){
-  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
+foreach ($aA as $k=>$v) {
+  if (((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])) {
+  if (isset($aNE[$k])) {$v = $k; }
+  elseif (!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')) { // Rather loose but ?not cause issues
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
   }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
+  if ($k == 'style' && !$C['style_pass']) {
+   if (false !== strpos($v, '&#')) {
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
     $v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){
+  }elseif (isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o') {
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
    $v = hl_prot($v, $k);
-   if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+   if ($k == 'href') { // X-spam
+    if ($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0) {
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
+    }elseif ($C['anti_link_spam']) {
      $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
+     if (!empty($r1) && preg_match($r1, $v)) {continue; }
      $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
+     if (!empty($r0) && preg_match($r0, $v)) {
+      if (isset($a['rel'])) {
+       if (!preg_match('`\bnofollow\b`i', $a['rel'])) {$a['rel'] .= ' nofollow'; }
+      }elseif (isset($aA['rel'])) {
+       if (!preg_match('`\bnofollow\b`i', $aA['rel'])) {$nfr = 1; }
+      } else {$a['rel'] = 'nofollow'; }
      }
     }
    }
   }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
+  if (isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0) {continue; }
   $a[$k] = str_replace('"', '&quot;', $v);
  }
 }
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
+if ($nfr) {$a['rel'] = isset($a['rel']) ? $a['rel'].' nofollow' : 'nofollow'; }
 
 // rqd attr
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
-if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
+if (isset($eAR[$e])) {
+ foreach ($eAR[$e] as $k=>$v) {
+  if (!isset($a[$k])) {$a[$k] = isset($v[0]) ? $v : $k; }
  }
 }
 
 // depr attrs
-if($depTr){
+if ($depTr) {
  $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
-  if($k == 'align'){
+ foreach ($a as $k=>$v) {
+  if ($k == 'style' or !isset($aND[$k][$e])) {continue; }
+  if ($k == 'align') {
    unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
+   if ($e == 'img' && ($v == 'left' or $v == 'right')) {$c[] = 'float: '.$v; }
+   elseif (($e == 'div' or $e == 'table') && $v == 'center') {$c[] = 'margin: auto'; }
+   else {$c[] = 'text-align: '.$v; }
+  }elseif ($k == 'bgcolor') {
    unset($a['bgcolor']);
-   $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
+   $c[] = 'background-color: '.$v;
+  }elseif ($k == 'border') {
    unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
-   unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'clear'){
-   unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
+  }elseif ($k == 'bordercolor') {
+   unset($a['bordercolor']); $c[] = 'border-color: '.$v;
+  }elseif ($k == 'clear') {
+   unset($a['clear']); $c[] = 'clear: '.($v != 'all' ? $v : 'both');
+  }elseif ($k == 'compact') {
    unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
-   unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
+  }elseif ($k == 'height' or $k == 'width') {
+   unset($a[$k]); $c[] = $k.': '.($v[0] != '*' ? $v.(ctype_digit($v) ? 'px' : '') : 'auto');
+  }elseif ($k == 'hspace') {
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
+  }elseif ($k == 'language' && !isset($a['type'])) {
    unset($a['language']);
-   $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
+   $a['type'] = 'text/'.strtolower($v);
+  }elseif ($k == 'name') {
+   if ($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')) {unset($a['name']); }
+   if (!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)) {$a['id'] = $v; }
+  }elseif ($k == 'noshade') {
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
+  }elseif ($k == 'nowrap') {
    unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
-   unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'start' or $k == 'value'){
+  }elseif ($k == 'size') {
+   unset($a['size']); $c[] = 'size: '.$v.'px';
+  }elseif ($k == 'start' or $k == 'value') {
    unset($a[$k]);
-  }elseif($k == 'type'){
+  }elseif ($k == 'type') {
    unset($a['type']);
    static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
-   $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
-  }elseif($k == 'vspace'){
+   $c[] = 'list-style-type: '.(isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
+  }elseif ($k == 'vspace') {
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
   }
  }
- if(count($c)){
+ if (count($c)) {
   $c = implode('; ', $c);
-  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
+  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$c.';' : $c.';';
  }
 }
 // unique ID
-if($C['unique_ids'] && isset($a['id'])){
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
+if ($C['unique_ids'] && isset($a['id'])) {
+ if (!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)) {unset($a['id']);
+ } else {
+  while (isset($GLOBALS['hl_Ids'][$id])) {$id = $C['unique_ids'].$id; }
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
  }
 }
 // xml:lang
-if($C['xml:lang'] && isset($a['lang'])){
+if ($C['xml:lang'] && isset($a['lang'])) {
  $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
+ if ($C['xml:lang'] == 2) {unset($a['lang']); }
 }
 // for transformed tag
-if(!empty($trt)){
- $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
+if (!empty($trt)) {
+ $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$trt : $trt;
 }
 // return with empty ele /
-if(empty($C['hook_tag'])){
+if (empty($C['hook_tag'])) {
  $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
- return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
+ foreach ($a as $k=>$v) {$aA .= " {$k}=\"{$v}\""; }
+ return "<{$e}{$aA}".(isset($eE[$e]) ? ' /' : '').'>';
 }
-else{return $C['hook_tag']($e, $a);}
+else {return $C['hook_tag']($e, $a); }
 // eof
 }
 
-function hl_tag2(&$e, &$a, $t=1){
+function hl_tag2(&$e, &$a, $t = 1) {
 // transform tag
-if($e == 'center'){$e = 'div'; return 'text-align: center;';}
-if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';}
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';}
-if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';}
+if ($e == 'center') {$e = 'div'; return 'text-align: center;'; }
+if ($e == 'dir' or $e == 'menu') {$e = 'ul'; return ''; }
+if ($e == 's' or $e == 'strike') {$e = 'span'; return 'text-decoration: line-through;'; }
+if ($e == 'u') {$e = 'span'; return 'text-decoration: underline;'; }
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
-if($e == 'font' && $t !=3){//3 is a new make_tag_strict config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
+if ($e == 'font' && $t != 3) {//3 is a new make_tag_strict config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
  $a2 = '';
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
+ if (preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)) {
+  $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[2])).';';
  }
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){
-  $a2 .= ' color: '. trim($m[2]). ';';
+ if (preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)) {
+  $a2 .= ' color: '.trim($m[2]).';';
  }
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){
-  $a2 .= ' font-size: '. $fs[$m]. ';';
+ if (preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])) {
+  $a2 .= ' font-size: '.$fs[$m].';';
  }
 // $e = 'span'; return ltrim($a2);
 // replace the above with following
- if($GLOBALS['C']['balance']){
-  $e = 'div'; return 'display: inline; -htmlawed-transform: 1; '. ltrim($a2);
- }else{
+ if ($GLOBALS['C']['balance']) {
+  $e = 'div'; return 'display: inline; -htmlawed-transform: 1; '.ltrim($a2);
+ } else {
   $e = 'span'; return ltrim($a2);
  }
 }
-if($t == 2){$e = 0; return 0;}
+if ($t == 2) {$e = 0; return 0; }
 return '';
 // eof
 }
 
-function hl_tidy($t, $w, $p){
+function hl_tidy($t, $w, $p) {
 // Tidy/compact HTM
-if(strpos(' pre,script,textarea', "$p,")){return $t;}
+if (strpos(' pre,script,textarea', "$p,")) {return $t; }
 $t = preg_replace('`\s+`', ' ', preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t));
-if(($w = strtolower($w)) == -1){
+if (($w = strtolower($w)) == -1) {
  return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }
 $s = strpos(" $w", 't') ? "\t" : ' ';
@@ -672,66 +672,66 @@ 
 $d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
 $T = explode('<', $t);
 $X = 1;
-while($X){
+while ($X) {
  $n = $N;
  $t = $T;
  ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
+ if (isset($d[$p])) {echo str_repeat($s, ++$n); }
  echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
+ for ($i = -1, $j = count($t); ++$i < $j;) {
   $r = ''; list($e, $r) = explode('>', $t[$i]);
   $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
   $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
   $e = "<$e>";
-  if(isset($d[$y])){
-   if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+  if (isset($d[$y])) {
+   if (!$x) {
+    if ($n) {echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n); }
+    else {++$N; ob_end_clean(); continue 2; }
    }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
+   else {echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n)); }
    echo $r; continue;
   }
-  $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, $r;}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, $r;
-  }elseif(!$y){echo $f, $e, $f, $r;
-  }else{echo $e, $r;}
+  $f = "\n".str_repeat($s, $n);
+  if (isset($c[$y])) {
+   if (!$x) {echo $e, $f, $r; }
+   else {echo $f, $e, $r; }
+  }elseif (isset($b[$y])) {echo $f, $e, $r;
+  }elseif (isset($a[$y])) {echo $e, $f, $r;
+  }elseif (!$y) {echo $f, $e, $f, $r;
+  } else {echo $e, $r; }
  }
  $X = 0;
 }
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents()));
 ob_end_clean();
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
+if (($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)) {
  $t = str_replace("\n", $l, $t);
 }
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 // eof
 }
 
-function hl_version(){
+function hl_version() {
 // rel
 return '1.1.17';
 // eof
 }
 
-function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){
+function kses($t, $h, $p = array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')) {
 // kses compat
-foreach($h as $k=>$v){
+foreach ($h as $k=>$v) {
  $h[$k]['n']['*'] = 1;
 }
 $C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0;
 $C['keep_bad'] = 1;
 $C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*';
 $C['hook'] = 'kses_hook';
-$C['schemes'] = '*:'. implode(',', $p);
+$C['schemes'] = '*:'.implode(',', $p);
 return htmLawed($t, $C, $h);
 // eof
 }
 
-function kses_hook($t, &$C, &$S){
+function kses_hook($t, &$C, &$S) {
 // kses compat
 return $t;
 // eof

Braces +708 added lines, -263 removed lines

@@ -9,28 +9,44 @@ 
 See htmLawed_README.txt/htm
 */
 
-function htmLawed($t, $C=1, $S=array()){
+function htmLawed($t, $C=1, $S=array())
+{
 $C = is_array($C) ? $C : array();
-if(!empty($C['valid_xhtml'])){
+if(!empty($C['valid_xhtml']))
+{
  $C['elements'] = empty($C['elements']) ? '*-center-dir-font-isindex-menu-s-strike-u' : $C['elements'];
  $C['make_tag_strict'] = isset($C['make_tag_strict']) ? $C['make_tag_strict'] : 2;
  $C['xml:lang'] = isset($C['xml:lang']) ? $C['xml:lang'] : 2;
 }
 // config eles
 $e = array('a'=>1, 'abbr'=>1, 'acronym'=>1, 'address'=>1, 'applet'=>1, 'area'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'blockquote'=>1, 'br'=>1, 'button'=>1, 'caption'=>1, 'center'=>1, 'cite'=>1, 'code'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'del'=>1, 'dfn'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'dt'=>1, 'em'=>1, 'embed'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'isindex'=>1, 'kbd'=>1, 'label'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'object'=>1, 'ol'=>1, 'optgroup'=>1, 'option'=>1, 'p'=>1, 'param'=>1, 'pre'=>1, 'q'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'table'=>1, 'tbody'=>1, 'td'=>1, 'textarea'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'tt'=>1, 'u'=>1, 'ul'=>1, 'var'=>1); // 86/deprecated+embed+ruby
-if(!empty($C['safe'])){
+if(!empty($C['safe']))
+{
  unset($e['applet'], $e['embed'], $e['iframe'], $e['object'], $e['script']);
 }
 $x = !empty($C['elements']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['elements']) : '*';
-if($x == '-*'){$e = array();}
-elseif(strpos($x, '*') === false){$e = array_flip(explode(',', $x));}
-else{
- if(isset($x[1])){
+if($x == '-*')
+{
+$e = array();}
+elseif(strpos($x, '*') === false)
+{
+$e = array_flip(explode(',', $x));}
+else
+{
+ if(isset($x[1]))
+ {
   preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-  for($i=count($m); --$i>=0;){$m[$i] = $m[$i][0];}
-  foreach($m as $v){
-   if($v[0] == '+'){$e[substr($v, 1)] = 1;}
-   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)){unset($e[$v]);}
+  for($i=count($m); --$i>=0;)
+  {
+$m[$i] = $m[$i][0];}
+  foreach($m as $v)
+  {
+   if($v[0] == '+')
+   {
+$e[substr($v, 1)] = 1;}
+   if($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m))
+   {
+unset($e[$v]);}
   }
  }
 }
@@ -38,7 +54,8 @@ 
 // config attrs
 $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
 $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
-if(isset($x['on*'])){
+if(isset($x['on*']))
+{
  unset($x['on*']);
  $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
 }
@@ -46,14 +63,22 @@ 
 // config URL
 $x = (isset($C['schemes'][2]) && strpos($C['schemes'], ':')) ? strtolower($C['schemes']) : 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https';
 $C['schemes'] = array();
-foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v){
+foreach(explode(';', str_replace(array(' ', "\t", "\r", "\n"), '', $x)) as $v)
+{
  $x = $x2 = null; list($x, $x2) = explode(':', $v, 2);
- if($x2){$C['schemes'][$x] = array_flip(explode(',', $x2));}
+ if($x2)
+ {
+$C['schemes'][$x] = array_flip(explode(',', $x2));}
 }
-if(!isset($C['schemes']['*'])){$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);}
-if(!empty($C['safe']) && empty($C['schemes']['style'])){$C['schemes']['style'] = array('!'=>1);}
+if(!isset($C['schemes']['*']))
+{
+$C['schemes']['*'] = array('file'=>1, 'http'=>1, 'https'=>1,);}
+if(!empty($C['safe']) && empty($C['schemes']['style']))
+{
+$C['schemes']['style'] = array('!'=>1);}
 $C['abs_url'] = isset($C['abs_url']) ? $C['abs_url'] : 0;
-if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url'])){
+if(!isset($C['base_url']) or !preg_match('`^[a-zA-Z\d.+\-]+://[^/]+/(.+?/)?$`', $C['base_url']))
+{
  $C['base_url'] = $C['abs_url'] = 0;
 }
 // config rest
@@ -84,23 +109,35 @@ 
 // block elements allowed for nesting when only inline is allowed; Example span does not allow block elements as table; table is the only element tested so far
 $C['allow_for_inline'] = isset($C['allow_for_inline'])?$C['allow_for_inline']:0;
 
-if(isset($GLOBALS['C'])){$reC = $GLOBALS['C'];}
+if(isset($GLOBALS['C']))
+{
+$reC = $GLOBALS['C'];}
 $GLOBALS['C'] = $C;
 $S = is_array($S) ? $S : hl_spec($S);
-if(isset($GLOBALS['S'])){$reS = $GLOBALS['S'];}
+if(isset($GLOBALS['S']))
+{
+$reS = $GLOBALS['S'];}
 $GLOBALS['S'] = $S;
 
 $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
-if($C['clean_ms_char']){
+if($C['clean_ms_char'])
+{
  $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
  $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
  $t = strtr($t, $x);
 }
-if($C['cdata'] or $C['comment']){$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);}
+if($C['cdata'] or $C['comment'])
+{
+$t = preg_replace_callback('`<!(?:(?:--.*?--)|(?:\[CDATA\[.*?\]\]))>`sm', 'hl_cmtcd', $t);}
 $t = preg_replace_callback('`&amp;([A-Za-z][A-Za-z0-9]{1,30}|#(?:[0-9]{1,8}|[Xx][0-9A-Fa-f]{1,7}));`', 'hl_ent', str_replace('&', '&amp;', $t));
-if($C['unique_ids'] && !isset($GLOBALS['hl_Ids'])){$GLOBALS['hl_Ids'] = array();}
-if($C['hook']){$t = $C['hook']($t, $C, $S);}
-if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting'])){
+if($C['unique_ids'] && !isset($GLOBALS['hl_Ids']))
+{
+$GLOBALS['hl_Ids'] = array();}
+if($C['hook'])
+{
+$t = $C['hook']($t, $C, $S);}
+if($C['show_setting'] && preg_match('`^[a-z][a-z0-9_]*$`i', $C['show_setting']))
+{
  $GLOBALS[$C['show_setting']] = array('config'=>$C, 'spec'=>$S, 'time'=>microtime());
 }
 // main
@@ -109,41 +146,71 @@ 
 $t = (($C['cdata'] or $C['comment']) && strpos($t, "\x01") !== false) ? str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05"), array('', '', '&', '<', '>'), $t) : $t;
 $t = $C['tidy'] ? hl_tidy($t, $C['tidy'], $C['parent']) : $t;
 unset($C, $e);
-if(isset($reC)){$GLOBALS['C'] = $reC;}
-if(isset($reS)){$GLOBALS['S'] = $reS;}
+if(isset($reC))
+{
+$GLOBALS['C'] = $reC;}
+if(isset($reS))
+{
+$GLOBALS['S'] = $reS;}
 return $t;
 // eof
 }
 
-function hl_attrval($t, $p){
+function hl_attrval($t, $p)
+{
 // check attr val against $S
 $o = 1; $l = strlen($t);
-foreach($p as $k=>$v){
- switch($k){
-  case 'maxlen':if($l > $v){$o = 0;}
-  break; case 'minlen': if($l < $v){$o = 0;}
-  break; case 'maxval': if((float)($t) > $v){$o = 0;}
-  break; case 'minval': if((float)($t) < $v){$o = 0;}
-  break; case 'match': if(!preg_match($v, $t)){$o = 0;}
-  break; case 'nomatch': if(preg_match($v, $t)){$o = 0;}
+foreach($p as $k=>$v)
+{
+ switch($k)
+ {
+  case 'maxlen':if($l > $v)
+  {
+$o = 0;}
+  break; case 'minlen': if($l < $v)
+  {
+$o = 0;}
+  break; case 'maxval': if((float)($t) > $v)
+  {
+$o = 0;}
+  break; case 'minval': if((float)($t) < $v)
+  {
+$o = 0;}
+  break; case 'match': if(!preg_match($v, $t))
+  {
+$o = 0;}
+  break; case 'nomatch': if(preg_match($v, $t))
+  {
+$o = 0;}
   break; case 'oneof':
    $m = 0;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 1; break;}}
+   foreach(explode('|', $v) as $n)
+   {
+if($t == $n)
+   {
+$m = 1; break;}}
    $o = $m;
   break; case 'noneof':
    $m = 1;
-   foreach(explode('|', $v) as $n){if($t == $n){$m = 0; break;}}
+   foreach(explode('|', $v) as $n)
+   {
+if($t == $n)
+   {
+$m = 0; break;}}
    $o = $m;
   break; default:
   break;
  }
- if(!$o){break;}
+ if(!$o)
+ {
+break;}
 }
 return ($o ? $t : (isset($p['default']) ? $p['default'] : 0));
 // eof
 }
 
-function hl_bal($t, $do=1, $in='div'){
+function hl_bal($t, $do=1, $in='div')
+{
 // balance tags
 // by content
 $cB = array('blockquote'=>1, 'form'=>1, 'map'=>1, 'noscript'=>1); // Block
@@ -154,209 +221,359 @@ 
 $cN2 = array_keys($cN);
 $cR = array('blockquote'=>1, 'dir'=>1, 'dl'=>1, 'form'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
 $cS = array('colgroup'=>array('col'=>1), 'dir'=>array('li'=>1), 'dl'=>array('dd'=>1, 'dt'=>1), 'menu'=>array('li'=>1), 'ol'=>array('li'=>1), 'optgroup'=>array('option'=>1), 'option'=>array('#pcdata'=>1), 'rbc'=>array('rb'=>1), 'rp'=>array('#pcdata'=>1), 'rtc'=>array('rt'=>1), 'ruby'=>array('rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1), 'select'=>array('optgroup'=>1, 'option'=>1), 'script'=>array('#pcdata'=>1), 'table'=>array('caption'=>1, 'col'=>1, 'colgroup'=>1, 'tfoot'=>1, 'tbody'=>1, 'tr'=>1, 'thead'=>1), 'tbody'=>array('tr'=>1), 'tfoot'=>array('tr'=>1), 'textarea'=>array('#pcdata'=>1), 'thead'=>array('tr'=>1), 'tr'=>array('td'=>1, 'th'=>1), 'ul'=>array('li'=>1)); // Specific - immediate parent-child
-if($GLOBALS['C']['direct_list_nest']){$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);}
+if($GLOBALS['C']['direct_list_nest'])
+{
+$cS['ol'] = $cS['ul'] += array('ol'=>1, 'ul'=>1);}
 $cO = array('address'=>array('p'=>1), 'applet'=>array('param'=>1), 'blockquote'=>array('script'=>1), 'fieldset'=>array('legend'=>1, '#pcdata'=>1), 'form'=>array('script'=>1), 'map'=>array('area'=>1), 'object'=>array('param'=>1, 'embed'=>1)); // Other
 $cT = array('colgroup'=>1, 'dd'=>1, 'dt'=>1, 'li'=>1, 'option'=>1, 'p'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1); // Omitable closing
 // block/inline type; ins & del both type; #pcdata: text
 $eB = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'del'=>1, 'dir'=>1, 'dl'=>1, 'div'=>1, 'fieldset'=>1, 'form'=>1, 'ins'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'isindex'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'table'=>1, 'ul'=>1);
 $eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
-if($GLOBALS['C']['allow_for_inline'] && is_array($GLOBALS['C']['allow_for_inline'])) foreach($GLOBALS['C']['allow_for_inline'] as $khai => $vhai) {$eI[$vhai]=1;}//allow table as if it was an inline element as <span> some Text <table>...</table> more text</span> is quite common
+if($GLOBALS['C']['allow_for_inline'] && is_array($GLOBALS['C']['allow_for_inline']))
+{
+	foreach($GLOBALS['C']['allow_for_inline'] as $khai => $vhai) {$eI[$vhai]=1;
+}
+}//allow table as if it was an inline element as <span> some Text <table>...</table> more text</span> is quite common
 $eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
 $eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
 $eF = $eB + $eI;
 
 // $in sets allowed child
 $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
-if(isset($cE[$in])){
+if(isset($cE[$in]))
+{
  return (!$do ? '' : str_replace(array('<', '>'), array('&lt;', '&gt;'), $t));
 }
-if(isset($cS[$in])){$inOk = $cS[$in];}
-elseif(isset($cI[$in])){$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-elseif(isset($cF[$in])){$inOk = $eF; unset($cI['del'], $cI['ins']);}
-elseif(isset($cB[$in])){$inOk = $eB; unset($cI['del'], $cI['ins']);}
-if(isset($cO[$in])){$inOk = $inOk + $cO[$in];}
-if(isset($cN[$in])){$inOk = array_diff_assoc($inOk, $cN[$in]);}
+if(isset($cS[$in]))
+{
+$inOk = $cS[$in];}
+elseif(isset($cI[$in]))
+{
+$inOk = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
+elseif(isset($cF[$in]))
+{
+$inOk = $eF; unset($cI['del'], $cI['ins']);}
+elseif(isset($cB[$in]))
+{
+$inOk = $eB; unset($cI['del'], $cI['ins']);}
+if(isset($cO[$in]))
+{
+$inOk = $inOk + $cO[$in];}
+if(isset($cN[$in]))
+{
+$inOk = array_diff_assoc($inOk, $cN[$in]);}
 
 $t = explode('<', $t);
 $ok = $q = array(); // $q seq list of open non-empty ele
 ob_start();
 
-for($i=-1, $ci=count($t); ++$i<$ci;){
+for($i=-1, $ci=count($t); ++$i<$ci;)
+{
  // allowed $ok in parent $p
- if($ql = count($q)){
+ if($ql = count($q))
+ {
   $p = array_pop($q);
   $q[] = $p;
-  if(isset($cS[$p])){$ok = $cS[$p];}
-  elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
-  elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
-  elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
-  if(isset($cO[$p])){$ok = $ok + $cO[$p];}
-  if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
- }else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
+  if(isset($cS[$p]))
+  {
+$ok = $cS[$p];}
+  elseif(isset($cI[$p]))
+  {
+$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
+  elseif(isset($cF[$p]))
+  {
+$ok = $eF; unset($cI['del'], $cI['ins']);}
+  elseif(isset($cB[$p]))
+  {
+$ok = $eB; unset($cI['del'], $cI['ins']);}
+  if(isset($cO[$p]))
+  {
+$ok = $ok + $cO[$p];}
+  if(isset($cN[$p]))
+  {
+$ok = array_diff_assoc($ok, $cN[$p]);}
+ }
+ else
+ {
+$ok = $inOk; unset($cI['del'], $cI['ins']);}
  // bad tags, & ele content
- if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5))))
+ {
   echo '&lt;', $s, $e, $a, '&gt;';
  }
- if(isset($x[0])){
-  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+ if(isset($x[0]))
+ {
+  if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)))
+  {
    echo '<div>', $x, '</div>';
   }
-  elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
-  elseif(strpos($x, "\x02\x04")){
-   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+  elseif($do < 3 or isset($ok['#pcdata']))
+  {
+echo $x;}
+  elseif(strpos($x, "\x02\x04"))
+  {
+   foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v)
+   {
     echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
    }
-  }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+  }
+  elseif($do > 4)
+  {
+echo preg_replace('`\S`', '', $x);}
  }
  // get markup
- if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r)){$x = $t[$i]; continue;}
+ if(!preg_match('`^(/?)([a-z1-6]+)([^>]*)>(.*)`sm', $t[$i], $r))
+ {
+$x = $t[$i]; continue;}
  $s = null; $e = null; $a = null; $x = null; list($all, $s, $e, $a, $x) = $r;
  // close tag
- if($s){
-  if(isset($cE[$e]) or !in_array($e, $q)){continue;} // Empty/unopen
-  if($p == $e){array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
+ if($s)
+ {
+  if(isset($cE[$e]) or !in_array($e, $q))
+  {
+continue;} // Empty/unopen
+  if($p == $e)
+  {
+array_pop($q); echo '</', $e, '>'; unset($e); continue;} // Last open
   $add = ''; // Nesting - close open tags that need to be
-  for($j=-1, $cj=count($q); ++$j<$cj;){
-   if(($d = array_pop($q)) == $e){break;}
-   else{$add .= "</{$d}>";}
+  for($j=-1, $cj=count($q); ++$j<$cj;)
+  {
+   if(($d = array_pop($q)) == $e)
+   {
+break;}
+   else
+   {
+$add .= "</{$d}>";}
   }
   echo $add, '</', $e, '>'; unset($e); continue;
  }
  // open tag
  // $cB ele needs $eB ele as child
- if(isset($cB[$e]) && strlen(trim($x))){
+ if(isset($cB[$e]) && strlen(trim($x)))
+ {
   $t[$i] = "{$e}{$a}>";
   array_splice($t, $i+1, 0, 'div>'. $x); unset($e, $x); ++$ci; --$i; continue;
  }
- if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e])){
+ if((($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)) && !isset($eB[$e]) && !isset($ok[$e]))
+ {
   array_splice($t, $i, 0, 'div>'); unset($e, $x); ++$ci; --$i; continue;
  }
- if($e == 'div' && !isset($ok['div']) && strpos($a, '-htmlawed-transform')){
+ if($e == 'div' && !isset($ok['div']) && strpos($a, '-htmlawed-transform'))
+ {
   $t[$i] = "span{$a}>{$x}"; unset($e, $x); --$i; continue;
  }
  // if no open ele, $in = parent; mostly immediate parent-child relation should hold
- if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2)){
-  if(!isset($ok[$e])){
-   if($ql && isset($cT[$p])){echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
+ if(!$ql or !isset($eN[$e]) or !array_intersect($q, $cN2))
+ {
+  if(!isset($ok[$e]))
+  {
+   if($ql && isset($cT[$p]))
+   {
+echo '</', array_pop($q), '>'; unset($e, $x); --$i;}
    continue;
   }
-  if(!isset($cE[$e])){$q[] = $e;}
+  if(!isset($cE[$e]))
+  {
+$q[] = $e;}
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // specific parent-child
- if(isset($cS[$p][$e])){
-  if(!isset($cE[$e])){$q[] = $e;}
+ if(isset($cS[$p][$e]))
+ {
+  if(!isset($cE[$e]))
+  {
+$q[] = $e;}
   echo '<', $e, $a, '>'; unset($e); continue;
  }
  // nesting
  $add = '';
  $q2 = array();
- for($k=-1, $kc=count($q); ++$k<$kc;){
+ for($k=-1, $kc=count($q); ++$k<$kc;)
+ {
   $d = $q[$k];
   $ok2 = array();
-  if(isset($cS[$d])){$q2[] = $d; continue;}
+  if(isset($cS[$d]))
+  {
+$q2[] = $d; continue;}
   $ok2 = isset($cI[$d]) ? $eI : $eF;
-  if(isset($cO[$d])){$ok2 = $ok2 + $cO[$d];}
-  if(isset($cN[$d])){$ok2 = array_diff_assoc($ok2, $cN[$d]);}
-  if(!isset($ok2[$e])){
-   if(!$k && !isset($inOk[$e])){continue 2;}
+  if(isset($cO[$d]))
+  {
+$ok2 = $ok2 + $cO[$d];}
+  if(isset($cN[$d]))
+  {
+$ok2 = array_diff_assoc($ok2, $cN[$d]);}
+  if(!isset($ok2[$e]))
+  {
+   if(!$k && !isset($inOk[$e]))
+   {
+continue 2;}
    $add = "</{$d}>";
-   for(;++$k<$kc;){$add = "</{$q[$k]}>{$add}";}
+   for(;++$k<$kc;)
+   {
+$add = "</{$q[$k]}>{$add}";}
    break;
   }
-  else{$q2[] = $d;}
+  else
+  {
+$q2[] = $d;}
  }
  $q = $q2;
- if(!isset($cE[$e])){$q[] = $e;}
+ if(!isset($cE[$e]))
+ {
+$q[] = $e;}
  echo $add, '<', $e, $a, '>'; unset($e); continue;
 }
 
 // end
-if($ql = count($q)){
+if($ql = count($q))
+{
  $p = array_pop($q);
  $q[] = $p;
- if(isset($cS[$p])){$ok = $cS[$p];}
- elseif(isset($cI[$p])){$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
- elseif(isset($cF[$p])){$ok = $eF; unset($cI['del'], $cI['ins']);}
- elseif(isset($cB[$p])){$ok = $eB; unset($cI['del'], $cI['ins']);}
- if(isset($cO[$p])){$ok = $ok + $cO[$p];}
- if(isset($cN[$p])){$ok = array_diff_assoc($ok, $cN[$p]);}
-}else{$ok = $inOk; unset($cI['del'], $cI['ins']);}
-if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5)))){
+ if(isset($cS[$p]))
+ {
+$ok = $cS[$p];}
+ elseif(isset($cI[$p]))
+ {
+$ok = $eI; $cI['del'] = 1; $cI['ins'] = 1;}
+ elseif(isset($cF[$p]))
+ {
+$ok = $eF; unset($cI['del'], $cI['ins']);}
+ elseif(isset($cB[$p]))
+ {
+$ok = $eB; unset($cI['del'], $cI['ins']);}
+ if(isset($cO[$p]))
+ {
+$ok = $ok + $cO[$p];}
+ if(isset($cN[$p]))
+ {
+$ok = array_diff_assoc($ok, $cN[$p]);}
+}
+else
+{
+$ok = $inOk; unset($cI['del'], $cI['ins']);}
+if(isset($e) && ($do == 1 or (isset($ok['#pcdata']) && ($do == 3 or $do == 5))))
+{
  echo '&lt;', $s, $e, $a, '&gt;';
 }
-if(isset($x[0])){
- if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql))){
+if(isset($x[0]))
+{
+ if(strlen(trim($x)) && (($ql && isset($cB[$p])) or (isset($cB[$in]) && !$ql)))
+ {
   echo '<div>', $x, '</div>';
  }
- elseif($do < 3 or isset($ok['#pcdata'])){echo $x;}
- elseif(strpos($x, "\x02\x04")){
-  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v){
+ elseif($do < 3 or isset($ok['#pcdata']))
+ {
+echo $x;}
+ elseif(strpos($x, "\x02\x04"))
+ {
+  foreach(preg_split('`(\x01\x02[^\x01\x02]+\x02\x01)`', $x, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY) as $v)
+  {
    echo (substr($v, 0, 2) == "\x01\x02" ? $v : ($do > 4 ? preg_replace('`\S`', '', $v) : ''));
   }
- }elseif($do > 4){echo preg_replace('`\S`', '', $x);}
+ }
+ elseif($do > 4)
+ {
+echo preg_replace('`\S`', '', $x);}
 }
-while(!empty($q) && ($e = array_pop($q))){echo '</', $e, '>';}
+while(!empty($q) && ($e = array_pop($q)))
+{
+echo '</', $e, '>';}
 $o = ob_get_contents();
 ob_end_clean();
 return $o;
 // eof
 }
 
-function hl_cmtcd($t){
+function hl_cmtcd($t)
+{
 // comment/CDATA sec handler
 $t = $t[0];
 global $C;
-if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata'])){return $t;}
-if($v == 1){return '';}
-if($n == 'comment'){
- if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' '){$t .= ' ';}
+if(!($v = $C[$n = $t[3] == '-' ? 'comment' : 'cdata']))
+{
+return $t;}
+if($v == 1)
+{
+return '';}
+if($n == 'comment')
+{
+ if(substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ')
+ {
+$t .= ' ';}
 }
-else{$t = substr($t, 1, -1);}
+else
+{
+$t = substr($t, 1, -1);}
 $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
 return str_replace(array('&', '<', '>'), array("\x03", "\x04", "\x05"), ($n == 'comment' ? "\x01\x02\x04!--$t--\x05\x02\x01" : "\x01\x01\x04$t\x05\x01\x01"));
 // eof
 }
 
-function hl_ent($t){
+function hl_ent($t)
+{
 // entitity handler
 global $C;
 $t = $t[1];
 static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
 static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
-if($t[0] != '#'){
+if($t[0] != '#')
+{
  return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
 }
-if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))){
+if(($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111)))
+{
  return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
 }
 return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
 // eof
 }
 
-function hl_prot($p, $c=null){
+function hl_prot($p, $c=null)
+{
 // check URL scheme
 global $C;
 $b = $a = '';
-if($c == null){$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
+if($c == null)
+{
+$c = 'style'; $b = $p[1]; $a = $p[3]; $p = trim($p[2]);}
 $c = isset($C['schemes'][$c]) ? $C['schemes'][$c] : $C['schemes']['*'];
 static $d = 'denied:';
-if(isset($c['!']) && substr($p, 0, 7) != $d){$p = "$d$p";}
-if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d)){return "{$b}{$p}{$a}";} // All ok, frag, query, param
-if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])])){ // Denied prot
+if(isset($c['!']) && substr($p, 0, 7) != $d)
+{
+$p = "$d$p";}
+if(isset($c['*']) or !strcspn($p, '#?;') or (substr($p, 0, 7) == $d))
+{
+return "{$b}{$p}{$a}";} // All ok, frag, query, param
+if(preg_match('`^([^:?[@!$()*,=/\'\]]+?)(:|&#(58|x3a);|%3a|\\\\0{0,4}3a).`i', $p, $m) && !isset($c[strtolower($m[1])]))
+{
+// Denied prot
  return "{$b}{$d}{$p}{$a}";
 }
-if($C['abs_url']){
- if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0){ // Make url rel
+if($C['abs_url'])
+{
+ if($C['abs_url'] == -1 && strpos($p, $C['base_url']) === 0)
+ {
+// Make url rel
   $p = substr($p, strlen($C['base_url']));
- }elseif(empty($m[1])){ // Make URL abs
-  if(substr($p, 0, 2) == '//'){$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
-  elseif($p[0] == '/'){$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
-  elseif(strcspn($p, './')){$p = $C['base_url']. $p;}
-  else{
+ }
+ elseif(empty($m[1]))
+ {
+// Make URL abs
+  if(substr($p, 0, 2) == '//')
+  {
+$p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;}
+  elseif($p[0] == '/')
+  {
+$p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;}
+  elseif(strcspn($p, './'))
+  {
+$p = $C['base_url']. $p;}
+  else
+  {
    preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
-   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)){
+   while(preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p))
+   {
     $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
    }
    $p = $m[1]. $p;
@@ -367,77 +584,133 @@ 
 // eof
 }
 
-function hl_regex($p){
+function hl_regex($p)
+{
 // ?regex
-if(empty($p)){return 0;}
-if($t = ini_get('track_errors')){$o = isset($php_errormsg) ? $php_errormsg : null;}
-else{ini_set('track_errors', 1);}
+if(empty($p))
+{
+return 0;}
+if($t = ini_get('track_errors'))
+{
+$o = isset($php_errormsg) ? $php_errormsg : null;}
+else
+{
+ini_set('track_errors', 1);}
 unset($php_errormsg);
-if(($d = ini_get('display_errors'))){ini_set('display_errors', 0);}
+if(($d = ini_get('display_errors')))
+{
+ini_set('display_errors', 0);}
 preg_match($p, '');
-if($d){ini_set('display_errors', 1);}
+if($d)
+{
+ini_set('display_errors', 1);}
 $r = isset($php_errormsg) ? 0 : 1;
-if($t){$php_errormsg = isset($o) ? $o : null;}
-else{ini_set('track_errors', 0);}
+if($t)
+{
+$php_errormsg = isset($o) ? $o : null;}
+else
+{
+ini_set('track_errors', 0);}
 return $r;
 // eof
 }
 
-function hl_spec($t){
+function hl_spec($t)
+{
 // final $spec
 $s = array();
 $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t)));
-for($i = count(($t = explode(';', $t))); --$i>=0;){
+for($i = count(($t = explode(';', $t))); --$i>=0;)
+{
  $w = $t[$i];
- if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))){continue;}
+ if(empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1))))
+ {
+continue;}
  $y = $n = array();
- foreach(explode(',', $a) as $v){
-  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m)){continue;}
-  if(($x = strtolower($m[1])) == '-*'){$n['*'] = 1; continue;}
-  if($x[0] == '-'){$n[substr($x, 1)] = 1; continue;}
-  if(!isset($m[2])){$y[$x] = 1; continue;}
-  foreach(explode('/', $m[2]) as $m){
-   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5){$y[$x] = 1; continue;}
+ foreach(explode(',', $a) as $v)
+ {
+  if(!preg_match('`^([a-z:\-\*]+)(?:\((.*?)\))?`i', $v, $m))
+  {
+continue;}
+  if(($x = strtolower($m[1])) == '-*')
+  {
+$n['*'] = 1; continue;}
+  if($x[0] == '-')
+  {
+$n[substr($x, 1)] = 1; continue;}
+  if(!isset($m[2]))
+  {
+$y[$x] = 1; continue;}
+  foreach(explode('/', $m[2]) as $m)
+  {
+   if(empty($m) or ($p = strpos($m, '=')) == 0 or $p < 5)
+   {
+$y[$x] = 1; continue;}
    $y[$x][strtolower(substr($m, 0, $p))] = str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08"), array(";", "|", "~", " ", ",", "/", "(", ")"), substr($m, $p+1));
   }
-  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match'])){unset($y[$x]['match']);}
-  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch'])){unset($y[$x]['nomatch']);}
+  if(isset($y[$x]['match']) && !hl_regex($y[$x]['match']))
+  {
+unset($y[$x]['match']);}
+  if(isset($y[$x]['nomatch']) && !hl_regex($y[$x]['nomatch']))
+  {
+unset($y[$x]['nomatch']);}
  }
- if(!count($y) && !count($n)){continue;}
- foreach(explode(',', substr($w, 0, $e)) as $v){
-  if(!strlen(($v = strtolower($v)))){continue;}
-  if(count($y)){$s[$v] = $y;}
-  if(count($n)){$s[$v]['n'] = $n;}
+ if(!count($y) && !count($n))
+ {
+continue;}
+ foreach(explode(',', substr($w, 0, $e)) as $v)
+ {
+  if(!strlen(($v = strtolower($v))))
+  {
+continue;}
+  if(count($y))
+  {
+$s[$v] = $y;}
+  if(count($n))
+  {
+$s[$v]['n'] = $n;}
  }
 }
 return $s;
 // eof
 }
 
-function hl_tag($t){
+function hl_tag($t)
+{
 // tag/attribute handler
 global $C;
 $t = $t[0];
 // invalid < >
-if($t == '< '){return '&lt; ';}
-if($t == '>'){return '&gt;';}
-if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)){
+if($t == '< ')
+{
+return '&lt; ';}
+if($t == '>')
+{
+return '&gt;';}
+if(!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m))
+{
  //return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
  return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
-}elseif(!isset($C['elements'][($e = strtolower($m[2]))])){
+}
+elseif(!isset($C['elements'][($e = strtolower($m[2]))]))
+{
  return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
 }
 // attr string
 $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
 // tag transform
 static $eD = array('applet'=>1, 'center'=>1, 'dir'=>1, 'embed'=>1, 'font'=>1, 'isindex'=>1, 'menu'=>1, 's'=>1, 'strike'=>1, 'u'=>1); // Deprecated
-if($C['make_tag_strict'] && isset($eD[$e])){
+if($C['make_tag_strict'] && isset($eD[$e]))
+{
  $trt = hl_tag2($e, $a, $C['make_tag_strict']);
- if(!$e){return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
+ if(!$e)
+ {
+return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');}
 }
 // close tag
 static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
-if(!empty($m[1])){
+if(!empty($m[1]))
+{
  return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
 }
 
@@ -448,7 +721,8 @@ 
 static $aNP = array('action'=>1, 'cite'=>1, 'classid'=>1, 'codebase'=>1, 'data'=>1, 'href'=>1, 'longdesc'=>1, 'model'=>1, 'pluginspage'=>1, 'pluginurl'=>1, 'usemap'=>1); // Need scheme check; excludes style, on* & src
 static $aNU = array('class'=>array('param'=>1, 'script'=>1), 'dir'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'id'=>array('script'=>1), 'lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'xml:lang'=>array('applet'=>1, 'br'=>1, 'iframe'=>1, 'param'=>1, 'script'=>1), 'onclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'ondblclick'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeydown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeypress'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onkeyup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousedown'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmousemove'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseout'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseover'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'onmouseup'=>array('applet'=>1, 'bdo'=>1, 'br'=>1, 'font'=>1, 'iframe'=>1, 'isindex'=>1, 'param'=>1, 'script'=>1), 'style'=>array('param'=>1, 'script'=>1), 'title'=>array('param'=>1, 'script'=>1)); // Univ & exceptions
 
-if($C['lc_std_val']){
+if($C['lc_std_val'])
+{
  // predef attr vals for $eAL & $aNE ele
  static $aNL = array('all'=>1, 'baseline'=>1, 'bottom'=>1, 'button'=>1, 'center'=>1, 'char'=>1, 'checkbox'=>1, 'circle'=>1, 'col'=>1, 'colgroup'=>1, 'cols'=>1, 'data'=>1, 'default'=>1, 'file'=>1, 'get'=>1, 'groups'=>1, 'hidden'=>1, 'image'=>1, 'justify'=>1, 'left'=>1, 'ltr'=>1, 'middle'=>1, 'none'=>1, 'object'=>1, 'password'=>1, 'poly'=>1, 'post'=>1, 'preserve'=>1, 'radio'=>1, 'rect'=>1, 'ref'=>1, 'reset'=>1, 'right'=>1, 'row'=>1, 'rowgroup'=>1, 'rows'=>1, 'rtl'=>1, 'submit'=>1, 'text'=>1, 'top'=>1);
  static $eAL = array('a'=>1, 'area'=>1, 'bdo'=>1, 'button'=>1, 'col'=>1, 'form'=>1, 'img'=>1, 'input'=>1, 'object'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'td'=>1, 'tfoot'=>1, 'th'=>1, 'thead'=>1, 'tr'=>1, 'xml:space'=>1);
@@ -456,7 +730,8 @@ 
 }
 
 $depTr = 0;
-if($C['no_deprecated_attr']){
+if($C['no_deprecated_attr'])
+{
  // dep attr:applicable ele
  static $aND = array('align'=>array('caption'=>1, 'div'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'object'=>1, 'p'=>1, 'table'=>1), 'bgcolor'=>array('table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1), 'border'=>array('img'=>1, 'object'=>1), 'bordercolor'=>array('table'=>1, 'td'=>1, 'tr'=>1), 'clear'=>array('br'=>1), 'compact'=>array('dl'=>1, 'ol'=>1, 'ul'=>1), 'height'=>array('td'=>1, 'th'=>1), 'hspace'=>array('img'=>1, 'object'=>1), 'language'=>array('script'=>1), 'name'=>array('a'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'map'=>1), 'noshade'=>array('hr'=>1), 'nowrap'=>array('td'=>1, 'th'=>1), 'size'=>array('hr'=>1), 'start'=>array('ol'=>1), 'type'=>array('li'=>1, 'ol'=>1, 'ul'=>1), 'value'=>array('li'=>1), 'vspace'=>array('img'=>1, 'object'=>1), 'width'=>array('hr'=>1, 'pre'=>1, 'td'=>1, 'th'=>1));
  static $eAD = array('a'=>1, 'br'=>1, 'caption'=>1, 'div'=>1, 'dl'=>1, 'form'=>1, 'h1'=>1, 'h2'=>1, 'h3'=>1, 'h4'=>1, 'h5'=>1, 'h6'=>1, 'hr'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'legend'=>1, 'li'=>1, 'map'=>1, 'object'=>1, 'ol'=>1, 'p'=>1, 'pre'=>1, 'script'=>1, 'table'=>1, 'td'=>1, 'th'=>1, 'tr'=>1, 'ul'=>1);
@@ -464,203 +739,339 @@ 
 }
 
 // attr name-vals
-if(strpos($a, "\x01") !== false){$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
+if(strpos($a, "\x01") !== false)
+{
+$a = preg_replace('`\x01[^\x01]*\x01`', '', $a);} // No comment/CDATA sec
 $mode = 0; $a = trim($a, ' /'); $aA = array();
-while(strlen($a)){
+while(strlen($a))
+{
  $w = 0;
- switch($mode){
+ switch($mode)
+ {
   case 0: // Name
-   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m)){
+   if(preg_match('`^[a-zA-Z][\-a-zA-Z:]+`', $a, $m))
+   {
     $nm = strtolower($m[0]);
     $w = $mode = 1; $a = ltrim(substr_replace($a, '', 0, strlen($m[0])));
    }
   break; case 1:
-   if($a[0] == '='){ // =
+   if($a[0] == '=')
+   {
+// =
     $w = 1; $mode = 2; $a = ltrim($a, '= ');
-   }else{ // No val
+   }
+   else
+   {
+// No val
     $w = 1; $mode = 0; $a = ltrim($a);
     $aA[$nm] = '';
    }
   break; case 2: // Val
-   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m)){
+   if(preg_match('`^((?:"[^"]*")|(?:\'[^\']*\')|(?:\s*[^\s"\']+))(.*)`', $a, $m))
+   {
     $a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
     $aA[$nm] = trim(($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m);
    }
   break;
  }
- if($w == 0){ // Parse errs, deal with space, " & '
+ if($w == 0)
+ {
+// Parse errs, deal with space, " & '
   $a = preg_replace('`^(?:"[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*`', '', $a);
   $mode = 0;
  }
 }
-if($mode == 1){$aA[$nm] = '';}
+if($mode == 1)
+{
+$aA[$nm] = '';}
 
 // clean attrs
 global $S;
 $rl = isset($S[$e]) ? $S[$e] : array();
 $a = array(); $nfr = 0;
-foreach($aA as $k=>$v){
-  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k])){
-  if(isset($aNE[$k])){$v = $k;}
-  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type')){ // Rather loose but ?not cause issues
+foreach($aA as $k=>$v)
+{
+  if(((isset($C['deny_attribute']['*']) ? isset($C['deny_attribute'][$k]) : !isset($C['deny_attribute'][$k])) && (isset($aN[$k][$e]) or (isset($aNU[$k]) && !isset($aNU[$k][$e]))) && !isset($rl['n'][$k]) && !isset($rl['n']['*'])) or isset($rl[$k]))
+  {
+  if(isset($aNE[$k]))
+  {
+$v = $k;}
+  elseif(!empty($lcase) && (($e != 'button' or $e != 'input') or $k == 'type'))
+  {
+// Rather loose but ?not cause issues
    $v = (isset($aNL[($v2 = strtolower($v))])) ? $v2 : $v;
   }
-  if($k == 'style' && !$C['style_pass']){
-   if(false !== strpos($v, '&#')){
+  if($k == 'style' && !$C['style_pass'])
+  {
+   if(false !== strpos($v, '&#'))
+   {
     static $sC = array('&#x20;'=>' ', '&#32;'=>' ', '&#x45;'=>'e', '&#69;'=>'e', '&#x65;'=>'e', '&#101;'=>'e', '&#x58;'=>'x', '&#88;'=>'x', '&#x78;'=>'x', '&#120;'=>'x', '&#x50;'=>'p', '&#80;'=>'p', '&#x70;'=>'p', '&#112;'=>'p', '&#x53;'=>'s', '&#83;'=>'s', '&#x73;'=>'s', '&#115;'=>'s', '&#x49;'=>'i', '&#73;'=>'i', '&#x69;'=>'i', '&#105;'=>'i', '&#x4f;'=>'o', '&#79;'=>'o', '&#x6f;'=>'o', '&#111;'=>'o', '&#x4e;'=>'n', '&#78;'=>'n', '&#x6e;'=>'n', '&#110;'=>'n', '&#x55;'=>'u', '&#85;'=>'u', '&#x75;'=>'u', '&#117;'=>'u', '&#x52;'=>'r', '&#82;'=>'r', '&#x72;'=>'r', '&#114;'=>'r', '&#x4c;'=>'l', '&#76;'=>'l', '&#x6c;'=>'l', '&#108;'=>'l', '&#x28;'=>'(', '&#40;'=>'(', '&#x29;'=>')', '&#41;'=>')', '&#x20;'=>':', '&#32;'=>':', '&#x22;'=>'"', '&#34;'=>'"', '&#x27;'=>"'", '&#39;'=>"'", '&#x2f;'=>'/', '&#47;'=>'/', '&#x2a;'=>'*', '&#42;'=>'*', '&#x5c;'=>'\\', '&#92;'=>'\\');
     $v = strtr($v, $sC);
    }
    $v = preg_replace_callback('`(url(?:\()(?: )*(?:\'|"|&(?:quot|apos);)?)(.+?)((?:\'|"|&(?:quot|apos);)?(?: )*(?:\)))`iS', 'hl_prot', $v);
    $v = !$C['css_expression'] ? preg_replace('`expression`i', ' ', preg_replace('`\\\\\S|(/|(%2f))(\*|(%2a))`i', ' ', $v)) : $v;
-  }elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o'){
+  }
+  elseif(isset($aNP[$k]) or strpos($k, 'src') !== false or $k[0] == 'o')
+  {
    $v = str_replace("\xad", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v));
    $v = hl_prot($v, $k);
-   if($k == 'href'){ // X-spam
-    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0){
+   if($k == 'href')
+   {
+// X-spam
+    if($C['anti_mail_spam'] && strpos($v, 'mailto:') === 0)
+    {
      $v = str_replace('@', htmlspecialchars($C['anti_mail_spam']), $v);
-    }elseif($C['anti_link_spam']){
+    }
+    elseif($C['anti_link_spam'])
+    {
      $r1 = $C['anti_link_spam'][1];
-     if(!empty($r1) && preg_match($r1, $v)){continue;}
+     if(!empty($r1) && preg_match($r1, $v))
+     {
+continue;}
      $r0 = $C['anti_link_spam'][0];
-     if(!empty($r0) && preg_match($r0, $v)){
-      if(isset($a['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $a['rel'])){$a['rel'] .= ' nofollow';}
-      }elseif(isset($aA['rel'])){
-       if(!preg_match('`\bnofollow\b`i', $aA['rel'])){$nfr = 1;}
-      }else{$a['rel'] = 'nofollow';}
+     if(!empty($r0) && preg_match($r0, $v))
+     {
+      if(isset($a['rel']))
+      {
+       if(!preg_match('`\bnofollow\b`i', $a['rel']))
+       {
+$a['rel'] .= ' nofollow';}
+      }
+      elseif(isset($aA['rel']))
+      {
+       if(!preg_match('`\bnofollow\b`i', $aA['rel']))
+       {
+$nfr = 1;}
+      }
+      else
+      {
+$a['rel'] = 'nofollow';}
      }
     }
    }
   }
-  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0){continue;}
+  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($v, $rl[$k])) === 0)
+  {
+continue;}
   $a[$k] = str_replace('"', '&quot;', $v);
  }
 }
-if($nfr){$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
+if($nfr)
+{
+$a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';}
 
 // rqd attr
 static $eAR = array('area'=>array('alt'=>'area'), 'bdo'=>array('dir'=>'ltr'), 'form'=>array('action'=>''), 'img'=>array('src'=>'', 'alt'=>'image'), 'map'=>array('name'=>''), 'optgroup'=>array('label'=>''), 'param'=>array('name'=>''), 'script'=>array('type'=>'text/javascript'), 'textarea'=>array('rows'=>'10', 'cols'=>'50'));
-if(isset($eAR[$e])){
- foreach($eAR[$e] as $k=>$v){
-  if(!isset($a[$k])){$a[$k] = isset($v[0]) ? $v : $k;}
+if(isset($eAR[$e]))
+{
+ foreach($eAR[$e] as $k=>$v)
+ {
+  if(!isset($a[$k]))
+  {
+$a[$k] = isset($v[0]) ? $v : $k;}
  }
 }
 
 // depr attrs
-if($depTr){
+if($depTr)
+{
  $c = array();
- foreach($a as $k=>$v){
-  if($k == 'style' or !isset($aND[$k][$e])){continue;}
-  if($k == 'align'){
+ foreach($a as $k=>$v)
+ {
+  if($k == 'style' or !isset($aND[$k][$e]))
+  {
+continue;}
+  if($k == 'align')
+  {
    unset($a['align']);
-   if($e == 'img' && ($v == 'left' or $v == 'right')){$c[] = 'float: '. $v;}
-   elseif(($e == 'div' or $e == 'table') && $v == 'center'){$c[] = 'margin: auto';}
-   else{$c[] = 'text-align: '. $v;}
-  }elseif($k == 'bgcolor'){
+   if($e == 'img' && ($v == 'left' or $v == 'right'))
+   {
+$c[] = 'float: '. $v;}
+   elseif(($e == 'div' or $e == 'table') && $v == 'center')
+   {
+$c[] = 'margin: auto';}
+   else
+   {
+$c[] = 'text-align: '. $v;}
+  }
+  elseif($k == 'bgcolor')
+  {
    unset($a['bgcolor']);
    $c[] = 'background-color: '. $v;
-  }elseif($k == 'border'){
+  }
+  elseif($k == 'border')
+  {
    unset($a['border']); $c[] = "border: {$v}px";
-  }elseif($k == 'bordercolor'){
+  }
+  elseif($k == 'bordercolor')
+  {
    unset($a['bordercolor']); $c[] = 'border-color: '. $v;
-  }elseif($k == 'clear'){
+  }
+  elseif($k == 'clear')
+  {
    unset($a['clear']); $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
-  }elseif($k == 'compact'){
+  }
+  elseif($k == 'compact')
+  {
    unset($a['compact']); $c[] = 'font-size: 85%';
-  }elseif($k == 'height' or $k == 'width'){
+  }
+  elseif($k == 'height' or $k == 'width')
+  {
    unset($a[$k]); $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
-  }elseif($k == 'hspace'){
+  }
+  elseif($k == 'hspace')
+  {
    unset($a['hspace']); $c[] = "margin-left: {$v}px; margin-right: {$v}px";
-  }elseif($k == 'language' && !isset($a['type'])){
+  }
+  elseif($k == 'language' && !isset($a['type']))
+  {
    unset($a['language']);
    $a['type'] = 'text/'. strtolower($v);
-  }elseif($k == 'name'){
-   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')){unset($a['name']);}
-   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v)){$a['id'] = $v;}
-  }elseif($k == 'noshade'){
+  }
+  elseif($k == 'name')
+  {
+   if($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map'))
+   {
+unset($a['name']);}
+   if(!isset($a['id']) && preg_match('`[a-zA-Z][a-zA-Z\d.:_\-]*`', $v))
+   {
+$a['id'] = $v;}
+  }
+  elseif($k == 'noshade')
+  {
    unset($a['noshade']); $c[] = 'border-style: none; border: 0; background-color: gray; color: gray';
-  }elseif($k == 'nowrap'){
+  }
+  elseif($k == 'nowrap')
+  {
    unset($a['nowrap']); $c[] = 'white-space: nowrap';
-  }elseif($k == 'size'){
+  }
+  elseif($k == 'size')
+  {
    unset($a['size']); $c[] = 'size: '. $v. 'px';
-  }elseif($k == 'start' or $k == 'value'){
+  }
+  elseif($k == 'start' or $k == 'value')
+  {
    unset($a[$k]);
-  }elseif($k == 'type'){
+  }
+  elseif($k == 'type')
+  {
    unset($a['type']);
    static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
    $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
-  }elseif($k == 'vspace'){
+  }
+  elseif($k == 'vspace')
+  {
    unset($a['vspace']); $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
   }
  }
- if(count($c)){
+ if(count($c))
+ {
   $c = implode('; ', $c);
   $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
  }
 }
 // unique ID
-if($C['unique_ids'] && isset($a['id'])){
- if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)){unset($a['id']);
- }else{
-  while(isset($GLOBALS['hl_Ids'][$id])){$id = $C['unique_ids']. $id;}
+if($C['unique_ids'] && isset($a['id']))
+{
+ if(!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1))
+ {
+unset($a['id']);
+ }
+ else
+ {
+  while(isset($GLOBALS['hl_Ids'][$id]))
+  {
+$id = $C['unique_ids']. $id;}
   $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
  }
 }
 // xml:lang
-if($C['xml:lang'] && isset($a['lang'])){
+if($C['xml:lang'] && isset($a['lang']))
+{
  $a['xml:lang'] = isset($a['xml:lang']) ? $a['xml:lang'] : $a['lang'];
- if($C['xml:lang'] == 2){unset($a['lang']);}
+ if($C['xml:lang'] == 2)
+ {
+unset($a['lang']);}
 }
 // for transformed tag
-if(!empty($trt)){
+if(!empty($trt))
+{
  $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
 }
 // return with empty ele /
-if(empty($C['hook_tag'])){
+if(empty($C['hook_tag']))
+{
  $aA = '';
- foreach($a as $k=>$v){$aA .= " {$k}=\"{$v}\"";}
+ foreach($a as $k=>$v)
+ {
+$aA .= " {$k}=\"{$v}\"";}
  return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
 }
-else{return $C['hook_tag']($e, $a);}
+else
+{
+return $C['hook_tag']($e, $a);}
 // eof
 }
 
-function hl_tag2(&$e, &$a, $t=1){
+function hl_tag2(&$e, &$a, $t=1)
+{
 // transform tag
-if($e == 'center'){$e = 'div'; return 'text-align: center;';}
-if($e == 'dir' or $e == 'menu'){$e = 'ul'; return '';}
-if($e == 's' or $e == 'strike'){$e = 'span'; return 'text-decoration: line-through;';}
-if($e == 'u'){$e = 'span'; return 'text-decoration: underline;';}
+if($e == 'center')
+{
+$e = 'div'; return 'text-align: center;';}
+if($e == 'dir' or $e == 'menu')
+{
+$e = 'ul'; return '';}
+if($e == 's' or $e == 'strike')
+{
+$e = 'span'; return 'text-decoration: line-through;';}
+if($e == 'u')
+{
+$e = 'span'; return 'text-decoration: underline;';}
 static $fs = array('0'=>'xx-small', '1'=>'xx-small', '2'=>'small', '3'=>'medium', '4'=>'large', '5'=>'x-large', '6'=>'xx-large', '7'=>'300%', '-1'=>'smaller', '-2'=>'60%', '+1'=>'larger', '+2'=>'150%', '+3'=>'200%', '+4'=>'300%');
-if($e == 'font' && $t !=3){//3 is a new make_tag_strict config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
+if($e == 'font' && $t !=3)
+{
+//3 is a new make_tag_strict config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
  $a2 = '';
- if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)){
+ if(preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m))
+ {
   $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
  }
- if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)){
+ if(preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m))
+ {
   $a2 .= ' color: '. trim($m[2]). ';';
  }
- if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])){
+ if(preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))]))
+ {
   $a2 .= ' font-size: '. $fs[$m]. ';';
  }
 // $e = 'span'; return ltrim($a2);
 // replace the above with following
- if($GLOBALS['C']['balance']){
+ if($GLOBALS['C']['balance'])
+ {
   $e = 'div'; return 'display: inline; -htmlawed-transform: 1; '. ltrim($a2);
- }else{
+ }
+ else
+ {
   $e = 'span'; return ltrim($a2);
  }
 }
-if($t == 2){$e = 0; return 0;}
+if($t == 2)
+{
+$e = 0; return 0;}
 return '';
 // eof
 }
 
-function hl_tidy($t, $w, $p){
+function hl_tidy($t, $w, $p)
+{
 // Tidy/compact HTM
-if(strpos(' pre,script,textarea', "$p,")){return $t;}
+if(strpos(' pre,script,textarea', "$p,"))
+{
+return $t;}
 $t = preg_replace('`\s+`', ' ', preg_replace_callback(array('`(<(!\[CDATA\[))(.+?)(\]\]>)`sm', '`(<(!--))(.+?)(-->)`sm', '`(<(pre|script|textarea)[^>]*?>)(.+?)(</\2>)`sm'), create_function('$m', 'return $m[1]. str_replace(array("<", ">", "\n", "\r", "\t", " "), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), $m[3]). $m[4];'), $t));
-if(($w = strtolower($w)) == -1){
+if(($w = strtolower($w)) == -1)
+{
  return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 }
 $s = strpos(" $w", 't') ? "\t" : ' ';
@@ -672,54 +1083,87 @@ 
 $d = array('address'=>1, 'blockquote'=>1, 'center'=>1, 'colgroup'=>1, 'dir'=>1, 'div'=>1, 'dl'=>1, 'fieldset'=>1, 'form'=>1, 'hr'=>1, 'iframe'=>1, 'map'=>1, 'menu'=>1, 'noscript'=>1, 'ol'=>1, 'optgroup'=>1, 'rbc'=>1, 'rtc'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'table'=>1, 'tbody'=>1, 'tfoot'=>1, 'thead'=>1, 'tr'=>1, 'ul'=>1);
 $T = explode('<', $t);
 $X = 1;
-while($X){
+while($X)
+{
  $n = $N;
  $t = $T;
  ob_start();
- if(isset($d[$p])){echo str_repeat($s, ++$n);}
+ if(isset($d[$p]))
+ {
+echo str_repeat($s, ++$n);}
  echo ltrim(array_shift($t));
- for($i=-1, $j=count($t); ++$i<$j;){
+ for($i=-1, $j=count($t); ++$i<$j;)
+ {
   $r = ''; list($e, $r) = explode('>', $t[$i]);
   $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
   $y = !$x ? ltrim($e, '/') : ($x > 0 ? substr($e, 0, strcspn($e, ' ')) : 0);
   $e = "<$e>";
-  if(isset($d[$y])){
-   if(!$x){
-    if($n){echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
-    else{++$N; ob_end_clean(); continue 2;}
+  if(isset($d[$y]))
+  {
+   if(!$x)
+   {
+    if($n)
+    {
+echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);}
+    else
+    {
+++$N; ob_end_clean(); continue 2;}
    }
-   else{echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
+   else
+   {
+echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));}
    echo $r; continue;
   }
   $f = "\n". str_repeat($s, $n);
-  if(isset($c[$y])){
-   if(!$x){echo $e, $f, $r;}
-   else{echo $f, $e, $r;}
-  }elseif(isset($b[$y])){echo $f, $e, $r;
-  }elseif(isset($a[$y])){echo $e, $f, $r;
-  }elseif(!$y){echo $f, $e, $f, $r;
-  }else{echo $e, $r;}
+  if(isset($c[$y]))
+  {
+   if(!$x)
+   {
+echo $e, $f, $r;}
+   else
+   {
+echo $f, $e, $r;}
+  }
+  elseif(isset($b[$y]))
+  {
+echo $f, $e, $r;
+  }
+  elseif(isset($a[$y]))
+  {
+echo $e, $f, $r;
+  }
+  elseif(!$y)
+  {
+echo $f, $e, $f, $r;
+  }
+  else
+  {
+echo $e, $r;}
  }
  $X = 0;
 }
 $t = str_replace(array("\n ", " \n"), "\n", preg_replace('`[\n]\s*?[\n]+`', "\n", ob_get_contents()));
 ob_end_clean();
-if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0)){
+if(($l = strpos(" $w", 'r') ? (strpos(" $w", 'n') ? "\r\n" : "\r") : 0))
+{
  $t = str_replace("\n", $l, $t);
 }
 return str_replace(array("\x01", "\x02", "\x03", "\x04", "\x05", "\x07"), array('<', '>', "\n", "\r", "\t", ' '), $t);
 // eof
 }
 
-function hl_version(){
+function hl_version()
+{
 // rel
 return '1.1.17';
 // eof
 }
 
-function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto')){
+function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'))
+{
 // kses compat
-foreach($h as $k=>$v){
+foreach($h as $k=>$v)
+{
  $h[$k]['n']['*'] = 1;
 }
 $C['cdata'] = $C['comment'] = $C['make_tag_strict'] = $C['no_deprecated_attr'] = $C['unique_ids'] = 0;
@@ -731,7 +1175,8 @@ 
 // eof
 }
 
-function kses_hook($t, &$C, &$S){
+function kses_hook($t, &$C, &$S)
+{
 // kses compat
 return $t;
 // eof