EGroupware / egroupware

api/src/Etemplate/Request.php

Braces +32 added lines, -8 removed lines

@@ -189,9 +189,12 @@ 
 				//error_log(__METHOD__."() size of request = ".bytes($id));
 			}
 		}
-		if (!$request)	// eT2 request/session expired
+		if (!$request)
+		{
+			// eT2 request/session expired
 		{
 			list($app) = explode('.', $_GET['menuaction']);
+		}
 			$global = false;
 			if(isset($GLOBALS['egw_info']['apps'][$app]))
 			{
@@ -275,7 +278,10 @@ 
 	 */
 	public function set_to_process($_form_name, $type, $data=array())
 	{
-		if (!$_form_name || !$type) return;
+		if (!$_form_name || !$type)
+		{
+			return;
+		}
 
 		//echo '<p>'.__METHOD__."($form_name,$type,".array2string($data).")</p>\n";
 		$data['type'] = $type;
@@ -298,7 +304,10 @@ 
 	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array=false)
 	{
 		//echo '<p>'.__METHOD__."($form_name,$attribute,$value,$add_to_array)</p>\n";
-		if (!$_form_name) return;
+		if (!$_form_name)
+		{
+			return;
+		}
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
 		$form_name = str_replace(array('\\\'','&quot;'), array('\'','"'), $_form_name);
@@ -393,7 +402,10 @@ 
 	 */
 	public function &__get($var)
 	{
-		if ($var == 'data_modified') return $this->data_modified;
+		if ($var == 'data_modified')
+		{
+			return $this->data_modified;
+		}
 
 		return $this->data[$var];
 	}
@@ -434,16 +446,25 @@ 
 		{
 			$len = strlen(is_array($val) ? serialize($val) : $val);
 			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
-			if ($percent < $min_share) continue;
+			if ($percent < $min_share)
+			{
+				continue;
+			}
 			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
-			if ($percent >= $dump_share) _debug_array($val);
+			if ($percent >= $dump_share)
+			{
+				_debug_array($val);
+			}
 			if (is_array($val) && $len > 2000)
 			{
 				foreach($val as $k => $v)
 				{
 					$l = strlen(is_array($v) ? serialize($v) : $v);
 					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
-					if ($p < $min_share) continue;
+					if ($p < $min_share)
+					{
+						continue;
+					}
 					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
 				}
 			}
@@ -484,7 +505,10 @@ 
 				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
 
 			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
-			if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+			if (bytes($key) > $key_size)
+			{
+				$key = cut_bytes($key,0,$key_size-1);
+			}
 
 			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
 			{

Spacing +25 added lines, -26 removed lines

@@ -91,19 +91,19 @@ 
 	 *
 	 * @var array
 	 */
-	protected $data=array();
+	protected $data = array();
 	/**
 	 * Flag if data has been modified and therefor need to be stored again in the session
 	 *
 	 * @var boolean
 	 */
-	protected $data_modified=false;
+	protected $data_modified = false;
 	/**
 	 * Flag that stored data should be removed by destructor, if not modified.
 	 *
 	 * @var boolean
 	 */
-	protected $remove_if_not_modified=false;
+	protected $remove_if_not_modified = false;
 	/**
 	 * mcrypt resource
 	 *
@@ -141,7 +141,7 @@ 
 	 * @param string $id =null
 	 * @return Request
 	 */
-	public static function read($id=null)
+	public static function read($id = null)
 	{
 		if (is_null(self::$request_class))
 		{
@@ -167,7 +167,7 @@ 
 				// decrypt the data if available
 				if (self::init_crypt())
 				{
-					$id = mdecrypt_generic(self::$mcrypt,$id);
+					$id = mdecrypt_generic(self::$mcrypt, $id);
 				}
 				// uncompress the data if available
 				if (self::$compression_level && function_exists('gzcompress'))
@@ -193,7 +193,7 @@ 
 		{
 			list($app) = explode('.', $_GET['menuaction']);
 			$global = false;
-			if(isset($GLOBALS['egw_info']['apps'][$app]))
+			if (isset($GLOBALS['egw_info']['apps'][$app]))
 			{
 				$index_url = isset($GLOBALS['egw_info']['apps'][$app]['index']) ?
 					'/index.php?menuaction='.$GLOBALS['egw_info']['apps'][$app]['index'] : '/'.$app.'/index.php';
@@ -230,7 +230,7 @@ 
 	 *
 	 * @param string $id =null
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		unset($id);
 	}
@@ -276,7 +276,7 @@ 
 		{
 			if (is_array($this->data['content']['nm']['rows']))
 			{
-				foreach(array_keys($this->data['content']['nm']['rows']) as $n)
+				foreach (array_keys($this->data['content']['nm']['rows']) as $n)
 				{
 					if (is_int($n))
 					{
@@ -297,7 +297,7 @@ 
 	 * @param string $type etemplate type
 	 * @param array $data =array() optional extra data
 	 */
-	public function set_to_process($_form_name, $type, $data=array())
+	public function set_to_process($_form_name, $type, $data = array())
 	{
 		if (!$_form_name || !$type) return;
 
@@ -305,7 +305,7 @@ 
 		$data['type'] = $type;
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
-		$form_name = str_replace(array('\\\'','"'), array('\'','"'), $_form_name);
+		$form_name = str_replace(array('\\\'', '"'), array('\'', '"'), $_form_name);
 
 		$this->data['to_process'][$form_name] = $data;
 		$this->data_modified = true;
@@ -319,13 +319,13 @@ 
 	 * @param array $value
 	 * @param boolean $add_to_array =false should $value be added to the attribute array
 	 */
-	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array=false)
+	public function set_to_process_attribute($_form_name, $attribute, $value, $add_to_array = false)
 	{
 		//echo '<p>'.__METHOD__."($form_name,$attribute,$value,$add_to_array)</p>\n";
 		if (!$_form_name) return;
 
 		// unquote single and double quotes, as this is how they get returned in $_POST
-		$form_name = str_replace(array('\\\'','&quot;'), array('\'','"'), $_form_name);
+		$form_name = str_replace(array('\\\'', '&quot;'), array('\'', '"'), $_form_name);
 
 		if ($add_to_array)
 		{
@@ -356,7 +356,7 @@ 
 	 * @param string $form_name =null
 	 * @return array
 	 */
-	public function get_to_process($form_name=null)
+	public function get_to_process($form_name = null)
 	{
 		//echo '<p>'.__METHOD__."($form_name)</p>\n";
 		return $form_name ? $this->data['to_process'][$form_name] : $this->data['to_process'];
@@ -387,8 +387,7 @@ 
 		// generate random token (using oppenssl if available otherwise mt_rand based Auth::randomstring)
 		$token = function_exists('openssl_random_pseudo_bytes') ?
 			// replace + with _ to not run into url-encoding issues when used in a url
-			str_replace('+', '_', base64_encode(openssl_random_pseudo_bytes(32))) :
-			\EGroupware\Api\Auth::randomstring(44);
+			str_replace('+', '_', base64_encode(openssl_random_pseudo_bytes(32))) : \EGroupware\Api\Auth::randomstring(44);
 
 		return $GLOBALS['egw_info']['flags']['currentapp'].'_'.$userID.'_'.$token;
 	}
@@ -399,7 +398,7 @@ 
 	 * @param string $var
 	 * @param mixed $val
 	 */
-	public function __set($var,$val)
+	public function __set($var, $val)
 	{
 		if ($this->data[$var] !== $val)
 		{
@@ -450,23 +449,23 @@ 
 	 * @param double $min_share minimum share to be reported (in percent of the whole request)
 	 * @param double $dump_share minimum share from which on a variable get output
 	 */
-	public function debug($min_share=1.0,$dump_share=25.0)
+	public function debug($min_share = 1.0, $dump_share = 25.0)
 	{
-		echo "<p><b>total size request data = ".($total=strlen(serialize($this->data)))."</b></p>\n";
+		echo "<p><b>total size request data = ".($total = strlen(serialize($this->data)))."</b></p>\n";
 		echo "<p>shares bigger then $min_share% percent of it:</p>\n";
-		foreach($this->data as $key => $val)
+		foreach ($this->data as $key => $val)
 		{
 			$len = strlen(is_array($val) ? serialize($val) : $val);
-			$len .= ' ('.sprintf('%2.1lf',($percent = 100.0 * $len / $total)).'%)';
+			$len .= ' ('.sprintf('%2.1lf', ($percent = 100.0 * $len / $total)).'%)';
 			if ($percent < $min_share) continue;
 			echo "<p><b>$key</b>: strlen(\$val)=$len</p>\n";
 			if ($percent >= $dump_share) _debug_array($val);
 			if (is_array($val) && $len > 2000)
 			{
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$l = strlen(is_array($v) ? serialize($v) : $v);
-					$l .= ' ('.sprintf('%2.1lf',($p = 100.0 * $l / $total)).'%)';
+					$l .= ' ('.sprintf('%2.1lf', ($p = 100.0 * $l / $total)).'%)';
 					if ($p < $min_share) continue;
 					echo "<p>&nbsp;- {$key}[$k]: strlen(\$v)=$l</p>\n";
 				}
@@ -481,7 +480,7 @@ 
 	 * @param string $mode ='ecb'
 	 * @return boolean true if encryption is used, false otherwise
 	 */
-	static public function init_crypt($algo='tripledes',$mode='ecb')
+	static public function init_crypt($algo = 'tripledes', $mode = 'ecb')
 	{
 		if (is_null(self::$mcrypt))
 		{
@@ -505,12 +504,12 @@ 
 			}
 			$iv_size = mcrypt_enc_get_iv_size(self::$mcrypt);
 			$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+				mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
 			$key_size = mcrypt_enc_get_key_size(self::$mcrypt);
-			if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+			if (bytes($key) > $key_size) $key = cut_bytes($key, 0, $key_size - 1);
 
-			if (mcrypt_generic_init(self::$mcrypt,$key, $iv) < 0)
+			if (mcrypt_generic_init(self::$mcrypt, $key, $iv) < 0)
 			{
 				error_log(__METHOD__."() could not initialise mcrypt, sessions get NOT encrypted!");
 				return self::$mcrypt = false;

api/src/Mail/Smtp/Dbmailuser.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Primary mail address required as an alias too: true or false
 	 */
-	const REQUIRE_MAIL_AS_ALIAS=false;
+	const REQUIRE_MAIL_AS_ALIAS = false;
 
 	/**
 	 * Attribute for forwards OR false if not possible

api/src/Mail/Smtp/Qmail.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Primary mail address required as an alias too: true or false
 	 */
-	const REQUIRE_MAIL_AS_ALIAS=false;
+	const REQUIRE_MAIL_AS_ALIAS = false;
 
 	/**
 	 * Attribute for forwards OR false if not possible

api/src/Mail/Smtp/Mandriva.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Primary mail address required as an alias too: true or false
 	 */
-	const REQUIRE_MAIL_AS_ALIAS=false;
+	const REQUIRE_MAIL_AS_ALIAS = false;
 
 	/**
 	 * Attribute for forwards OR false if not possible

api/src/Framework.php

Indentation +63 added lines, -63 removed lines

@@ -62,16 +62,16 @@ 
 	var $template_dirs = array();
 
 	/**
-	* true if $this->header() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->header() was called
+	 *
+	 * @var boolean
+	 */
 	static $header_done = false;
 	/**
-	* true if $this->navbar() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->navbar() was called
+	 *
+	 * @var boolean
+	 */
 	static $navbar_done = false;
 
 	/**
@@ -1030,13 +1030,13 @@ 
 	}
 
 	/**
-	* Compile entries for topmenu:
-	* - regular items: links
-	* - info items
-	*
-	* @param array $vars
-	* @param array $apps
-	*/
+	 * Compile entries for topmenu:
+	 * - regular items: links
+	 * - info items
+	 *
+	 * @param array $vars
+	 * @param array $apps
+	 */
 	function topmenu(array $vars,array $apps)
 	{
 		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
@@ -1140,39 +1140,39 @@ 
 	}
 
 	/**
-	* 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
+	 */
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content Html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content Html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_info_item($content, $id=null);
 
 	static $top_menu_extra = array();
 
 	/**
-	* Called by hooks to add an entry in the topmenu location.
-	* Extra entries will be added just before Logout.
-	*
-	* @param string $id unique element id
-	* @param string $url Address for the entry to link to
-	* @param string $title Text displayed for the entry
-	* @param string $target Optional, so the entry can open in a new page or popup
-	* @access public
-	* @return void
-	*/
+	 * Called by hooks to add an entry in the topmenu location.
+	 * Extra entries will be added just before Logout.
+	 *
+	 * @param string $id unique element id
+	 * @param string $url Address for the entry to link to
+	 * @param string $title Text displayed for the entry
+	 * @param string $target Optional, so the entry can open in a new page or popup
+	 * @access public
+	 * @return void
+	 */
 	public static function add_topmenu_item($id,$url,$title,$target = '')
 	{
 		$entry['name'] = $id;
@@ -1184,16 +1184,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 html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
 
 	/**
@@ -1228,19 +1228,19 @@ 
 	protected static $js_include_mgr;
 
 	/**
-	* Checks to make sure a valid package and file name is provided
-	*
-	* Example call syntax:
-	* a) Api\Framework::includeJS('jscalendar','calendar')
-	*    --> /phpgwapi/js/jscalendar/calendar.js
-	* b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
-	*    --> /phpgwapi/inc/calendar-setup.js?lang=de
-	*
-	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
-	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
-	*/
+	 * Checks to make sure a valid package and file name is provided
+	 *
+	 * Example call syntax:
+	 * a) Api\Framework::includeJS('jscalendar','calendar')
+	 *    --> /phpgwapi/js/jscalendar/calendar.js
+	 * b) Api\Framework::includeJS('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
+	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
+	 *
+	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
+	 * @param string|array $file =null file to be included - no ".js" on the end or array with get params
+	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
+	 * @param boolean $append =true should the file be added
+	 */
 	static function includeJS($package, $file=null, $app='phpgwapi', $append=true)
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app, $append);

Doc Comments +6 added lines, -10 removed lines

@@ -78,6 +78,7 @@ 
 	 * Constructor
 	 *
 	 * The constructor instanciates the class in $GLOBALS['egw']->framework, from where it should be used
+	 * @param string $template
 	 */
 	function __construct($template)
 	{
@@ -576,8 +577,9 @@ 
 	/**
 	 * Get login logo or background image base on requested config type
 	 *
-	 * @param type $type config type to fetch. e.g.: "login_logo_file"
-	 * @param type $find_type type of image to search on as alternative option. e.g.: "logo"
+	 * @param string $type config type to fetch. e.g.: "login_logo_file"
+	 * @param type string type of image to search on as alternative option. e.g.: "logo"
+	 * @param string $find_type
 	 *
 	 * @return string returns full url of the image
 	 */
@@ -601,7 +603,7 @@ 
 	/**
 	 * Returns Html with user and time
 	 *
-	 * @return void
+	 * @return string
 	 */
 	protected static function _user_time_info()
 	{
@@ -1032,7 +1034,6 @@ 
 	 *
 	 * Themes are css file in the template directory
 	 *
-	 * @param string $themes_dir ='css'
 	 */
 	function list_themes()
 	{
@@ -1199,11 +1200,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
 	*/
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
@@ -1460,7 +1456,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 =array() key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function ajax_set_favorite($app, $name, $action, $group, $filters = array())
 	{

Braces +54 added lines, -15 removed lines

@@ -255,7 +255,10 @@ 
 		}
 
 		// commit session (if existing), to fix timing problems sometimes preventing session creation ("Your session can not be verified")
-		if (isset($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+		if (isset($GLOBALS['egw']->session))
+		{
+			$GLOBALS['egw']->session->commit_session();
+		}
 
 		exit;
 	}
@@ -285,8 +288,14 @@ 
 	 */
 	function render($content,$app_header=null,$navbar=null)
 	{
-		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
-		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		if (!is_null($app_header))
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = $app_header;
+		}
+		if (!is_null($navbar))
+		{
+			$GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		}
 
 		echo $this->header();
 
@@ -483,7 +492,10 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki')
+		{
+			$robots ='<meta name="robots" content="none" />';
+		}
 
 		$var['favicon_file'] = self::get_login_logo_or_bg_url('favicon_file', 'favicon.ico');
 
@@ -741,13 +753,19 @@ 
 		$ind_b = isset($arr[$b['name']]) ? $arr[$b['name']] : null;
 
 		if ($ind_a == $ind_b)
-			return 0;
+		{
+					return 0;
+		}
 
 		if ($ind_a == null)
-			return -1;
+		{
+					return -1;
+		}
 
 		if ($ind_b == null)
-			return 1;
+		{
+					return 1;
+		}
 
 		return $ind_a > $ind_b ? 1 : -1;
 	}
@@ -836,9 +854,12 @@ 
 			$app_title = $GLOBALS['egw_info']['apps'][$app]['title'];
 		}
 
-		if ($GLOBALS['egw_info']['user']['apps']['preferences'])	// Preferences last
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			// Preferences last
 		{
 			$prefs = $apps['preferences'];
+		}
 			unset($apps['preferences']);
 			$apps['preferences'] = $prefs;
 		}
@@ -889,7 +910,10 @@ 
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
 			foreach($themes_to_check as $theme_css)
 			{
-				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
+				if (file_exists(EGW_SERVER_ROOT.$theme_css))
+				{
+					break;
+				}
 			}
 			$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 			if (!$debug_minify && file_exists(EGW_SERVER_ROOT.($theme_min_css = str_replace('.css', '.min.css', $theme_css))))
@@ -979,7 +1003,9 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str)
+		{
+return substr($str,1);}, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -991,7 +1017,10 @@ 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
 		foreach($extra+self::$extra as $name => $value)
 		{
-			if (is_array($value)) $value = json_encode($value);
+			if (is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
 			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
 		}
@@ -1041,7 +1070,10 @@ 
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
 					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					if (!isset($list[$name]))
+					{
+						$list[$name] = ucfirst ($name);
+					}
 				}
 			}
 			closedir($dh);
@@ -1120,7 +1152,8 @@ 
 
 		Hooks::process('topmenu_info',array(),true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach(self::$top_menu_extra as $extra_item)
+		{
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1145,7 +1178,10 @@ 
 	protected function add_preferences_topmenu($type='prefs')
 	{
 		static $memberships=null;
-		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		if (!isset($memberships))
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		}
 		static $types = array(
 			'prefs' => array(
 				'title' => 'Preferences',
@@ -1173,7 +1209,10 @@ 
 			// as all apps answer, we need to remove none-true responses
 			foreach($apps as $app => $val)
 			{
-				if (!$val) unset($apps[$app]);
+				if (!$val)
+				{
+					unset($apps[$app]);
+				}
 			}
 		}
 		else

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

@@ -402,7 +402,7 @@ 
 	 */
 	public function _get_footer()
 	{
-		$var = Array(
+		$var = array(
 			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['api']
 		);
@@ -833,7 +833,7 @@ 
 
 				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,array($icon,'nonav'),'',$svg);
 			}
 		}
 
@@ -866,13 +866,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',array('about','nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',array('logout','nonav'));
 
 		return $apps;
 	}

Spacing +116 added lines, -119 removed lines

@@ -116,7 +116,7 @@ 
 			$GLOBALS['egw_info']['server']['template_set'] = 'jdots';
 		}
 		// eg. "default" is only used for login at the moment
-		if (!class_exists($class=$GLOBALS['egw_info']['server']['template_set'].'_framework'))
+		if (!class_exists($class = $GLOBALS['egw_info']['server']['template_set'].'_framework'))
 		{
 			$class = __CLASS__.'\\Minimal';
 		}
@@ -135,7 +135,7 @@ 
 	{
 		return preg_match('/^[A-Z0-9_-]+$/i', $template) &&
 			file_exists(EGW_SERVER_ROOT.'/'.$template) &&
-			file_exists($file=EGW_SERVER_ROOT.'/'.$template.'/setup/setup.inc.php') &&
+			file_exists($file = EGW_SERVER_ROOT.'/'.$template.'/setup/setup.inc.php') &&
 			include_once($file) && !empty($GLOBALS['egw_info']['template'][$template]);
 	}
 
@@ -150,7 +150,7 @@ 
 		Header\ContentSecurityPolicy::send();
 
 		// allow client-side to detect first load aka just logged in
-		$reload_count =& Cache::getSession(__CLASS__, 'framework-reload');
+		$reload_count = & Cache::getSession(__CLASS__, 'framework-reload');
 		self::$extra['framework-reload'] = (int)(bool)$reload_count++;
 	}
 
@@ -180,9 +180,9 @@ 
 	 * @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)
 	{
-		unset($link_app);	// not used by required by function signature
+		unset($link_app); // not used by required by function signature
 		return $GLOBALS['egw']->session->link($url, $extravars);
 	}
 
@@ -212,8 +212,7 @@ 
 				!empty($GLOBALS['egw_info']['server']['enforce_ssl']) || $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ?
 				'https://' : 'http://').
 				($GLOBALS['egw_info']['server']['hostname'] && $GLOBALS['egw_info']['server']['hostname'] !== 'localhost' ?
-					$GLOBALS['egw_info']['server']['hostname'] :
-					(isset($_SERVER['HTTP_X_FORWARDED_HOST']) ?  $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'])).
+					$GLOBALS['egw_info']['server']['hostname'] : (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST'])).
 				$link;
 		}
 		return $link;
@@ -227,7 +226,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		// Determines whether the current output buffer should be flushed
 		$do_flush = true;
@@ -249,7 +248,7 @@ 
 		else
 		{
 			$file = $line = null;
-			if (headers_sent($file,$line))
+			if (headers_sent($file, $line))
 			{
 				throw new Exception\AssertionFailed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!");
 			}
@@ -284,7 +283,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 redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		self::redirect(self::link($url, $extravars), $link_app);
 	}
@@ -299,7 +298,7 @@ 
 	 * @param string $navbar =null show the navigation, default !$GLOBALS['egw_info']['flags']['nonavbar'], false gives a typical popu
 	 *
 	 */
-	function render($content,$app_header=null,$navbar=null)
+	function render($content, $app_header = null, $navbar = null)
 	{
 		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
 		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
@@ -320,7 +319,7 @@ 
 	 *
 	 * @return string with Html
 	 */
-	abstract function header(array $extra=array());
+	abstract function header(array $extra = array());
 
 	/**
 	 * Returns the Html from the body-tag til the main application area (incl. opening div tag)
@@ -340,7 +339,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	abstract function isTop($consider_navbar_not_yet_called_as_true=true);
+	abstract function isTop($consider_navbar_not_yet_called_as_true = true);
 
 	/**
 	 * Returns the content of one sidebox
@@ -350,7 +349,7 @@ 
 	 * @param array $file
 	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
 	 */
-	abstract function sidebox($appname,$menu_title,$file,$type=null);
+	abstract function sidebox($appname, $menu_title, $file, $type = null);
 
 	/**
 	 * Returns the Html from the closing div of the main application area to the closing html-tag
@@ -365,7 +364,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		(new Framework\Login($this))->screen($extra_vars, $change_passwd);
 	}
@@ -403,11 +402,11 @@ 
 	public function _get_footer()
 	{
 		$var = Array(
-			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
+			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['api']
 		);
 		$var['page_generation_time'] = '';
-		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 		{
 			$times = self::get_page_generation_time();
 
@@ -451,16 +450,16 @@ 
 	static public function _get_body_attribs()
 	{
 		$js = '';
-		foreach(self::$body_tags as $what => $data)
+		foreach (self::$body_tags as $what => $data)
 		{
 			if (!empty($data))
 			{
-				if($what == 'onLoad')
+				if ($what == 'onLoad')
 				{
-					$js .= 'onLoad="egw_LAB.wait(function() {'. htmlspecialchars($data).'})"';
+					$js .= 'onLoad="egw_LAB.wait(function() {'.htmlspecialchars($data).'})"';
 					continue;
 				}
-				$js .= ' '.$what.'="' . htmlspecialchars($data) . '"';
+				$js .= ' '.$what.'="'.htmlspecialchars($data).'"';
 			}
 		}
 		return $js;
@@ -472,7 +471,7 @@ 
 	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	 * @return array
 	 */
-	protected function _get_header(array $extra=array())
+	protected function _get_header(array $extra = array())
 	{
 		// display password expires in N days message once per session
 		$message = null;
@@ -483,7 +482,7 @@ 
 		}
 
 		// get used language code (with a little xss check, if someone tries to sneak something in)
-		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$GLOBALS['egw_info']['user']['preferences']['common']['lang']))
+		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
 			$lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		}
@@ -503,7 +502,7 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots = '<meta name="robots" content="none" />';
 
 		$var['favicon_file'] = self::get_login_logo_or_bg_url('favicon_file', 'favicon.ico');
 
@@ -513,7 +512,7 @@ 
 			$include_wz_tooltip = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].
 				$wz_tooltip.'?'.filemtime(EGW_SERVER_ROOT.$wz_tooltip).'" type="text/javascript"></script>';
 		}
-		return $this->_get_css()+array(
+		return $this->_get_css() + array(
 			'img_icon'			=> $var['favicon_file'],
 			'img_shortcut'		=> $var['favicon_file'],
 			'pngfix'        	=> $pngfix,
@@ -537,15 +536,15 @@ 
 	 */
 	protected function _get_navbar($apps)
 	{
-		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images';
+		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$this->template.'/images';
 
-		if(isset($GLOBALS['egw_info']['flags']['app_header']))
+		if (isset($GLOBALS['egw_info']['flags']['app_header']))
 		{
 			$var['current_app_title'] = $GLOBALS['egw_info']['flags']['app_header'];
 		}
 		else
 		{
-			$var['current_app_title']=$apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
+			$var['current_app_title'] = $apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
 		}
 		$var['currentapp'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -557,14 +556,14 @@ 
 
 		$var['user_info'] = $this->_user_time_info();
 
-		if($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
+		if ($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
 		{
 			$api_messages = lang('You are required to change your password during your first login').'<br />'.
-				lang('Click this image on the navbar: %1','<img src="'.Image::find('preferences','navbar.gif').'">');
+				lang('Click this image on the navbar: %1', '<img src="'.Image::find('preferences', 'navbar.gif').'">');
 		}
-		elseif($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400*$GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
+		elseif ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400 * $GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
 		{
-			$api_messages = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+			$api_messages = lang('it has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 		}
 
 		$var['logo_header'] = $var['logo_file'] = self::get_login_logo_or_bg_url('login_logo_file', 'logo');
@@ -574,13 +573,13 @@ 
 			$var['logo_header'] = self::get_login_logo_or_bg_url('login_logo_header', 'logo');
 		}
 
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.eGroupWare.org';
 
-		if (substr($var['logo_url'],0,4) != 'http')
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 
 		return $var;
 	}
@@ -593,11 +592,10 @@ 
 	 *
 	 * @return string returns full url of the image
 	 */
-	static function get_login_logo_or_bg_url ($type, $find_type)
+	static function get_login_logo_or_bg_url($type, $find_type)
 	{
 		$url = is_array($GLOBALS['egw_info']['server'][$type]) ?
-			$GLOBALS['egw_info']['server'][$type][0] :
-			$GLOBALS['egw_info']['server'][$type];
+			$GLOBALS['egw_info']['server'][$type][0] : $GLOBALS['egw_info']['server'][$type];
 
 		if (substr($url, 0, 4) == 'http' ||
 			$url[0] == '/')
@@ -606,7 +604,7 @@ 
 		}
 		else
 		{
-			return Image::find('api',$url ? $url : $find_type, '', null);
+			return Image::find('api', $url ? $url : $find_type, '', null);
 		}
 	}
 
@@ -618,14 +616,14 @@ 
 	protected static function _user_time_info()
 	{
 		$now = new DateTime();
-		$user_info = '<b>'.Accounts::format_username() .'</b>'. ' - ' . lang($now->format('l')) . ' ' . $now->format(true);
+		$user_info = '<b>'.Accounts::format_username().'</b>'.' - '.lang($now->format('l')).' '.$now->format(true);
 
 		$user_tzs = DateTime::getUserTimezones();
 		if (count($user_tzs) > 1)
 		{
 			$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-			$user_info .= Html::form(Html::select('tz',$tz,$user_tzs,true),array(),
-				'/index.php','','tz_selection',' style="display: inline;"','GET');
+			$user_info .= Html::form(Html::select('tz', $tz, $user_tzs, true), array(),
+				'/index.php', '', 'tz_selection', ' style="display: inline;"', 'GET');
 		}
 		return $user_info;
 	}
@@ -637,10 +635,10 @@ 
 	 */
 	protected static function _current_users()
 	{
-	   if( $GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
+	   if ($GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
 	   {
-		  $current_users = '<a href="' . self::link('/index.php','menuaction=admin.admin_accesslog.sessions') . '">' .
-		  	lang('Current users') . ': <span id="currentusers">' . $GLOBALS['egw']->session->session_count() . '</span></a>';
+		  $current_users = '<a href="'.self::link('/index.php', 'menuaction=admin.admin_accesslog.sessions').'">'.
+		  	lang('Current users').': <span id="currentusers">'.$GLOBALS['egw']->session->session_count().'</span></a>';
 		  return $current_users;
 	   }
 	}
@@ -674,14 +672,14 @@ 
 	 * @param array $opts =array() further params for http(s) context, eg. array('timeout' => 123)
 	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
 	 */
-	public static function proxy_context($username=null, $password=null, array $opts = array())
+	public static function proxy_context($username = null, $password = null, array $opts = array())
 	{
 		$opts += array(
 			'method' => 'GET',
 		);
 		if (!empty($GLOBALS['egw_info']['server']['httpproxy_server']))
 		{
-			$opts += array (
+			$opts += array(
 				'proxy'  => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
 					($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
 				'request_fulluri' => true,
@@ -710,7 +708,7 @@ 
 	 * @param string &$changelog on return path to changelog
 	 * @return string
 	 */
-	public static function api_version(&$changelog=null)
+	public static function api_version(&$changelog = null)
 	{
 		return Framework\Updates::api_version($changelog);
 	}
@@ -723,7 +721,7 @@ 
 	 */
 	public static function index($app)
 	{
-		$data =& $GLOBALS['egw_info']['user']['apps'][$app];
+		$data = & $GLOBALS['egw_info']['user']['apps'][$app];
 		if (!isset($data))
 		{
 			throw new Exception\WrongParameter("'$app' not a valid app for this user!");
@@ -740,7 +738,7 @@ 
 				$index = '/index.php?menuaction='.$data['index'];
 			}
 		}
-		return self::link($index,$GLOBALS['egw_info']['flags']['params'][$app]);
+		return self::link($index, $GLOBALS['egw_info']['flags']['params'][$app]);
 	}
 
 	/**
@@ -781,15 +779,15 @@ 
 	 *	true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable()
 	 * @return array
 	 */
-	protected static function _get_navbar_apps($svg=false)
+	protected static function _get_navbar_apps($svg = false)
 	{
 		list($first) = each($GLOBALS['egw_info']['user']['apps']);
-		if(is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
+		if (is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
 		{
 			$newarray['admin'] = $GLOBALS['egw_info']['user']['apps']['admin'];
-			foreach($GLOBALS['egw_info']['user']['apps'] as $index => $value)
+			foreach ($GLOBALS['egw_info']['user']['apps'] as $index => $value)
 			{
-				if($index != 'admin')
+				if ($index != 'admin')
 				{
 					$newarray[$index] = $value;
 				}
@@ -802,7 +800,7 @@ 
 		unset($newarray);
 
 		$apps = array();
-		foreach($GLOBALS['egw_info']['user']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['user']['apps'] as $app => $data)
 		{
 			if (is_long($app))
 			{
@@ -819,21 +817,21 @@ 
 				if ($data['status'] == 4)
 				{
 					$apps[$app]['target'] = ' target="'.$app.'" onClick="'."if (this != '') { window.open(this+'".
-						(strpos($apps[$app]['url'],'?') !== false ? '&' : '?').
+						(strpos($apps[$app]['url'], '?') !== false ? '&' : '?').
 						"referer='+encodeURIComponent(location),this.target,'width=800,height=600,scrollbars=yes,resizable=yes'); return false; } else { return true; }".'"';
 				}
-				elseif(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
+				elseif (isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 				{
-					$apps[$app]['target'] = 'target="' . $GLOBALS['egw_info']['flags']['navbar_target'] . '"';
+					$apps[$app]['target'] = 'target="'.$GLOBALS['egw_info']['flags']['navbar_target'].'"';
 				}
 				else
 				{
 					$apps[$app]['target'] = '';
 				}
 
-				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
+				$icon = isset($data['icon']) ? $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
-				$apps[$app]['icon']  = $apps[$app]['icon_hover']  = Image::find($icon_app,Array($icon,'nonav'),'',$svg);
+				$apps[$app]['icon'] = $apps[$app]['icon_hover'] = Image::find($icon_app, Array($icon, 'nonav'), '', $svg);
 			}
 		}
 
@@ -866,13 +864,13 @@ 
 		// We handle this here because its special
 		$apps['about']['title'] = 'EGroupware';
 		$apps['about']['url']   = self::link('/about.php');
-		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api',Array('about','nonav'));
+		$apps['about']['icon']  = $apps['about']['icon_hover'] = Image::find('api', Array('about', 'nonav'));
 		$apps['about']['name']  = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name']  = 'logout';
 		$apps['logout']['url']   = self::link('/logout.php');
-		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api',Array('logout','nonav'));
+		$apps['logout']['icon']  = $apps['logout']['icon_hover'] = Image::find('api', Array('logout', 'nonav'));
 
 		return $apps;
 	}
@@ -907,7 +905,7 @@ 
 			}
 			$themes_to_check[] = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
-			foreach($themes_to_check as $theme_css)
+			foreach ($themes_to_check as $theme_css)
 			{
 				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
 			}
@@ -941,7 +939,7 @@ 
 
 				// sending print css last, so it can overwrite anything
 				$print_css = $this->template_dir.'/print.css';
-				if(!file_exists(EGW_SERVER_ROOT.$print_css))
+				if (!file_exists(EGW_SERVER_ROOT.$print_css))
 				{
 					$print_css = '/api/templates/default/print.css';
 				}
@@ -967,7 +965,7 @@ 
 	 * @param array $extra =array() extra data to pass to egw.js as data-parameter
 	 * @return string the javascript to be included
 	 */
-	public static function _get_js(array $extra=array())
+	public static function _get_js(array $extra = array())
 	{
 		$java_script = '';
 
@@ -975,7 +973,7 @@ 
 		Think of conf vars etc...  (pim@lingewoud.nl) */
 		if (isset($GLOBALS['egw_info']['flags']['java_script_thirst']))
 		{
-			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst'] . "\n";
+			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst']."\n";
 		}
 		// add configuration, link-registry, images, user-data and -perferences for non-popup windows
 		// specifying etag in url to force reload, as we send expires header
@@ -987,7 +985,7 @@ 
 			self::includeJS('/api/images.php', array(
 				'template' => $GLOBALS['egw_info']['server']['template_set'],
 				'etag' => md5(json_encode(Image::map($GLOBALS['egw_info']['server']['template_set']))),
-				'svg' => Header\UserAgent::mobile(),	// always load non-svg image map, ATM we use svg icons only for mobile theme
+				'svg' => Header\UserAgent::mobile(), // always load non-svg image map, ATM we use svg icons only for mobile theme
 			));
 			self::includeJS('/api/user.php', array(
 				'user' => $GLOBALS['egw_info']['user']['account_lid'],
@@ -999,7 +997,7 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str) {return substr($str, 1); }, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -1009,18 +1007,18 @@ 
 				'/api/js/jsapi/egw.js?'.filemtime(EGW_SERVER_ROOT.'/api/js/jsapi/egw.js').'" id="egw_script_id"';
 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
-		foreach($extra+self::$extra as $name => $value)
+		foreach ($extra + self::$extra as $name => $value)
 		{
 			if (is_array($value)) $value = json_encode($value);
 			// we need to double encode (Html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
-			$java_script .= ' data-'.$name."=\"". Html::htmlspecialchars($value, true)."\"";
+			$java_script .= ' data-'.$name."=\"".Html::htmlspecialchars($value, true)."\"";
 		}
 		$java_script .= "></script>\n";
 
-		if(@isset($_GET['menuaction']))
+		if (@isset($_GET['menuaction']))
 		{
-			list(, $class) = explode('.',$_GET['menuaction']);
-			if(is_array($GLOBALS[$class]->public_functions) &&
+			list(, $class) = explode('.', $_GET['menuaction']);
+			if (is_array($GLOBALS[$class]->public_functions) &&
 				$GLOBALS[$class]->public_functions['java_script'])
 			{
 				$java_script .= $GLOBALS[$class]->java_script();
@@ -1029,10 +1027,10 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags, this needs to be executed as anonymous function
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
-			if(trim($GLOBALS['egw_info']['flags']['java_script']) != '')
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
+			if (trim($GLOBALS['egw_info']['flags']['java_script']) != '')
 			{
-				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
+				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script']."});</script>\n";
 			}
 		}
 
@@ -1049,7 +1047,7 @@ 
 	function list_themes()
 	{
 		$list = array();
-		if (file_exists($file=EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
+		if (file_exists($file = EGW_SERVER_ROOT.$this->template_dir.'/setup/setup.inc.php') &&
 			(include $file) && isset($GLOBALS['egw_info']['template'][$this->template]['themes']))
 		{
 			$list = $GLOBALS['egw_info']['template'][$this->template]['themes'];
@@ -1060,8 +1058,8 @@ 
 			{
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
-					list($name) = explode('.',$file);
-					if (!isset($list[$name])) $list[$name] = ucfirst ($name);
+					list($name) = explode('.', $file);
+					if (!isset($list[$name])) $list[$name] = ucfirst($name);
 				}
 			}
 			closedir($dh);
@@ -1075,21 +1073,20 @@ 
 	 * @param boolean $full_data =false true: value is array with values for keys 'name', 'title', ...
 	 * @returns array alphabetically sorted list of templates
 	 */
-	static function list_templates($full_data=false)
+	static function list_templates($full_data = false)
 	{
 		$list = array('pixelegg'=>null);
 		// templates packaged like apps in own directories (containing as setup/setup.inc.php file!)
 		$dr = dir(EGW_SERVER_ROOT);
-		while (($entry=$dr->read()))
+		while (($entry = $dr->read()))
 		{
 			if ($entry != '..' && !isset($GLOBALS['egw_info']['apps'][$entry]) && is_dir(EGW_SERVER_ROOT.'/'.$entry) &&
-				file_exists($f = EGW_SERVER_ROOT . '/' . $entry .'/setup/setup.inc.php'))
+				file_exists($f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php'))
 			{
 				include($f);
 				if (isset($GLOBALS['egw_info']['template'][$entry]))
 				{
-					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] :
-						$GLOBALS['egw_info']['template'][$entry]['title'];
+					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] : $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 			}
 		}
@@ -1106,14 +1103,14 @@ 
 	* @param array $vars
 	* @param array $apps
 	*/
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
+		if ($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
 		{
 			$this->_add_topmenu_item($apps['home']);
 		}
 
-		if($GLOBALS['egw_info']['user']['apps']['preferences'])
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$this->add_preferences_topmenu('prefs');
 			$this->add_preferences_topmenu('acl');
@@ -1138,9 +1135,9 @@ 
 			$this->_add_topmenu_item(array_merge($apps['manual'],array('title' => lang('Help'))));
 		}*/
 
-		Hooks::process('topmenu_info',array(),true);
+		Hooks::process('topmenu_info', array(), true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach (self::$top_menu_extra as $extra_item) {
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1150,7 +1147,7 @@ 
 		{
 			$this->_add_topmenu_info_item($update, 'update');
 		}
-		if($GLOBALS['egw_info']['user']['apps']['notifications'])
+		if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 		{
 			$this->_add_topmenu_info_item(self::_get_notification_bell(), 'notifications');
 		}
@@ -1162,9 +1159,9 @@ 
 	/**
 	 * Add Preferences link to topmenu using settings-hook to know if an app supports Preferences
 	 */
-	protected function add_preferences_topmenu($type='prefs')
+	protected function add_preferences_topmenu($type = 'prefs')
 	{
-		static $memberships=null;
+		static $memberships = null;
 		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 		static $types = array(
 			'prefs' => array(
@@ -1178,20 +1175,20 @@ 
 			'cats' => array(
 				'title' => 'Categories',
 				'hook' => 'categories',
-				'run_hook' => true,	// acturally run hook, not just look it's implemented
+				'run_hook' => true, // acturally run hook, not just look it's implemented
 			),
 		);
 		if (!$GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['server']['deny_'.$type] &&
 			array_intersect($memberships, (array)$GLOBALS['egw_info']['server']['deny_'.$type]) &&
 			!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			return;	// user has no access to Preferences app
+			return; // user has no access to Preferences app
 		}
 		if (isset($types[$type]['run_hook']))
 		{
 			$apps = Hooks::process($types[$type]['hook']);
 			// as all apps answer, we need to remove none-true responses
-			foreach($apps as $app => $val)
+			foreach ($apps as $app => $val)
 			{
 				if (!$val) unset($apps[$app]);
 			}
@@ -1217,7 +1214,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
+	abstract function _add_topmenu_item(array $app_data, $alt_label = null);
 
 	/**
 	* Add info items to the topmenu template class to be displayed
@@ -1227,7 +1224,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_info_item($content, $id=null);
+	abstract function _add_topmenu_info_item($content, $id = null);
 
 	static $top_menu_extra = array();
 
@@ -1242,7 +1239,7 @@ 
 	* @access public
 	* @return void
 	*/
-	public static function add_topmenu_item($id,$url,$title,$target = '')
+	public static function add_topmenu_item($id, $url, $title, $target = '')
 	{
 		$entry['name'] = $id;
 		$entry['url'] = $url;
@@ -1263,7 +1260,7 @@ 
 	* @access public
 	* @return void
 	*/
-	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
+	abstract function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null);
 
 	/**
 	 * Call and return content of 'after_navbar' hook
@@ -1273,7 +1270,7 @@ 
 	protected function _get_after_navbar()
 	{
 		ob_start();
-		Hooks::process('after_navbar',null,true);
+		Hooks::process('after_navbar', null, true);
 		$content = ob_get_contents();
 		ob_end_clean();
 
@@ -1310,7 +1307,7 @@ 
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
 	* @param boolean $append =true should the file be added
 	*/
-	static function includeJS($package, $file=null, $app='phpgwapi', $append=true)
+	static function includeJS($package, $file = null, $app = 'phpgwapi', $append = true)
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app, $append);
 	}
@@ -1322,7 +1319,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return array with pathes relative to EGW_SERVER_ROOT
 	 */
-	static function js_files(array $files=null, $clear_files=false)
+	static function js_files(array $files = null, $clear_files = false)
 	{
 		if (isset($files) && is_array($files))
 		{
@@ -1341,7 +1338,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return string|array see $return_pathes parameter
 	 */
-	static public function get_script_links($return_pathes=false, $clear_files=false)
+	static public function get_script_links($return_pathes = false, $clear_files = false)
 	{
 		$to_include = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files($clear_files));
 
@@ -1349,7 +1346,7 @@ 
 		{
 			return $to_include;
 		}
-		$start = '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url'];
+		$start = '<script type="text/javascript" src="'.$GLOBALS['egw_info']['server']['webserver_url'];
 		$end = '">'."</script>\n";
 		return "\n".$start.implode($end.$start, $to_include).$end;
 	}
@@ -1369,7 +1366,7 @@ 
 	 * @param boolean $no_default_css =false true do NOT load any default css, only what app explicitly includes
 	 * @return boolean false: css file not found, true: file found
 	 */
-	public static function includeCSS($app, $name=null, $append=true, $no_default_css=false)
+	public static function includeCSS($app, $name = null, $append = true, $no_default_css = false)
 	{
 		if ($no_default_css)
 		{
@@ -1389,16 +1386,16 @@ 
 
 		// try to add app specific css file
 		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			self::includeCSS($app,'app');
+			self::includeCSS($app, 'app');
 
 		// add all css files from Framework::includeCSS()
 		$query = null;
 		//error_log(__METHOD__."() Framework\CssIncludes::get()=".array2string(Framework\CssIncludes::get()));
-		foreach(Framework\CssIncludes::get() as $path)
+		foreach (Framework\CssIncludes::get() as $path)
 		{
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
-			$path .= '?'. ($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
+			list($path, $query) = explode('?', $path, 2);
+			$path .= '?'.($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
 			$response->includeCSS($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
 
@@ -1407,7 +1404,7 @@ 
 
 		// add all js files from Framework::includeJS()
 		$files = Framework\Bundle::js_includes(self::$js_include_mgr->get_included_files());
-		foreach($files as $path)
+		foreach ($files as $path)
 		{
 			$response->includeScript($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
@@ -1486,17 +1483,17 @@ 
 	 */
 	public static function ajax_user_list()
 	{
-		$list = array('accounts' => array(),'groups' => array(), 'owngroups' => array());
-		if($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
+		$list = array('accounts' => array(), 'groups' => array(), 'owngroups' => array());
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
 		{
 			$list['accounts']['filter']['group'] = $GLOBALS['egw_info']['user']['account_primary_group'];
 		}
-		foreach($list as $type => &$accounts)
+		foreach ($list as $type => &$accounts)
 		{
 			$options = array('account_type' => $type) + $accounts;
-			$key_pair = Accounts::link_query('',$options);
+			$key_pair = Accounts::link_query('', $options);
 			$accounts = array();
-			foreach($key_pair as $account_id => $name)
+			foreach ($key_pair as $account_id => $name)
 			{
 				$accounts[] = array('value' => $account_id, 'label' => $name);
 			}
@@ -1514,16 +1511,16 @@ 
 	 * @param boolean $_resolve_groups =false true: return attribute for all members, false return attribute for group itself
 	 * @return array account_id => data pairs
 	 */
-	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups=false)
+	public static function ajax_account_data($_account_ids, $_field, $_resolve_groups = false)
 	{
 		$list = array();
-		foreach((array)$_account_ids as $account_id)
+		foreach ((array)$_account_ids as $account_id)
 		{
-			foreach($account_id < 0 && $_resolve_groups ?
+			foreach ($account_id < 0 && $_resolve_groups ?
 				$GLOBALS['egw']->accounts->members($account_id, true) : array($account_id) as $account_id)
 			{
 				// Make sure name is formatted according to preference
-				if($_field == 'account_fullname')
+				if ($_field == 'account_fullname')
 				{
 					$list[$account_id] = Accounts::format_username(
 						$GLOBALS['egw']->accounts->id2name($account_id, 'account_lid'),

preferences/inc/class.preferences_categories_ui.inc.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 
 	function __construct()
 	{
-		if (false) parent::__construct ();	// parent constructor explicitly not called!
+		if (false) parent::__construct(); // parent constructor explicitly not called!
 
 		Framework::includeCSS('/admin/templates/default/app.css');
 
@@ -46,7 +46,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		$GLOBALS['egw_info']['flags']['currentapp'] = $_GET['cats_app'];
 

Braces +7 added lines, -2 removed lines

@@ -16,7 +16,8 @@ 
  * Preference UI extends Admin class to give regular users restricted
  * access to modify Api\Categories
  */
-class preferences_categories_ui extends admin_categories {
+class preferences_categories_ui extends admin_categories
+{
 
 	protected $appname = 'preferences';
 	protected $get_rows = 'preferences.preferences_categories_ui.get_rows';
@@ -26,7 +27,11 @@ 
 
 	function __construct()
 	{
-		if (false) parent::__construct ();	// parent constructor explicitly not called!
+		if (false)
+		{
+			parent::__construct ();
+		}
+		// parent constructor explicitly not called!
 
 		Framework::includeCSS('/admin/templates/default/app.css');
 

calendar/sitemgr/class.module_calendar.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,9 +27,9 @@ 
 		$this->description = lang('This module displays the current month');
  	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
-		$date = (int) (strtotime(get_var('date',array('POST','GET'))));
+		$date = (int)(strtotime(get_var('date', array('POST', 'GET'))));
 		$redirect = $arguments['redirect'] ? $arguments['redirect'] : '#';
 
 		if (!file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
@@ -38,6 +38,6 @@ 
 		}
 
 		return $GLOBALS['egw']->jscalendar->get_javascript().
-			$GLOBALS['egw']->jscalendar->flat($redirect,$date);
+			$GLOBALS['egw']->jscalendar->flat($redirect, $date);
 	}
 }

calendar/inc/class.calendar_hooks.inc.php

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

@@ -83,7 +83,7 @@
 	 */
 	static function admin()
 	{
-		$file = Array(
+		$file = array(
 			'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
 			'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
 			'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),

Braces +29 added lines, -7 removed lines

@@ -107,9 +107,12 @@ 
 	 */
 	static function settings($hook_data)
 	{
-		if (!$hook_data['setup'])	// does not work on setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work on setup time
 		{
 			$bo = new calendar_bo();
+		}
 			$bo->check_set_default_prefs();
 		}
 		$yesno = array(
@@ -208,9 +211,12 @@ 
 			1		=> lang('Yes'),
 			2		=> lang('With credentials included'),
 		);
-		if (!$hook_data['setup'])	// does not work at setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
+		}
 			foreach($GLOBALS['egw']->accounts->search(array('type' => 'owngroups','app' => 'calendar')) as $group)
 			{
 				$options[$group['account_id']] = Api\Accounts::username($group['account_id']);
@@ -374,9 +380,12 @@ 
 				'default' => '',
 			),
 		);
-		if (isset($bo))	// add custom time-spans set by CalDAV clients, not in our prefs
+		if (isset($bo))
+		{
+			// add custom time-spans set by CalDAV clients, not in our prefs
 		{
 			$prefs = $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		}
 			$data = array(
 				'prefs' => &$prefs,	// use reference to get preference value back
 				'preprocess' => true,
@@ -744,7 +753,10 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($data).")");
 		// caldav perfs are always user specific and cant by switched off
-		if ($data['type'] != 'user') return;
+		if ($data['type'] != 'user')
+		{
+			return;
+		}
 
 		$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
 		foreach(array(
@@ -753,16 +765,23 @@ 
 		) as $name => $dav)
 		{
 			$pref =& $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
-			if (true) $pref = str_replace("\r", '', $pref);	// remove CR messing up multiline preg_match
+			if (true)
+			{
+				$pref = str_replace("\r", '', $pref);
+			}
+			// remove CR messing up multiline preg_match
 			$val =& $data['prefs'][$name];
 
 			//error_log(__METHOD__."() groupdav[$dav]=$pref, calendar[$name]=$val");
 
-			if ($data['preprocess'])	// showing preferences
+			if ($data['preprocess'])
+			{
+				// showing preferences
 			{
 				if (!isset($val))	// no calendar pref --> read value from caldav
 				{
 					$matches = null;
+			}
 					if (preg_match('/^ACTION:NONE$/mi', $pref))
 					{
 						$val = '';
@@ -896,7 +915,10 @@ 
 	{
 		Api\Translation::add_app('calendar');
 		// do not set actions for alarm type
-		if ($params['data']['type'] == 6) return array();
+		if ($params['data']['type'] == 6)
+		{
+			return array();
+		}
 		return array(
 			array(
 				'id' => 'A',

Spacing +35 added lines, -35 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return array(
 			'query' => 'calendar.calendar_bo.link_query',
 			'title' => 'calendar.calendar_bo.link_title',
@@ -50,7 +50,7 @@ 
 			'add_id'     => 'link_id',
 			'add_popup'  => '850x590',
 			'file_access' => 'calendar.calendar_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'mime' => array(
 				'text/calendar' => array(
 					'menuaction' => 'calendar.calendar_uiforms.edit',
@@ -81,7 +81,7 @@ 
 	 */
 	static function getAppExportLimit($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return $GLOBALS['egw_info']['server']['calendar_export_limit'];
 	}
 
@@ -91,13 +91,13 @@ 
 	static function admin()
 	{
 		$file = Array(
-			'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-			'Custom fields' => Egw::link('/index.php','menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
-			'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
-			'Category ACL' => Egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'),
-			'Update timezones' => Egw::link('/index.php','menuaction=calendar.calendar_timezones.update'),
+			'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+			'Custom fields' => Egw::link('/index.php', 'menuaction=admin.admin_customfields.index&appname=calendar&ajax=true'),
+			'Global Categories' => Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar&ajax=true'),
+			'Category ACL' => Egw::link('/index.php', 'menuaction=calendar.calendar_uiforms.cat_acl'),
+			'Update timezones' => Egw::link('/index.php', 'menuaction=calendar.calendar_timezones.update'),
 		);
-		display_section('calendar','calendar',$file);
+		display_section('calendar', 'calendar', $file);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 		}
 		for ($i = 2; $i <= 9; ++$i)
 		{
-			$muliple_weeks[$i] = lang('%1 weeks',$i);
+			$muliple_weeks[$i] = lang('%1 weeks', $i);
 		}
 
 		for ($i = 2; $i <= 20; $i++)
@@ -210,14 +210,14 @@ 
 		if (!$hook_data['setup'])	// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'owngroups','app' => 'calendar')) as $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'owngroups', 'app' => 'calendar')) as $group)
 			{
 				$options[$group['account_id']] = Api\Accounts::username($group['account_id']);
 			}
-			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
+			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'], $GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
 			$freebusy_url = '<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>';
 			$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is');
-			$freebusy_help .= ' ' . $freebusy_url;
+			$freebusy_help .= ' '.$freebusy_url;
 
 			// Timezone for file exports
 			$export_tzs = array('0' => 'Use Event TZ');
@@ -355,7 +355,7 @@ 
 				'admin'  => False
 			),
 			'default-alarm' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for regular events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm',
 				'help'   => 'Alarm added automatic to new events before event start-time',
@@ -364,7 +364,7 @@ 
 				'default' => '',
 			),
 			'default-alarm-wholeday' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for whole-day events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm-wholeday',
 				'help'   => lang('Alarm added automatic to new events before event start-time').' ('.lang('Midnight').')',
@@ -377,7 +377,7 @@ 
 		{
 			$prefs = $GLOBALS['egw_info']['user']['preferences']['calendar'];
 			$data = array(
-				'prefs' => &$prefs,	// use reference to get preference value back
+				'prefs' => &$prefs, // use reference to get preference value back
 				'preprocess' => true,
 				'type' => 'user',
 			);
@@ -619,9 +619,9 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -631,9 +631,9 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -658,7 +658,7 @@ 
 				}
 				catch (Exception $e)
 				{
-					unset($e);	// not used
+					unset($e); // not used
 					// permission error
 					continue;
 				}
@@ -746,14 +746,14 @@ 
 		if ($data['type'] != 'user') return;
 
 		$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
-		foreach(array(
+		foreach (array(
 			'default-alarm' => 'default-alarm-vevent-datetime:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 			'default-alarm-wholeday' => 'default-alarm-vevent-date:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 		) as $name => $dav)
 		{
-			$pref =& $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
-			if (true) $pref = str_replace("\r", '', $pref);	// remove CR messing up multiline preg_match
-			$val =& $data['prefs'][$name];
+			$pref = & $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
+			if (true) $pref = str_replace("\r", '', $pref); // remove CR messing up multiline preg_match
+			$val = & $data['prefs'][$name];
 
 			//error_log(__METHOD__."() groupdav[$dav]=$pref, calendar[$name]=$val");
 
@@ -774,7 +774,7 @@ 
 							'D' => 1440,
 						);
 						$factor = $factors[strtoupper($matches[2])];
-						$val = $factor*(int)$matches[1];
+						$val = $factor * (int)$matches[1];
 					}
 					else
 					{
@@ -805,7 +805,7 @@ 
 				}
 				else
 				{
-					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val)/60, 0).'H', $pref);
+					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val) / 60, 0).'H', $pref);
 				}
 				$GLOBALS['egw']->preferences->add('groupdav', $dav, $pref, 'user');
 				//error_log(__METHOD__."() storing $name=$val --> $dav='$pref'");
@@ -866,7 +866,7 @@ 
 	 */
 	public static function categories($data)
 	{
-		unset($data);	// not used, but in function signature for hooks
+		unset($data); // not used, but in function signature for hooks
 		return true;
 	}
 
@@ -877,9 +877,9 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
-		return array (
+		return array(
 			'menuaction' => 'calendar.calendar_uiforms.mail_import',
 			'popup' => Link::get_registry('calendar', 'edit_popup')
 		);
@@ -891,7 +891,7 @@ 
 	 * @param type $params
 	 * @return type
 	 */
-	public static function notifications_actions ($params)
+	public static function notifications_actions($params)
 	{
 		Api\Translation::add_app('calendar');
 		// do not set actions for alarm type
@@ -928,7 +928,7 @@ 
 	$async = new Api\Asyncservice();
 	$async->cancel_timer($id);
 
-	if((float)$config > 0)
+	if ((float)$config > 0)
 	{
 		$result = $async->set_timer(
 			array('month' => '*', 'day' => 1),
@@ -936,7 +936,7 @@ 
 			'calendar.calendar_boupdate.purge',
 			(float)$config
 		);
-		if(!$result)
+		if (!$result)
 		{
 			$GLOBALS['config_error'] = 'Unable to schedule purge';
 		}

calendar/inc/class.calendar_datasource.inc.php

Braces +13 added lines, -3 removed lines

@@ -25,7 +25,11 @@ 
 	 */
 	function __construct()
 	{
-		if (false) parent::__construct();	// can not be called, but gives IDE warning
+		if (false)
+		{
+			parent::__construct();
+		}
+		// can not be called, but gives IDE warning
 
 		$this->datasource('calendar');
 
@@ -94,16 +98,22 @@ 
 			if (!is_array($this->pm_config))
 			{
 				$this->pm_config = Api\Config::read('projectmanager');
-				if (!$this->pm_config['hours_per_workday']) $this->pm_config['hours_per_workday'] = 8;
+				if (!$this->pm_config['hours_per_workday'])
+				{
+					$this->pm_config['hours_per_workday'] = 8;
+				}
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
 		foreach($data['participants'] as $uid => $status)
 		{
-			if ($status != 'R' && is_numeric($uid))	// only users for now
+			if ($status != 'R' && is_numeric($uid))
+			{
+				// only users for now
 			{
 				$ds['pe_resources'][] = $uid;
 			}
+			}
 		}
 		// if we have multiple participants we have to multiply the time by the number of participants to get the total time
 		$ds['pe_planned_time'] *= count($ds['pe_resources']);

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	function __construct()
 	{
-		if (false) parent::__construct();	// can not be called, but gives IDE warning
+		if (false) parent::__construct(); // can not be called, but gives IDE warning
 
 		$this->datasource('calendar');
 
@@ -50,14 +50,14 @@ 
 
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $cal->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $cal->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title' => $cal->link_title($data),
@@ -67,7 +67,7 @@ 
 			'pe_details'       => $data['description'] ? nl2br($data['description']) : '',
 		);
 		// return first global category, as PM only supports one
-		foreach($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
+		foreach ($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
 		{
 			if (Api\Categories::is_global($cat_id))
 			{
@@ -76,13 +76,13 @@ 
 			}
 		}
 		// calculation of the time
-		$ds['pe_planned_time'] = (int) (($ds['pe_planned_end'] - $ds['pe_planned_start'])/60);	// time is in minutes
+		$ds['pe_planned_time'] = (int)(($ds['pe_planned_end'] - $ds['pe_planned_start']) / 60); // time is in minutes
 
 		// if the event spans multiple days, we have to substract the nights (24h - daily working time specified in PM)
-		if (($ds['pe_planned_time']/ 60 > 24) && date('Y-m-d',$ds['pe_planned_end']) != date('Y-m-d',$ds['pe_planned_start']))
+		if (($ds['pe_planned_time'] / 60 > 24) && date('Y-m-d', $ds['pe_planned_end']) != date('Y-m-d', $ds['pe_planned_start']))
 		{
 			$start = $end = null;
-			foreach(array('start','end') as $name)
+			foreach (array('start', 'end') as $name)
 			{
 				$arr = $cal->date2array($ds['pe_planned_'.$name]);
 				$arr['hour'] = 12;
@@ -99,7 +99,7 @@ 
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
-		foreach($data['participants'] as $uid => $status)
+		foreach ($data['participants'] as $uid => $status)
 		{
 			if ($status != 'R' && is_numeric($uid))	// only users for now
 			{
@@ -134,7 +134,7 @@ 
 	function delete($id)
 	{
 		// dont delete entries which are linked to elements other than their project
-		if (count(Link::get_links('calendar',$id)) > 1)
+		if (count(Link::get_links('calendar', $id)) > 1)
 		{
 			return false;
 		}
@@ -149,11 +149,11 @@ 
 	 * @param string $status
 	 * @return boolean true if status changed, false otherwise
 	 */
-	function change_status($id,$status)
+	function change_status($id, $status)
 	{
 		$bo = new calendar_boupdate();
 		if (($entry = $bo->read($id)) && (
-				$bo->check_perms(Acl::EDIT,$entry)
+				$bo->check_perms(Acl::EDIT, $entry)
 		))
 		{
 			// Restore from deleted