EGroupware / egroupware

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)
 	{

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

@@ -278,7 +278,7 @@
 		if (Header\UserAgent::mobile()) return;
 
 		// PGP Encryption (Mailvelope plugin) restore/backup menu
-		$file = Array(
+		$file = array(
 			'Backup/Restore ...' => 'javascript:app.'.$appname.'.mailvelopeCreateBackupRestoreDialog();',
 			'sendToBottom' => true
 		);

Spacing +15 added lines, -16 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
@@ -157,7 +157,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;
@@ -189,13 +189,12 @@ 
 	 * @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();
 
 		//error_log(__METHOD__.__LINE__.array2string(self::$locations[$location]));
-		return $return_methods ? self::$locations[$location][$app] :
-			(empty(self::$locations[$location][$app]) ? 0 : count(self::$locations[$location][$app]));
+		return $return_methods ? self::$locations[$location][$app] : (empty(self::$locations[$location][$app]) ? 0 : count(self::$locations[$location][$app]));
 	}
 
 	/**
@@ -234,7 +233,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');
@@ -250,18 +249,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 +57 added lines, -14 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
@@ -163,7 +179,10 @@ 
 			return true;
 		}
 
-		if (!$ret) return false;
+		if (!$ret)
+		{
+			return false;
+		}
 
 		return count($ret) == 1 ? $ret[0] : $ret;
 	}
@@ -176,7 +195,10 @@ 
 	 */
 	public static function count($location)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		return count(self::$locations[$location]);
 	}
@@ -191,7 +213,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] :
@@ -206,7 +231,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();
@@ -220,7 +248,10 @@ 
 	 */
 	static public function disable($hook)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		$ret = isset(self::$locations[$hook]);
 
@@ -237,7 +268,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()
 		{
@@ -252,11 +286,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)
@@ -284,7 +324,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(

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 +178 added lines, -178 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() {jQuery(function() {if(jQuery().chosen) jQuery('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,12 +439,12 @@ 
 	* @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
@@ -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'].'/vendor/egroupware/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,17 +865,17 @@ 
 	 * @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.'%';
 
 		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";
 	}
 
@@ -893,32 +893,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;
 			}
@@ -927,12 +927,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;
 			}
@@ -943,12 +943,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
 			{
@@ -968,24 +968,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>';
@@ -999,7 +999,7 @@ 
 	 */
 	static function bold($content)
 	{
-		return '<b>'.($content?$content.'</b>':'');
+		return '<b>'.($content ? $content.'</b>' : '');
 	}
 
 	/**
@@ -1009,7 +1009,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\"";
 
@@ -1025,12 +1025,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] != '')
 			{
@@ -1060,7 +1060,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 != '')
 		{
@@ -1081,7 +1081,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";
 
@@ -1115,9 +1115,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))
@@ -1140,7 +1140,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');
@@ -1150,16 +1150,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";
@@ -1170,7 +1170,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";
 
@@ -1211,7 +1211,7 @@ 
 		}
 		if (is_string($_folders))
 		{
-			switch($dataMode)
+			switch ($dataMode)
 			{
 				case 'JSON':
 					$html .= "$tree.loadJSONObject($_folders);\n"; break;
@@ -1222,10 +1222,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))
 				{
@@ -1237,10 +1237,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';
 						}
@@ -1251,22 +1251,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
@@ -1286,7 +1286,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";
 			}
@@ -1311,7 +1311,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() {jQuery(function() {if(jQuery().chosen) jQuery('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.'%';
 
 		return '<div class="onlyPrint">'.$title.'</div><div class="noPrint" title="'.$title.'" '.$options.
@@ -895,17 +971,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
@@ -920,7 +1005,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
 			{
@@ -983,10 +1071,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>';
 	}
@@ -1011,7 +1102,10 @@ 
 	 */
 	static function hr($width='',$options='')
 	{
-		if ($width) $options .= " width=\"$width\"";
+		if ($width)
+		{
+			$options .= " width=\"$width\"";
+		}
 
 		return "<hr $options />\n";
 	}
@@ -1027,8 +1121,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)
 		{
@@ -1146,9 +1246,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";
@@ -1156,7 +1262,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)
@@ -1165,19 +1274,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 .= "});";
@@ -1222,7 +1340,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)
@@ -1251,22 +1372,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)
 	{

Braces +64 added lines, -19 removed lines

@@ -77,7 +77,10 @@ 
 
 		foreach(scandir(EGW_SERVER_ROOT.'/vendor/egroupware/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'];
@@ -132,7 +141,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);
+		}
 	}
 
 	/**
@@ -141,7 +152,9 @@ 
 	private static function get_lang()
 	{
 		if (self::$lang == null || self::$country == null)
-			self::read_lang_country();
+		{
+					self::read_lang_country();
+		}
 
 		return self::$lang;
 	}
@@ -152,7 +165,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);
 	}
@@ -290,7 +305,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.';';
@@ -359,8 +377,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'));
@@ -392,12 +416,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'));
 				}
@@ -406,17 +438,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'));
@@ -432,7 +474,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;
 

Spacing +40 added lines, -41 removed lines

@@ -84,7 +84,7 @@ 
 		);
 		$skins = array();
 
-		foreach(scandir(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins') as $skin)
+		foreach (scandir(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins') as $skin)
 		{
 			if ($skin[0] == '.') continue;
 
@@ -104,7 +104,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;
 	}
 
 	/**
@@ -115,7 +115,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'];
 
@@ -126,7 +126,7 @@ 
 			$unit = 'px';
 			$size = (string)(int)$size;
 		}
-		return $size.($size?$unit:'');
+		return $size.($size ? $unit : '');
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 
 		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);
 	}
 
@@ -245,7 +245,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;
@@ -266,7 +266,7 @@ 
 			.($start_path != '' ? '&path='.$start_path : '');
 		}
 
-		return \EGroupware\Api\Egw::link('/index.php',array(
+		return \EGroupware\Api\Egw::link('/index.php', array(
 			'menuaction' => 'api.EGroupware\\Api\\Html\\CkEditorConfig.vfsSelectHelper',
 			'path' => $start_path
 		));
@@ -296,8 +296,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;
@@ -310,7 +309,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.';';
 		}
@@ -367,48 +366,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;
@@ -416,13 +415,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;
@@ -434,11 +433,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'));
 		}
 	}
 
@@ -451,7 +450,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;
 
@@ -461,7 +460,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;
 	}
 
@@ -470,7 +469,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))
 		{
@@ -478,7 +477,7 @@ 
 			{
 				if (!empty($config['extraPlugins']) && $config['extraPlugins'] !== '')
 				{
-					$config['extraPlugins'] .= ',' . $plugin;
+					$config['extraPlugins'] .= ','.$plugin;
 				}
 				else
 				{
@@ -531,6 +530,6 @@ 
 		$response->call('window.opener.et2_htmlarea.buildVfsSelectForCKEditor',
 				array('funcNum' => $_GET['CKEditorFuncNum']));
 		$response->call('window.close');
-		$tmp->exec('',array());
+		$tmp->exec('', array());
 	}
 }

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 +79 added lines, -79 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.'pt;[^"]*">.?</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,79 +379,79 @@ 
 		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('api','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('api', 'error');
 			}
-			if (!preg_match('/^cid:.*/',$attribute_array['src']))
+			if (!preg_match('/^cid:.*/', $attribute_array['src']))
 			{
-				$url = explode('/', preg_replace('/^(http|https):\/\//','',$attribute_array['src']));
+				$url = explode('/', preg_replace('/^(http|https):\/\//', '', $attribute_array['src']));
 				if ($GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] != 1
 						&& !in_array($url[0], $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalDomains']))
 				{
 					//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('api','error');
 			}
 			if (!preg_match('/^cid:.*/',$attribute_array['src']))
@@ -407,36 +490,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))."');";
@@ -446,7 +553,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 +33 added lines, -33 removed lines

@@ -132,13 +132,13 @@ 
    break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
    break; case 'nomatch': if(preg_match($v, $tv)){$o = 0;}
    break; case 'oneof':
-    $m = 0;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
-    $o = $m;
+	$m = 0;
+	foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
+	$o = $m;
    break; case 'noneof':
-    $m = 1;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
-    $o = $m;
+	$m = 1;
+	foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
+	$o = $m;
    break; default:
    break;
   }
@@ -212,7 +212,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);}
  }
@@ -365,7 +365,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;
   }
@@ -478,20 +478,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(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m));
+	$a = ltrim($m[2]); $m = $m[1]; $w = 1; $mode = 0;
+	$aA[$nm] = trim(str_replace('<', '&lt;', ($m[0] == '"' or $m[0] == '\'') ? substr($m, 1, -1) : $m));
    }
   break;
  }
@@ -514,8 +514,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;
@@ -523,20 +523,20 @@ 
    $v = str_replace("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char is soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
    $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($k, $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;

Braces +706 added lines, -262 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,49 +146,82 @@ 
 $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($a, $t, $p){
+function hl_attrval($a, $t, $p)
+{
 // check attr val against $S
 static $ma = array('accesskey', 'class', 'rel');
 $s = in_array($a, $ma) ? ' ' : '';
 $r = array();
 $t = !empty($s) ? explode($s, $t) : array($t);
-foreach($t as $tk=>$tv){
+foreach($t as $tk=>$tv)
+{
  $o = 1; $l = strlen($tv);
- 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)($tv) > $v){$o = 0;}
-   break; case 'minval': if((float)($tv) < $v){$o = 0;}
-   break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
-   break; case 'nomatch': if(preg_match($v, $tv)){$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)($tv) > $v)
+   {
+$o = 0;}
+   break; case 'minval': if((float)($tv) < $v)
+   {
+$o = 0;}
+   break; case 'match': if(!preg_match($v, $tv))
+   {
+$o = 0;}
+   break; case 'nomatch': if(preg_match($v, $tv))
+   {
+$o = 0;}
    break; case 'oneof':
     $m = 0;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
+    foreach(explode('|', $v) as $n)
+    {
+if($tv == $n)
+    {
+$m = 1; break;}}
     $o = $m;
    break; case 'noneof':
     $m = 1;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
+    foreach(explode('|', $v) as $n)
+    {
+if($tv == $n)
+    {
+$m = 0; break;}}
     $o = $m;
    break; default:
    break;
   }
-  if(!$o){break;}
+  if(!$o)
+  {
+break;}
  }
- if($o){$r[] = $tv;}
+ if($o)
+ {
+$r[] = $tv;}
 }
 $r = implode($s, $r);
 return (isset($r[0]) ? $r : (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
@@ -162,209 +232,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;
@@ -375,77 +595,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) : ''));
 }
 // open tag & attr
@@ -455,7 +731,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);
@@ -463,7 +740,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);
@@ -471,196 +749,328 @@ 
 }
 
 // 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(str_replace('<', '&lt;', ($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("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char is soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
    $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($k, $v, $rl[$k])) === 0){continue;}
+  if(isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($k, $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 = '';
- while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)){
+ while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m))
+ {
   $a = str_replace($m[0], ' ', $a);
   $a2 .= strtolower($m[2]) == 'color' ? (' color: '. str_replace('"', '\'', trim($m[4])). ';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '. str_replace('"', '\'', $fs[$m]). ';') : '');
  }
- while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)){
+ while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m))
+ {
   $a = str_replace($m[0], ' ', $a);
   $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[3])). ';';
  }
  $e = 'span'; return ltrim(str_replace('<', '', $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 +1082,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.22';
 // 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 +1174,8 @@ 
 // eof
 }
 
-function kses_hook($t, &$C, &$S){
+function kses_hook($t, &$C, &$S)
+{
 // kses compat
 return $t;
 // eof

Spacing +292 added lines, -292 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,49 +109,49 @@ 
 $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($a, $t, $p){
+function hl_attrval($a, $t, $p) {
 // check attr val against $S
 static $ma = array('accesskey', 'class', 'rel');
 $s = in_array($a, $ma) ? ' ' : '';
 $r = array();
 $t = !empty($s) ? explode($s, $t) : array($t);
-foreach($t as $tk=>$tv){
+foreach ($t as $tk=>$tv) {
  $o = 1; $l = strlen($tv);
- 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)($tv) > $v){$o = 0;}
-   break; case 'minval': if((float)($tv) < $v){$o = 0;}
-   break; case 'match': if(!preg_match($v, $tv)){$o = 0;}
-   break; case 'nomatch': if(preg_match($v, $tv)){$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)($tv) > $v) {$o = 0; }
+   break; case 'minval': if ((float)($tv) < $v) {$o = 0; }
+   break; case 'match': if (!preg_match($v, $tv)) {$o = 0; }
+   break; case 'nomatch': if (preg_match($v, $tv)) {$o = 0; }
    break; case 'oneof':
     $m = 0;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 1; break;}}
+    foreach (explode('|', $v) as $n) {if ($tv == $n) {$m = 1; break; }}
     $o = $m;
    break; case 'noneof':
     $m = 1;
-    foreach(explode('|', $v) as $n){if($tv == $n){$m = 0; break;}}
+    foreach (explode('|', $v) as $n) {if ($tv == $n) {$m = 0; break; }}
     $o = $m;
    break; default:
    break;
   }
-  if(!$o){break;}
+  if (!$o) {break; }
  }
- if($o){$r[] = $tv;}
+ if ($o) {$r[] = $tv; }
 }
 $r = implode($s, $r);
 return (isset($r[0]) ? $r : (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
@@ -162,212 +162,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;
   }
  }
 }
@@ -375,87 +375,87 @@ 
 // 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), 'allowfullscreen'=>array('iframe'=>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('allowfullscreen'=>1, '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);
@@ -463,7 +463,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);
@@ -471,196 +471,196 @@ 
 }
 
 // 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(str_replace('<', '&lt;', ($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("­", ' ', (strpos($v, '&') !== false ? str_replace(array('&#xad;', '&#173;', '&shy;'), ' ', $v) : $v)); # double-quoted char is soft-hyphen; appears here as "­" or hyphen or something else depending on viewing software
    $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($k, $v, $rl[$k])) === 0){continue;}
+  if (isset($rl[$k]) && is_array($rl[$k]) && ($v = hl_attrval($k, $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 = '';
- while(preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)){
+ while (preg_match('`(^|\s)(color|size)\s*=\s*(\'|")?(.+?)(\\3|\s|$)`i', $a, $m)) {
   $a = str_replace($m[0], ' ', $a);
-  $a2 .= strtolower($m[2]) == 'color' ? (' color: '. str_replace('"', '\'', trim($m[4])). ';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '. str_replace('"', '\'', $fs[$m]). ';') : '');
+  $a2 .= strtolower($m[2]) == 'color' ? (' color: '.str_replace('"', '\'', trim($m[4])).';') : (isset($fs[($m = trim($m[4]))]) ? ($a2 .= ' font-size: '.str_replace('"', '\'', $fs[$m]).';') : '');
  }
- while(preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)){
+ while (preg_match('`(^|\s)face\s*=\s*(\'|")?([^=]+?)\\2`i', $a, $m) or preg_match('`(^|\s)face\s*=(\s*)(\S+)`i', $a, $m)) {
   $a = str_replace($m[0], ' ', $a);
-  $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[3])). ';';
+  $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[3])).';';
  }
  $e = 'span'; return ltrim(str_replace('<', '', $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.22';
 // 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

api/src/Json/Msg.php

Doc Comments +5 added lines, -3 removed lines

@@ -82,8 +82,7 @@ 
 	/**
 	 * Allows to call a global javascript function with given parameters: window[$func].call(window[, $param1[, ...]])
 	 *
-	 * @param string $func name of the global (window) javascript function to call
-	 * @param mixed $parameters variable number of parameters
+	 * @param string $function
 	 */
 	public function call($function)
 	{
@@ -108,7 +107,7 @@ 
 	 *
 	 * @param string $selector jquery selector
 	 * @param string $method name of the jquery to call
-	 * @param array $parameters =array()
+	 * @param string[] $parameters =array()
 	 */
 	public function jquery($selector,$method,array $parameters=array())
 	{
@@ -126,6 +125,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public function generic($type, array $parameters = array())
 	{
 		if (is_string($type))

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param string $function name of the global (window) javascript function to call
 	 * @param array $parameters =array()
 	 */
-	public function apply($function,array $parameters=array())
+	public function apply($function, array $parameters = array())
 	{
 		if (is_string($function))
 		{
@@ -88,7 +88,7 @@ 
 	public function call($function)
 	{
 		$parameters = func_get_args();
-		array_shift($parameters);	// shift off $function
+		array_shift($parameters); // shift off $function
 
 		if (is_string($function))
 		{
@@ -110,7 +110,7 @@ 
 	 * @param string $method name of the jquery to call
 	 * @param array $parameters =array()
 	 */
-	public function jquery($selector,$method,array $parameters=array())
+	public function jquery($selector, $method, array $parameters = array())
 	{
 		if (is_string($selector) && is_string($method))
 		{
@@ -169,7 +169,7 @@ 
 	 * @param string $app =null default current app from flags
 	 * or only the current application
 	 */
-	public function redirect($url, $global = false, $app=null)
+	public function redirect($url, $global = false, $app = null)
 	{
 		if (is_string($url) && is_bool($global))
 		{

api/src/Ldap/ServerInfo.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	/**
 	* gets the version
 	*
-	* @return integer the supported ldap version
+	* @return string the supported ldap version
 	*/
 	function getVersion()
 	{
@@ -159,7 +159,7 @@ 
 	 * @param resource $ds
 	 * @param string $host
 	 * @param int $version 2 or 3
-	 * @return ldapserverinfo
+	 * @return ServerInfo
 	 */
 	public static function get($ds, $host, $version=3)
 	{

Indentation +40 added lines, -40 removed lines

@@ -32,33 +32,33 @@ 
 	const SAMBA4 = 2;
 
 	/**
-	* @var array $namingContext holds the supported namingcontexts
-	*/
+	 * @var array $namingContext holds the supported namingcontexts
+	 */
 	var $namingContext = array();
 
 	/**
-	* @var string $version holds the LDAP server version
-	*/
+	 * @var string $version holds the LDAP server version
+	 */
 	var $version = 2;
 
 	/**
-	* @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
-	*/
+	 * @var integer $serverType holds the type of LDAP server(OpenLDAP, ADS, NDS, ...)
+	 */
 	var $serverType = 0;
 
 	/**
-	* @var string $_subSchemaEntry the subschema entry DN
-	*/
+	 * @var string $_subSchemaEntry the subschema entry DN
+	 */
 	var $subSchemaEntry = '';
 
 	/**
-	* @var array $supportedObjectClasses the supported objectclasses
-	*/
+	 * @var array $supportedObjectClasses the supported objectclasses
+	 */
 	var $supportedObjectClasses = array();
 
 	/**
-	* @var array $supportedOIDs the supported OIDs
-	*/
+	 * @var array $supportedOIDs the supported OIDs
+	 */
 	var $supportedOIDs = array();
 
 	/**
@@ -79,50 +79,50 @@ 
 	}
 
 	/**
-	* gets the version
-	*
-	* @return integer the supported ldap version
-	*/
+	 * gets the version
+	 *
+	 * @return integer the supported ldap version
+	 */
 	function getVersion()
 	{
 		return $this->version;
 	}
 
 	/**
-	* sets the namingcontexts
-	*
-	* @param array $_namingContext the supported namingcontexts
-	*/
+	 * sets the namingcontexts
+	 *
+	 * @param array $_namingContext the supported namingcontexts
+	 */
 	function setNamingContexts($_namingContext)
 	{
 		$this->namingContext = $_namingContext;
 	}
 
 	/**
-	* sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
-	*
-	* @param integer $_serverType the type of ldap server
-	*/
+	 * sets the type of the ldap server(OpenLDAP, ADS, NDS, ...)
+	 *
+	 * @param integer $_serverType the type of ldap server
+	 */
 	function setServerType($_serverType)
 	{
 		$this->serverType = $_serverType;
 	}
 
 	/**
-	* sets the DN for the subschema entry
-	*
-	* @param string $_subSchemaEntry the subschema entry DN
-	*/
+	 * sets the DN for the subschema entry
+	 *
+	 * @param string $_subSchemaEntry the subschema entry DN
+	 */
 	function setSubSchemaEntry($_subSchemaEntry)
 	{
 		$this->subSchemaEntry = $_subSchemaEntry;
 	}
 
 	/**
-	* sets the supported objectclasses
-	*
-	* @param array $_supportedObjectClasses the supported objectclasses
-	*/
+	 * sets the supported objectclasses
+	 *
+	 * @param array $_supportedObjectClasses the supported objectclasses
+	 */
 	function setSupportedObjectClasses($_supportedObjectClasses)
 	{
 		$this->supportedOIDs = $_supportedObjectClasses;
@@ -130,20 +130,20 @@ 
 	}
 
 	/**
-	* sets the version
-	*
-	* @param integer $_version the supported ldap version
-	*/
+	 * sets the version
+	 *
+	 * @param integer $_version the supported ldap version
+	 */
 	function setVersion($_version)
 	{
 		$this->version = $_version;
 	}
 
 	/**
-	* checks for supported objectclasses
-	*
-	* @return bool returns true if the ldap server supports this objectclass
-	*/
+	 * checks for supported objectclasses
+	 *
+	 * @return bool returns true if the ldap server supports this objectclass
+	 */
 	function supportsObjectClass($_objectClass)
 	{
 		if($this->supportedObjectClasses[strtolower($_objectClass)])

Spacing +19 added lines, -19 removed lines

@@ -146,7 +146,7 @@ 
 	*/
 	function supportsObjectClass($_objectClass)
 	{
-		if($this->supportedObjectClasses[strtolower($_objectClass)])
+		if ($this->supportedObjectClasses[strtolower($_objectClass)])
 		{
 			return true;
 		}
@@ -161,21 +161,21 @@ 
 	 * @param int $version 2 or 3
 	 * @return ldapserverinfo
 	 */
-	public static function get($ds, $host, $version=3)
+	public static function get($ds, $host, $version = 3)
 	{
-		$filter='(objectclass=*)';
-		$justthese = array('structuralObjectClass','namingContexts','supportedLDAPVersion','subschemaSubentry','vendorname');
-		if(($sr = @ldap_read($ds, '', $filter, $justthese)))
+		$filter = '(objectclass=*)';
+		$justthese = array('structuralObjectClass', 'namingContexts', 'supportedLDAPVersion', 'subschemaSubentry', 'vendorname');
+		if (($sr = @ldap_read($ds, '', $filter, $justthese)))
 		{
-			if(($info = ldap_get_entries($ds, $sr)))
+			if (($info = ldap_get_entries($ds, $sr)))
 			{
 				$ldapServerInfo = new ServerInfo($host);
 				$ldapServerInfo->setVersion($version);
 
 				// check for naming contexts
-				if($info[0]['namingcontexts'])
+				if ($info[0]['namingcontexts'])
 				{
-					for($i=0; $i<$info[0]['namingcontexts']['count']; $i++)
+					for ($i = 0; $i < $info[0]['namingcontexts']['count']; $i++)
 					{
 						$namingcontexts[] = $info[0]['namingcontexts'][$i];
 					}
@@ -183,9 +183,9 @@ 
 				}
 
 				// check for ldap server type
-				if($info[0]['structuralobjectclass'])
+				if ($info[0]['structuralobjectclass'])
 				{
-					switch($info[0]['structuralobjectclass'][0])
+					switch ($info[0]['structuralobjectclass'][0])
 					{
 						case 'OpenLDAProotDSE':
 							$ldapServerType = OPENLDAP_LDAPSERVER;
@@ -202,30 +202,30 @@ 
 				}
 
 				// check for subschema entry dn
-				if($info[0]['subschemasubentry'])
+				if ($info[0]['subschemasubentry'])
 				{
 					$subschemasubentry = $info[0]['subschemasubentry'][0];
 					$ldapServerInfo->setSubSchemaEntry($subschemasubentry);
 				}
 
 				// create list of supported objetclasses
-				if(!empty($subschemasubentry))
+				if (!empty($subschemasubentry))
 				{
-					$filter='(objectclass=*)';
+					$filter = '(objectclass=*)';
 					$justthese = array('objectClasses');
 
-					if(($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
+					if (($sr = ldap_read($ds, $subschemasubentry, $filter, $justthese)))
 					{
-						if(($info = ldap_get_entries($ds, $sr)))
+						if (($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
-								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
+							if ($info[0]['objectclasses']) {
+								for ($i = 0; $i < $info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;
-									if(preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
+									if (preg_match('/^\( (.*) NAME \'(\w*)\' /', $info[0]['objectclasses'][$i], $matches))
 									{
 										#_debug_array($matches);
-										if(count($matches) == 3)
+										if (count($matches) == 3)
 										{
 											$supportedObjectClasses[$matches[1]] = strtolower($matches[2]);
 										}

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
 					{
 						if(($info = ldap_get_entries($ds, $sr)))
 						{
-							if($info[0]['objectclasses']) {
+							if($info[0]['objectclasses'])
+							{
 								for($i=0; $i<$info[0]['objectclasses']['count']; $i++)
 								{
 									$matches = null;

api/src/Link/Storage.php

Doc Comments +6 added lines, -1 removed lines

@@ -176,6 +176,11 @@ 
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
+	/**
+	 * @param boolean $left
+	 * @param string $only_app
+	 * @param boolean $not_only
+	 */
 	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
@@ -206,7 +211,7 @@ 
 	 * @param string $id ='' id in $app, if no integer link_id given in $app_link_id
 	 * @param string $app2 ='' appname of 2. endpoint of the link, if no integer link_id given in $app_link_id
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{

Indentation +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 			echo "<p>solink.link('$app1',$id1,'$app2',$id2,'$remark',$owner)</p>\n";
 		}
 		if ($app1 == $app2 && $id1 == $id2 ||
-		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
+			$id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
 			return False;	// dont link to self or other nosense
 		}
@@ -412,26 +412,26 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
-                        	'join'=>" a
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker and projectmanager->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                       		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
-                        	'join'=>" a
+					   		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+							'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
 			),
 			// retrieve the type of links, where the relation is realized as timesheet->projectmanager and infolog->timesheet
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
-                     		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
-                       		'join'=>" a
+					 		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
+								(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+					   		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
 			),

Spacing +58 added lines, -58 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param int $lastmod =0 timestamp of last modification (defaults to now=time())
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0)
 	{
 		if (self::DEBUG)
 		{
@@ -68,21 +68,21 @@ 
 		if ($app1 == $app2 && $id1 == $id2 ||
 		    $id1 == '' || $id2 == '' || $app1 == '' || $app2 == '')
 		{
-			return False;	// dont link to self or other nosense
+			return False; // dont link to self or other nosense
 		}
-		if (($link = self::get_link($app1,$id1,$app2,$id2)))
+		if (($link = self::get_link($app1, $id1, $app2, $id2)))
 		{
 			if ($link['link_remark'] != $remark)
 			{
-				self::update_remark($link['link_id'],$remark);
+				self::update_remark($link['link_id'], $remark);
 			}
-			return $link['link_id'];	// link alread exist
+			return $link['link_id']; // link alread exist
 		}
 		if (!$owner)
 		{
 			$owner = $GLOBALS['egw_info']['user']['account_id'];
 		}
-		return self::$db->insert(self::TABLE,array(
+		return self::$db->insert(self::TABLE, array(
 				'link_app1'		=> $app1,
 				'link_id1'		=> $id1,
 				'link_app2'		=> $app2,
@@ -90,7 +90,7 @@ 
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> $lastmod ? $lastmod : time(),
 				'link_owner'	=> $owner,
-			),False,__LINE__,__FILE__) ? self::$db->get_last_insert_id(self::TABLE,'link_id') : false;
+			), False, __LINE__, __FILE__) ? self::$db->get_last_insert_id(self::TABLE, 'link_id') : false;
 	}
 
 	/**
@@ -100,14 +100,14 @@ 
 	 * @param string $remark new text for the remark
 	 * @return boolean true on success, else false
 	 */
-	static function update_remark($link_id,$remark)
+	static function update_remark($link_id, $remark)
 	{
-		return self::$db->update(self::TABLE,array(
+		return self::$db->update(self::TABLE, array(
 				'link_remark'	=> $remark,
 				'link_lastmod'	=> time(),
-			),array(
+			), array(
 				'link_id'	=> $link_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 	}
 
 	/**
@@ -121,15 +121,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC', $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $deleted = false, $limit = null)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>solink.get_links($app,".print_r($id,true).",$only_app,$order,$deleted)</p>\n";
+			echo "<p>solink.get_links($app,".print_r($id, true).",$only_app,$order,$deleted)</p>\n";
 		}
 		if (($not_only = $only_app[0] == '!'))
 		{
-			$only_app = substr($only_app,1);
+			$only_app = substr($only_app, 1);
 		}
 
 		$offset = false;
@@ -137,32 +137,32 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
 		try {
-			foreach(self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
+			foreach (self::$db->select(self::TABLE, '*', self::$db->expression(self::TABLE, '((', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),'))',
+					), '))',
 					$deleted ? '' : ' AND deleted IS NULL'
 				), __LINE__, __FILE__, $offset, $order ? " ORDER BY $order" : '', 'phpgwapi', $limit) as $row)
 			{
 				// check if left side (1) is one of our targets --> add it
-				if ($row['link_app1'] == $app && in_array($row['link_id1'],(array)$id))
+				if ($row['link_app1'] == $app && in_array($row['link_id1'], (array)$id))
 				{
-					self::_add2links($row,true,$only_app,$not_only,$links);
+					self::_add2links($row, true, $only_app, $not_only, $links);
 				}
 				// check if right side (2) is one of our targets --> add it (both can be true for multiple targets!)
-				if ($row['link_app2'] == $app && in_array($row['link_id2'],(array)$id))
+				if ($row['link_app2'] == $app && in_array($row['link_id2'], (array)$id))
 				{
-					self::_add2links($row,false,$only_app,$not_only,$links);
+					self::_add2links($row, false, $only_app, $not_only, $links);
 				}
 			}
 			// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -170,18 +170,18 @@ 
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return is_array($id) ? $links : ($links[$id] ? $links[$id] : array());
 	}
 
-	private static function _add2links($row,$left,$only_app,$not_only,array &$links)
+	private static function _add2links($row, $left, $only_app, $not_only, array &$links)
 	{
 		$linked_app = $left ? $row['link_app2'] : $row['link_app1'];
 		$linked_id  = $left ? $row['link_id2'] : $row['link_id1'];
 		$app_id = $left ? $row['link_id1'] : $row['link_id2'];
-		list($app) = explode('-',$linked_app);
+		list($app) = explode('-', $linked_app);
 		if ($only_app && $not_only == ($linked_app == $only_app) || !$GLOBALS['egw_info']['user']['apps'][$app])
 		{
 			#echo "$linked_app == $only_app, ";var_dump($linked_app == $only_app);echo "	->dont return a link<br>";
@@ -208,13 +208,13 @@ 
 	 * @param string $id2 ='' id in $app2, if no integer link_id given in $app_link_id
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
 			echo "<p>solink.get_link('$app_link_id',$id,'$app2','$id2')</p>\n";
 		}
-		if ((int) $app_link_id > 0)
+		if ((int)$app_link_id > 0)
 		{
 			$where = array('link_id' => $app_link_id);
 		}
@@ -224,24 +224,24 @@ 
 			{
 				return False;
 			}
-			$where = self::$db->expression(self::TABLE,'(',array(
+			$where = self::$db->expression(self::TABLE, '(', array(
 					'link_app1'	=> $app_link_id,
 					'link_id1'	=> $id,
 					'link_app2'	=> $app2,
 					'link_id2'	=> $id2,
-				),') OR (',array(
+				), ') OR (', array(
 					'link_app2'	=> $app_link_id,
 					'link_id2'	=> $id,
 					'link_app1'	=> $app2,
 					'link_id1'	=> $id2,
-				),')');
+				), ')');
 		}
 		try {
-			return self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__)->fetch(ADODB_FETCH_ASSOC);
+			return self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__)->fetch(ADODB_FETCH_ASSOC);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 		return false;
@@ -259,7 +259,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete of linked entry
 	 * @return array with deleted links
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -284,21 +284,21 @@ 
 					$check1['link_id1'] = $id;
 					$check2['link_id2'] = $id;
 				}
-				$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
+				$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
 			}
 			elseif ($app != '' && $app2 != '')
 			{
-				$where = self::$db->expression(self::TABLE,'(',array(
+				$where = self::$db->expression(self::TABLE, '(', array(
 						'link_app1'	=> $app,
 						'link_id1'	=> $id,
 						'link_app2'	=> $app2,
 						'link_id2'	=> $id2,
-					),') OR (',array(
+					), ') OR (', array(
 						'link_app1'	=> $app2,
 						'link_id1'	=> $id2,
 						'link_app2'	=> $app,
 						'link_id2'	=> $id,
-					),')');
+					), ')');
 			}
 			if ($owner)
 			{
@@ -308,25 +308,25 @@ 
 		}
 		$deleted = array();
 		try {
-			foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
+			foreach (self::$db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 			{
 				$deleted[] = $row;
 			}
-			if($hold_for_purge)
+			if ($hold_for_purge)
 			{
-				self::$db->update(self::TABLE,array(
+				self::$db->update(self::TABLE, array(
 					'deleted' => time(),
 					'link_lastmod' => time(),
-				), $where, __LINE__,__FILE__);
+				), $where, __LINE__, __FILE__);
 			}
 			else
 			{
-				self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
+				self::$db->delete(self::TABLE, $where, __LINE__, __FILE__);
 			}
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 		}
 
@@ -357,8 +357,8 @@ 
 			$check1['link_id1'] = $id;
 			$check2['link_id2'] = $id;
 		}
-		$where = self::$db->expression(self::TABLE,'((',$check1,') OR (',$check2,'))');
-		self::$db->update(self::TABLE,array('deleted'=> null), $where, __LINE__,__FILE__);
+		$where = self::$db->expression(self::TABLE, '((', $check1, ') OR (', $check2, '))');
+		self::$db->update(self::TABLE, array('deleted'=> null), $where, __LINE__, __FILE__);
 	}
 
 	/**
@@ -371,13 +371,13 @@ 
 	 * @param int $new_owner account_id of new owner
 	 * @return int number of links changed
 	 */
-	static function chown($owner,$new_owner)
+	static function chown($owner, $new_owner)
 	{
-		if ((int)$owner <= 0 || (int) $new_owner <= 0)
+		if ((int)$owner <= 0 || (int)$new_owner <= 0)
 		{
 			return 0;
 		}
-		self::$db->update(self::TABLE,array('owner'=>$new_owner),array('owner'=>$owner),__LINE__,__FILE__);
+		self::$db->update(self::TABLE, array('owner'=>$new_owner), array('owner'=>$owner), __LINE__, __FILE__);
 
 		return self::$db->affected_rows();
 	}
@@ -404,15 +404,15 @@ 
 	 * @param int|array $limit =null number of entries to return, default null = all or array(offset, num_rows) to return num_rows starting from offset
 	 * @return array with links from entries from $app to $target_app/$target_id plus the other (b) link_id/app/id in the keys 'link3'/'app3'/'id3'
 	 */
-	static function get_3links($app, $target_app, $target_id=null, $just_app_ids=false, $order='link_lastmod DESC', $limit=null)
+	static function get_3links($app, $target_app, $target_id = null, $just_app_ids = false, $order = 'link_lastmod DESC', $limit = null)
 	{
 		$table = self::TABLE;
-		$arrayofselects=array(
+		$arrayofselects = array(
 			// retrieve the type of links, where the relation is realized as timesheet->infolog/tracker via infolog->projectmanager to timesheet->projectmanager
 			array('table'=>self::TABLE,
 				'cols'=>'c.*,b.link_app1 AS app3,b.link_id1 AS id3,b.link_id AS link3',
 				'where'=>'a.link_app1='.self::$db->quote($app).' AND c.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND c.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND c.', array('link_id2' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id2=b.link_id1 AND a.link_app2=b.link_app1
                        			JOIN $table c ON a.link_id1=c.link_id1 AND a.link_app1=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app2 AND c.link_id2=b.link_id2",
@@ -421,7 +421,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'b.link_id, b.link_app2 as app1, b.link_id2 as id1, b.link_app1 as app2, b.link_id1 as id2, b.link_remark,b.link_lastmod,b.link_owner,b.deleted,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                        		'where'=>'a.link_app1='.self::$db->quote($app).' AND b.link_app1='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND b.',array('link_id1' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND b.', array('link_id1' => $target_id))),
                         	'join'=>" a
                         		JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id1 AND a.link_app2=c.link_app1 AND a.link_id!=c.link_id AND c.link_app2=b.link_app1 AND c.link_id2=b.link_id1",
@@ -430,7 +430,7 @@ 
 			array('table'=>self::TABLE,
 				'cols'=>'a.*,c.link_app1 AS app3,c.link_id1 AS id3,c.link_id AS link3',
                      		'where'=>'a.link_app1='.self::$db->quote($app).' AND a.link_app2='.self::$db->quote($target_app).
-                        		(!$target_id ? '' : self::$db->expression(self::TABLE,' AND a.',array('link_id2' => $target_id))),
+                        		(!$target_id ? '' : self::$db->expression(self::TABLE, ' AND a.', array('link_id2' => $target_id))),
                        		'join'=>" a
                        			JOIN $table b ON a.link_id1=b.link_id2 AND a.link_app1=b.link_app2
                         		JOIN $table c ON a.link_id2=c.link_id2 AND a.link_app2=c.link_app2 AND a.link_id!=c.link_id AND c.link_app1=b.link_app1 AND c.link_id1=b.link_id1",
@@ -442,17 +442,17 @@ 
 		{
 			list($offset, $limit) = $limit;
 		}
-		elseif($limit)
+		elseif ($limit)
 		{
 			$offset = 0;
 		}
 
 		$links = array();
-		foreach(self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
+		foreach (self::$db->union($arrayofselects, __LINE__, __FILE__, $order, $offset, $limit) as $row)
 		{
 			if ($just_app_ids)
 			{
-				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'],(array)$target_id)))
+				if ($row['link_app1'] == $target_app && (is_null($target_id) || in_array($row['link_id1'], (array)$target_id)))
 				{
 					$links[$row['link_id']] = $row['link_id2'];
 				}
@@ -463,7 +463,7 @@ 
 			}
 			else
 			{
-				$links[] = Api\Db::strip_array_keys($row,'link_');
+				$links[] = Api\Db::strip_array_keys($row, 'link_');
 			}
 		}
 		// if query returns exactly limit rows, we assume there are more and therefore set self::$limit_exceeded
@@ -477,7 +477,7 @@ 
 	 */
 	static function init_static( )
 	{
-		self::$db     = $GLOBALS['egw']->db;
+		self::$db = $GLOBALS['egw']->db;
 	}
 }
 Storage::init_static();

Braces +4 added lines, -1 removed lines

@@ -302,7 +302,10 @@
 			}
 			if ($owner)
 			{
-				if ($app) $where = array($where);
+				if ($app)
+				{
+					$where = array($where);
+				}
 				$where['link_owner'] = $owner;
 			}
 		}

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

@@ -269,7 +269,7 @@
 		{
 			$where = array('link_id' => $link_id);
 		}
-		elseif ($app == '' AND $owner == '')
+		elseif ($app == '' and $owner == '')
 		{
 			return 0;
 		}

api/src/Mail/Account.php

Doc Comments +6 added lines, -6 removed lines

@@ -486,7 +486,7 @@ 
 	 * @param boolean $replace_placeholders =false should placeholders like {{n_fn}} be replaced
 	 * @param string $field ='name' what to return as value: "ident_(realname|org|email|signature)" or default "name"=result from identity_name
 	 * @param int $user =null account_id to use if not current user
-	 * @return Iterator ident_id => identity_name of identity
+	 * @return Api\Db\CallbackIterator ident_id => identity_name of identity
 	 */
 	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
 	{
@@ -795,7 +795,7 @@ 
 	 *
 	 * To get $this->params you need to call getUserData before! It is never automatically loaded.
 	 *
-	 * @param type $name
+	 * @param string $name
 	 * @return mixed
 	 */
 	public function __get($name)
@@ -819,8 +819,8 @@ 
 	/**
 	 * Give read access to protected parameters in $this->params
 	 *
-	 * @param type $name
-	 * @return mixed
+	 * @param string $name
+	 * @return boolean
 	 */
 	public function __isset($name)
 	{
@@ -1340,10 +1340,10 @@ 
 	 * @param boolean|string $just_name =true true: return self::identity_name, false: return Account objects,
 	 *	string with attribute-name: return that attribute, eg. acc_imap_host or 'params' to return all attributes as array
 	 * @param string $order_by ='acc_name ASC'
-	 * @param int|boolean $offset =false offset or false to return all
+	 * @param boolean $offset =false offset or false to return all
 	 * @param int $num_rows =0 number of rows to return, 0=default from prefs (if $offset !== false)
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
-	 * @return Iterator with acc_id => acc_name or Account objects
+	 * @return Api\Db\CallbackIterator with acc_id => acc_name or Account objects
 	 */
 	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
 	{

Braces +95 added lines, -24 removed lines

@@ -360,8 +360,14 @@ 
 		{
 			// make sure mbstring.func_overload=0
 			static $func_overload = null;
-			if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
-			if ($func_overload) throw new Api\Exception\AssertionFailed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			if (is_null($func_overload))
+			{
+				$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+			}
+			if ($func_overload)
+			{
+				throw new Api\Exception\AssertionFailed('Fatal Error: EGroupware requires mbstring.func_overload=0 set in your php.ini!');
+			}
 
 			$class = $this->params['acc_imap_type'];
 			$this->imapServer = new $class($this->params, $_adminConnection, $_timeout);
@@ -490,7 +496,10 @@ 
 	 */
 	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
 	{
-		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($user))
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$acc_id = is_scalar($account) ? $account : $account['acc_id'];
 
 		$cols = array('ident_id', 'ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature', 'acc_id', 'acc_imap_username', 'acc_imap_logintype', 'acc_domain');
@@ -528,8 +537,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($user) || $user == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($row['ident_realname'])) $row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($row['ident_email'])) $row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($row['ident_realname']))
+					{
+						$row['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($row['ident_email']))
+					{
+						$row['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if ($field != 'name')
 				{
@@ -538,7 +553,9 @@ 
 				}
 				return self::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row)
+			{
+return $row['ident_id'];});
 	}
 
 	/**
@@ -554,10 +571,13 @@ 
 		{
 			$address .= ($address && $identity['ident_org'] ? ' ' : '').$identity['ident_org'];
 		}
-		if (strpos($address, ',') !== false)	// need to quote comma
+		if (strpos($address, ',') !== false)
+		{
+			// need to quote comma
 		{
 			$address = '"'.str_replace('"', '\\"', $address).'"';
 		}
+		}
 		if (!strpos($identity['ident_email'], '@'))
 		{
 			$address = null;
@@ -661,8 +681,14 @@ 
 		if ($to_replace)
 		{
 			static $merge=null;
-			if (!isset($merge)) $merge = new Api\Contacts\Merge();
-			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($merge))
+			{
+				$merge = new Api\Contacts\Merge();
+			}
+			if (!isset($account_id))
+			{
+				$account_id = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			foreach($to_replace as $name => &$value)
 			{
 				$err = null;
@@ -1083,7 +1109,10 @@ 
 				}
 
 				// fetch the IMAP / incomming server data
-				if (!class_exists($data['acc_smtp_type'])) $data['acc_smtp_type'] = __NAMESPACE__.'\\Smtp';
+				if (!class_exists($data['acc_smtp_type']))
+				{
+					$data['acc_smtp_type'] = __NAMESPACE__.'\\Smtp';
+				}
 			}
 		}
 		return $data;
@@ -1115,7 +1144,10 @@ 
 		}
 
 		// fetch the IMAP / incomming server data
-		if (!class_exists($imap_type)) $imap_type = __NAMESPACE__.'\\Imap';
+		if (!class_exists($imap_type))
+		{
+			$imap_type = __NAMESPACE__.'\\Imap';
+		}
 
 		return $imap_type;
 	}
@@ -1168,7 +1200,10 @@ 
 			$data['acc_id'] = self::$db->get_last_insert_id(self::TABLE, 'acc_id');
 		}
 		// restore namespace in class-names
-		if ($backup) $data = array_merge($data, $backup);
+		if ($backup)
+		{
+			$data = array_merge($data, $backup);
+		}
 
 		// store identity
 		$new_ident_id = self::save_identity($data);
@@ -1279,7 +1314,10 @@ 
 	 */
 	protected static function credentials_valid_for($account, $account_id=null)
 	{
-		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// if account valid for multiple users
 		if (self::is_multiple($account))
@@ -1398,9 +1436,12 @@ 
 				$cols[] = $valid_account_id_sql.' AS account_id';
 				$join .= ' '.self::ALL_VALID_JOIN;
 			}
-			if ($just_name == 'params')	// join in acc_imap_admin_username
+			if ($just_name == 'params')
+			{
+				// join in acc_imap_admin_username
 			{
 				$cols[] = self::ADMIN_COL;
+			}
 				$join .= ' '.self::ADMIN_JOIN;
 			}
 			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
@@ -1434,7 +1475,10 @@ 
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key]))
+		{
+			self::$search_cache[$cache_key]=array();
+		}
 		return new Api\Db\CallbackIterator(new \ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1476,12 +1520,18 @@ 
 			{
 				if ($smtp)
 				{
-					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port']) continue;
+					if (!$params['acc_smtp_host'] || !$params['acc_smtp_port'])
+					{
+						continue;
+					}
 					// check requirement of session, which is not available in async service!
 					if (isset($GLOBALS['egw_info']['flags']['async-service']) ||
-						empty($GLOBALS['egw_info']['user']['account_id']))	// happens during login when notifying about blocked accounts
+						empty($GLOBALS['egw_info']['user']['account_id']))
+					{
+						// happens during login when notifying about blocked accounts
 					{
 						if ($params['acc_smtp_auth_session']) continue;
+					}
 						// may fail because of smtp only profile, or no session password, etc
 						try
 						{
@@ -1492,15 +1542,24 @@ 
 							unset($x);
 							continue;
 						}
-						if (Credentials::isUser($account->acc_smtp_pw_enc)) continue;
+						if (Credentials::isUser($account->acc_smtp_pw_enc))
+						{
+							continue;
+						}
 					}
 				}
 				else
 				{
-					if (!$params['acc_imap_host'] || !$params['acc_imap_port']) continue;
+					if (!$params['acc_imap_host'] || !$params['acc_imap_port'])
+					{
+						continue;
+					}
 					$account = new Account($params);
 					// continue if we have either no imap username or password
-					if (!$account->is_imap()) continue;
+					if (!$account->is_imap())
+					{
+						continue;
+					}
 				}
 				return $return_id ? $acc_id : (isset($account) && $account->acc_id == $acc_id ?
 					$account : new Account($params));
@@ -1508,7 +1567,10 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if ($log_no_default) error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			if ($log_no_default)
+			{
+				error_log(__METHOD__.__LINE__.' Error no Default available.'.$e->getMessage());
+			}
 		}
 		return null;
 	}
@@ -1570,8 +1632,14 @@ 
 				// fill an empty ident_realname or ident_email of current user with data from user account
 				if ($replace_placeholders && (!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['acount_id']))
 				{
-					if (empty($account['ident_realname'])) $account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
-					if (empty($account['ident_email'])) $account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					if (empty($account['ident_realname']))
+					{
+						$account['ident_realname'] = $GLOBALS['egw_info']['user']['account_fullname'];
+					}
+					if (empty($account['ident_email']))
+					{
+						$account['ident_email'] = $GLOBALS['egw_info']['user']['account_email'];
+					}
 				}
 				if (empty($account['ident_email']) && !empty($account['acc_imap_username']) && strpos($account['acc_imap_username'], '@') !== false)
 				{
@@ -1642,7 +1710,10 @@ 
 	 */
 	protected static function memberships($user=null)
 	{
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;

Spacing +69 added lines, -72 removed lines

@@ -197,7 +197,7 @@ 
 	/**
 	 * Path to log smtp comunication to or null to not log
 	 */
-	const SMTP_DEBUG_LOG = null;//'/tmp/smtp.log';
+	const SMTP_DEBUG_LOG = null; //'/tmp/smtp.log';
 
 	/**
 	 * Instanciated account object by acc_id, read acts as singelton
@@ -252,7 +252,7 @@ 
 	 * @param int $called_for=null if set access to given user (without smtp credentials!),
 	 *	default current user AND read username/password from current users session
 	 */
-	/*protected*/ function __construct(array $params, $called_for=null)
+	/*protected*/ function __construct(array $params, $called_for = null)
 	{
 		// read credentials from database
 		$params += Credentials::read($params['acc_id'], null, $called_for ? array(0, $called_for) : $called_for, $this->on_login);
@@ -281,16 +281,16 @@ 
 	public static function ssl2secure($ssl)
 	{
 		$secure = false;
-		switch($ssl & ~self::SSL_VERIFY)
+		switch ($ssl&~self::SSL_VERIFY)
 		{
 			case self::SSL_STARTTLS:
-				$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+				$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 				break;
 			case self::SSL_SSL:
 				$secure = 'ssl';
 				break;
 			case self::SSL_TLS:
-				$secure = 'tlsv1';	// since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
+				$secure = 'tlsv1'; // since Horde_Imap_Client-1.16.0 requiring Horde_Socket_Client-1.1.0
 				break;
 		}
 		return $secure;
@@ -324,15 +324,15 @@ 
 				$this->params = array_merge($this->params, $data);
 			}
 		}
-		catch(Horde_Imap_Client_Exception $e) {
+		catch (Horde_Imap_Client_Exception $e) {
 			unset($e);
 			// ignore eg. connection errors
 		}
-		catch(\InvalidArgumentException $e) {
+		catch (\InvalidArgumentException $e) {
 			unset($e);
 			// ignore eg. missing admin user
 		}
-		$this->params += array_fill_keys(self::$user_data, null);	// make sure all keys exist now
+		$this->params += array_fill_keys(self::$user_data, null); // make sure all keys exist now
 
 		return (array)$data + (array)$smtp_data;
 	}
@@ -344,7 +344,7 @@ 
 	 */
 	public function saveUserData($user, array $data)
 	{
-		$data += $this->params;	// in case only user-data has been specified
+		$data += $this->params; // in case only user-data has been specified
 
 		// store account-information of managed mail server
 		if ($user > 0 && $data['acc_smtp_type'] && $data['acc_smtp_type'] != __NAMESPACE__.'\\Smtp')
@@ -368,7 +368,7 @@ 
 	 * @param int $_timeout =null timeout in secs, if none given fmail pref or default of 20 is used
 	 * @return Imap
 	 */
-	public function imapServer($_adminConnection=false, $_timeout=null)
+	public function imapServer($_adminConnection = false, $_timeout = null)
 	{
 		if (!isset($this->imapServer) || $this->imapServer->isAdminConnection !== $_adminConnection)
 		{
@@ -400,11 +400,11 @@ 
 	 *	(matters only for imap servers managed by EGroupware!)
 	 * @return boolean
 	 */
-	public function is_imap($try_connect=true)
+	public function is_imap($try_connect = true)
 	{
-		if (empty($this->acc_imap_host) || ( empty($this->acc_imap_username) && empty($this->acc_imap_password) ) )
+		if (empty($this->acc_imap_host) || (empty($this->acc_imap_username) && empty($this->acc_imap_password)))
 		{
-			return false;	// no imap host or credentials
+			return false; // no imap host or credentials
 		}
 		// if we are not managing the mail-server, we do NOT need to check deliveryMode and accountStatus
 		if ($this->acc_smtp_type == __NAMESPACE__.'\\Smtp')
@@ -441,7 +441,7 @@ 
 			$this->smtpServer->editForwardingAddress = false;
 			$this->smtpServer->host = $this->params['acc_smtp_host'];
 			$this->smtpServer->port = $this->params['acc_smtp_port'];
-			switch($this->params['acc_smtp_ssl'])
+			switch ($this->params['acc_smtp_ssl'])
 			{
 				case self::SSL_TLS:
 					$this->smtpServer->host = 'tlsv1://'.$this->smtpServer->host;
@@ -471,16 +471,16 @@ 
 		if (!isset($this->smtpTransport))
 		{
 			$secure = false;
-			switch($this->acc_smtp_ssl & ~self::SSL_VERIFY)
+			switch ($this->acc_smtp_ssl & ~self::SSL_VERIFY)
 			{
 				case self::SSL_STARTTLS:
-					$secure = 'tls';	// Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
+					$secure = 'tls'; // Horde uses 'tls' for STARTTLS, not ssl connection with tls version >= 1 and no sslv2/3
 					break;
 				case self::SSL_SSL:
 					$secure = 'ssl';
 					break;
 				case self::SSL_TLS:
-					$secure = 'tlsv1';	// since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
+					$secure = 'tlsv1'; // since Horde_Smtp-1.3.0 requiring Horde_Socket_Client-1.1.0
 					break;
 			}
 			// Horde use locale for translation of error messages
@@ -510,7 +510,7 @@ 
 	 * @param int $user =null account_id to use if not current user
 	 * @return Iterator ident_id => identity_name of identity
 	 */
-	public static function identities($account, $replace_placeholders=true, $field='name', $user=null)
+	public static function identities($account, $replace_placeholders = true, $field = 'name', $user = null)
 	{
 		if (!isset($user)) $user = $GLOBALS['egw_info']['user']['account_id'];
 		$acc_id = is_scalar($account) ? $account : $account['acc_id'];
@@ -560,7 +560,7 @@ 
 				}
 				return self::identity_name($row, $replace_placeholders);
 			}, array(),
-			function($row) { return $row['ident_id'];});
+			function($row) { return $row['ident_id']; });
 	}
 
 	/**
@@ -603,17 +603,17 @@ 
 	 * @return array acc_id:ident_id:email => rfc822 address pairs, eg. '1:1:rb@stylite.de' => 'Ralf Becker Stylite AG <rb@stylite.de>'
 	 * @todo add aliases for manged mail servers
 	 */
-	public static function rfc822_addresses($formatter=null)
+	public static function rfc822_addresses($formatter = null)
 	{
 		if (!$formatter || !is_callable($formatter))
 		{
 			$formatter = 'self::rfc822';
 		}
 		$addresses = array();
-		foreach(self::search(true, false) as $acc_id => $account)
+		foreach (self::search(true, false) as $acc_id => $account)
 		{
-			$added = false;	// make sure each account get's at least added once, even if it uses an identical email address
-			foreach(self::identities($account, true, 'params') as $identity)
+			$added = false; // make sure each account get's at least added once, even if it uses an identical email address
+			foreach (self::identities($account, true, 'params') as $identity)
 			{
 				if (($address = call_user_func($formatter, $identity)) && (!$added || !in_array($address, $addresses)))
 				{
@@ -647,7 +647,7 @@ 
 			}
 			return $cmp;
 		});
-		foreach($identities as &$identity)
+		foreach ($identities as &$identity)
 		{
 			$identity = self::identity_name($identity);
 		}
@@ -664,16 +664,16 @@ 
 	 * @param int $account_id =null account_id of user, or current user
 	 * @return array with modified fields
 	 */
-	public static function replace_placeholders($identity, $account_id=null)
+	public static function replace_placeholders($identity, $account_id = null)
 	{
-		static $fields = array('ident_name','ident_realname','ident_org','ident_email','ident_signature');
+		static $fields = array('ident_name', 'ident_realname', 'ident_org', 'ident_email', 'ident_signature');
 
 		if (!is_array($identity) && !is_a($identity, 'Account'))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."() requires an identity or account as first parameter!");
 		}
 		$to_replace = array();
-		foreach($fields as $name)
+		foreach ($fields as $name)
 		{
 			if (strpos($identity[$name], '{{') !== false || strpos($identity[$name], '$$') !== false)
 			{
@@ -682,10 +682,10 @@ 
 		}
 		if ($to_replace)
 		{
-			static $merge=null;
+			static $merge = null;
 			if (!isset($merge)) $merge = new Api\Contacts\Merge();
 			if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
-			foreach($to_replace as $name => &$value)
+			foreach ($to_replace as $name => &$value)
 			{
 				$err = null;
 				$value = $merge->merge_string($value,
@@ -707,7 +707,7 @@ 
 	 * @return array
 	 * @throws Api\Exception\NotFound
 	 */
-	public static function read_identity($ident_id, $replace_placeholders=false, $user=null, $account=null)
+	public static function read_identity($ident_id, $replace_placeholders = false, $user = null, $account = null)
 	{
 		if (($account && $account['ident_id'] == $ident_id))
 		{
@@ -777,8 +777,7 @@ 
 			'ident_org' => $identity['ident_org'],
 			'ident_email' => $identity['ident_email'],
 			'ident_signature' => $identity['ident_signature'],
-			'account_id' => self::is_multiple($identity) ? 0 :
-				(is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
+			'account_id' => self::is_multiple($identity) ? 0 : (is_array($identity['account_id']) ? $identity['account_id'][0] : $identity['account_id']),
 		);
 		if ($identity['ident_id'] > 0)
 		{
@@ -822,7 +821,7 @@ 
 	 */
 	public function __get($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return !empty($this->params['acc_imap_admin_username']);
@@ -846,7 +845,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'acc_imap_administration':	// no longer stored in database
 				return true;
@@ -936,11 +935,11 @@ 
 		{
 			// check if account is for current user, if not deny access
 			$memberships = self::memberships();
-			$memberships[] = '';	// edit uses '' for everyone
+			$memberships[] = ''; // edit uses '' for everyone
 
 			if (array_intersect((array)$account['account_id'], $memberships))
 			{
-				switch($rights)
+				switch ($rights)
 				{
 					case Api\Acl::READ:
 						$access = true;
@@ -985,7 +984,7 @@ 
 	 * @return email_account
 	 * @throws Api\Exception\NotFound if account was not found (or not valid for current user)
 	 */
-	public static function read($acc_id, $called_for=null)
+	public static function read($acc_id, $called_for = null)
 	{
 		//error_log(__METHOD__."($acc_id, ".array2string($called_for).")");
 		// some caching, but only for regular usage/users
@@ -1003,7 +1002,7 @@ 
 				//error_log(__METHOD__."($acc_id) created instance from cached data");
 				return self::$instances[$acc_id] = new Account(self::$cache[$acc_id]);
 			}
-			$data =& self::$cache[$acc_id];
+			$data = & self::$cache[$acc_id];
 		}
 		$where = array(self::TABLE.'.acc_id='.(int)$acc_id);
 		if (!isset($called_for) || $called_for !== '0')
@@ -1027,7 +1026,7 @@ 
 		if (!$valid_account_id_sql)
 		{
 			$data['account_id'] = array();
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $acc_id),
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$data['account_id'][] = $row['account_id'];
@@ -1039,7 +1038,7 @@ 
 		if (!isset($called_for))
 		{
 			//error_log(__METHOD__."($acc_id) creating instance and caching data read from db");
-			$ret =& self::$instances[$acc_id];
+			$ret = & self::$instances[$acc_id];
 		}
 		return $ret = new Account($data, $called_for);
 	}
@@ -1052,7 +1051,7 @@ 
 	 */
 	protected static function db2data(array $data)
 	{
-		foreach(array('acc_sieve_enabled','acc_user_editable','acc_smtp_auth_session','acc_user_forward') as $name)
+		foreach (array('acc_sieve_enabled', 'acc_user_editable', 'acc_smtp_auth_session', 'acc_user_forward') as $name)
 		{
 			if (isset($data[$name]))
 			{
@@ -1151,16 +1150,16 @@ 
 	 * @throws Api\Exception\WrongParameter if called static without data-array
 	 * @throws Api\Db\Exception
 	 */
-	public static function write(array $data, $user=null)
+	public static function write(array $data, $user = null)
 	{
 		//error_log(__METHOD__."(".array2string($data).")");
 		$data['acc_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		$data['acc_modified'] = time();
 
 		// remove redundant namespace to fit into column
-		$ns_len = strlen(__NAMESPACE__)+1;
+		$ns_len = strlen(__NAMESPACE__) + 1;
 		$backup = array();
-		foreach(array('acc_smtp_type', 'acc_imap_type') as $attr)
+		foreach (array('acc_smtp_type', 'acc_imap_type') as $attr)
 		{
 			if (substr($data[$attr], 0, $ns_len) == __NAMESPACE__.'\\')
 			{
@@ -1174,7 +1173,7 @@ 
 		{
 			// set not set values which, are NOT NULL and therefore would give an SQL error
 			$td = self::$db->get_table_definitions('api', self::TABLE);
-			foreach($td['fd'] as $col => $def)
+			foreach ($td['fd'] as $col => $def)
 			{
 				if (!isset($data[$col]) && $def['nullable'] === false && !isset($def['default']))
 				{
@@ -1211,19 +1210,19 @@ 
 		$old_account_ids = array();
 		if ($where)
 		{
-			foreach(self::$db->select(self::VALID_TABLE, 'account_id', $where,
+			foreach (self::$db->select(self::VALID_TABLE, 'account_id', $where,
 				__LINE__, __FILE__, false, '', self::APP) as $row)
 			{
 				$old_account_ids[] = $row['account_id'];
 			}
 			if (($ids_to_remove = array_diff($old_account_ids, (array)$data['account_id'])))
 			{
-				self::$db->delete(self::VALID_TABLE, $where+array(
+				self::$db->delete(self::VALID_TABLE, $where + array(
 					'account_id' => $ids_to_remove,
 				), __LINE__, __FILE__, self::APP);
 			}
 		}
-		foreach((array)$data['account_id'] as $account_id)
+		foreach ((array)$data['account_id'] as $account_id)
 		{
 			if (!in_array($account_id, $old_account_ids))
 			{
@@ -1285,8 +1284,7 @@ 
 		}
 
 		// store notification folders
-		Notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 :
-			($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
+		Notifications::write($data['acc_id'], $data['notify_save_default'] ? 0 : ($data['called_for'] ? $data['called_for'] : $GLOBALS['egw_info']['user']['account_id']),
 			(array)$data['notify_folders']);
 
 		// store domain of an account for all user like before as "mail_suffix" config
@@ -1312,7 +1310,7 @@ 
 	 * @param int $account_id =null
 	 * @return int account_id for whom credentials are valid or 0 for all
 	 */
-	protected static function credentials_valid_for($account, $account_id=null)
+	protected static function credentials_valid_for($account, $account_id = null)
 	{
 		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
 
@@ -1338,7 +1336,7 @@ 
 	 * @param int $account_id =null user or group
 	 * @return int number of deleted mail accounts or null if only user-data was deleted and no full mail accounts
 	 */
-	public static function delete($acc_id, $account_id=null)
+	public static function delete($acc_id, $account_id = null)
 	{
 		if (is_array($acc_id) || $acc_id > 0)
 		{
@@ -1349,7 +1347,7 @@ 
 			self::$db->delete(self::TABLE, array('acc_id' => $acc_id), __LINE__, __FILE__, self::APP);
 
 			// invalidate caches
-			foreach((array)$acc_id as $acc_id)
+			foreach ((array)$acc_id as $acc_id)
 			{
 				self::cache_invalidate($acc_id);
 			}
@@ -1368,7 +1366,7 @@ 
 		self::$db->delete(self::IDENTITIES_TABLE, array('account_id' => $account_id), __LINE__, __FILE__, self::APP);
 		// find profiles not belonging to anyone else and delete them
 		$acc_ids = array();
-		foreach(self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
+		foreach (self::$db->select(self::TABLE, self::TABLE.'.acc_id', 'account_id IS NULL', __LINE__, __FILE__,
 			false, 'GROUP BY '.self::TABLE.'.acc_id', self::APP, 0, 'LEFT '.self::VALID_JOIN) as $row)
 		{
 			$acc_ids[] = $row['acc_id'];
@@ -1392,7 +1390,7 @@ 
 	 * @param boolean $replace_placeholders =true should placeholders like {{n_fn}} be replaced
 	 * @return Iterator with acc_id => acc_name or Account objects
 	 */
-	public static function search($only_current_user=true, $just_name=true, $order_by=null, $offset=false, $num_rows=0, $replace_placeholders=true)
+	public static function search($only_current_user = true, $just_name = true, $order_by = null, $offset = false, $num_rows = 0, $replace_placeholders = true)
 	{
 		//error_log(__METHOD__."($only_current_user, $just_name, '$order_by', $offset, $num_rows)");
 		$where = array();
@@ -1438,19 +1436,19 @@ 
 				$cols[] = self::ADMIN_COL;
 				$join .= ' '.self::ADMIN_JOIN;
 			}
-			$rs = self::$db->select(self::TABLE, $cols,	$where, __LINE__, __FILE__,
+			$rs = self::$db->select(self::TABLE, $cols, $where, __LINE__, __FILE__,
 				$offset, Api\Storage::fix_group_by_columns($group_by, $cols, self::TABLE, 'acc_id').' ORDER BY '.$order_by,
 				self::APP, $num_rows, $join);
 
 			$ids = array();
-			foreach($rs as $row)
+			foreach ($rs as $row)
 			{
 				$row = self::db2data($row);
 
 				if ($only_current_user === true)
 				{
 					//error_log(__METHOD__."(TRUE, $just_name) caching data for acc_id=$row[acc_id]");
-					self::$search_cache[$cache_key][$row['acc_id']] =& self::$cache[$row['acc_id']];
+					self::$search_cache[$cache_key][$row['acc_id']] = & self::$cache[$row['acc_id']];
 					self::$cache[$row['acc_id']] = $row;
 				}
 				else
@@ -1462,14 +1460,14 @@ 
 			// fetch valid_id, if not yet fetched
 			if (!$valid_account_id_sql && $ids)
 			{
-				foreach(self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
+				foreach (self::$db->select(self::VALID_TABLE, 'account_id', array('acc_id' => $ids),
 					__LINE__, __FILE__, false, '', self::APP) as $row)
 				{
 					self::$cache[$row['acc_id']]['account_id'][] = $row['account_id'];
 				}
 			}
 		}
-		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key]=array();
+		if (is_null(self::$search_cache[$cache_key])) self::$search_cache[$cache_key] = array();
 		return new Api\Db\CallbackIterator(new \ArrayIterator(self::$search_cache[$cache_key]),
 			// process each row
 			function($row) use ($just_name, $replace_placeholders, $account_id)
@@ -1503,11 +1501,11 @@ 
 	 * @param boolean $log_no_default =true true: error_log if no default found, false be silent
 	 * @return Account|null
 	 */
-	static function get_default($smtp=false, $return_id=false, $log_no_default=true)
+	static function get_default($smtp = false, $return_id = false, $log_no_default = true)
 	{
 		try
 		{
-			foreach(self::search(true, 'params') as $acc_id => $params)
+			foreach (self::search(true, 'params') as $acc_id => $params)
 			{
 				if ($smtp)
 				{
@@ -1554,7 +1552,7 @@ 
 	 * @param boolean $smtp =false false: usable for IMAP, true: usable for SMTP
 	 * @return int
 	 */
-	static function get_default_acc_id($smtp=false)
+	static function get_default_acc_id($smtp = false)
 	{
 		return self::get_default($smtp, true);
 	}
@@ -1567,7 +1565,7 @@ 
 	 * @param int $account_id =null account_id of user we are called for
 	 * @return string with htmlencoded angle brackets
 	 */
-	public static function identity_name($account, $replace_placeholders=true, $account_id=null)
+	public static function identity_name($account, $replace_placeholders = true, $account_id = null)
 	{
 		if ($replace_placeholders)
 		{
@@ -1594,7 +1592,7 @@ 
 				{
 					if (!isset($account['acc_imap_username']))
 					{
-						$account += Credentials::read($account['acc_id'], null, ($account_id?array($account_id, 0):null));
+						$account += Credentials::read($account['acc_id'], null, ($account_id ? array($account_id, 0) : null));
 					}
 					if (empty($account['acc_imap_username']) && $account['acc_imap_logintype'] &&
 						(!isset($account_id) || $account_id == $GLOBALS['egw_info']['user']['account_id']))
@@ -1613,7 +1611,7 @@ 
 					$account['ident_email'] = $account['acc_imap_username'];
 				}
 			}
-			catch(\Exception $e) {
+			catch (\Exception $e) {
 				_egw_log_exception($e);
 			}
 		}
@@ -1625,11 +1623,11 @@ 
 		{
 			$name = $account['acc_name'];
 		}
-		if (strpos($account['ident_email'], '@') !== false || trim($account['ident_email']) !='')
+		if (strpos($account['ident_email'], '@') !== false || trim($account['ident_email']) != '')
 		{
 			$name .= ' <'.$account['ident_email'].'>';
 		}
-		elseif(strpos($account['acc_imap_username'], '@') !== false || trim($account['acc_imap_username']) !='')
+		elseif (strpos($account['acc_imap_username'], '@') !== false || trim($account['acc_imap_username']) != '')
 		{
 			$name .= ' <'.$account['acc_imap_username'].'>';
 		}
@@ -1652,8 +1650,7 @@ 
 	 */
 	public static function is_multiple($account)
 	{
-		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 :
-			(count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
+		$is_multiple = !is_array($account['account_id']) ? $account['account_id'] <= 0 : (count($account['account_id']) > 1 || $account['account_id'][0] <= 0);
 		//error_log(__METHOD__."(account_id=".array2string($account['account_id']).") returning ".array2string($is_multiple));
 		return $is_multiple;
 	}
@@ -1674,13 +1671,13 @@ 
 	 * @param type $user
 	 * @return array
 	 */
-	protected static function memberships($user=null)
+	protected static function memberships($user = null)
 	{
 		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		$memberships[] = $user;
-		$memberships[] = 0;	// marks accounts valid for everyone
+		$memberships[] = 0; // marks accounts valid for everyone
 
 		return $memberships;
 	}