EGroupware / egroupware

api/src/Etemplate/Widget/Nextmatch/Customfilter.php

Spacing +8 added lines, -8 removed lines

@@ -29,18 +29,18 @@ 
 	 * @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)
 	{
-		switch($this->attrs['type'])
+		switch ($this->attrs['type'])
 		{
 			case "link-entry":
 				self::$transformation['type'] = $this->attrs['type'] = 'nextmatch-entryheader';
 				break;
 			default:
-				list($type) = explode('-',$this->attrs['type']);
-				if($type == 'select')
+				list($type) = explode('-', $this->attrs['type']);
+				if ($type == 'select')
 				{
-					if(in_array($this->attrs['type'], Widget\Select::$cached_types))
+					if (in_array($this->attrs['type'], Widget\Select::$cached_types))
 					{
 						$widget_type = $this->attrs['type'];
 					}
@@ -53,7 +53,7 @@ 
 		$this->setElementAttribute($form_name, 'options', trim($this->attrs['widget_options']) != '' ? $this->attrs['widget_options'] : '');
 
 		$this->setElementAttribute($form_name, 'type', $this->attrs['type']);
-		if($widget_type)
+		if ($widget_type)
 		{
 			$this->setElementAttribute($form_name, 'widget_type', $widget_type);
 		}
@@ -69,11 +69,11 @@ 
 	 * @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())
 	{
 		$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);
 		// 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
 		$valid = $value ? $value : null;

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

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
 

Spacing +39 added lines, -39 removed lines

@@ -39,16 +39,16 @@ 
 	 *
 	 * @param string $xml
 	 */
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
 		$this->bool_attr_default += array(
 			'multiple' => false,
 		);
 
-		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);
 		}
@@ -69,7 +69,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;
@@ -94,22 +94,22 @@ 
 			{
 				$widget = $template->getElementById($matches[1].':$cont[id]:'.$matches[3]);
 			}
-			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)
 				{
 					static::process_uploaded_file($field, $file, $mime, $file_data);
 				}
@@ -123,8 +123,8 @@ 
 			if ($widget)
 			{
 				$callback = $widget->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
-				if($callback)
+				if (!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if ($callback)
 				{
 					ExecMethod2($callback, $_FILES[$field], $widget_id, self::$request, $response);
 				}
@@ -140,10 +140,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'];
@@ -151,19 +151,19 @@ 
 
 		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
 			// Don't trust what the browser tells us for mime
-			if(function_exists('mime_content_type'))
+			if (function_exists('mime_content_type'))
 			{
 				$file['type'] = $type = Api\MimeMagic::analyze_file($file['tmp_name']);
 			}
 
 			// Mime check
-			if($mime)
+			if ($mime)
 			{
 				$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;
 				}
@@ -172,8 +172,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))
@@ -189,10 +189,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['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if ($new_file) {
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -220,7 +220,7 @@ 
 
 		// count all the parts of this file
 		$total_files = $sum_size = 0;
-		foreach(scandir($temp_dir) as $file) {
+		foreach (scandir($temp_dir) as $file) {
 			if (stripos($file, $fileName) !== false) {
 				$total_files++;
 				$sum_size += filesize($temp_dir.'/'.$file);
@@ -233,7 +233,7 @@ 
 		{
 			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
 			{
@@ -242,7 +242,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);
@@ -278,13 +278,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);
 					}
 				}
 			}
@@ -301,23 +301,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;
@@ -337,7 +337,7 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if ($valid && !$this->attrs['multiple']) $valid = $valid[0];
 		}
 	}
 
@@ -350,16 +350,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)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$unit = strtolower(substr($upload_max_filesize, -1));
-		if (!is_numeric($unit)) $upload_max_filesize *= $unit == 'm' ? 1024*1024 : 1024;
-		if ($upload_max_filesize > 1024*1024)
+		if (!is_numeric($unit)) $upload_max_filesize *= $unit == 'm' ? 1024 * 1024 : 1024;
+		if ($upload_max_filesize > 1024 * 1024)
 		{
-			self::setElementAttribute($form_name, 'chunk_size', ($upload_max_filesize-1024*1024)/2);
+			self::setElementAttribute($form_name, 'chunk_size', ($upload_max_filesize - 1024 * 1024) / 2);
 		}
 	}
 }

Braces +52 added lines, -18 removed lines

@@ -45,7 +45,10 @@ 
 			'multiple' => false,
 		);
 
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 
 		// Legacy multiple - id ends in []
 		if(substr($this->id,-2) == '[]')
@@ -105,7 +108,8 @@ 
 				$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;
 					}
 				}
@@ -123,7 +127,10 @@ 
 			if ($widget)
 			{
 				$callback = $widget->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if(!$callback)
+				{
+					$callback = $template->getElementAttribute($field, 'callback');
+				}
 				if($callback)
 				{
 					ExecMethod2($callback, $_FILES[$field], $widget_id, self::$request, $response);
@@ -149,7 +156,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']))
+		{
 			// Don't trust what the browser tells us for mime
 			if(function_exists('mime_content_type'))
 			{
@@ -192,7 +200,8 @@ 
 				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
 						$_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if( $new_file)
+			{
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -216,12 +225,15 @@ 
 	 * @param string $fileName - the original file name
 	 * @param string $totalSize - original file size (in bytes)
 	 */
-	private static function createFileFromChunks($temp_dir, $fileName, $totalSize) {
+	private static function createFileFromChunks($temp_dir, $fileName, $totalSize)
+	{
 
 		// count all the parts of this file
 		$total_files = $sum_size = 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++;
 				$sum_size += filesize($temp_dir.'/'.$file);
 			}
@@ -241,21 +253,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);
 			}
 
@@ -310,14 +329,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;
@@ -337,7 +365,10 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if($valid && !$this->attrs['multiple'])
+			{
+				$valid = $valid[0];
+			}
 		}
 	}
 
@@ -356,7 +387,10 @@ 
 
 		$upload_max_filesize = ini_get('upload_max_filesize');
 		$unit = strtolower(substr($upload_max_filesize, -1));
-		if (!is_numeric($unit)) $upload_max_filesize *= $unit == 'm' ? 1024*1024 : 1024;
+		if (!is_numeric($unit))
+		{
+			$upload_max_filesize *= $unit == 'm' ? 1024*1024 : 1024;
+		}
 		if ($upload_max_filesize > 1024*1024)
 		{
 			self::setElementAttribute($form_name, 'chunk_size', ($upload_max_filesize-1024*1024)/2);

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

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

Spacing +6 added lines, -6 removed lines

@@ -29,21 +29,21 @@
 	 * @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);
+		$value = & self::get_array(self::$request->content, $form_name);
 
 		$image = $value != '' ? $value : $this->attrs['src'];
 
-		if (is_string($image)) list($app,$img) = explode('/',$image,2);
-		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
+		if (is_string($image)) list($app, $img) = explode('/', $image, 2);
+		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img, '/') !== false)
 		{
 			$img = $image;
-			list($app) = explode('.',$form_name);
+			list($app) = explode('.', $form_name);
 		}
 		$src = Api\Image::find($app, $img);
-		if(!$this->id)
+		if (!$this->id)
 		{
 //			self::setElementAttribute($this->attrs['src'], 'id', $this->attrs['src']);
 		}

Braces +4 added lines, -1 removed lines

@@ -36,7 +36,10 @@
 
 		$image = $value != '' ? $value : $this->attrs['src'];
 
-		if (is_string($image)) list($app,$img) = explode('/',$image,2);
+		if (is_string($image))
+		{
+			list($app,$img) = explode('/',$image,2);
+		}
 		if (!$app || !$img || !is_dir(EGW_SERVER_ROOT.'/'.$app) || strpos($img,'/')!==false)
 		{
 			$img = $image;

api/src/Etemplate/Widget/Checkbox.php

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

api/src/Etemplate/Widget.php

Indentation +6 added lines, -6 removed lines

@@ -903,12 +903,12 @@
 	}
 
 	/**
-	* Check if we have not ignored validation errors
-	*
-	* @param string $ignore_validation ='' if not empty regular expression for validation-errors to ignore
-	* @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
-	* @return boolean true if there are not ignored validation errors, false otherwise
-	*/
+	 * Check if we have not ignored validation errors
+	 *
+	 * @param string $ignore_validation ='' if not empty regular expression for validation-errors to ignore
+	 * @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
+	 * @return boolean true if there are not ignored validation errors, false otherwise
+	 */
 	public static function validation_errors($ignore_validation='',$cname='')
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;

Spacing +108 added lines, -108 removed lines

@@ -48,11 +48,11 @@ 
 	 * @var array
 	 */
 	public $bool_attr_default = array(
-		'disabled' => null,	// null = no default
+		'disabled' => null, // null = no default
 		'statustext_html' => false,
 		'no_lang' => false,
 		// strictly speeding only for input widgets, but server-side input-widgets have a validation method, but no shared parent
-		'readonly' => null,	// null = no default
+		'readonly' => null, // null = no default
 		'needed' => false,
 	);
 
@@ -112,9 +112,9 @@ 
 		$this->id = $reader->getAttribute('id');
 
 		// Update content?
-		if(self::$cont == null)
+		if (self::$cont == null)
 			self::$cont = is_array(self::$request->content) ? self::$request->content : array();
-		if($this->id && is_array(self::$cont[$this->id]))
+		if ($this->id && is_array(self::$cont[$this->id]))
 		{
 			$old_cont = self::$cont;
 			self::$cont = self::$cont[$this->id];
@@ -123,7 +123,7 @@ 
 		// read all attributes
 		$this->set_attrs($reader);
 
-		while($reader->read() && $reader->depth > $depth)
+		while ($reader->read() && $reader->depth > $depth)
 		{
 			if ($reader->nodeType == XMLReader::ELEMENT && $reader->depth > $depth)
 			{
@@ -137,7 +137,7 @@ 
 		}
 
 		// Reset content as we leave
-		if($old_cont) {
+		if ($old_cont) {
 			self::$cont = $old_cont;
 		}
 	}
@@ -176,7 +176,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Template current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		$reader = self::get_reader($xml);
 
@@ -193,14 +193,14 @@ 
 
 		// read and set all attributes
 		$template = $this;
-		while($reader->moveToNextAttribute())
+		while ($reader->moveToNextAttribute())
 		{
 			if ($reader->name != 'id' && $template->attr[$reader->name] != $reader->value)
 			{
 				if (!$cloned)
 				{
 					$template = clone($this);
-					$cloned = true;	// only clone it once, otherwise we loose attributes!
+					$cloned = true; // only clone it once, otherwise we loose attributes!
 				}
 				// $reader->value is an object and therefore assigned by reference
 				// this is important to not loose content when validating dynamic generated tabs as in settings!
@@ -217,7 +217,7 @@ 
 				if ($legacy_options && $reader->name == 'options')
 				{
 					$legacy_options = explode(',', $legacy_options);
-					foreach(self::csv_split($value, count($legacy_options)) as $n => $val)
+					foreach (self::csv_split($value, count($legacy_options)) as $n => $val)
 					{
 						if ($legacy_options[$n] && (string)$val !== '') $template->attrs[$legacy_options[$n]] = $val;
 					}
@@ -226,14 +226,14 @@ 
 		}
 
 		// Add in anything in the modification array
-		if(is_array(self::$request->modifications[$this->id]))
+		if (is_array(self::$request->modifications[$this->id]))
 		{
-			$this->attrs = array_merge($this->attrs,self::$request->modifications[$this->id]);
+			$this->attrs = array_merge($this->attrs, self::$request->modifications[$this->id]);
 		}
 
 		// cast boolean attributes to boolean and set their defaults, if they have one
 		//$old_attrs = $this->attrs;
-		foreach($this->bool_attr_default as $name => $default_value)
+		foreach ($this->bool_attr_default as $name => $default_value)
 		{
 			if (!isset($this->attrs[$name]))
 			{
@@ -268,32 +268,32 @@ 
 	 * @param string $enclosure ='"'
 	 * @return array
 	 */
-	public static function csv_split($str,$num=null,$delimiter=',',$enclosure='"')
+	public static function csv_split($str, $num = null, $delimiter = ',', $enclosure = '"')
 	{
-		if (strpos($str,$enclosure) === false)
+		if (strpos($str, $enclosure) === false)
 		{
-			return is_null($num) ? explode($delimiter,$str) : explode($delimiter,$str,$num);	// no need to run this more expensive code
+			return is_null($num) ? explode($delimiter, $str) : explode($delimiter, $str, $num); // no need to run this more expensive code
 		}
-		$parts = explode($delimiter,$str);
-		for($n = 0; isset($parts[$n]); ++$n)
+		$parts = explode($delimiter, $str);
+		for ($n = 0; isset($parts[$n]); ++$n)
 		{
-			$part =& $parts[$n];
+			$part = & $parts[$n];
 			if ($part[0] === $enclosure)
 			{
-				while (isset($parts[$n+1]) && substr($part,-1) !== $enclosure)
+				while (isset($parts[$n + 1]) && substr($part, -1) !== $enclosure)
 				{
 					$part .= $delimiter.$parts[++$n];
 					unset($parts[$n]);
 				}
-				$part = substr(str_replace($enclosure.$enclosure,$enclosure,$part),1,-1);
+				$part = substr(str_replace($enclosure.$enclosure, $enclosure, $part), 1, -1);
 			}
 		}
-		$parts_renum = array_values($parts);	// renumber the parts (in case we had to concat them)
+		$parts_renum = array_values($parts); // renumber the parts (in case we had to concat them)
 
 		if ($num > 0 && count($parts_renum) > $num)
 		{
-			$parts_renum[$num-1] = implode($delimiter,array_slice($parts_renum,$num-1,count($parts_renum)-$num+1));
-			$parts_renum = array_slice($parts_renum,0,$num);
+			$parts_renum[$num - 1] = implode($delimiter, array_slice($parts_renum, $num - 1, count($parts_renum) - $num + 1));
+			$parts_renum = array_slice($parts_renum, 0, $num);
 		}
 		return $parts_renum;
 	}
@@ -320,7 +320,7 @@ 
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."('$class', ".array2string($widgets).") $class is no subclass of ".__CLASS__.'!');
 		}
-		foreach((array)$widgets as $widget)
+		foreach ((array)$widgets as $widget)
 		{
 			self::$widget_registry[$widget] = $class;
 		}
@@ -344,19 +344,19 @@ 
 
 		if (!$widget_registry)	// not in instance cache --> rescan from filesystem
 		{
-			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
+			foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
 			{
-				if(strpos($path, 'tests/') !== FALSE)
+				if (strpos($path, 'tests/') !== FALSE)
 				{
 					continue;
 				}
-				if(substr($path, -4) == '.php')
+				if (substr($path, -4) == '.php')
 				{
 					try
 					{
 						include_once($path);
 					}
-					catch(\Exception $e)
+					catch (\Exception $e)
 					{
 						error_log($e->getMessage());
 					}
@@ -364,18 +364,18 @@ 
 			}
 
 			// Use hook to load custom widgets from other apps
-			$widgets = Api\Hooks::process('etemplate2_register_widgets',array(),true);
-			foreach($widgets as $list)
+			$widgets = Api\Hooks::process('etemplate2_register_widgets', array(), true);
+			foreach ($widgets as $list)
 			{
 				if (is_array($list))
 				{
-					foreach($list as $class)
+					foreach ($list as $class)
 					{
 						try
 						{
-							class_exists($class);	// trigger autoloader
+							class_exists($class); // trigger autoloader
 						}
-						catch(\Exception $e)
+						catch (\Exception $e)
 						{
 							error_log($e->getMessage());
 						}
@@ -384,7 +384,7 @@ 
 			}
 			if (self::$widget_registry['htmlarea'] === Api\Etemplate\Widget\HtmlArea::class)
 			Api\Cache::setInstance('etemplate', 'widget_registry', self::$widget_registry, 3600);
-			else error_log(__METHOD__."() wrong class for Htmlarea: ".function_backtrace ());
+			else error_log(__METHOD__."() wrong class for Htmlarea: ".function_backtrace());
 		}
 		else
 		{
@@ -400,22 +400,22 @@ 
 	 * @param string|XMLReader $xml
 	 * @param string $id =null
 	 */
-	public static function factory($type, $xml, $id=null)
+	public static function factory($type, $xml, $id = null)
 	{
-		$class_name =& self::$widget_registry[$type];
+		$class_name = & self::$widget_registry[$type];
 
 		if (!isset($class_name))
 		{
-			list($basetype) = explode('-',$type);
+			list($basetype) = explode('-', $type);
 			if (//dont think this is used: !class_exists($class_name = 'etemplate_widget_'.str_replace('-','_',$type)) &&
 				!class_exists($class_name = __CLASS__.'\\'.ucfirst($basetype)) &&
 				// widgets supplied by application in class ${app}_widget_etemplate or ${app}_${subtype}_widget_etemplate
 				!(isset($GLOBALS['egw_info']['apps'][$basetype]) &&
-					(class_exists($class_name = str_replace('-','_',$type).'_etemplate_widget') ||
+					(class_exists($class_name = str_replace('-', '_', $type).'_etemplate_widget') ||
 					 class_exists($class_name = $basetype.'_etemplate_widget'))))
 			{
 				// Try for base type, it's probably better than the root
-				if(self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
+				if (self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
 				{
 					$class_name = self::$widget_registry[$basetype];
 				}
@@ -436,22 +436,22 @@ 
 		{
 			// Class in widget registry, but not loaded
 			// Try for a base class
-			$subtypes = explode('-',$type);
+			$subtypes = explode('-', $type);
 			$basetype = $subtypes[0];
-			$class_name = __CLASS__.'\\'.implode('\\',array_map('ucfirst',$subtypes));
-			if(!class_exists($class_name) && self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
+			$class_name = __CLASS__.'\\'.implode('\\', array_map('ucfirst', $subtypes));
+			if (!class_exists($class_name) && self::$widget_registry[$basetype] && self::$widget_registry[$basetype] != $class_name)
 			{
 				// Try for base type, it's probably better than the root
 				$class_name = self::$widget_registry[$basetype];
 			}
-			if(!class_exists($class_name))
+			if (!class_exists($class_name))
 			{
 				// Fall back to widget class, we can not ignore it, as the widget may contain other widgets
 				$class_name = __CLASS__;
 			}
 		}
 
-		if(!$xml)
+		if (!$xml)
 		{
 			if (empty($type)) $type = 'widget';
 			$xml = "<$type id=\"$id\"/>";
@@ -462,7 +462,7 @@ 
 		if ($type == 'template' && $id && ($template = Widget\Template::instance($id)))
 		{
 			// references can set different attributes like: class, span, content (namespace)
-			return $template->set_attrs($xml, false);	// false = need to clone template, if attributs are set!
+			return $template->set_attrs($xml, false); // false = need to clone template, if attributs are set!
 		}
 		return new $class_name($xml);
 	}
@@ -474,9 +474,9 @@ 
 	 * @param string $type =null
 	 * @return Widget|NULL
 	 */
-	public function getElementById($id, $type=null)
+	public function getElementById($id, $type = null)
 	{
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			if ($child->id === $id && (is_null($type) || $child->type === $type))
 			{
@@ -499,7 +499,7 @@ 
 	public function getElementsByType($type)
 	{
 		$elements = array();
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			if ($child->type === $type)
 			{
@@ -519,14 +519,14 @@ 
 	 * @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)
 	{
 		// maintain $expand array name-expansion
 		$cname = $params[0];
-		$expand =& $params[1];
+		$expand = & $params[1];
 		if ($expand['cname'] && $expand['cname'] !== $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 		if ($respect_disabled && ($disabled = $this->attrs['disabled'] && self::check_disabled($this->attrs['disabled'], $expand)))
@@ -539,20 +539,20 @@ 
 			// Some parameter checking to avoid fatal errors
 			$call = true;
 			$method = new ReflectionMethod($this, $method_name);
-			foreach($method->getParameters() as $index => $param)
+			foreach ($method->getParameters() as $index => $param)
 			{
-				if(!$param->isOptional() && !array_key_exists($index,$params))
+				if (!$param->isOptional() && !array_key_exists($index, $params))
 				{
 					error_log("Missing required parameter {$param->getPosition()}: {$param->getName()}");
 					$call = false;
 				}
-				if($param->isArray() && !is_array($params[$index]))
+				if ($param->isArray() && !is_array($params[$index]))
 				{
 					error_log("$method_name expects an array for {$param->getPosition()}: {$param->getName()}");
 					$params[$index] = (array)$params[$index];
 				}
 			}
-			if($call) call_user_func_array(array($this, $method_name), $params);
+			if ($call) call_user_func_array(array($this, $method_name), $params);
 		}
 		// allow calling with a function or closure --> call it with widget as first param
 		elseif (is_callable($method_name))
@@ -560,7 +560,7 @@ 
 			$params[2] = $this;
 			call_user_func_array($method_name, $params);
 		}
-		foreach($this->children as $child)
+		foreach ($this->children as $child)
 		{
 			// If type has something that can be expanded, we need to expand it so the correct method is run
 			$this->expand_widget($child, $expand);
@@ -577,13 +577,13 @@ 
 	 */
 	protected function expand_widget(Widget &$child, array &$expand)
 	{
-		if(strpos($child->attrs['type'], '@') !== false || strpos($child->attrs['type'], '$') !== false)
+		if (strpos($child->attrs['type'], '@') !== false || strpos($child->attrs['type'], '$') !== false)
 		{
-			$type = self::expand_name($child->attrs['type'],$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
-			$id = self::expand_name($child->id,$expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
+			$type = self::expand_name($child->attrs['type'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
+			$id = self::expand_name($child->id, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 			$attrs = $child->attrs;
 			unset($attrs['type']);
-			$expanded_child = self::factory($type, false,$id);
+			$expanded_child = self::factory($type, false, $id);
 			$expanded_child->id = $id;
 			$expanded_child->type = $type;
 			$expanded_child->attrs = $attrs + array('type' => $type);
@@ -606,14 +606,14 @@ 
 	{
 		if (($not = $disabled[0] == '!'))
 		{
-			$disabled = substr($disabled,1);
+			$disabled = substr($disabled, 1);
 		}
-		list($value,$check) = $vals = explode('=',$disabled);
+		list($value, $check) = $vals = explode('=', $disabled);
 
 		// use expand_name to be able to use @ or $
 		$val = self::expand_name($value, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$check_val = self::expand_name($check, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
-		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
+		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val, $val) : $val == $check_val);
 		if ($not) $result = !$result;
 
 		//error_log(__METHOD__."('".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False'));
@@ -655,33 +655,33 @@ 
 	 * 	"del[$cont[id]]" expands to "del[123]" if $cont = array('id' => 123)
 	 * @return string the expanded name
 	 */
-	protected static function expand_name($name,$c,$row,$c_=0,$row_=0,$cont=array())
+	protected static function expand_name($name, $c, $row, $c_ = 0, $row_ = 0, $cont = array())
 	{
 		$is_index_in_content = $name[0] == '@';
-		if (($pos_var=strpos($name,'$')) !== false)
+		if (($pos_var = strpos($name, '$')) !== false)
 		{
 			if (!$cont)
 			{
 				$cont = array();
 			}
 			if (!is_numeric($c)) $c = self::chrs2num($c);
-			$col = self::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
-			if (is_numeric($c_)) $col_ = self::num2chrs($c_-1);
+			$col = self::num2chrs($c - 1); // $c-1 to get: 0:'@', 1:'A', ...
+			if (is_numeric($c_)) $col_ = self::num2chrs($c_ - 1);
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
-			eval('$name = "'.str_replace('"','\\"',$name).'";');
-			unset($col_, $row_, $row_cont, $col_row_cont);	// quiten IDE warning about used vars, they might be used in above eval!
+			eval('$name = "'.str_replace('"', '\\"', $name).'";');
+			unset($col_, $row_, $row_cont, $col_row_cont); // quiten IDE warning about used vars, they might be used in above eval!
 		}
 		if ($is_index_in_content)
 		{
 			if ($name[1] == '@' && is_array(self::$request->content))
 			{
-				$name = self::get_array(self::$request->content,substr($name,2));
+				$name = self::get_array(self::$request->content, substr($name, 2));
 			}
-			elseif(is_array($cont))
+			elseif (is_array($cont))
 			{
-				$name = self::get_array($cont,substr($name,1));
+				$name = self::get_array($cont, substr($name, 1));
 			}
 			else
 			{
@@ -703,11 +703,11 @@ 
 		$min = ord('A');
 		$max = ord('Z') - $min + 1;
 
-		$num = 1+ord($chrs{0})-$min;
+		$num = 1 + ord($chrs{0}) - $min;
 		if (strlen($chrs) > 1)
 		{
 			$num *= 1 + $max - $min;
-			$num += 1+ord($chrs{1})-$min;
+			$num += 1 + ord($chrs{1}) - $min;
 		}
 		return $num;
 	}
@@ -738,7 +738,7 @@ 
 	 */
 	public function __toString()
 	{
-		return '['.get_class($this).'] ' .
+		return '['.get_class($this).'] '.
 			$this->type.($this->attrs['type'] && $this->attrs['type'] != $this->type ? '('.$this->attrs['type'].')' : '').'#'.$this->id;
 	}
 
@@ -747,7 +747,7 @@ 
 	 */
 	public function __clone()
 	{
-		foreach($this->children as $child_num => $child) {
+		foreach ($this->children as $child_num => $child) {
 			$this->children[$child_num] = clone $child;
 		}
 	}
@@ -758,16 +758,16 @@ 
 	 * @param string $indent =''
 	 * @return string
 	 */
-	public function toXml($indent='')
+	public function toXml($indent = '')
 	{
 		echo "$indent<$this->type";
 		if ($this->id) echo ' id="'.htmlspecialchars($this->id).'"';
-		foreach($this->attrs as $name => $value)
+		foreach ($this->attrs as $name => $value)
 		{
 			if ($name == 'options' && $this->legacy_options && (!is_array($this->legacy_options) ||
 				isset($this->legacy_options[$this->attrs['type'] ? $this->attrs['type'] : $this->type])))
 			{
-				continue;	// do NOT output already converted legacy options
+				continue; // do NOT output already converted legacy options
 			}
 			echo ' '.$name.'="'.htmlspecialchars($value).'"';
 		}
@@ -776,7 +776,7 @@ 
 		if ($this->children)
 		{
 			echo ">\n";
-			foreach($this->children as $child)
+			foreach ($this->children as $child)
 			{
 				$child->toXml($indent."\t");
 			}
@@ -799,7 +799,7 @@ 
 	 * @param array $expand =null values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @return string complete form-name
 	 */
-	static function form_name($cname,$name,array $expand=null)
+	static function form_name($cname, $name, array $expand = null)
 	{
 		if ($expand && !empty($name))
 		{
@@ -807,18 +807,18 @@ 
 		}
 		if (count($name_parts = explode('[', $name, 2)) > 1)
 		{
-			$name_parts = array_merge(array($name_parts[0]), explode('][', substr($name_parts[1],0,-1)));
+			$name_parts = array_merge(array($name_parts[0]), explode('][', substr($name_parts[1], 0, -1)));
 		}
 		if (!empty($cname))
 		{
-			array_unshift($name_parts,$cname);
+			array_unshift($name_parts, $cname);
 		}
 		$form_name = array_shift($name_parts);
 		if (count($name_parts))
 		{
 			// RB: not sure why this business with entity encoding for square brakets, it messes up validation
 			//$form_name .= '&#x5B;'.implode('&#x5D;&#x5B;',$name_parts).'&#x5D;';
-			$form_name .= '['.implode('][',$name_parts).']';
+			$form_name .= '['.implode('][', $name_parts).']';
 		}
 		return $form_name;
 	}
@@ -835,36 +835,36 @@ 
 	 * @param bool $skip_empty returns false if $idx is not present in $arr
 	 * @return mixed reference to $arr[$idx] or null if $idx is not set and not $reference_into
 	 */
-	static function &get_array(&$arr,$_idx,$reference_into=False,$skip_empty=False)
+	static function &get_array(&$arr, $_idx, $reference_into = False, $skip_empty = False)
 	{
 		if (!is_array($arr))
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."(\$arr,'$_idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($_idx)) return false;	// given an error in php5.2
+		if (is_object($_idx)) return false; // given an error in php5.2
 
 		// Make sure none of these are left
-		$idx = str_replace(array('&#x5B;','&#x5D;'), array('[',']'), $_idx);
+		$idx = str_replace(array('&#x5B;', '&#x5D;'), array('[', ']'), $_idx);
 
 		// Handle things expecting arrays - ends in []
-		if(substr($idx,-2) == "[]")
+		if (substr($idx, -2) == "[]")
 		{
-			$idx = substr($idx,0,-2);
+			$idx = substr($idx, 0, -2);
 		}
 
 		if (count($idxs = explode('[', $idx, 2)) > 1)
 		{
-			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1],0,-1)));
+			$idxs = array_merge(array($idxs[0]), explode('][', substr($idxs[1], 0, -1)));
 		}
 		$pos = &$arr;
-		foreach($idxs as $idx)
+		foreach ($idxs as $idx)
 		{
 			if (!is_array($pos) && (!$reference_into || $reference_into && isset($pos)))
 			{
 				//if ($reference_into) error_log(__METHOD__."(".(strlen($s=array2string($arr))>512?substr($s,0,512).'...':$s).", '$idx', ".array2string($reference_into).", ".array2string($skip_empty).") ".function_backtrace());
 				return null;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
+			if ($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -882,7 +882,7 @@ 
 	 */
 	static function set_array(&$_arr, $_idx, $_value)
 	{
-		$ref =& self::get_array($_arr, $_idx, true);
+		$ref = & self::get_array($_arr, $_idx, true);
 		if (true) $ref = $_value;
 	}
 
@@ -896,7 +896,7 @@ 
 	 * @param string $form_name =null form_name, to not calculate him again
 	 * @return boolean
 	 */
-	public function is_readonly($cname='', $form_name=null)
+	public function is_readonly($cname = '', $form_name = null)
 	{
 		if (!isset($form_name))
 		{
@@ -906,11 +906,11 @@ 
 			$form_name = self::form_name($cname, $this->id, $expand);
 		}
 		$readonly = $this->attrs['readonly'] || self::$request->readonlys[$form_name] ||
-			self::get_array(self::$request->readonlys,$form_name) === true ||
+			self::get_array(self::$request->readonlys, $form_name) === true ||
 			isset(self::$request->readonlys['__ALL__']) && (
 				// Exceptions to all
 				self::$request->readonlys[$form_name] !== false &&
-				self::get_array(self::$request->readonlys,$form_name) !== false
+				self::get_array(self::$request->readonlys, $form_name) !== false
 			);
 
 		//error_log(__METHOD__."('$cname') this->id='$this->id' --> form_name='$form_name': attrs[readonly]=".array2string($this->attrs['readonly']).", readonlys['$form_name']=".array2string(self::$request->readonlys[$form_name]).", readonlys[$form_name]=".array2string(self::get_array(self::$request->readonlys,$form_name)).", readonlys['__ALL__']=".array2string(self::$request->readonlys['__ALL__'])." returning ".array2string($readonly));
@@ -930,12 +930,12 @@ 
 	 * @param string|boolean $error error-message already translated or false to reset all existing error for given name
 	 * @param string $cname =null set it to '', if the name is already a form-name, defaults to self::$name_vars
 	 */
-	public static function set_validation_error($name,$error,$cname=null)
+	public static function set_validation_error($name, $error, $cname = null)
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//error_log(__METHOD__."('$name','$error','$cname') ".function_backtrace());
 
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname) $name = self::form_name($cname, $name);
 
 		if ($error === false)
 		{
@@ -958,18 +958,18 @@ 
 	* @param string $cname =null name-prefix, which need to be ignored, default self::$name_vars
 	* @return boolean true if there are not ignored validation errors, false otherwise
 	*/
-	public static function validation_errors($ignore_validation='',$cname='')
+	public static function validation_errors($ignore_validation = '', $cname = '')
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
 		if (!$ignore_validation) return count(self::$validation_errors) > 0;
 
-		foreach(array_values(self::$validation_errors) as $name)
+		foreach (array_values(self::$validation_errors) as $name)
 		{
-			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/', '\\1\\2', $name);
 
 			// treat $ignoare_validation only as regular expression, if it starts with a slash
-			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation,$name) ||
+			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation, $name) ||
 				$ignore_validation[0] != '/' && $ignore_validation != $name)
 			{
 				//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') name='$name' ($error) not ignored!!!</p>\n";
@@ -1006,14 +1006,14 @@ 
 	 * @param mixed $val if not NULL sets attribute else returns it
 	 * @return reference to attribute
 	 */
-	public static function &setElementAttribute($name,$attr,$val)
+	public static function &setElementAttribute($name, $attr, $val)
 	{
 		//error_log(__METHOD__."('$name', '$attr', ...) request=".get_class(self::$request).", response=".get_class(self::$response).function_backtrace());
-		$ref =& self::$request->modifications[$name][$attr];
-		if(self::$request && self::$response)
+		$ref = & self::$request->modifications[$name][$attr];
+		if (self::$request && self::$response)
 		{
 			// In an AJAX response - automatically add
-			self::$response->generic('assign',array(
+			self::$response->generic('assign', array(
 				'etemplate_exec_id' => self::$request->id(),
 				'id' => $name,
 				'key' => $attr,
@@ -1036,7 +1036,7 @@ 
 	 * @param boolean $disabled =true disable or enable a cell, default true=disable
 	 * @return reference to attribute
 	 */
-	public function disableElement($name,$disabled=True)
+	public function disableElement($name, $disabled = True)
 	{
 		return self::setElementAttribute($name, 'disabled', $disabled);
 	}

Braces +78 added lines, -21 removed lines

@@ -113,7 +113,9 @@ 
 
 		// Update content?
 		if(self::$cont == null)
-			self::$cont = is_array(self::$request->content) ? self::$request->content : array();
+		{
+					self::$cont = is_array(self::$request->content) ? self::$request->content : array();
+		}
 		if($this->id && is_array(self::$cont[$this->id]))
 		{
 			$old_cont = self::$cont;
@@ -137,7 +139,8 @@ 
 		}
 
 		// Reset content as we leave
-		if($old_cont) {
+		if($old_cont)
+		{
 			self::$cont = $old_cont;
 		}
 	}
@@ -219,7 +222,10 @@ 
 					$legacy_options = explode(',', $legacy_options);
 					foreach(self::csv_split($value, count($legacy_options)) as $n => $val)
 					{
-						if ($legacy_options[$n] && (string)$val !== '') $template->attrs[$legacy_options[$n]] = $val;
+						if ($legacy_options[$n] && (string)$val !== '')
+						{
+							$template->attrs[$legacy_options[$n]] = $val;
+						}
 					}
 				}
 			}
@@ -237,7 +243,10 @@ 
 		{
 			if (!isset($this->attrs[$name]))
 			{
-				if (isset($default_value)) $this->attrs[$name] = $default_value;
+				if (isset($default_value))
+				{
+					$this->attrs[$name] = $default_value;
+				}
 			}
 			// cast to bool, only if NOT containing variables
 			elseif (!is_bool($this->attrs[$name]) && strpos($this->attrs[$name], '@') === false &&
@@ -342,13 +351,16 @@ 
 	{
 		$widget_registry = Api\Cache::getInstance('etemplate', 'widget_registry');
 
-		if (!$widget_registry)	// not in instance cache --> rescan from filesystem
+		if (!$widget_registry)
+		{
+			// not in instance cache --> rescan from filesystem
 		{
 			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
 			{
 				if(strpos($path, 'tests/') !== FALSE)
 				{
 					continue;
+		}
 				}
 				if(substr($path, -4) == '.php')
 				{
@@ -383,8 +395,12 @@ 
 				}
 			}
 			if (self::$widget_registry['htmlarea'] === Api\Etemplate\Widget\HtmlArea::class)
-			Api\Cache::setInstance('etemplate', 'widget_registry', self::$widget_registry, 3600);
-			else error_log(__METHOD__."() wrong class for Htmlarea: ".function_backtrace ());
+			{
+						Api\Cache::setInstance('etemplate', 'widget_registry', self::$widget_registry, 3600);
+			}
+			else {
+				error_log(__METHOD__."() wrong class for Htmlarea: ".function_backtrace ());
+			}
 		}
 		else
 		{
@@ -453,7 +469,10 @@ 
 
 		if(!$xml)
 		{
-			if (empty($type)) $type = 'widget';
+			if (empty($type))
+			{
+				$type = 'widget';
+			}
 			$xml = "<$type id=\"$id\"/>";
 		}
 		//error_log(__METHOD__."('$type', ..., '$id') using $class_name");
@@ -552,7 +571,10 @@ 
 					$params[$index] = (array)$params[$index];
 				}
 			}
-			if($call) call_user_func_array(array($this, $method_name), $params);
+			if($call)
+			{
+				call_user_func_array(array($this, $method_name), $params);
+			}
 		}
 		// allow calling with a function or closure --> call it with widget as first param
 		elseif (is_callable($method_name))
@@ -614,7 +636,10 @@ 
 		$val = self::expand_name($value, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$check_val = self::expand_name($check, $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
 		$result = count($vals) == 1 ? $val != '' : ($check_val[0] == '/' ? preg_match($check_val,$val) : $val == $check_val);
-		if ($not) $result = !$result;
+		if ($not)
+		{
+			$result = !$result;
+		}
 
 		//error_log(__METHOD__."('".($not?'!':'')."$disabled' = '$val' ".(count($vals) == 1 ? '' : ($not?'!':'=')."= '$check_val'")." = ".($result?'True':'False'));
 		return $result;
@@ -664,9 +689,15 @@ 
 			{
 				$cont = array();
 			}
-			if (!is_numeric($c)) $c = self::chrs2num($c);
+			if (!is_numeric($c))
+			{
+				$c = self::chrs2num($c);
+			}
 			$col = self::num2chrs($c-1);	// $c-1 to get: 0:'@', 1:'A', ...
-			if (is_numeric($c_)) $col_ = self::num2chrs($c_-1);
+			if (is_numeric($c_))
+			{
+				$col_ = self::num2chrs($c_-1);
+			}
 			$row_cont = $cont[$row];
 			$col_row_cont = $cont[$col.$row];
 
@@ -747,7 +778,8 @@ 
 	 */
 	public function __clone()
 	{
-		foreach($this->children as $child_num => $child) {
+		foreach($this->children as $child_num => $child)
+		{
 			$this->children[$child_num] = clone $child;
 		}
 	}
@@ -761,7 +793,10 @@ 
 	public function toXml($indent='')
 	{
 		echo "$indent<$this->type";
-		if ($this->id) echo ' id="'.htmlspecialchars($this->id).'"';
+		if ($this->id)
+		{
+			echo ' id="'.htmlspecialchars($this->id).'"';
+		}
 		foreach($this->attrs as $name => $value)
 		{
 			if ($name == 'options' && $this->legacy_options && (!is_array($this->legacy_options) ||
@@ -841,7 +876,11 @@ 
 		{
 			throw new Api\Exception\AssertionFailed(__METHOD__."(\$arr,'$_idx',$reference_into,$skip_empty) \$arr is no array!");
 		}
-		if (is_object($_idx)) return false;	// given an error in php5.2
+		if (is_object($_idx))
+		{
+			return false;
+		}
+		// given an error in php5.2
 
 		// Make sure none of these are left
 		$idx = str_replace(array('&#x5B;','&#x5D;'), array('[',']'), $_idx);
@@ -864,7 +903,10 @@ 
 				//if ($reference_into) error_log(__METHOD__."(".(strlen($s=array2string($arr))>512?substr($s,0,512).'...':$s).", '$idx', ".array2string($reference_into).", ".array2string($skip_empty).") ".function_backtrace());
 				return null;
 			}
-			if($skip_empty && (!is_array($pos) || !isset($pos[$idx]))) return null;
+			if($skip_empty && (!is_array($pos) || !isset($pos[$idx])))
+			{
+				return null;
+			}
 			$pos = &$pos[$idx];
 		}
 		return $pos;
@@ -883,7 +925,10 @@ 
 	static function set_array(&$_arr, $_idx, $_value)
 	{
 		$ref =& self::get_array($_arr, $_idx, true);
-		if (true) $ref = $_value;
+		if (true)
+		{
+			$ref = $_value;
+		}
 	}
 
 	/**
@@ -935,7 +980,10 @@ 
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//error_log(__METHOD__."('$name','$error','$cname') ".function_backtrace());
 
-		if ($cname) $name = self::form_name($cname,$name);
+		if ($cname)
+		{
+			$name = self::form_name($cname,$name);
+		}
 
 		if ($error === false)
 		{
@@ -962,11 +1010,17 @@ 
 	{
 		// not yet used: if (is_null($cname)) $cname = self::$name_vars;
 		//echo "<p>uietemplate::validation_errors('$ignore_validation','$cname') validation_error="; _debug_array(self::$validation_errors);
-		if (!$ignore_validation) return count(self::$validation_errors) > 0;
+		if (!$ignore_validation)
+		{
+			return count(self::$validation_errors) > 0;
+		}
 
 		foreach(array_values(self::$validation_errors) as $name)
 		{
-			if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			if ($cname)
+			{
+				$name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
+			}
 
 			// treat $ignoare_validation only as regular expression, if it starts with a slash
 			if ($ignore_validation[0] == '/' && !preg_match($ignore_validation,$name) ||
@@ -1023,7 +1077,10 @@ 
 			self::$request->unset_to_process('');
 			//error_log(__METHOD__."('$name', '$attr', ...) ".function_backtrace());
 		}
-		if (!is_null($val)) $ref = $val;
+		if (!is_null($val))
+		{
+			$ref = $val;
+		}
 
 		//error_log(__METHOD__."('$name', '$attr', ".array2string($val).')');
 		return $ref;