EGroupware / egroupware

api/src/Etemplate/Widget/Entry.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, array $expand=array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$attrs = $this->attrs;
 
@@ -68,14 +68,14 @@ 
 		$attrs['id'] = $this->id;
 
 		$form_name = self::form_name($cname, $this->id);
-		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
+		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX.$this->id);
 
 		// No need to proceed
-		if(!$data_id) return;
+		if (!$data_id) return;
 
 		// Find out which record to load
 		$value = self::get_array(self::$request->content, $form_name, false, true);
-		if(!$value)
+		if (!$value)
 		{
 			// Try here...  legacy / fallback / just make it work
 			$value = self::get_array(self::$request->content, $data_id, true, false);
@@ -85,23 +85,23 @@ 
 		{
 			// Get the record itself
 			$data = self::get_array(self::$request->content, $data_id, true, false);
-			if(!$data)
+			if (!$data)
 			{
 				$data = static::get_entry($value, $attrs);
 			}
 		}
 
 		// Set the new value so transformer can find it.  Use prefix to avoid changing the original value
-		$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
+		$new_value = & self::get_array(self::$request->content, self::ID_PREFIX.$this->id, true, false);
 		if (true) $new_value = $data;
-		$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
+		$this->id = self::ID_PREFIX.$this->id."[{$attrs['field']}]";
 
 		$old_type = self::getElementAttribute($this->id, 'type');
 
 		parent::beforeSendToClient($cname, $expand);
 
 		// Check for conflict - more than one with same id/field and different type
-		if($old_type && $old_type != $this->type)
+		if ($old_type && $old_type != $this->type)
 		{
 			//self::set_validation_error($this->id, lang('%1, duplicate ID', $this));
 		}

Braces +8 added lines, -2 removed lines

@@ -71,7 +71,10 @@ 
 		$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
 
 		// No need to proceed
-		if(!$data_id) return;
+		if(!$data_id)
+		{
+			return;
+		}
 
 		// Find out which record to load
 		$value = self::get_array(self::$request->content, $form_name, false, true);
@@ -93,7 +96,10 @@ 
 
 		// Set the new value so transformer can find it.  Use prefix to avoid changing the original value
 		$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
-		if (true) $new_value = $data;
+		if (true)
+		{
+			$new_value = $data;
+		}
 		$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
 
 		$old_type = self::getElementAttribute($this->id, 'type');

api/src/Etemplate/Widget/Url.php

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	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);
 
@@ -64,12 +64,12 @@ 
 
 			if ((string)$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 !!!'), '');
 				return;
 			}
 			elseif ((string)$value != '' && !isset($this->attrs['preg']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'url':
 						// if no protocol given eg. "www.egroupware.org" prepend "http://" for validation
@@ -79,7 +79,7 @@ 
 						}
 						$url_valid = filter_var($value, FILTER_VALIDATE_URL) ||
 							// Remove intl chars & check again, but if it passes we'll keep the original
-							filter_var(preg_replace('/[^[:print:]]/','',$value), FILTER_VALIDATE_URL);
+							filter_var(preg_replace('/[^[:print:]]/', '', $value), FILTER_VALIDATE_URL);
 						//error_log(__METHOD__."() filter_var(value=".array2string($value).", FILTER_VALIDATE_URL)=".array2string(filter_var($value, FILTER_VALIDATE_URL))." --> url_valid=".array2string($url_valid));
 						// remove http:// validation prefix again
 						if ($missing_protocol)
@@ -88,7 +88,7 @@ 
 						}
 						if (!$url_valid)
 						{
-							self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+							self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value), '');
 							return;
 						}
 						break;
@@ -98,19 +98,19 @@ 
 				}
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = substr($value,0,(int) $this->attrs['maxlength']);
+				$value = substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'],$value))
+			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					default:
 						//error_log("preg_match('{$this->attrs['preg']}', '$value')=".array2string(preg_match($this->attrs['preg'], $value)));
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[preg]', '$value')"*/, '');
 						break;
 				}
 			}

Braces +4 added lines, -1 removed lines

@@ -114,7 +114,10 @@
 						break;
 				}
 			}
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value));
 		}
 	}

Doc Comments -1 removed lines

@@ -102,7 +102,6 @@
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{

api/src/Etemplate/Widget/Transformer.php

Spacing +21 added lines, -21 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, array $expand=array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$attrs = $this->attrs;
 		$form_name = self::form_name($cname, $this->id);
@@ -82,14 +82,14 @@ 
 			error_log(__METHOD__."() $this has no id!");
 			return;
 		}
-		$attrs['value'] = $value =& self::get_array(self::$request->content, $form_name, false, true);
+		$attrs['value'] = $value = & self::get_array(self::$request->content, $form_name, false, true);
 		$attrs['type'] = $this->type;
 		$attrs['id'] = $this->id;
 
 		$unmodified = $attrs;
 
 		// run the transformation
-		foreach(static::$transformation as $filter => $data)
+		foreach (static::$transformation as $filter => $data)
 		{
 			$this->action($filter, $data, $attrs);
 		}
@@ -97,14 +97,14 @@ 
 		//echo $this; _debug_array($unmodified); _debug_array($attrs); _debug_array(array_diff_assoc($attrs, $unmodified));
 		// compute the difference and send it to the client as modifications
 		$type_changed = false;
-		foreach(array_diff_assoc($attrs, $unmodified) as $attr => $val)
+		foreach (array_diff_assoc($attrs, $unmodified) as $attr => $val)
 		{
-			switch($attr)
+			switch ($attr)
 			{
 				case 'value':
 					if ($val != $value)
 					{
-						$value = $val;	// $value is reference to self::$request->content
+						$value = $val; // $value is reference to self::$request->content
 					}
 					break;
 				case 'sel_options':
@@ -112,15 +112,15 @@ 
 					break;
 				case 'type':	// not an attribute in etemplate2
 					$type_changed = true;
-					if($val == 'template')
+					if ($val == 'template')
 					{
 						// If the widget has been transformed into a template, we
 						// also need to try and instanciate & parse the template too
 						$transformed_template = Template::instance($attrs['template']);
-						if($transformed_template)
+						if ($transformed_template)
 						{
 							$this->expand_widget($transformed_template, $expand);
-							$transformed_template->run('beforeSendToClient',array($cname,$expand));
+							$transformed_template->run('beforeSendToClient', array($cname, $expand));
 						}
 						$type_changed = false;
 					}
@@ -129,14 +129,14 @@ 
 					break;
 			}
 		}
-		if($type_changed)
+		if ($type_changed)
 		{
 			// Run the new widget type's beforeSendToClient
-			$expanded_child = self::factory($attrs['type'], false,$this->id);
+			$expanded_child = self::factory($attrs['type'], false, $this->id);
 			$expanded_child->id = $this->id;
 			$expanded_child->type = $attrs['type'];
 			$expanded_child->attrs = $attrs;
-			$expanded_child->run('beforeSendToClient',array($cname,$expand));
+			$expanded_child->run('beforeSendToClient', array($cname, $expand));
 		}
 	}
 
@@ -158,7 +158,7 @@ 
 			if (strpos($action, '@') !== false)
 			{
 				$replace = array();
-				foreach($attrs as $a => $v)
+				foreach ($attrs as $a => $v)
 				{
 					if (is_scalar($v) || is_null($v)) $replace['@'.$a] = $v;
 				}
@@ -166,14 +166,14 @@ 
 				// now replace with non-scalar value, eg. if values is an array: "@value", "@value[key] or "@value[@key]"
 				if (($a = strstr($action, '@')))
 				{
-					$action = self::get_array($attrs, substr($a,1));
+					$action = self::get_array($attrs, substr($a, 1));
 				}
 			}
 			$attrs[$attr] = $action;
 			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__']))
+		elseif (is_array($action) && isset($action['__callback__']))
 		{
 			if (!is_string(($callback = $action['__callback__'])))
 			{
@@ -183,7 +183,7 @@ 
 			{
 				$attrs[$attr] = $this->$callback($attrs[$attr], $attrs);
 			}
-			elseif(count(explode('.', $callback)) == 3)
+			elseif (count(explode('.', $callback)) == 3)
 			{
 				$attrs[$attr] = ExecMethod($callback, $attrs[$attr], $attrs);
 			}
@@ -197,29 +197,29 @@ 
 			}
 		}
 		// action is a clientside callback
-		elseif(is_array($action) && isset($action['__js__']))
+		elseif (is_array($action) && isset($action['__js__']))
 		{
 			// nothing to do here
 		}
 		// TODO: Might be a better way to handle when value to be set is an array
-		elseif(is_array($action) && $attr == 'sel_options')
+		elseif (is_array($action) && $attr == 'sel_options')
 		{
 			$attrs[$attr] = $action;
 		}
 		// action is a switch --> check cases
-		elseif(is_array($action))
+		elseif (is_array($action))
 		{
 			// case matches --> run all actions
 			if (isset($action[$attrs[$attr]]) || !isset($action[$attrs[$attr]]) && isset($action['__default__']))
 			{
 				$actions = isset($action[$attrs[$attr]]) ? $action[$attrs[$attr]] : $action['__default__'];
-				if(!is_array($actions))
+				if (!is_array($actions))
 				{
 					$attrs[$attr] = $actions;
 					$actions = array($attr => $actions);
 				}
 				if (self::DEBUG) error_log(__METHOD__."(attr='$attr', action=".array2string($action).") attrs['$attr']=='{$attrs[$attr]}' --> running actions");
-				foreach($actions as $attr => $action)
+				foreach ($actions as $attr => $action)
 				{
 					$this->action($attr, $action, $attrs);
 				}

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

Spacing +7 added lines, -7 removed lines

@@ -128,7 +128,7 @@ 
 
 		$this->contacts->__construct();
 		$options = $this->contacts->contact_fields;
-		foreach($this->contacts->customfields as $name => $data)
+		foreach ($this->contacts->customfields as $name => $data)
 		{
 			$options['#'.$name] = $data['label'];
 		}
@@ -148,28 +148,28 @@ 
 	 */
 	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'];
-		switch($attrs['type'])
+		if (is_array($value) && array_key_exists('app', $value) && array_key_exists('id', $value)) $value = $value['id'];
+		switch ($attrs['type'])
 		{
 			case 'contact-account':
 			case 'contact-template':
-				if (substr($value,0,8) != 'account:')
+				if (substr($value, 0, 8) != 'account:')
 				{
 					$value = 'account:'.($attrs['name'] != 'account:' ? $value : $GLOBALS['egw_info']['user']['account_id']);
 				}
 				// 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();
 				}
 				break;
 		}
-		unset($contact['jpegphoto']);	// makes no sense to return binary image
+		unset($contact['jpegphoto']); // makes no sense to return binary image
 
 		//error_log(__METHOD__."('$value') returning ".array2string($contact));
 		return $contact;

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

Spacing +87 added lines, -89 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -96,7 +96,7 @@ 
 	 * @return Template current object or clone, if any attribute was set
 	 * @todo Use legacy_attributes instead of leaving it to typeOptions method to parse them
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		parent::set_attrs($xml, $cloned);
 
@@ -109,7 +109,7 @@ 
 				unset($this->attrs['options']);
 			}
 		}
-		elseif($this->attrs['rows'] > 1)
+		elseif ($this->attrs['rows'] > 1)
 		{
 			$this->attrs['multiple'] = true;
 		}
@@ -125,7 +125,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$widget_type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
@@ -135,21 +135,21 @@ 
 		{
 			$value = $value_in = self::get_array($content, $form_name);
 
-			$allowed2 = self::selOptions($form_name, true);	// true = return array of option-values
+			$allowed2 = self::selOptions($form_name, true); // true = return array of option-values
 			$type_options = self::typeOptions($this,
 				// typeOptions thinks # of rows is the first thing in options
 				($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']));
-			$allowed = array_merge($allowed2,array_keys($type_options));
+			$allowed = array_merge($allowed2, array_keys($type_options));
 
 			// add option children's values too, "" is not read, therefore we cast to string
-			foreach($this->children as $child)
+			foreach ($this->children as $child)
 			{
 				if ($child->type == 'option') $allowed[] = (string)$child->attrs['value'];
 			}
 
 			if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = '';
 
-			foreach((array) $value as $val)
+			foreach ((array)$value as $val)
 			{
 				// handle empty-label for all widget types
 				if ((string)$val === '' && in_array('', $allowed)) continue;
@@ -158,7 +158,7 @@ 
 				{
 					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';
@@ -172,7 +172,7 @@ 
 						)
 						{
 							self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val,
-								!$type?'not found' : ($type == 1 ? 'user' : 'group')),'');
+								!$type ? 'not found' : ($type == 1 ? 'user' : 'group')), '');
 							$value = '';
 							break 2;
 						}
@@ -186,9 +186,9 @@ 
 						break;
 
 					default:
-						if(!in_array($val, $allowed))
+						if (!in_array($val, $allowed))
 						{
-							self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!", $val, implode("','",$allowed)),'');
+							self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val, implode("','", $allowed)), '');
 							$value = '';
 							break 2;
 						}
@@ -196,7 +196,7 @@ 
 			}
 			if ($ok && $value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 			}
 			// some widgets sub-types need some post-processing
 			// ToDo: move it together with preprocessing to clientside
@@ -204,7 +204,7 @@ 
 			{
 				case 'select-dow':
 					$dow = 0;
-					foreach((array)$value as $val)
+					foreach ((array)$value as $val)
 					{
 						$dow |= $val;
 					}
@@ -230,7 +230,7 @@ 
 						{
 							$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];
 						}
@@ -254,7 +254,7 @@ 
 	 * @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)
 	{
 		//error_log(__METHOD__."('$cname') this->id=$this->id, this->type=$this->type, this->attrs=".array2string($this->attrs));
 		$matches = null;
@@ -287,14 +287,14 @@ 
 		{
 			// Check selection preference, we may be able to skip reading some data
 			$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
-			if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none')
+			if ($this->attrs['type'] == 'select-account' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $select_pref == 'none')
 			{
 				// Preserve but do not send the value if preference is 'none'
 				self::$request->preserv[$this->id] = self::$request->content[$this->id];
 				unset(self::$request->content[$this->id]);
 				$this->attrs['readonly'] = true;
 			}
-			if(!in_array($type, self::$cached_types))
+			if (!in_array($type, self::$cached_types))
 			{
 				// adding type specific options here, while keep further options set by app code
 				// we need to make sure to run only once for auto-repeated rows, because
@@ -324,20 +324,20 @@ 
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
 		$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
-		if(is_array(self::$request->sel_options[$options]))
+		if (is_array(self::$request->sel_options[$options]))
 		{
-			if(in_array($this->attrs['type'], self::$cached_types) && !isset($form_names_done[$options]))
+			if (in_array($this->attrs['type'], self::$cached_types) && !isset($form_names_done[$options]))
 			{
 				// Fix any custom options from application
-				self::fix_encoded_options(self::$request->sel_options[$options],true);
+				self::fix_encoded_options(self::$request->sel_options[$options], true);
 				$form_names_done[$options] = true;
 			}
 			// Turn on search, if there's a lot of rows (unless explicitly set)
-			if(!array_key_exists('search',$this->attrs) && count(self::$request->sel_options[$options]) >= self::SEARCH_ROW_LIMIT)
+			if (!array_key_exists('search', $this->attrs) && count(self::$request->sel_options[$options]) >= self::SEARCH_ROW_LIMIT)
 			{
 				self::setElementAttribute($form_name, "search", true);
 			}
-			if(!self::$request->sel_options[$options])
+			if (!self::$request->sel_options[$options])
 			{
 				unset(self::$request->sel_options[$options]);
 			}
@@ -352,12 +352,12 @@ 
 	 * @param array $options
 	 * @param boolean $use_array_of_objects Re-indexes options, making everything more complicated
 	 */
-	public static function fix_encoded_options(array &$options, $use_array_of_objects=null)
+	public static function fix_encoded_options(array &$options, $use_array_of_objects = null)
 	{
 		$backup_options = $options;
 
 		$values = array();
-		foreach($options as $value => &$label)
+		foreach ($options as $value => &$label)
 		{
 			// Of course once we re-index the options, we can't detect duplicates
 			// so check here, as we re-index
@@ -377,7 +377,7 @@ 
 				return self::fix_encoded_options($options, true);
 			}
 			// optgroup or values for keys "label" and "title"
-			if(is_array($label))
+			if (is_array($label))
 			{
 				self::fix_encoded_options($label, false);
 				if ($use_array_of_objects && !array_key_exists('value', $label)) $label['value'] = $value;
@@ -408,7 +408,7 @@ 
 	 * @param boolean $return_values =false true: return array with option values, instead of value => label pairs
 	 * @return array
 	 */
-	public static function selOptions($name, $return_values=false)
+	public static function selOptions($name, $return_values = false)
 	{
 		$options = array();
 
@@ -419,12 +419,12 @@ 
 		}
 
 		// Check for base of name in root of sel_options
-		if(!$options)
+		if (!$options)
 		{
-			$name_parts = explode('[',str_replace(array('[',']',']'),array('['),$name));
+			$name_parts = explode('[', str_replace(array('[', ']', ']'), array('['), $name));
 			if (count($name_parts))
 			{
-				$org_name = $name_parts[count($name_parts)-1];
+				$org_name = $name_parts[count($name_parts) - 1];
 				if (isset(self::$request->sel_options[$org_name]) && is_array(self::$request->sel_options[$org_name]))
 				{
 					$options += self::$request->sel_options[$org_name];
@@ -444,7 +444,7 @@ 
 		if ($return_values)
 		{
 			$values = array();
-			foreach($options as $key => $val)
+			foreach ($options as $key => $val)
 			{
 				if (is_array($val))
 				{
@@ -460,7 +460,7 @@ 
 					}
 					else	// optgroup
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
 							$values[] = is_array($v) && isset($v['value']) ? $v['value'] : $k;
 						}
@@ -489,50 +489,50 @@ 
 	 * @param string $form_name =null
 	 * @return array with value => label pairs
 	 */
-	public static function typeOptions($widget_type, $_legacy_options, &$no_lang=false, $readonly=false, &$value=null, $form_name=null)
+	public static function typeOptions($widget_type, $_legacy_options, &$no_lang = false, $readonly = false, &$value = null, $form_name = null)
 	{
-		if($widget_type && is_object($widget_type))
+		if ($widget_type && is_object($widget_type))
 		{
 			$widget = $widget_type;
 			$widget_type = $widget->attrs['type'] ? $widget->attrs['type'] : $widget->type;
 		}
 		// Legacy / static support
 		// Have to do this explicitly, since legacy options is not defined on class level
-		$legacy_options = explode(',',$_legacy_options);
-		foreach($legacy_options as &$field)
+		$legacy_options = explode(',', $_legacy_options);
+		foreach ($legacy_options as &$field)
 		{
-			$field = self::expand_name($field, 0, 0,'','',self::$cont);
+			$field = self::expand_name($field, 0, 0, '', '', self::$cont);
 		}
 
-		list($rows,$type,$type2,$type3,$type4,$type5) = $legacy_options;
+		list($rows, $type, $type2, $type3, $type4, $type5) = $legacy_options;
 		$no_lang = false;
 		$options = array();
 		switch ($widget_type)
 		{
 			case 'select-percent':	// options: #row,decrement(default=10)
 				$decr = $type > 0 ? $type : 10;
-				for ($i=0; $i <= 100; $i += $decr)
+				for ($i = 0; $i <= 100; $i += $decr)
 				{
 					$options[intval($i)] = intval($i).'%';
 				}
 				$options[100] = '100%';
 				if (!$rows || !empty($value))
 				{
-					$value = intval(($value+($decr/2)) / $decr) * $decr;
+					$value = intval(($value + ($decr / 2)) / $decr) * $decr;
 				}
 				$no_lang = True;
 				break;
 
 			case 'select-priority':
-				$options = array('','low','normal','high');
+				$options = array('', 'low', 'normal', 'high');
 				break;
 
 			case 'select-bool':	// equal to checkbox, can be used with nextmatch-customfilter to filter a boolean column
-				$options = array(0 => 'no',1 => 'yes');
+				$options = array(0 => 'no', 1 => 'yes');
 				break;
 
 			case 'select-country':	// #Row|Extralabel,1=use country name, 0=use 2 letter-code,custom country field name
-				if($type == 0 && $type2)
+				if ($type == 0 && $type2)
 				{
 					$custom_label = is_numeric($type2) ? 'Custom' : $type2;
 					$options = array('-custom-' => lang($custom_label)) + Api\Country::countries();
@@ -546,7 +546,7 @@ 
 					$value = Api\Country::country_code($value);
 					if (!isset($options[$value]))
 					{
-						if($type2)
+						if ($type2)
 						{
 							$options[$value] = $value;
 						}
@@ -562,20 +562,20 @@ 
 
 			case 'select-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
 				if ((!$type3 || $type3 === $GLOBALS['egw']->categories->app_name) &&
-					(!$type5 || $type5 ==  $GLOBALS['egw']->categories->account_id))
+					(!$type5 || $type5 == $GLOBALS['egw']->categories->account_id))
 				{
 					$categories = $GLOBALS['egw']->categories;
 				}
 				else	// we need to instanciate a new cat object for the correct application
 				{
-					$categories = new Api\Categories($type5,$type3);
+					$categories = new Api\Categories($type5, $type3);
 				}
 				// Allow text for global
 				$type = ($type && strlen($type) > 1 ? $type : !$type);
 				// we cast $type4 (parent) to int, to get default of 0 if omitted
-				foreach((array)$categories->return_sorted_array(0,False,'','','',$type,(int)$type4,true) as $cat)
+				foreach ((array)$categories->return_sorted_array(0, False, '', '', '', $type, (int)$type4, true) as $cat)
 				{
-					$s = str_repeat('&nbsp;',$cat['level']) . stripslashes($cat['name']);
+					$s = str_repeat('&nbsp;', $cat['level']).stripslashes($cat['name']);
 
 					if (Api\Categories::is_global($cat))
 					{
@@ -590,13 +590,13 @@ 
 						'children'	=> $cat['children']
 					);
 					// Send data too
-					if(is_array($cat['data']))
+					if (is_array($cat['data']))
 					{
 						$options[$cat['id']] += $cat['data'];
 					}
 				}
 				// preserv unavailible cats (eg. private user-cats)
-				if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',',$value),array_keys((array)$options))))
+				if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',', $value), array_keys((array)$options))))
 				{
 					// unavailable cats need to be merged in again
 					$unavailable_name = $form_name.self::UNAVAILABLE_CAT_POSTFIX;
@@ -609,11 +609,11 @@ 
 				$options[''] = '';
 				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;
-				$to = date('Y')+$type2;
-				if ($value && $value+$type2 > $to || $type2 > 100) $to = $type2 > 100 ? $type2 : $value+$type2;
+				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;
+				$to = date('Y') + $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++;
@@ -629,17 +629,17 @@ 
 			case 'select-dow':	// options: rows[,0=summaries befor days, 1=summaries after days, 2=no summaries[,extraStyleMultiselect]]
 				if (!defined('MCAL_M_SUNDAY'))
 				{
-					define('MCAL_M_SUNDAY',1);
-					define('MCAL_M_MONDAY',2);
-					define('MCAL_M_TUESDAY',4);
-					define('MCAL_M_WEDNESDAY',8);
-					define('MCAL_M_THURSDAY',16);
-					define('MCAL_M_FRIDAY',32);
-					define('MCAL_M_SATURDAY',64);
-
-					define('MCAL_M_WEEKDAYS',62);
-					define('MCAL_M_WEEKEND',65);
-					define('MCAL_M_ALLDAYS',127);
+					define('MCAL_M_SUNDAY', 1);
+					define('MCAL_M_MONDAY', 2);
+					define('MCAL_M_TUESDAY', 4);
+					define('MCAL_M_WEDNESDAY', 8);
+					define('MCAL_M_THURSDAY', 16);
+					define('MCAL_M_FRIDAY', 32);
+					define('MCAL_M_SATURDAY', 64);
+
+					define('MCAL_M_WEEKDAYS', 62);
+					define('MCAL_M_WEEKEND', 65);
+					define('MCAL_M_ALLDAYS', 127);
 				}
 				$weekstart = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
 				$options = array();
@@ -672,9 +672,9 @@ 
 				}
 				$value_in = $value;
 				$value = array();
-				foreach(array_keys($options) as $val)
+				foreach (array_keys($options) as $val)
 				{
-					if (($value_in & $val) == $val)
+					if (($value_in&$val) == $val)
 					{
 						$value[] = $val;
 
@@ -682,7 +682,7 @@ 
 							$val == MCAL_M_WEEKDAYS && $value_in == MCAL_M_WEEKDAYS ||
 							$val == MCAL_M_WEEKEND && $value_in == MCAL_M_WEEKEND)
 						{
-							break;	// dont set the others
+							break; // dont set the others
 						}
 					}
 				}
@@ -695,22 +695,22 @@ 
 				// fall-through
 
 			case 'select-number':	// options: rows,min,max,decrement,suffix
-				$type = $type === '' ? 1 : intval($type);		// min
-				$type2 = $type2 === '' ? 10 : intval($type2);	// max
+				$type = $type === '' ? 1 : intval($type); // min
+				$type2 = $type2 === '' ? 10 : intval($type2); // max
 				$format = '%d';
 				if (!empty($type3) && $type3[0] == '0')			// leading zero
 				{
 					$format = '%0'.strlen($type3).'d';
 				}
-				$type3 = !$type3 ? 1 : intval($type3);			// decrement
+				$type3 = !$type3 ? 1 : intval($type3); // decrement
 				if (($type <= $type2) != ($type3 > 0))
 				{
-					$type3 = -$type3;	// void infinite loop
+					$type3 = -$type3; // void infinite loop
 				}
 				if (!empty($type4)) $format .= lang($type4);
-				for ($i=0,$n=$type; $n <= $type2 && $i <= 100; $n += $type3,++$i)
+				for ($i = 0, $n = $type; $n <= $type2 && $i <= 100; $n += $type3, ++$i)
 				{
-					$options[$n] = sprintf($format,$n);
+					$options[$n] = sprintf($format, $n);
 				}
 				$no_lang = True;
 				break;
@@ -720,15 +720,14 @@ 
 				for ($h = 0; $h <= 23; ++$h)
 				{
 					$options[$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
-						(($h % 12 ? $h % 12 : 12).$minutes.' '.($h < 12 ? lang('am') : lang('pm'))) :
-						sprintf('%02d',$h).$minutes;
+						(($h % 12 ? $h % 12 : 12).$minutes.' '.($h < 12 ? lang('am') : lang('pm'))) : sprintf('%02d', $h).$minutes;
 				}
 				$no_lang = True;
 				break;
 
 			case 'select-app':	// type2: 'user'=apps of current user, 'enabled', 'installed' (default), 'all' = not installed ones too
 				$apps = self::app_options($type2);
-				$options = is_array($options) ? $options+$apps : $apps;
+				$options = is_array($options) ? $options + $apps : $apps;
 				break;
 
 			case 'select-lang':
@@ -743,7 +742,7 @@ 
 				}
 				if ($readonly)	// for readonly we dont need to fetch all TZ's
 				{
-					$options[$value] = calendar_timezones::tz2id($value,'name');
+					$options[$value] = calendar_timezones::tz2id($value, 'name');
 				}
 				else
 				{
@@ -773,7 +772,7 @@ 
 		{
 			if ($type2 == 'enabled' && (!$data['enabled'] || !$data['status'] || $data['status'] == 3))
 			{
-				continue;	// app not enabled (user can not have run rights for these apps)
+				continue; // app not enabled (user can not have run rights for these apps)
 			}
 			if ($type2 != 'user' || $GLOBALS['egw_info']['user']['apps'][$app])
 			{
@@ -788,7 +787,7 @@ 
 				if (@is_dir(EGW_SERVER_ROOT."/$file/setup") && $file[0] != '.' &&
 				!isset($apps[$app = basename($file)]))
 				{
-					$apps[$app] = $app . ' (*)';
+					$apps[$app] = $app.' (*)';
 				}
 			}
 			closedir($dir);
@@ -806,7 +805,7 @@ 
 	 * @param boolean $show_type =false true: return array with values for keys label and icon, false: only label
 	 * @return string|array
 	 */
-	public static function accountInfo($id,$acc=null,$longnames=0,$show_type=false)
+	public static function accountInfo($id, $acc = null, $longnames = 0, $show_type = false)
 	{
 		if (!$id)
 		{
@@ -817,7 +816,7 @@ 
 		{
 			$data = $GLOBALS['egw']->accounts->get_account_data($id);
 			if (!isset($data[$id])) return '#'.$id;
-			foreach(array('type','lid','firstname','lastname') as $name)
+			foreach (array('type', 'lid', 'firstname', 'lastname') as $name)
 			{
 				$acc['account_'.$name] = $data[$id][$name];
 			}
@@ -833,18 +832,17 @@ 
 				$info .= '&lt;'.$acc['account_lid'].'&gt; ';
 				// fall-through
 			case 1:
-				$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
-					$acc['account_firstname'].' '.$acc['account_lastname'];
+				$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] : $acc['account_firstname'].' '.$acc['account_lastname'];
 				break;
 			case '0':
 				$info .= $acc['account_lid'];
 				break;
 			default:			// use the phpgw default
 				$info = Api\Accounts::format_username($acc['account_lid'],
-					$acc['account_firstname'],$acc['account_lastname']);
+					$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'
@@ -864,8 +862,8 @@ 
 	public static function ajax_get_options($type, $attributes, $value = null)
 	{
 		$no_lang = false;
-		$options = self::typeOptions($type, $attributes,$no_lang,false,$value);
-		self::fix_encoded_options($options,true);
+		$options = self::typeOptions($type, $attributes, $no_lang, false, $value);
+		self::fix_encoded_options($options, true);
 		$response = Api\Json\Response::get();
 		$response->data($options);
 	}

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

Spacing +12 added lines, -12 removed lines

@@ -42,17 +42,17 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be cname!
 	 * @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)
 	{
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $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);
+			$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)))
@@ -67,11 +67,11 @@ 
 
 		// Expand children
 		$columns_disabled = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			if (isset($this->children[$n]))
 			{
-				$child =& $this->children[$n];
+				$child = & $this->children[$n];
 				// If type has something that can be expanded, we need to expand it so the correct method is run
 				$this->expand_widget($child, $expand);
 			}
@@ -107,17 +107,17 @@ 
 	 */
 	private function need_autorepeat(Etemplate\Widget $widget, $cname, array $expand)
 	{
-		foreach(array($widget) + $widget->children as $check_widget)
+		foreach (array($widget) + $widget->children as $check_widget)
 		{
 			$pat = $check_widget->id;
-			while(($pattern = strstr($pat, '$')))
+			while (($pattern = strstr($pat, '$')))
 			{
-				$pat = substr($pattern,$pattern[1] == '{' ? 2 : 1);
+				$pat = substr($pattern, $pattern[1] == '{' ? 2 : 1);
 
-				$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');
 
-				if ($Ok && ($fname=self::form_name($cname, $check_widget->id, $expand)) &&
+				if ($Ok && ($fname = self::form_name($cname, $check_widget->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) != '[]' &&

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

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 	 * @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)
 	{
 		$matches = null;
 		if ($cname == '$row')	// happens eg. with custom-fields: $cname='$row', this->id='#something'
@@ -55,13 +55,13 @@ 
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
 		$options = (isset(self::$request->sel_options[$form_name]) ? $form_name : $this->id);
-		if(is_array(self::$request->sel_options[$options]))
+		if (is_array(self::$request->sel_options[$options]))
 		{
 
 			// Fix any custom options from application
-			self::fix_encoded_options(self::$request->sel_options[$options],true);
+			self::fix_encoded_options(self::$request->sel_options[$options], true);
 
-			if(!self::$request->sel_options[$options])
+			if (!self::$request->sel_options[$options])
 			{
 				unset(self::$request->sel_options[$options]);
 			}

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/Nextmatch/Accountfilter.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * @param string|XMLReader $xml
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		parent::set_attrs($xml, $cloned);
 

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;