EGroupware / egroupware

api/src/Auth/Pam.php

Spacing +7 added lines, -7 removed lines

@@ -30,9 +30,9 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by interface
+		unset($passwd_type); // not used but required by interface
 
 		if (pam_auth($username, get_magic_quotes_gpc() ? stripslashes($passwd) : $passwd))
 		{
@@ -40,12 +40,12 @@ 
 			if (!$GLOBALS['egw']->accounts->name2id($username) &&
 				function_exists('posix_getpwnam') && ($data = posix_getpwnam($username)))
 			{
-				list($fullname) = explode(',',$data['gecos']);
-				$parts = explode(' ',$fullname);
+				list($fullname) = explode(',', $data['gecos']);
+				$parts = explode(' ', $fullname);
 				if (count($parts) > 1)
 				{
 					$lastname = array_pop($parts);
-					$firstname = implode(' ',$parts);
+					$firstname = implode(' ', $parts);
 					$email = Api\Accounts::email($firstname, $lastname, $username);
 
 					$GLOBALS['auto_create_acct'] = array(
@@ -69,9 +69,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by interface
 
 		// deny password changes.
 		return False;

api/src/Auth/Mail.php

Spacing +10 added lines, -10 removed lines

@@ -34,14 +34,14 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used but required by function signature
+		unset($passwd_type); // not used but required by function signature
 
 		switch ($GLOBALS['egw_info']['server']['mail_login_type'])
 		{
 			case 'vmailmgr':
-				$username = $username . '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+				$username = $username.'@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 				break;
 			case 'email':
 				$username = $GLOBALS['egw']->accounts->id2name($username, 'account_email');
@@ -68,7 +68,7 @@ 
 				$mailauth = true;
 				$imap->logout();
 			}
-			catch(Horde_Imap_Client_Exception $e) {
+			catch (Horde_Imap_Client_Exception $e) {
 				// throw everything but authentication failed as exception
 				if ($e->getCode() != Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED) throw $e;
 
@@ -85,19 +85,19 @@ 
 				case 'imap':
 				default:
 					if (!isset($port)) $port = 143;
-					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.':'.$port.'/imap/novalidate-cert}INBOX', $username, $passwd);
 					break;
 				case 'imaps':
 					if (!isset($port)) $port = 993;
-					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/imap/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3':
 					if (!isset($port)) $port = 110;
-					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 				case 'pop3s':
 					if (!isset($port)) $port = 995;
-					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username , $passwd);
+					$mailauth = imap_open('{'.$host.'/pop3/ssl/novalidate-cert:'.$port.'}INBOX', $username, $passwd);
 					break;
 			}
 			if ($mailauth) imap_close($mailauth);
@@ -113,9 +113,9 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used but required by function sigature
+		unset($old_passwd, $new_passwd, $account_id); // not used but required by function sigature
 
 		return False;
 	}

api/src/Auth/Backend.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text');
+	function authenticate($username, $passwd, $passwd_type = 'text');
 
 	/**
 	 * changes password in sql datababse
@@ -36,5 +36,5 @@ 
 	 * @throws Exception to give a verbose error, why changing password failed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0);
+	function change_password($old_passwd, $new_passwd, $account_id = 0);
 }

api/src/Auth/Cas.php

Spacing +6 added lines, -6 removed lines

@@ -29,18 +29,18 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		/* if program goes here, authenticate is, normaly, already verified by CAS */
 		if ($GLOBALS['egw_info']['server']['account_repository'] != 'ldap' &&
 			$GLOBALS['egw_info']['server']['account_repository'] != 'ldsq') /* For anonymous LDAP connection */
 		{
-			if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')) &&
+			if (!($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')) &&
 				$GLOBALS['egw_info']['server']['auto_create_acct'])
 			{
 				// create a global array with all availible info about that account
 				$GLOBALS['auto_create_acct'] = array();
-				foreach(array(
+				foreach (array(
 					'givenname' => 'firstname',
 					'sn'        => 'lastname',
 					'uidnumber' => 'id',
@@ -48,11 +48,11 @@ 
 					'gidnumber' => 'primary_group',
 					) as $ldap_name => $acct_name)
 				{
-					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+					$GLOBALS['auto_create_acct'][$acct_name] = Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 				}
 				return True;
 			}
-			return $id && $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A' && phpCAS::checkAuthentication();
+			return $id && $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A' && phpCAS::checkAuthentication();
 		}
 		return phpCAS::checkAuthentication();
 	}
@@ -65,7 +65,7 @@ 
 	 * @param int $account_id =0 account id of user whose passwd should be changed
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
 		/* Not allowed */
 		return false;

api/src/Mail/Smtp.php

Spacing +16 added lines, -18 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		$this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
 
@@ -104,12 +104,10 @@ 
 	 */
 	function addAccount($_hookValues)
 	{
-		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] :
-			Api\Accounts::email($_hookValues['account_firstname'],
-				$_hookValues['account_lastname'],$_hookValues['account_lid'],$this->defaultDomain);
+		$mailLocalAddress = $_hookValues['account_email'] ? $_hookValues['account_email'] : Api\Accounts::email($_hookValues['account_firstname'],
+				$_hookValues['account_lastname'], $_hookValues['account_lid'], $this->defaultDomain);
 
-		$account_id = !empty($_hookValues['account_id']) ? $_hookValues['account_id'] :
-			$this->accounts->name2id($_hookValues['account_lid'], 'account_lid', 'u');
+		$account_id = !empty($_hookValues['account_id']) ? $_hookValues['account_id'] : $this->accounts->name2id($_hookValues['account_lid'], 'account_lid', 'u');
 
 		if ($this->accounts->exists($account_id) != 1)
 		{
@@ -126,7 +124,7 @@ 
 	 */
 	function deleteAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
 		return true;
 	}
@@ -139,12 +137,12 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= array();
+		$emailAddresses = array();
 
 		if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
 		{
-			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
-			$emailAddresses[] = array (
+			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'].(!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '').$GLOBALS['egw_info']['user']['account_lastname']);
+			$emailAddresses[] = array(
 				'name'		=> $realName,
 				'address'	=> $this->accounts->id2name($account_id, 'account_email'),
 				'type'		=> 'default',
@@ -161,9 +159,9 @@ 
 	 * @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)
 	{
-		unset($user, $match_uid_at_domain);	// not used, but required by function signature
+		unset($user, $match_uid_at_domain); // not used, but required by function signature
 
 		$userData = array();
 
@@ -201,9 +199,9 @@ 
 	 * @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)
 	{
-		unset($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress,	// not used, but require by function signature
+		unset($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress, // not used, but require by function signature
 			$_deliveryMode, $_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only, $_setMailbox);
 
 		return true;
@@ -217,7 +215,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		unset($_hookValues);	// not used, but required by function signature
+		unset($_hookValues); // not used, but required by function signature
 
 		return true;
 	}
@@ -233,15 +231,15 @@ 
 	 * 	default use $this->loginType
 	 * @return string
 	 */
-	/*static*/ public function mailbox_addr($account,$domain=null,$mail_login_type=null)
+	/*static*/ public function mailbox_addr($account, $domain = null, $mail_login_type = null)
 	{
 		if (is_null($domain)) $domain = $this->defaultDomain;
 		if (is_null($mail_login_type)) $mail_login_type = $this->loginType;
 
-		switch($mail_login_type)
+		switch ($mail_login_type)
 		{
 			case 'email':
-				$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account,'account_email');
+				$mbox = is_array($account) ? $account['account_email'] : $GLOBALS['egw']->accounts->id2name($account, 'account_email');
 				break;
 
 			case 'uidNumber':

api/src/Mail/Imap/Cyrus.php

Spacing +15 added lines, -15 removed lines

@@ -62,8 +62,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;
 		}
@@ -78,9 +78,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;
 		}
@@ -94,14 +94,14 @@ 
 			$mboxes = (array)$this->getMailboxes($mailboxName, 1);
 			//error_log(__METHOD__."('$username') getMailboxes('$reference','$username$restriction') = ".array2string($mboxes));
 
-			foreach(array_keys($mboxes) as $mbox)
+			foreach (array_keys($mboxes) as $mbox)
 			{
 				// give the admin account the rights to delete this mailbox
 				$this->setACL($mbox, $this->acc_imap_admin_username, array('rights' => 'aeiklprstwx'));
 				$this->deleteMailbox($mbox);
 			}
 		}
-		catch(Horde_Imap_Client_Exception $e) {
+		catch (Horde_Imap_Client_Exception $e) {
 			_egw_log_exception($e);
 			$this->disconnect();
 			return false;
@@ -124,7 +124,7 @@ 
 		if ($_username !== $GLOBALS['egw_info']['user']['account_lid']) $this->adminConnection();
 		$userData = array();
 
-		if(($quota = $this->getQuotaByUser($_username,'ALL')))
+		if (($quota = $this->getQuotaByUser($_username, 'ALL')))
 		{
 			$userData['quotaLimit'] = (int)($quota['limit'] / 1024);
 			$userData['quotaUsed'] = (int)($quota['usage'] / 1024);
@@ -145,7 +145,7 @@ 
 	 */
 	function setUserData($_username, $_quota)
 	{
-		if(!$this->acc_imap_administration)
+		if (!$this->acc_imap_administration)
 		{
 			return false;
 		}
@@ -155,7 +155,7 @@ 
 
 		$mailboxName = $this->getUserMailboxString($_username);
 
-		$this->setQuota($mailboxName, array('STORAGE' => (int)$_quota > 0 ? (int)$_quota*1024 : -1));
+		$this->setQuota($mailboxName, array('STORAGE' => (int)$_quota > 0 ? (int)$_quota * 1024 : -1));
 
 		$this->disconnect();
 
@@ -169,7 +169,7 @@ 
 	 */
 	function updateAccount($_hookValues)
 	{
-		if(!$this->acc_imap_administration)
+		if (!$this->acc_imap_administration)
 		{
 			return false;
 		}
@@ -182,14 +182,14 @@ 
 		// make sure we use the correct username here.
 		$username = $this->getMailBoxUserName($_hookValues['account_lid']);
 		$folderInfo = $this->getMailboxes('', $mailboxName, true);
-		if(empty($folderInfo))
+		if (empty($folderInfo))
 		{
 			try {
 				$this->createMailbox($mailboxName);
 				$this->setACL($mailboxName, $username, array('rights' => 'aeiklprstwx'));
 				// create defined folders and subscribe them (have to use user-credentials to subscribe!)
 				$userimap = null;
-				foreach($this->params as $name => $value)
+				foreach ($this->params as $name => $value)
 				{
 					if (substr($name, 0, 11) == 'acc_folder_' && !empty($value))
 					{
@@ -206,7 +206,7 @@ 
 				}
 				if (isset($userimap)) $userimap->logout();
 			}
-			catch(Horde_Imap_Client_Exception $e) {
+			catch (Horde_Imap_Client_Exception $e) {
 				_egw_log_exception($e);
 			}
 		}
@@ -220,9 +220,9 @@ 
 	 * @param array $params
 	 * @throws Exception
 	 */
-	public function __call($name,array $params=null)
+	public function __call($name, array $params = null)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'setRules':	// call setRules with 3. param of true, to enable utf7imap fileinto for Cyrus
 				$params += array(null, null, true);

api/src/Mail/Imap/Dbmailuser.php

Spacing +32 added lines, -32 removed lines

@@ -47,16 +47,16 @@ 
 
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if (!is_resource($ds)) {
 			return false;
 		}
 
-		$filter		= '(&(objectclass=posixaccount)(uid='. $_username .')(dbmailGID='. sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id'])) .'))';
+		$filter		= '(&(objectclass=posixaccount)(uid='.$_username.')(dbmailGID='.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;
 				}
 			}
@@ -66,40 +66,40 @@ 
 
 	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', 'dbmailUID', 'dbmailGID', 'mail');
+		$filter = '(&(objectclass=posixaccount)(uidnumber='.$uidnumber.'))';
+		$justthese = array('dn', 'objectclass', 'dbmailUID', 'dbmailGID', 'mail');
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter, $justthese);
 
-		if(($info = ldap_get_entries($ds, $sri))) {
-			if((!in_array('dbmailuser',$info[0]['objectclass']) && !in_array('dbmailUser',$info[0]['objectclass'])) && $info[0]['mail']) {
+		if (($info = ldap_get_entries($ds, $sri))) {
+			if ((!in_array('dbmailuser', $info[0]['objectclass']) && !in_array('dbmailUser', $info[0]['objectclass'])) && $info[0]['mail']) {
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'dbmailuser';
 				sort($newData['objectclass']);
 				$newData['dbmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
-				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_hookValues['account_lid'] .'@'. $this->domainName : $_hookValues['account_lid'];
+				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_hookValues['account_lid'].'@'.$this->domainName : $_hookValues['account_lid'];
 
-				if(!ldap_modify($ds, $info[0]['dn'], $newData)) {
+				if (!ldap_modify($ds, $info[0]['dn'], $newData)) {
 					#print ldap_error($ds);
 				}
 
 				return true;
 			} else {
 				$newData = array();
-				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_hookValues['account_lid'] .'@'. $this->domainName : $_hookValues['account_lid'];
+				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_hookValues['account_lid'].'@'.$this->domainName : $_hookValues['account_lid'];
 				$newData['dbmailGID']	= 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);
 					_debug_array($newData);
 					exit;
@@ -115,63 +115,63 @@ 
 	{
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if (!is_resource($ds)) {
 			return false;
 		}
 
-		$filter		= '(&(objectclass=posixaccount)(uid='. $_username .'))';
-		$justthese	= array('dn', 'objectclass', 'dbmailGID', 'dbmailUID', 'mail');
+		$filter = '(&(objectclass=posixaccount)(uid='.$_username.'))';
+		$justthese = array('dn', 'objectclass', 'dbmailGID', 'dbmailUID', '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))) {
 			$validLDAPConfig = false;
-			if(in_array('dbmailuser',$info[0]['objectclass']) || in_array('dbmailUser',$info[0]['objectclass'])) {
+			if (in_array('dbmailuser', $info[0]['objectclass']) || in_array('dbmailUser', $info[0]['objectclass'])) {
 				$validLDAPConfig = true;
 			}
 
-			if(!in_array('dbmailuser',$info[0]['objectclass']) && !in_array('dbmailUser',$info[0]['objectclass']) && $info[0]['mail']) {
+			if (!in_array('dbmailuser', $info[0]['objectclass']) && !in_array('dbmailUser', $info[0]['objectclass']) && $info[0]['mail']) {
 				$newData['objectclass'] = $info[0]['objectclass'];
 				unset($newData['objectclass']['count']);
 				$newData['objectclass'][] = 'dbmailUser';
 				sort($newData['objectclass']);
 				$newData['dbmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
-				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_username .'@'. $this->domainName : $_username;
+				$newData['dbmailUID']	= (!empty($this->domainName)) ? $_username.'@'.$this->domainName : $_username;
 
-				if(ldap_modify($ds, $info[0]['dn'], $newData)) {
+				if (ldap_modify($ds, $info[0]['dn'], $newData)) {
 					$validLDAPConfig = true;
 				}
 			} else {
-				if ((in_array('dbmailuser',$info[0]['objectclass']) || in_array('dbmailUser',$info[0]['objectclass'])) && !$info[0]['dbmailuid']) {
+				if ((in_array('dbmailuser', $info[0]['objectclass']) || in_array('dbmailUser', $info[0]['objectclass'])) && !$info[0]['dbmailuid']) {
 					$newData = array();
-					$newData['dbmailUID']	= (!empty($this->domainName)) ? $_username .'@'. $this->domainName : $_username;
+					$newData['dbmailUID'] = (!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;
 					}
 				}
 
-				if ((in_array('dbmailuser',$info[0]['objectclass']) || in_array('dbmailUser',$info[0]['objectclass'])) && !$info[0]['dbmailgid']) {
+				if ((in_array('dbmailuser', $info[0]['objectclass']) || in_array('dbmailUser', $info[0]['objectclass'])) && !$info[0]['dbmailgid']) {
 					$newData = array();
-					$newData['dbmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
+					$newData['dbmailGID'] = 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;
 					}
 				}
 			}
 
-			if($validLDAPConfig) {
+			if ($validLDAPConfig) {
 				$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;
 				}

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

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