EGroupware / egroupware

api/src/Header/UserAgent.php

Spacing +6 added lines, -6 removed lines

@@ -76,11 +76,11 @@ 
 	{
 		// should be Ok for all HTML 4 compatible browsers
 		$parts = $all_parts = null;
-		if(!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$parts))
+		if (!preg_match('/compatible; ([a-z]+)[\/ ]+([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $parts))
 		{
-			preg_match_all('/([a-z]+)\/([0-9.]+)/i',$_SERVER['HTTP_USER_AGENT'],$all_parts,PREG_SET_ORDER);
+			preg_match_all('/([a-z]+)\/([0-9.]+)/i', $_SERVER['HTTP_USER_AGENT'], $all_parts, PREG_SET_ORDER);
 			$parts = array_pop($all_parts);
-			foreach($all_parts as $p)
+			foreach ($all_parts as $p)
 			{
 				if ($p[1] == 'Chrome' && $parts[1] != 'Edge')
 				{
@@ -89,12 +89,12 @@ 
 				}
 			}
 		}
-		list(,self::$user_agent,self::$ua_version) = $parts;
+		list(,self::$user_agent, self::$ua_version) = $parts;
 		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
-		if (self::$user_agent=='trident')
+		if (self::$user_agent == 'trident')
 		{
-			self::$user_agent='msie';
+			self::$user_agent = 'msie';
 			$matches = null;
 			self::$ua_version = preg_match('|Trident/[0-9.]+; rv:([0-9.]+)|i', $_SERVER['HTTP_USER_AGENT'], $matches) ?
 				$matches[1] : 11.0;

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 			}
 		}
 		list(,self::$user_agent,self::$ua_version) = $parts;
-		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
+		if ((self::$user_agent = strtolower(self::$user_agent)) == 'version')
+		{
+			self::$user_agent = 'opera';
+		}
 		// IE no longer reports MSIE, but "Trident/7.0; rv:11.0"
 		if (self::$user_agent=='trident')
 		{

api/src/Header/Content.php

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param boolean $force_download =true send content-disposition attachment header
 	 * @param boolean $no_content_type =false do not send actual content-type and content-length header, just content-disposition
 	 */
-	public static function safe(&$content, $path, &$mime='', &$length=0, $nocache=true, $force_download=true, $no_content_type=false)
+	public static function safe(&$content, $path, &$mime = '', &$length = 0, $nocache = true, $force_download = true, $no_content_type = false)
 	{
 		// change old/aliased mime-types to new one, eg. image/pdf to application/pdf
 		$mime = Api\MimeMagic::fix_mime_type($mime);
@@ -53,7 +53,7 @@ 
 			if (UserAgent::type() == 'chrome' || UserAgent::type() == 'msie' && UserAgent::version() >= 8)
 			{
 				$mime = 'text/plain';
-				header('X-Content-Type-Options: nosniff');	// stop IE & Chrome from content-type sniffing
+				header('X-Content-Type-Options: nosniff'); // stop IE & Chrome from content-type sniffing
 			}
 			// for the rest we change mime-type to text/html and let code below handle it safely
 			// this stops Safari and Firefox from using it as src attribute in a script tag
@@ -65,7 +65,7 @@ 
 				{
 					$data = fread($content, $length);
 					fclose($content);
-					$content =& $data;
+					$content = & $data;
 					unset($data);
 				}
 				$content = '<pre>'.$content;
@@ -79,12 +79,12 @@ 
 			if (UserAgent::type() == 'chrome' && UserAgent::version() >= 24 ||
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
-				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
+				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 || // OS X
 				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				$csp = "script-src 'none'"; // forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
-				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
+				header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
 				//error_log(__METHOD__."('$options[path]') ".UserAgent::type().'/'.UserAgent::version().(UserAgent::mobile()?'/mobile':'').": using Content-Security-Policy: $csp");
 			}
@@ -117,25 +117,25 @@ 
 	 * @param boolean $nocache =true send headers to disallow browser/proxies to cache the download
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function type($fn,$mime='',$length=0,$nocache=True,$forceDownload=true)
+	public static function type($fn, $mime = '', $length = 0, $nocache = True, $forceDownload = true)
 	{
 		// if no mime-type is given or it's the default binary-type, guess it from the extension
-		if(empty($mime) || $mime == 'application/octet-stream')
+		if (empty($mime) || $mime == 'application/octet-stream')
 		{
 			$mime = Api\MimeMagic::filename2mime($fn);
 		}
-		if($fn)
+		if ($fn)
 		{
 			// Show this for all
-			self::disposition($fn,$forceDownload);
+			self::disposition($fn, $forceDownload);
 			header('Content-type: '.$mime);
 
-			if($length)
+			if ($length)
 			{
 				header('Content-length: '.$length);
 			}
 
-			if($nocache)
+			if ($nocache)
 			{
 				header('Pragma: no-cache');
 				header('Pragma: public');
@@ -151,7 +151,7 @@ 
 	 * @param string $fn filename
 	 * @param boolean $forceDownload =true send headers to handle as attachment/download
 	 */
-	public static function disposition($fn, $forceDownload=true)
+	public static function disposition($fn, $forceDownload = true)
 	{
 		if ($forceDownload)
 		{

Braces +10 added lines, -3 removed lines

@@ -80,9 +80,13 @@ 
 				// mobile FF 24 on Android does NOT honor CSP!
 				UserAgent::type() == 'firefox' && !UserAgent::mobile() && UserAgent::version() >= 24 ||
 				UserAgent::type() == 'safari' && !UserAgent::mobile() && UserAgent::version() >= 536 ||	// OS X
-				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)	// iOS 7
+				UserAgent::type() == 'safari' && UserAgent::mobile() && UserAgent::version() >= 9537)
 			{
-				$csp = "script-src 'none'";	// forbid to execute any javascript
+				// iOS 7
+			{
+				$csp = "script-src 'none'";
+			}
+			// forbid to execute any javascript
 				header("Content-Security-Policy: $csp");
 				header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
 				//header("X-Content-Security-Policy: $csp");	// FF <= 22
@@ -96,7 +100,10 @@ 
 		}
 		if ($no_content_type)
 		{
-			if ($force_download) self::disposition(Api\Vfs::basename($path), $force_download);
+			if ($force_download)
+			{
+				self::disposition(Api\Vfs::basename($path), $force_download);
+			}
 		}
 		else
 		{

api/src/Header/Referer.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return string
 	 * @todo get "real" referer for jDots template
 	 */
-	static function get($default='',$referer='')
+	static function get($default = '', $referer = '')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
 		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
@@ -34,11 +34,11 @@ 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/', '', $referer); // removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
-			list(,$referer) = explode($webserver_url,$referer,2);
+			list(,$referer) = explode($webserver_url, $referer, 2);
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 

Braces +14 added lines, -4 removed lines

@@ -29,12 +29,19 @@ 
 	static function get($default='',$referer='')
 	{
 		// HTTP_REFERER seems NOT to get urldecoded
-		if (!$referer) $referer = urldecode($_SERVER['HTTP_REFERER']);
+		if (!$referer)
+		{
+			$referer = urldecode($_SERVER['HTTP_REFERER']);
+		}
 
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
-		if (empty($webserver_url) || $webserver_url{0} == '/')	// url is just a path
+		if (empty($webserver_url) || $webserver_url{0} == '/')
+		{
+			// url is just a path
 		{
-			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);	// removing the domain part
+			$referer = preg_replace('/^https?:\/\/[^\/]+/','',$referer);
+		}
+		// removing the domain part
 		}
 		if (strlen($webserver_url) > 1)
 		{
@@ -42,7 +49,10 @@ 
 		}
 		$ret = str_replace('/etemplate/process_exec.php', '/index.php', $referer);
 
-		if (empty($ret) || strpos($ret, 'cd=yes') !== false) $ret = $default;
+		if (empty($ret) || strpos($ret, 'cd=yes') !== false)
+		{
+			$ret = $default;
+		}
 
 		return $ret;
 	}

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

Spacing +20 added lines, -20 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param string $load_via ='' use given template to load $name
 	 * @return Template|boolean false if not found
 	 */
-	public static function instance($_name, $template_set=null, $version='', $load_via='')
+	public static function instance($_name, $template_set = null, $version = '', $load_via = '')
 	{
 		if (Api\Header\UserAgent::mobile())
 		{
@@ -65,7 +65,7 @@ 
 		}
 
 		//$start = microtime(true);
-		list($name) = explode('?', $_name);	// remove optional cache-buster
+		list($name) = explode('?', $_name); // remove optional cache-buster
 		if (isset(self::$cache[$name]) || !($path = self::relPath($name, $template_set, $version)))
 		{
 			if ((!$path || self::read($load_via, $template_set)) && isset(self::$cache[$name]))
@@ -74,25 +74,25 @@ 
 				return self::$cache[$name];
 			}
 			// Template not found, try again as if $name were a partial name
-			else if(!$path && strpos($name,'.') === false)
+			else if (!$path && strpos($name, '.') === false)
 			{
-				foreach(self::$cache as $c_name => $c_template)
+				foreach (self::$cache as $c_name => $c_template)
 				{
-					list(,, $c_sub) = explode('.',$c_name, 3);
-					if($name == $c_sub)
+					list(,, $c_sub) = explode('.', $c_name, 3);
+					if ($name == $c_sub)
 					{
 						//error_log(__METHOD__ . "('$name' loaded from cache ($c_name)");
 						return $c_template;
 					}
 
-					$parts = explode('.',$c_name);
-					if($name == $parts[count($parts)-1]) return $c_template;
+					$parts = explode('.', $c_name);
+					if ($name == $parts[count($parts) - 1]) return $c_template;
 				}
 			}
 			// Template not found, try again with content expansion
 			if (is_array(self::$request->content))
 			{
-				$expand_name = self::expand_name($name, '','','','',self::$cont);
+				$expand_name = self::expand_name($name, '', '', '', '', self::$cont);
 				if ($expand_name && $expand_name != $name &&
 					($template = self::instance($expand_name, $template_set, $version, $load_via)))
 				{
@@ -108,7 +108,7 @@ 
 		$reader = new XMLReader();
 		if (!$reader->open(self::rel2path($path))) return false;
 
-		while($reader->read())
+		while ($reader->read())
 		{
 			if ($reader->nodeType == XMLReader::ELEMENT && $reader->name == 'template')
 			{
@@ -141,9 +141,9 @@ 
 	 * @param string $version =''
 	 * @return string path of template xml file or null if not found
 	 */
-	public static function relPath($name, $template_set=null, $version='')
+	public static function relPath($name, $template_set = null, $version = '')
 	{
-		unset($version);	// not used currently
+		unset($version); // not used currently
 		list($app, $rest) = explode('.', $name, 2);
 
 		if (empty($template_set))
@@ -153,7 +153,7 @@ 
 		$template_path = '/'.$app.'/templates/'.$template_set.'/'.$rest.'.xet';
 		$default_path = '/'.$app.'/templates/default/'.$rest.'.xet';
 
-		foreach(array(Api\Vfs::PREFIX.self::VFS_TEMPLATE_PATH, EGW_SERVER_ROOT) as $prefix)
+		foreach (array(Api\Vfs::PREFIX.self::VFS_TEMPLATE_PATH, EGW_SERVER_ROOT) as $prefix)
 		{
 			if (file_exists($prefix.$template_path))
 			{
@@ -227,21 +227,21 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be cname, second $expand!
 	 * @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];
+		$cname = & $params[0];
 		$old_cname = $params[0];
 		if ($this->attrs['content']) $cname = self::form_name($cname, $this->attrs['content'], $params[1]);
 
 		// Check for template from content, and run over it
 		// templates included via template tag have their name to load them from in attribute "template"
-		$expand_name = self::expand_name($this->id ? $this->id : $this->attrs['template'], '','','','',self::$request->content);
-		if($this->original_name)
+		$expand_name = self::expand_name($this->id ? $this->id : $this->attrs['template'], '', '', '', '', self::$request->content);
+		if ($this->original_name)
 		{
-			$expand_name = self::expand_name($this->original_name, '','','','',self::$request->content);
+			$expand_name = self::expand_name($this->original_name, '', '', '', '', self::$request->content);
 		}
 		//error_log("$this running $method_name() cname: {$this->id} -> expand_name: $expand_name");
-		if($expand_name && $expand_name != $this->id)
+		if ($expand_name && $expand_name != $this->id)
 		{
 			if (($row_template = self::instance($expand_name)))
 			{
@@ -261,7 +261,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));
 		$form_name = self::form_name($cname, $this->id, $expand);

Braces +16 added lines, -4 removed lines

@@ -86,7 +86,10 @@ 
 					}
 
 					$parts = explode('.',$c_name);
-					if($name == $parts[count($parts)-1]) return $c_template;
+					if($name == $parts[count($parts)-1])
+					{
+						return $c_template;
+					}
 				}
 			}
 			// Template not found, try again with content expansion
@@ -106,7 +109,10 @@ 
 			return false;
 		}
 		$reader = new XMLReader();
-		if (!$reader->open(self::rel2path($path))) return false;
+		if (!$reader->open(self::rel2path($path)))
+		{
+			return false;
+		}
 
 		while($reader->read())
 		{
@@ -208,7 +214,10 @@ 
 			{
 				$url = Api\Vfs::download_url($path);
 
-				if ($url[0] == '/') $url = Api\Framework::link($url);
+				if ($url[0] == '/')
+				{
+					$url = Api\Framework::link($url);
+				}
 
 				// mtime postfix has to use '?download=', as our WebDAV treats everything else literal and not ignore them like Apache for static files!
 				$url .= '?download='.filemtime($path);
@@ -231,7 +240,10 @@ 
 	{
 		$cname =& $params[0];
 		$old_cname = $params[0];
-		if ($this->attrs['content']) $cname = self::form_name($cname, $this->attrs['content'], $params[1]);
+		if ($this->attrs['content'])
+		{
+			$cname = self::form_name($cname, $this->attrs['content'], $params[1]);
+		}
 
 		// Check for template from content, and run over it
 		// templates included via template tag have their name to load them from in attribute "template"

api/src/Etemplate/Widget/Tabbox.php

Spacing +14 added lines, -14 removed lines

@@ -42,30 +42,30 @@ 
 	 * @param array $params =array('') parameter(s) first parameter has to be the cname, second $expand!
 	 * @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)
 	{
 		$form_name = self::form_name($params[0], $this->id, $params[1]);
 
 		// Make sure additional tabs are processed for any method
-		if (!($tabs =& self::getElementAttribute($form_name, 'tabs')))
+		if (!($tabs = & self::getElementAttribute($form_name, 'tabs')))
 		{
 			$tabs = $this->attrs['tabs'];
 		}
-		if($tabs && !$this->tabs_attr_evaluated)
+		if ($tabs && !$this->tabs_attr_evaluated)
 		{
-			$this->tabs_attr_evaluated = true;	// we must not evaluate tabs attribte more then once!
+			$this->tabs_attr_evaluated = true; // we must not evaluate tabs attribte more then once!
 
 			// add_tabs toggles replacing or adding to existing tabs
-			if(!$this->attrs['add_tabs'])
+			if (!$this->attrs['add_tabs'])
 			{
 				$this->children[1]->children = array();
 			}
 
 			//$this->tabs = array();
-			foreach($tabs as &$tab)
+			foreach ($tabs as &$tab)
 			{
-				$template= clone Template::instance($tab['template']);
-				if($tab['id']) $template->attrs['content'] = $tab['id'];
+				$template = clone Template::instance($tab['template']);
+				if ($tab['id']) $template->attrs['content'] = $tab['id'];
 				$this->children[1]->children[] = $template;
 				$tab['url'] = Template::rel2url($template->rel_path);
 				//$this->tabs[] = $tab;
@@ -78,13 +78,13 @@ 
 
 		// Check for disabled tabs set via readonly, and set them as disabled
 		$readonlys = self::get_array(self::$request->readonlys, $form_name);
-		if($respect_disabled && $readonlys)
+		if ($respect_disabled && $readonlys)
 		{
-			foreach($this->children[1]->children as $tab)
+			foreach ($this->children[1]->children as $tab)
 			{
-				$parts = explode('.',$tab->template ? $tab->template : $tab->id);
+				$parts = explode('.', $tab->template ? $tab->template : $tab->id);
 				$ro_id = array_pop($parts);
-				if($readonlys[$ro_id])
+				if ($readonlys[$ro_id])
 				{
 					$tab->attrs['disabled'] = $readonlys[$ro_id];
 				}
@@ -104,14 +104,14 @@ 
 	 * @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);
 
 		if (!empty($form_name))
 		{
 			$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;
 		}
 	}

Doc Comments -1 removed lines

@@ -52,7 +52,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())
 	{

Braces +8 added lines, -2 removed lines

@@ -65,7 +65,10 @@ 
 			foreach($tabs as &$tab)
 			{
 				$template= clone Template::instance($tab['template']);
-				if($tab['id']) $template->attrs['content'] = $tab['id'];
+				if($tab['id'])
+				{
+					$template->attrs['content'] = $tab['id'];
+				}
 				$this->children[1]->children[] = $template;
 				$tab['url'] = Template::rel2url($template->rel_path);
 				//$this->tabs[] = $tab;
@@ -112,7 +115,10 @@ 
 		{
 			$value = self::get_array($content, $form_name);
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 }

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

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

api/src/Etemplate/Widget/Contact.php

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