EGroupware / egroupware

api/src/Mail/Imap/Dbmailqmailuser.php

Spacing +25 added lines, -25 removed lines

@@ -47,16 +47,16 @@ 
 
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if (!is_resource($ds)) {
 			return false;
 		}
 
-		$filter		= '(&(objectclass=posixaccount)(uid='. $_username .')(qmailGID='. sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id'])) .'))';
+		$filter		= '(&(objectclass=posixaccount)(uid='.$_username.')(qmailGID='.sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id'])).'))';
 		$justthese	= array('dn', 'objectclass', 'mailQuota');
-		if(($sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese))) {
+		if (($sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese))) {
 
-			if(($info = ldap_get_entries($ds, $sri))) {
-				if(isset($info[0]['mailquota'][0])) {
+			if (($info = ldap_get_entries($ds, $sri))) {
+				if (isset($info[0]['mailquota'][0])) {
 					$userData['quotaLimit'] = $info[0]['mailquota'][0] / 1048576;
 				}
 			}
@@ -65,27 +65,27 @@ 
 	}
 
 	function updateAccount($_hookValues) {
-		if(!$uidnumber = (int)$_hookValues['account_id']) {
+		if (!$uidnumber = (int)$_hookValues['account_id']) {
 			return false;
 		}
 
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if (!is_resource($ds)) {
 			return false;
 		}
 
-		$filter		= '(&(objectclass=posixaccount)(uidnumber='. $uidnumber .'))';
-		$justthese	= array('dn', 'objectclass', 'qmailUID', 'qmailGID', 'mail');
+		$filter = '(&(objectclass=posixaccount)(uidnumber='.$uidnumber.'))';
+		$justthese = array('dn', 'objectclass', 'qmailUID', 'qmailGID', 'mail');
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese);
 
-		if(($info = ldap_get_entries($ds, $sri))) {
-			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email']) {
+		if (($info = ldap_get_entries($ds, $sri))) {
+			if (!in_array('qmailuser', $info[0]['objectclass']) && $info[0]['email']) {
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'qmailuser';
 				sort($newData['objectclass']);
-				$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
+				$newData['qmailGID'] = sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 				#$newData['qmailUID']	= (!empty($this->domainName)) ? $_username .'@'. $this->domainName : $_username;
 
 				ldap_modify($ds, $info[0]['dn'], $newData);
@@ -93,10 +93,10 @@ 
 				return true;
 			} else {
 				$newData = array();
-				$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
+				$newData['qmailGID'] = sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 				#$newData['qmailUID']	= (!empty($this->domainName)) ? $_username .'@'. $this->domainName : $_username;
 
-				if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+				if (!ldap_modify($ds, $info[0]['dn'], $newData)) {
 					#print ldap_error($ds);
 					#return false;
 				}
@@ -109,30 +109,30 @@ 
 	function setUserData($_username, $_quota) {
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if (!is_resource($ds)) {
 			return false;
 		}
 
-		$filter		= '(&(objectclass=posixaccount)(uid='. $_username .'))';
-		$justthese	= array('dn', 'objectclass', 'qmailGID', 'mail');
+		$filter = '(&(objectclass=posixaccount)(uid='.$_username.'))';
+		$justthese = array('dn', 'objectclass', 'qmailGID', 'mail');
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese);
 
-		if(($info = ldap_get_entries($ds, $sri))) {
+		if (($info = ldap_get_entries($ds, $sri))) {
 			#_debug_array($info);
-			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email']) {
+			if (!in_array('qmailuser', $info[0]['objectclass']) && $info[0]['email']) {
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'qmailuser';
 				sort($newData['objectclass']);
-				$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
+				$newData['qmailGID'] = sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 
 				ldap_modify($ds, $info[0]['dn'], $newData);
 			} else {
-				if (in_array('qmailuser',$info[0]['objectclass']) && !$info[0]['qmailgid']) {
+				if (in_array('qmailuser', $info[0]['objectclass']) && !$info[0]['qmailgid']) {
 					$newData = array();
-					$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
+					$newData['qmailGID'] = sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 
-					if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+					if (!ldap_modify($ds, $info[0]['dn'], $newData)) {
 						#print ldap_error($ds);
 						#return false;
 					}
@@ -141,13 +141,13 @@ 
 
 			$newData = array();
 
-			if((int)$_quota >= 0) {
+			if ((int)$_quota >= 0) {
 				$newData['mailQuota'] = (int)$_quota * 1048576;
 			} else {
 				$newData['mailQuota'] = array();
 			}
 
-			if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+			if (!ldap_modify($ds, $info[0]['dn'], $newData)) {
 				#print ldap_error($ds);
 				return false;
 			}

Braces +45 added lines, -21 removed lines

@@ -47,16 +47,20 @@ 
 
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if(!is_resource($ds))
+		{
 			return false;
 		}
 
 		$filter		= '(&(objectclass=posixaccount)(uid='. $_username .')(qmailGID='. sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id'])) .'))';
 		$justthese	= array('dn', 'objectclass', 'mailQuota');
-		if(($sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese))) {
+		if(($sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese)))
+		{
 
-			if(($info = ldap_get_entries($ds, $sri))) {
-				if(isset($info[0]['mailquota'][0])) {
+			if(($info = ldap_get_entries($ds, $sri)))
+			{
+				if(isset($info[0]['mailquota'][0]))
+				{
 					$userData['quotaLimit'] = $info[0]['mailquota'][0] / 1048576;
 				}
 			}
@@ -64,14 +68,17 @@ 
 		return $userData;
 	}
 
-	function updateAccount($_hookValues) {
-		if(!$uidnumber = (int)$_hookValues['account_id']) {
+	function updateAccount($_hookValues)
+	{
+		if(!$uidnumber = (int)$_hookValues['account_id'])
+		{
 			return false;
 		}
 
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if(!is_resource($ds))
+		{
 			return false;
 		}
 
@@ -79,8 +86,10 @@ 
 		$justthese	= array('dn', 'objectclass', 'qmailUID', 'qmailGID', 'mail');
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese);
 
-		if(($info = ldap_get_entries($ds, $sri))) {
-			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email']) {
+		if(($info = ldap_get_entries($ds, $sri)))
+		{
+			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email'])
+			{
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'qmailuser';
@@ -91,12 +100,15 @@ 
 				ldap_modify($ds, $info[0]['dn'], $newData);
 
 				return true;
-			} else {
+			}
+			else
+			{
 				$newData = array();
 				$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 				#$newData['qmailUID']	= (!empty($this->domainName)) ? $_username .'@'. $this->domainName : $_username;
 
-				if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+				if(!ldap_modify($ds, $info[0]['dn'], $newData))
+				{
 					#print ldap_error($ds);
 					#return false;
 				}
@@ -106,10 +118,12 @@ 
 		return false;
 	}
 
-	function setUserData($_username, $_quota) {
+	function setUserData($_username, $_quota)
+	{
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if(!is_resource($ds))
+		{
 			return false;
 		}
 
@@ -117,9 +131,11 @@ 
 		$justthese	= array('dn', 'objectclass', 'qmailGID', 'mail');
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese);
 
-		if(($info = ldap_get_entries($ds, $sri))) {
+		if(($info = ldap_get_entries($ds, $sri)))
+		{
 			#_debug_array($info);
-			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email']) {
+			if(!in_array('qmailuser',$info[0]['objectclass']) && $info[0]['email'])
+			{
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'qmailuser';
@@ -127,12 +143,16 @@ 
 				$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 
 				ldap_modify($ds, $info[0]['dn'], $newData);
-			} else {
-				if (in_array('qmailuser',$info[0]['objectclass']) && !$info[0]['qmailgid']) {
+			}
+			else
+			{
+				if (in_array('qmailuser',$info[0]['objectclass']) && !$info[0]['qmailgid'])
+				{
 					$newData = array();
 					$newData['qmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 
-					if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+					if(!ldap_modify($ds, $info[0]['dn'], $newData))
+					{
 						#print ldap_error($ds);
 						#return false;
 					}
@@ -141,13 +161,17 @@ 
 
 			$newData = array();
 
-			if((int)$_quota >= 0) {
+			if((int)$_quota >= 0)
+			{
 				$newData['mailQuota'] = (int)$_quota * 1048576;
-			} else {
+			}
+			else
+			{
 				$newData['mailQuota'] = array();
 			}
 
-			if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+			if(!ldap_modify($ds, $info[0]['dn'], $newData))
+			{
 				#print ldap_error($ds);
 				return false;
 			}

api/src/Mail/Imap/Dovecot.php

Spacing +20 added lines, -20 removed lines

@@ -56,7 +56,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $user_home;	// = '/var/dovecot/imap/%d/%u';
+	var $user_home; // = '/var/dovecot/imap/%d/%u';
 
 	/**
 	 * Ensure we use an admin connection
@@ -65,12 +65,12 @@ 
 	 *
 	 * @param string $_username =true create an admin connection for given user or $this->acc_imap_username
 	 */
-	function adminConnection($_username=true)
+	function adminConnection($_username = true)
 	{
 		// generate admin user name of $username
 		if (($pos = strpos($this->acc_imap_admin_username, '*')) !== false)	// remove evtl. set username
 		{
-			$this->params['acc_imap_admin_username'] = substr($this->acc_imap_admin_username, $pos+1);
+			$this->params['acc_imap_admin_username'] = substr($this->acc_imap_admin_username, $pos + 1);
 		}
 		$this->params['acc_imap_admin_username'] = (is_string($_username) ? $_username : $this->acc_imap_username).
 			'*'.$this->acc_imap_admin_username;
@@ -87,16 +87,16 @@ 
 	 * @param string $_folderName =''
 	 * @return string utf-7 encoded (done in getMailboxName)
 	 */
-	function getUserMailboxString($_username, $_folderName='')
+	function getUserMailboxString($_username, $_folderName = '')
 	{
-		unset($_username);	// not used, but required by function signature
+		unset($_username); // not used, but required by function signature
 
 		$mailboxString = 'INBOX';
 
 		if (!empty($_folderName))
 		{
 			$nameSpaces = $this->getNameSpaceArray();
-			$mailboxString .= $nameSpaces['others'][0]['delimiter'] . $_folderName;
+			$mailboxString .= $nameSpaces['others'][0]['delimiter'].$_folderName;
 		}
 		return $mailboxString;
 	}
@@ -119,8 +119,8 @@ 
 	function deleteAccount($_hookValues)
 	{
 		// some precausion to really delete just _one_ account
-		if (strpos($_hookValues['account_lid'],'%') !== false ||
-			strpos($_hookValues['account_lid'],'*') !== false)
+		if (strpos($_hookValues['account_lid'], '%') !== false ||
+			strpos($_hookValues['account_lid'], '*') !== false)
 		{
 			return false;
 		}
@@ -135,9 +135,9 @@ 
 	 * @return string $username='%' username containing wildcards, default '%' for all users of a domain
 	 * @return int|boolean number of deleted mailboxes on success or false on error
 	 */
-	function deleteUsers($username='%')
+	function deleteUsers($username = '%')
 	{
-		if(!$this->acc_imap_administration || empty($username))
+		if (!$this->acc_imap_administration || empty($username))
 		{
 			return false;
 		}
@@ -155,9 +155,9 @@ 
 			{
 				throw new Api\Exception\AssertionFailed("user_home='$this->user_home' contains no domain-part '%d'!");
 			}
-			$home = strtr(substr($this->user_home, 0, $pos+2), $replace);
+			$home = strtr(substr($this->user_home, 0, $pos + 2), $replace);
 
-			$ret = count(scandir($home))-2;
+			$ret = count(scandir($home)) - 2;
 		}
 		else
 		{
@@ -183,7 +183,7 @@ 
 	{
 		if (is_dir($path))
 		{
-			foreach(scandir($path) as $file)
+			foreach (scandir($path) as $file)
 			{
 				if ($file == '.' || $file == '..') continue;
 
@@ -201,7 +201,7 @@ 
 				return false;
 			}
 		}
-		elseif(!unlink($path))
+		elseif (!unlink($path))
 		{
 			return false;
 		}
@@ -235,10 +235,10 @@ 
 
 		$userData = array();
 		// we are authenticated with master but for current user
-		if(($quota = $this->getStorageQuotaRoot('INBOX')))
+		if (($quota = $this->getStorageQuotaRoot('INBOX')))
 		{
-			$userData['quotaLimit'] = (int) ($quota['QMAX'] / 1024);
-			$userData['quotaUsed'] = (int) ($quota['USED'] / 1024);
+			$userData['quotaLimit'] = (int)($quota['QMAX'] / 1024);
+			$userData['quotaUsed'] = (int)($quota['USED'] / 1024);
 		}
 		$this->username = $bufferUsername;
 		$this->loginName = $bufferLoginName;
@@ -260,7 +260,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		unset($_username); unset($_quota);	// not used, but required by function signature
+		unset($_username); unset($_quota); // not used, but required by function signature
 
 		return true;
 	}
@@ -272,9 +272,9 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
-		if(!$this->acc_imap_administration)
+		if (!$this->acc_imap_administration)
 		{
 			return false;
 		}

Braces +16 added lines, -4 removed lines

@@ -68,10 +68,13 @@ 
 	function adminConnection($_username=true)
 	{
 		// generate admin user name of $username
-		if (($pos = strpos($this->acc_imap_admin_username, '*')) !== false)	// remove evtl. set username
+		if (($pos = strpos($this->acc_imap_admin_username, '*')) !== false)
+		{
+			// remove evtl. set username
 		{
 			$this->params['acc_imap_admin_username'] = substr($this->acc_imap_admin_username, $pos+1);
 		}
+		}
 		$this->params['acc_imap_admin_username'] = (is_string($_username) ? $_username : $this->acc_imap_username).
 			'*'.$this->acc_imap_admin_username;
 
@@ -185,7 +188,10 @@ 
 		{
 			foreach(scandir($path) as $file)
 			{
-				if ($file == '.' || $file == '..') continue;
+				if ($file == '.' || $file == '..')
+				{
+					continue;
+				}
 
 				if (is_dir($path))
 				{
@@ -217,8 +223,14 @@ 
 	 */
 	function getUserData($_username)
 	{
-		if (isset($this->username)) $bufferUsername = $this->username;
-		if (isset($this->loginName)) $bufferLoginName = $this->loginName;
+		if (isset($this->username))
+		{
+			$bufferUsername = $this->username;
+		}
+		if (isset($this->loginName))
+		{
+			$bufferLoginName = $this->loginName;
+		}
 		$this->username = $this->loginName = $_username;
 
 		// now disconnect to be able to reestablish the connection with the targetUser while we go on

api/src/Mail/Cache.php

Indentation +43 added lines, -43 removed lines

@@ -29,15 +29,15 @@ 
 	 */
 	const LEVEL = Api\Cache::INSTANCE;
 
-    /**
-     * Retrieve cached data.
-     *
-     * @param string $key        Object ID to query.
-     * @param integer $lifetime  Lifetime of the object in seconds.
-     *
-     * @return mixed  Cached data, or false if none was found.
-     */
-    public function get($key, $lifetime = 0)
+	/**
+	 * Retrieve cached data.
+	 *
+	 * @param string $key        Object ID to query.
+	 * @param integer $lifetime  Lifetime of the object in seconds.
+	 *
+	 * @return mixed  Cached data, or false if none was found.
+	 */
+	public function get($key, $lifetime = 0)
 	{
 		unset($lifetime);	// not (yet) used, but required by function signature
 
@@ -46,54 +46,54 @@ 
 		return !is_null($ret) ? $ret : false;
 	}
 
-    /**
-     * Store an object in the cache.
-     *
-     * @param string $key        Object ID used as the caching key.
-     * @param mixed $data        Data to store in the cache.
-     * @param integer $lifetime  Object lifetime - i.e. the time before the
-     *                           data becomes available for garbage
-     *                           collection. If 0 will not be GC'd.
-     */
-    public function set($key, $data, $lifetime = 0)
+	/**
+	 * Store an object in the cache.
+	 *
+	 * @param string $key        Object ID used as the caching key.
+	 * @param mixed $data        Data to store in the cache.
+	 * @param integer $lifetime  Object lifetime - i.e. the time before the
+	 *                           data becomes available for garbage
+	 *                           collection. If 0 will not be GC'd.
+	 */
+	public function set($key, $data, $lifetime = 0)
 	{
 		Api\Cache::setCache(self::LEVEL, 'mail', $key, $data, $lifetime);
 	}
 
-    /**
-     * Checks if a given key exists in the cache, valid for the given
-     * lifetime.
-     *
-     * @param string $key        Cache key to check.
-     * @param integer $lifetime  Lifetime of the key in seconds.
-     *
-     * @return boolean  Existence.
-     */
-    public function exists($key, $lifetime = 0)
+	/**
+	 * Checks if a given key exists in the cache, valid for the given
+	 * lifetime.
+	 *
+	 * @param string $key        Cache key to check.
+	 * @param integer $lifetime  Lifetime of the key in seconds.
+	 *
+	 * @return boolean  Existence.
+	 */
+	public function exists($key, $lifetime = 0)
 	{
 		unset($lifetime);	// not (yet) used, but required by function signature
 
 		return !is_null(Api\Cache::getCache(self::LEVEL, 'mail', $key));
 	}
 
-    /**
-     * Expire any existing data for the given key.
-     *
-     * @param string $key  Cache key to expire.
-     *
-     * @return boolean  Success or failure.
-     */
-    public function expire($key)
+	/**
+	 * Expire any existing data for the given key.
+	 *
+	 * @param string $key  Cache key to expire.
+	 *
+	 * @return boolean  Success or failure.
+	 */
+	public function expire($key)
 	{
 		Api\Cache::unsetCache(self::LEVEL, 'mail', $key);
 	}
 
-    /**
-     * Clears all data from the cache.
-     *
-     * @throws Horde_Cache_Exception
-     */
-    public function clear()
+	/**
+	 * Clears all data from the cache.
+	 *
+	 * @throws Horde_Cache_Exception
+	 */
+	public function clear()
 	{
 		Api\Cache::flush(self::LEVEL, self::APP);
 	}

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function get($key, $lifetime = 0)
 	{
-		unset($lifetime);	// not (yet) used, but required by function signature
+		unset($lifetime); // not (yet) used, but required by function signature
 
 		$ret = Api\Cache::getCache(self::LEVEL, 'mail', $key);
 
@@ -71,7 +71,7 @@ 
      */
     public function exists($key, $lifetime = 0)
 	{
-		unset($lifetime);	// not (yet) used, but required by function signature
+		unset($lifetime); // not (yet) used, but required by function signature
 
 		return !is_null(Api\Cache::getCache(self::LEVEL, 'mail', $key));
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
      *
      * @param string $key  Cache key to expire.
      *
-     * @return boolean  Success or failure.
+     * @return boolean|null  Success or failure.
      */
     public function expire($key)
 	{

Braces +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
      * @return mixed  Cached data, or false if none was found.
      */
     public function get($key, $lifetime = 0)
-	{
+    {
 		unset($lifetime);	// not (yet) used, but required by function signature
 
 		$ret = Api\Cache::getCache(self::LEVEL, 'mail', $key);
@@ -56,7 +56,7 @@ 
      *                           collection. If 0 will not be GC'd.
      */
     public function set($key, $data, $lifetime = 0)
-	{
+    {
 		Api\Cache::setCache(self::LEVEL, 'mail', $key, $data, $lifetime);
 	}
 
@@ -70,7 +70,7 @@ 
      * @return boolean  Existence.
      */
     public function exists($key, $lifetime = 0)
-	{
+    {
 		unset($lifetime);	// not (yet) used, but required by function signature
 
 		return !is_null(Api\Cache::getCache(self::LEVEL, 'mail', $key));
@@ -84,7 +84,7 @@ 
      * @return boolean  Success or failure.
      */
     public function expire($key)
-	{
+    {
 		Api\Cache::unsetCache(self::LEVEL, 'mail', $key);
 	}
 
@@ -94,7 +94,7 @@ 
      * @throws Horde_Cache_Exception
      */
     public function clear()
-	{
+    {
 		Api\Cache::flush(self::LEVEL, self::APP);
 	}
 }

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