EGroupware / egroupware

api/src/Mail/Imap/Dbmailuser.php

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

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

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

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

Braces +14 added lines, -4 removed lines

@@ -104,21 +104,30 @@ 
 
 	function getRules()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->rules;
 	}
 
 	function getVacation()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->vacation;
 	}
 
 	function getEmailNotification()
 	{
-		if (!isset($this->rules)) $this->retrieveRules();
+		if (!isset($this->rules))
+		{
+			$this->retrieveRules();
+		}
 
 		return $this->emailNotification;
 	}
@@ -169,7 +178,8 @@ 
 	 */
 	function setEmailNotification(array $_emailNotification, $_scriptName=null)
 	{
-		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
+		if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail']))
+		{
     		$_emailNotification['status'] = 'off';
     		$_emailNotification['externalEmail'] = '';
     	}

api/src/Mail/Smtp/Sql.php

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

Braces +5 added lines, -1 removed lines

@@ -84,7 +84,11 @@
 	{
 		foreach(Account::search((int)$data['account_id'], 'params') as $params)
 		{
-			if (!Account::is_multiple($params)) continue;	// no need to waste time on personal accounts
+			if (!Account::is_multiple($params))
+			{
+				continue;
+			}
+			// no need to waste time on personal accounts
 
 			try {
 				$account = new Account($params);

api/src/Mail/Types.php

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

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