EGroupware / egroupware

api/src/Framework/Favorites.php

Doc Comments +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
 	 * @param string $action "add" or "delete"
 	 * @param boolean|int|String $group ID of the group to create the favorite for, or 'all' for all users
 	 * @param array $filters key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function set_favorite($app, $_name, $action, $group, $filters = array())
 	{

Spacing +22 added lines, -23 removed lines

@@ -42,7 +42,7 @@ 
 	 *
 	 * @return array with a single sidebox menu item (array) containing html for favorites
 	 */
-	public static function list_favorites($app, $default=null)
+	public static function list_favorites($app, $default = null)
 	{
 		if (!$app)
 		{
@@ -58,7 +58,7 @@ 
 		$target = 'favorite_sidebox_'.$app;
 
 		/* @var $filters array an array of favorites*/
-		$filters =  self::get_favorites($app);
+		$filters = self::get_favorites($app);
 		$is_admin = $GLOBALS['egw_info']['user']['apps']['admin'];
 		$html = "<span id='$target' class='ui-helper-clearfix sidebox-favorites'><ul class='ui-menu ui-widget-content ui-corner-all favorites' role='listbox'>\n";
 
@@ -69,25 +69,24 @@ 
 		}
 
 		// Get link for if there is no nextmatch - this is the fallback
-		$registry = Api\Link::get_registry($app,'list');
+		$registry = Api\Link::get_registry($app, 'list');
 		if (!$registry)
 		{
 			$registry = Api\Link::get_registry($app, 'index');
 		}
-		foreach($filters as $name => $filter)
+		foreach ($filters as $name => $filter)
 		{
 			//filter must not be empty if there's one, ignore it at the moment but it need to be checked how it got there in database
 			if (!$filter)
 			{
-				error_log(__METHOD__.'Favorite filter "'.$name.'" is not supposed to be empty, it should be an array.  Skipping, more investigation needed. filter = '. array2string($filters[$name]));
+				error_log(__METHOD__.'Favorite filter "'.$name.'" is not supposed to be empty, it should be an array.  Skipping, more investigation needed. filter = '.array2string($filters[$name]));
 				continue;
 			}
 			$li = "<li data-id='$name' data-group='{$filter['group']}' class='ui-menu-item' role='menuitem'>\n";
 			$li .= '<a href="#" class="ui-corner-all" tabindex="-1">';
-			$li .= "<div class='" . ((string)$name === (string)$default_filter ? 'ui-icon ui-icon-heart' : 'sideboxstar') . "'></div>".
+			$li .= "<div class='".((string)$name === (string)$default_filter ? 'ui-icon ui-icon-heart' : 'sideboxstar')."'></div>".
 				$filter['name'];
-			$li .= ($filter['group'] != false && !$is_admin || $name === 'blank' ? "" :
-				"<div class='ui-icon ui-icon-trash' title='" . lang('Delete') . "'></div>");
+			$li .= ($filter['group'] != false && !$is_admin || $name === 'blank' ? "" : "<div class='ui-icon ui-icon-trash' title='".lang('Delete')."'></div>");
 			$li .= "</a></li>\n";
 			//error_log(__METHOD__."() $name, filter=".array2string($filter)." --> ".$li);
 			$html .= $li;
@@ -95,7 +94,7 @@ 
 
 		// If were're here, the app supports favorites, so add a 'Add' link too
 		$html .= "<li data-id='add' class='ui-menu-item' role='menuitem'><a href='javascript:app.$app.add_favorite()' class='ui-corner-all'>";
-		$html .= Api\Html::image($app, 'new') . lang('Add current'). '</a></li>';
+		$html .= Api\Html::image($app, 'new').lang('Add current').'</a></li>';
 
 		$html .= '</ul></span>';
 
@@ -117,7 +116,7 @@ 
 	 * @return (array|boolean) An array of sorted favorites or False if there's no preferenced sorted list
 	 *
 	 */
-	public static function get_fav_sort_pref ($app)
+	public static function get_fav_sort_pref($app)
 	{
 		$fav_sorted_list = array();
 
@@ -157,13 +156,13 @@ 
 		$fav_sort_pref = self::get_fav_sort_pref($app);
 
 		// Look through all preferences & pull out favorites
-		foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $pref_name => $pref)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $pref_name => $pref)
 		{
-			if(strpos($pref_name, $pref_prefix) === 0)
+			if (strpos($pref_name, $pref_prefix) === 0)
 			{
-				if(!is_array($pref)) continue;	// old favorite
+				if (!is_array($pref)) continue; // old favorite
 
-				$favorites[(string)substr($pref_name,strlen($pref_prefix))] = $pref;
+				$favorites[(string)substr($pref_name, strlen($pref_prefix))] = $pref;
 			}
 		}
 		if (is_array($fav_sort_pref))
@@ -172,7 +171,7 @@ 
 			{
 				$sorted_list[$key] = $favorites[$key];
 			}
-			$favorites = array_merge($sorted_list,$favorites);
+			$favorites = array_merge($sorted_list, $favorites);
 		}
 		return $favorites;
 	}
@@ -204,7 +203,7 @@ 
 			}
 			else
 			{
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $gid)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $gid)
 				{
 					$prefs = new Api\Preferences($gid);
 					$prefs->read_repository();
@@ -216,7 +215,7 @@ 
 				}
 			}
 		}
-		if($group && $GLOBALS['egw_info']['apps']['admin'] && $group !== 'all')
+		if ($group && $GLOBALS['egw_info']['apps']['admin'] && $group !== 'all')
 		{
 			$prefs = new Api\Preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -227,7 +226,7 @@ 
 		$prefs->read_repository();
 		$type = $group === "all" ? "default" : "user";
 		//error_log(__METHOD__."('$app', '$name', '$action', ".array2string($group).", ...) pref_name=$pref_name, type=$type");
-		if($action == "add")
+		if ($action == "add")
 		{
 			$filters = array(
 				// This is the name as user entered it, minus tags
@@ -235,9 +234,9 @@ 
 				'group' => $group ? $group : false,
 				'state' => $filters
 			);
-			$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/','_',$name);
-			$result = $prefs->add($app,$pref_name,$filters,$type);
-			$pref = $prefs->save_repository(false,$type);
+			$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/', '_', $name);
+			$result = $prefs->add($app, $pref_name, $filters, $type);
+			$pref = $prefs->save_repository(false, $type);
 
 			// Update preferences client side, or it could disappear
 			Api\Json\Response::get()->call('egw.set_preferences', (array)$pref[$app], $app);
@@ -247,8 +246,8 @@ 
 		}
 		else if ($action == "delete")
 		{
-			$result = $prefs->delete($app,$pref_name, $type);
-			$pref = $prefs->save_repository(false,$type);
+			$result = $prefs->delete($app, $pref_name, $type);
+			$pref = $prefs->save_repository(false, $type);
 
 			// Update preferences client side, or it could come back
 			Api\Json\Response::get()->call('egw.set_preferences', (array)$pref[$app], $app);

Braces +5 added lines, -1 removed lines

@@ -161,7 +161,11 @@
 		{
 			if(strpos($pref_name, $pref_prefix) === 0)
 			{
-				if(!is_array($pref)) continue;	// old favorite
+				if(!is_array($pref))
+				{
+					continue;
+				}
+				// old favorite
 
 				$favorites[(string)substr($pref_name,strlen($pref_prefix))] = $pref;
 			}

api/src/Framework/Minimal.php

Doc Comments -5 removed lines

@@ -103,11 +103,6 @@
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{

Indentation +54 added lines, -54 removed lines

@@ -21,29 +21,29 @@ 
 class Minimal extends Api\Framework
 {
 	/**
-	* Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
-	*
-	* @var Template
-	*/
+	 * Instance of the phplib Template class for the API's template dir (EGW_TEMPLATE_DIR)
+	 *
+	 * @var Template
+	 */
 	var $tpl;
 
 	/**
-	* Constructor
-	*
-	* @param string $template ='default' name of the template
-	* @return idots_framework
-	*/
+	 * Constructor
+	 *
+	 * @param string $template ='default' name of the template
+	 * @return idots_framework
+	 */
 	function __construct($template='default')
 	{
 		parent::__construct($template);		// call the constructor of the extended class
 	}
 
 	/**
-	* Returns the html-header incl. the opening body tag
-	*
-	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
-	* @return string with html
-	*/
+	 * Returns the html-header incl. the opening body tag
+	 *
+	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
+	 * @return string with html
+	 */
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
@@ -76,10 +76,10 @@ 
 	}
 
 	/**
-	* Returns the html from the body-tag til the main application area (incl. opening div tag)
-	*
-	* @return string with html
-	*/
+	 * Returns the html from the body-tag til the main application area (incl. opening div tag)
+	 *
+	 * @return string with html
+	 */
 	function navbar()
 	{
 		return '';
@@ -101,37 +101,37 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_item(array $app_data,$alt_label=null)
 	{
 		unset($app_data, $alt_label);
 	}
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	function _add_topmenu_info_item($content, $id=null)
 	{
 		unset($content, $id);
 	}
 
 	/**
-	* Returns the html from the closing div of the main application area to the closing html-tag
-	*
-	* @return string html or null if no footer needed/wanted
-	*/
+	 * Returns the html from the closing div of the main application area to the closing html-tag
+	 *
+	 * @return string html or null if no footer needed/wanted
+	 */
 	function footer()
 	{
 		static $footer_done=0;
@@ -141,29 +141,29 @@ 
 	}
 
 	/**
-	* Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
-	*
-	* @param string $appname
-	* @param string $menu_title
-	* @param array $file
-	* @param string $type =null 'admin', 'preferences', 'favorites', ...
-	*/
+	 * Parses one sidebox menu and add's the html to $this->sidebox_content for later use by $this->navbar
+	 *
+	 * @param string $appname
+	 * @param string $menu_title
+	 * @param array $file
+	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
+	 */
 	function sidebox($appname,$menu_title,$file,$type=null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);

Spacing +13 added lines, -13 removed lines

@@ -33,9 +33,9 @@ 
 	* @param string $template ='default' name of the template
 	* @return idots_framework
 	*/
-	function __construct($template='default')
+	function __construct($template = 'default')
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 	}
 
 	/**
@@ -44,7 +44,7 @@ 
 	* @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	* @return string with html
 	*/
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -66,11 +66,11 @@ 
 		// as the old Template class has problems if restored from the session (php-restore)
 		$this->tpl = new Template(EGW_SERVER_ROOT.$this->template_dir, 'keep');
 		$this->tpl->set_file(array('_head' => 'head.tpl'));
-		$this->tpl->set_block('_head','head');
+		$this->tpl->set_block('_head', 'head');
 
 		$this->tpl->set_var($this->_get_header($extra));
 
-		$content .= $this->tpl->fp('out','head');
+		$content .= $this->tpl->fp('out', 'head');
 
 		return $content;
 	}
@@ -93,7 +93,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	public function isTop($consider_navbar_not_yet_called_as_true=true)
+	public function isTop($consider_navbar_not_yet_called_as_true = true)
 	{
 		unset($consider_navbar_not_yet_called_as_true);
 
@@ -109,7 +109,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
 		unset($app_data, $alt_label);
 	}
@@ -122,7 +122,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
 		unset($content, $id);
 	}
@@ -134,10 +134,10 @@ 
 	*/
 	function footer()
 	{
-		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		static $footer_done = 0;
+		if ($footer_done++) return; // prevent multiple footers, not sure we still need this (RalfBecker)
 
-		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
+		return "</body>\n</html>\n"; // close body and html tag, eg. for popups
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	* @param array $file
 	* @param string $type =null 'admin', 'preferences', 'favorites', ...
 	*/
-	function sidebox($appname,$menu_title,$file,$type=null)
+	function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		unset($appname, $menu_title, $file, $type);
 	}
@@ -164,7 +164,7 @@ 
 	* @access public
 	* @return void
 	*/
-	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
+	function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null)
 	{
 		unset($id, $icon_src, $iconlink, $blink, $tooltip);
 	}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,10 @@ 
 	function header(array $extra=array())
 	{
 		// make sure header is output only once
-		if (self::$header_done) return '';
+		if (self::$header_done)
+		{
+			return '';
+		}
 		self::$header_done = true;
 
 		// js stuff is not needed by login page or in popups
@@ -135,7 +138,11 @@ 
 	function footer()
 	{
 		static $footer_done=0;
-		if ($footer_done++) return;	// prevent multiple footers, not sure we still need this (RalfBecker)
+		if ($footer_done++)
+		{
+			return;
+		}
+		// prevent multiple footers, not sure we still need this (RalfBecker)
 
 		return "</body>\n</html>\n";	// close body and html tag, eg. for popups
 	}

api/src/Framework/Updates.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +4 added lines, -4 removed lines

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

Braces +8 added lines, -2 removed lines

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

api/src/Header/Authenticate.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +12 added lines, -12 removed lines

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

Spacing +19 added lines, -19 removed lines

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

Braces +42 added lines, -11 removed lines

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

api/src/Header/ContentSecurityPolicy.php

Doc Comments -1 removed lines

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

Spacing +11 added lines, -11 removed lines

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

Braces +8 added lines, -2 removed lines

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

api/src/Hooks.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Braces +53 added lines, -13 removed lines

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

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

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

api/src/Html.php

Doc Comments +3 added lines, -5 removed lines

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

Indentation +29 added lines, -29 removed lines

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

Braces +183 added lines, -47 removed lines

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

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,11 +865,11 @@ 
 	 * @param string $height height, default 5px
 	 * @return string html
 	 */
-	static function progressbar($_percent, $_title='',$options='',$width='',$color='',$height='' )
+	static function progressbar($_percent, $_title = '', $options = '', $width = '', $color = '', $height = '')
 	{
 		$percent = (int)$_percent;
 		if (!$width) $width = '30px';
-		if (!$height)$height= '5px';
+		if (!$height)$height = '5px';
 		if (!$color) $color = '#D00000';
 		$title = $_title ? self::htmlspecialchars($_title) : $percent.'%';
 
@@ -879,7 +879,7 @@ 
 		}
 		return '<div class="onlyPrint">'.$title.'</div><div class="noPrint" title="'.$title.'" '.$options.
 			' style="height: '.$height.'; width: '.$width.'; border: 1px solid black; padding: 1px; text-align: left;'.
-			(@stristr($options,'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
+			(@stristr($options, 'onclick="') ? ' cursor: pointer;' : '').'">'."\n\t".
 			'<div style="height: '.$height.'; width: '.$percent.'%; background: '.$color.';"></div>'."\n</div>\n";
 	}
 
@@ -897,32 +897,32 @@ 
 	 * @param string $options further options for the tag, default '' = none
 	 * @return string the html
 	 */
-	static function image( $app,$name,$title='',$options='' )
+	static function image($app, $name, $title = '', $options = '')
 	{
 		if (is_array($name))	// menuaction and other get-vars
 		{
-			$name = $GLOBALS['egw']->link('/index.php',$name);
+			$name = $GLOBALS['egw']->link('/index.php', $name);
 		}
-		if (substr($name,0,5) == 'vfs:/')	// vfs pseudo protocoll
+		if (substr($name, 0, 5) == 'vfs:/')	// vfs pseudo protocoll
 		{
-			$name = Framework::link(Vfs::download_url(substr($name,4)));
+			$name = Framework::link(Vfs::download_url(substr($name, 4)));
 		}
-		if ($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://' || stripos($name,'api/thumbnail.php') )
+		if ($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://' || stripos($name, 'api/thumbnail.php'))
 		{
-			if (!($name[0] == '/' || substr($name,0,7) == 'http://' || substr($name,0,8) == 'https://')) $name = '/'.$name;
+			if (!($name[0] == '/' || substr($name, 0, 7) == 'http://' || substr($name, 0, 8) == 'https://')) $name = '/'.$name;
 			$url = $name;
 		}
 		else	// no URL, so try searching the image
 		{
-			$name = str_replace(array('.gif','.GIF','.png','.PNG'),'',$name);
+			$name = str_replace(array('.gif', '.GIF', '.png', '.PNG'), '', $name);
 
-			if (!($url = Image::find($app,$name)))
+			if (!($url = Image::find($app, $name)))
 			{
-				$url = $name;		// name may already contain absolut path
+				$url = $name; // name may already contain absolut path
 			}
-			if($GLOBALS['egw_info']['server']['webserver_url'])
+			if ($GLOBALS['egw_info']['server']['webserver_url'])
 			{
-				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url);
+				list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'], $url);
 
 				if (!is_null($path)) $path = EGW_SERVER_ROOT.$path;
 			}
@@ -931,12 +931,12 @@ 
 				$path = EGW_SERVER_ROOT.$url;
 			}
 
-			if (is_null($path) || (!@is_readable($path) && stripos($path,'webdav.php')===false))
+			if (is_null($path) || (!@is_readable($path) && stripos($path, 'webdav.php') === false))
 			{
 				// if the image-name is a percentage, use a progressbar
-				if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
+				if (substr($name, -1) == '%' && is_numeric($percent = substr($name, 0, -1)))
 				{
-					return self::progressbar($percent,$title);
+					return self::progressbar($percent, $title);
 				}
 				return $title;
 			}
@@ -947,12 +947,12 @@ 
 		}
 
 		// This block makes pngfix.js useless, adding a check on disable_pngfix to have pngfix.js do its thing
-		if (Header\UserAgent::type() == 'msie' && Header\UserAgent::version() < 7.0 && substr($url,-4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
+		if (Header\UserAgent::type() == 'msie' && Header\UserAgent::version() < 7.0 && substr($url, -4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
 		{
 			$extra_styles = "display: inline-block; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$url',sizingMethod='image'); width: 1px; height: 1px;";
-			if (false!==strpos($options,'style="'))
+			if (false !== strpos($options, 'style="'))
 			{
-				$options = str_replace('style="','style="'.$extra_styles, $options);
+				$options = str_replace('style="', 'style="'.$extra_styles, $options);
 			}
 			else
 			{
@@ -972,24 +972,24 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function a_href( $content,$url,$vars='',$options='')
+	static function a_href($content, $url, $vars = '', $options = '')
 	{
 		if (is_array($url))
 		{
 			$vars = $url;
 			$url = '/index.php';
 		}
-		elseif (strpos($url,'/')===false &&
-			count(explode('.',$url)) >= 3 &&
-			!(strpos($url,'mailto:')!==false ||
-			strpos($url,'://')!==false ||
-			strpos($url,'javascript:')!==false))
+		elseif (strpos($url, '/') === false &&
+			count(explode('.', $url)) >= 3 &&
+			!(strpos($url, 'mailto:') !== false ||
+			strpos($url, '://') !== false ||
+			strpos($url, 'javascript:') !== false))
 		{
 			$url = "/index.php?menuaction=$url";
 		}
 		if ($url[0] == '/')		// link relative to eGW
 		{
-			$url = self::link($url,$vars);
+			$url = self::link($url, $vars);
 		}
 		//echo "<p>self::a_href('".self::htmlspecialchars($content)."','$url',".print_r($vars,True).") = ".self::link($url,$vars)."</p>";
 		return '<a href="'.self::htmlspecialchars($url).'" '.$options.'>'.$content.'</a>';
@@ -1003,7 +1003,7 @@ 
 	 */
 	static function bold($content)
 	{
-		return '<b>'.($content?$content.'</b>':'');
+		return '<b>'.($content ? $content.'</b>' : '');
 	}
 
 	/**
@@ -1013,7 +1013,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function hr($width='',$options='')
+	static function hr($width = '', $options = '')
 	{
 		if ($width) $options .= " width=\"$width\"";
 
@@ -1029,12 +1029,12 @@ 
 	 * @param mixed $names String (or Array) with the option-names eg. 'WIDTH,HEIGHT,BORDER'
 	 * @return string with options/attributes
 	 */
-	static function formatOptions($options,$names)
+	static function formatOptions($options, $names)
 	{
-		if (!is_array($options)) $options = explode(',',$options);
-		if (!is_array($names))   $names   = explode(',',$names);
+		if (!is_array($options)) $options = explode(',', $options);
+		if (!is_array($names))   $names   = explode(',', $names);
 
-		foreach($options as $n => $val)
+		foreach ($options as $n => $val)
 		{
 			if ($val != '' && $names[$n] != '')
 			{
@@ -1064,7 +1064,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function label($content,$id='',$accesskey='',$options='')
+	static function label($content, $id = '', $accesskey = '', $options = '')
 	{
 		if ($id != '')
 		{
@@ -1085,7 +1085,7 @@ 
 	 * @param string $options attributes for the tag, default ''=none
 	 * @return string the html
 	 */
-	static function fieldset($content,$legend='',$options='')
+	static function fieldset($content, $legend = '', $options = '')
 	{
 		$html = "<fieldset $options>".($legend ? '<legend>'.self::htmlspecialchars($legend).'</legend>' : '')."\n";
 
@@ -1119,9 +1119,9 @@ 
 	 *
 	 * @return string the html code, to be added into the template
 	 */
-	static function tree($_folders,$_selected,$_topFolder=false,$_onNodeSelect="null",$tree='foldertree',$_divClass='',
-		$_leafImage='',$_onCheckHandler=false,$delimiter='/',$folderImageDir=null,$autoLoading=null,$dataMode='JSON',
-		$dragndrop=false)
+	static function tree($_folders, $_selected, $_topFolder = false, $_onNodeSelect = "null", $tree = 'foldertree', $_divClass = '',
+		$_leafImage = '', $_onCheckHandler = false, $delimiter = '/', $folderImageDir = null, $autoLoading = null, $dataMode = 'JSON',
+		$dragndrop = false)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($folderImageDir))
@@ -1144,7 +1144,7 @@ 
 			//error_log(__METHOD__."() setting templated image-path: $folderImageDir");
 		}
 
-		static $tree_initialised=false;
+		static $tree_initialised = false;
 		if (!$tree_initialised)
 		{
 			Framework::includeCSS('/api/js/dhtmlxtree/codebase/dhtmlxtree.css');
@@ -1154,16 +1154,16 @@ 
 			$tree_initialised = true;
 			if (!$_folders && !$autoLoading) return null;
 		}
-		$html = self::div("\n",'id="'.$tree.'"',$_divClass).$html;
+		$html = self::div("\n", 'id="'.$tree.'"', $_divClass).$html;
 		$html .= "<script type='text/javascript'>\n";
 		$html .= "var $tree;";
 		$html .= "egw_LAB.wait(function() {";
 		$html .= "$tree = new"." dhtmlXTreeObject('$tree','100%','100%',0);\n";
-		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
+		$html .= "$tree.parentObject.style.overflow='auto';\n"; // dhtmlXTree constructor has hidden hardcoded
 		if (Translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";
 		$html .= "$tree.setImagePath('$folderImageDir/dhtmlxtree/');\n";
 
-		if($_onCheckHandler)
+		if ($_onCheckHandler)
 		{
 			$html .= "$tree.enableCheckBoxes(1);\n";
 			$html .= "$tree.setOnCheckHandler('$_onCheckHandler');\n";
@@ -1174,7 +1174,7 @@ 
 		if ($autoLoading)
 		{
 			$autoLoading = is_array($autoLoading) ?
-				Framework::link('/index.php',$autoLoading) : Framework::link($autoLoading);
+				Framework::link('/index.php', $autoLoading) : Framework::link($autoLoading);
 			$html .= "$tree.setXMLAutoLoading('$autoLoading');\n";
 			if ($dataMode != 'XML') $html .= "$tree.setDataMode('$dataMode');\n";
 
@@ -1215,7 +1215,7 @@ 
 		}
 		if (is_string($_folders))
 		{
-			switch($dataMode)
+			switch ($dataMode)
 			{
 				case 'JSON':
 					$html .= "$tree.loadJSONObject($_folders);\n"; break;
@@ -1226,10 +1226,10 @@ 
 		else
 		{
 			// evtl. remove leading delimiter
-			if ($_selected[0] == $delimiter) $_selected = substr($_selected,1);
+			if ($_selected[0] == $delimiter) $_selected = substr($_selected, 1);
 
 			$n = 0;
-			foreach($_folders as $path => $data)
+			foreach ($_folders as $path => $data)
 			{
 				if (!is_array($data))
 				{
@@ -1241,10 +1241,10 @@ 
 				if ($_leafImage)
 				{
 					$image1 = $image2 = $image3 = "'".$_leafImage."'";
-					if (($next_item = array_slice($_folders, $n+1, 1, true)))
+					if (($next_item = array_slice($_folders, $n + 1, 1, true)))
 					{
 						list($next_path) = each($next_item);
-						if (substr($next_path,0,strlen($path)+1) == $path.'/')
+						if (substr($next_path, 0, strlen($path) + 1) == $path.'/')
 						{
 							$image1 = $image2 = $image3 = '0';
 						}
@@ -1255,22 +1255,22 @@ 
 					$image1 = $image2 = $image3 = "'".$data['image']."'";
 				}
 				// evtl. remove leading delimiter
-				if ($path[0] == $delimiter) $path = substr($path,1);
-				$folderParts = explode($delimiter,$path);
+				if ($path[0] == $delimiter) $path = substr($path, 1);
+				$folderParts = explode($delimiter, $path);
 
 				//get rightmost folderpart
 				$label = array_pop($folderParts);
 				if (isset($data['label'])) $label = $data['label'];
 
 				// the rest of the array is the name of the parent
-				$parentName = implode((array)$folderParts,$delimiter);
-				if(empty($parentName)) $parentName = $top;
+				$parentName = implode((array)$folderParts, $delimiter);
+				if (empty($parentName)) $parentName = $top;
 
 				$entryOptions = !isset($data['child']) || $data['child'] ? 'CHILD' : '';
 				if ($_onCheckHandler && $_selected)	// check selected items on multi selection
 				{
-					if (!is_array($_selected)) $_selected = explode(',',$_selected);
-					if (array_search("$path",$_selected)!==false) $entryOptions .= ',CHECKED';
+					if (!is_array($_selected)) $_selected = explode(',', $_selected);
+					if (array_search("$path", $_selected) !== false) $entryOptions .= ',CHECKED';
 					//echo "<p>path=$path, _selected=".print_r($_selected,true).": $entryOptions</p>\n";
 				}
 				// highlight current item
@@ -1290,7 +1290,7 @@ 
 		$html .= "$tree.closeAllItems(0);\n";
 		if ($_selected)
 		{
-			foreach(is_array($_selected)?$_selected:array($_selected) as $path)
+			foreach (is_array($_selected) ? $_selected : array($_selected) as $path)
 			{
 				$html .= "$tree.openItem('".addslashes($path)."');\n";
 			}
@@ -1315,7 +1315,7 @@ 
 	 *		or to restrict the attribute's values
 	 * @param boolean $_force =null - force the config passed to be used without merging to the default
 	 */
-	static function purify($html,$config=null,$spec=array(),$_force=false)
+	static function purify($html, $config = null, $spec = array(), $_force = false)
 	{
 		return Html\HtmLawed::purify($html, $config, $spec, $_force);
 	}

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

Spacing +38 added lines, -39 removed lines

@@ -75,7 +75,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;
 
@@ -95,7 +95,7 @@ 
 		if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']);
 
 		// return our default "moono" first
-		return isset($skins['moono']) ? array('moono' => $skins['moono'])+$skins : $skins;
+		return isset($skins['moono']) ? array('moono' => $skins['moono']) + $skins : $skins;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 * @param string &$unit =null on return just unit
 	 * @return string font-size including unit
 	 */
-	public static function font_size_from_prefs(array $prefs=null, &$size=null, &$unit=null)
+	public static function font_size_from_prefs(array $prefs = null, &$size = null, &$unit = null)
 	{
 		if (is_null($prefs)) $prefs = $GLOBALS['egw_info']['user']['preferences'];
 
@@ -117,7 +117,7 @@ 
 			$unit = 'px';
 			$size = (string)(int)$size;
 		}
-		return $size.($size?$unit:'');
+		return $size.($size ? $unit : '');
 	}
 
 	/**
@@ -131,7 +131,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);
 	}
 
@@ -236,7 +236,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;
@@ -277,8 +277,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;
@@ -291,7 +290,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.';';
 		}
@@ -348,48 +347,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;
@@ -397,13 +396,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;
@@ -415,11 +414,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'));
 		}
 	}
 
@@ -432,7 +431,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;
 
@@ -442,7 +441,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;
 	}
 
@@ -451,7 +450,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))
 		{
@@ -459,7 +458,7 @@ 
 			{
 				if (!empty($config['extraPlugins']) && $config['extraPlugins'] !== '')
 				{
-					$config['extraPlugins'] .= ',' . $plugin;
+					$config['extraPlugins'] .= ','.$plugin;
 				}
 				else
 				{

api/src/Html/HtmLawed.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +78 added lines, -78 removed lines

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

Braces +146 added lines, -38 removed lines

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