EGroupware / egroupware

api/src/Etemplate/Widget/Vfs.php

Doc Comments +1 added lines

@@ -230,6 +230,7 @@
 	* If the entry is not yet created, the file information is stored into the widget's value.
 	* When the form is submitted, the information for all files uploaded is available in the returned
 	* $content array and the application should deal with the file.
+	* @return string
 	*/
 	public static function store_file($path, $file)
 	{

Indentation +7 added lines, -7 removed lines

@@ -224,13 +224,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, $file)
 	{
 		$name = $_REQUEST['widget_id'];

Braces +40 added lines, -10 removed lines

@@ -27,7 +27,10 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -64,9 +67,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = Api\Link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
@@ -194,7 +203,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -218,7 +230,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -245,10 +260,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
+			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else    // multiple upload with dir given (trailing slash)
 		{
@@ -294,7 +312,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -305,7 +326,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -317,14 +341,20 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
 		{
 			$path = Api\Link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 }

Spacing +40 added lines, -41 removed lines

@@ -25,9 +25,9 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 	}
 
 	/**
@@ -36,10 +36,10 @@ 
 	 */
 	public function beforeSendToClient($cname, $expand = array())
 	{
-		if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
+		if ($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
-			if($this->attrs['path'])
+			if ($this->attrs['path'])
 			{
 				$path = $this->attrs['path'];
 			}
@@ -50,26 +50,26 @@ 
 
 			$this->setElementAttribute($form_name, 'path', $path);
 			// ID maps to path - check there for any existing files
-			list($app,$id,$relpath) = explode(':',$path,3);
-			if($app && $id)
+			list($app, $id, $relpath) = explode(':', $path, 3);
+			if ($app && $id)
 			{
-				if(!is_numeric($id))
+				if (!is_numeric($id))
 				{
-					$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-					if($_id != $id)
+					$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+					if ($_id != $id)
 					{
 						$id = $_id;
 						$form_name = "$app:$id:$relpath";
 					}
 				}
-				$value =& self::get_array(self::$request->content, $form_name, true);
-				$path = Api\Link::vfs_path($app,$id,'',true);
+				$value = & self::get_array(self::$request->content, $form_name, true);
+				$path = Api\Link::vfs_path($app, $id, '', true);
 				if (!empty($relpath)) $path .= '/'.$relpath;
 
 				if (true) $value = array();
 
 				// Single file, already existing
-				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
+				if (substr($path, -1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
 				{
 					$file = Api\Vfs::stat($path);
 					$file['path'] = $path;
@@ -78,14 +78,14 @@ 
 					$value = array($file);
 				}
 				// Single file, missing extension in path
-				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath,-4,1) !== '.')
+				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath, -4, 1) !== '.')
 				{
-					$find = Api\Vfs::find(substr($path,0, - strlen($relpath)), array(
+					$find = Api\Vfs::find(substr($path, 0, - strlen($relpath)), array(
 						'type' => 'f',
 						'maxdepth' => 1,
-						'name' => $relpath . '*'
+						'name' => $relpath.'*'
 					));
-					foreach($find as $file)
+					foreach ($find as $file)
 					{
 						$file_info = Api\Vfs::stat($file);
 						$file_info['path'] = $file;
@@ -97,7 +97,7 @@ 
 				else if (substr($path, -1) == '/' && Api\Vfs::is_dir($path))
 				{
 					$scan = Api\Vfs::scandir($path);
-					foreach($scan as $file)
+					foreach ($scan as $file)
 					{
 						$file_info = Api\Vfs::stat("$path$file");
 						$file_info['path'] = "$path$file";
@@ -113,7 +113,7 @@ 
 	public static function ajax_upload()
 	{
 		parent::ajax_upload();
-		foreach($_FILES as $file)
+		foreach ($_FILES as $file)
 		{
 			self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file);
 		}
@@ -126,7 +126,7 @@ 
 	{
 		$request_id = urldecode($_REQUEST['request_id']);
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id))
+		if (!self::$request = Etemplate\Request::read($request_id))
 		{
 			$error = lang("Could not read session");
 		}
@@ -143,8 +143,7 @@ 
 		else
 		{
 			$data = self::$request->content[$widget_id];
-			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data :
-				self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
+			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data : self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
 
 			// store temp. vfs-path like links to be able to move it to correct location after entry is stored
 			if (!$data['to_id'] || is_array($data['to_id']))
@@ -187,10 +186,10 @@ 
 	static function fix_html_dragins($app, $id, array $links, &$html)
 	{
 		$replace = $remove_dir = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$matches = null;
-			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX, '|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
 			{
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
@@ -202,7 +201,7 @@ 
 		{
 			$html = strtr($old = $html, $replace);
 			// remove all dirs
-			foreach($remove_dir as $dir)
+			foreach ($remove_dir as $dir)
 			{
 				Api\Vfs::remove($dir);
 			}
@@ -217,7 +216,7 @@ 
 	 * @param string $postfix =null default random id
 	 * @return string vfs path
 	 */
-	static function get_temp_dir($app, $postfix=null)
+	static function get_temp_dir($app, $postfix = null)
 	{
 		if (!isset($postfix)) $postfix = md5(time().session_id());
 
@@ -237,15 +236,15 @@ 
 		$name = $_REQUEST['widget_id'];
 
 		// Find real path
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
 			$path = self::get_vfs_path($path);
 		}
 		$filename = $file['name'];
-		if (substr($path,-1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
@@ -257,17 +256,17 @@ 
 		}
 		if (!($dir = Api\Vfs::dirname($path)))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!', "dirname('$path') === false"));
+			self::set_validation_error($name, lang('Error create parent directory %1!', "dirname('$path') === false"));
 			return false;
 		}
-		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!',Api\Vfs::decodePath($dir)));
+			self::set_validation_error($name, lang('Error create parent directory %1!', Api\Vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($file['tmp_name'],Api\Vfs::PREFIX.$path))
+		if (!copy($file['tmp_name'], Api\Vfs::PREFIX.$path))
 		{
-			self::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			self::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
 
@@ -286,7 +285,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		// do not validate, as it would overwrite preserved values with null!
 		if (in_array($this->type, array('vfs-size', 'vfs-uid', 'vfs-gid', 'vfs', 'vfs-mime')))
@@ -295,12 +294,12 @@ 
 		}
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = $value_in = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if (!is_array($value)) $value = array();
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -319,16 +318,16 @@ 
 	 */
 	public static function get_vfs_path($path)
 	{
-		list($app,$id,$relpath) = explode(':',$path,3);
+		list($app, $id, $relpath) = explode(':', $path, 3);
 		if (empty($id) || $id == 'undefined')
 		{
-			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
+			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir($app);
 			$path = $tmppath[$app];
 		}
 		else
 		{
-			$path = Api\Link::vfs_path($app,$id,'',true);
+			$path = Api\Link::vfs_path($app, $id, '', true);
 		}
 		if (!empty($relpath)) $path .= '/'.$relpath;
 		return $path;

api/src/Exception/NoPermission/Admin.php

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
  */
 class Admin extends App
 {
+	/**
+	 * @param string $msg
+	 */
 	function __construct($msg=null,$code=102)
 	{
 		if (is_null($msg)) $msg = 'admin';

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
  */
 class Admin extends App
 {
-	function __construct($msg=null,$code=102)
+	function __construct($msg = null, $code = 102)
 	{
 		if (is_null($msg)) $msg = 'admin';
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }

Braces +4 added lines, -1 removed lines

@@ -21,7 +21,10 @@
 {
 	function __construct($msg=null,$code=102)
 	{
-		if (is_null($msg)) $msg = 'admin';
+		if (is_null($msg))
+		{
+			$msg = 'admin';
+		}
 
 		parent::__construct($msg,$code);
 	}

api/src/Framework/Ajax.php

Doc Comments -5 removed lines

@@ -356,11 +356,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 +18 added lines, -18 removed lines

@@ -337,16 +337,16 @@ 
 	}
 
 	/**
-	* 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 Api\Html, or null of no tooltip
-	* @todo implement in a reasonable way for jdots
-	* @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 Api\Html, or null of no tooltip
+	 * @todo implement in a reasonable way for jdots
+	 * @return void
+	 */
 	function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null)
 	{
 		unset($id,$icon_src,$iconlink,$blink,$tooltip);	// not used
@@ -354,14 +354,14 @@ 
 	}
 
 	/**
-	* 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)
 	{
 		switch($app_data['name'])

Braces +56 added lines, -14 removed lines

@@ -104,7 +104,9 @@ 
 
 		//Width may not be smaller than MIN_SIDEBAR_WIDTH
 		if ($width < self::MIN_SIDEBAR_WIDTH)
-			$width = self::MIN_SIDEBAR_WIDTH;
+		{
+					$width = self::MIN_SIDEBAR_WIDTH;
+		}
 
 		return $width;
 	}
@@ -156,7 +158,10 @@ 
 	 */
 	static function link($url = '', $extravars = '', $link_app=null)
 	{
-		if (is_null($link_app)) $link_app = self::$link_app;
+		if (is_null($link_app))
+		{
+			$link_app = self::$link_app;
+		}
 		$link = parent::link($url, $extravars);
 
 		// $link_app === true --> detect application, otherwise use given application
@@ -185,7 +190,10 @@ 
 		$srcs = array();
 		foreach(Api\Hooks::process('csp-frame-src') as $src)
 		{
-			if ($src) $srcs = array_merge($srcs, $src);
+			if ($src)
+			{
+				$srcs = array_merge($srcs, $src);
+			}
 		}
 		return $srcs;
 	}
@@ -199,7 +207,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;
 
 		$this->send_headers();
@@ -266,7 +277,10 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script']))
+				{
+					$GLOBALS['egw_info']['flags']['java_script']='';
+				}
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
@@ -539,7 +553,10 @@ 
 	 */
 	public function sidebox($appname,$menu_title,$file,$type=null)
 	{
-		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		if (!isset($file['menuOpened']))
+		{
+			$file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
+		}
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
 		$this->sidebox_menu_opened = false;
 
@@ -680,7 +697,10 @@ 
 		foreach($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
-			if ($data['active']) $active = $data['appName'];
+			if ($data['active'])
+			{
+				$active = $data['appName'];
+			}
 		}
 		// send app a notification, that it's tab got closed
 		// used eg. in phpFreeChat to leave the chat
@@ -807,10 +827,22 @@ 
 		}
 
 		unset($apps['logout']);	// never display it
-		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
-		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
-		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
-		if (isset($apps['home'])) $apps['home']['noNavbar'] = true;
+		if (isset($apps['about']))
+		{
+			$apps['about']['noNavbar'] = true;
+		}
+		if (isset($apps['preferences']))
+		{
+			$apps['preferences']['noNavbar'] = true;
+		}
+		if (isset($apps['manual']))
+		{
+			$apps['manual']['noNavbar'] = true;
+		}
+		if (isset($apps['home']))
+		{
+			$apps['home']['noNavbar'] = true;
+		}
 
 		// no need for website icon, if we have sitemgr
 		if (isset($apps['sitemgr']) && isset($apps['sitemgr-link']))
@@ -872,7 +904,10 @@ 
 		else
 		{
 			$active_tab = $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'];
-			if (!$active_tab) $active_tab = $default_app;
+			if (!$active_tab)
+			{
+				$active_tab = $default_app;
+			}
 		}
 
 		//self::app_from_url might return an application the user has no rights
@@ -915,9 +950,12 @@ 
 		// Restore Tabs
 		foreach($open_tabs as $n => $app)
 		{
-			if (isset($apps[$app]))		// user might no longer have app rights
+			if (isset($apps[$app]))
+			{
+				// user might no longer have app rights
 			{
 				$apps[$app]['opened'] = $n;
+			}
 				if ($app == $active_tab)
 				{
 					$apps[$app]['active'] = true;
@@ -943,7 +981,11 @@ 
 	function footer($no_framework=true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done)
+		{
+			return;
+		}
+		// prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])

Spacing +79 added lines, -79 removed lines

@@ -57,11 +57,11 @@ 
 	 *
 	 * @param string $template = '' name of the template
 	 */
-	function __construct($template=self::APP)
+	function __construct($template = self::APP)
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 
-		$this->template_dir = '/'.$template;		// we are packaged as an application
+		$this->template_dir = '/'.$template; // we are packaged as an application
 	}
 
 	/**
@@ -129,16 +129,16 @@ 
 	public static function app_from_url($url)
 	{
 		$matches = null;
-		if (preg_match('/menuaction=([a-z0-9_-]+)\./i',$url,$matches))
+		if (preg_match('/menuaction=([a-z0-9_-]+)\./i', $url, $matches))
 		{
 			return $matches[1];
 		}
 		if ($GLOBALS['egw_info']['server']['webserver_url'] &&
-			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)))
+			($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)))
 		{
-			list(,$url) = explode($webserver_path, parse_url($url,PHP_URL_PATH),2);
+			list(,$url) = explode($webserver_path, parse_url($url, PHP_URL_PATH), 2);
 		}
-		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/',$url,$matches))
+		if (preg_match('/\/([^\/]+)\/([^\/]+\.php)?(\?|\/|$)/', $url, $matches))
 		{
 			return $matches[1];
 		}
@@ -154,7 +154,7 @@ 
 	 * @param string $link_app = null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url = '', $extravars = '', $link_app=null)
+	static function link($url = '', $extravars = '', $link_app = null)
 	{
 		if (is_null($link_app)) $link_app = self::$link_app;
 		$link = parent::link($url, $extravars);
@@ -165,7 +165,7 @@ 
 			// Link gets handled in JS, so quotes need slashes as well as url-encoded
 			// encoded ampersands in get parameters (%26) need to be encoded twise,
 			// so they are still encoded when assigned to window.location
-			$link_with_slashes = str_replace(array('%27','%26'), array('\%27','%2526'), $link);
+			$link_with_slashes = str_replace(array('%27', '%26'), array('\%27', '%2526'), $link);
 
 			//$link = "javascript:window.egw_link_handler?egw_link_handler('$link','$link_app'):parent.egw_link_handler('$link','$link_app');";
 			$link = "javascript:egw_link_handler('$link_with_slashes','$link_app')";
@@ -183,7 +183,7 @@ 
 	protected function _get_csp_frame_src()
 	{
 		$srcs = array();
-		foreach(Api\Hooks::process('csp-frame-src') as $src)
+		foreach (Api\Hooks::process('csp-frame-src') as $src)
 		{
 			if ($src) $srcs = array_merge($srcs, $src);
 		}
@@ -196,7 +196,7 @@ 
 	 * @param array $extra = array() extra attributes passed as data-attribute to egw.js
 	 * @return string with Api\Html
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// make sure header is output only once
 		if (self::$header_done) return '';
@@ -221,8 +221,8 @@ 
 		{
 			$this->tpl->set_file(array('_head' => 'head.tpl'));
 		}
-		$this->tpl->set_block('_head','head');
-		$this->tpl->set_block('_head','framework');
+		$this->tpl->set_block('_head', 'head');
+		$this->tpl->set_block('_head', 'framework');
 
 		// should we draw the framework, or just a header
 		$do_framework = isset($_GET['cd']) && $_GET['cd'] === 'yes';
@@ -247,7 +247,7 @@ 
 			{
 				self::includeJS('.', 'fw_'.static::APP, static::JS_INCLUDE_APP);
 			}
-			Api\Cache::unsetSession(__CLASS__,'sidebox_md5');	// sideboxes need to be send again
+			Api\Cache::unsetSession(__CLASS__, 'sidebox_md5'); // sideboxes need to be send again
 
 			$extra['navbar-apps'] = $this->get_navbar_apps($_SERVER['REQUEST_URI']);
 		}
@@ -256,7 +256,7 @@ 
 		// - if not we need to check if we have an opener (are a popup window)
 		// - as popups can open further popups, we need to decend all the way down until we find a framework
 		// - only if we cant find a framework in all openers, we redirect to create a new framework
-		if(!$do_framework)
+		if (!$do_framework)
 		{
 			// fetch sidebox from application and set it in extra data, if we are no popup
 			if (!$GLOBALS['egw_info']['flags']['nonavbar'])
@@ -266,12 +266,12 @@ 
 			// for remote manual never check/create framework
 			if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('manual', 'login', 'logout', 'sitemgr')))
 			{
-				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script']='';
+				if (empty($GLOBALS['egw_info']['flags']['java_script'])) $GLOBALS['egw_info']['flags']['java_script'] = '';
 				$extra['check-framework'] = $_GET['cd'] !== 'no';
 			}
 		}
 		$this->tpl->set_var($this->_get_header($extra));
-		$content = $this->tpl->fp('out','head').$content;
+		$content = $this->tpl->fp('out', 'head').$content;
 
 		if (!$do_framework)
 		{
@@ -280,10 +280,10 @@ 
 
 		// topmenu
 		$vars = $this->_get_navbar($apps = $this->_get_navbar_apps());
-		$this->tpl->set_var($this->topmenu($vars,$apps));
+		$this->tpl->set_var($this->topmenu($vars, $apps));
 
 		// hook after_navbar (eg. notifications)
-		$this->tpl->set_var('hook_after_navbar',$this->_get_after_navbar());
+		$this->tpl->set_var('hook_after_navbar', $this->_get_after_navbar());
 
 		//Global sidebar width
 		$this->tpl->set_var('sidebox_width', self::get_global_sidebar_width());
@@ -300,7 +300,7 @@ 
 
 		// add framework div's
 		$this->tpl->set_var($this->_get_footer());
-		$content .= $this->tpl->fp('out','framework');
+		$content .= $this->tpl->fp('out', 'framework');
 		$content .= self::footer(false);
 
 		echo $content;
@@ -319,14 +319,14 @@ 
 	 * @param array $apps
 	 * @return array
 	 */
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
 		$this->topmenu_items = $this->topmenu_info_items = array();
 
-		parent::topmenu($vars,$apps);
-		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>",$this->topmenu_items)."</li>\n</ul>";
+		parent::topmenu($vars, $apps);
+		$vars['topmenu_items'] = "<ul>\n<li>".implode("</li>\n<li>", $this->topmenu_items)."</li>\n</ul>";
 		$vars['topmenu_info_items'] = '';
-		foreach($this->topmenu_info_items as $id => $item)
+		foreach ($this->topmenu_info_items as $id => $item)
 		{
 			$vars['topmenu_info_items'] .= '<div class="topmenu_info_item"'.
 				(is_numeric($id) ? '' : ' id="topmenu_info_'.$id.'"').'>'.$item."</div>\n";
@@ -347,9 +347,9 @@ 
 	* @todo implement in a reasonable way for jdots
 	* @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);	// not used
+		unset($id, $icon_src, $iconlink, $blink, $tooltip); // not used
 		// not yet implemented, only used in admin/inc/hook_topmenu_info.inc.php to notify about pending updates
 	}
 
@@ -362,9 +362,9 @@ 
 	* @access protected
 	* @return void
 	*/
-	function _add_topmenu_item(array $app_data,$alt_label=null)
+	function _add_topmenu_item(array $app_data, $alt_label = null)
 	{
-		switch($app_data['name'])
+		switch ($app_data['name'])
 		{
 			case 'logout':
 				if (Api\Header\UserAgent::mobile() || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'mobile')
@@ -373,7 +373,7 @@ 
 				}
 				else
 				{
-					return;	// no need for logout in topmenu on jdots
+					return; // no need for logout in topmenu on jdots
 				}
 				break;
 
@@ -382,7 +382,7 @@ 
 				break;
 
 			default:
-				if (strpos($app_data['url'],'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
+				if (strpos($app_data['url'], 'logout.php') === false && substr($app_data['url'], 0, 11) != 'javascript:')
 				{
 					$app_data['url'] = "javascript:egw_link_handler('".$app_data['url']."','".
 						(isset($GLOBALS['egw_info']['user']['apps'][$app_data['name']]) ?
@@ -390,8 +390,8 @@ 
 				}
 		}
 		$id = $app_data['id'] ? $app_data['id'] : ($app_data['name'] ? $app_data['name'] : $app_data['title']);
-		$title =  htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
-		$this->topmenu_items[] = '<a id="topmenu_' . $id . '" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
+		$title = htmlspecialchars($alt_label ? $alt_label : $app_data['title']);
+		$this->topmenu_items[] = '<a id="topmenu_'.$id.'" href="'.htmlspecialchars($app_data['url']).'" title="'.$app_data['title'].'">'.$title.'</a>';
 	}
 
 	/**
@@ -402,11 +402,11 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	function _add_topmenu_info_item($content, $id=null)
+	function _add_topmenu_info_item($content, $id = null)
 	{
-		if(strpos($content,'menuaction=admin.admin_accesslog.sessions') !== false)
+		if (strpos($content, 'menuaction=admin.admin_accesslog.sessions') !== false)
 		{
-			$content = preg_replace('/href="([^"]+)"/',"href=\"javascript:egw_link_handler('\\1','admin')\"",$content);
+			$content = preg_replace('/href="([^"]+)"/', "href=\"javascript:egw_link_handler('\\1','admin')\"", $content);
 		}
 		if ($id)
 		{
@@ -425,10 +425,10 @@ 
 	 */
 	static function ajax_tz_selection($tz)
 	{
-		Api\DateTime::setUserPrefs($tz);	// throws exception, if tz is invalid
+		Api\DateTime::setUserPrefs($tz); // throws exception, if tz is invalid
 
 		$GLOBALS['egw']->preferences->read_repository();
-		$GLOBALS['egw']->preferences->add('common','tz',$tz);
+		$GLOBALS['egw']->preferences->add('common', 'tz', $tz);
 		$GLOBALS['egw']->preferences->save_repository();
 	}
 
@@ -480,13 +480,13 @@ 
 		// only send admin sidebox, for admin index url (when clicked on admin),
 		// not for other admin pages, called eg. from sidebox menu of other apps
 		// --> that way we always stay in the app, and NOT open admin sidebox for an app tab!!!
-		if ($app == 'admin' && substr($_SERVER['PHP_SELF'],-16) != '/admin/index.php' &&
+		if ($app == 'admin' && substr($_SERVER['PHP_SELF'], -16) != '/admin/index.php' &&
 			$_GET['menuaction'] != 'admin.admin_ui.index')
 		{
 			//error_log(__METHOD__."() app=$app, menuaction=$_GET[menuaction], PHP_SELF=$_SERVER[PHP_SELF] --> sidebox request ignored");
 			return;
 		}
-		$md5_session =& Api\Cache::getSession(__CLASS__,'sidebox_md5');
+		$md5_session = & Api\Cache::getSession(__CLASS__, 'sidebox_md5');
 
 		//Set the sidebox content
 		$sidebox = $this->get_sidebox($app);
@@ -495,7 +495,7 @@ 
 		if ($md5_session[$app] !== $md5)
 		{
 			//error_log(__METHOD__."() header changed md5_session[$app]!=='$md5' --> setting it on self::\$extra[setSidebox]");
-			$md5_session[$app] = $md5;	// update md5 in session
+			$md5_session[$app] = $md5; // update md5 in session
 			self::$extra['setSidebox'] = array($app, $sidebox, $md5);
 		}
 		//else error_log(__METHOD__."() md5_session[$app]==='$md5' --> nothing to do");
@@ -509,9 +509,9 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true ignored by jdots, we only care for cd=yes GET param
 	 * @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);	// not used
+		unset($consider_navbar_not_yet_called_as_true); // not used
 		return isset($_GET['cd']) && $_GET['cd'] === 'yes';
 	}
 
@@ -537,7 +537,7 @@ 
 	 * @param array $file
 	 * @param string $type = null 'admin', 'preferences', 'favorites', ...
 	 */
-	public function sidebox($appname,$menu_title,$file,$type=null)
+	public function sidebox($appname, $menu_title, $file, $type = null)
 	{
 		if (!isset($file['menuOpened'])) $file['menuOpened'] = (boolean)$this->sidebox_menu_opened;
 		//error_log(__METHOD__."('$appname', '$menu_title', file[menuOpened]=$file[menuOpened], ...) this->sidebox_menu_opened=$this->sidebox_menu_opened");
@@ -546,11 +546,11 @@ 
 		// fix app admin menus to use admin.admin_ui.index loader
 		if (($type == 'admin' || $menu_title == lang('Admin')) && $appname != 'admin')
 		{
-			foreach($file as &$link)
+			foreach ($file as &$link)
 			{
 				preg_match('/ajax=(true|false)/', $link, $ajax);
 				$link = preg_replace("/^(javascript:egw_link_handler\(')(.*)menuaction=([^&]+)(.*)(','[^']+'\))$/",
-					'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax=' . ($ajax[1] ? $ajax[1] : 'true') .'\',\'admin\')', $file_was=$link);
+					'$1$2menuaction=admin.admin_ui.index&load=$3$4&ajax='.($ajax[1] ? $ajax[1] : 'true').'\',\'admin\')', $file_was = $link);
 			}
 
 		}
@@ -587,15 +587,15 @@ 
 			self::$link_app = $appname;
 			// allow other apps to hook into sidebox menu of an app, hook-name: sidebox_$appname
 			$this->sidebox_menu_opened = true;
-			Api\Hooks::process('sidebox_'.$appname,array($appname),true);	// true = call independent of app-permissions
+			Api\Hooks::process('sidebox_'.$appname, array($appname), true); // true = call independent of app-permissions
 
 			// calling the old hook
 			$this->sidebox_menu_opened = true;
-			Api\Hooks::single('sidebox_menu',$appname);
+			Api\Hooks::single('sidebox_menu', $appname);
 			self::$link_app = null;
 
 			// allow other apps to hook into sidebox menu of every app: sidebox_all
-			Api\Hooks::process('sidebox_all',array($GLOBALS['egw_info']['flags']['currentapp']),true);
+			Api\Hooks::process('sidebox_all', array($GLOBALS['egw_info']['flags']['currentapp']), true);
 		}
 		//If there still is no sidebox content, return null here
 		if (!isset($this->sideboxes[$appname]))
@@ -605,17 +605,17 @@ 
 
 		$data = array();
 		$sendToBottom = array();
-		foreach($this->sideboxes[$appname] as $menu_name => &$file)
+		foreach ($this->sideboxes[$appname] as $menu_name => &$file)
 		{
 			$current_menu = array(
-				'menu_name' => md5($menu_name),	// can contain Api\Html tags and javascript!
+				'menu_name' => md5($menu_name), // can contain Api\Html tags and javascript!
 				'title' => $menu_name,
 				'entries' => array(),
 				'opened' => (boolean)$file['menuOpened'],
 			);
-			foreach($file as $item_text => $item_link)
+			foreach ($file as $item_text => $item_link)
 			{
-				if ($item_text === 'menuOpened' || $item_text === 'sendToBottom' ||// flag, not menu entry
+				if ($item_text === 'menuOpened' || $item_text === 'sendToBottom' || // flag, not menu entry
 					$item_text === '_NewLine_' || $item_link === '_NewLine_')
 				{
 					continue;
@@ -626,14 +626,14 @@ 
 				}
 
 				$var = array();
-				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images/bullet.png';
+				$var['icon_or_star'] = $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images/bullet.png';
 				$var['target'] = '';
-				if(is_array($item_link))
+				if (is_array($item_link))
 				{
-					if(isset($item_link['icon']))
+					if (isset($item_link['icon']))
 					{
 						$app = isset($item_link['app']) ? $item_link['app'] : $appname;
-						$var['icon_or_star'] = $item_link['icon'] ? Api\Image::find($app,$item_link['icon']) : False;
+						$var['icon_or_star'] = $item_link['icon'] ? Api\Image::find($app, $item_link['icon']) : False;
 					}
 					$var['lang_item'] = isset($item_link['no_lang']) && $item_link['no_lang'] ? $item_link['text'] : lang($item_link['text']);
 					$var['item_link'] = $item_link['link'];
@@ -677,7 +677,7 @@ 
 	public static function ajax_tab_changed_state($tablist)
 	{
 		$tabs = array();
-		foreach($tablist as $data)
+		foreach ($tablist as $data)
 		{
 			$tabs[] = $data['appName'];
 			if ($data['active']) $active = $data['appName'];
@@ -686,7 +686,7 @@ 
 		// used eg. in phpFreeChat to leave the chat
 		if (($old_tabs = Api\Cache::getSession(__CLASS__, 'open_tabs')))
 		{
-			foreach(array_diff(explode(',',$old_tabs),$tabs) as $app)
+			foreach (array_diff(explode(',', $old_tabs), $tabs) as $app)
 			{
 				//error_log("Tab '$app' closed, old_tabs=$old_tabs");
 				Api\Hooks::single(array(
@@ -695,7 +695,7 @@ 
 				), $app);
 			}
 		}
-		$open = implode(',',$tabs);
+		$open = implode(',', $tabs);
 
 		if ($open != $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'] ||
 			$active != $GLOBALS['egw_info']['user']['preferences']['common']['active_tab'])
@@ -765,7 +765,7 @@ 
 		$i = 0;
 
 		//Parse the "$apps" array for valid content (security)
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			//Check whether the app really exists and add it to the $app_arr var
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -796,17 +796,17 @@ 
 	 */
 	public function navbar_apps()
 	{
-		$apps = parent::_get_navbar_apps(Api\Image::svg_usable());	// use svg if usable in browser
+		$apps = parent::_get_navbar_apps(Api\Image::svg_usable()); // use svg if usable in browser
 
 		//Add its sidebox width to each app
 		foreach ($apps as $app => &$data)
 		{
 			$data['sideboxwidth'] = self::get_sidebar_width($app);
 			// overwrite icon with svg, if supported by browser
-			unset($data['icon_hover']);	// not used in jdots
+			unset($data['icon_hover']); // not used in jdots
 		}
 
-		unset($apps['logout']);	// never display it
+		unset($apps['logout']); // never display it
 		if (isset($apps['about'])) $apps['about']['noNavbar'] = true;
 		if (isset($apps['preferences'])) $apps['preferences']['noNavbar'] = true;
 		if (isset($apps['manual'])) $apps['manual']['noNavbar'] = true;
@@ -856,7 +856,7 @@ 
 		}
 
 		// check if user called a specific url --> open it as active tab
-		$last_direct_url =& Api\Cache::getSession(__CLASS__, 'last_direct_url');
+		$last_direct_url = & Api\Cache::getSession(__CLASS__, 'last_direct_url');
 		if ($last_direct_url)
 		{
 			$url = $last_direct_url;
@@ -866,7 +866,7 @@ 
 		{
 			// Coming in with a specific URL, save it and redirect to index.php
 			// so reloads work nicely, but strip cd=yes or we'll get the framework again
-			$last_direct_url = preg_replace('/[&?]cd=yes/','',$url);
+			$last_direct_url = preg_replace('/[&?]cd=yes/', '', $url);
 			Api\Framework::redirect_link('/index.php?cd=yes');
 		}
 		else
@@ -881,11 +881,11 @@ 
 		if ($active_tab && array_key_exists($active_tab, $apps))
 		{
 			// Do not remove cd=yes if it's an ajax=true app
-			if (strpos( $apps[$active_tab]['url'],'ajax=true') !== False)
+			if (strpos($apps[$active_tab]['url'], 'ajax=true') !== False)
 			{
-				$url = preg_replace('/[&?]cd=yes/','',$url);
+				$url = preg_replace('/[&?]cd=yes/', '', $url);
 			}
-			if($last_direct_url)
+			if ($last_direct_url)
 			{
 				$apps[$active_tab]['openOnce'] = $url;
 			}
@@ -897,8 +897,8 @@ 
 		{
 			$open_tabs = $GLOBALS['egw_info']['user']['preferences']['common']['open_tabs'];
 		}
-		$open_tabs = $open_tabs ? explode(',',$open_tabs) : array();
-		if ($active_tab && !in_array($active_tab,$open_tabs))
+		$open_tabs = $open_tabs ? explode(',', $open_tabs) : array();
+		if ($active_tab && !in_array($active_tab, $open_tabs))
 		{
 			$open_tabs[] = $active_tab;
 			$store_prefs = true;
@@ -906,14 +906,14 @@ 
 		if ($store_prefs)
 		{
 			$GLOBALS['egw']->preferences->read_repository();
-			$GLOBALS['egw']->preferences->add('common', 'open_tabs', implode(',',$open_tabs));
+			$GLOBALS['egw']->preferences->add('common', 'open_tabs', implode(',', $open_tabs));
 			$GLOBALS['egw']->preferences->add('common', 'active_tab', $active_tab);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 
 		//error_log(__METHOD__."('$url') url_tab='$url_tab', active_tab=$active_tab, open_tabs=".array2string($open_tabs));
 		// Restore Tabs
-		foreach($open_tabs as $n => $app)
+		foreach ($open_tabs as $n => $app)
 		{
 			if (isset($apps[$app]))		// user might no longer have app rights
 			{
@@ -940,10 +940,10 @@ 
 	 * @param boolean $no_framework = true
 	 * @return string
 	 */
-	function footer($no_framework=true)
+	function footer($no_framework = true)
 	{
 		//error_log(__METHOD__."($no_framework) footer_done=".array2string(self::$footer_done).' '.function_backtrace());
-		if (self::$footer_done) return;	// prevent (multiple) footers
+		if (self::$footer_done) return; // prevent (multiple) footers
 		self::$footer_done = true;
 
 		if (!isset($GLOBALS['egw_info']['flags']['nofooter']) || !$GLOBALS['egw_info']['flags']['nofooter'])
@@ -955,7 +955,7 @@ 
 			}
 		}
 		return $footer.
-			$GLOBALS['egw_info']['flags']['need_footer']."\n".	// eg. javascript, which need to be at the end of the page
+			$GLOBALS['egw_info']['flags']['need_footer']."\n".// eg. javascript, which need to be at the end of the page
 			"</body>\n</html>\n";
 	}
 
@@ -993,8 +993,8 @@ 
 		if ($parts['query'])
 		{
 			$_SERVER['REQUEST_URI'] = '?'.$parts['query'];
-			parse_str($parts['query'],$_GET);
-			$_REQUEST = $_GET;	// some apps use $_REQUEST to check $_GET or $_POST
+			parse_str($parts['query'], $_GET);
+			$_REQUEST = $_GET; // some apps use $_REQUEST to check $_GET or $_POST
 		}
 
 		if (!isset($_GET['menuaction']))
@@ -1004,7 +1004,7 @@ 
 		// set session action
 		$GLOBALS['egw']->session->set_action('Ajax: '.$_GET['menuaction']);
 
-		list($app,$class,$method) = explode('.',$_GET['menuaction']);
+		list($app, $class, $method) = explode('.', $_GET['menuaction']);
 
 		if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
 		{
@@ -1016,7 +1016,7 @@ 
 
 		$GLOBALS[$class] = $obj = CreateObject($app.'.'.$class);
 
-		if(!is_array($obj->public_functions) || !$obj->public_functions[$method])
+		if (!is_array($obj->public_functions) || !$obj->public_functions[$method])
 		{
 			throw new Api\Exception\NoPermission("Bad menuaction {$_GET['menuaction']}, not listed in public_functions!");
 		}

api/src/Framework/CssIncludes.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
 	 * Parse beginning of given CSS file for /*@import url("...") statements
 	 *
 	 * @param string $path EGroupware relative path eg. /phpgwapi/templates/default/some.css
-	 * @return array parsed pathes (EGroupware relative) including $path itself
+	 * @return string[] parsed pathes (EGroupware relative) including $path itself
 	 */
 	protected static function resolve_css_includes($path, &$pathes=array())
 	{

Braces +8 added lines, -2 removed lines

@@ -107,14 +107,20 @@
 		$max_modified = 0;
 		//no more dynamic minifying: $debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
-		if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
+		if ($base_path[0] != '/')
+		{
+			$base_path = parse_url($base_path, PHP_URL_PATH);
+		}
 		$css_files = '';
 		foreach(self::$files as $path)
 		{
 			foreach(self::resolve_css_includes($path) as $path)
 			{
 				list($file,$query) = explode('?',$path,2);
-				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified) $max_modified = $mod;
+				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified)
+				{
+					$max_modified = $mod;
+				}
 
 				// do NOT include app.css or categories.php, as it changes from app to app
 				//no more dynamic minifying: if ($debug_minify || substr($path, -8) == '/app.css' || substr($file,-14) == 'categories.php')

Spacing +15 added lines, -15 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param boolean $clear_includes =false true: clear all previous includes
 	 * @return boolean false: css file not found, true: file found
 	 */
-	public static function add($app, $name=null, $append=true, $clear_includes=false)
+	public static function add($app, $name = null, $append = true, $clear_includes = false)
 	{
 		if ($clear_includes)
 		{
@@ -43,7 +43,7 @@ 
 
 		if (!is_null($name))
 		{
-			foreach($GLOBALS['egw']->framework->template_dirs as $dir)
+			foreach ($GLOBALS['egw']->framework->template_dirs as $dir)
 			{
 				if (file_exists(EGW_SERVER_ROOT.($path = '/'.$app.'/templates/'.$dir.'/'.$name.'.css')))
 				{
@@ -55,12 +55,12 @@ 
 		{
 			$path = $app;
 		}
-		if (!file_exists(EGW_SERVER_ROOT.$path) && !file_exists(EGW_SERVER_ROOT . parse_url($path,PHP_URL_PATH)))
+		if (!file_exists(EGW_SERVER_ROOT.$path) && !file_exists(EGW_SERVER_ROOT.parse_url($path, PHP_URL_PATH)))
 		{
 			//error_log(__METHOD__."($app,$name) $path NOT found!");
 			return false;
 		}
-		if (!in_array($path,self::$files))
+		if (!in_array($path, self::$files))
 		{
 			if ($append)
 			{
@@ -79,16 +79,16 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get($resolve=false)
+	public static function get($resolve = false)
 	{
 		if (!$resolve)
 		{
 			return self::$files;
 		}
 		$files = array();
-		foreach(self::$files as $path)
+		foreach (self::$files as $path)
 		{
-			foreach(self::resolve_css_includes($path) as $path)
+			foreach (self::resolve_css_includes($path) as $path)
 			{
 				$files[] = $path;
 			}
@@ -109,11 +109,11 @@ 
 		$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
 		if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
 		$css_files = '';
-		foreach(self::$files as $path)
+		foreach (self::$files as $path)
 		{
-			foreach(self::resolve_css_includes($path) as $path)
+			foreach (self::resolve_css_includes($path) as $path)
 			{
-				list($file,$query) = explode('?',$path,2);
+				list($file, $query) = explode('?', $path, 2);
 				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified) $max_modified = $mod;
 
 				// do NOT include app.css or categories.php, as it changes from app to app
@@ -147,20 +147,20 @@ 
 	 * @param string $path EGroupware relative path eg. /phpgwapi/templates/default/some.css
 	 * @return array parsed pathes (EGroupware relative) including $path itself
 	 */
-	protected static function resolve_css_includes($path, &$pathes=array())
+	protected static function resolve_css_includes($path, &$pathes = array())
 	{
 		$matches = null;
 
-		list($file) = explode('?',$path,2);
-		if (($to_check = file_get_contents (EGW_SERVER_ROOT.$file, false, null, 0, 1024)) &&
+		list($file) = explode('?', $path, 2);
+		if (($to_check = file_get_contents(EGW_SERVER_ROOT.$file, false, null, 0, 1024)) &&
 			stripos($to_check, '/*@import') !== false && preg_match_all('|/\*@import url\("([^"]+)"|i', $to_check, $matches))
 		{
-			foreach($matches[1] as $import_path)
+			foreach ($matches[1] as $import_path)
 			{
 				if ($import_path[0] != '/')
 				{
 					$dir = dirname($path);
-					while(substr($import_path,0,3) == '../')
+					while (substr($import_path, 0, 3) == '../')
 					{
 						$dir = dirname($dir);
 						$import_path = substr($import_path, 3);

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

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;
 			}

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-_]/u','_',$name);
-			$result = $prefs->add($app,$pref_name,$filters,$type);
-			$pref = $prefs->save_repository(false,$type);
+			$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/u', '_', $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);

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;
 	}
 }

Braces +38 added lines, -10 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?)
@@ -139,7 +142,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);
 			}
@@ -167,7 +171,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
@@ -175,10 +182,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)
 		{
@@ -200,7 +213,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'");
+			}
 		}
 	}
 
@@ -215,7 +231,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);
 
@@ -228,7 +247,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;
 	}
 
@@ -247,10 +269,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;
 	}
 

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);
 		}
@@ -115,7 +115,7 @@ 
 			{
 				$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);
@@ -139,7 +139,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);
 			}
@@ -161,24 +161,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)
 		{
@@ -194,7 +194,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))
 		{
@@ -213,13 +213,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;
@@ -240,16 +240,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;
 	}
@@ -265,7 +265,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)
 	    {

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 +57 added lines, -14 removed lines

@@ -62,9 +62,16 @@ 
 		//echo "<p>".__METHOD__.'('.array2string($args).','.array2string($order).','.array2string($no_permission_check).")</p>\n";
 		$location = is_array($args) ? (isset($args['hook_location']) ? $args['hook_location'] : $args['location']) : $args;
 
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 		$hooks = self::$locations[$location];
-		if (!isset($hooks) || empty($hooks)) return array();	// not a single app implements that hook
+		if (!isset($hooks) || empty($hooks))
+		{
+			return array();
+		}
+		// not a single app implements that hook
 
 		$apps = array_keys($hooks);
 		if (!$no_permission_check)
@@ -99,9 +106,15 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($args).",'$appname','$no_permission_check','$try_unregistered')");
 
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
-		if (!is_array($args)) $args = array('location' => $args);
+		if (!is_array($args))
+		{
+			$args = array('location' => $args);
+		}
 		$location = isset($args['hook_location']) ? $args['hook_location'] : $args['location'];
 
 		if (!$appname)
@@ -135,7 +148,10 @@ 
 				// static method of an autoloadable class
 				if (isset($method) && class_exists($class))
 				{
-					if (is_callable($hook)) $ret[] = call_user_func($hook, $args);
+					if (is_callable($hook))
+					{
+						$ret[] = call_user_func($hook, $args);
+					}
 				}
 				// app.class.method or not autoloadable class
 				else
@@ -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 @@ 
 	 */
 	static public function disable($hook)
 	{
-		if (!isset(self::$locations)) self::read();
+		if (!isset(self::$locations))
+		{
+			self::read();
+		}
 
 		$ret = isset(self::$locations[$hook]);
 
@@ -228,7 +259,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()
 		{
@@ -243,11 +277,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)
@@ -275,7 +315,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

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

api/src/Html.php

Doc Comments +3 added lines, -5 removed lines

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

Indentation +29 added lines, -29 removed lines

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

Spacing +178 added lines, -178 removed lines

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

Braces +183 added lines, -47 removed lines

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