EGroupware / egroupware

api/src/MimeMagic.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 		{
 			return $mime;
 		}
-		return lang('%1 file',strtoupper($ext)).' ('.$mime.')';
+		return lang('%1 file', strtoupper($ext)).' ('.$mime.')';
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	{
 		if (empty($_ext))
 		{
-			return 'text/plain';//assume no extension is a text file
+			return 'text/plain'; //assume no extension is a text file
 		}
 		$ext = strtolower($_ext);
 		if (!array_key_exists($ext, self::$mime_extension_map))
@@ -188,24 +188,24 @@ 
 	 */
 	public static function analyze_data($data)
 	{
-		if(!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
+		if (!is_writeable(@$GLOBALS['egw_info']['server']['temp_dir']))
 		{
 			//nothing we can do but bail out
 			return false;
 		}
 
 		mt_srand(time());
-		$filename = $GLOBALS['egw_info']['server']['temp_dir'] . '/'
-			. md5( time() + mt_rand() ) . '.tmp';
+		$filename = $GLOBALS['egw_info']['server']['temp_dir'].'/'
+			. md5(time() + mt_rand()).'.tmp';
 
 		$fp = @fopen($filename, 'ab');
-		if(!$fp || !$data)
+		if (!$fp || !$data)
 		{
 			//houston we have a problem - bail out
 			return false;
 		}
 
-		if(!fwrite($fp, $data))
+		if (!fwrite($fp, $data))
 		{
 			//bail out again
 			return false;
@@ -215,7 +215,7 @@ 
 
 		$mime = self::analyze_file($filename);
 
-		unlink($filename);//remove the temp file
+		unlink($filename); //remove the temp file
 
 		return $mime;
 	}
@@ -233,7 +233,7 @@ 
 	 * @var array of extenstion to mime mappings
 	 */
 	static $mime_extension_map = array(
-		'txt'				=> 'text/plain',	// should be first, so text/plain maps back to .txt
+		'txt'				=> 'text/plain', // should be first, so text/plain maps back to .txt
 		'3dml'              => 'text/vnd.in3d.3dml',
 		'3ds'               => 'image/x-3ds',
 		'3g2'               => 'video/3gpp2',

Braces +4 added lines, -1 removed lines

@@ -106,7 +106,10 @@
 	public static function mime2ext($_type)
 	{
 		$type = strtolower($_type);
-		if (isset(self::$mime_alias_map[$type])) $type = self::$mime_alias_map[$type];
+		if (isset(self::$mime_alias_map[$type]))
+		{
+			$type = self::$mime_alias_map[$type];
+		}
 		$key = array_search($type, self::$mime_extension_map);
 		if (empty($type) || $key === false)
 		{

api/src/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 class Exception extends \Exception
 {
 	// nothing fancy yet
-	function __construct($msg=null,$code=100,\Exception $previous=null)
+	function __construct($msg = null, $code = 100, \Exception $previous = null)
 	{
 		return parent::__construct($msg, $code, $previous);
 	}

api/src/Accounts/Sql.php

Spacing +52 added lines, -52 removed lines

@@ -198,38 +198,38 @@ 
 		if ($data['account_passwd'])
 		{
 			// if password it's not already entcrypted, do so now
-			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']) &&
+				!preg_match('/^[0-9a-f]{32}$/', $data['account_passwd']))	// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change'] = 0;
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
 			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = ''; // is NOT NULL!
+			if (!isset($to_write['account_status'])) $to_write['account_status'] = ''; // is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
 			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
 
-			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+			if (!in_array($to_write['account_type'], array('u', 'g')) ||
+				!$this->db->insert($this->table, $to_write, false, __LINE__, __FILE__)) return false;
 
 			if (!(int)$data['account_id'])
 			{
-				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
+				$data['account_id'] = $this->db->get_last_insert_id($this->table, 'account_id');
 				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
 			}
 		}
 		else	// update of existing account
 		{
 			unset($to_write['account_id']);
-			if (!$this->db->update($this->table,$to_write,array('account_id' => abs($data['account_id'])),__LINE__,__FILE__))
+			if (!$this->db->update($this->table, $to_write, array('account_id' => abs($data['account_id'])), __LINE__, __FILE__))
 			{
 				return false;
 			}
@@ -278,16 +278,16 @@ 
 	{
 		if (!(int)$account_id) return false;
 
-		$contact_id = $this->id2name($account_id,'person_id');
+		$contact_id = $this->id2name($account_id, 'person_id');
 
-		if (!$this->db->delete($this->table,array('account_id' => abs($account_id)),__LINE__,__FILE__))
+		if (!$this->db->delete($this->table, array('account_id' => abs($account_id)), __LINE__, __FILE__))
 		{
 			return false;
 		}
 		if ($contact_id)
 		{
 			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
-			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
+			$this->contacts->delete($contact_id, false); // false = allow to delete accounts (!)
 		}
 		return true;
 	}
@@ -303,11 +303,11 @@ 
 		if (!(int)$account_id) return false;
 
 		$memberships = array();
-		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
+		if (($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
 		{
-			foreach($gids as $gid)
+			foreach ($gids as $gid)
 			{
-				$memberships[(string) $gid] = $this->id2name($gid);
+				$memberships[(string)$gid] = $this->id2name($gid);
 			}
 		}
 		return $memberships;
@@ -319,17 +319,17 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id numerical account-id
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!(int)$account_id) return;
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
-		$acl->delete('phpgw_group',false);
+		$acl->delete('phpgw_group', false);
 
-		foreach($groups as $group)
+		foreach ($groups as $group)
 		{
-			$acl->add('phpgw_group',$group,1);
+			$acl->add('phpgw_group', $group, 1);
 		}
 		$acl->save_repository();
 	}
@@ -345,7 +345,7 @@ 
 		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
 
 		$members = array();
-		foreach($this->db->select($this->table, 'account_id,account_lid',
+		foreach ($this->db->select($this->table, 'account_id,account_lid',
 			$this->db->expression(Api\Acl::TABLE, array(
 				'acl_appname'  => 'phpgw_group',
 				'acl_location' => $account_id,
@@ -364,15 +364,15 @@ 
 	 * @param array $members array with uidnumber or uid's
 	 * @param int $gid gidnumber of group to set
 	 */
-	function set_members($members,$gid)
+	function set_members($members, $gid)
 	{
-		$GLOBALS['egw']->acl->delete_repository('phpgw_group',$gid,false);
+		$GLOBALS['egw']->acl->delete_repository('phpgw_group', $gid, false);
 
 		if (is_array($members))
 		{
-			foreach($members as $id)
+			foreach ($members as $id)
 			{
-				$GLOBALS['egw']->acl->add_repository('phpgw_group',$gid,$id,1);
+				$GLOBALS['egw']->acl->add_repository('phpgw_group', $gid, $id, 1);
 			}
 		}
 	}
@@ -407,20 +407,20 @@ 
 		);
 
 		// fetch order of account_fullname from Api\Accounts::format_username
-		if (strpos($param['order'],'account_fullname') !== false)
+		if (strpos($param['order'], 'account_fullname') !== false)
 		{
-			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/',',',str_replace(array('[',']'),'',
-				Api\Accounts::format_username('account_lid','account_firstname','account_lastname'))), $param['order']);
+			$param['order'] = str_replace('account_fullname', preg_replace('/[ ,]+/', ',', str_replace(array('[', ']'), '',
+				Api\Accounts::format_username('account_lid', 'account_firstname', 'account_lastname'))), $param['order']);
 		}
-		$order = str_replace(array_keys($order2contact),array_values($order2contact),$param['order']);
+		$order = str_replace(array_keys($order2contact), array_values($order2contact), $param['order']);
 		// allways add 'account_lid', as it is only valid one for groups
 		if (strpos($order, 'account_lid') === false)
 		{
-			$order .= ($order?',':'').'account_lid';
+			$order .= ($order ? ',' : '').'account_lid';
 		}
 		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
 
-		$search_cols = array('account_lid','n_family','n_given','email');
+		$search_cols = array('account_lid', 'n_family', 'n_given', 'email');
 		$join = $this->contacts_join;
 		$email_cols = array('email');
 
@@ -436,7 +436,7 @@ 
 		}
 
 		$filter = array();
-		switch($param['type'])
+		switch ($param['type'])
 		{
 			case 'accounts':
 				$filter['owner'] = 0;
@@ -451,7 +451,7 @@ 
 			case 'groupmembers':
 			case 'groupmembers+memberships':
 				$members = array();
-				foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
+				foreach ((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $grp => $name)
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
@@ -486,13 +486,13 @@ 
 		}
 		if ($param['active'])
 		{
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), Api\Contacts\Sql::ACOUNT_ACTIVE_FILTER);
 		}
 		$criteria = array();
 		$wildcard = $param['query_type'] == 'start' || $param['query_type'] == 'exact' ? '' : '%';
 		if (($query = $param['query']))
 		{
-			switch($param['query_type'])
+			switch ($param['query_type'])
 			{
 				case 'start':
 					$query .= '*';
@@ -500,7 +500,7 @@ 
 				case 'all':
 				default:
 				case 'exact':
-					foreach($search_cols as $col)
+					foreach ($search_cols as $col)
 					{
 						$criteria[$col] = $query;
 					}
@@ -521,7 +521,7 @@ 
 				case 'email':
 					$criteria['email'] = $query;
 					// Group email
-					if(in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
+					if (in_array(Api\Mail\Smtp\Sql::TABLE, $this->db->table_names(true)))
 					{
 						$criteria[Api\Mail\Smtp\Sql::TABLE.'.mail_value'] = $query;
 					}
@@ -531,12 +531,12 @@ 
 		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
 
 		$accounts = array();
-		foreach((array) $this->contacts->search($criteria,
-			array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
-			$order,"account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
-			$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
+		foreach ((array)$this->contacts->search($criteria,
+			array_merge(array(1, 'n_given', 'n_family', 'id', 'created', 'modified', $this->table.'.account_id AS account_id'), $email_cols),
+			$order, "account_lid,account_type,account_status,account_expires,account_primary_group,account_description",
+			$wildcard, false, $query[0] == '!' ? 'AND' : 'OR',
 			$param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']),
-			$filter,$join) as $contact)
+			$filter, $join) as $contact)
 		{
 			if ($contact)
 			{
@@ -576,13 +576,13 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int/false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($name,$which='account_lid',$account_type=null)
+	function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		if ($account_type === 'g' && $which != 'account_lid') return false;
 
 		$where = array();
 		$cols = 'account_id';
-		switch($which)
+		switch ($which)
 		{
 			case 'account_fullname':
 				$table = $this->contacts_table;
@@ -613,11 +613,11 @@ 
 		}
 		else
 		{
-			$where[] = 'account_id IS NOT NULL'.	// otherwise contacts with eg. the same email hide the accounts!
-				($table == $this->contacts_table ? " AND contact_tid != 'D'" : '');	// ignore deleted accounts contact-data
+			$where[] = 'account_id IS NOT NULL'.// otherwise contacts with eg. the same email hide the accounts!
+				($table == $this->contacts_table ? " AND contact_tid != 'D'" : ''); // ignore deleted accounts contact-data
 
 		}
-		if (!($rs = $this->db->select($table,$cols,$where,__LINE__,__FILE__)) || !($row = $rs->fetch()))
+		if (!($rs = $this->db->select($table, $cols, $where, __LINE__, __FILE__)) || !($row = $rs->fetch()))
 		{
 			//error_log(__METHOD__."('$name', '$which', ".array2string($account_type).") db->select('$table', '$cols', ".array2string($where).") returned ".array2string($rs).' '.function_backtrace());
 			return false;
@@ -634,9 +634,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -648,14 +648,14 @@ 
 	 */
 	function update_lastlogin($account_id, $ip)
 	{
-		$previous_login = $this->db->select($this->table,'account_lastlogin',array('account_id'=>abs($account_id)),__LINE__,__FILE__)->fetchColumn();
+		$previous_login = $this->db->select($this->table, 'account_lastlogin', array('account_id'=>abs($account_id)), __LINE__, __FILE__)->fetchColumn();
 
-		$this->db->update($this->table,array(
+		$this->db->update($this->table, array(
 			'account_lastloginfrom' => $ip,
 			'account_lastlogin'     => time(),
-		),array(
+		), array(
 			'account_id' => abs($account_id),
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		return $previous_login;
 	}

Braces +94 added lines, -23 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id > 0)
 		{
@@ -152,11 +155,14 @@ 
 			unset($e);
 		}
 
-		if (!$rs)	// handle not (yet) existing mailaccounts table
+		if (!$rs)
+		{
+			// handle not (yet) existing mailaccounts table
 		{
 			$rs = $this->db->select($this->table, $this->table.'.*',
 				$this->table.'.account_id='.abs($account_id), __LINE__, __FILE__);
 		}
+		}
 		if (!$rs || !($data = $rs->fetch()))
 		{
 			return false;
@@ -166,7 +172,10 @@ 
 			$data['account_id'] = -$data['account_id'];
 			$data['mailAllowed'] = true;
 		}
-		if (!$data['account_firstname']) $data['account_firstname'] = $data['account_lid'];
+		if (!$data['account_firstname'])
+		{
+			$data['account_firstname'] = $data['account_lid'];
+		}
 		if (!$data['account_lastname'])
 		{
 			$data['account_lastname'] = $data['account_type'] == 'g' ? 'Group' : 'User';
@@ -177,7 +186,10 @@ 
 				$data['account_lastname'] = lang($data['account_lastname']);
 			}
 		}
-		if (!$data['account_fullname']) $data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		if (!$data['account_fullname'])
+		{
+			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
+		}
 
 		return $data;
 	}
@@ -199,31 +211,57 @@ 
 		{
 			// if password it's not already entcrypted, do so now
 			if (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']) &&
-				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))	// md5 hash
+				!preg_match('/^[0-9a-f]{32}$/',$data['account_passwd']))
+			{
+				// md5 hash
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_sql($data['account_passwd']);
 			}
+			}
 			$to_write['account_pwd'] = $data['account_passwd'];
 			$to_write['account_lastpwd_change'] = time();
 		}
-		if ($data['mustchangepassword'] == 1) $to_write['account_lastpwd_change']=0;
+		if ($data['mustchangepassword'] == 1)
+		{
+			$to_write['account_lastpwd_change']=0;
+		}
 		if (!(int)$data['account_id'] || !$this->id2name($data['account_id']))
 		{
-			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
+			if ($to_write['account_id'] < 0)
+			{
+				$to_write['account_id'] *= -1;
+			}
 
-			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
-			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_pwd']))
+			{
+				$to_write['account_pwd'] = '';
+			}
+			// is NOT NULL!
+			if (!isset($to_write['account_status']))
+			{
+				$to_write['account_status'] = '';
+			}
+			// is NOT NULL!
 
 			// postgres requires the auto-id field to be unset!
-			if (isset($to_write['account_id']) && !$to_write['account_id']) unset($to_write['account_id']);
+			if (isset($to_write['account_id']) && !$to_write['account_id'])
+			{
+				unset($to_write['account_id']);
+			}
 
 			if (!in_array($to_write['account_type'],array('u','g')) ||
-				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;
+				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__))
+			{
+				return false;
+			}
 
 			if (!(int)$data['account_id'])
 			{
 				$data['account_id'] = $this->db->get_last_insert_id($this->table,'account_id');
-				if ($data['account_type'] == 'g') $data['account_id'] *= -1;
+				if ($data['account_type'] == 'g')
+				{
+					$data['account_id'] *= -1;
+				}
 			}
 		}
 		else	// update of existing account
@@ -276,7 +314,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$contact_id = $this->id2name($account_id,'person_id');
 
@@ -286,7 +327,10 @@ 
 		}
 		if ($contact_id)
 		{
-			if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+			if (!isset($this->contacts))
+			{
+				$this->contacts = new Api\Contacts();
+			}
 			$this->contacts->delete($contact_id,false);	// false = allow to delete accounts (!)
 		}
 		return true;
@@ -300,7 +344,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$memberships = array();
 		if(($gids = $GLOBALS['egw']->acl->get_location_list_for_id('phpgw_group', 1, $account_id)))
@@ -321,7 +368,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!(int)$account_id) return;
+		if (!(int)$account_id)
+		{
+			return;
+		}
 
 		$acl = new Api\Acl($account_id);
 		$acl->read_repository();
@@ -342,7 +392,10 @@ 
 	 */
 	function members($account_id)
 	{
-		if (!is_numeric($account_id)) $account_id = $this->name2id($account_id);
+		if (!is_numeric($account_id))
+		{
+			$account_id = $this->name2id($account_id);
+		}
 
 		$members = array();
 		foreach($this->db->select($this->table, 'account_id,account_lid',
@@ -418,7 +471,10 @@ 
 		{
 			$order .= ($order?',':'').'account_lid';
 		}
-		if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		if ($param['sort'])
+		{
+			$order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
+		}
 
 		$search_cols = array('account_lid','n_family','n_given','email');
 		$join = $this->contacts_join;
@@ -455,7 +511,10 @@ 
 				{
 					unset($name);
 					$members = array_unique(array_merge($members, array_keys((array)$this->members($grp))));
-					if ($param['type'] == 'groupmembers+memberships') $members[] = abs($grp);
+					if ($param['type'] == 'groupmembers+memberships')
+					{
+						$members[] = abs($grp);
+					}
 				}
 				$filter['account_id'] = $members;
 				break;
@@ -474,9 +533,12 @@ 
 		// fix ambigous account_id (used in accounts and contacts table)
 		if (array_key_exists('account_id', $filter))
 		{
-			if (!$filter['account_id'])	// eg. group without members (would give SQL error)
+			if (!$filter['account_id'])
+			{
+				// eg. group without members (would give SQL error)
 			{
 				$this->total = 0;
+			}
 				return array();
 			}
 			$filter[] = $this->db->expression($this->table, $this->table.'.', array(
@@ -528,7 +590,10 @@ 
 					break;
 			}
 		}
-		if (!isset($this->contacts)) $this->contacts = new Api\Contacts();
+		if (!isset($this->contacts))
+		{
+			$this->contacts = new Api\Contacts();
+		}
 
 		$accounts = array();
 		foreach((array) $this->contacts->search($criteria,
@@ -578,7 +643,10 @@ 
 	 */
 	function name2id($name,$which='account_lid',$account_type=null)
 	{
-		if ($account_type === 'g' && $which != 'account_lid') return false;
+		if ($account_type === 'g' && $which != 'account_lid')
+		{
+			return false;
+		}
 
 		$where = array();
 		$cols = 'account_id';
@@ -601,9 +669,12 @@ 
 				$cols .= ',account_type';
 				$where[$which] = $name;
 				// check if we need to treat username case-insensitive
-				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+				if ($which == 'account_lid' && !$GLOBALS['egw_info']['server']['case_sensitive_username'])
+				{
+					// = is case sensitiv eg. on postgres, but not on mysql!
 				{
 					$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($where['account_lid']);
+				}
 					unset($where['account_lid']);
 				}
 		}

api/src/Cache/Memcache.php

Spacing +16 added lines, -16 removed lines

@@ -54,26 +54,26 @@ 
 	 * @throws Exception if connection to backend could not be established
 	 * @param array $params eg. array('localhost'[,'localhost:11211',...])
 	 */
-	function __construct(array $params=null)
+	function __construct(array $params = null)
 	{
-		check_load_extension('memcache',true);
+		check_load_extension('memcache', true);
 		$this->memcache = new \Memcache();
 
-		if (!$params) $params = array('localhost');	// some reasonable default
+		if (!$params) $params = array('localhost'); // some reasonable default
 
 		$ok = false;
-		foreach($params as $host_port)
+		foreach ($params as $host_port)
 		{
-			$parts = explode(':',$host_port);
+			$parts = explode(':', $host_port);
 			$host = array_shift($parts);
-			$port = $parts ? array_shift($parts) : 11211;	// default port
+			$port = $parts ? array_shift($parts) : 11211; // default port
 
-			$ok = $this->memcache->addServer($host,$port) || $ok;
+			$ok = $this->memcache->addServer($host, $port) || $ok;
 			//error_log(__METHOD__."(".array2string($params).") memcache->addServer('$host',$port) = ".(int)$ok);
 		}
 		if (!$ok)
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
+			throw new Exception(__METHOD__.'('.array2string($params).") Can't open connection to any memcached server!");
 		}
 		$this->igbinary_available = function_exists('igbinary_serialize') && function_exists('igbinary_unserialize');
 	}
@@ -86,7 +86,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
 		return $this->memcache->add(self::key($keys),
 			$this->igbinary_available ? igbinary_serialize($data) : serialize($data),
@@ -101,7 +101,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
 		return $this->memcache->set(self::key($keys),
 			$this->igbinary_available ? igbinary_serialize($data) : serialize($data),
@@ -116,7 +116,7 @@ 
 	 */
 	function get(array $keys)
 	{
-		if (($data = $this->memcache->get($key=self::key($keys))) === false)
+		if (($data = $this->memcache->get($key = self::key($keys))) === false)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") key='$key' NOT found!");
 			return null;
@@ -135,7 +135,7 @@ 
 	{
 		$locations = array_pop($keys);
 		$prefix = self::key($keys);
-		foreach($locations as &$location)
+		foreach ($locations as &$location)
 		{
 			$location = $prefix.'::'.$location;
 		}
@@ -144,10 +144,10 @@ 
 			return array();
 		}
 		$ret = array();
-		$prefix_len = strlen($prefix)+2;
-		foreach($multiple as $location => $data)
+		$prefix_len = strlen($prefix) + 2;
+		foreach ($multiple as $location => $data)
 		{
-			$key = substr($location,$prefix_len);
+			$key = substr($location, $prefix_len);
 			//error_log(__METHOD__."(".array2string($locations).") key='$key' found ".bytes($data)." bytes).");
 			$ret[$key] = $this->igbinary_available && $data[1] !== ':' ? igbinary_unserialize($data) : unserialize($data);
 		}
@@ -175,6 +175,6 @@ 
 	 */
 	private function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

Braces +5 added lines, -1 removed lines

@@ -59,7 +59,11 @@
 		check_load_extension('memcache',true);
 		$this->memcache = new \Memcache();
 
-		if (!$params) $params = array('localhost');	// some reasonable default
+		if (!$params)
+		{
+			$params = array('localhost');
+		}
+		// some reasonable default
 
 		$ok = false;
 		foreach($params as $host_port)

api/src/Cache/Base.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
 	 * @param boolean $verbose =false true: echo failed checks
 	 * @return int number of failed checks
 	 */
-	function check($verbose=false)
+	function check($verbose = false)
 	{
 		// set us up as provider for Api\Cache class
 		$GLOBALS['egw_info']['server']['install_id'] = md5(microtime(true));
@@ -37,27 +37,27 @@ 
 		Api\Cache::$default_provider = get_class($this);
 
 		$failed = 0;
-		foreach(array(
+		foreach (array(
 			Api\Cache::TREE => 'tree',
 			Api\Cache::INSTANCE => 'instance',
 		) as $level => $label)
 		{
 			$locations = array();
-			foreach(array('string',123,true,false,null,array(),array(1,2,3)) as $data)
+			foreach (array('string', 123, true, false, null, array(), array(1, 2, 3)) as $data)
 			{
 				$location = md5(microtime(true).$label.serialize($data));
-				$get_before_set = $this->get(array($level,__CLASS__,$location));
+				$get_before_set = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_before_set))
 				{
 					if ($verbose) echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
 					++$failed;
 				}
-				if (($set = $this->set(array($level,__CLASS__,$location), $data, 10)) !== true)
+				if (($set = $this->set(array($level, __CLASS__, $location), $data, 10)) !== true)
 				{
 					if ($verbose) echo "$label: set returned ".array2string($set)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_set = $this->get(array($level,__CLASS__,$location));
+				$get_after_set = $this->get(array($level, __CLASS__, $location));
 				if ($get_after_set !== $data)
 				{
 					if ($verbose) echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
@@ -65,25 +65,25 @@ 
 				}
 				if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 				{
-					$mget_after_set = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_set = $this->mget(array($level, __CLASS__, array($location)));
 					if ($mget_after_set[$location] !== $data)
 					{
 						if ($verbose) echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
 						++$failed;
 					}
 				}
-				$add_after_set = $this->add(array($level,__CLASS__,$location), 'other-data');
+				$add_after_set = $this->add(array($level, __CLASS__, $location), 'other-data');
 				if ($add_after_set !== false)
 				{
 					if ($verbose) echo "$label: add_after_set=".array2string($add_after_set)."\n";
 					++$failed;
 				}
-				if (($delete = $this->delete(array($level,__CLASS__,$location))) !== true)
+				if (($delete = $this->delete(array($level, __CLASS__, $location))) !== true)
 				{
 					if ($verbose) echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
 					++$failed;
 				}
-				$get_after_delete = $this->get(array($level,__CLASS__,$location));
+				$get_after_delete = $this->get(array($level, __CLASS__, $location));
 				if (!is_null($get_after_delete))
 				{
 					if ($verbose) echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
@@ -93,7 +93,7 @@ 
 				if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 				{
 					$locations[$location] = $data;
-					$mget_after_delete = $this->mget(array($level,__CLASS__,array($location)));
+					$mget_after_delete = $this->mget(array($level, __CLASS__, array($location)));
 					if (isset($mget_after_delete[$location]))
 					{
 						if ($verbose) echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
@@ -104,7 +104,7 @@ 
 				{
 					$locations[$location] = $data;
 				}
-				$add_after_delete = $this->add(array($level,__CLASS__,$location), $data, 10);
+				$add_after_delete = $this->add(array($level, __CLASS__, $location), $data, 10);
 				if ($add_after_delete !== true)
 				{
 					if ($verbose) echo "$label: add_after_delete=".array2string($add_after_delete)."\n";
@@ -112,7 +112,7 @@ 
 				}
 				else
 				{
-					$get_after_add = $this->get(array($level,__CLASS__,$location));
+					$get_after_add = $this->get(array($level, __CLASS__, $location));
 					if ($get_after_add !== $data)
 					{
 						if ($verbose) echo "$label: get_after_add=".array2string($get_after_add)." !== ".array2string($data)."\n";
@@ -122,11 +122,11 @@ 
 			}
 			// get all above in one request
 			$keys = array_keys($locations);
-			$keys_bogus = array_merge(array('not-set'),array_keys($locations),array('not-set-too'));
+			$keys_bogus = array_merge(array('not-set'), array_keys($locations), array('not-set-too'));
 			if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
 			{
-				$mget = $this->mget(array($level,__CLASS__,$keys));
-				$mget_bogus = $this->mget(array($level,__CLASS__,$keys_bogus));
+				$mget = $this->mget(array($level, __CLASS__, $keys));
+				$mget_bogus = $this->mget(array($level, __CLASS__, $keys_bogus));
 			/* Api\Cache::getCache() gives a different result, as it does NOT use $level direkt
 			}
 			else
@@ -160,7 +160,7 @@ 
 	 */
 	function flush(array $keys)
 	{
-		unset($keys);	// required by function signature
+		unset($keys); // required by function signature
 		return false;
 	}
 }

Braces +52 added lines, -13 removed lines

@@ -49,18 +49,27 @@ 
 				$get_before_set = $this->get(array($level,__CLASS__,$location));
 				if (!is_null($get_before_set))
 				{
-					if ($verbose) echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
+					if ($verbose)
+					{
+						echo "$label: get_before_set=".array2string($get_before_set)." != NULL\n";
+					}
 					++$failed;
 				}
 				if (($set = $this->set(array($level,__CLASS__,$location), $data, 10)) !== true)
 				{
-					if ($verbose) echo "$label: set returned ".array2string($set)." !== TRUE\n";
+					if ($verbose)
+					{
+						echo "$label: set returned ".array2string($set)." !== TRUE\n";
+					}
 					++$failed;
 				}
 				$get_after_set = $this->get(array($level,__CLASS__,$location));
 				if ($get_after_set !== $data)
 				{
-					if ($verbose) echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
+					if ($verbose)
+					{
+						echo "$label: get_after_set=".array2string($get_after_set)." !== ".array2string($data)."\n";
+					}
 					++$failed;
 				}
 				if (is_a($this, 'EGroupware\Api\Cache\ProviderMultiple'))
@@ -68,25 +77,37 @@ 
 					$mget_after_set = $this->mget(array($level,__CLASS__,array($location)));
 					if ($mget_after_set[$location] !== $data)
 					{
-						if ($verbose) echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
+						if ($verbose)
+						{
+							echo "$label: mget_after_set['$location']=".array2string($mget_after_set[$location])." !== ".array2string($data)."\n";
+						}
 						++$failed;
 					}
 				}
 				$add_after_set = $this->add(array($level,__CLASS__,$location), 'other-data');
 				if ($add_after_set !== false)
 				{
-					if ($verbose) echo "$label: add_after_set=".array2string($add_after_set)."\n";
+					if ($verbose)
+					{
+						echo "$label: add_after_set=".array2string($add_after_set)."\n";
+					}
 					++$failed;
 				}
 				if (($delete = $this->delete(array($level,__CLASS__,$location))) !== true)
 				{
-					if ($verbose) echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
+					if ($verbose)
+					{
+						echo "$label: delete returned ".array2string($delete)." !== TRUE\n";
+					}
 					++$failed;
 				}
 				$get_after_delete = $this->get(array($level,__CLASS__,$location));
 				if (!is_null($get_after_delete))
 				{
-					if ($verbose) echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
+					if ($verbose)
+					{
+						echo "$label: get_after_delete=".array2string($get_after_delete)." != NULL\n";
+					}
 					++$failed;
 				}
 				// prepare for mget of everything
@@ -96,18 +117,27 @@ 
 					$mget_after_delete = $this->mget(array($level,__CLASS__,array($location)));
 					if (isset($mget_after_delete[$location]))
 					{
-						if ($verbose) echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
+						if ($verbose)
+						{
+							echo "$label: mget_after_delete['$location']=".array2string($mget_after_delete[$location])." != NULL\n";
+						}
 						++$failed;
 					}
 				}
-				elseif (!is_null($data))	// emulation can NOT distinquish between null and not set
+				elseif (!is_null($data))
+				{
+					// emulation can NOT distinquish between null and not set
 				{
 					$locations[$location] = $data;
 				}
+				}
 				$add_after_delete = $this->add(array($level,__CLASS__,$location), $data, 10);
 				if ($add_after_delete !== true)
 				{
-					if ($verbose) echo "$label: add_after_delete=".array2string($add_after_delete)."\n";
+					if ($verbose)
+					{
+						echo "$label: add_after_delete=".array2string($add_after_delete)."\n";
+					}
 					++$failed;
 				}
 				else
@@ -115,7 +145,10 @@ 
 					$get_after_add = $this->get(array($level,__CLASS__,$location));
 					if ($get_after_add !== $data)
 					{
-						if ($verbose) echo "$label: get_after_add=".array2string($get_after_add)." !== ".array2string($data)."\n";
+						if ($verbose)
+						{
+							echo "$label: get_after_add=".array2string($get_after_add)." !== ".array2string($data)."\n";
+						}
 						++$failed;
 					}
 				}
@@ -136,12 +169,18 @@ 
 			}*/
 				if ($mget !== $locations)
 				{
-					if ($verbose) echo "$label: mget=\n".array2string($mget)." !==\n".array2string($locations)."\n";
+					if ($verbose)
+					{
+						echo "$label: mget=\n".array2string($mget)." !==\n".array2string($locations)."\n";
+					}
 					++$failed;
 				}
 				if ($mget_bogus !== $locations)
 				{
-					if ($verbose) echo "$label: mget(".array2string($keys_bogus).")=\n".array2string($mget_bogus)." !==\n".array2string($locations)."\n";
+					if ($verbose)
+					{
+						echo "$label: mget(".array2string($keys_bogus).")=\n".array2string($mget_bogus)." !==\n".array2string($locations)."\n";
+					}
 					++$failed;
 				}
 			}

api/src/Cache/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0);
+	function add(array $keys, $data, $expiration = 0);
 
 	/**
 	 * Stores some data in the cache
@@ -48,7 +48,7 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0);
+	function set(array $keys, $data, $expiration = 0);
 
 	/**
 	 * Get some data from the cache

api/src/Cache/Apc.php

Spacing +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		if (!function_exists('apc_fetch'))	// apc >= 3.0
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") No function apc_fetch()!");
+			throw new Exception(__METHOD__.'('.array2string($params).") No function apc_fetch()!");
 		}
 	}
 
@@ -66,7 +66,7 @@ 
 			// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
 			if (is_numeric($size) && $size <= 1048576) $size .= 'M';
 
-			switch(strtoupper(substr($size, -1)))
+			switch (strtoupper(substr($size, -1)))
 			{
 				case 'G':
 					$size *= 1024;
@@ -92,9 +92,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
-		return apc_add(self::key($keys),$data,$expiration);
+		return apc_add(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		return apc_store(self::key($keys),$data,$expiration);
+		return apc_store(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	function get(array $keys)
 	{
 		$success = null;
-		$data = apc_fetch($key=self::key($keys),$success);
+		$data = apc_fetch($key = self::key($keys), $success);
 
 		if (!$success)
 		{
@@ -152,12 +152,12 @@ 
 		// APC >= 3.1.1, but also seems to be missing if apc is disabled eg. for cli
 		if (!class_exists('APCIterator'))
 		{
-			if (function_exists('apc_clear_cache')) apc_clear_cache ('user');
+			if (function_exists('apc_clear_cache')) apc_clear_cache('user');
 
 			return false;
 		}
 		//error_log(__METHOD__."(".array2string($keys).")");
-		foreach(new \APCIterator('user', $preg='/^'.preg_quote(self::key($keys).'/')) as $item)
+		foreach (new \APCIterator('user', $preg = '/^'.preg_quote(self::key($keys).'/')) as $item)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") preg='$preg': calling apc_delete('$item[key]')");
 			apc_delete($item['key']);
@@ -173,6 +173,6 @@ 
 	 */
 	private static function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

Braces +12 added lines, -3 removed lines

@@ -44,10 +44,13 @@ 
 	 */
 	function __construct(array $params)
 	{
-		if (!function_exists('apc_fetch'))	// apc >= 3.0
+		if (!function_exists('apc_fetch'))
+		{
+			// apc >= 3.0
 		{
 			throw new Exception (__METHOD__.'('.array2string($params).") No function apc_fetch()!");
 		}
+		}
 	}
 
 	/**
@@ -64,7 +67,10 @@ 
 		{
 			$size = ini_get('apc.shm_size');
 			// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
-			if (is_numeric($size) && $size <= 1048576) $size .= 'M';
+			if (is_numeric($size) && $size <= 1048576)
+			{
+				$size .= 'M';
+			}
 
 			switch(strtoupper(substr($size, -1)))
 			{
@@ -152,7 +158,10 @@ 
 		// APC >= 3.1.1, but also seems to be missing if apc is disabled eg. for cli
 		if (!class_exists('APCIterator'))
 		{
-			if (function_exists('apc_clear_cache')) apc_clear_cache ('user');
+			if (function_exists('apc_clear_cache'))
+			{
+				apc_clear_cache ('user');
+			}
 
 			return false;
 		}

api/src/Country.php

Spacing +12 added lines, -12 removed lines

@@ -364,7 +364,7 @@ 
 	 * @param boolean $translated =true use translated name or english
 	 * @return string
 	 */
-	public static function get_full_name($code,$translated=true)
+	public static function get_full_name($code, $translated = true)
 	{
 		if ($translated)
 		{
@@ -383,36 +383,36 @@ 
 	 */
 	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]))
 		{
-			return $name;	// $name is already a country-code
+			return $name; // $name is already a country-code
 		}
 
-		if (($code = array_search(strtoupper($name),self::$country_array)) !== false)
+		if (($code = array_search(strtoupper($name), self::$country_array)) !== false)
 		{
 			return $code;
 		}
 		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)
+		if (($code = array_search(strtoupper($name), self::$countries_translated)) !== false ||
+			($code = array_search($name, self::$countries_translated)) !== false)
 		{
 			return $code;
 		}
 		// search case-insensitive all translations for the english phrase of given country $name
 		// we do that to catch all possible cases of translations
-		static $en_names = array();	// we do some caching to minimize db-accesses
+		static $en_names = array(); // we do some caching to minimize db-accesses
 		if (isset($en_names[$name]))
 		{
 			$name = $en_names[$name];
 		}
-		elseif (($name_en = Translation::get_message_id($name,'common')))
+		elseif (($name_en = Translation::get_message_id($name, 'common')))
 		{
 			$name = $en_names[$name] = strtoupper($name_en);
 		}
-		if (($code = array_search(strtoupper($name),self::$country_array)) !== false)
+		if (($code = array_search(strtoupper($name), self::$country_array)) !== false)
 		{
 			return $code;
 		}
@@ -425,7 +425,7 @@ 
 	 * @param boolean $translated =true use translated names or english
 	 * @return array with 2-letter code => name pairs
 	 */
-	public static function countries($translated=true)
+	public static function countries($translated = true)
 	{
 		if ($translated)
 		{
@@ -447,12 +447,12 @@ 
 
 		self::$countries_translated = self::$country_array;
 		// try to translate them and sort alphabetic
-		foreach(self::$countries_translated as $k => $name)
+		foreach (self::$countries_translated as $k => $name)
 		{
 			self::$countries_translated[$k] = lang($name);
 		}
 
-		if(class_exists('Collator') && class_exists('Locale'))
+		if (class_exists('Collator') && class_exists('Locale'))
 		{
 			$col = new \Collator(Preferences::setlocale());
 			$col->asort(self::$countries_translated);

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

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	/**
 	 * Constructor
 	 */
-	function __construct($primary='mail', $fallback='sql')
+	function __construct($primary = 'mail', $fallback = 'sql')
 	{
 		parent::__construct($primary, $fallback);
 	}