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

Braces +24 added lines, -6 removed lines

@@ -187,7 +187,10 @@ 
 		}
 		foreach((array)$item['item'] as $child)
 		{
-			if (self::in_tree($id, $child)) return true;
+			if (self::in_tree($id, $child))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -251,7 +254,10 @@ 
 				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}
@@ -271,7 +277,10 @@ 
 			//error_log(__METHOD__."() setting templated image-path for $form_name: $templated_path");
 		}
 
-		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();
+		}
 		if ($this->attrs['type'])
 		{
 			// += to keep further options set by app code
@@ -339,7 +348,10 @@ 
 	public static function imagePath($image)
 	{
 		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		if (!isset($image_path))
+		{
+			$image_path = self::templateImagePath ();
+		}
 
 		$parts = explode('/', $image_path);
 		$image_parts   = explode('/', $image);
@@ -414,12 +426,18 @@ 
 		switch ($widget_type)
 		{
 			case 'tree-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
-				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
+				if ($readonly)
+				{
+					// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
+				}
 					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
 					{
-						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						if ($id)
+						{
+							$cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						}
 					}
 					break;
 				}

api/src/Etemplate/Widget/Customfields.php

Braces +57 added lines, -14 removed lines

@@ -89,7 +89,10 @@ 
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		// No name, no way to get parameters client-side.
-		if(!$this->id) $this->id = self::GLOBAL_ID;
+		if(!$this->id)
+		{
+			$this->id = self::GLOBAL_ID;
+		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -180,7 +183,10 @@ 
 			$form_name = self::$prefix.$name;
 		}
 
-		if(!is_array($fields)) $fields = array();
+		if(!is_array($fields))
+		{
+			$fields = array();
+		}
 		switch($type = $this->type)
 		{
 			case 'customfields-types':
@@ -205,11 +211,18 @@ 
 				foreach(array_reverse($fields) as $lname => $field)
 				{
 					if (!empty($this->attrs['sub-type']) && !empty($field['type2']) &&
-						strpos(','.$field['type2'].',',','.$field['type2'].',') === false) continue;    // not for our content type//
-					if (isset($value[self::$prefix.$lname]) && $value[self::$prefix.$lname] !== '') //break;
+						strpos(','.$field['type2'].',',','.$field['type2'].',') === false)
+					{
+						continue;
+					}
+					// not for our content type//
+					if (isset($value[self::$prefix.$lname]) && $value[self::$prefix.$lname] !== '')
+					{
+						//break;
 					{
 						$fields_with_vals[]=$lname;
 					}
+					}
 					//$stop_at_field = $name;
 				}
 				break;
@@ -240,7 +253,10 @@ 
 
 		// Re-format date custom fields from Y-m-d
 		$field_settings =& self::get_array(self::$request->modifications, "{$this->id}[customfields]",true);
-		if (true) $field_settings = array();
+		if (true)
+		{
+			$field_settings = array();
+		}
 		$link_types = Api\Link::app_list();
 		foreach($fields as $fname => $field)
 		{
@@ -263,7 +279,10 @@ 
 	protected function _widget($fname, array $field)
 	{
 		static $link_types = null;
-		if (!isset($link_types)) $link_types = Api\Link::app_list ();
+		if (!isset($link_types))
+		{
+			$link_types = Api\Link::app_list ();
+		}
 
 		$type = $field['type'];
 		// Link-tos needs to change from appname to link-to
@@ -288,8 +307,14 @@ 
 			case 'date':
 			case 'date-time':
 				$widget->attrs['dataformat'] = $type == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s';
-				if($field['values']['min']) $widget->attrs['min'] = $field['values']['min'];
-				if($field['values']['max']) $widget->attrs['min'] = $field['values']['max'];
+				if($field['values']['min'])
+				{
+					$widget->attrs['min'] = $field['values']['min'];
+				}
+				if($field['values']['max'])
+				{
+					$widget->attrs['min'] = $field['values']['max'];
+				}
 				break;
 
 			case 'vfs-upload':
@@ -306,7 +331,10 @@ 
 				break;
 
 			default:
-				if (substr($type, 0, 7) !== 'select-' && $type != 'ajax_select') break;
+				if (substr($type, 0, 7) !== 'select-' && $type != 'ajax_select')
+				{
+					break;
+				}
 				// fall-through for all select-* widgets
 			case 'select':
 				$this->attrs['multiple'] = $field['rows'] > 1;
@@ -367,7 +395,10 @@ 
 		$all_readonly = $this->is_readonly($cname, $form_name);
 		$value_in = self::get_array($content, $form_name);
 		// if we have no id / use self::GLOBAL_ID, we have to set $value_in in global namespace for regular widgets validation to find
-		if (!$this->id) $content = array_merge($content, $value_in);
+		if (!$this->id)
+		{
+			$content = array_merge($content, $value_in);
+		}
 		//error_log(__METHOD__."($cname, ...) form_name=$form_name, use-private={$this->attrs['use-private']}, value_in=".array2string($value_in));
 		$customfields =& $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
 		if(is_array($value_in))
@@ -392,7 +423,10 @@ 
 				// run validation method of widget implementing this custom field
 				$widget = $this->_widget($fname, $field_settings);
 				// widget has no validate method, eg. is only displaying stuff --> nothing to validate
-				if (!method_exists($widget, 'validate')) continue;
+				if (!method_exists($widget, 'validate'))
+				{
+					continue;
+				}
 				$widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated);
 				if ($field_settings['needed'] && (is_array($value) ? !$value : (string)$value === ''))
 				{
@@ -401,10 +435,16 @@ 
 				$field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id,1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field);
 				$valid =& self::get_array($validated, $field_name, true);
 
-				if (is_array($valid)) $valid = implode(',', $valid);
+				if (is_array($valid))
+				{
+					$valid = implode(',', $valid);
+				}
 				// NULL is valid for most fields, but not custom fields due to backend handling
 				// See so_sql_cf->save()
-				if (is_null($valid)) $valid = false;
+				if (is_null($valid))
+				{
+					$valid = false;
+				}
 				//error_log(__METHOD__."() $field_name: ".array2string($value).' --> '.array2string($valid));
 			}
 		}
@@ -412,7 +452,10 @@ 
 		{
 			// Transformation doesn't handle validation
 			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
-			if (true) $valid = $value_in;
+			if (true)
+			{
+				$valid = $value_in;
+			}
 			//error_log(__METHOD__."() $form_name $field: ".array2string($value).' --> '.array2string($value));
 		}
 	}

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

Braces +32 added lines, -10 removed lines

@@ -37,7 +37,8 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if($xml)
+		{
 			parent::__construct($xml);
 		}
 	}
@@ -85,14 +86,18 @@ 
 
 
 		// ToDo: implement on client-side
-		if (!$attrs['help']) self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		if (!$attrs['help'])
+		{
+			self::setElementAttribute($form_name, 'help', 'view this linked entry in its application');
+		}
 
 		if($attrs['type'] == 'link-list')
 		{
 			$app = $value['to_app'];
 			$id  = $value['to_id'];
 			$links = Api\Link::get_links($app,$id,'','link_lastmod DESC',true, $value['show_deleted']);
-			foreach($links as $link) {
+			foreach($links as $link)
+			{
 				$value[] = $link;
 			}
 		}
@@ -104,7 +109,10 @@ 
 	public static function ajax_link_search($app, $type, $pattern, $options=array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
-		if(!$options['num_rows']) $options['num_rows'] = 1000;
+		if(!$options['num_rows'])
+		{
+			$options['num_rows'] = 1000;
+		}
 
 		$links = Api\Link::query($app, $pattern, $options);
 
@@ -160,8 +168,10 @@ 
 	public static function ajax_link($app, $id, Array $links)
 	{
 		// Files need to know full path in tmp directory
-		foreach($links as $key => $link) {
-			if($link['app'] == Api\Link::VFS_APPNAME) {
+		foreach($links as $key => $link)
+		{
+			if($link['app'] == Api\Link::VFS_APPNAME)
+			{
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'] . '/' . $link['id'];
@@ -253,7 +263,10 @@ 
 			$id .= "/$dest_file";
 		}
 
-		if(!is_array($files)) $files = array($files);
+		if(!is_array($files))
+		{
+			$files = array($files);
+		}
 		foreach($files as $target)
 		{
 			Api\Link::link_file($app, $id, $target);
@@ -340,7 +353,10 @@ 
 				else
 				{
 					// Not enough information, leave it to the application
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = $link;
 				}
 			}
@@ -360,7 +376,10 @@ 
 				}
 				foreach($files as $name => $attrs)
 				{
-					if(!is_array($value['to_id'])) $value['to_id'] = array();
+					if(!is_array($value['to_id']))
+					{
+						$value['to_id'] = array();
+					}
 					$value['to_id'][] = array(
 						'app'	=> Api\Link::VFS_APPNAME,
 						'id'	=> array(
@@ -372,7 +391,10 @@ 
 				}
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log($this);
 			//error_log("   " . array2string($valid));
 		}