EGroupware / egroupware

etemplate/inc/class.etemplate_request_session.inc.php

Doc Comments -1 removed lines

@@ -77,7 +77,6 @@
 	/**
 	 * Factory method to get a new request object or the one for an existing request
 	 *
-	 * @param string $id=null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
 	static function read($id=null)

Spacing +16 added lines, -16 removed lines

@@ -56,7 +56,7 @@ 
 	 *
 	 * @param array $id
 	 */
-	private function __construct($id=null)
+	private function __construct($id = null)
 	{
 		if (!$id) $id = self::request_id();
 
@@ -80,15 +80,15 @@ 
 	 * @param string $id=null
 	 * @return etemplate_request|boolean the object or false if $id is not found
 	 */
-	static function read($id=null)
+	static function read($id = null)
 	{
 		$request = new etemplate_request_session($id);
 
 		if (!is_null($id))
 		{
-			if (!($data = $GLOBALS['egw']->session->appsession($id,'etemplate')))
+			if (!($data = $GLOBALS['egw']->session->appsession($id, 'etemplate')))
 			{
-				return false;	// request not found
+				return false; // request not found
 			}
 			$request->data = $data;
 		}
@@ -103,8 +103,8 @@ 
 	 */
 	static function request_id()
 	{
-		$time = (int) (100 * microtime(true));	// gives precision of 1/100 sec
-		$id = $GLOBALS['egw_info']['flags']['currentapp'] .':'. $time;
+		$time = (int)(100 * microtime(true)); // gives precision of 1/100 sec
+		$id = $GLOBALS['egw_info']['flags']['currentapp'].':'.$time;
 
 		return $id;
 	}
@@ -144,30 +144,30 @@ 
 	protected function _php4_request_garbage_collection()
 	{
 		// now we are on php4 sessions and do a bit of garbage collection
-		$appsessions =& $_SESSION[egw_session::EGW_APPSESSION_VAR]['etemplate'];
-		$session_used =& $appsessions['session_used'];
+		$appsessions = & $_SESSION[egw_session::EGW_APPSESSION_VAR]['etemplate'];
+		$session_used = & $appsessions['session_used'];
 
 		if ($this->id)
 		{
 			//echo "session_used[$id_used]='".$session_used[$id_used]."'<br/>\n";
-			++$session_used[$this->id];	// count the number of times a session got used
+			++$session_used[$this->id]; // count the number of times a session got used
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20) return; // we dont need to care
 
-		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
+		$now = (int)(100 * microtime(true)); // gives precision of 1/100 sec
 
-		foreach(array_keys($appsessions) as $id)
+		foreach (array_keys($appsessions) as $id)
 		{
-			list(,$time) = explode(':',$id);
+			list(,$time) = explode(':', $id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time) continue; // other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
-			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+			if ($session_used[$id] == 1 && $time < $now - 10 * 6000 || // session used and older then 10min
+				$time < $now - 30 * 6000)	// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);

Braces +18 added lines, -4 removed lines

@@ -58,7 +58,10 @@ 
 	 */
 	private function __construct($id=null)
 	{
-		if (!$id) $id = self::request_id();
+		if (!$id)
+		{
+			$id = self::request_id();
+		}
 
 		$this->id = $id;
 	}
@@ -154,7 +157,11 @@ 
 		}
 		$this->garbage_collection_done = true;
 
-		if (count($appsessions) < 20) return;	// we dont need to care
+		if (count($appsessions) < 20)
+		{
+			return;
+		}
+		// we dont need to care
 
 		$now = (int) (100 * microtime(true));	// gives precision of 1/100 sec
 
@@ -162,15 +169,22 @@ 
 		{
 			list(,$time) = explode(':',$id);
 
-			if (!$time) continue;	// other data, no session
+			if (!$time)
+			{
+				continue;
+			}
+			// other data, no session
 
 			//echo ++$n.') '.$id.': '.(($now-$time)/100.0)."secs old, used=".$session_used[$id].", size=".strlen($appsessions[$id])."<br>\n";
 
 			if ($session_used[$id] == 1 && $time < $now - 10*6000 || // session used and older then 10min
-				$time < $now - 30*6000)	// session not used and older then 30min
+				$time < $now - 30*6000)
+			{
+				// session not used and older then 30min
 			{
 				//echo "<p>boetemplate::php4_session_garbage_collection('$id_used'): unsetting session '$id' (now=$now)</p>\n";
 				unset($appsessions[$id]);
+			}
 				unset($session_used[$id]);
 			}
 		}

etemplate/inc/class.etemplate_widget_button.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,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 +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
 	 * @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);
 		//error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
@@ -49,18 +49,18 @@ 
 		{
 			$value = self::get_array($content, $form_name);
 
-			if(
+			if (
 				// Handle case of not existing $row_cont[id], eg: create[]
 				is_array($value) && count($value) == 1 ||
 				// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
 				$value == true
 			)
 			{
-				$valid =& self::get_array($validated, $form_name, true);
+				$valid = & self::get_array($validated, $form_name, true);
 				$valid = is_array($value) ? $value : 'pressed';
 
 				// recorded pressed button globally, was in the template object before, put now as static on this object
-				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
+				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name, -10) == '[cancel]')
 				{
 					self::$canceled = true;
 				}
@@ -72,4 +72,4 @@ 
 		}
 	}
 }
-etemplate_widget::registerWidget('etemplate_widget_button', array('button','buttononly'));
+etemplate_widget::registerWidget('etemplate_widget_button', array('button', 'buttononly'));

Braces +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
 				is_array($value) && count($value) == 1 ||
 				// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
 				$value == true
-			)
-			{
+			) {
 				$valid =& self::get_array($validated, $form_name, true);
 				$valid = is_array($value) ? $value : 'pressed';
 

etemplate/inc/class.etemplate_widget_checkbox.inc.php

Doc Comments +1 added lines, -1 removed lines

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

@@ -44,7 +44,7 @@ 
 	 * @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);
 
@@ -56,28 +56,28 @@ 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			if (!isset($value))	return;	// value not transmitted --> nothing to validate
-			$valid =& self::get_array($validated, $form_name, true);
+			if (!isset($value))	return; // value not transmitted --> nothing to validate
+			$valid = & self::get_array($validated, $form_name, true);
 
 			if (!$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 !!!'), '');
 			}
 			$type = $this->type ? $this->type : $this->attrs['type'];
 			$value_attr = $type == 'radio' ? 'set_value' : 'selected_value';
 			// defaults for set and unset values
 			$selected_value = true;
 			$unselected_value = false;
-			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value',$this->attrs))
+			if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselected_value', $this->attrs))
 			{
-				if(array_key_exists($value_attr, $this->attrs))
+				if (array_key_exists($value_attr, $this->attrs))
 				{
 					// Expand any content stuff
-					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
-				if(array_key_exists('unselected_value',$this->attrs))
+				if (array_key_exists('unselected_value', $this->attrs))
 				{
-					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'],$expand['cont']);
+					$unselected_value = self::expand_name($this->attrs['unselected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 				}
 			}
 			if ($type == 'radio')
@@ -87,14 +87,14 @@ 
 				{
 					$valid = $value;
 				}
-				elseif ( !$options && $selected_value && $value == $selected_value)
+				elseif (!$options && $selected_value && $value == $selected_value)
 				{
 					// Options set in template, not in sel_options
 					$valid = $selected_value;
 				}
 				elseif (!isset($valid))
 				{
-					$valid = '';	// do not overwrite value of an other radio-button of the same group (identical name)!
+					$valid = ''; // do not overwrite value of an other radio-button of the same group (identical name)!
 				}
 			}
 			elseif (in_array((string)$selected_value, (array)$value))

Braces +13 added lines, -3 removed lines

@@ -56,7 +56,11 @@ 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			if (!isset($value))	return;	// value not transmitted --> nothing to validate
+			if (!isset($value))
+			{
+				return;
+			}
+			// value not transmitted --> nothing to validate
 			$valid =& self::get_array($validated, $form_name, true);
 
 			if (!$value && $this->attrs['needed'])
@@ -101,7 +105,10 @@ 
 			{
 				if ($multiple)
 				{
-					if (!isset($valid)) $valid = array();
+					if (!isset($valid))
+					{
+						$valid = array();
+					}
 					$valid[] = $selected_value;
 				}
 				else
@@ -113,7 +120,10 @@ 
 			{
 				if ($multiple)
 				{
-					if (!isset($valid)) $valid = array();
+					if (!isset($valid))
+					{
+						$valid = array();
+					}
 				}
 				elseif ($value === 'true')
 				{

etemplate/inc/class.etemplate_widget_date.inc.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

@@ -56,17 +56,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);
 		}
@@ -86,10 +86,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);
 
 		$value = $this->format_date($value);
 	}
@@ -101,7 +101,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))
 		{
@@ -111,11 +111,11 @@ 
 		{
 			$date = new egw_time($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');
@@ -137,18 +137,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))
 			{
@@ -158,49 +158,49 @@ 
 			{
 				$valid = (string)$value === '' ? '' : (int)$value;
 			}
-			if($value)
+			if ($value)
 			{
 				$date = new egw_time($value);
 			}
 			if (!empty($this->attrs['min']))
 			{
-				if(is_numeric($this->attrs['min']))
+				if (is_numeric($this->attrs['min']))
 				{
-					$min = new egw_time(strtotime( $this->attrs['min'] . 'days'));
+					$min = new egw_time(strtotime($this->attrs['min'].'days'));
 				}
 				else
 				{
 					$min = new egw_time(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 egw_time(strtotime( $this->attrs['max'] . 'days'));
+					$max = new egw_time(strtotime($this->attrs['max'].'days'));
 				}
 				else
 				{
 					$max = new egw_time(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 = '';
@@ -217,7 +217,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)" . egw_time::to($valid));
 		}

Braces +17 added lines, -4 removed lines

@@ -86,7 +86,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);
@@ -101,7 +104,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))
 		{
@@ -141,9 +148,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'])
@@ -205,10 +215,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 (($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;
 

etemplate/inc/class.etemplate_widget_grid.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 	 * - as a grid can contain other grid's as direct child, we have to backup and initialise $columns_disabled in grid run!
 	 *
 	 * @param string $method_name
-	 * @param array $params=array('') parameter(s) first parameter has to be the cname, second $expand!
-	 * @param boolean $respect_disabled=false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
+	 * @param boolean $respect_disabled false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 * @param array $columns_disabled=array() disabled columns
 	 */
 	public function run($method_name, $params=array(''), $respect_disabled=false, &$columns_disabled=array())

Spacing +20 added lines, -20 removed lines

@@ -61,11 +61,11 @@ 
 	 * @param boolean $respect_disabled=false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 * @param array $columns_disabled=array() disabled columns
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false, &$columns_disabled=array())
+	public function run($method_name, $params = array(''), $respect_disabled = false, &$columns_disabled = array())
 	{
 		// maintain $expand array name-expansion
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
@@ -81,13 +81,13 @@ 
 			//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this disabled='{$this->attrs['disabled']}'=".array2string($disabled).": NOT running");
 			$params[0] = $old_cname;
 			$params[1] = $old_expand;
-			return false;	// return
+			return false; // return
 		}
 		
 		if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
 		if ($expand['cname'] !== $cname && $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 
@@ -97,10 +97,10 @@ 
 		}
 		//foreach($this->children as $n => $child)
 		$repeat_child = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			// maintain $expand array name-expansion
-			switch($this->type)
+			switch ($this->type)
 			{
 				case 'rows':
 					$expand['row'] = $n;
@@ -112,7 +112,7 @@ 
 			if (isset($this->children[$n]))
 			{
 				$child = $this->children[$n];
-				if($this->type == 'rows' || $this->type == 'columns')
+				if ($this->type == 'rows' || $this->type == 'columns')
 				{
 					/*
 					 * We store a clone of the repeated child, because at the end
@@ -139,7 +139,7 @@ 
 				if (in_array($n, $columns_disabled))
 				{
 					//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this column $n is disabled: NOT running");
-					continue;	// do NOT run $method_name on disabled columns
+					continue; // do NOT run $method_name on disabled columns
 				}
 			}
 			//error_log('Running ' . $method_name . ' on child ' . $n . '(' . $child . ') ['.$expand['row'] . ','.$expand['c'] . ']');
@@ -147,7 +147,7 @@ 
 
 			if ($this->type == 'columns' && $disabled)
 			{
-				$columns_disabled[] = $n;	// mark column as disabled
+				$columns_disabled[] = $n; // mark column as disabled
 			}
 		}
 		if ($this->type == 'grid')
@@ -171,34 +171,34 @@ 
 	private function need_autorepeat($cname, array $expand)
 	{
 		// check id's of children
-		foreach($this->children as $n => $direct_child)
+		foreach ($this->children as $n => $direct_child)
 		{
-			foreach(array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
+			foreach (array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
 			{
 				$pat = $child->id;
-				while(($pat = strstr($pat, '$')))
+				while (($pat = strstr($pat, '$')))
 				{
-					$pat = substr($pat,$pat[1] == '{' ? 2 : 1);
+					$pat = substr($pat, $pat[1] == '{' ? 2 : 1);
 
 					switch ($this->type)
 					{
 						case 'column':
-							$Ok = $pat[0] == 'c' && !(substr($pat,0,4) == 'cont' || substr($pat,0,2) == 'c_' ||
-								substr($pat,0,4) == 'col_');
+							$Ok = $pat[0] == 'c' && !(substr($pat, 0, 4) == 'cont' || substr($pat, 0, 2) == 'c_' ||
+								substr($pat, 0, 4) == 'col_');
 							break;
 						case 'row':
-							$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-								substr($pat,0,4) == 'row_' && substr($pat,0,8) != 'row_cont');
+							$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+								substr($pat, 0, 4) == 'row_' && substr($pat, 0, 8) != 'row_cont');
 							//error_log(__METHOD__."() pat='$pat' --> Ok=".array2string($Ok));
 							break;
 						default:
 							return false;
 					}
-					if ($Ok && ($fname=self::form_name($cname, $child->id, $expand)) &&
+					if ($Ok && ($fname = self::form_name($cname, $child->id, $expand)) &&
 						// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 						// for an id like "run[$row_cont[appname]]"
 						substr($fname, -2) != '[]' &&
-						($value = self::get_array(self::$request->content,$fname)) !== null)	// null = not found (can be false!)
+						($value = self::get_array(self::$request->content, $fname)) !== null)	// null = not found (can be false!)
 					{
 						//error_log(__METHOD__."('$cname', ) $this autorepeating row $expand[row] because of $child->id = '$fname' is ".array2string($value));
 						return true;

Braces +8 added lines, -2 removed lines

@@ -88,7 +88,10 @@ 
 			return false;	// return
 		}
 
-		if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
+		if ($this->id)
+		{
+			$cname = self::form_name($cname, $this->id, $expand);
+		}
 		if ($expand['cname'] !== $cname && $cname)
 		{
 			$expand['cont'] =& self::get_array(self::$request->content, $cname);
@@ -202,10 +205,13 @@ 
 						// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 						// for an id like "run[$row_cont[appname]]"
 						substr($fname, -2) != '[]' &&
-						($value = self::get_array(self::$request->content,$fname)) !== null)	// null = not found (can be false!)
+						($value = self::get_array(self::$request->content,$fname)) !== null)
+					{
+						// null = not found (can be false!)
 					{
 						//error_log(__METHOD__."('$cname', ) $this autorepeating row $expand[row] because of $child->id = '$fname' is ".array2string($value));
 						unset($value);
+					}
 						return true;
 					}
 				}

etemplate/inc/class.etemplate_widget_htmlarea.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,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 +5 added lines, -5 removed lines

@@ -38,16 +38,16 @@ 
 		$form_name = self::form_name($cname, $this->id);
 
 		$config = Api\Html\CkEditorConfig::get_ckeditor_config_array($this->attrs['mode'], $this->attrs['height'],
-			$this->attrs['expand_toolbar'],$this->attrs['base_href']
+			$this->attrs['expand_toolbar'], $this->attrs['base_href']
 		);
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = Api\Html\CkEditorConfig::font_size_from_prefs();
 		$font_span = '<span style="width: 100%; display: inline; '.
-			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
+			($font ? 'font-family:'.$font.'; ' : '').($font_size ? 'font-size:'.$font_size.'; ' : '').
 			'">&#8203;</span>';
 		if (empty($font) && empty($font_size)) $font_span = '';
-		if($font_span)
+		if ($font_span)
 		{
 			$config['preference_style'] = $font_span;
 		}
@@ -65,7 +65,7 @@ 
 	 * @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);
 
@@ -77,7 +77,7 @@ 
 			{
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

Braces +8 added lines, -2 removed lines

@@ -46,7 +46,10 @@ 
 		$font_span = '<span style="width: 100%; display: inline; '.
 			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
 			'">&#8203;</span>';
-		if (empty($font) && empty($font_size)) $font_span = '';
+		if (empty($font) && empty($font_size))
+		{
+			$font_span = '';
+		}
 		if($font_span)
 		{
 			$config['preference_style'] = $font_span;
@@ -78,7 +81,10 @@ 
 				$value = Api\Html\HtmLawed::purify($value, $this->attrs['validation_rules']);
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

etemplate/inc/class.etemplate_widget_tabbox.inc.php

Doc Comments +1 added lines, -3 removed lines

@@ -34,8 +34,7 @@ 
 	 * content.  This prevents running the method on disabled tabs.
 	 *
 	 * @param string $method_name
-	 * @param array $params=array('') parameter(s) first parameter has to be the cname, second $expand!
-	 * @param boolean $respect_disabled=false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
+	 * @param boolean $respect_disabled false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 */
 	public function run($method_name, $params=array(''), $respect_disabled=false)
 	{
@@ -87,7 +86,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 +14 added lines, -14 removed lines

@@ -37,24 +37,24 @@ 
 	 * @param array $params=array('') parameter(s) first parameter has to be the cname, second $expand!
 	 * @param boolean $respect_disabled=false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false)
+	public function run($method_name, $params = array(''), $respect_disabled = false)
 	{
 
 		// Make sure additional tabs are processed for any method
-		if($this->attrs['tabs'] && !$this->tabs_attr_evaluated)
+		if ($this->attrs['tabs'] && !$this->tabs_attr_evaluated)
 		{
-			$this->tabs_attr_evaluated = true;	// we must not evaluate tabs attribte more then once!
+			$this->tabs_attr_evaluated = true; // we must not evaluate tabs attribte more then once!
 
 			// add_tabs toggles replacing or adding to existing tabs
-			if(!$this->attrs['add_tabs'])
+			if (!$this->attrs['add_tabs'])
 			{
 				$this->children[1]->children = array();
 			}
 
-			foreach($this->attrs['tabs'] as $tab)
+			foreach ($this->attrs['tabs'] as $tab)
 			{
-				$template= clone etemplate_widget_template::instance($tab['template']);
-				if($tab['id']) $template->attrs['content'] = $tab['id'];
+				$template = clone etemplate_widget_template::instance($tab['template']);
+				if ($tab['id']) $template->attrs['content'] = $tab['id'];
 				$this->children[1]->children[] = $template;
 				unset($template);
 			}
@@ -63,13 +63,13 @@ 
 		// Check for disabled tabs set via readonly, and set them as disabled
 		$form_name = self::form_name($params[0], $this->id, $params[1]);
 		$readonlys = self::get_array(self::$request->readonlys, $form_name);
-		if($respect_disabled && $readonlys)
+		if ($respect_disabled && $readonlys)
 		{
-			foreach($this->children[1]->children as $tab)
+			foreach ($this->children[1]->children as $tab)
 			{
-				$ro_id = explode('.',$tab->template ? $tab->template : $tab->id);
-				$ro_id = $ro_id[count($ro_id)-1];
-				if($readonlys[$ro_id])
+				$ro_id = explode('.', $tab->template ? $tab->template : $tab->id);
+				$ro_id = $ro_id[count($ro_id) - 1];
+				if ($readonlys[$ro_id])
 				{
 					$tab->attrs['disabled'] = $readonlys[$ro_id];
 				}
@@ -89,14 +89,14 @@ 
 	 * @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);
 
 		if (!empty($form_name))
 		{
 			$value = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

Braces +8 added lines, -2 removed lines

@@ -65,7 +65,10 @@ 
 			foreach($tabs as &$tab)
 			{
 				$template= clone Template::instance($tab['template']);
-				if($tab['id']) $template->attrs['content'] = $tab['id'];
+				if($tab['id'])
+				{
+					$template->attrs['content'] = $tab['id'];
+				}
 				$this->children[1]->children[] = $template;
 				$tab['url'] = Template::rel2url($template->rel_path);
 				//$this->tabs[] = $tab;
@@ -112,7 +115,10 @@ 
 		{
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

etemplate/inc/class.etemplate_widget_textbox.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -49,8 +49,8 @@ 
 	 * Reimplemented to handle legacy read-only by setting size < 0
 	 *
 	 * @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 etemplate_widget_template current object or clone, if any attribute was set
+	 * @param boolean $cloned true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
+	 * @return etemplate_widget_textbox current object or clone, if any attribute was set
 	 */
 	public function set_attrs($xml, $cloned=true)
 	{
@@ -105,7 +105,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

@@ -52,7 +52,7 @@ 
 	 * @param boolean $cloned=true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return etemplate_widget_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);
 
@@ -64,7 +64,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;
 	}
@@ -75,16 +75,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));
 			}
@@ -107,7 +107,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);
 
@@ -115,7 +115,7 @@ 
 		{
 			if (!isset($this->attrs['validator']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'int':
 					case 'integer':
@@ -145,24 +145,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;
 				}
 			}
@@ -170,17 +170,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'];
 					}
 				}
 			}
@@ -192,4 +192,4 @@ 
 		}
 	}
 }
-etemplate_widget::registerWidget('etemplate_widget_textbox', array('textbox','text','int','integer','float','passwd','hidden','colorpicker','hidden'));
+etemplate_widget::registerWidget('etemplate_widget_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'])
 					{

etemplate/inc/class.etemplate_widget_toolbar.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,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 +2 added lines, -2 removed lines

@@ -29,14 +29,14 @@
 	 * @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))
 		{
 			$value = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}

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