EGroupware / egroupware

api/src/Etemplate/Widget/File.php

Indentation +4 added lines, -4 removed lines

@@ -238,10 +238,10 @@
 	}
 
 	/**
-	* Delete a directory RECURSIVELY
-	* @param string $dir - directory path
-	* @link http://php.net/manual/en/function.rmdir.php
-	*/
+	 * Delete a directory RECURSIVELY
+	 * @param string $dir - directory path
+	 * @link http://php.net/manual/en/function.rmdir.php
+	 */
 	private static function rrmdir($dir)
 	{
 		if (is_dir($dir))

Spacing +37 added lines, -37 removed lines

@@ -27,12 +27,12 @@ 
 	 *
 	 * @param string $xml
 	 */
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 
 		// Legacy multiple - id ends in []
-		if(substr($this->id,-2) == '[]')
+		if (substr($this->id, -2) == '[]')
 		{
 			$this->setElementAttribute($this->id, 'multiple', true);
 		}
@@ -52,7 +52,7 @@ 
 		$response = Api\Json\Response::get();
 		$request_id = str_replace(' ', '+', rawurldecode($_REQUEST['request_id']));
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id)) {
+		if (!self::$request = Etemplate\Request::read($request_id)) {
 			$response->error("Could not read session");
 			return;
 		}
@@ -70,20 +70,20 @@ 
 		foreach ($_FILES as $field => &$files)
 		{
 			$widget = $template->getElementById($widget_id ? $widget_id : $field);
-			if($widget && $widget->attrs['mime']) {
+			if ($widget && $widget->attrs['mime']) {
 				$mime = $widget->attrs['mime'];
 			}
 
 			// Check for legacy [] in id to indicate multiple - it changes format
-			if(is_array($files['name'])) {
+			if (is_array($files['name'])) {
 				$file_list = array();
-				foreach($files as $f_field => $values)
+				foreach ($files as $f_field => $values)
 				{
-					foreach($values as $key => $f_value) {
+					foreach ($values as $key => $f_value) {
 						$file_list[$key][$f_field] = $f_value;
 					}
 				}
-				foreach($file_list as $file)
+				foreach ($file_list as $file)
 				{
 					self::process_uploaded_file($field, $file, $mime, $file_data);
 				}
@@ -99,13 +99,13 @@ 
 		$response->data($file_data);
 
 		// Check for a callback, call it if there is one
-		foreach($_FILES as $field => $file)
+		foreach ($_FILES as $field => $file)
 		{
-			if(($element = $template->getElementById($field)))
+			if (($element = $template->getElementById($field)))
 			{
 				$callback = $element->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
-				if($callback)
+				if (!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if ($callback)
 				{
 					ExecMethod($callback, $_FILES[$field]);
 				}
@@ -118,10 +118,10 @@ 
 	 */
 	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
 	{
-		unset($field);	// not used
+		unset($field); // not used
 
 		// Chunks get mangled a little
-		if($file['name'] == 'blob')
+		if ($file['name'] == 'blob')
 		{
 			$file['name'] = $_POST['resumableFilename'];
 			$file['type'] = $_POST['resumableType'];
@@ -129,14 +129,14 @@ 
 
 		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
 			// Mime check
-			if($mime)
+			if ($mime)
 			{
 				$type = $file['type'];
 				$is_preg = $mime[0] == '/';
-				if (!$is_preg && strcasecmp($mime,$type) ||
-					$is_preg && !preg_match($mime,$type))
+				if (!$is_preg && strcasecmp($mime, $type) ||
+					$is_preg && !preg_match($mime, $type))
 				{
-					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!',$type,$mime);
+					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!', $type, $mime);
 					//error_log(__METHOD__.__LINE__.array2string($file_data[$file['name']]));
 					return false;
 				}
@@ -145,8 +145,8 @@ 
 			// Resumable / chunked uploads
 			// init the destination file (format <filename.ext>.part<#chunk>
 			// the file is stored in a temporary directory
-			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/','_',$_POST['resumableIdentifier']);
-			$dest_file = $temp_dir.'/'.str_replace('/','_',$_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
+			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/', '_', $_POST['resumableIdentifier']);
+			$dest_file = $temp_dir.'/'.str_replace('/', '_', $_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
 
 			// create the temporary directory
 			if (!is_dir($temp_dir))
@@ -162,10 +162,10 @@ 
 			else
 			{
 				// check if all the parts present, and create the final destination file
-				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
+				$new_file = self::createFileFromChunks($temp_dir, str_replace('/', '_', $_POST['resumableFilename']),
 						$_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if ($new_file) {
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -194,7 +194,7 @@ 
 
 		// count all the parts of this file
 		$total_files = 0;
-		foreach(scandir($temp_dir) as $file) {
+		foreach (scandir($temp_dir) as $file) {
 			if (stripos($file, $fileName) !== false) {
 				$total_files++;
 			}
@@ -202,10 +202,10 @@ 
 
 		// check that all the parts are present
 		// the size of the last part is between chunkSize and 2*$chunkSize
-		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+		if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) {
 			if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 			{
-				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
+				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'egw_');
 			}
 			else
 			{
@@ -214,7 +214,7 @@ 
 
 			// create the final destination file
 			if (($fp = fopen($new_file, 'w')) !== false) {
-				for ($i=1; $i<=$total_files; $i++) {
+				for ($i = 1; $i <= $total_files; $i++) {
 					fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
 				}
 				fclose($fp);
@@ -250,13 +250,13 @@ 
 			{
 				if ($object != "." && $object != "..")
 				{
-					if (filetype($dir . "/" . $object) == "dir")
+					if (filetype($dir."/".$object) == "dir")
 					{
-						self::rrmdir($dir . "/" . $object);
+						self::rrmdir($dir."/".$object);
 					}
 					else
 					{
-						unlink($dir . "/" . $object);
+						unlink($dir."/".$object);
 					}
 				}
 			}
@@ -273,23 +273,23 @@ 
 	 * @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);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$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);
 
-			if(!is_array($value)) $value = array();
+			if (!is_array($value)) $value = array();
 
 			// Incoming values indexed by temp name
-			if($value[0]) $value = $value[0];
+			if ($value[0]) $value = $value[0];
 
-			foreach($value as $tmp => $file)
+			foreach ($value as $tmp => $file)
 			{
-				if(!$file) continue;
+				if (!$file) continue;
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmp;
@@ -309,7 +309,7 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if ($valid && !$this->attrs['multiple']) $valid = $valid[0];
 		}
 	}
 }

Braces +58 added lines, -22 removed lines

@@ -29,7 +29,10 @@ 
 	 */
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 
 		// Legacy multiple - id ends in []
 		if(substr($this->id,-2) == '[]')
@@ -48,11 +51,13 @@ 
 	 *
 	 * @note Currently, no attempt is made to clean up files automatically.
 	 */
-	public static function ajax_upload() {
+	public static function ajax_upload()
+	{
 		$response = Api\Json\Response::get();
 		$request_id = str_replace(' ', '+', rawurldecode($_REQUEST['request_id']));
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id)) {
+		if(!self::$request = Etemplate\Request::read($request_id))
+		{
 			$response->error("Could not read session");
 			return;
 		}
@@ -70,16 +75,19 @@ 
 		foreach ($_FILES as $field => &$files)
 		{
 			$widget = $template->getElementById($widget_id ? $widget_id : $field);
-			if($widget && $widget->attrs['mime']) {
+			if($widget && $widget->attrs['mime'])
+			{
 				$mime = $widget->attrs['mime'];
 			}
 
 			// Check for legacy [] in id to indicate multiple - it changes format
-			if(is_array($files['name'])) {
+			if(is_array($files['name']))
+			{
 				$file_list = array();
 				foreach($files as $f_field => $values)
 				{
-					foreach($values as $key => $f_value) {
+					foreach($values as $key => $f_value)
+					{
 						$file_list[$key][$f_field] = $f_value;
 					}
 				}
@@ -104,7 +112,10 @@ 
 			if(($element = $template->getElementById($field)))
 			{
 				$callback = $element->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if(!$callback)
+				{
+					$callback = $template->getElementAttribute($field, 'callback');
+				}
 				if($callback)
 				{
 					ExecMethod($callback, $_FILES[$field]);
@@ -127,7 +138,8 @@ 
 			$file['type'] = $_POST['resumableType'];
 		}
 
-		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
+		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name']))
+		{
 			// Mime check
 			if($mime)
 			{
@@ -165,7 +177,8 @@ 
 				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
 						$_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if( $new_file)
+			{
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -190,19 +203,23 @@ 
 	 * @param string $chunkSize - each chunk size (in bytes)
 	 * @param string $totalSize - original file size (in bytes)
 	 */
-	private static function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize) {
+	private static function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize)
+	{
 
 		// count all the parts of this file
 		$total_files = 0;
-		foreach(scandir($temp_dir) as $file) {
-			if (stripos($file, $fileName) !== false) {
+		foreach(scandir($temp_dir) as $file)
+		{
+			if (stripos($file, $fileName) !== false)
+			{
 				$total_files++;
 			}
 		}
 
 		// check that all the parts are present
 		// the size of the last part is between chunkSize and 2*$chunkSize
-		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1))
+		{
 			if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 			{
 				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
@@ -213,21 +230,28 @@ 
 			}
 
 			// create the final destination file
-			if (($fp = fopen($new_file, 'w')) !== false) {
-				for ($i=1; $i<=$total_files; $i++) {
+			if (($fp = fopen($new_file, 'w')) !== false)
+			{
+				for ($i=1; $i<=$total_files; $i++)
+				{
 					fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
 				}
 				fclose($fp);
-			} else {
+			}
+			else
+			{
 				_log('cannot create the destination file');
 				return false;
 			}
 
 			// rename the temporary directory (to avoid access from other
 			// concurrent chunks uploads) and than delete it
-			if (rename($temp_dir, $temp_dir.'_UNUSED')) {
+			if (rename($temp_dir, $temp_dir.'_UNUSED'))
+			{
 				self::rrmdir($temp_dir.'_UNUSED');
-			} else {
+			}
+			else
+			{
 				self::rrmdir($temp_dir);
 			}
 
@@ -282,14 +306,23 @@ 
 			$value = $value_in = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
 
-			if(!is_array($value)) $value = array();
+			if(!is_array($value))
+			{
+				$value = array();
+			}
 
 			// Incoming values indexed by temp name
-			if($value[0]) $value = $value[0];
+			if($value[0])
+			{
+				$value = $value[0];
+			}
 
 			foreach($value as $tmp => $file)
 			{
-				if(!$file) continue;
+				if(!$file)
+				{
+					continue;
+				}
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmp;
@@ -309,7 +342,10 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if($valid && !$this->attrs['multiple'])
+			{
+				$valid = $valid[0];
+			}
 		}
 	}
 }

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

@@ -116,7 +116,7 @@
 	/**
 	 * Process one uploaded file.  There should only be one per request...
 	 */
-	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
+	protected static function process_uploaded_file($field, array &$file, $mime, array &$file_data)
 	{
 		unset($field);	// not used
 

api/src/Etemplate/Widget/Button.php

Spacing +5 added lines, -5 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);
 		//error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
@@ -53,18 +53,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);
 				if (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;
 				}
@@ -76,4 +76,4 @@ 
 		}
 	}
 }
-Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button','buttononly'));
+Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button', 'buttononly'));

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

Braces +5 added lines, -3 removed lines

@@ -58,10 +58,12 @@
 				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);
-				if (true) $valid = is_array($value) ? $value : 'pressed';
+				if (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]')

api/src/Etemplate/Widget/Grid.php

Spacing +20 added lines, -20 removed lines

@@ -65,11 +65,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];
 
@@ -85,13 +85,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;
 		}
 
@@ -101,10 +101,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;
@@ -116,7 +116,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
@@ -143,7 +143,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'] . ']');
@@ -151,7 +151,7 @@ 
 
 			if ($this->type == 'columns' && $disabled)
 			{
-				$columns_disabled[] = $n;	// mark column as disabled
+				$columns_disabled[] = $n; // mark column as disabled
 			}
 		}
 		if ($this->type == 'grid')
@@ -175,34 +175,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(($patstr = strstr($pat, '$')))
+				while (($patstr = strstr($pat, '$')))
 				{
-					$pat = substr($patstr,$patstr[1] == '{' ? 2 : 1);
+					$pat = substr($patstr, $patstr[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));
 						unset($value);

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

api/src/Etemplate/Widget/HtmlArea.php

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

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

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

api/src/Etemplate/Widget/ItemPicker.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -40,7 +40,7 @@ 
 	 * Find items that match the given parameters
 	 * using the egw_link class
 	 */
-	public static function ajax_item_search($app, $type, $pattern, $options=array())
+	public static function ajax_item_search($app, $type, $pattern, $options = array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
 		$items = Api\Link::query($app, $pattern, $options);

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}

api/src/Etemplate/Widget/HistoryLog.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * while it uses select-account for owner in historylog (containing all users).
 	 *
 	 * @param string $cname
-	*/
+	 */
 	public function beforeSendToClient($cname)
 	{
 		$form_name = self::form_name($cname, $this->id);

Spacing +8 added lines, -8 removed lines

@@ -38,19 +38,19 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id);
 
-		if(is_array(self::$request->content[$form_name]['status-widgets']))
+		if (is_array(self::$request->content[$form_name]['status-widgets']))
 		{
-			foreach(self::$request->content[$form_name]['status-widgets'] as $key => $type)
+			foreach (self::$request->content[$form_name]['status-widgets'] as $key => $type)
 			{
-				if(!is_array($type))
+				if (!is_array($type))
 				{
-					list($basetype) = explode('-',$type);
+					list($basetype) = explode('-', $type);
 					$widget = @self::factory($basetype, '<?xml version="1.0"?><'.$type.' type="'.$type.'"/>', $key);
 					$widget->id = $key;
 					$widget->attrs['type'] = $type;
 					$widget->type = $type;
 
-					if(method_exists($widget, 'beforeSendToClient'))
+					if (method_exists($widget, 'beforeSendToClient'))
 					{
 						// need to use $form_name as $cname see comment in header
 						$widget->beforeSendToClient($form_name, array());
@@ -59,7 +59,7 @@ 
 				else
 				{
 					// need to use self::form_name($form_name, $key) as index into sel_options see comment in header
-					$options =& self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
+					$options = & self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
 					if (!is_array($options)) $options = array();
 					$options += $type;
 				}
@@ -82,11 +82,11 @@ 
 	 * @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);
 		$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;
 		return true;
 	}

Braces +8 added lines, -2 removed lines

@@ -60,7 +60,10 @@ 
 				{
 					// need to use self::form_name($form_name, $key) as index into sel_options see comment in header
 					$options =& self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
-					if (!is_array($options)) $options = array();
+					if (!is_array($options))
+					{
+						$options = array();
+					}
 					$options += $type;
 				}
 
@@ -87,7 +90,10 @@ 
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = self::get_array($content, $form_name);
 		$valid =& self::get_array($validated, $form_name, true);
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 		return true;
 	}
 }

api/src/Etemplate/Widget/Nextmatch.php

Spacing +143 added lines, -143 removed lines

@@ -90,9 +90,9 @@ 
 	 */
 	const ICON_PATH = '/api/images';
 
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -115,13 +115,13 @@ 
 	 * @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)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = self::get_array(self::$request->content, $form_name, true);
 
 		$value['start'] = 0;
-		if(!array_key_exists('num_rows',$value))
+		if (!array_key_exists('num_rows', $value))
 		{
 			$value['num_rows'] = self::INITIAL_ROWS;
 		}
@@ -130,40 +130,40 @@ 
 
 		$send_value = $value;
 
-		list($app) = explode('.',$value['get_rows']);
-		if(!$GLOBALS['egw_info']['apps'][$app])
+		list($app) = explode('.', $value['get_rows']);
+		if (!$GLOBALS['egw_info']['apps'][$app])
 		{
-			list($app) = explode('.',$this->attrs['template']);
+			list($app) = explode('.', $this->attrs['template']);
 		}
 
 		// Check for a favorite in URL
-		if($_GET['favorite'] && $value['favorites'])
+		if ($_GET['favorite'] && $value['favorites'])
 		{
-			$safe_name = preg_replace('/[^A-Za-z0-9-_]/','_',strip_tags($_GET['favorite']));
-			$pref_name = "favorite_" .$safe_name;
+			$safe_name = preg_replace('/[^A-Za-z0-9-_]/', '_', strip_tags($_GET['favorite']));
+			$pref_name = "favorite_".$safe_name;
 
 			// Do some easy applying of filters server side
 			$favorite = $GLOBALS['egw_info']['user']['preferences'][$app][$pref_name];
-			if(!$favorite && $_GET['favorite'] == 'blank')
+			if (!$favorite && $_GET['favorite'] == 'blank')
 			{
 				// Have to go through each of these
-				foreach(array('search','cat_id','filter','filter2') as $filter)
+				foreach (array('search', 'cat_id', 'filter', 'filter2') as $filter)
 				{
 					$send_value[$filter] = '';
 				}
 				unset($send_value['col_filter']);
 			}
 			// Old type
-			if($favorite && $favorite['filter'])
+			if ($favorite && $favorite['filter'])
 			{
 				$favorite['state'] = $favorite['filter'];
 			}
-			if($favorite && $favorite['state'])
+			if ($favorite && $favorite['state'])
 			{
 				$send_value = array_merge($value, $favorite['state']);
 
 				// Ajax call can handle the saved sort here, but this can't
-				if($favorite['state']['sort'])
+				if ($favorite['state']['sort'])
 				{
 					unset($send_value['sort']);
 					$send_value['order'] = $favorite['state']['sort']['id'];
@@ -175,19 +175,19 @@ 
 		unset($send_value['favorite']);
 
 		// Parse sort into something that get_rows functions are expecting: db_field in order, ASC/DESC in sort
-		if(is_array($send_value['sort']))
+		if (is_array($send_value['sort']))
 		{
 			$send_value['order'] = $send_value['sort']['id'];
 			$send_value['sort'] = $send_value['sort']['asc'] ? 'ASC' : 'DESC';
 		}
-		if($value['num_rows'] != 0)
+		if ($value['num_rows'] != 0)
 		{
 			$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys, null, null, $this);
 		}
-		if (true) $value =& self::get_array(self::$request->content, $form_name, true);
+		if (true) $value = & self::get_array(self::$request->content, $form_name, true);
 
 		// Add favorite here so app doesn't save it in the session
-		if($_GET['favorite'])
+		if ($_GET['favorite'])
 		{
 			$send_value['favorite'] = $safe_name;
 		}
@@ -195,32 +195,32 @@ 
 		$value['total'] = $total;
 
 		// Send categories
-		if(!$value['no_cat'] && !$value['cat_is_select'])
+		if (!$value['no_cat'] && !$value['cat_is_select'])
 		{
 			$cat_app = $value['cat_app'] ? $value['cat_app'] : $GLOBALS['egw_info']['flags']['current_app'];
 			$value['options-cat_id'] = self::$request->sel_options['cat_id'] ? self::$request->sel_options['cat_id'] : array();
 
 			// Add 'All', if not already there
-			if(!$value['options-cat_id'][''] && !$value['options-cat_id'][0])
+			if (!$value['options-cat_id'][''] && !$value['options-cat_id'][0])
 			{
 				$value['options-cat_id'][''] = lang('All categories');
 			}
-			$value['options-cat_id'] += Select::typeOptions('select-cat', ',,'.$cat_app,$no_lang=true,false,$value['cat_id']);
+			$value['options-cat_id'] += Select::typeOptions('select-cat', ',,'.$cat_app, $no_lang = true, false, $value['cat_id']);
 			Select::fix_encoded_options($value['options-cat_id']);
 		}
 
 		// Favorite group for admins
-		if($GLOBALS['egw_info']['apps']['admin'] && $value['favorites'])
+		if ($GLOBALS['egw_info']['apps']['admin'] && $value['favorites'])
 		{
 			self::$request->sel_options[$form_name]['favorite']['group'] = array('all' => lang('All users')) +
-				Select::typeOptions('select-account',',groups');
+				Select::typeOptions('select-account', ',groups');
 		}
-		foreach($value as $name => &$_value)
+		foreach ($value as $name => &$_value)
 		{
-			if(strpos($name, 'options-') !== false && $_value)
+			if (strpos($name, 'options-') !== false && $_value)
 			{
 				$select = substr($name, 8);
-				if(!self::$request->sel_options[$select])
+				if (!self::$request->sel_options[$select])
 				{
 					self::$request->sel_options[$select] = array();
 				}
@@ -231,14 +231,14 @@ 
 				//unset($value[$name]);
 			}
 		}
-		if($value['rows']['sel_options'])
+		if ($value['rows']['sel_options'])
 		{
-			self::$request->sel_options = array_merge(self::$request->sel_options,$value['rows']['sel_options']);
+			self::$request->sel_options = array_merge(self::$request->sel_options, $value['rows']['sel_options']);
 			unset($value['rows']['sel_options']);
 		}
 
 		// If column selection preference is forced, set a flag to turn off UI
-		$pref_name = 'nextmatch-' . (isset($value['columnselection_pref']) ? $value['columnselection_pref'] : $this->attrs['template']);
+		$pref_name = 'nextmatch-'.(isset($value['columnselection_pref']) ? $value['columnselection_pref'] : $this->attrs['template']);
 		$value['no_columnselection'] = $value['no_columnselection'] || (
 			$GLOBALS['egw']->preferences->forced[$app][$pref_name] &&
 			// Need to check admin too, or it will be impossible to turn off
@@ -278,8 +278,8 @@ 
 	 * @todo for $queriedRange[refresh] first check if there's any modification since $lastModified, return $result[order]===null
 	 * @return array with values for keys 'total', 'rows', 'readonlys', 'order', 'data' and 'lastModification'
 	 */
-	static public function ajax_get_rows($exec_id, array $queriedRange, array $filters = array(), $form_name='nm',
-		array $knownUids=null, $lastModified=null)
+	static public function ajax_get_rows($exec_id, array $queriedRange, array $filters = array(), $form_name = 'nm',
+		array $knownUids = null, $lastModified = null)
 	{
 		self::$request = Etemplate\Request::read($exec_id);
 		// fix for somehow empty etemplate request content
@@ -290,7 +290,7 @@ 
 		self::$response = Api\Json\Response::get();
 
 		$value = self::get_array(self::$request->content, $form_name, true);
-		if(!is_array($value))
+		if (!is_array($value))
 		{
 			$value = ($value) ? array($value) : array();
 		}
@@ -305,15 +305,15 @@ 
 			);
 			$valid_filters = array();
 
-			if($template)
+			if ($template)
 			{
-				$template->run('validate', array('', $expand, $expand['cont'], &$valid_filters), false);	// $respect_disabled=false: as client may disable things, here we validate everything and leave it to the get_rows to interpret
+				$template->run('validate', array('', $expand, $expand['cont'], &$valid_filters), false); // $respect_disabled=false: as client may disable things, here we validate everything and leave it to the get_rows to interpret
 				$filters = $valid_filters[$form_name];
 			}
 			// Avoid empty arrays, they cause problems with db filtering
-			foreach($filters['col_filter'] as $col => &$val)
+			foreach ($filters['col_filter'] as $col => &$val)
 			{
-				if(is_array($val) && count($val) == 0)
+				if (is_array($val) && count($val) == 0)
 				{
 					unset($filters['col_filter'][$col]);
 				}
@@ -328,7 +328,7 @@ 
 		$result = array();
 
 		// Parse sort into something that get_rows functions are expecting: db_field in order, ASC/DESC in sort
-		if(is_array($value['sort']))
+		if (is_array($value['sort']))
 		{
 			$value['order'] = $value['sort']['id'];
 			$value['sort'] = $value['sort']['asc'] ? 'ASC' : 'DESC';
@@ -336,7 +336,7 @@ 
 
 		$value['start'] = (int)$queriedRange['start'];
 		$value['num_rows'] = (int)$queriedRange['num_rows'];
-		if($value['num_rows'] == 0) $value['num_rows'] = self::INITIAL_ROWS;
+		if ($value['num_rows'] == 0) $value['num_rows'] = self::INITIAL_ROWS;
 		// if app supports parent_id / hierarchy ($value['parent_id'] not empty), set parent_id as filter
 		if (($parent_id = $value['parent_id']))
 		{
@@ -346,9 +346,9 @@ 
 		}
 
 		// Set current app for get_rows
-		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
-		if($app)
+		list($app) = explode('.', self::$request->method);
+		if (!$app) list($app) = explode('::', self::$request->method);
+		if ($app)
 		{
 			$GLOBALS['egw_info']['flags']['currentapp'] = $app;
 			Api\Translation::add_app($app);
@@ -361,7 +361,7 @@ 
 		}
 		$rows = $result['data'] = $result['order'] = array();
 		$result['total'] = self::call_get_rows($value, $rows, $result['readonlys'], null, null, $template);
-		$result['lastModification'] = Api\DateTime::to('now', 'ts')-1;
+		$result['lastModification'] = Api\DateTime::to('now', 'ts') - 1;
 
 		if (isset($GLOBALS['egw_info']['flags']['app_header']) && self::$request->app_header != $GLOBALS['egw_info']['flags']['app_header'])
 		{
@@ -372,12 +372,12 @@ 
 		$row_id = isset($value['row_id']) ? $value['row_id'] : 'id';
 		$row_modified = $value['row_modified'];
 
-		foreach($rows as $n => $row)
+		foreach ($rows as $n => $row)
 		{
 			$kUkey = false;
 			if (is_int($n) && $row)
 			{
-				if (!isset($row[$row_id])) unset($row_id);	// unset default row_id of 'id', if not used
+				if (!isset($row[$row_id])) unset($row_id); // unset default row_id of 'id', if not used
 				if (!isset($row[$row_modified])) unset($row_modified);
 
 				$id = $row_id ? $row[$row_id] : $n;
@@ -405,11 +405,11 @@ 
 			{
 				// Encode all select options and re-index to avoid Firefox's problem with
 				// '' => 'All'
-				if($n == 'sel_options')
+				if ($n == 'sel_options')
 				{
-					foreach($row as &$options)
+					foreach ($row as &$options)
 					{
-						Select::fix_encoded_options($options,true);
+						Select::fix_encoded_options($options, true);
 					}
 				}
 				$result['rows'][$n] = $row;
@@ -481,23 +481,23 @@ 
 
 		// Check for anything changed in the query
 		// Tell the client about the changes
-		$request_value =& self::get_array(self::$request->content, $form_name,true);
+		$request_value = & self::get_array(self::$request->content, $form_name, true);
 		$changes = $no_rows = false;
 
-		foreach($value_in as $key => $original_value)
+		foreach ($value_in as $key => $original_value)
 		{
 			// These keys are ignored
-			if(in_array($key, array('col_filter','start','num_rows','total','order','sort')))
+			if (in_array($key, array('col_filter', 'start', 'num_rows', 'total', 'order', 'sort')))
 			{
 				continue;
 			}
-			if($original_value == $value[$key]) continue;
+			if ($original_value == $value[$key]) continue;
 
 			// These keys we don't send row data back, as they cause a partial reload
-			if(in_array($key, array('template'))) $no_rows = true;
+			if (in_array($key, array('template'))) $no_rows = true;
 
 			// Actions still need extra handling
-			if($key == 'actions' && !isset($value['actions'][0]))
+			if ($key == 'actions' && !isset($value['actions'][0]))
 			{
 				$value['action_links'] = array();
 				$template_name = isset($value['template']) ? $value['template'] : '';
@@ -516,7 +516,7 @@ 
 			));
 		}
 		// Request doesn't handle changing by reference, so force it
-		if($changes)
+		if ($changes)
 		{
 			$content = self::$request->content;
 			self::$request->content = array();
@@ -556,27 +556,27 @@ 
 	 * @param Etemplate\Widget $widget =null instanciated nextmatch widget to let it's widgets transform each row
 	 * @return int|boolean total items found of false on error ($value['get_rows'] not callable)
 	 */
-	private static function call_get_rows(array &$value,array &$rows,array &$readonlys=null,$obj=null,$method=null, Etemplate\Widget $widget=null)
+	private static function call_get_rows(array &$value, array &$rows, array &$readonlys = null, $obj = null, $method = null, Etemplate\Widget $widget = null)
 	{
 		if (is_null($method)) $method = $value['get_rows'];
 
 		if (is_null($obj))
 		{
 			// allow static callbacks
-			if(strpos($method,'::') !== false)
+			if (strpos($method, '::') !== false)
 			{
-				list($class,$method) = explode('::',$method);
+				list($class, $method) = explode('::', $method);
 
 				//  workaround for php < 5.2.3: do NOT call it static, but allow application code to specify static callbacks
-				if (version_compare(PHP_VERSION,'5.2.3','>='))
+				if (version_compare(PHP_VERSION, '5.2.3', '>='))
 				{
-					$method = array($class,$method);
+					$method = array($class, $method);
 					unset($class);
 				}
 			}
 			else
 			{
-				list($app,$class,$method) = explode('.',$value['get_rows']);
+				list($app, $class, $method) = explode('.', $value['get_rows']);
 			}
 			if ($class)
 			{
@@ -596,23 +596,23 @@ 
 		}
 		$raw_rows = array();
 		if (!is_array($readonlys)) $readonlys = array();
-		if(is_callable($method))	// php5.2.3+ static call (value is always a var param!)
+		if (is_callable($method))	// php5.2.3+ static call (value is always a var param!)
 		{
-			$total = call_user_func_array($method,array(&$value,&$raw_rows,&$readonlys));
+			$total = call_user_func_array($method, array(&$value, &$raw_rows, &$readonlys));
 		}
-		elseif(is_object($obj) && method_exists($obj,$method))
+		elseif (is_object($obj) && method_exists($obj, $method))
 		{
-			$total = $obj->$method($value,$raw_rows,$readonlys);
+			$total = $obj->$method($value, $raw_rows, $readonlys);
 		}
 		else
 		{
-			$total = false;	// method not callable
+			$total = false; // method not callable
 		}
 		// if we have a nextmatch widget, find the repeating row
 		if ($widget && $widget->attrs['template'])
 		{
 			$row_template = $widget->getElementById($widget->attrs['template']);
-			if(!$row_template)
+			if (!$row_template)
 			{
 				$row_template = Template::instance($widget->attrs['template']);
 			}
@@ -620,9 +620,9 @@ 
 			// Try to find just the repeating part
 			$repeating_row = null;
 			// First child should be a grid, we want last row
-			foreach($row_template->children[0]->children[1]->children as $child)
+			foreach ($row_template->children[0]->children[1]->children as $child)
 			{
-				if($child->type == 'row') $repeating_row = $child;
+				if ($child->type == 'row') $repeating_row = $child;
 			}
 		}
 		// otherwise we might get stoped by max_excutiontime
@@ -634,7 +634,7 @@ 
 
 		// remove empty rows required by old etemplate to compensate for header rows
 		$first = $total ? null : 0;
-		foreach($raw_rows as $n => $row)
+		foreach ($raw_rows as $n => $row)
 		{
 			// skip empty rows inserted for each header-line in old etemplate
 			if (is_int($n) && is_array($rows))
@@ -645,14 +645,14 @@ 
 				{
 					$row['is_parent'] = isset($is_parent_value) ?
 						$row[$is_parent] == $is_parent_value : (boolean)$row[$is_parent];
-					$row['parent_id'] = $row[$parent_id];	// seems NOT used on client!
+					$row['parent_id'] = $row[$parent_id]; // seems NOT used on client!
 				}
 				// run beforeSendToClient methods of widgets in row on row-data
-				if($repeating_row)
+				if ($repeating_row)
 				{
 					// Change anything by widget for each row ($row set to 1)
 					$_row = array(1 => &$row);
-					$repeating_row->run('set_row_value', array('',array('row' => 1), &$_row), true);
+					$repeating_row->run('set_row_value', array('', array('row' => 1), &$_row), true);
 				}
 				else if (!$widget || get_class($widget) != __NAMESPACE__.'\\HistoryLog')
 				{
@@ -660,13 +660,13 @@ 
 					//error_log(self::$request->template['name'] . ' had to fallback to run_beforeSendToClient() because it could not find the row');
 					$row = self::run_beforeSendToClient($row);
 				}
-				$rows[$n-$first+$value['start']] = $row;
+				$rows[$n - $first + $value['start']] = $row;
 			}
-			elseif(!is_numeric($n))	// rows with string-keys, after numeric rows
+			elseif (!is_numeric($n))	// rows with string-keys, after numeric rows
 			{
-				if($n == 'sel_options')
+				if ($n == 'sel_options')
 				{
-					foreach($row as $name => &$options)
+					foreach ($row as $name => &$options)
 					{
 						// remember newly set options for validation of nextmatch filters
 						self::$request->sel_options[$name] = $options;
@@ -695,7 +695,7 @@ 
 	{
 		$timestamps = self::get_timestamps();
 
-		foreach($row as $name => &$value)
+		foreach ($row as $name => &$value)
 		{
 			if ($name[0] != '#' && in_array($name, $timestamps) && $value &&
 				(is_int($value) || is_string($value) && is_numeric($value)) &&
@@ -717,15 +717,15 @@ 
 		return Api\Cache::getTree(__CLASS__, 'timestamps', function()
 		{
 			$timestamps = array();
-			foreach(scandir(EGW_SERVER_ROOT) as $app)
+			foreach (scandir(EGW_SERVER_ROOT) as $app)
 			{
 				$dir = EGW_SERVER_ROOT.'/'.$app;
 				if (is_dir($dir) && file_exists($dir.'/setup/tables_current.inc.php') &&
 					($tables_defs = $GLOBALS['egw']->db->get_table_definitions($app)))
 				{
-					foreach($tables_defs as $defintion)
+					foreach ($tables_defs as $defintion)
 					{
-						foreach($defintion['fd'] as $col => $data)
+						foreach ($defintion['fd'] as $col => $data)
 						{
 							if ($data['type'] == 'timestamp' || $data['meta'] == 'timestamp')
 							{
@@ -743,7 +743,7 @@ 
 			}
 			//error_log(__METHOD__."() returning ".array2string($timestamps));
 			return $timestamps;
-		}, array(), 86400);	// cache for 1 day
+		}, array(), 86400); // cache for 1 day
 	}
 
 	/**
@@ -795,18 +795,18 @@ 
 	 * @param array $default_attrs =null default attributes
 	 * @return array
 	 */
-	public static function egw_actions(array $actions=null, $template_name='', $prefix='', array &$action_links=array(),
-		$max_length=self::DEFAULT_MAX_MENU_LENGTH, array $default_attrs=null)
+	public static function egw_actions(array $actions = null, $template_name = '', $prefix = '', array &$action_links = array(),
+		$max_length = self::DEFAULT_MAX_MENU_LENGTH, array $default_attrs = null)
 	{
 		//echo "<p>".__METHOD__."(\$actions, '$template_name', '$prefix', \$action_links, $max_length) \$actions="; _debug_array($actions);
-		$first_level = !$action_links;	// add all first level actions
+		$first_level = !$action_links; // add all first level actions
 
 		//echo "actions="; _debug_array($actions);
 		$egw_actions = array();
 		$n = 1;
 		$group = false;
 
-		foreach((array)$actions as $id => $action)
+		foreach ((array)$actions as $id => $action)
 		{
 			// in case it's only selectbox  id => label pairs
 			if (!is_array($action)) $action = array('caption' => $action);
@@ -834,12 +834,12 @@ 
 
 			if (!$first_level && $n == $max_length && count($actions) > $max_length)
 			{
-				$id = 'more_'.count($actions);	// we need a new unique id
+				$id = 'more_'.count($actions); // we need a new unique id
 				$action = array(
 					'caption' => 'More',
 					'prefix' => $prefix,
 					// display rest of actions incl. current one as children
-					'children' => array_slice($actions, $max_length-1, count($actions)-$max_length+1, true),
+					'children' => array_slice($actions, $max_length - 1, count($actions) - $max_length + 1, true),
 				);
 				//echo "*** Inserting id=$prefix$id"; _debug_array($action);
 				// we break at end of foreach loop, as rest of actions is already dealt with
@@ -847,8 +847,8 @@ 
 			}
 
 			// add all first level popup actions plus ones with enabled = 'javaScript:...' to action_links
-			if ((!isset($action['type']) || in_array($action['type'],array('popup','drag','drop'))) &&	// popup is the default
-				($first_level || substr($action['enabled'],0,11) == 'javaScript:'))
+			if ((!isset($action['type']) || in_array($action['type'], array('popup', 'drag', 'drop'))) && // popup is the default
+				($first_level || substr($action['enabled'], 0, 11) == 'javaScript:'))
 			{
 				$action_links[] = $prefix.$id;
 			}
@@ -856,7 +856,7 @@ 
 			// add sub-menues
 			if ($action['children'])
 			{
-				static $inherit_attrs = array('url','popup','nm_action','onExecute','type','egw_open','allowOnMultiple','confirm','confirm_multiple');
+				static $inherit_attrs = array('url', 'popup', 'nm_action', 'onExecute', 'type', 'egw_open', 'allowOnMultiple', 'confirm', 'confirm_multiple');
 				$inherit_keys = array_flip($inherit_attrs);
 				$action['children'] = self::egw_actions($action['children'], $template_name, $action['prefix'], $action_links, $max_length,
 					array_intersect_key($action, $inherit_keys));
@@ -864,28 +864,28 @@ 
 				unset($action['prefix']);
 
 				// Allow default actions to keep their onExecute
-				if($action['default']) unset($inherit_keys['onExecute']);
+				if ($action['default']) unset($inherit_keys['onExecute']);
 				$action = array_diff_key($action, $inherit_keys);
 			}
 
 			// link or popup action
 			if ($action['url'])
 			{
-				$action['url'] = Api\Framework::link('/index.php',str_replace('$action',$id,$action['url']));
+				$action['url'] = Api\Framework::link('/index.php', str_replace('$action', $id, $action['url']));
 				if ($action['popup'])
 				{
-					list($action['data']['width'],$action['data']['height']) = explode('x',$action['popup']);
+					list($action['data']['width'], $action['data']['height']) = explode('x', $action['popup']);
 					unset($action['popup']);
 					$action['data']['nm_action'] = 'popup';
 				}
 				else
 				{
 					$action['data']['nm_action'] = 'location';
-					if(!$action['target'] && strpos($action['url'],'menuaction') > 0)
+					if (!$action['target'] && strpos($action['url'], 'menuaction') > 0)
 					{
 						// It would be better if app set target, but we'll auto-detect if not
-						list(,$menuaction) = explode('=',$action['url']);
-						list($app) = explode('.',$menuaction);
+						list(,$menuaction) = explode('=', $action['url']);
+						list($app) = explode('.', $menuaction);
 						$action['data']['target'] = $app;
 					}
 				}
@@ -901,12 +901,12 @@ 
 		}
 
 		// Make sure select all is in a group by itself
-		foreach($egw_actions as $id => &$_action)
+		foreach ($egw_actions as $id => &$_action)
 		{
-			if($id == $prefix . 'select_all') continue;
-			if($_action['group'] >= $egw_actions[$prefix.'select_all']['group'] )
+			if ($id == $prefix.'select_all') continue;
+			if ($_action['group'] >= $egw_actions[$prefix.'select_all']['group'])
 			{
-				$egw_actions[$id]['group']+=1;
+				$egw_actions[$id]['group'] += 1;
 			}
 		}
 		//echo "egw_actions="; _debug_array($egw_actions);
@@ -927,11 +927,11 @@ 
 	 * @param int $max_cats_flat =self::DEFAULT_MAX_MENU_LENGTH use hierarchical display if more cats
 	 * @return array like self::egw_actions
 	 */
-	public static function category_action($app, $group=0, $caption='Change category',
-		$prefix='cat_', $globals=true, $parent_id=0, $max_cats_flat=self::DEFAULT_MAX_MENU_LENGTH)
+	public static function category_action($app, $group = 0, $caption = 'Change category',
+		$prefix = 'cat_', $globals = true, $parent_id = 0, $max_cats_flat = self::DEFAULT_MAX_MENU_LENGTH)
 	{
-		$cat = new Api\Categories(null,$app);
-		$cats = $cat->return_sorted_array($start=0, false, '', 'ASC', 'cat_name', $globals, $parent_id, true);
+		$cat = new Api\Categories(null, $app);
+		$cats = $cat->return_sorted_array($start = 0, false, '', 'ASC', 'cat_name', $globals, $parent_id, true);
 
 		// if more then max_length cats, switch automatically to hierarchical display
 		if (count($cats) > $max_cats_flat)
@@ -941,9 +941,9 @@ 
 		else	// flat, indented categories
 		{
 			$cat_actions = array();
-			foreach((array)$cats as $cat)
+			foreach ((array)$cats as $cat)
 			{
-				$name = str_repeat('&nbsp;',2*$cat['level']) . stripslashes($cat['name']);
+				$name = str_repeat('&nbsp;', 2 * $cat['level']).stripslashes($cat['name']);
 
 				$cat_actions[$cat['id']] = array(
 					'caption' => $name,
@@ -973,10 +973,10 @@ 
 	 * @param int $parent_id =0 only returns cats of a certain parent
 	 * @return array
 	 */
-	private static function category_hierarchy(array $cats, $prefix, $parent_id=0)
+	private static function category_hierarchy(array $cats, $prefix, $parent_id = 0)
 	{
 		$cat_actions = array();
-		foreach($cats as $key => $cat)
+		foreach ($cats as $key => $cat)
 		{
 			// current hierarchy level
 			if ($cat['parent'] == $parent_id)
@@ -996,14 +996,14 @@ 
 				unset($cats[$key]);
 			}
 			// direct children
-			elseif(isset($cat_actions[$cat['parent']]))
+			elseif (isset($cat_actions[$cat['parent']]))
 			{
 				$cat_actions['sub_'.$cat['parent']] = $cat_actions[$cat['parent']];
 				// have to add category itself to children, to be able to select it!
-				$cat_actions[$cat['parent']]['group'] = -1;	// own group on top
+				$cat_actions[$cat['parent']]['group'] = -1; // own group on top
 				$cat_actions['sub_'.$cat['parent']]['children'] = array(
 					$cat['parent'] => $cat_actions[$cat['parent']],
-				)+self::category_hierarchy($cats, $prefix, $cat['parent']);
+				) + self::category_hierarchy($cats, $prefix, $cat['parent']);
 				unset($cat_actions[$cat['parent']]);
 			}
 		}
@@ -1026,7 +1026,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);
 		$value = self::get_array($content, $form_name);
@@ -1035,7 +1035,7 @@ 
 		// $content.  Fetch them from the request, so we actually have them.
 		$content_value = self::get_array(self::$request->content, $form_name);
 
-		list($app) = explode('.',$this->attrs['template']);
+		list($app) = explode('.', $this->attrs['template']);
 
 		unset($value['favorite']);
 
@@ -1044,18 +1044,18 @@ 
 
 		// Legacy support - action popups were not properly namespaced
 		$preserve = self::get_array(self::$request->preserv, $form_name);
-		if($value[$preserve['action_var']] && $content[$value[$preserve['action_var']].'_popup'])
+		if ($value[$preserve['action_var']] && $content[$value[$preserve['action_var']].'_popup'])
 		{
 			$validated += $content[$value[$preserve['action_var']].'_popup'];
 		}
 
 
 		// Save current column settings as default, clear, or force (admins only)
-		if($GLOBALS['egw_info']['user']['apps']['admin'] && $app && $value['selectcols'])
+		if ($GLOBALS['egw_info']['user']['apps']['admin'] && $app && $value['selectcols'])
 		{
-			$pref_name = 'nextmatch-' . (isset($content_value['columnselection_pref']) ? $content_value['columnselection_pref'] : $this->attrs['template']);
+			$pref_name = 'nextmatch-'.(isset($content_value['columnselection_pref']) ? $content_value['columnselection_pref'] : $this->attrs['template']);
 			$refresh_pref_name = $pref_name.'-autorefresh';
-			switch($value['nm_col_preference']) {
+			switch ($value['nm_col_preference']) {
 				case 'force':
 					$pref_level = 'forced';
 					break;
@@ -1068,39 +1068,39 @@ 
 			}
 
 			// Clear forced pref before setting default
-			if($pref_level != 'forced')
+			if ($pref_level != 'forced')
 			{
-				$GLOBALS['egw']->preferences->delete($app,$pref_name,'forced');
-				$GLOBALS['egw']->preferences->delete($app,$refresh_pref_name,'forced');
-				$GLOBALS['egw']->preferences->delete($app,$pref_name.'-size','forced');
-				$GLOBALS['egw']->preferences->delete($app,$pref_name.'-lettersearch','forced');
-				$GLOBALS['egw']->preferences->save_repository(true,'forced');
+				$GLOBALS['egw']->preferences->delete($app, $pref_name, 'forced');
+				$GLOBALS['egw']->preferences->delete($app, $refresh_pref_name, 'forced');
+				$GLOBALS['egw']->preferences->delete($app, $pref_name.'-size', 'forced');
+				$GLOBALS['egw']->preferences->delete($app, $pref_name.'-lettersearch', 'forced');
+				$GLOBALS['egw']->preferences->save_repository(true, 'forced');
 			}
 
 			// Set columns + refresh as default for all users
 			// Columns included in submit, preference might not be updated yet
 			$cols = $value['selectcols'];
 			$GLOBALS['egw']->preferences->read_repository(true);
-			$GLOBALS['egw']->preferences->add($app,$pref_name,is_array($cols) ? implode(',',$cols) : $cols, $pref_level);
+			$GLOBALS['egw']->preferences->add($app, $pref_name, is_array($cols) ? implode(',', $cols) : $cols, $pref_level);
 
 			// Autorefresh
 			$refresh = $value['nm_autorefresh'];
-			$GLOBALS['egw']->preferences->add($app,$refresh_pref_name,(int)$refresh,$pref_level);
+			$GLOBALS['egw']->preferences->add($app, $refresh_pref_name, (int)$refresh, $pref_level);
 
 			// Lettersearch
 			$lettersearch = is_array($cols) && in_array('lettersearch', $cols);
-			$GLOBALS['egw']->preferences->add($app,$pref_name.'-lettersearch',(int)$lettersearch,$pref_level);
+			$GLOBALS['egw']->preferences->add($app, $pref_name.'-lettersearch', (int)$lettersearch, $pref_level);
 
-			$GLOBALS['egw']->preferences->save_repository(true,$pref_level);
+			$GLOBALS['egw']->preferences->save_repository(true, $pref_level);
 			$GLOBALS['egw']->preferences->read(true);
 
-			if($value['nm_col_preference'] == 'reset')
+			if ($value['nm_col_preference'] == 'reset')
 			{
 				// Clear column + refresh preference so users go back to default
-				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name);
-				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name.'-size');
-				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name.'-lettersearch');
-				$GLOBALS['egw']->preferences->delete_preference($app,$refresh_pref_name);
+				$GLOBALS['egw']->preferences->delete_preference($app, $pref_name);
+				$GLOBALS['egw']->preferences->delete_preference($app, $pref_name.'-size');
+				$GLOBALS['egw']->preferences->delete_preference($app, $pref_name.'-lettersearch');
+				$GLOBALS['egw']->preferences->delete_preference($app, $refresh_pref_name);
 			}
 		}
 		unset($value['nm_col_preference']);
@@ -1117,20 +1117,20 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be 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)
 	{
 		$old_param0 = $params[0];
-		$cname =& $params[0];
+		$cname = & $params[0];
 		// Need this check or the headers will get involved too
-		if($this->type == 'nextmatch')
+		if ($this->type == 'nextmatch')
 		{
 			parent::run($method_name, $params, $respect_disabled);
 			if ($this->id) $cname = self::form_name($cname, $this->id, $params[1]);
 
 			// Run on all the sub-templates
-			foreach(array('template', 'header_left', 'header_right', 'header_row') as $sub_template)
+			foreach (array('template', 'header_left', 'header_right', 'header_row') as $sub_template)
 			{
-				if($this->attrs[$sub_template])
+				if ($this->attrs[$sub_template])
 				{
 					$row_template = Template::instance($this->attrs[$sub_template]);
 					$row_template->run($method_name, $params, $respect_disabled);
@@ -1141,10 +1141,10 @@ 
 
 		// Prevent troublesome keys from breaking the nextmatch
 		// TODO: Figure out where these come from
-		foreach(array('$row','${row}', '$', '0','1','2') as $key)
+		foreach (array('$row', '${row}', '$', '0', '1', '2') as $key)
 		{
-			if(is_array(self::$request->content[$cname])) unset(self::$request->content[$cname][$key]);
-			if(is_array(self::$request->preserve[$cname])) unset(self::$request->preserve[$cname][$key]);
+			if (is_array(self::$request->content[$cname])) unset(self::$request->content[$cname][$key]);
+			if (is_array(self::$request->preserve[$cname])) unset(self::$request->preserve[$cname][$key]);
 		}
 	}
 
@@ -1159,9 +1159,9 @@ 
 	 * @param array|string $row_ids rows to refresh
 	 * @param string $type ='edit' "edit" (default), "delete" or "add"
 	 */
-	public function refresh($row_ids, $type='edit')
+	public function refresh($row_ids, $type = 'edit')
 	{
-		unset($row_ids, $type);	// not used, but required by function signature
+		unset($row_ids, $type); // not used, but required by function signature
 
 		throw new Api\Exception('Not yet implemented');
 	}

Braces +126 added lines, -34 removed lines

@@ -92,7 +92,8 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -184,14 +185,20 @@ 
 		{
 			$total = self::call_get_rows($send_value, $send_value['rows'], self::$request->readonlys, null, null, $this);
 		}
-		if (true) $value =& self::get_array(self::$request->content, $form_name, true);
+		if (true)
+		{
+			$value =& self::get_array(self::$request->content, $form_name, true);
+		}
 
 		// Add favorite here so app doesn't save it in the session
 		if($_GET['favorite'])
 		{
 			$send_value['favorite'] = $safe_name;
 		}
-		if (true) $value = $send_value;
+		if (true)
+		{
+			$value = $send_value;
+		}
 		$value['total'] = $total;
 
 		// Send categories
@@ -257,7 +264,10 @@ 
 		{
 			$value['action_links'] = array();
 			$template_name = isset($value['template']) ? $value['template'] : $this->attrs['options'];
-			if (!is_array($value['action_links'])) $value['action_links'] = array();
+			if (!is_array($value['action_links']))
+			{
+				$value['action_links'] = array();
+			}
 			$value['actions'] = self::egw_actions($value['actions'], $template_name, '', $value['action_links']);
 		}
 	}
@@ -321,7 +331,10 @@ 
 			//error_log($this . " Valid filters: " . array2string($filters));
 		}
 
-		if (true) $value = $value_in = array_merge($value, $filters);
+		if (true)
+		{
+			$value = $value_in = array_merge($value, $filters);
+		}
 
 		//error_log(__METHOD__."('".substr($exec_id,0,10)."...', range=".array2string($queriedRange).', filters='.array2string($filters).", '$form_name', knownUids=".array2string($knownUids).", lastModified=$lastModified) parent_id=$value[parent_id], is_parent=$value[is_parent]");
 
@@ -336,18 +349,27 @@ 
 
 		$value['start'] = (int)$queriedRange['start'];
 		$value['num_rows'] = (int)$queriedRange['num_rows'];
-		if($value['num_rows'] == 0) $value['num_rows'] = self::INITIAL_ROWS;
+		if($value['num_rows'] == 0)
+		{
+			$value['num_rows'] = self::INITIAL_ROWS;
+		}
 		// if app supports parent_id / hierarchy ($value['parent_id'] not empty), set parent_id as filter
 		if (($parent_id = $value['parent_id']))
 		{
 			// Infolog at least wants 'parent_id' instead of $parent_id
 			$value['col_filter'][$parent_id] = $queriedRange['parent_id'];
-			if ($queriedRange['parent_id']) $value['csv_export'] = 'children';
+			if ($queriedRange['parent_id'])
+			{
+				$value['csv_export'] = 'children';
+			}
 		}
 
 		// Set current app for get_rows
 		list($app) = explode('.',self::$request->method);
-		if(!$app) list($app) = explode('::',self::$request->method);
+		if(!$app)
+		{
+			list($app) = explode('::',self::$request->method);
+		}
 		if($app)
 		{
 			$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -377,8 +399,15 @@ 
 			$kUkey = false;
 			if (is_int($n) && $row)
 			{
-				if (!isset($row[$row_id])) unset($row_id);	// unset default row_id of 'id', if not used
-				if (!isset($row[$row_modified])) unset($row_modified);
+				if (!isset($row[$row_id]))
+				{
+					unset($row_id);
+				}
+				// unset default row_id of 'id', if not used
+				if (!isset($row[$row_modified]))
+				{
+					unset($row_modified);
+				}
 
 				$id = $row_id ? $row[$row_id] : $n;
 				$result['order'][] = $id;
@@ -394,12 +423,14 @@ 
 				if (!$row_id || !$knownUids || ($kUkey = array_search($id, $knownUids)) === false ||
 					!$lastModified || !isset($modified) || $modified > $lastModified ||
 					$queriedRange['refresh'] && $id == $queriedRange['refresh']
-				)
-				{
+				) {
 					$result['data'][$id] = $row;
 				}
 
-				if ($kUkey !== false) unset($knownUids[$kUkey]);
+				if ($kUkey !== false)
+				{
+					unset($knownUids[$kUkey]);
+				}
 			}
 			else	// non-row data set by get_rows method
 			{
@@ -491,17 +522,26 @@ 
 			{
 				continue;
 			}
-			if($original_value == $value[$key]) continue;
+			if($original_value == $value[$key])
+			{
+				continue;
+			}
 
 			// These keys we don't send row data back, as they cause a partial reload
-			if(in_array($key, array('template'))) $no_rows = true;
+			if(in_array($key, array('template')))
+			{
+				$no_rows = true;
+			}
 
 			// Actions still need extra handling
 			if($key == 'actions' && !isset($value['actions'][0]))
 			{
 				$value['action_links'] = array();
 				$template_name = isset($value['template']) ? $value['template'] : '';
-				if (!is_array($value['action_links'])) $value['action_links'] = array();
+				if (!is_array($value['action_links']))
+				{
+					$value['action_links'] = array();
+				}
 				$value['actions'] = self::egw_actions($value['actions'], $template_name, '', $value['action_links']);
 			}
 
@@ -558,7 +598,10 @@ 
 	 */
 	private static function call_get_rows(array &$value,array &$rows,array &$readonlys=null,$obj=null,$method=null, Etemplate\Widget $widget=null)
 	{
-		if (is_null($method)) $method = $value['get_rows'];
+		if (is_null($method))
+		{
+			$method = $value['get_rows'];
+		}
 
 		if (is_null($obj))
 		{
@@ -584,10 +627,13 @@ 
 				{
 					$GLOBALS[$class] = new $class();
 				}
-				if (is_object($GLOBALS[$class]))	// use existing instance (put there by a previous CreateObject)
+				if (is_object($GLOBALS[$class]))
+				{
+					// use existing instance (put there by a previous CreateObject)
 				{
 					$obj = $GLOBALS[$class];
 				}
+				}
 				else
 				{
 					$obj = CreateObject($app.'.'.$class);
@@ -595,11 +641,17 @@ 
 			}
 		}
 		$raw_rows = array();
-		if (!is_array($readonlys)) $readonlys = array();
-		if(is_callable($method))	// php5.2.3+ static call (value is always a var param!)
+		if (!is_array($readonlys))
+		{
+			$readonlys = array();
+		}
+		if(is_callable($method))
+		{
+			// php5.2.3+ static call (value is always a var param!)
 		{
 			$total = call_user_func_array($method,array(&$value,&$raw_rows,&$readonlys));
 		}
+		}
 		elseif(is_object($obj) && method_exists($obj,$method))
 		{
 			$total = $obj->$method($value,$raw_rows,$readonlys);
@@ -622,11 +674,17 @@ 
 			// First child should be a grid, we want last row
 			foreach($row_template->children[0]->children[1]->children as $child)
 			{
-				if($child->type == 'row') $repeating_row = $child;
+				if($child->type == 'row')
+				{
+					$repeating_row = $child;
+				}
 			}
 		}
 		// otherwise we might get stoped by max_excutiontime
-		if ($total > 200) @set_time_limit(0);
+		if ($total > 200)
+		{
+			@set_time_limit(0);
+		}
 
 		$is_parent = $value['is_parent'];
 		$is_parent_value = $value['is_parent_value'];
@@ -639,12 +697,18 @@ 
 			// skip empty rows inserted for each header-line in old etemplate
 			if (is_int($n) && is_array($rows))
 			{
-				if (is_null($first)) $first = $n;
+				if (is_null($first))
+				{
+					$first = $n;
+				}
 
-				if ($row[$is_parent])	// if app supports parent_id / hierarchy, set parent_id and is_parent
+				if ($row[$is_parent])
+				{
+					// if app supports parent_id / hierarchy, set parent_id and is_parent
 				{
 					$row['is_parent'] = isset($is_parent_value) ?
 						$row[$is_parent] == $is_parent_value : (boolean)$row[$is_parent];
+				}
 					$row['parent_id'] = $row[$parent_id];	// seems NOT used on client!
 				}
 				// run beforeSendToClient methods of widgets in row on row-data
@@ -662,7 +726,9 @@ 
 				}
 				$rows[$n-$first+$value['start']] = $row;
 			}
-			elseif(!is_numeric($n))	// rows with string-keys, after numeric rows
+			elseif(!is_numeric($n))
+			{
+				// rows with string-keys, after numeric rows
 			{
 				if($n == 'sel_options')
 				{
@@ -670,6 +736,7 @@ 
 					{
 						// remember newly set options for validation of nextmatch filters
 						self::$request->sel_options[$name] = $options;
+			}
 
 						Select::fix_encoded_options($options, true);
 					}
@@ -809,8 +876,14 @@ 
 		foreach((array)$actions as $id => $action)
 		{
 			// in case it's only selectbox  id => label pairs
-			if (!is_array($action)) $action = array('caption' => $action);
-			if ($default_attrs) $action += $default_attrs;
+			if (!is_array($action))
+			{
+				$action = array('caption' => $action);
+			}
+			if ($default_attrs)
+			{
+				$action += $default_attrs;
+			}
 
 			// Add 'Select All' after first group
 			if ($first_level && $group !== false && $action['group'] != $group && !$egw_actions[$prefix.'select_all'])
@@ -864,7 +937,10 @@ 
 				unset($action['prefix']);
 
 				// Allow default actions to keep their onExecute
-				if($action['default']) unset($inherit_keys['onExecute']);
+				if($action['default'])
+				{
+					unset($inherit_keys['onExecute']);
+				}
 				$action = array_diff_key($action, $inherit_keys);
 			}
 
@@ -897,13 +973,19 @@ 
 
 			$egw_actions[$prefix.$id] = $action;
 
-			if (!$first_level && $n++ == $max_length) break;
+			if (!$first_level && $n++ == $max_length)
+			{
+				break;
+			}
 		}
 
 		// Make sure select all is in a group by itself
 		foreach($egw_actions as $id => &$_action)
 		{
-			if($id == $prefix . 'select_all') continue;
+			if($id == $prefix . 'select_all')
+			{
+				continue;
+			}
 			if($_action['group'] >= $egw_actions[$prefix.'select_all']['group'] )
 			{
 				$egw_actions[$id]['group']+=1;
@@ -1055,7 +1137,8 @@ 
 		{
 			$pref_name = 'nextmatch-' . (isset($content_value['columnselection_pref']) ? $content_value['columnselection_pref'] : $this->attrs['template']);
 			$refresh_pref_name = $pref_name.'-autorefresh';
-			switch($value['nm_col_preference']) {
+			switch($value['nm_col_preference'])
+			{
 				case 'force':
 					$pref_level = 'forced';
 					break;
@@ -1125,7 +1208,10 @@ 
 		if($this->type == 'nextmatch')
 		{
 			parent::run($method_name, $params, $respect_disabled);
-			if ($this->id) $cname = self::form_name($cname, $this->id, $params[1]);
+			if ($this->id)
+			{
+				$cname = self::form_name($cname, $this->id, $params[1]);
+			}
 
 			// Run on all the sub-templates
 			foreach(array('template', 'header_left', 'header_right', 'header_row') as $sub_template)
@@ -1143,8 +1229,14 @@ 
 		// TODO: Figure out where these come from
 		foreach(array('$row','${row}', '$', '0','1','2') as $key)
 		{
-			if(is_array(self::$request->content[$cname])) unset(self::$request->content[$cname][$key]);
-			if(is_array(self::$request->preserve[$cname])) unset(self::$request->preserve[$cname][$key]);
+			if(is_array(self::$request->content[$cname]))
+			{
+				unset(self::$request->content[$cname][$key]);
+			}
+			if(is_array(self::$request->preserve[$cname]))
+			{
+				unset(self::$request->preserve[$cname][$key]);
+			}
 		}
 	}
 

api/src/Etemplate/Widget/Toolbar.php

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

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

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

Spacing +17 added lines, -17 removed lines

@@ -36,7 +36,7 @@ 
 	{
 		$this->attrs['allowFreeEntries'] = true;
 
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -56,7 +56,7 @@ 
 		if ($type == "account")
 		{
 			// Only search if a query was provided - don't search for all accounts
-			if($query)
+			if ($query)
 			{
 				$options['account_type'] = $_REQUEST['account_type'];
 				$links = Api\Accounts::link_query($query, $options);
@@ -67,7 +67,7 @@ 
 			$links = Api\Link::query($app, $query, $options);
 		}
 		$results = array();
-		foreach($links as $id => $name)
+		foreach ($links as $id => $name)
 		{
 			$results[] = array('id' => $id, 'label' => $name);
 		}
@@ -87,7 +87,7 @@ 
 	public static function ajax_email()
 	{
 		// If no mail app access, use link system -> addressbook
-		if(!$GLOBALS['egw_info']['apps']['mail'])
+		if (!$GLOBALS['egw_info']['apps']['mail'])
 		{
 			$_REQUEST['app'] = 'addressbook-email';
 			return self::ajax_search();
@@ -105,7 +105,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);
 
@@ -115,38 +115,38 @@ 
 			$value = $value_in = self::get_array($content, $form_name);
 			$allowed = Select::selOptions($form_name);
 
-			foreach((array) $value as $key => $val)
+			foreach ((array)$value as $key => $val)
 			{
-				if(count($allowed) && !$this->attrs['allowFreeEntries'] && !array_key_exists($val,$allowed))
+				if (count($allowed) && !$this->attrs['allowFreeEntries'] && !array_key_exists($val, $allowed))
 				{
-					self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),'');
+					self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", array_keys($allowed))), '');
 					unset($value[$key]);
 				}
-				if($this->type == 'taglist-email' && $this->attrs['include_lists'] && is_numeric($val))
+				if ($this->type == 'taglist-email' && $this->attrs['include_lists'] && is_numeric($val))
 				{
 					$lists = $GLOBALS['egw']->contacts->get_lists(Api\Acl::READ);
-					if(!array_key_exists($val, $lists))
+					if (!array_key_exists($val, $lists))
 					{
-						self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($lists))),'');
+						self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", array_keys($lists))), '');
 					}
 				}
-				else if($this->type == 'taglist-email' && !preg_match(Url::EMAIL_PREG, $val) &&
+				else if ($this->type == 'taglist-email' && !preg_match(Url::EMAIL_PREG, $val) &&
 					// Allow merge placeholders.  Might be a better way to do this though.
-					!preg_match('/{{.+}}|\$\$.+\$\$/',$val)
+					!preg_match('/{{.+}}|\$\$.+\$\$/', $val)
 				)
 				{
-					self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),'');
+					self::set_validation_error($form_name, lang("'%1' has an invalid format", $val), '');
 				}
 			}
 			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), '');
 			}
-			if(array_key_exists('multiple', $this->attrs) && $this->attrs['multiple'] == false)
+			if (array_key_exists('multiple', $this->attrs) && $this->attrs['multiple'] == false)
 			{
 				$value = array_shift($value);
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
 			// with preserved old content and therefore user can not empty a taglist
 			if (true) $valid = $value ? $value : null;

Braces +7 added lines, -4 removed lines

@@ -36,7 +36,8 @@ 
 	{
 		$this->attrs['allowFreeEntries'] = true;
 
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -133,8 +134,7 @@ 
 				else if($this->type == 'taglist-email' && !preg_match(Url::EMAIL_PREG, $val) &&
 					// Allow merge placeholders.  Might be a better way to do this though.
 					!preg_match('/{{.+}}|\$\$.+\$\$/',$val)
-				)
-				{
+				) {
 					self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),'');
 				}
 			}
@@ -149,7 +149,10 @@ 
 			$valid =& self::get_array($validated, $form_name, true);
 			// returning null instead of array(), as array() will be overwritten by etemplate_new::complete_array_merge()
 			// with preserved old content and therefore user can not empty a taglist
-			if (true) $valid = $value ? $value : null;
+			if (true)
+			{
+				$valid = $value ? $value : null;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}