EGroupware / egroupware

api/src/Mail/Smtp/Ads.php

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 	 */
 	protected function getLdapConnection()
 	{
-		static $ldap=null;
+		static $ldap = null;
 
 		if (is_null($ldap))
 		{
@@ -151,7 +151,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 

api/src/Mail/Smtp/Oldqmailuser.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	/**
 	 * Primary mail address required as an alias too: true or false
 	 */
-	const REQUIRE_MAIL_AS_ALIAS=false;
+	const REQUIRE_MAIL_AS_ALIAS = false;
 
 	/**
 	 * Attribute for forwards OR false if not possible

api/src/Mail/Smtp/Univention.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 	/**
 	 * Primary mail address required as an alias too: true or false
 	 */
-	const REQUIRE_MAIL_AS_ALIAS=false;
+	const REQUIRE_MAIL_AS_ALIAS = false;
 
 	/**
 	 * Attribute for forwards OR false if not possible
@@ -95,7 +95,7 @@ 
 	 */
 	function addAccountExtra(array $_hookValues, array $allValues, array &$newData)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
 		if (empty($allValues['univentionmailhomeserver'][0]) && $newData[self::MAIL_ENABLE_ATTR])
 		{

api/src/Mail/Smtp/Sql.php

Spacing +20 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 
@@ -78,16 +78,16 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= parent::getAccountEmailAddress($_accountName);
+		$emailAddresses = parent::getAccountEmailAddress($_accountName);
 
 		if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
 		{
-			foreach($this->db->select(self::TABLE, 'mail_value', array(
+			foreach ($this->db->select(self::TABLE, 'mail_value', array(
 				'account_id' => $account_id,
 				'mail_type' => self::TYPE_ALIAS,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_value', self::APP) as $row)
 			{
-				$emailAddresses[] = array (
+				$emailAddresses[] = array(
 					'name'		=> $emailAddresses[0]['name'],
 					'address'	=> $row['mail_value'],
 					'type'		=> 'alternate',
@@ -111,7 +111,7 @@ 
 	 * @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
 	 * 	'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")
 	 */
-	function getUserData($user, $match_uid_at_domain=false)
+	function getUserData($user, $match_uid_at_domain = false)
 	{
 		$userData = array();
 
@@ -140,7 +140,7 @@ 
 			{
 				$account_id[] = $id;
 			}
-			foreach($this->db->select(self::TABLE, 'account_id', array(
+			foreach ($this->db->select(self::TABLE, 'account_id', array(
 				'mail_type' => self::TYPE_ALIAS,
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -156,11 +156,11 @@ 
 				$userData['mailLocalAddress'] = $this->accounts->id2name($account_id, 'account_email');
 			}
 			$enabled = $forwardOnly = array();
-			foreach($this->db->select(self::TABLE, '*', array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'account_id' => $account_id,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_type,mail_value', self::APP) as $row)
 			{
-				switch($row['mail_type'])
+				switch ($row['mail_type'])
 				{
 					case self::TYPE_ENABLED:
 						$userData['accountStatus'] = $row['mail_value'];
@@ -203,11 +203,11 @@ 
 			if (is_array($account_id))
 			{
 				// add group-members for groups as forward (that way we dont need to store&update them)
-				foreach($account_id as $id)
+				foreach ($account_id as $id)
 				{
 					if ($id < 0 && ($members = $this->accounts->members($id, true)))
 					{
-						foreach($members as $member)
+						foreach ($members as $member)
 						{
 							if (($email = $this->accounts->id2name($member, 'account_email')) && !in_array($email, (array)$userData['forward']))
 							{
@@ -238,7 +238,7 @@ 
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
-		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
+		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only = false, $_setMailbox = null)
 	{
 		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
 
@@ -257,22 +257,22 @@ 
 		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
-		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
+		foreach ($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
 		{
-			switch($row['mail_type'])
+			switch ($row['mail_type'])
 			{
 				case self::TYPE_ALIAS:
-					$new_addresses =& $_mailAlternateAddress;
+					$new_addresses = & $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses = & $_mailForwardingAddress;
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
 					}
 					else
 					{
-						unset($new_addresses[$key]);	// no need to store
+						unset($new_addresses[$key]); // no need to store
 					}
 					break;
 
@@ -322,14 +322,14 @@ 
 			));
 		}
 		// store all new values
-		foreach($flags+array(
+		foreach ($flags + array(
 			self::TYPE_ALIAS => $_mailAlternateAddress,
 			self::TYPE_FORWARD => $_mailForwardingAddress,
 		) as $type => $values)
 		{
 			if ($values && (!$_forwarding_only || in_array($type, array(self::TYPE_FORWARD, self::TYPE_DELIVERY))))
 			{
-				foreach((array)$values as $value)
+				foreach ((array)$values as $value)
 				{
 					$this->db->insert(self::TABLE, array(
 						'account_id' => $_uidnumber,
@@ -363,11 +363,11 @@ 
 			$join .= ' JOIN '.self::TABLE.' active ON active.account_id='.self::TABLE.'.account_id AND active.mail_type='.self::TYPE_ENABLED;
 		}
 		$mailboxes = array();
-		foreach($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
+		foreach ($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous') continue; // anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

Braces +29 added lines, -7 removed lines

@@ -94,7 +94,10 @@ 
 				);
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		}
 
 		return $emailAddresses;
 	}
@@ -145,7 +148,10 @@ 
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
 			{
-				if (!in_array($row['account_id'], $account_id)) $account_id[] = $row['account_id'];
+				if (!in_array($row['account_id'], $account_id))
+				{
+					$account_id[] = $row['account_id'];
+				}
 			}
 			//error_log(__METHOD__."('$user') account_id=".array2string($account_id));
 		}
@@ -218,7 +224,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$user') returning ".array2string($userData));
+		}
 
 		return $userData;
 	}
@@ -240,7 +249,10 @@ 
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
 		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		}
 
 		if (!$_forwarding_only && $this->accounts->id2name($_uidnumber, 'account_email') !== $_mailLocalAddress)
 		{
@@ -254,7 +266,10 @@ 
 			self::TYPE_QUOTA => $_quota,
 		);
 		$where = array('account_id' => $_uidnumber);
-		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		if ($_forwarding_only)
+		{
+			$where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		}
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
 		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -265,7 +280,10 @@ 
 					$new_addresses =& $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD)
+					{
+						$new_addresses =& $_mailForwardingAddress;
+					}
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
@@ -367,7 +385,11 @@ 
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous')
+			{
+				continue;
+			}
+			// anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

api/src/Mail/Types.php

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,10 @@ 
 	 *
 	 * @return array classname => label pairs
 	 */
-	static public function getSMTPServerTypes($extended=true)
+	static public function getSMTPServerTypes($extended = true)
 	{
 		$retData = self::server_types(false, $extended);
-		foreach(Api\Hooks::process(array(
+		foreach (Api\Hooks::process(array(
 			'location' => 'smtp_server_types',
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
@@ -55,10 +55,10 @@ 
 	 * @param boolean $extended =true
 	 * @return array classname => label pairs
 	 */
-	static public function getIMAPServerTypes($extended=true)
+	static public function getIMAPServerTypes($extended = true)
 	{
 		$retData = self::server_types(true, $extended);
-		foreach(Api\Hooks::process(array(
+		foreach (Api\Hooks::process(array(
 			'location' => 'imap_server_types',
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
@@ -84,11 +84,11 @@ 
 	 * @param boolean $extended =false
 	 * @return array
 	 */
-	protected static function server_types($imap=true, $extended=false)
+	protected static function server_types($imap = true, $extended = false)
 	{
 		$types = array();
 		$prefix = $imap ? 'Imap' : 'Smtp';
-		foreach(scandir($dir=__DIR__.'/'.$prefix) as $file)
+		foreach (scandir($dir = __DIR__.'/'.$prefix) as $file)
 		{
 			if ($file == '..')
 			{
@@ -106,7 +106,7 @@ 
 
 			$type = array(
 				'classname' => $class_name,
-				'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
+				'description' => is_callable($function = $class_name.'::description') ? call_user_func($function) : $class_name,
 			);
 			if ($imap) $type['protocol'] = 'imap';
 

Braces +20 added lines, -6 removed lines

@@ -33,10 +33,14 @@ 
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
 		{
-			if ($data && $app != 'emailadmin') $retData += $data;
+			if ($data && $app != 'emailadmin')
+			{
+				$retData += $data;
+			}
 		}
 
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'EGroupware\\Api\\Mail\\Smtp' => 9,
 				'EGroupware\\Api\\Mail\\Smtp\\Sql' => 8,
@@ -63,9 +67,13 @@ 
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
 		{
-			if ($data && $app != 'emailadmin') $retData += $data;
+			if ($data && $app != 'emailadmin')
+			{
+				$retData += $data;
+			}
 		}
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'EGroupware\\Api\\Mail\\Imap' => 9,
 				'managementserver_imap' => 8,
@@ -102,13 +110,19 @@ 
 			{
 				continue;
 			}
-			if (!class_exists($class_name)) continue;
+			if (!class_exists($class_name))
+			{
+				continue;
+			}
 
 			$type = array(
 				'classname' => $class_name,
 				'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
 			);
-			if ($imap) $type['protocol'] = 'imap';
+			if ($imap)
+			{
+				$type['protocol'] = 'imap';
+			}
 
 			$types[$class_name] = $extended ? $type : $type['description'];
 		}

api/src/Mail/Notifications.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param boolean $return_empty_marker =false should we return null
 	 * @return array with values for "notify_folders", "notify_use_default"
 	 */
-	public static function read($acc_id, $account_id=null, $return_empty_marker=false)
+	public static function read($acc_id, $account_id = null, $return_empty_marker = false)
 	{
 		if (is_null($account_id))
 		{
@@ -71,7 +71,7 @@ 
 			//error_log(__METHOD__."($acc_id, ".array2string($account_id).") nothing in cache");
 		}
 		$account_specific = 0;
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['account_id'])
 			{
@@ -109,19 +109,19 @@ 
 	{
 		if (!is_numeric($account_id) || !($account_id >= 0))
 		{
-			return 0;	// nothing to save, happens eg. in setup
+			return 0; // nothing to save, happens eg. in setup
 		}
 
 		if ($account_id && !$folders && ($default = self::read($acc_id, 0)) && $default['notify_folders'])
 		{
-			$folders[] = null;	// we need to write a marker, that user wants no notifications!
+			$folders[] = null; // we need to write a marker, that user wants no notifications!
 		}
-		$old = self::read($acc_id, $account_id, true);	// true = return empty marker
-		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array();	// ignore returned default
+		$old = self::read($acc_id, $account_id, true); // true = return empty marker
+		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array(); // ignore returned default
 
 		$changed = 0;
 		// insert newly added ones
-		foreach(array_diff($folders, $old['notify_folders']) as $folder)
+		foreach (array_diff($folders, $old['notify_folders']) as $folder)
 		{
 			self::$db->insert(self::TABLE, array(
 				'acc_id' => $acc_id,
@@ -156,7 +156,7 @@ 
 	 * @param int|array $account_id =null
 	 * @return int number of rows deleted
 	 */
-	public static function delete($acc_id, $account_id=null)
+	public static function delete($acc_id, $account_id = null)
 	{
 		if (!($acc_id > 0) && !isset($account_id))
 		{
@@ -169,7 +169,7 @@ 
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 
 		// invalidate cache: we allways unset everything about an account to simplify cache handling
-		foreach($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
+		foreach ($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
 		{
 			unset(self::$cache[$acc_id]);
 		}

Braces +17 added lines, -4 removed lines

@@ -88,7 +88,10 @@ 
 			}
 		}
 		$folders = (array)self::$cache[$acc_id][$account_specific];
-		if (!$return_empty_marker && $folders == array(null)) $folders = array();
+		if (!$return_empty_marker && $folders == array(null))
+		{
+			$folders = array();
+		}
 		$result = array(
 			'notify_folders' => $folders,
 			'notify_account_id' => $account_specific,
@@ -117,7 +120,11 @@ 
 			$folders[] = null;	// we need to write a marker, that user wants no notifications!
 		}
 		$old = self::read($acc_id, $account_id, true);	// true = return empty marker
-		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array();	// ignore returned default
+		if ($account_id && !$old['notify_account_id'])
+		{
+			$old['notify_folders'] = array();
+		}
+		// ignore returned default
 
 		$changed = 0;
 		// insert newly added ones
@@ -163,8 +170,14 @@ 
 			throw new Api\Exception\WrongParameter(__METHOD__."() no acc_id AND no account_id parameter!");
 		}
 		$where = array();
-		if ($acc_id > 0) $where['acc_id'] = $acc_id;
-		if (isset($account_id)) $where['account_id'] = $account_id;
+		if ($acc_id > 0)
+		{
+			$where['acc_id'] = $acc_id;
+		}
+		if (isset($account_id))
+		{
+			$where['account_id'] = $account_id;
+		}
 
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 

api/src/Ldap.php

Indentation +8 added lines, -8 removed lines

@@ -31,17 +31,17 @@
 class Ldap
 {
 	/**
-	* Holds the LDAP link identifier
-	*
-	* @var resource $ds
-	*/
+	 * Holds the LDAP link identifier
+	 *
+	 * @var resource $ds
+	 */
 	var $ds;
 
 	/**
-	* Holds the detected information about the connected ldap server
-	*
-	* @var Ldap\ServerInfo $ldapserverinfo
-	*/
+	 * Holds the detected information about the connected ldap server
+	 *
+	 * @var Ldap\ServerInfo $ldapserverinfo
+	 */
 	var $ldapserverinfo;
 
 	/**

Braces +36 added lines, -9 removed lines

@@ -129,12 +129,18 @@ 
 	 */
 	static function result2array($ldap)
 	{
-		if (!is_array($ldap)) return false;
+		if (!is_array($ldap))
+		{
+			return false;
+		}
 
 		$arr = array();
 		foreach($ldap as $var => $val)
 		{
-			if (is_int($var) || $var == 'count') continue;
+			if (is_int($var) || $var == 'count')
+			{
+				continue;
+			}
 
 			if (is_array($val) && $val['count'] == 1)
 			{
@@ -142,7 +148,10 @@ 
 			}
 			else
 			{
-				if (is_array($val)) unset($val['count']);
+				if (is_array($val))
+				{
+					unset($val['count']);
+				}
 
 				$arr[$var] = $val;
 			}
@@ -168,7 +177,10 @@ 
 	{
 		if(!function_exists('ldap_connect'))
 		{
-			if ($this->exception_on_error) throw new Exception\AssertionFailed('LDAP support unavailable!');
+			if ($this->exception_on_error)
+			{
+				throw new Exception\AssertionFailed('LDAP support unavailable!');
+			}
 
 			printf('<b>Error: LDAP support unavailable</b><br>',$host);
 			return False;
@@ -194,10 +206,13 @@ 
 			{
 				if ($h !== $host)
 				{
-					if (isset($_SESSION))	// store working host as first choice in session
+					if (isset($_SESSION))
+					{
+						// store working host as first choice in session
 					{
 						$_SESSION['ldapConnect'][$host] = implode(' ',array_unique(array_merge(array($h),$hosts)));
 					}
+					}
 				}
 				return $this->ds;
 			}
@@ -206,7 +221,10 @@ 
 				' '.function_backtrace());
 		}
 		// give visible error, only if we cant connect to any ldap server
-		if ($this->exception_on_error) throw new Exception\NoPermission("Can't connect/bind to LDAP server '$host' and dn='$dn'!");
+		if ($this->exception_on_error)
+		{
+			throw new Exception\NoPermission("Can't connect/bind to LDAP server '$host' and dn='$dn'!");
+		}
 
 		return false;
 	}
@@ -242,7 +260,10 @@ 
 		{
 			$supportedLDAPVersion = 2;
 		}
-		if ($use_tls) ldap_start_tls($this->ds);
+		if ($use_tls)
+		{
+			ldap_start_tls($this->ds);
+		}
 
 		if (!isset($this->ldapserverinfo) ||
 			!is_a($this->ldapserverinfo,'EGroupware\Ldap\ServerInfo') ||
@@ -281,10 +302,13 @@ 
 	 */
 	function restoreSessionData()
 	{
-		if (isset($GLOBALS['egw']->session))	// no availible in setup
+		if (isset($GLOBALS['egw']->session))
+		{
+			// no availible in setup
 		{
 			$this->ldapserverinfo = Cache::getSession(__CLASS__, 'ldapServerInfo');
 		}
+		}
 	}
 
 	/**
@@ -292,9 +316,12 @@ 
 	 */
 	function saveSessionData()
 	{
-		if (isset($GLOBALS['egw']->session))	// no availible in setup
+		if (isset($GLOBALS['egw']->session))
+		{
+			// no availible in setup
 		{
 			Cache::setSession(__CLASS__, 'ldapServerInfo', $this->ldapserverinfo);
 		}
+		}
 	}
 }

Spacing +18 added lines, -18 removed lines

@@ -49,14 +49,14 @@ 
 	 *
 	 * @var boolean $exception_on_error
 	 */
-	var $exception_on_error=false;
+	var $exception_on_error = false;
 
 	/**
 	 * Constructor
 	 *
 	 * @param boolean $exception_on_error =false true: throw Exceptions in ldapConnect instead of echoing error and returning false
 	 */
-	function __construct($exception_on_error=false)
+	function __construct($exception_on_error = false)
 	{
 		$this->exception_on_error = $exception_on_error;
 		$this->restoreSessionData();
@@ -83,7 +83,7 @@ 
 	 * @throws Exception\AssertingFailed 'LDAP support unavailable!' (no ldap extension)
 	 * @throws Exception\NoPermission if bind fails
 	 */
-	public static function factory($ressource=true, $host='', $dn='', $passwd='')
+	public static function factory($ressource = true, $host = '', $dn = '', $passwd = '')
 	{
 		$key = md5($host.':'.$dn.':'.$passwd);
 
@@ -118,7 +118,7 @@ 
 	 */
 	static function quote($string)
 	{
-		return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+		return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 		if (!is_array($ldap)) return false;
 
 		$arr = array();
-		foreach($ldap as $var => $val)
+		foreach ($ldap as $var => $val)
 		{
 			if (is_int($var) || $var == 'count') continue;
 
@@ -164,13 +164,13 @@ 
 	 * @throws Exception\AssertingFailed 'LDAP support unavailable!' (no ldap extension)
 	 * @throws Exception\NoPermission if bind fails
 	 */
-	function ldapConnect($host='', $dn='', $passwd='')
+	function ldapConnect($host = '', $dn = '', $passwd = '')
 	{
-		if(!function_exists('ldap_connect'))
+		if (!function_exists('ldap_connect'))
 		{
 			if ($this->exception_on_error) throw new Exception\AssertionFailed('LDAP support unavailable!');
 
-			printf('<b>Error: LDAP support unavailable</b><br>',$host);
+			printf('<b>Error: LDAP support unavailable</b><br>', $host);
 			return False;
 		}
 		if (empty($host))
@@ -188,7 +188,7 @@ 
 		{
 			$host = $_SESSION['ldapConnect'][$host];
 		}
-		foreach($hosts=preg_split('/[ ,;]+/', $host) as $h)
+		foreach ($hosts = preg_split('/[ ,;]+/', $host) as $h)
 		{
 			if ($this->_connect($h, $dn, $passwd))
 			{
@@ -196,7 +196,7 @@ 
 				{
 					if (isset($_SESSION))	// store working host as first choice in session
 					{
-						$_SESSION['ldapConnect'][$host] = implode(' ',array_unique(array_merge(array($h),$hosts)));
+						$_SESSION['ldapConnect'][$host] = implode(' ', array_unique(array_merge(array($h), $hosts)));
 					}
 				}
 				return $this->ds;
@@ -221,20 +221,20 @@ 
 	 */
 	private function _connect($host, $dn, $passwd)
 	{
-		if (($use_tls = substr($host,0,6) == 'tls://'))
+		if (($use_tls = substr($host, 0, 6) == 'tls://'))
 		{
-			$port = parse_url($host,PHP_URL_PORT);
-			$host = parse_url($host,PHP_URL_HOST);
+			$port = parse_url($host, PHP_URL_PORT);
+			$host = parse_url($host, PHP_URL_HOST);
 		}
 		// connect to ldap server (never fails, as connection happens in bind!)
-		if(!$host || !($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
+		if (!$host || !($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
 		{
 			return False;
 		}
 		// set network timeout to not block for minutes
 		ldap_set_option($this->ds, LDAP_OPT_NETWORK_TIMEOUT, 5);
 
-		if(ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
+		if (ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
 		{
 			$supportedLDAPVersion = 3;
 		}
@@ -245,7 +245,7 @@ 
 		if ($use_tls) ldap_start_tls($this->ds);
 
 		if (!isset($this->ldapserverinfo) ||
-			!is_a($this->ldapserverinfo,'EGroupware\Ldap\ServerInfo') ||
+			!is_a($this->ldapserverinfo, 'EGroupware\Ldap\ServerInfo') ||
 			$this->ldapserverinfo->host != $host)
 		{
 			//error_log("no ldap server info found");
@@ -255,7 +255,7 @@ 
 			$this->saveSessionData();
 		}
 
-		if(!@ldap_bind($this->ds, $dn, $passwd))
+		if (!@ldap_bind($this->ds, $dn, $passwd))
 		{
 			return False;
 		}
@@ -268,7 +268,7 @@ 
 	 */
 	function ldapDisconnect()
 	{
-		if(is_resource($this->ds))
+		if (is_resource($this->ds))
 		{
 			ldap_unbind($this->ds);
 			unset($this->ds);

api/asyncwrapper.php

Spacing +4 added lines, -4 removed lines

@@ -11,14 +11,14 @@
  * @version $Id$
  */
 
-$path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
+$path_to_egroupware = realpath(__DIR__.'/..'); //  need to be adapted if this script is moved somewhere else
 $php = isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_'];
 
-foreach(file($path_to_egroupware. '/header.inc.php') as $line)
+foreach (file($path_to_egroupware.'/header.inc.php') as $line)
 {
-	if(preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches))
+	if (preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches))
 	{
 		// -d memory_limit=-1 --> no memory limit
-		system($php. ' -q -d memory_limit=-1 '.$path_to_egroupware.'/api/asyncservices.php '. $matches[1]);
+		system($php.' -q -d memory_limit=-1 '.$path_to_egroupware.'/api/asyncservices.php '.$matches[1]);
 	}
 }

api/config.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 $etag = '"'.md5($config.$link_registry).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
+Api\Session::cache_control(86400); // cache for one day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -47,7 +47,7 @@ 
 $content .= 'egw.set_link_registry('.$link_registry.", undefined, egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');