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

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	{
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'etemplate';
 		$GLOBALS['egw_info']['flags']['app_header'] = 'et2 Widgets';
-                //'js_link_registry'      => True,
+				//'js_link_registry'      => True,
 
 		// Widget browser code
 		Api\Framework::includeJS('/api/js/etemplate/widget_browser.js');

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 		Api\Framework::includeCSS('/api/templates/default/etemplate2.css');
 
-		Api\Framework::includeCSS('api','widget_browser',false);
+		Api\Framework::includeCSS('api', 'widget_browser', false);
 
 		// load translations
 		Api\Translation::add_app('etemplate');