EGroupware / egroupware

api/src/Etemplate/Widget/Customfields.php

Spacing +61 added lines, -61 removed lines

@@ -42,12 +42,12 @@ 
 		'date'     => 'Date',
 		'date-time'=> 'Date+Time',
 		'select-account' => 'Select account',
-		'button'   => 'Button',         // button to execute javascript
+		'button'   => 'Button', // button to execute javascript
 		'url'      => 'Url',
 		'url-email'=> 'EMail',
 		'url-phone'=> 'Phone number',
 		'htmlarea' => 'Formatted Text (HTML)',
-		'link-entry' => 'Select entry',         // should be last type, as the individual apps get added behind
+		'link-entry' => 'Select entry', // should be last type, as the individual apps get added behind
 	);
 
 	/**
@@ -86,24 +86,24 @@ 
 	 * @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)
 	{
 		// 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);
 
 		// Store properties at top level, so all customfield widgets can share
-		if($this->attrs['app'])
+		if ($this->attrs['app'])
 		{
 			$app = $this->attrs['app'];
 		}
 		else
 		{
-			$app =& $this->getElementAttribute(self::GLOBAL_VALS, 'app');
-			if($this->getElementAttribute($form_name, 'app'))
+			$app = & $this->getElementAttribute(self::GLOBAL_VALS, 'app');
+			if ($this->getElementAttribute($form_name, 'app'))
 			{
-				$app =& $this->getElementAttribute($form_name, 'app');
+				$app = & $this->getElementAttribute($form_name, 'app');
 			}
 			else
 			{
@@ -112,21 +112,21 @@ 
 			}
 		}
 
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
-			$customfields =& $this->getElementAttribute($form_name, 'customfields');
+			$customfields = & $this->getElementAttribute($form_name, 'customfields');
 		}
-		elseif($app)
+		elseif ($app)
 		{
 			// Checking creates it even if it wasn't there
 			unset(self::$request->modifications[$form_name]['customfields']);
-			$customfields =& $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
+			$customfields = & $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
 		}
 
-		if(!$app)
+		if (!$app)
 		{
-			$app =& $this->setElementAttribute(self::GLOBAL_VALS, 'app', $GLOBALS['egw_info']['flags']['currentapp']);
-			$customfields =& $this->setElementAttribute(self::GLOBAL_VALS, 'customfields', Api\Storage\Customfields::get($app));
+			$app = & $this->setElementAttribute(self::GLOBAL_VALS, 'app', $GLOBALS['egw_info']['flags']['currentapp']);
+			$customfields = & $this->setElementAttribute(self::GLOBAL_VALS, 'customfields', Api\Storage\Customfields::get($app));
 		}
 
 		// if we are in the etemplate editor or the app has no cf's, load the cf's from the app the tpl belongs too
@@ -134,29 +134,29 @@ 
 			($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' || !$this->attrs['customfields']) || !isset($customfields))
 		{
 			// app changed
-			$customfields =& Api\Storage\Customfields::get($app);
+			$customfields = & Api\Storage\Customfields::get($app);
 		}
 		// Filter fields
-		if($this->attrs['field-names'])
+		if ($this->attrs['field-names'])
 		{
 			$fields_name = explode(',', $this->attrs['field-names']);
-			foreach($fields_name as &$f)
+			foreach ($fields_name as &$f)
 			{
 				if ($f[0] == "!")
 				{
-					$f= substr($f,1);
-					$negate_fields[]= $f;
+					$f = substr($f, 1);
+					$negate_fields[] = $f;
 				}
-				$field_filters []= $f;
+				$field_filters [] = $f;
 			}
 		}
 
 		$fields = $customfields;
 
-		$use_private = self::expand_name($this->attrs['use-private'],0,0,'','',self::$cont);
-		$this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'],0,0,'','',self::$cont);
+		$use_private = self::expand_name($this->attrs['use-private'], 0, 0, '', '', self::$cont);
+		$this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'], 0, 0, '', '', self::$cont);
 
-		foreach((array)$fields as $key => $field)
+		foreach ((array)$fields as $key => $field)
 		{
 			// remove private or non-private cf's, if only one kind should be displayed
 			if ((string)$use_private !== '' && (boolean)$field['private'] != (boolean)$use_private)
@@ -165,44 +165,44 @@ 
 			}
 
 			// Remove filtered fields
-			if($field_filters && in_array($key, $negate_fields) && in_array($key, $field_filters))
+			if ($field_filters && in_array($key, $negate_fields) && in_array($key, $field_filters))
 			{
 				unset($fields[$key]);
 			}
 
 			// Rmove fields for none private cutomfields when name refers to a single custom field
 			$matches = null;
-			if (($pos=strpos($form_name,self::$prefix)) !== false &&
-			preg_match($preg = '/'.self::$prefix.'([^\]]+)/',$form_name,$matches) && !isset($fields[$name=$matches[1]]))
+			if (($pos = strpos($form_name, self::$prefix)) !== false &&
+			preg_match($preg = '/'.self::$prefix.'([^\]]+)/', $form_name, $matches) && !isset($fields[$name = $matches[1]]))
 			{
 				unset($fields[$key]);
 			}
 		}
 		// check if name refers to a single custom field --> show only that
 		$matches = null;
-		if (($pos=strpos($form_name,self::$prefix)) !== false && // allow the prefixed name to be an array index too
-			preg_match($preg = '/'.self::$prefix.'([^\]]+)/',$form_name,$matches) && isset($fields[$name=$matches[1]]))
+		if (($pos = strpos($form_name, self::$prefix)) !== false && // allow the prefixed name to be an array index too
+			preg_match($preg = '/'.self::$prefix.'([^\]]+)/', $form_name, $matches) && isset($fields[$name = $matches[1]]))
 		{
 			$fields = array($name => $fields[$name]);
 			$value = array(self::$prefix.$name => $value);
 			$form_name = self::$prefix.$name;
 		}
 
-		if(!is_array($fields)) $fields = array();
-		switch($type = $this->type)
+		if (!is_array($fields)) $fields = array();
+		switch ($type = $this->type)
 		{
 			case 'customfields-types':
-				foreach(self::$cf_types as $lname => $label)
+				foreach (self::$cf_types as $lname => $label)
 				{
 					$sel_options[$lname] = lang($label);
-					$fields_with_vals[]=$lname;
+					$fields_with_vals[] = $lname;
 				}
 				$link_types = array_intersect_key(Api\Link::app_list('query'), Api\Link::app_list('title'));
 				// Explicitly add in filemanager, which does not support query or title
 				$link_types['filemanager'] = lang('filemanager');
 
 				ksort($link_types);
-				foreach($link_types as $lname => $label)
+				foreach ($link_types as $lname => $label)
 				{
 					$sel_options[$lname] = '- '.$label;
 				}
@@ -210,32 +210,32 @@ 
 				self::$transformation['type'][$type]['no_lang'] = true;
 				return parent::beforeSendToClient($cname, $expand);
 			case 'customfields-list':
-				foreach(array_reverse($fields) as $lname => $field)
+				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//
+						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;
+						$fields_with_vals[] = $lname;
 					}
 					//$stop_at_field = $name;
 				}
 				break;
 			default:
-				foreach(array_reverse($fields) as $lname => $field)
+				foreach (array_reverse($fields) as $lname => $field)
 				{
-					$fields_with_vals[]=$lname;
+					$fields_with_vals[] = $lname;
 				}
 		}
 		// need to encode values/select-options to keep their order
-		foreach($customfields as &$data)
+		foreach ($customfields as &$data)
 		{
 			if (!empty($data['values']))
 			{
 				Select::fix_encoded_options($data['values']);
 			}
 		}
-		if($fields != $customfields)
+		if ($fields != $customfields)
 		{
 			// This widget has different settings from global
 			$this->setElementAttribute($form_name, 'customfields', $fields);
@@ -247,14 +247,14 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		// Re-format date custom fields from Y-m-d
-		$field_settings =& self::get_array(self::$request->modifications, "{$this->id}[customfields]",true);
+		$field_settings = & self::get_array(self::$request->modifications, "{$this->id}[customfields]", true);
 		if (true) $field_settings = array();
 		$link_types = Api\Link::app_list();
-		foreach($fields as $fname => $field)
+		foreach ($fields as $fname => $field)
 		{
 			// Run beforeSendToClient for each field
 			$widget = $this->_widget($fname, $field);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->beforeSendToClient($this->id == self::GLOBAL_ID ? '' : $this->id, $expand);
 			}
@@ -271,13 +271,13 @@ 
 	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
-		if($link_types[$field['type']])
+		if ($link_types[$field['type']])
 		{
-			if($type == 'filemanager')
+			if ($type == 'filemanager')
 			{
 				$type = 'vfs-upload';
 			}
@@ -293,18 +293,18 @@ 
 		$widget->set_attrs($xml);
 		
 		// some type-specific (default) attributes
-		switch($type)
+		switch ($type)
 		{
 			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':
-				$widget->attrs['path'] = $field['app'] . ':' .
-					self::expand_name('$cont['.Api\Link::get_registry($field['app'],'view_id').']',0,0,0,0,self::$request->content).
+				$widget->attrs['path'] = $field['app'].':'.
+					self::expand_name('$cont['.Api\Link::get_registry($field['app'], 'view_id').']', 0, 0, 0, 0, self::$request->content).
 					':'.$field['label'];
 				break;
 
@@ -363,7 +363,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())
 	{
 		if ($this->id)
 		{
@@ -379,14 +379,14 @@ 
 		// 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);
 		//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))
+		$customfields = & $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
+		if (is_array($value_in))
 		{
-			foreach(array_keys($value_in) as $field)
+			foreach (array_keys($value_in) as $field)
 			{
-				$field_settings = $customfields[$fname=substr($field,1)];
+				$field_settings = $customfields[$fname = substr($field, 1)];
 
-				if ((string)$this->attrs['use-private'] !== '' &&	// are only (non-)private fields requested
+				if ((string)$this->attrs['use-private'] !== '' && // are only (non-)private fields requested
 					(boolean)$field_settings['private'] != ($this->attrs['use-private'] != '0'))
 				{
 					continue;
@@ -404,8 +404,8 @@ 
 				// widget has no validate method, eg. is only displaying stuff --> nothing to validate
 				if (!method_exists($widget, 'validate')) continue;
 				$widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated);
-				$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);
+				$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);
 				// NULL is valid for most fields, but not custom fields due to backend handling
@@ -417,7 +417,7 @@ 
 		elseif ($this->type == 'customfields-types')
 		{
 			// Transformation doesn't handle validation
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 			if (true) $valid = $value_in;
 			//error_log(__METHOD__."() $form_name $field: ".array2string($value).' --> '.array2string($value));
 		}

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);
 
@@ -188,7 +191,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':
@@ -213,11 +219,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;
@@ -248,7 +261,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)
 		{
@@ -271,7 +287,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
@@ -298,8 +317,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':
@@ -316,7 +341,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':
 				$widget->attrs['multiple'] = $field['rows'] > 1;
@@ -377,7 +405,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))
@@ -402,15 +433,24 @@ 
 				// 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);
 				$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));
 			}
 		}
@@ -418,7 +458,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));
 		}
 	}