EGroupware / egroupware

api/src/Etemplate/Widget/Transformer.php

Braces +16 added lines, -4 removed lines

@@ -150,7 +150,10 @@ 
 	 */
 	protected function action($attr, $action, array &$attrs)
 	{
-		if (self::DEBUG) error_log(__METHOD__."('$attr', ".array2string($action).')');
+		if (self::DEBUG)
+		{
+			error_log(__METHOD__."('$attr', ".array2string($action).')');
+		}
 		// action is an assignment
 		if (is_scalar($action) || is_null($action))
 		{
@@ -160,7 +163,10 @@ 
 				$replace = array();
 				foreach($attrs as $a => $v)
 				{
-					if (is_scalar($v) || is_null($v)) $replace['@'.$a] = $v;
+					if (is_scalar($v) || is_null($v))
+					{
+						$replace['@'.$a] = $v;
+					}
 				}
 				$action = strtr($action, $replace);
 				// now replace with non-scalar value, eg. if values is an array: "@value", "@value[key] or "@value[@key]"
@@ -170,7 +176,10 @@ 
 				}
 			}
 			$attrs[$attr] = $action;
-			if (self::DEBUG) error_log(__METHOD__."('$attr', ".array2string($action).") attrs['$attr'] = ".array2string($action).', attrs='.array2string($attrs));
+			if (self::DEBUG)
+			{
+				error_log(__METHOD__."('$attr', ".array2string($action).") attrs['$attr'] = ".array2string($action).', attrs='.array2string($attrs));
+			}
 		}
 		// action is a serverside callback
 		elseif(is_array($action) && isset($action['__callback__']))
@@ -218,7 +227,10 @@ 
 					$attrs[$attr] = $actions;
 					$actions = array($attr => $actions);
 				}
-				if (self::DEBUG) error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
+				if (self::DEBUG)
+				{
+					error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
+				}
 				foreach($actions as $attr => $action)
 				{
 					$this->action($attr, $action, $attrs);

api/src/Etemplate/Widget/Contact.php

Braces +13 added lines, -3 removed lines

@@ -148,9 +148,15 @@ 
 	 */
 	public function get_contact($value, array $attrs)
 	{
-		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value))) return $value;
+		if (is_array($value) && !(array_key_exists('app',$value) && array_key_exists('id', $value)))
+		{
+			return $value;
+		}
 
-		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		if(is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value))
+		{
+			$value = $value['id'];
+		}
 		switch($attrs['type'])
 		{
 			case 'contact-account':
@@ -162,7 +168,11 @@ 
 				// fall-through
 			case 'contact-value':
 			default:
-				if (substr($value,0,12) == 'addressbook:') $value = substr($value,12);	// link-entry syntax
+				if (substr($value,0,12) == 'addressbook:')
+				{
+					$value = substr($value,12);
+				}
+				// link-entry syntax
 				if (!($contact = $this->contacts->read($value)))
 				{
 					$contact = array();

api/src/Etemplate/Widget/Vfs.php

Braces +40 added lines, -10 removed lines

@@ -27,7 +27,10 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -64,9 +67,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = Api\Link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
@@ -194,7 +203,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -218,7 +230,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -245,10 +260,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
+			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else    // multiple upload with dir given (trailing slash)
 		{
@@ -294,7 +312,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -305,7 +326,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -317,14 +341,20 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
 		{
 			$path = Api\Link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 }

api/src/Etemplate/Widget/Select.php

Braces +88 added lines, -25 removed lines

@@ -81,7 +81,8 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -144,21 +145,33 @@ 
 			// add option children's values too, "" is not read, therefore we cast to string
 			foreach($this->children as $child)
 			{
-				if ($child->type == 'option') $allowed[] = (string)$child->attrs['value'];
+				if ($child->type == 'option')
+				{
+					$allowed[] = (string)$child->attrs['value'];
+				}
 			}
 
-			if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = '';
+			if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1))
+			{
+				$allowed[] = '';
+			}
 
 			foreach((array) $value as $val)
 			{
 				// handle empty-label for all widget types
-				if ((string)$val === '' && in_array('', $allowed)) continue;
+				if ((string)$val === '' && in_array('', $allowed))
+				{
+					continue;
+				}
 
 				switch ($widget_type)
 				{
 					case 'select-account':
 						// If in allowed options, skip account check to support app-specific options
-						if(count($allowed) > 0 && in_array($val,$allowed)) continue;
+						if(count($allowed) > 0 && in_array($val,$allowed))
+						{
+							continue;
+						}
 
 						// validate accounts independent of options know to server
 						$account_type = $this->attrs['account_type'] ? $this->attrs['account_type'] : 'accounts';
@@ -169,8 +182,7 @@ 
 							in_array($account_type, array('owngroups', 'memberships')) &&
 								!in_array($val, $GLOBALS['egw']->accounts->memberships(
 									$GLOBALS['egw_info']['user']['account_id'], true))
-						)
-						{
+						) {
 							self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val,
 								!$type?'not found' : ($type == 1 ? 'user' : 'group')),'');
 							$value = '';
@@ -230,10 +242,13 @@ 
 						{
 							$value = array_merge($value, (array)self::$request->preserv[$unavailable_name]);
 						}
-						elseif(!$value)	// for single cat, we only restore unavailable one, if no other was selected
+						elseif(!$value)
+						{
+							// for single cat, we only restore unavailable one, if no other was selected
 						{
 							$value = self::$request->preserv[$unavailable_name];
 						}
+						}
 					}
 			}
 			if (isset($value))
@@ -258,10 +273,13 @@ 
 	{
 		//error_log(__METHOD__."('$cname') this->id=$this->id, this->type=$this->type, this->attrs=".array2string($this->attrs));
 		$matches = null;
-		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
+		if ($cname == '$row')
+		{
+			// happens eg. with custom-fields: $cname='$row', this->id='#something'
 		{
 			$form_name = $this->id;
 		}
+		}
 		// happens with fields in nm-header: $cname='nm', this->id='${row}[something]' or '{$row}[something]'
 		elseif (preg_match('/(\${row}|{\$row})\[([^]]+)\]$/', $this->id, $matches))
 		{
@@ -281,7 +299,10 @@ 
 		{
 			$form_name = self::form_name($cname, $this->id, $expand);
 		}
-		if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
+		if (!is_array(self::$request->sel_options[$form_name]))
+		{
+			self::$request->sel_options[$form_name] = array();
+		}
 		$type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
 		if ($type != 'select' && $type != 'menupopup')
 		{
@@ -380,7 +401,10 @@ 
 			if(is_array($label))
 			{
 				self::fix_encoded_options($label, false);
-				if ($use_array_of_objects && !array_key_exists('value', $label)) $label['value'] = $value;
+				if ($use_array_of_objects && !array_key_exists('value', $label))
+				{
+					$label['value'] = $value;
+				}
 			}
 			else
 			{
@@ -607,13 +631,27 @@ 
 
 			case 'select-year':	// options: #rows,#before(default=3),#after(default=2)
 				$options[''] = '';
-				if ($type <= 0)  $type  = 3;
-				if ($type2 <= 0) $type2 = 2;
-				if ($type > 100 && $type2 > 100 && $type > $type) { $y = $type; $type=$type2; $type2=$y; }
+				if ($type <= 0)
+				{
+					$type  = 3;
+				}
+				if ($type2 <= 0)
+				{
+					$type2 = 2;
+				}
+				if ($type > 100 && $type2 > 100 && $type > $type)
+				{
+$y = $type; $type=$type2; $type2=$y; }
 				$y = date('Y')-$type;
-				if ($value && $value-$type < $y || $type > 100) $y = $type > 100 ? $type : $value-$type;
+				if ($value && $value-$type < $y || $type > 100)
+				{
+					$y = $type > 100 ? $type : $value-$type;
+				}
 				$to = date('Y')+$type2;
-				if ($value && $value+$type2 > $to || $type2 > 100) $to = $type2 > 100 ? $type2 : $value+$type2;
+				if ($value && $value+$type2 > $to || $type2 > 100)
+				{
+					$to = $type2 > 100 ? $type2 : $value+$type2;
+				}
 				for ($n = 0; $y <= $to && $n < 200; ++$n)
 				{
 					$options[$y] = $y++;
@@ -651,8 +689,14 @@ 
 						MCAL_M_WEEKEND	=> 'weekend',
 					);
 				}
-				if ($weekstart == 'Saturday') $options[MCAL_M_SATURDAY] = 'saturday';
-				if ($weekstart != 'Monday') $options[MCAL_M_SUNDAY] = 'sunday';
+				if ($weekstart == 'Saturday')
+				{
+					$options[MCAL_M_SATURDAY] = 'saturday';
+				}
+				if ($weekstart != 'Monday')
+				{
+					$options[MCAL_M_SUNDAY] = 'sunday';
+				}
 				$options += array(
 					MCAL_M_MONDAY	=> 'monday',
 					MCAL_M_TUESDAY	=> 'tuesday',
@@ -660,8 +704,14 @@ 
 					MCAL_M_THURSDAY	=> 'thursday',
 					MCAL_M_FRIDAY	=> 'friday',
 				);
-				if ($weekstart != 'Saturday') $options[MCAL_M_SATURDAY] = 'saturday';
-				if ($weekstart == 'Monday') $options[MCAL_M_SUNDAY] = 'sunday';
+				if ($weekstart != 'Saturday')
+				{
+					$options[MCAL_M_SATURDAY] = 'saturday';
+				}
+				if ($weekstart == 'Monday')
+				{
+					$options[MCAL_M_SUNDAY] = 'sunday';
+				}
 				if ($rows >= 2 && $type == 1)
 				{
 					$options += array(
@@ -698,16 +748,22 @@ 
 				$type = $type === '' ? 1 : intval($type);		// min
 				$type2 = $type2 === '' ? 10 : intval($type2);	// max
 				$format = '%d';
-				if (!empty($type3) && $type3[0] == '0')			// leading zero
+				if (!empty($type3) && $type3[0] == '0')
+				{
+					// leading zero
 				{
 					$format = '%0'.strlen($type3).'d';
 				}
+				}
 				$type3 = !$type3 ? 1 : intval($type3);			// decrement
 				if (($type <= $type2) != ($type3 > 0))
 				{
 					$type3 = -$type3;	// void infinite loop
 				}
-				if (!empty($type4)) $format .= lang($type4);
+				if (!empty($type4))
+				{
+					$format .= lang($type4);
+				}
 				for ($i=0,$n=$type; $n <= $type2 && $i <= 100; $n += $type3,++$i)
 				{
 					$options[$n] = sprintf($format,$n);
@@ -741,10 +797,13 @@ 
 				{
 					$value = calendar_timezones::id2tz($value);
 				}
-				if ($readonly)	// for readonly we dont need to fetch all TZ's
+				if ($readonly)
+				{
+					// for readonly we dont need to fetch all TZ's
 				{
 					$options[$value] = calendar_timezones::tz2id($value,'name');
 				}
+				}
 				else
 				{
 					$options = $type ? Api\DateTime::getTimezones() : Api\DateTime::getUserTimezones($value);
@@ -816,7 +875,10 @@ 
 		if (!is_array($acc))
 		{
 			$data = $GLOBALS['egw']->accounts->get_account_data($id);
-			if (!isset($data[$id])) return '#'.$id;
+			if (!isset($data[$id]))
+			{
+				return '#'.$id;
+			}
 			foreach(array('type','lid','firstname','lastname') as $name)
 			{
 				$acc['account_'.$name] = $data[$id][$name];
@@ -844,7 +906,8 @@ 
 					$acc['account_firstname'],$acc['account_lastname']);
 				break;
 		}
-		if($show_type) {
+		if($show_type)
+		{
 			$info = array(
 				'label'	=> $info,
 				'icon' => $acc['account_type'] == 'g' ? 'addressbook/group' : 'user'

api/src/Etemplate/Widget/Box.php

Braces +8 added lines, -2 removed lines

@@ -49,7 +49,10 @@ 
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
-		if ($this->id && $this->type != 'groupbox') $cname = self::form_name($cname, $this->id, $params[1]);
+		if ($this->id && $this->type != 'groupbox')
+		{
+			$cname = self::form_name($cname, $this->id, $params[1]);
+		}
 		if ($expand['cname'] !== $cname && $cname)
 		{
 			$expand['cont'] =& self::get_array(self::$request->content, $cname);
@@ -121,10 +124,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__."($widget,$cname) $this autorepeating row $expand[row] because of $check_widget->id = '$fname' is ".array2string($value));
 					unset($value);
+				}
 					return true;
 				}
 			}

api/src/Etemplate/Widget/AjaxSelect.php

Braces +4 added lines, -1 removed lines

@@ -29,10 +29,13 @@
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		$matches = null;
-		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
+		if ($cname == '$row')
+		{
+			// happens eg. with custom-fields: $cname='$row', this->id='#something'
 		{
 			$form_name = $this->id;
 		}
+		}
 		// happens with fields in nm-header: $cname='nm', this->id='${row}[something]' or '{$row}[something]'
 		elseif (preg_match('/(\${row}|{\$row})\[([^]]+)\]$/', $this->id, $matches))
 		{

api/src/Etemplate/Widget/Date.php

Braces +21 added lines, -5 removed lines

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

api/src/Etemplate/Widget/File.php

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

api/src/Etemplate/Widget/Button.php

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