EGroupware / egroupware

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

Braces +24 added lines, -6 removed lines

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

api/src/Auth/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;

Braces +4 added lines, -1 removed lines

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

api/src/Csrf.php

Spacing +3 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	 * @param mixed $_purpose =true if given it need to be used in validate too! (It must NOT be NULL)
 	 * @return string CSRF token
 	 */
-	public static function token($_purpose=true)
+	public static function token($_purpose = true)
 	{
 		if (is_null($_purpose))
 		{
@@ -40,8 +40,7 @@ 
 		}
 		// generate random token (using oppenssl if available otherwise mt_rand based Auth::randomstring)
 		$token = function_exists('openssl_random_pseudo_bytes') ?
-			base64_encode(openssl_random_pseudo_bytes(64)) :
-			Auth::randomstring(64);
+			base64_encode(openssl_random_pseudo_bytes(64)) : Auth::randomstring(64);
 
 		// store it in session for later validation
 		Cache::setSession(__CLASS__, $token, $_purpose);
@@ -56,7 +55,7 @@ 
 	 * @param string $_purpose =true optional purpose string passed to token method
 	 * @param boolean $_delete_token =true true if token should be deleted after validation, it will validate no second time
 	 */
-	public static function validate($_token, $_purpose=true, $_delete_token=true)
+	public static function validate($_token, $_purpose = true, $_delete_token = true)
 	{
 		$stored_purpose = Cache::getSession(__CLASS__, $_token);
 

Braces +8 added lines, -2 removed lines

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

api/src/Image.php

Spacing +21 added lines, -21 removed lines

@@ -29,25 +29,25 @@ 
 	 *	true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable()
 	 * @return string url of image or null if not found
 	 */
-	static function find($app,$image,$extension='',$_svg=false)
+	static function find($app, $image, $extension = '', $_svg = false)
 	{
 		$svg = Header\UserAgent::mobile() ? null : $_svg; // ATM we use svg icons only for mobile theme
 		static $image_map_no_svg = null, $image_map_svg = null;
-		if (is_null($svg)) $svg = self::svg_usable ();
+		if (is_null($svg)) $svg = self::svg_usable();
 		if ($svg)
 		{
-			$image_map =& $image_map_svg;
+			$image_map = & $image_map_svg;
 		}
 		else
 		{
-			$image_map =& $image_map_no_svg;
+			$image_map = & $image_map_no_svg;
 		}
 		if (is_null($image_map)) $image_map = self::map(null, $svg);
 
 		// array of images in descending precedence
 		if (is_array($image))
 		{
-			foreach($image as $img)
+			foreach ($image as $img)
 			{
 				if (($url = self::find($app, $img, $extension)))
 				{
@@ -66,16 +66,16 @@ 
 			return $webserver_url.$image_map['vfs'][$image.$extension];
 		}
 		// then app specific ones
-		if(isset($image_map[$app][$image.$extension]))
+		if (isset($image_map[$app][$image.$extension]))
 		{
 			return $webserver_url.$image_map[$app][$image.$extension];
 		}
 		// then api
-		if(isset($image_map['api'][$image.$extension]))
+		if (isset($image_map['api'][$image.$extension]))
 		{
 			return $webserver_url.$image_map['api'][$image.$extension];
 		}
-		if(isset($image_map['phpgwapi'][$image.$extension]))
+		if (isset($image_map['phpgwapi'][$image.$extension]))
 		{
 			return $webserver_url.$image_map['phpgwapi'][$image.$extension];
 		}
@@ -98,7 +98,7 @@ 
 	 * @param string &$name on return basename without extension
 	 * @return string extension without dot, eg. 'php'
 	 */
-	protected static function get_extension($path, &$name=null)
+	protected static function get_extension($path, &$name = null)
 	{
 		$parts = explode('.', basename($path));
 		$ext = array_pop($parts);
@@ -130,7 +130,7 @@ 
 	 * @param boolean $svg =null prefer svg images, default for all browsers but IE<9
 	 * @return array of application => image-name => full path
 	 */
-	public static function map($template_set=null, $svg=null)
+	public static function map($template_set = null, $svg = null)
 	{
 		if (is_null($template_set))
 		{
@@ -149,17 +149,17 @@ 
 		//$starttime = microtime(true);
 
 		// priority: : PNG->JPG->GIF
-		$img_types = array('png','jpg','gif','ico');
+		$img_types = array('png', 'jpg', 'gif', 'ico');
 
 		// if we want svg, prepend it to img-types
-		if ($svg) array_unshift ($img_types, 'svg');
+		if ($svg) array_unshift($img_types, 'svg');
 
 		$map = array();
-		foreach(scandir(EGW_SERVER_ROOT) as $app)
+		foreach (scandir(EGW_SERVER_ROOT) as $app)
 		{
 			if ($app[0] == '.' || !is_dir(EGW_SERVER_ROOT.'/'.$app) || !file_exists(EGW_SERVER_ROOT.'/'.$app.'/templates')) continue;
 
-			$app_map =& $map[$app];
+			$app_map = & $map[$app];
 			if (true) $app_map = array();
 			$imagedirs = array();
 			if (Header\UserAgent::mobile())
@@ -177,16 +177,16 @@ 
 			if ($template_set != 'idots') $imagedirs[] = '/'.$app.'/templates/idots/images';
 			$imagedirs[] = '/'.$app.'/templates/default/images';
 
-			foreach($imagedirs as $imagedir)
+			foreach ($imagedirs as $imagedir)
 			{
 				if (!file_exists($dir = EGW_SERVER_ROOT.$imagedir) || !is_readable($dir)) continue;
 
-				foreach(scandir($dir) as $img)
+				foreach (scandir($dir) as $img)
 				{
 					if ($img[0] == '.') continue;
 
 					$subdir = null;
-					foreach(is_dir($dir.'/'.$img) ? scandir($dir.'/'.($subdir=$img)) : (array) $img as $img)
+					foreach (is_dir($dir.'/'.$img) ? scandir($dir.'/'.($subdir = $img)) : (array)$img as $img)
 					{
 						$name = null;
 						if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
@@ -201,11 +201,11 @@ 
 				}
 			}
 		}
-		$app_map =& $map['vfs'];
+		$app_map = & $map['vfs'];
 		if (true) $app_map = array();
 		if (($dir = $GLOBALS['egw_info']['server']['vfs_image_dir']) && Vfs::file_exists($dir) && Vfs::is_readable($dir))
 		{
-			foreach(Vfs::find($dir) as $img)
+			foreach (Vfs::find($dir) as $img)
 			{
 				if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
 
@@ -220,7 +220,7 @@ 
 			return $map;
 		}
 		//error_log(__METHOD__."('$template_set') took ".(microtime(true)-$starttime).' secs');
-		Cache::setInstance(__CLASS__, $cache_name, $map, 86400);	// cache for one day
+		Cache::setInstance(__CLASS__, $cache_name, $map, 86400); // cache for one day
 		//echo "<p>template_set=".array2string($template_set)."</p>\n"; _debug_array($map);
 		return $map;
 	}
@@ -236,7 +236,7 @@ 
 			$templates[] = $template_set;
 		}
 		//error_log(__METHOD__."() for templates ".array2string($templates));
-		foreach($templates as $template_set)
+		foreach ($templates as $template_set)
 		{
 			Cache::unsetInstance(__CLASS__, 'image_map_'.$template_set);
 			Cache::unsetInstance(__CLASS__, 'image_map_'.$template_set.'_svg');

Braces +48 added lines, -12 removed lines

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

api/src/Mail/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);

Braces +12 added lines, -3 removed lines

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

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

Braces +53 added lines, -25 removed lines

@@ -47,16 +47,20 @@ 
 
 		$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'])) .'))';
 		$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,13 +70,15 @@ 
 
 	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;
 		}
 
@@ -80,8 +86,10 @@ 
 		$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';
@@ -89,17 +97,21 @@ 
 				$newData['dbmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 				$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 {
+			}
+			else
+			{
 				$newData = array();
 				$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,7 +127,8 @@ 
 	{
 		$ds = Ldap::factory();
 
-		if(!is_resource($ds)) {
+		if(!is_resource($ds))
+		{
 			return false;
 		}
 
@@ -123,13 +136,16 @@ 
 		$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';
@@ -137,41 +153,53 @@ 
 				$newData['dbmailGID']	= sprintf("%u", crc32($GLOBALS['egw_info']['server']['install_id']));
 				$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']) {
+			}
+			else
+			{
+				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;
 
-					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']));
 
-					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 {
+				}
+				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;
 			}

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