EGroupware / egroupware

addressbook/inc/class.addressbook_zpush.inc.php

Spacing +58 added lines, -59 removed lines

@@ -71,7 +71,7 @@ 
 		'homestreet'	=>	'adr_two_street',
 		'homefaxnumber'	=> 'tel_fax_home',
 		'homephonenumber'	=>	'tel_home',
-		'jobtitle'	=>	'title',	// unfortunatly outlook only has title & jobtitle, while EGw has 'n_prefix', 'title' & 'role',
+		'jobtitle'	=>	'title', // unfortunatly outlook only has title & jobtitle, while EGw has 'n_prefix', 'title' & 'role',
 		'lastname'	=> 'n_family',
 		'middlename'	=> 'n_middle',
 		'mobilephonenumber'	=> 'tel_cell',
@@ -123,9 +123,9 @@ 
 	 * @param booelan $ab_prefix =false prefix personal, private and accounts addressbook with lang('Addressbook').' '
 	 * @return string|array addressbook name of array with int account_id => label pairs
 	 */
-	private function get_addressbooks($account=null,$return_all_in_one=true, $ab_prefix=false)
+	private function get_addressbooks($account = null, $return_all_in_one = true, $ab_prefix = false)
 	{
-		static $abs=null;
+		static $abs = null;
 
 		if (!isset($abs) || !$return_all_in_one)
 		{
@@ -137,14 +137,14 @@ 
 			}
 			else
 			{
-				Api\Translation::add_app('addressbook');	// we need the addressbook translations
+				Api\Translation::add_app('addressbook'); // we need the addressbook translations
 
 				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
 				if (!is_array($pref_abs))
 				{
-					$pref_abs = $pref_abs ? explode(',',$pref_abs) : [];
+					$pref_abs = $pref_abs ? explode(',', $pref_abs) : [];
 				}
 				foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
 				{
@@ -152,18 +152,17 @@ 
 					{
 						$account_id = self::PRIVATE_AB;
 					}
-					if ($account_id && in_array($account_id,$pref_abs) || in_array('A',$pref_abs) ||
-						$account_id == 0 && in_array('U',$pref_abs) ||
-						$account_id == $GLOBALS['egw_info']['user']['account_id'] ||	// allways sync pers. AB
-						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$pref_abs))
+					if ($account_id && in_array($account_id, $pref_abs) || in_array('A', $pref_abs) ||
+						$account_id == 0 && in_array('U', $pref_abs) ||
+						$account_id == $GLOBALS['egw_info']['user']['account_id'] || // allways sync pers. AB
+						$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G', $pref_abs))
 					{
 						$abs[$account_id] = $label;
 					}
 				}
 			}
 		}
-		$ret = is_null($account) ? $abs :
-			($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
+		$ret = is_null($account) ? $abs : ($ab_prefix && (!$account || (int)$account == (int)$GLOBALS['egw_info']['user']['account_id']) ?
 				lang('Addressbook').' ' : '').$abs[$account];
 		//error_log(__METHOD__."($account, $return_all_in_one, $ab_prefix) returning ".array2string($ret));
 		return $ret;
@@ -181,7 +180,7 @@ 
 		foreach ($this->get_addressbooks() as $account => $label)
 		{
 			$folderlist[] = array(
-				'id'	=>	$this->backend->createID('addressbook',$account),
+				'id'	=>	$this->backend->createID('addressbook', $account),
 				'mod'	=>	$label,
 				'parent'=>	'0',
 			);
@@ -279,20 +278,20 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
-		unset($cutoffdate);	// not used, but required by function signature
+		unset($cutoffdate); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 		$filter = array('owner' => $user);
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
 			$user == $GLOBALS['egw_info']['user']['account_id'])
 		{
-			$filter['owner'] = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+			$filter['owner'] = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 			// translate AS private AB ID to EGroupware one
 			if (($key = array_search(self::PRIVATE_AB, $filter['owner'])) !== false)
 			{
@@ -309,10 +308,10 @@ 
 
 		$messagelist = array();
 		$criteria = null;
-		if (($contacts =& $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
-			false, 'AND', false,$filter)))
+		if (($contacts = & $this->addressbook->search($criteria, 'contact_id,contact_etag', '', '', '',
+			false, 'AND', false, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$messagelist[] = $this->StatMessage($id, $contact);
 			}
@@ -349,9 +348,9 @@ 
 		}
 		$emailname = isset($contact['n_given']) ? $contact['n_given'].' ' : '';
 		$emailname .= isset($contact['n_middle']) ? $contact['n_middle'].' ' : '';
-		$emailname .= isset($contact['n_family']) ? $contact['n_family']: '';
+		$emailname .= isset($contact['n_family']) ? $contact['n_family'] : '';
 		$message = new SyncContact();
-		foreach(self::$mapping as $key => $attr)
+		foreach (self::$mapping as $key => $attr)
 		{
 			switch ($attr)
 			{
@@ -364,7 +363,7 @@ 
 					}
 					else
 					{
-						if (strlen ($contact[$attr]) > 0)
+						if (strlen($contact[$attr]) > 0)
 						{
 							$message->asbody = new SyncBaseBody();
 							$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->asbody);
@@ -373,7 +372,7 @@ 
 					break;
 
 				case 'jpegphoto':
-					if (empty($contact[$attr]) && ($contact['files'] & Api\Contacts::FILES_BIT_PHOTO))
+					if (empty($contact[$attr]) && ($contact['files']&Api\Contacts::FILES_BIT_PHOTO))
 					{
 						$contact[$attr] = file_get_contents(Api\Link::vfs_path('addressbook', $contact['id'], Api\Contacts::FILES_PHOTO));
 					}
@@ -392,14 +391,14 @@ 
 
 				case 'cat_id':
 					$message->$key = array();
-					foreach($contact[$attr] ? explode(',',$contact[$attr]) : array() as $cat_id)
+					foreach ($contact[$attr] ? explode(',', $contact[$attr]) : array() as $cat_id)
 					{
 						$message->categories[] = Api\Categories::id2name($cat_id);
 					}
 					// for all addressbooks in one, add addressbook name itself as category
 					if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 					{
-						$message->categories[] = $this->get_addressbooks($contact['owner'].($contact['private']?'p':''), false, true);
+						$message->categories[] = $this->get_addressbooks($contact['owner'].($contact['private'] ? 'p' : ''), false, true);
 					}
 					break;
 				// HTC Desire needs at least one telefon number, otherwise sync of contact fails without error,
@@ -411,7 +410,7 @@ 
 				case 'n_fileas':
 					if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas'])
 					{
-						$message->$key = $this->addressbook->fileas($contact,$GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas']);
+						$message->$key = $this->addressbook->fileas($contact, $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-force-fileas']);
 						break;
 					}
 					// fall through
@@ -437,7 +436,7 @@ 
 	 */
 	public function StatMessage($folderid, $contact)
 	{
-		unset($folderid);	// not used (contact_id is global), but required by function signaure
+		unset($folderid); // not used (contact_id is global), but required by function signaure
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		if (!is_array($contact)) $contact = $this->addressbook->read($contact);
@@ -472,7 +471,7 @@ 
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		unset($id, $oldid, $displayname, $type);	// not used, but required by function signature
+		unset($id, $oldid, $displayname, $type); // not used, but required by function signature
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." not implemented");
 	}
 
@@ -511,7 +510,7 @@ 
 	 */
 	public function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$type = $account = null;
@@ -532,10 +531,10 @@ 
 		if ($account == 0)	// as a precausion, we currently do NOT allow to change Api\Accounts
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Changing of Api\Accounts denied!");
-			return false;			//no changing of Api\Accounts
+			return false; //no changing of Api\Accounts
 		}
 		$contact = array();
-		if (empty($id) && ($this->addressbook->grants[$account] & Acl::EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(Acl::EDIT, $contact))
+		if (empty($id) && ($this->addressbook->grants[$account]&Acl::EDIT) || ($contact = $this->addressbook->read($id)) && $this->addressbook->check_perms(Acl::EDIT, $contact))
 		{
 			// remove all fields supported by AS, leaving all unsupported fields unchanged
 			$contact = array_diff_key($contact, array_flip(self::$mapping));
@@ -548,7 +547,7 @@ 
 						break;
 
 					case 'bday':	// zpush uses timestamp in servertime
-						$contact[$attr] = $message->$key ? date('Y-m-d',$message->$key) : null;
+						$contact[$attr] = $message->$key ? date('Y-m-d', $message->$key) : null;
 						break;
 
 					case 'jpegphoto':
@@ -558,20 +557,20 @@ 
 					case 'cat_id':
 						// for existing entries in all-in-one addressbook, remove addressbook name as category
 						if ($contact && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
-							($k=array_search($this->get_addressbooks($contact['owner'].($contact['private']?'p':''), false, true),$message->$key)))
+							($k = array_search($this->get_addressbooks($contact['owner'].($contact['private'] ? 'p' : ''), false, true), $message->$key)))
 						{
 							unset($message->categories[$k]);
 						}
 						if (is_array($message->$key))
 						{
-							$contact[$attr] = implode(',', array_filter($this->addressbook->find_or_add_categories($message->$key, $id),'strlen'));
+							$contact[$attr] = implode(',', array_filter($this->addressbook->find_or_add_categories($message->$key, $id), 'strlen'));
 						}
 						break;
 					case 'email':
 					case 'email_home':
-						if (function_exists ('imap_rfc822_parse_adrlist'))
+						if (function_exists('imap_rfc822_parse_adrlist'))
 						{
-							$email_array = array_shift(imap_rfc822_parse_adrlist($message->$key,""));
+							$email_array = array_shift(imap_rfc822_parse_adrlist($message->$key, ""));
 							if (!empty($email_array->mailbox) && $email_array->mailbox != 'INVALID_ADDRESS' && !empty($email_array->host))
 							{
 								$contact[$attr] = $email_array->mailbox.'@'.$email_array->host;
@@ -583,7 +582,7 @@ 
 						}
 						else
 						{
-							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__. " Warning : php-imap not available");
+							ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Warning : php-imap not available");
 							$contact[$attr] = $message->$key;
 						}
 						break;
@@ -610,9 +609,9 @@ 
 				$contact['private'] = (int)$is_private;
 			}
 			// if default addressbook for new contacts is NOT synced --> use personal addressbook
-			elseif($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] &&
+			elseif ($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] &&
 				!in_array($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],
-					array_keys($this->get_addressbooks(null,false))))
+					array_keys($this->get_addressbooks(null, false))))
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
@@ -644,7 +643,7 @@ 
 	 */
 	public function MoveMessage($folderid, $id, $newfolderid, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id, $newfolderid) NOT allowed for an all-in-one addressbook --> returning false");
@@ -671,7 +670,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used, but required by function signature
+		unset($contentParameters); // not used, but required by function signature
 		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
 
 		$ret = $this->addressbook->delete($id);
@@ -747,16 +746,16 @@ 
 			}
 			if (in_array('A', $prefs_abs))
 			{
-				$owner = null;	// all AB's
+				$owner = null; // all AB's
 			}
 			else
 			{
-				$owner = array_keys($this->get_addressbooks(null,false));	// false = return all selected abs
+				$owner = array_keys($this->get_addressbooks(null, false)); // false = return all selected abs
 				// translate AS private AB ID to current user
 				if (($key = array_search(self::PRIVATE_AB, $owner)) !== false)
 				{
 					unset($owner[$key]);
-					if (!in_array($GLOBALS['egw_info']['user']['account_id'],$owner))
+					if (!in_array($GLOBALS['egw_info']['user']['account_id'], $owner))
 					{
 						$owner[] = $GLOBALS['egw_info']['user']['account_id'];
 					}
@@ -769,7 +768,7 @@ 
 		}
 		$ctag = $this->addressbook->get_ctag($owner);
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		//$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)
@@ -797,32 +796,32 @@ 
 		$range = false;
 		if (isset($searchquery['range']) && preg_match('/^\d+-\d+$/', $searchquery['range']))
 		{
-			list($start,$end) = explode('-', $searchquery['range']);
-			$range = array($start, $end-$start+1);	// array(start, num_entries)
+			list($start, $end) = explode('-', $searchquery['range']);
+			$range = array($start, $end - $start + 1); // array(start, num_entries)
 		}
 		//error_log(__METHOD__.'('.array2string($searchquery).') range='.array2string($range));
 
 		$items = $filter = array();
 		$filter['cols_to_search'] = array('n_fn', 'n_family', 'n_given',
-						'room','org_name', 'title', 'role', 'tel_work', 'tel_home', 'tel_cell',
+						'room', 'org_name', 'title', 'role', 'tel_work', 'tel_home', 'tel_cell',
 						'email', 'email_home');
-		if (($contacts =& $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range, $filter)))
+		if (($contacts = & $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR', $range, $filter)))
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				//$item[SYNC_GAL_ALIAS] = $contact['contact_id'];
-			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family'] ? $contact['n_family'] : $contact['org_name'];
 			  	$item[SYNC_GAL_FIRSTNAME] = $contact['n_given'];
 				$item[SYNC_GAL_DISPLAYNAME] = $contact['n_fn'];
-				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
-				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
+				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family'] ? $contact['n_family'] : $contact['org_name'];
+				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'];
 				//$item['nameid'] = $searchquery;
 				$item[SYNC_GAL_PHONE] = (string)$contact['tel_work'];
 				$item[SYNC_GAL_HOMEPHONE] = (string)$contact['tel_home'];
 				$item[SYNC_GAL_MOBILEPHONE] = (string)$contact['tel_cell'];
 				$item[SYNC_GAL_COMPANY] = (string)$contact['org_name'];
 				$item[SYNC_GAL_OFFICE] = $contact['room'];
-				$item[SYNC_GAL_TITLE ] = $contact['title'];
+				$item[SYNC_GAL_TITLE] = $contact['title'];
 
 			  	//do not return users without email
 				if (!trim($item[SYNC_GAL_EMAILADDRESS])) continue;
@@ -830,8 +829,8 @@ 
 				$items[] = $item;
 			}
 		}
-		$items['searchtotal']=count($items);
-		$items['range']=$searchquery['range'];
+		$items['searchtotal'] = count($items);
+		$items['range'] = $searchquery['range'];
 		return $items;
 	}
 
@@ -853,14 +852,14 @@ 
 			$addressbooks = $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
 			if ($user > 0)
 			{
-				unset($addressbooks[$user]);	// personal addressbook is allways synced
+				unset($addressbooks[$user]); // personal addressbook is allways synced
 				if (isset($addressbooks[$user.'p']))
 				{
 					$addressbooks[self::PRIVATE_AB] = lang('Private');
 				}
 			}
-			unset($addressbooks[$user.'p']);// private addressbook uses ID self::PRIVATE_AB
-			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute'))+$addressbook_bo->fileas_options();
+			unset($addressbooks[$user.'p']); // private addressbook uses ID self::PRIVATE_AB
+			$fileas_options = array('0' => lang('use addressbooks "own sorting" attribute')) + $addressbook_bo->fileas_options();
 		}
 		$addressbooks += array(
 			'G'	=> lang('Primary Group'),

Braces +76 added lines, -19 removed lines

@@ -139,7 +139,10 @@ 
 			{
 				Api\Translation::add_app('addressbook');	// we need the addressbook translations
 
-				if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+				if (!isset($this->addressbook))
+				{
+					$this->addressbook = new Api\Contacts();
+				}
 
 				$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
 				if (!is_array($pref_abs))
@@ -282,7 +285,10 @@ 
 	function GetMessageList($id, $cutoffdate=NULL)
 	{
 		unset($cutoffdate);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$type = $user = null;
 		$this->backend->splitID($id,$type,$user);
@@ -333,7 +339,10 @@ 
 	 */
 	public function GetMessage($folderid, $id, $contentparameters)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		//$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 		//$mimesupport = $contentparameters->GetMimeSupport();
@@ -377,7 +386,10 @@ 
 					{
 						$contact[$attr] = file_get_contents(Api\Link::vfs_path('addressbook', $contact['id'], Api\Contacts::FILES_PHOTO));
 					}
-					if (!empty($contact[$attr])) $message->$key = base64_encode($contact[$attr]);
+					if (!empty($contact[$attr]))
+					{
+						$message->$key = base64_encode($contact[$attr]);
+					}
 					break;
 
 				case 'bday':	// zpush seems to use a timestamp in utc (at least vcard backend does)
@@ -416,7 +428,10 @@ 
 					}
 					// fall through
 				default:
-					if (!empty($contact[$attr])) $message->$key = $contact[$attr];
+					if (!empty($contact[$attr]))
+					{
+						$message->$key = $contact[$attr];
+					}
 			}
 		}
 		//error_log(__METHOD__."(folder='$folderid',$id,...) returning ".array2string($message));
@@ -438,9 +453,15 @@ 
 	public function StatMessage($folderid, $contact)
 	{
 		unset($folderid);	// not used (contact_id is global), but required by function signaure
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
-		if (!is_array($contact)) $contact = $this->addressbook->read($contact);
+		if (!is_array($contact))
+		{
+			$contact = $this->addressbook->read($contact);
+		}
 
 		if (!$contact)
 		{
@@ -512,7 +533,10 @@ 
 	public function ChangeMessage($folderid, $id, $message, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$type = $account = null;
 		$this->backend->splitID($folderid, $type, $account);
@@ -524,14 +548,20 @@ 
 
 		}
 		// error_log(__METHOD__. " Id " .$id. " Account ". $account . " FolderID " . $folderid);
-		if ($type != 'addressbook') // || !($contact = $this->addressbook->read($id)))
+		if ($type != 'addressbook')
+		{
+			// || !($contact = $this->addressbook->read($id)))
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Folder wrong or contact not existing");
+		}
 			return false;
 		}
-		if ($account == 0)	// as a precausion, we currently do NOT allow to change Api\Accounts
+		if ($account == 0)
+		{
+			// as a precausion, we currently do NOT allow to change Api\Accounts
 		{
 			ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." Changing of Api\Accounts denied!");
+		}
 			return false;			//no changing of Api\Accounts
 		}
 		$contact = array();
@@ -594,7 +624,10 @@ 
 						}
 						break;
 					case 'title':	// as ol jobtitle mapping changed in egw from role to title, do NOT overwrite title with value of role
-						if ($id && $message->$key == $contact['role']) break;
+						if ($id && $message->$key == $contact['role'])
+						{
+							break;
+						}
 						// fall throught
 					default:
 						$contact[$attr] = $message->$key;
@@ -603,7 +636,10 @@ 
 			}
 			// for all-in-one addressbook, account is meaningless and wrong!
 			// Api\Contacts::save() keeps the owner or sets an appropriate one if none given
-			if (!isset($contact['private'])) $contact['private'] = (int)$is_private;
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$is_private;
+			}
 			if (!$GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'])
 			{
 				$contact['owner'] = $account;
@@ -616,7 +652,10 @@ 
 			{
 				$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			}
-			if (!empty($id)) $contact['id'] = $id;
+			if (!empty($id))
+			{
+				$contact['id'] = $id;
+			}
 			$this->addressbook->fixup_contact($contact);
 			$newid = $this->addressbook->save($contact);
 			//error_log(__METHOD__."($folderid,$id) contact=".array2string($contact)." returning ".array2string($newid));
@@ -672,7 +711,10 @@ 
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
 		unset($contentParameters);	// not used, but required by function signature
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		$ret = $this->addressbook->delete($id);
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__."('$folderid', $id) delete($id) returned ".array2string($ret));
@@ -732,9 +774,15 @@ 
 		$type = $owner = null;
 		$this->backend->splitID($folderid, $type, $owner);
 
-		if ($type != 'addressbook') return false;
+		if ($type != 'addressbook')
+		{
+			return false;
+		}
 
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 
 		// handle all-in-one addressbook
 		if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
@@ -790,7 +838,10 @@ 
 	 */
 	function getSearchResultsGAL($searchquery)
 	{
-		if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
+		if (!isset($this->addressbook))
+		{
+			$this->addressbook = new Api\Contacts();
+		}
 		//error_log(__METHOD__.'('.array2string($searchquery).')');
 
 		// only return items in given range, eg. "0-50"
@@ -814,7 +865,10 @@ 
 			  	$item[SYNC_GAL_LASTNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
 			  	$item[SYNC_GAL_FIRSTNAME] = $contact['n_given'];
 				$item[SYNC_GAL_DISPLAYNAME] = $contact['n_fn'];
-				if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+				if (!trim($item[SYNC_GAL_DISPLAYNAME]))
+				{
+					$item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];
+				}
 				$item[SYNC_GAL_EMAILADDRESS] = $contact['email'] ? $contact['email'] : (string)$contact['email_private'] ;
 				//$item['nameid'] = $searchquery;
 				$item[SYNC_GAL_PHONE] = (string)$contact['tel_work'];
@@ -825,7 +879,10 @@ 
 				$item[SYNC_GAL_TITLE ] = $contact['title'];
 
 			  	//do not return users without email
-				if (!trim($item[SYNC_GAL_EMAILADDRESS])) continue;
+				if (!trim($item[SYNC_GAL_EMAILADDRESS]))
+				{
+					continue;
+				}
 
 				$items[] = $item;
 			}