EGroupware / egroupware

api/src/Country.php

Braces +21 added lines, -5 removed lines

@@ -368,7 +368,10 @@ 
 	{
 		if ($translated)
 		{
-			if (!self::$countries_translated) self::_translate_countries();
+			if (!self::$countries_translated)
+			{
+				self::_translate_countries();
+			}
 
 			return self::$countries_translated[strtoupper($code)];
 		}
@@ -383,7 +386,11 @@ 
 	 */
 	public static function country_code($name)
 	{
-		if (!$name) return '';	// nothing to do
+		if (!$name)
+		{
+			return '';
+		}
+		// nothing to do
 
 		if (strlen($name) == 2 && isset(self::$country_array[$name]))
 		{
@@ -394,7 +401,10 @@ 
 		{
 			return $code;
 		}
-		if (!self::$countries_translated) self::_translate_countries();
+		if (!self::$countries_translated)
+		{
+			self::_translate_countries();
+		}
 
 		if (($code = array_search(strtoupper($name),self::$countries_translated)) !== false ||
 			($code = array_search($name,self::$countries_translated)) !== false)
@@ -429,7 +439,10 @@ 
 	{
 		if ($translated)
 		{
-			if (!self::$countries_translated) self::_translate_countries();
+			if (!self::$countries_translated)
+			{
+				self::_translate_countries();
+			}
 
 			return self::$countries_translated;
 		}
@@ -443,7 +456,10 @@ 
 	 */
 	protected static function _translate_countries()
 	{
-		if (self::$countries_translated) return;
+		if (self::$countries_translated)
+		{
+			return;
+		}
 
 		self::$countries_translated = self::$country_array;
 		// try to translate them and sort alphabetic

api/src/Auth/Ads.php

Braces +16 added lines, -4 removed lines

@@ -90,7 +90,10 @@ 
 			if (($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
 			{
 				$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
-				if (!$ret) error_log(__METHOD__."('$username') account_status check returning ".array2string($ret));
+				if (!$ret)
+				{
+					error_log(__METHOD__."('$username') account_status check returning ".array2string($ret));
+				}
 				return $ret;
 			}
 			// store homedirectory for egw_session->read_repositories
@@ -158,7 +161,10 @@ 
 	static function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL, $return_mod=false)
 	{
 		unset($passwd);	// not used but required by function signature
-		if (!($adldap = Api\Accounts\Ads::get_adldap())) return false;
+		if (!($adldap = Api\Accounts\Ads::get_adldap()))
+		{
+			return false;
+		}
 
 		if ($lastpwdchange)
 		{
@@ -166,7 +172,10 @@ 
 			$ldapServerInfo = Api\Ldap\ServerInfo::get($adldap->getLdapConnection(), $GLOBALS['egw_info']['server']['ads_host']);
 			if ($ldapServerInfo->serverType == Api\Ldap\ServerInfo::SAMBA4)
 			{
-				if ($lastpwdchange == -1) $lastpwdchange = time();
+				if ($lastpwdchange == -1)
+				{
+					$lastpwdchange = time();
+				}
 			}
 			// while Windows only allows to set -1 for current time (or 0 to force user to change password)
 			else
@@ -179,7 +188,10 @@ 
 			$lastpwdchange = Api\Accounts\Ads::convertUnixTimeToWindowsTime($lastpwdchange);
 		}
 		$mod = array('pwdlastset' => $lastpwdchange);
-		if ($return_mod) return $mod;
+		if ($return_mod)
+		{
+			return $mod;
+		}
 
 		$ret = false;
 		if ($account_id && ($username = Api\Accounts::id2name($account_id, 'account_lid')) &&

api/src/Auth/Mail.php

Braces +24 added lines, -6 removed lines

@@ -70,7 +70,10 @@ 
 			}
 			catch(Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
-				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
+				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED)
+				{
+					throw $e;
+				}
 
 				$mailauth = false;
 			}
@@ -84,23 +87,38 @@ 
 			{
 				case 'imap':
 				default:
-					if (!isset($port)) $port = 143;
+					if (!isset($port))
+					{
+						$port = 143;
+					}
 					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
 					break;
 				case 'imaps':
-					if (!isset($port)) $port = 993;
+					if (!isset($port))
+					{
+						$port = 993;
+					}
 					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3':
-					if (!isset($port)) $port = 110;
+					if (!isset($port))
+					{
+						$port = 110;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 				case 'pop3s':
-					if (!isset($port)) $port = 995;
+					if (!isset($port))
+					{
+						$port = 995;
+					}
 					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
 					break;
 			}
-			if ($mailauth) imap_close($mailauth);
+			if ($mailauth)
+			{
+				imap_close($mailauth);
+			}
 		}
 		return !!$mailauth;
 	}

api/src/Auth/Cas.php

Braces +4 added lines, -1 removed lines

@@ -33,13 +33,16 @@
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
-			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
+			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq')
+		{
+			/* For anonymous LDAP connection */
 		{
 			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
+		}
 				foreach(array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',

api/src/Html/HtmLawed.php

Braces +146 added lines, -38 removed lines

@@ -109,9 +109,18 @@ 
 	function run($html2check, $Config=null, $Spec=array())
 	{
 		//error_log(__METHOD__.__LINE__.' Input:'.$html2check);
-		if (is_array($Config) && is_array($this->Configuration)) $Config = array_merge($this->Configuration, $Config);
-		if (empty($Config)) $Config = $this->Configuration;
-		if (empty($Spec)) $Spec = $this->Spec;
+		if (is_array($Config) && is_array($this->Configuration))
+		{
+			$Config = array_merge($this->Configuration, $Config);
+		}
+		if (empty($Config))
+		{
+			$Config = $this->Configuration;
+		}
+		if (empty($Spec))
+		{
+			$Spec = $this->Spec;
+		}
 		// If we are processing mails, we take out stuff in <style> stuff </style> tags and
 		// put it back in after purifying; styles are processed for known security risks
 		// in self::getStyles
@@ -139,7 +148,10 @@ 
 	{
 		$ct=0;
 		$newStyle = null;
-		if (stripos($html,'<style')!==false)  $ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		if (stripos($html,'<style')!==false)
+		{
+			$ct = preg_match_all('#<style(?:\s.*)?>(.+)</style>#isU', $html, $newStyle);
+		}
 		if ($ct>0)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($newStyle[0]));
@@ -173,7 +185,11 @@ 
 		// CSS Security
 		// http://code.google.com/p/browsersec/wiki/Part1#Cascading_stylesheets
 		$css = preg_replace('/(javascript|expession|-moz-binding)/i','',$style);
-		if (stripos($css,'script')!==false) Api\Mail\Html::replaceTagsCompletley($css,'script'); // Strip out script that may be included
+		if (stripos($css,'script')!==false)
+		{
+			Api\Mail\Html::replaceTagsCompletley($css,'script');
+		}
+		// Strip out script that may be included
 		// we need this, as styledefinitions are enclosed with curly brackets; and template stuff tries to replace everything between curly brackets that is having no horizontal whitespace
 		// as the comments as <!-- styledefinition --> in stylesheet are outdated, and ck-editor does not understand it, we remove it
 		$css_no_comment = str_replace(array(':','<!--','-->'),array(': ','',''),$css);
@@ -199,12 +215,19 @@ 
 	{
 		$defaultConfig = array('valid_xhtml'=>1,'safe'=>1);
 
-		if (empty($html)) return $html;	// no need to process further
+		if (empty($html))
+		{
+			return $html;
+		}
+		// no need to process further
 		if (!empty($config) && is_string($config))
 		{
 			//error_log(__METHOD__.__LINE__.$config);
 			$config = json_decode($config,true);
-			if (is_null($config)) error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			if (is_null($config))
+			{
+				error_log(__METHOD__.__LINE__." decoding of config failed; standard will be applied");
+			}
 		}
 
 		// User preferences
@@ -218,8 +241,14 @@ 
 			return '';
 		}
 		$htmLawed = new HtmLawed();
-		if (is_array($config) && $_force===false) $config = array_merge($defaultConfig, $config);
-		if (empty($config)) $config = $defaultConfig;
+		if (is_array($config) && $_force===false)
+		{
+			$config = array_merge($defaultConfig, $config);
+		}
+		if (empty($config))
+		{
+			$config = $defaultConfig;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($config));
 		return $htmLawed->run($html,$config,$spec);
 	}
@@ -236,7 +265,8 @@ 
 function hl_my_tag_transform($element, $attribute_array=0)
 {
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
+	if(is_numeric($attribute_array))
+	{
 		return "</$element>";
 	}
 
@@ -258,18 +288,30 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	/*
@@ -301,7 +343,10 @@ 
 		$attribute_array['style'] = implode('; ', $style);
 	}
 	*/
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
@@ -314,12 +359,16 @@ 
 		{
 			$attribute_array['href']=str_ireplace("');",'',str_ireplace("javascript:GoToAnchor('","#",$attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
@@ -344,27 +393,52 @@ 
 	//error_log(__METHOD__.__LINE__.$element.'=>'.array2string($attribute_array));
 	static $lastelement = null;
 	static $throwawaycounter = null;
-	if (is_null($lastelement)) $lastelement='';
-	if (is_null($throwawaycounter)) $throwawaycounter = 0;
+	if (is_null($lastelement))
+	{
+		$lastelement='';
+	}
+	if (is_null($throwawaycounter))
+	{
+		$throwawaycounter = 0;
+	}
 	//if ($throwawaycounter>1) error_log(__METHOD__.__LINE__.' '.$throwawaycounter.$element.array2string($attribute_array));
 	if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
 	{
-		if (is_array($attribute_array)) $throwawaycounter++;
-		if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
-		if ($throwawaycounter>1) return '';
+		if (is_array($attribute_array))
+		{
+			$throwawaycounter++;
+		}
+		if ($attribute_array==0 && $throwawaycounter>0)
+		{
+			$throwawaycounter--;
+		}
+		if ($throwawaycounter>1)
+		{
+			return '';
+		}
+	}
+	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array))
+	{
+		$throwawaycounter = 0;
 	}
-	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
 	if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
 	{
 		$lastelement = 'div_with_attr';
 	}
 	else
 	{
-		if (is_array($attribute_array)) $lastelement = $element;
+		if (is_array($attribute_array))
+		{
+			$lastelement = $element;
+		}
 	}
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
-		if($element==$lastelement) $lastelement='';
+	if(is_numeric($attribute_array))
+	{
+		if($element==$lastelement)
+		{
+			$lastelement='';
+		}
 		return "</$element>";
 	}
 
@@ -386,15 +460,24 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 		// $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] ? '' : 'match' => '/^cid:.*/'),
 		if (isset($attribute_array['src']))
 		{
 			if (!(strlen($attribute_array['src'])>4 && strlen($attribute_array['src']<400)))
 			{
 					$attribute_array['alt']= $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+					if (!isset($attribute_array['title']))
+					{
+						$attribute_array['title']=$attribute_array['alt'];
+					}
 					$attribute_array['src']=Api\Image::find('phpgwapi','dialog_error');
 			}
 			if (!preg_match('/^cid:.*/',$attribute_array['src']))
@@ -405,36 +488,60 @@ 
 					if (empty($GLOBALS['egw_info']['server']['webserver_url'])||!preg_match("$^".$GLOBALS['egw_info']['server']['webserver_url'].".*$",$attribute_array['src']))
 					{
 						$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
-						if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+						if (!isset($attribute_array['title']))
+						{
+							$attribute_array['title']=$attribute_array['alt'];
+						}
 						$attribute_array['src']=Api\Image::find('mail','no-image-shown');
 						$attribute_array['border'] = 1;
 						if ($attribute_array['style'])
 						{
-							if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+							if (stripos($attribute_array['style'],'border')!==false)
+							{
+								$attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
-		if (isset($attribute_array['name']) && isset($attribute_array['id'])) $attribute_array['id'] = $attribute_array['name'];
-		if (strpos($attribute_array['href'],'@')!==false) $attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
+		if (isset($attribute_array['name']) && isset($attribute_array['id']))
+		{
+			$attribute_array['id'] = $attribute_array['name'];
+		}
+		if (strpos($attribute_array['href'],'@')!==false)
+		{
+			$attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		}
 		if (strpos($attribute_array['href'],'#')===0 && (isset(Api\Mail::$htmLawed_config['transform_anchor']) && Api\Mail::$htmLawed_config['transform_anchor']===true))
 		{
 			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'],1))."');";
@@ -444,7 +551,8 @@ 
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 

api/src/Csrf.php

Braces +8 added lines, -2 removed lines

@@ -64,10 +64,16 @@
 		if (!isset($stored_purpose) || $stored_purpose !== $_purpose)
 		{
 			error_log('CSRF detected from IP '.$_SERVER['REMOTE_ADDR'].' to '.$_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI']);
-			if ($_POST) error_log(array2string($_POST));
+			if ($_POST)
+			{
+				error_log(array2string($_POST));
+			}
 			// we are not throwing an exception here, but die, to not allow catching it!
 			die("CSRF detected, request terminated!");
 		}
-		if ($_delete_token) Cache::unsetSession(__CLASS__, $_token);
+		if ($_delete_token)
+		{
+			Cache::unsetSession(__CLASS__, $_token);
+		}
 	}
 }
\ No newline at end of file

api/src/Image.php

Braces +48 added lines, -12 removed lines

@@ -33,7 +33,10 @@ 
 	{
 		$svg = Header\UserAgent::mobile() ? null : $_svg; // ATM we use svg icons only for mobile theme
 		static $image_map_no_svg = null, $image_map_svg = null;
-		if (is_null($svg)) $svg = self::svg_usable ();
+		if (is_null($svg))
+		{
+			$svg = self::svg_usable ();
+		}
 		if ($svg)
 		{
 			$image_map =& $image_map_svg;
@@ -42,7 +45,10 @@ 
 		{
 			$image_map =& $image_map_no_svg;
 		}
-		if (is_null($image_map)) $image_map = self::map(null, $svg);
+		if (is_null($image_map))
+		{
+			$image_map = self::map(null, $svg);
+		}
 
 		// array of images in descending precedence
 		if (is_array($image))
@@ -152,15 +158,24 @@ 
 		$img_types = array('png','jpg','gif','ico');
 
 		// if we want svg, prepend it to img-types
-		if ($svg) array_unshift ($img_types, 'svg');
+		if ($svg)
+		{
+			array_unshift ($img_types, 'svg');
+		}
 
 		$map = array();
 		foreach(scandir(EGW_SERVER_ROOT) as $app)
 		{
-			if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) || !file_exists(EGW_SERVER_ROOT.'/'.$app.'/templates')) continue;
+			if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) || !file_exists(EGW_SERVER_ROOT.'/'.$app.'/templates'))
+			{
+				continue;
+			}
 
 			$app_map =& $map[$app];
-			if (true) $app_map = array();
+			if (true)
+			{
+				$app_map = array();
+			}
 			$imagedirs = array();
 			if (Header\UserAgent::mobile())
 			{
@@ -174,24 +189,39 @@ 
 			{
 				$imagedirs[] = '/'.$app.'/templates/'.$template_set.'/images';
 			}
-			if ($template_set != 'idots') $imagedirs[] = '/'.$app.'/templates/idots/images';
+			if ($template_set != 'idots')
+			{
+				$imagedirs[] = '/'.$app.'/templates/idots/images';
+			}
 			$imagedirs[] = '/'.$app.'/templates/default/images';
 
 			foreach($imagedirs as $imagedir)
 			{
-				if (!file_exists($dir = EGW_SERVER_ROOT.$imagedir) || !is_readable($dir)) continue;
+				if (!file_exists($dir = EGW_SERVER_ROOT.$imagedir) || !is_readable($dir))
+				{
+					continue;
+				}
 
 				foreach(scandir($dir) as $img)
 				{
-					if ($img[0] == '.') continue;
+					if ($img[0] == '.')
+					{
+						continue;
+					}
 
 					$subdir = null;
 					foreach(is_dir($dir.'/'.$img) ? scandir($dir.'/'.($subdir=$img)) : (array) $img as $img)
 					{
 						$name = null;
-						if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
+						if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name))
+						{
+							continue;
+						}
 
-						if (isset($subdir)) $name = $subdir.'/'.$name;
+						if (isset($subdir))
+						{
+							$name = $subdir.'/'.$name;
+						}
 
 						if (!isset($app_map[$name]) || array_search($ext, $img_types) < array_search(self::get_extension($app_map[$name]), $img_types))
 						{
@@ -202,12 +232,18 @@ 
 			}
 		}
 		$app_map =& $map['vfs'];
-		if (true) $app_map = array();
+		if (true)
+		{
+			$app_map = array();
+		}
 		if (($dir = $GLOBALS['egw_info']['server']['vfs_image_dir']) && Vfs::file_exists($dir) && Vfs::is_readable($dir))
 		{
 			foreach(Vfs::find($dir) as $img)
 			{
-				if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
+				if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name))
+				{
+					continue;
+				}
 
 				if (!isset($app_map[$name]) || array_search($ext, $img_types) < array_search(self::get_extension($app_map[$name]), $img_types))
 				{

api/src/Mail/Smtp.php

Braces +12 added lines, -3 removed lines

@@ -235,8 +235,14 @@ 
 	 */
 	/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
 	{
-		if (is_null($domain)) $domain = $this->defaultDomain;
-		if (is_null($mail_login_type)) $mail_login_type = $this->loginType;
+		if (is_null($domain))
+		{
+			$domain = $this->defaultDomain;
+		}
+		if (is_null($mail_login_type))
+		{
+			$mail_login_type = $this->loginType;
+		}
 
 		switch($mail_login_type)
 		{
@@ -245,7 +251,10 @@ 
 				break;
 
 			case 'uidNumber':
-				if (is_array($account)) $account = $account['account_id'];
+				if (is_array($account))
+				{
+					$account = $account['account_id'];
+				}
 				$mbox = 'u'.$account.'@'.$domain;
 				break;
 

api/src/Mail/Imap/Cyrus.php

Braces +12 added lines, -3 removed lines

@@ -121,7 +121,10 @@ 
 	function getUserData($_username)
 	{
 		// no need to switch to admin-connection for reading quota of current user
-		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection();
+		if ($_username !== $GLOBALS['egw_info']['user']['account_lid'])
+		{
+			$this->adminConnection();
+		}
 		$userData = array();
 
 		if(($quota = $this->getQuotaByUser($_username,'ALL')))
@@ -131,7 +134,10 @@ 
 		}
 		//error_log(__LINE__.': '.__METHOD__."('$_username') quota=".array2string($quota).' returning '.array2string($userData));
 
-		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->disconnect();
+		if ($_username !== $GLOBALS['egw_info']['user']['account_lid'])
+		{
+			$this->disconnect();
+		}
 
 		return $userData;
 	}
@@ -204,7 +210,10 @@ 
 						$userimap->subscribeMailbox($value);
 					}
 				}
-				if (isset($userimap)) $userimap->logout();
+				if (isset($userimap))
+				{
+					$userimap->logout();
+				}
 			}
 			catch(Horde_Imap_Client_Exception $e) {
 				_egw_log_exception($e);