EGroupware / egroupware

api/src/Etemplate/Widget/Date.php

Doc Comments +1 added lines, -2 removed lines

@@ -101,7 +101,6 @@ 
 	/**
 	 * Put date in the proper format for sending to client
 	 * @param string|int $value
-	 * @param string $format
 	 */
 	public function format_date($value)
 	{
@@ -139,7 +138,7 @@ 
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @return boolean true if no validation error, false otherwise
+	 * @return boolean|null true if no validation error, false otherwise
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +25 added lines, -25 removed lines

@@ -60,17 +60,17 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
-		if($this->type == 'date-houronly')
+		if ($this->type == 'date-houronly')
 		{
 			return parent::beforeSendToClient($cname, $expand);
 		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name, false, true);
+		$value = & self::get_array(self::$request->content, $form_name, false, true);
 
-		if($this->type != 'date-duration' && $value)
+		if ($this->type != 'date-duration' && $value)
 		{
 			$value = $this->format_date($value);
 		}
@@ -90,10 +90,10 @@ 
 	 */
 	public function set_row_value($cname, Array $expand, Array &$data)
 	{
-		if($this->type == 'date-duration') return;
+		if ($this->type == 'date-duration') return;
 
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& $this->get_array($data, $form_name, true);
+		$value = & $this->get_array($data, $form_name, true);
 
 		if (true) $value = $this->format_date($value);
 	}
@@ -105,7 +105,7 @@ 
 	 */
 	public function format_date($value)
 	{
-		if (!$value) return $value;	// otherwise we will get current date or 1970-01-01 instead of an empty value
+		if (!$value) return $value; // otherwise we will get current date or 1970-01-01 instead of an empty value
 
 		if ($this->attrs['dataformat'] && !is_numeric($value))
 		{
@@ -115,11 +115,11 @@ 
 		{
 			$date = new Api\DateTime($value);
 		}
-		if($this->type == 'date-timeonly')
+		if ($this->type == 'date-timeonly')
 		{
 			$date->setDate(1970, 1, 1);
 		}
-		if($date)
+		if ($date)
 		{
 			// postfix date-string with "Z" so javascript doesn't add/subtract anything
 			$value = $date->format('Y-m-d\TH:i:s\Z');
@@ -141,18 +141,18 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')	// date-since is always readonly
 		{
 			$value = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'));
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'));
 			}
 			elseif (is_null($value))
 			{
@@ -162,49 +162,49 @@ 
 			{
 				$valid = (string)$value === '' ? '' : (int)$value;
 			}
-			if($value)
+			if ($value)
 			{
 				$date = new Api\DateTime($value);
 			}
 			if (!empty($this->attrs['min']))
 			{
-				if(is_numeric($this->attrs['min']))
+				if (is_numeric($this->attrs['min']))
 				{
-					$min = new Api\DateTime(strtotime( $this->attrs['min'] . 'days'));
+					$min = new Api\DateTime(strtotime($this->attrs['min'].'days'));
 				}
 				else
 				{
 					$min = new Api\DateTime(strtotime($this->attrs['min']));
 				}
-				if($value < $min)
+				if ($value < $min)
 				{
-					self::set_validation_error($form_name,lang(
+					self::set_validation_error($form_name, lang(
 						"Value has to be at least '%1' !!!",
 						$min->format($this->type != 'date')
-					),'');
+					), '');
 					$value = $min;
 				}
 			}
 			if (!empty($this->attrs['max']))
 			{
-				if(is_numeric($this->attrs['max']))
+				if (is_numeric($this->attrs['max']))
 				{
-					$max = new Api\DateTime(strtotime( $this->attrs['max'] . 'days'));
+					$max = new Api\DateTime(strtotime($this->attrs['max'].'days'));
 				}
 				else
 				{
 					$max = new Api\DateTime(strtotime($this->attrs['max']));
 				}
-				if($value < $max)
+				if ($value < $max)
 				{
-					self::set_validation_error($form_name,lang(
+					self::set_validation_error($form_name, lang(
 						"Value has to be at maximum '%1' !!!",
 						$max->format($this->type != 'date')
-					),'');
+					), '');
 					$value = $max;
 				}
 			}
-			if(!$value)
+			if (!$value)
 			{
 				// Not null, blank
 				$value = '';
@@ -221,7 +221,7 @@ 
 			else
 			{
 				// this is not really a user error, but one of the clientside engine
-				self::set_validation_error($form_name,lang("'%1' is not a valid date !!!", $value).' '.$this->dataformat);
+				self::set_validation_error($form_name, lang("'%1' is not a valid date !!!", $value).' '.$this->dataformat);
 			}
 			//error_log("$this : ($valid)" . Api\DateTime::to($valid));
 		}

Braces +21 added lines, -5 removed lines

@@ -90,12 +90,18 @@ 
 	 */
 	public function set_row_value($cname, Array $expand, Array &$data)
 	{
-		if($this->type == 'date-duration') return;
+		if($this->type == 'date-duration')
+		{
+			return;
+		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value =& $this->get_array($data, $form_name, true);
 
-		if (true) $value = $this->format_date($value);
+		if (true)
+		{
+			$value = $this->format_date($value);
+		}
 	}
 
 	/**
@@ -105,7 +111,11 @@ 
 	 */
 	public function format_date($value)
 	{
-		if (!$value) return $value;	// otherwise we will get current date or 1970-01-01 instead of an empty value
+		if (!$value)
+		{
+			return $value;
+		}
+		// otherwise we will get current date or 1970-01-01 instead of an empty value
 
 		if ($this->attrs['dataformat'] && !is_numeric($value))
 		{
@@ -145,9 +155,12 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
-		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')	// date-since is always readonly
+		if (!$this->is_readonly($cname, $form_name) && $this->type != 'date-since')
+		{
+			// date-since is always readonly
 		{
 			$value = self::get_array($content, $form_name);
+		}
 			$valid =& self::get_array($validated, $form_name, true);
 
 			if ((string)$value === '' && $this->attrs['needed'])
@@ -209,10 +222,13 @@ 
 				// Not null, blank
 				$value = '';
 			}
-			elseif (empty($this->attrs['dataformat']))	// integer timestamp
+			elseif (empty($this->attrs['dataformat']))
+			{
+				// integer timestamp
 			{
 				$valid = $date->format('ts');
 			}
+			}
 			// string with formatting letters like for php's date() method
 			elseif ($date && ($valid = $date->format($this->attrs['dataformat'])))
 			{

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

@@ -88,7 +88,7 @@
 	 * @param array $data Row data
 	 * @return type
 	 */
-	public function set_row_value($cname, Array $expand, Array &$data)
+	public function set_row_value($cname, array $expand, array &$data)
 	{
 		if($this->type == 'date-duration') return;
 

api/src/Etemplate/Widget/Textbox.php

Doc Comments +1 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string|XMLReader $xml
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
-	 * @return Template current object or clone, if any attribute was set
+	 * @return Textbox current object or clone, if any attribute was set
 	 */
 	public function set_attrs($xml, $cloned=true)
 	{
@@ -110,7 +110,6 @@ 
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +21 added lines, -21 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Template current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		parent::set_attrs($xml, $cloned);
 
@@ -69,7 +69,7 @@ 
 			$this->setElementAttribute($this->id, 'size', abs($this->attrs['size']));
 			self::$request->readonlys[$this->id] = false;
 			$this->setElementAttribute($this->id, 'readonly', true);
-			trigger_error("Using a negative size to set textbox readonly. " .$this, E_USER_DEPRECATED);
+			trigger_error("Using a negative size to set textbox readonly. ".$this, E_USER_DEPRECATED);
 		}
 		return $this;
 	}
@@ -80,16 +80,16 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		// to NOT transmit passwords back to client, we need to store (non-empty) value in preserv
 		if ($this->attrs['type'] == 'passwd' || $this->type == 'passwd')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand);
-			$value =& self::get_array(self::$request->content, $form_name);
+			$value = & self::get_array(self::$request->content, $form_name);
 			if (!empty($value))
 			{
-				$preserv =& self::get_array(self::$request->preserv, $form_name, true);
+				$preserv = & self::get_array(self::$request->preserv, $form_name, true);
 				if (true) $preserv = (string)$value;
 				$value = str_repeat('*', strlen($preserv));
 			}
@@ -112,7 +112,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -120,7 +120,7 @@ 
 		{
 			if (!isset($this->attrs['validator']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'int':
 					case 'integer':
@@ -150,24 +150,24 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 			}
-			if ((int) $this->attrs['maxlength'] > 0 && mb_strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && mb_strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = mb_substr($value,0,(int) $this->attrs['maxlength']);
+				$value = mb_substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['validator'] && !preg_match($this->attrs['validator'],$value))
+			if ($this->attrs['validator'] && !preg_match($this->attrs['validator'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'integer':
-						self::set_validation_error($form_name,lang("'%1' is not a valid integer !!!",$value),'');
+						self::set_validation_error($form_name, lang("'%1' is not a valid integer !!!", $value), '');
 						break;
 					case 'float':
-						self::set_validation_error($form_name,lang("'%1' is not a valid floatingpoint number !!!",$value),'');
+						self::set_validation_error($form_name, lang("'%1' is not a valid floatingpoint number !!!", $value), '');
 						break;
 					default:
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[validator]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[validator]', '$value')"*/, '');
 						break;
 				}
 			}
@@ -175,17 +175,17 @@ 
 			{
 				if ((string)$value !== '' || $this->attrs['needed'])	// empty values are Ok if needed is not set
 				{
-					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+					$value = $this->type == 'integer' ? (int)$value : (float)str_replace(',', '.', $value); // allow for german (and maybe other) format
 
 					if (!empty($this->attrs['min']) && $value < $this->attrs['min'])
 					{
-						self::set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$this->attrs['min']),'');
-						$value = $this->type == 'integer' ? (int) $this->attrs['min'] : (float) $this->attrs['min'];
+						self::set_validation_error($form_name, lang("Value has to be at least '%1' !!!", $this->attrs['min']), '');
+						$value = $this->type == 'integer' ? (int)$this->attrs['min'] : (float)$this->attrs['min'];
 					}
 					if (!empty($this->attrs['max']) && $value > $this->attrs['max'])
 					{
-						self::set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$this->attrs['max']),'');
-						$value = $this->type == 'integer' ? (int) $this->attrs['max'] : (float) $this->attrs['max'];
+						self::set_validation_error($form_name, lang("Value has to be at maximum '%1' !!!", $this->attrs['max']), '');
+						$value = $this->type == 'integer' ? (int)$this->attrs['max'] : (float)$this->attrs['max'];
 					}
 				}
 			}
@@ -197,4 +197,4 @@ 
 		}
 	}
 }
-Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Textbox', array('textbox','text','int','integer','float','passwd','hidden','colorpicker','hidden'));
+Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Textbox', array('textbox', 'text', 'int', 'integer', 'float', 'passwd', 'hidden', 'colorpicker', 'hidden'));

Braces +14 added lines, -4 removed lines

@@ -41,7 +41,10 @@ 
 		// normalize types
 		if ($this->type !== 'textbox')
 		{
-			if ($this->type == 'int') $this->type = 'integer';
+			if ($this->type == 'int')
+			{
+				$this->type = 'integer';
+			}
 
 			$this->attrs['type'] = $this->type;
 			$this->type = 'textbox';
@@ -90,7 +93,10 @@ 
 			if (!empty($value))
 			{
 				$preserv =& self::get_array(self::$request->preserv, $form_name, true);
-				if (true) $preserv = (string)$value;
+				if (true)
+				{
+					$preserv = (string)$value;
+				}
 				$value = str_repeat('*', strlen($preserv));
 			}
 		}
@@ -171,11 +177,15 @@ 
 						break;
 				}
 			}
-			elseif ($this->type == 'integer' || $this->type == 'float')	// cast int and float and check range
+			elseif ($this->type == 'integer' || $this->type == 'float')
+			{
+				// cast int and float and check range
 			{
 				if ((string)$value !== '' || $this->attrs['needed'])	// empty values are Ok if needed is not set
 				{
-					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);	// allow for german (and maybe other) format
+					$value = $this->type == 'integer' ? (int) $value : (float) str_replace(',','.',$value);
+			}
+			// allow for german (and maybe other) format
 
 					if (!empty($this->attrs['min']) && $value < $this->attrs['min'])
 					{

api/src/Etemplate/Widget/Tree.php

Doc Comments +1 added lines, -2 removed lines

@@ -361,7 +361,6 @@ 
 	 * Get options from $sel_options array for a given selectbox name
 	 *
 	 * @param string $name
-	 * @param boolean $no_lang=false value of no_lang attribute
 	 * @return array
 	 */
 	public static function selOptions($name)
@@ -400,7 +399,7 @@ 
 	 *
 	 * @param string $widget_type
 	 * @param string $legacy_options options string of widget
-	 * @param boolean $no_lang=false initial value of no_lang attribute (some types set it to true)
+	 * @param boolean $no_lang initial value of no_lang attribute (some types set it to true)
 	 * @param boolean $readonly =false
 	 * @param mixed $value =null value for readonly
 	 * @return array with value => label pairs

Spacing +32 added lines, -32 removed lines

@@ -120,7 +120,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Etempalte\Widget current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		$this->attrs['type'] = $xml->localName;
 		parent::set_attrs($xml, $cloned);
@@ -164,7 +164,7 @@ 
 
 		if (isset($item['item']) && is_array($item['item']))
 		{
-			foreach($item['item'] as &$child)
+			foreach ($item['item'] as &$child)
 			{
 				$child = self::htmlencode_node($child);
 			}
@@ -185,7 +185,7 @@ 
 		{
 			return true;
 		}
-		foreach((array)$item['item'] as $child)
+		foreach ((array)$item['item'] as $child)
 		{
 			if (self::in_tree($id, $child)) return true;
 		}
@@ -215,7 +215,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())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -229,13 +229,13 @@ 
 			{
 				$allowed = $this->attrs['multiple'] ? array() : array('' => $this->attrs['options']);
 				$allowed += self::selOptions($form_name);
-				foreach((array) $value as $val)
+				foreach ((array)$value as $val)
 				{
 					if ($this->type == 'tree-cat' && !($this->attrs['multiple'] && !$val) && !self::in_cats($val, $allowed) ||
 						$this->type == 'tree' && !self::in_tree($val, $allowed))
 					{
-						self::set_validation_error($form_name,lang("'%1' is NOT allowed%2)!", $val,
-							$this->type == 'tree-cat' ? " ('".implode("','",array_keys($allowed)).')' : ''), '');
+						self::set_validation_error($form_name, lang("'%1' is NOT allowed%2)!", $val,
+							$this->type == 'tree-cat' ? " ('".implode("','", array_keys($allowed)).')' : ''), '');
 						$value = '';
 						break;
 					}
@@ -244,13 +244,13 @@ 
 			// return values for cat-tree as string, but not for regular tree as it can have id's with comma!
 			if (is_array($value) && $this->type == 'tree-cat')
 			{
-				$value = implode(',',$value);
+				$value = implode(',', $value);
 			}
 			if ($ok && $value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
@@ -276,7 +276,7 @@ 
 		{
 			// += to keep further options set by app code
 			self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options'],
-				$no_lang=null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name));
+				$no_lang = null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name));
 
 			// if no_lang was modified, forward modification to the client
 			if ($no_lang != $this->attr['no_lang'])
@@ -286,15 +286,15 @@ 
 		}
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
-		foreach(self::$request->sel_options[$form_name] as &$label)
+		foreach (self::$request->sel_options[$form_name] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -306,7 +306,7 @@ 
 	 * @param string $image_path =null default path to use, or empty to use default of /phpgwapi/templates/default/images/dhtmlxtree
 	 * @return string templated url if available, otherwise default path
 	 */
-	public static function templateImagePath($image_path=null)
+	public static function templateImagePath($image_path = null)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($image_path))
@@ -338,20 +338,20 @@ 
 	 */
 	public static function imagePath($image)
 	{
-		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		static $image_path = null;
+		if (!isset($image_path)) $image_path = self::templateImagePath();
 
 		$parts = explode('/', $image_path);
-		$image_parts   = explode('/', $image);
+		$image_parts = explode('/', $image);
 
 		// remove common parts
-		while(isset($parts[0]) && $parts[0] === $image_parts[0])
+		while (isset($parts[0]) && $parts[0] === $image_parts[0])
 		{
 			array_shift($parts);
 			array_shift($image_parts);
 		}
 		// add .. for different parts, except last image part
-		$url = implode('/', array_merge(array_fill(0, count($parts)-1, '..'), $image_parts));
+		$url = implode('/', array_merge(array_fill(0, count($parts) - 1, '..'), $image_parts));
 
 		//error_log(__METHOD__."('$image') image_path=$image_path returning $url");
 		return $url;
@@ -373,10 +373,10 @@ 
 		}
 		else
 		{
-			$name_parts = explode('[',str_replace(']','',$name));
+			$name_parts = explode('[', str_replace(']', '', $name));
 			if (count($name_parts))
 			{
-				$org_name = $name_parts[count($name_parts)-1];
+				$org_name = $name_parts[count($name_parts) - 1];
 				if (isset(self::$request->sel_options[$org_name]) && is_array(self::$request->sel_options[$org_name]))
 				{
 					$options += self::$request->sel_options[$org_name];
@@ -405,9 +405,9 @@ 
 	 * @param mixed $value =null value for readonly
 	 * @return array with value => label pairs
 	 */
-	public static function typeOptions($widget_type, $legacy_options, &$no_lang=false, $readonly=false, $value=null)
+	public static function typeOptions($widget_type, $legacy_options, &$no_lang = false, $readonly = false, $value = null)
 	{
-		list($rows,$type,$type2,$type3) = explode(',',$legacy_options);
+		list($rows, $type, $type2, $type3) = explode(',', $legacy_options);
 
 		$no_lang = false;
 		$options = array();
@@ -417,7 +417,7 @@ 
 				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
-					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
+					foreach (is_array($value) ? $value : (strpos($value, ',') !== false ? explode(',', $value) : array($value)) as $id)
 					{
 						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
 					}
@@ -425,14 +425,14 @@ 
 				}
 				if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
 				{
-					$categories =& $GLOBALS['egw']->categories;
+					$categories = & $GLOBALS['egw']->categories;
 				}
 				else    // we need to instanciate a new cat object for the correct application
 				{
-					$categories = new Api\Categories('',$type3);
+					$categories = new Api\Categories('', $type3);
 				}
-				$cat2path=array();
-				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type,0,true) as $cat)
+				$cat2path = array();
+				foreach ((array)$categories->return_sorted_array(0, False, '', '', '', !$type, 0, true) as $cat)
 				{
 					$s = stripslashes($cat['name']);
 
@@ -463,7 +463,7 @@ 
 				if ($value)
 				{
 					$pathes = $extension_data['unavailable'] = array();
-					foreach(is_array($value) ? $value : explode(',',$value) as $cat)
+					foreach (is_array($value) ? $value : explode(',', $value) as $cat)
 					{
 						if (isset($cat2path[$cat]))
 						{

Braces +24 added lines, -6 removed lines

@@ -187,7 +187,10 @@ 
 		}
 		foreach((array)$item['item'] as $child)
 		{
-			if (self::in_tree($id, $child)) return true;
+			if (self::in_tree($id, $child))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -251,7 +254,10 @@ 
 				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}
@@ -271,7 +277,10 @@ 
 			//error_log(__METHOD__."() setting templated image-path for $form_name: $templated_path");
 		}
 
-		if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
+		if (!is_array(self::$request->sel_options[$form_name]))
+		{
+			self::$request->sel_options[$form_name] = array();
+		}
 		if ($this->attrs['type'])
 		{
 			// += to keep further options set by app code
@@ -339,7 +348,10 @@ 
 	public static function imagePath($image)
 	{
 		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		if (!isset($image_path))
+		{
+			$image_path = self::templateImagePath ();
+		}
 
 		$parts = explode('/', $image_path);
 		$image_parts   = explode('/', $image);
@@ -414,12 +426,18 @@ 
 		switch ($widget_type)
 		{
 			case 'tree-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
-				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
+				if ($readonly)
+				{
+					// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
+				}
 					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
 					{
-						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						if ($id)
+						{
+							$cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						}
 					}
 					break;
 				}

api/src/Etemplate/Widget/Url.php

Doc Comments -1 removed lines

@@ -52,7 +52,6 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -64,12 +64,12 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 				return;
 			}
 			elseif ((string)$value != '' && !isset($this->attrs['preg']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'url':
 						// if no protocol given eg. "www.egroupware.org" prepend "http://" for validation
@@ -79,7 +79,7 @@ 
 						}
 						$url_valid = filter_var($value, FILTER_VALIDATE_URL) ||
 							// Remove intl chars & check again, but if it passes we'll keep the original
-							filter_var(preg_replace('/[^[:print:]]/','',$value), FILTER_VALIDATE_URL);
+							filter_var(preg_replace('/[^[:print:]]/', '', $value), FILTER_VALIDATE_URL);
 						//error_log(__METHOD__."() filter_var(value=".array2string($value).", FILTER_VALIDATE_URL)=".array2string(filter_var($value, FILTER_VALIDATE_URL))." --> url_valid=".array2string($url_valid));
 						// remove http:// validation prefix again
 						if ($missing_protocol)
@@ -88,7 +88,7 @@ 
 						}
 						if (!$url_valid)
 						{
-							self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+							self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value), '');
 							return;
 						}
 						break;
@@ -98,19 +98,19 @@ 
 				}
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = substr($value,0,(int) $this->attrs['maxlength']);
+				$value = substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'],$value))
+			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					default:
 						//error_log("preg_match('{$this->attrs['preg']}', '$value')=".array2string(preg_match($this->attrs['preg'], $value)));
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[preg]', '$value')"*/, '');
 						break;
 				}
 			}

Braces +4 added lines, -1 removed lines

@@ -37,7 +37,10 @@
 		{
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

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'];

Spacing +38 added lines, -38 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");
 		}
@@ -186,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);
@@ -201,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);
 			}
@@ -216,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());
 
@@ -236,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;
@@ -254,14 +254,14 @@ 
 		{
 			$path .= Api\Vfs::encodePathComponent($filename);
 		}
-		if (!Api\Vfs::file_exists($dir = Api\Vfs::dirname($path)) && !Api\Vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!Api\Vfs::file_exists($dir = Api\Vfs::dirname($path)) && !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;
 		}
 
@@ -280,7 +280,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')))
@@ -289,12 +289,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);
 				//...
@@ -313,16 +313,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;

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

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.php

Doc Comments +4 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)
 	{
@@ -544,7 +545,7 @@ 
 	/**
 	 * Returns Html with user and time
 	 *
-	 * @return void
+	 * @return string
 	 */
 	protected static function _user_time_info()
 	{
@@ -602,7 +603,7 @@ 
 	 *
 	 * @param string $username =null username for regular basic Auth
 	 * @param string $password =null password --------- " ----------
-	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
+	 * @return resource context to use with file_get_context/fopen or null if no proxy configured
 	 */
 	public static function proxy_context($username=null, $password=null)
 	{
@@ -970,7 +971,6 @@ 
 	 *
 	 * Themes are css file in the template directory
 	 *
-	 * @param string $themes_dir ='css'
 	 */
 	function list_themes()
 	{
@@ -1156,11 +1156,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);
 
@@ -1253,7 +1248,6 @@ 
 	* @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')
 	{
@@ -1414,7 +1408,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())
 	{

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;
 
 	/**
@@ -1044,13 +1044,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']))
@@ -1154,39 +1154,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;
@@ -1198,16 +1198,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);
 
 	/**
@@ -1242,19 +1242,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')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);

Spacing +124 added lines, -126 removed lines

@@ -120,13 +120,13 @@ 
 			if (empty($GLOBALS['egw_info']['server']['template_set'])) $GLOBALS['egw_info']['server']['template_set'] = 'idots';
 			// setup the new eGW framework (template sets)
 			$class = $GLOBALS['egw_info']['server']['template_set'].'_framework';
-			if (!class_exists($class) &&	// first try to autoload the class
-				file_exists($file=EGW_INCLUDE_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.$class.'.inc.php'))
+			if (!class_exists($class) && // first try to autoload the class
+				file_exists($file = EGW_INCLUDE_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.$class.'.inc.php'))
 			{
 				require_once($file);
-				if (!in_array($file,(array)$_SESSION['egw_required_files']))
+				if (!in_array($file, (array)$_SESSION['egw_required_files']))
 				{
-					$_SESSION['egw_required_files'][] = $file;	// automatic load the used framework class, when the object get's restored
+					$_SESSION['egw_required_files'][] = $file; // automatic load the used framework class, when the object get's restored
 				}
 			}
 		}
@@ -153,7 +153,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++;
 	}
 
@@ -182,9 +182,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);
 	}
 
@@ -196,7 +196,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;
@@ -218,7 +218,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!");
 			}
@@ -253,7 +253,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);
 	}
@@ -268,7 +268,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;
@@ -289,7 +289,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)
@@ -309,7 +309,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
@@ -319,7 +319,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
@@ -334,7 +334,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);
 	}
@@ -355,19 +355,19 @@ 
 	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']['phpgwapi']
 		);
 		$var['page_generation_time'] = '';
-		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 		{
-			$totaltime = sprintf('%4.2lf',microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time']);
+			$totaltime = sprintf('%4.2lf', microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time']);
 
-			$var['page_generation_time'] = '<div class="pageGenTime" id="divGenTime_'.$GLOBALS['egw_info']['flags']['currentapp'].'"><span>'.lang('Page was generated in %1 seconds',$totaltime);
+			$var['page_generation_time'] = '<div class="pageGenTime" id="divGenTime_'.$GLOBALS['egw_info']['flags']['currentapp'].'"><span>'.lang('Page was generated in %1 seconds', $totaltime);
 			if ($GLOBALS['egw_info']['flags']['session_restore_time'])
 			{
 				$var['page_generation_time'] .= ' '.lang('(session restored in %1 seconds)',
-					sprintf('%4.2lf',$GLOBALS['egw_info']['flags']['session_restore_time']));
+					sprintf('%4.2lf', $GLOBALS['egw_info']['flags']['session_restore_time']));
 			}
 			$var['page_generation_time'] .= '</span></div>';
 		}
@@ -397,16 +397,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;
@@ -418,7 +418,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;
@@ -429,7 +429,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'];
 		}
@@ -449,9 +449,9 @@ 
 		// 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" />';
 
-		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
+		if (substr($GLOBALS['egw_info']['server']['favicon_file'], 0, 4) == 'http')
 		{
 			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
 		}
@@ -467,7 +467,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,
@@ -491,15 +491,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'];
 
@@ -511,32 +511,32 @@ 
 
 		$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']);
 		}
 
-		if (substr($GLOBALS['egw_info']['server']['login_logo_file'],0,4) == 'http' ||
+		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
 		{
 			$var['logo_file'] = $GLOBALS['egw_info']['server']['login_logo_file'];
 		}
 		else
 		{
-			$var['logo_file'] = Image::find('phpgwapi',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = Image::find('phpgwapi', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$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;
 	}
@@ -549,14 +549,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;
 	}
@@ -568,10 +568,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;
 	   }
 	}
@@ -604,14 +604,14 @@ 
 	 * @param string $password =null password --------- " ----------
 	 * @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)
+	public static function proxy_context($username = null, $password = null)
 	{
 		$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,
@@ -640,7 +640,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);
 	}
@@ -653,7 +653,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!");
@@ -670,7 +670,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]);
 	}
 
 	/**
@@ -711,15 +711,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;
 				}
@@ -732,7 +732,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))
 			{
@@ -749,21 +749,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);
 			}
 		}
 
@@ -796,13 +796,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;
 	}
@@ -836,7 +836,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;
 			}
@@ -867,7 +867,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';
 				}
@@ -893,7 +893,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 = '';
 
@@ -901,7 +901,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
@@ -913,7 +913,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'],
@@ -925,7 +925,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
@@ -935,18 +935,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();
@@ -955,10 +955,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";
 			}
 		}
 
@@ -981,7 +981,7 @@ 
 			{
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
-					list($name) = explode('.',$file);
+					list($name) = explode('.', $file);
 					$list[$name] = $name;
 				}
 			}
@@ -996,21 +996,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,'jdots'=>null,'idots'=>null);
+		$list = array('pixelegg'=>null, 'jdots'=>null, 'idots'=>null);
 		// templates packaged in old phpgwapi
-		if (file_exists(EGW_SERVER_ROOT . '/phpgwapi') && ($d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates')))
+		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi') && ($d = dir(EGW_SERVER_ROOT.'/phpgwapi/templates')))
 		{
-			while (($entry=$d->read()))
+			while (($entry = $d->read()))
 			{
-				if ($entry != '..' && file_exists(EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry .'/class.'.$entry.'_framework.inc.php'))
+				if ($entry != '..' && file_exists(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/class.'.$entry.'_framework.inc.php'))
 				{
-					if (file_exists ($f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/setup/setup.inc.php'))
+					if (file_exists($f = EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/setup/setup.inc.php'))
 					{
 						include($f);
-						$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'];
 					}
 					else
 					{
@@ -1025,16 +1024,15 @@ 
 		}
 		// 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'];
 				}
 			}
 		}
@@ -1051,14 +1049,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');
@@ -1083,9 +1081,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);
 		}
 
@@ -1095,7 +1093,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');
 		}
@@ -1107,9 +1105,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(
@@ -1123,20 +1121,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]);
 			}
@@ -1162,7 +1160,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
@@ -1172,7 +1170,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();
 
@@ -1187,7 +1185,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;
@@ -1208,7 +1206,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
@@ -1218,7 +1216,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();
 
@@ -1255,7 +1253,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')
+	static function includeJS($package, $file = null, $app = 'phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);
 	}
@@ -1267,7 +1265,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))
 		{
@@ -1286,7 +1284,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));
 
@@ -1294,7 +1292,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;
 	}
@@ -1314,7 +1312,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)
 		{
@@ -1334,16 +1332,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);
 		}
 
@@ -1352,7 +1350,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);
 		}
@@ -1428,17 +1426,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);
 			}
@@ -1456,16 +1454,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'),

Braces +54 added lines, -15 removed lines

@@ -117,7 +117,10 @@ 
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
 			// default to idots, if no template_set set, to eg. not stall installations if settings use self::link
-			if (empty($GLOBALS['egw_info']['server']['template_set'])) $GLOBALS['egw_info']['server']['template_set'] = 'idots';
+			if (empty($GLOBALS['egw_info']['server']['template_set']))
+			{
+				$GLOBALS['egw_info']['server']['template_set'] = 'idots';
+			}
 			// setup the new eGW framework (template sets)
 			$class = $GLOBALS['egw_info']['server']['template_set'].'_framework';
 			if (!class_exists($class) &&	// first try to autoload the class
@@ -240,7 +243,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;
 	}
@@ -270,8 +276,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();
 
@@ -449,7 +461,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" />';
+		}
 
 		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
 		{
@@ -691,13 +706,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;
 	}
@@ -786,9 +807,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;
 		}
@@ -838,7 +862,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))))
@@ -925,7 +952,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
@@ -937,7 +966,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)."\"";
 		}
@@ -1085,7 +1117,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);
 		}
 
@@ -1110,7 +1143,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',
@@ -1138,7 +1174,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

@@ -354,7 +354,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']['phpgwapi']
 		);
@@ -763,7 +763,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);
 			}
 		}
 
@@ -796,13 +796,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;
 	}

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

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, -1, 1024)) &&
+		list($file) = explode('?', $path, 2);
+		if (($to_check = file_get_contents(EGW_SERVER_ROOT.$file, false, null, -1, 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);

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

api/src/Framework/Favorites.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +22 added lines, -23 removed lines

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

Braces +5 added lines, -1 removed lines

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