EGroupware / egroupware

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

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) != '[]' &&

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

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;

api/src/Etemplate/Widget/Button.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		//error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
@@ -53,18 +53,18 @@ 
 		{
 			$value = self::get_array($content, $form_name);
 
-			if(
+			if (
 				// Handle case of not existing $row_cont[id], eg: create[]
 				is_array($value) && count($value) == 1 ||
 				// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
 				$value == true
 			)
 			{
-				$valid =& self::get_array($validated, $form_name, true);
+				$valid = & self::get_array($validated, $form_name, true);
 				if (true) $valid = is_array($value) ? $value : 'pressed';
 
 				// recorded pressed button globally, was in the template object before, put now as static on this object
-				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
+				if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name, -10) == '[cancel]')
 				{
 					self::$canceled = true;
 				}
@@ -76,4 +76,4 @@ 
 		}
 	}
 }
-Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button','buttononly'));
+Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Button', array('button', 'buttononly'));

api/src/Etemplate/Widget/Grid.php

Spacing +20 added lines, -20 removed lines

@@ -65,11 +65,11 @@ 
 	 * @param boolean $respect_disabled =false false (default): ignore disabled, true: method is NOT run for disabled widgets AND their children
 	 * @param array $columns_disabled=array() disabled columns
 	 */
-	public function run($method_name, $params=array(''), $respect_disabled=false, &$columns_disabled=array())
+	public function run($method_name, $params = array(''), $respect_disabled = false, &$columns_disabled = array())
 	{
 		// maintain $expand array name-expansion
-		$cname =& $params[0];
-		$expand =& $params[1];
+		$cname = & $params[0];
+		$expand = & $params[1];
 		$old_cname = $params[0];
 		$old_expand = $params[1];
 
@@ -85,13 +85,13 @@ 
 			//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this disabled='{$this->attrs['disabled']}'=".array2string($disabled).": NOT running");
 			$params[0] = $old_cname;
 			$params[1] = $old_expand;
-			return false;	// return
+			return false; // return
 		}
 
 		if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
 		if ($expand['cname'] !== $cname && $cname)
 		{
-			$expand['cont'] =& self::get_array(self::$request->content, $cname);
+			$expand['cont'] = & self::get_array(self::$request->content, $cname);
 			$expand['cname'] = $cname;
 		}
 
@@ -101,10 +101,10 @@ 
 		}
 		//foreach($this->children as $n => $child)
 		$repeat_child = null;
-		for($n = 0; ; ++$n)
+		for ($n = 0; ; ++$n)
 		{
 			// maintain $expand array name-expansion
-			switch($this->type)
+			switch ($this->type)
 			{
 				case 'rows':
 					$expand['row'] = $n;
@@ -116,7 +116,7 @@ 
 			if (isset($this->children[$n]))
 			{
 				$child = $this->children[$n];
-				if($this->type == 'rows' || $this->type == 'columns')
+				if ($this->type == 'rows' || $this->type == 'columns')
 				{
 					/*
 					 * We store a clone of the repeated child, because at the end
@@ -143,7 +143,7 @@ 
 				if (in_array($n, $columns_disabled))
 				{
 					//error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this column $n is disabled: NOT running");
-					continue;	// do NOT run $method_name on disabled columns
+					continue; // do NOT run $method_name on disabled columns
 				}
 			}
 			//error_log('Running ' . $method_name . ' on child ' . $n . '(' . $child . ') ['.$expand['row'] . ','.$expand['c'] . ']');
@@ -151,7 +151,7 @@ 
 
 			if ($this->type == 'columns' && $disabled)
 			{
-				$columns_disabled[] = $n;	// mark column as disabled
+				$columns_disabled[] = $n; // mark column as disabled
 			}
 		}
 		if ($this->type == 'grid')
@@ -175,34 +175,34 @@ 
 	private function need_autorepeat($cname, array $expand)
 	{
 		// check id's of children
-		foreach($this->children as $n => $direct_child)
+		foreach ($this->children as $n => $direct_child)
 		{
-			foreach(array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
+			foreach (array_merge(array($direct_child), $n ? array() : $direct_child->children) as $child)
 			{
 				$pat = $child->id;
-				while(($patstr = strstr($pat, '$')))
+				while (($patstr = strstr($pat, '$')))
 				{
-					$pat = substr($patstr,$patstr[1] == '{' ? 2 : 1);
+					$pat = substr($patstr, $patstr[1] == '{' ? 2 : 1);
 
 					switch ($this->type)
 					{
 						case 'column':
-							$Ok = $pat[0] == 'c' && !(substr($pat,0,4) == 'cont' || substr($pat,0,2) == 'c_' ||
-								substr($pat,0,4) == 'col_');
+							$Ok = $pat[0] == 'c' && !(substr($pat, 0, 4) == 'cont' || substr($pat, 0, 2) == 'c_' ||
+								substr($pat, 0, 4) == 'col_');
 							break;
 						case 'row':
-							$Ok = $pat[0] == 'r' && !(substr($pat,0,2) == 'r_' ||
-								substr($pat,0,4) == 'row_' && substr($pat,0,8) != 'row_cont');
+							$Ok = $pat[0] == 'r' && !(substr($pat, 0, 2) == 'r_' ||
+								substr($pat, 0, 4) == 'row_' && substr($pat, 0, 8) != 'row_cont');
 							//error_log(__METHOD__."() pat='$pat' --> Ok=".array2string($Ok));
 							break;
 						default:
 							return false;
 					}
-					if ($Ok && ($fname=self::form_name($cname, $child->id, $expand)) &&
+					if ($Ok && ($fname = self::form_name($cname, $child->id, $expand)) &&
 						// need to break if fname ends in [] as get_array() will ignore it and returns whole array
 						// for an id like "run[$row_cont[appname]]"
 						substr($fname, -2) != '[]' &&
-						($value = self::get_array(self::$request->content,$fname)) !== null)	// null = not found (can be false!)
+						($value = self::get_array(self::$request->content, $fname)) !== null)	// null = not found (can be false!)
 					{
 						//error_log(__METHOD__."('$cname', ) $this autorepeating row $expand[row] because of $child->id = '$fname' is ".array2string($value));
 						unset($value);

api/src/Etemplate/Widget/ItemPicker.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function __construct($xml = '')
 	{
-		if($xml) {
+		if ($xml) {
 			parent::__construct($xml);
 		}
 	}
@@ -40,7 +40,7 @@ 
 	 * Find items that match the given parameters
 	 * using the egw_link class
 	 */
-	public static function ajax_item_search($app, $type, $pattern, $options=array())
+	public static function ajax_item_search($app, $type, $pattern, $options = array())
 	{
 		$options['type'] = $type ? $type : $options['type'];
 		$items = Api\Link::query($app, $pattern, $options);

api/src/Etemplate/Widget/HistoryLog.php

Spacing +8 added lines, -8 removed lines

@@ -38,19 +38,19 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id);
 
-		if(is_array(self::$request->content[$form_name]['status-widgets']))
+		if (is_array(self::$request->content[$form_name]['status-widgets']))
 		{
-			foreach(self::$request->content[$form_name]['status-widgets'] as $key => $type)
+			foreach (self::$request->content[$form_name]['status-widgets'] as $key => $type)
 			{
-				if(!is_array($type))
+				if (!is_array($type))
 				{
-					list($basetype) = explode('-',$type);
+					list($basetype) = explode('-', $type);
 					$widget = @self::factory($basetype, '<?xml version="1.0"?><'.$type.' type="'.$type.'"/>', $key);
 					$widget->id = $key;
 					$widget->attrs['type'] = $type;
 					$widget->type = $type;
 
-					if(method_exists($widget, 'beforeSendToClient'))
+					if (method_exists($widget, 'beforeSendToClient'))
 					{
 						// need to use $form_name as $cname see comment in header
 						$widget->beforeSendToClient($form_name, array());
@@ -59,7 +59,7 @@ 
 				else
 				{
 					// need to use self::form_name($form_name, $key) as index into sel_options see comment in header
-					$options =& self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
+					$options = & self::get_array(self::$request->sel_options, self::form_name($form_name, $key), true);
 					if (!is_array($options)) $options = array();
 					$options += $type;
 				}
@@ -82,11 +82,11 @@ 
 	 * @param array &$validated=array() validated content
 	 * @return boolean true if no validation error, false otherwise
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 		if (true) $valid = $value;
 		return true;
 	}