EGroupware / egroupware

api/src/Db/Exception/NotUnique.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
 /**
  * Storing the row violates a unique key constrain
  */
-class NotUnique extends Db\Exception { }
+class NotUnique extends Db\Exception
+{
+}

api/src/Db/Exception/InvalidSql.php

Braces +3 added lines, -1 removed lines

@@ -19,4 +19,6 @@
  * New InvalidSql exception has to extend deprecated egw_exception_db_invalid_sql
  * to allow legacy code to catch exceptions thrown by Api\Db!
  */
-class InvalidSql extends \egw_exception_db_invalid_sql {}
+class InvalidSql extends \egw_exception_db_invalid_sql
+{
+}

api/src/Db/Exception/Setup.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
 /**
  * EGroupware not (fully) installed, visit setup
  */
-class Setup extends Db\Exception { }
+class Setup extends Db\Exception
+{
+}

api/src/Db/Exception/Support.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
 /**
  * PHP lacks support for configured database type
  */
-class Support extends Db\Exception { }
+class Support extends Db\Exception
+{
+}

api/src/Db/Exception/Connection.php

Braces +3 added lines, -1 removed lines

@@ -18,4 +18,6 @@
 /**
  *  Can not connect to database: eg. database down, wrong host, name or credentials
  */
-class Connection extends Db\Exception { }
+class Connection extends Db\Exception
+{
+}

api/src/Contacts/Merge.php

Braces +51 added lines, -13 removed lines

@@ -84,7 +84,10 @@ 
 	 */
 	protected function calendar_replacements($id,$last_event_too=false)
 	{
-		if (!class_exists('calendar_boupdate')) return array();
+		if (!class_exists('calendar_boupdate'))
+		{
+			return array();
+		}
 
 		$calendar = new calendar_boupdate();
 
@@ -118,11 +121,17 @@ 
 		foreach($events as $key => $event)
 		{
 			// Use -1 for previous key
-			if($key < 0) $n = $key;
+			if($key < 0)
+			{
+				$n = $key;
+			}
 
 			foreach($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
+				if (substr($name,-4) == 'date')
+				{
+					$name = substr($name,0,-4);
+				}
 				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
 			}
 			foreach(array('start','end') as $what)
@@ -134,7 +143,10 @@ 
 				) as $name => $format)
 				{
 					$value = $event[$what] ? date($format,$event[$what]) : '';
-					if ($format == 'l') $value = lang($value);
+					if ($format == 'l')
+					{
+						$value = lang($value);
+					}
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
@@ -145,7 +157,8 @@ 
 		}
 
 		// Need to set some keys if there is no previous event
-		if($last_event_too && count($events['-1']) == 0) {
+		if($last_event_too && count($events['-1']) == 0)
+		{
 			$replacements['$$calendar/-1/start$$'] = '';
 			$replacements['$$calendar/-1/end$$'] = '';
 			$replacements['$$calendar/-1/owner$$'] = '';
@@ -170,22 +183,38 @@ 
 		$n = 0;
 		foreach($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;	// dont show them, as they are not used in the UI atm.
+			if (in_array($name,array('tid','label','geo')))
+			{
+				continue;
+			}
+			// dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
 			if($name == 'cat_id')
 			{
-				if ($n&1) echo "</tr>\n";
+				if ($n&1)
+				{
+					echo "</tr>\n";
+				}
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
 				$n++;
 			}
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -242,14 +271,23 @@ 
 			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('start','end')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{calendar/#/'.$name.'}}</td><td>'.$label.'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 		echo "</table>\n";

Spacing +34 added lines, -34 removed lines

@@ -16,7 +16,7 @@ 
 use EGroupware\Api;
 
 // explicit import not namespaced classes
-use calendar_boupdate;	// we detect if it is not available
+use calendar_boupdate; // we detect if it is not available
 
 /**
  * Contacts document merge
@@ -55,22 +55,22 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null,$ignore_acl=false)
+	protected function get_replacements($id, &$content = null, $ignore_acl = false)
 	{
-		if (!($replacements = $this->contact_replacements($id,'',$ignore_acl, $content)))
+		if (!($replacements = $this->contact_replacements($id, '', $ignore_acl, $content)))
 		{
 			return false;
 		}
-		if($content && strpos($content, '$$#') !== false)
+		if ($content && strpos($content, '$$#') !== false)
 		{
-			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements,'addressbook');
+			$this->cf_link_to_expand($this->contacts->read($id, $ignore_acl), $content, $replacements, 'addressbook');
 		}
 
 		// Links
 		$replacements += $this->get_all_links('addressbook', $id, '', $content);
-		if (!(strpos($content,'$$calendar/') === false))
+		if (!(strpos($content, '$$calendar/') === false))
 		{
-			$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false));
+			$replacements += $this->calendar_replacements($id, !(strpos($content, '$$calendar/-1/') === false));
 		}
 		return $replacements;
 	}
@@ -82,7 +82,7 @@ 
 	 * @param boolean $last_event_too =false also include information about the last event
 	 * @return array
 	 */
-	protected function calendar_replacements($id,$last_event_too=false)
+	protected function calendar_replacements($id, $last_event_too = false)
 	{
 		if (!class_exists('calendar_boupdate')) return array();
 
@@ -101,7 +101,7 @@ 
 		{
 			$events = array();
 		}
-		if ($last_event_too==true)
+		if ($last_event_too == true)
 		{
 			$last = $calendar->search(array(
 				'end' => $calendar->now_su,
@@ -111,41 +111,41 @@ 
 				'order' => 'cal_start DESC',
 				'enum_recurring' => true
 			));
-			$events['-1'] = $last ? array_shift($last) : array();	// returned events are indexed by cal_id!
+			$events['-1'] = $last ? array_shift($last) : array(); // returned events are indexed by cal_id!
 		}
 		$replacements = array();
-		$n = 1;  // Returned events are indexed by cal_id, need to index sequentially
-		foreach($events as $key => $event)
+		$n = 1; // Returned events are indexed by cal_id, need to index sequentially
+		foreach ($events as $key => $event)
 		{
 			// Use -1 for previous key
-			if($key < 0) $n = $key;
+			if ($key < 0) $n = $key;
 
-			foreach($calendar->event2array($event) as $name => $data)
+			foreach ($calendar->event2array($event) as $name => $data)
 			{
-				if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+				if (substr($name, -4) == 'date') $name = substr($name, 0, -4);
+				$replacements['$$calendar/'.$n.'/'.$name.'$$'] = is_array($data['data']) ? implode(', ', $data['data']) : $data['data'];
 			}
-			foreach(array('start','end') as $what)
+			foreach (array('start', 'end') as $what)
 			{
-				foreach(array(
+				foreach (array(
 					'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 					'day'  => 'l',
 					'time' => $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i',
 				) as $name => $format)
 				{
-					$value = $event[$what] ? date($format,$event[$what]) : '';
+					$value = $event[$what] ? date($format, $event[$what]) : '';
 					if ($format == 'l') $value = lang($value);
 					$replacements['$$calendar/'.$n.'/'.$what.$name.'$$'] = $value;
 				}
 			}
-			$duration = ($event['end'] - $event['start'])/60;
-			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+			$duration = ($event['end'] - $event['start']) / 60;
+			$replacements['$$calendar/'.$n.'/duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 			++$n;
 		}
 
 		// Need to set some keys if there is no previous event
-		if($last_event_too && count($events['-1']) == 0) {
+		if ($last_event_too && count($events['-1']) == 0) {
 			$replacements['$$calendar/-1/start$$'] = '';
 			$replacements['$$calendar/-1/end$$'] = '';
 			$replacements['$$calendar/-1/owner$$'] = '';
@@ -168,18 +168,18 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Contact fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;	// dont show them, as they are not used in the UI atm.
+			if (in_array($name, array('tid', 'label', 'geo'))) continue; // dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('email', 'org_name', 'tel_work', 'url')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
 			}
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
-			if($name == 'cat_id')
+			if ($name == 'cat_id')
 			{
 				if ($n&1) echo "</tr>\n";
 				echo '<td>{{categories}}</td><td>'.lang('Category path').'</td>';
@@ -190,13 +190,13 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->contacts->customfields as $name => $field)
+		foreach ($this->contacts->customfields as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),
@@ -223,7 +223,7 @@ 
 
 		Api\Translation::add_app('calendar');
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'title' => lang('Title'),
 			'description' => lang('Description'),
 			'participants' => lang('Participants'),
@@ -245,7 +245,7 @@ 
 			'owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('start', 'end')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -274,8 +274,8 @@ 
 	 * @param int|string $export_limit =null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
 	 * @return array see nextmatch_widget::egw_actions
 	 */
-	public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
-		$export_limit=null)
+	public static function document_action($dirs, $group = 0, $caption = 'Insert in document', $prefix = 'document_', $default_doc = '',
+		$export_limit = null)
 	{
 		$actions = parent::document_action($dirs, $group, $caption, $prefix, $default_doc, $export_limit);
 
@@ -287,14 +287,14 @@ 
 
 	protected static function customise_mail_actions(&$action)
 	{
-		if(strpos($action['egw_open'], 'edit-mail') === 0)
+		if (strpos($action['egw_open'], 'edit-mail') === 0)
 		{
 			unset($action['confirm_multiple']);
 			$action['onExecute'] = 'javaScript:app.addressbook.merge_mail';
 		}
 		else if ($action['children'])
 		{
-			foreach($action['children'] as &$child)
+			foreach ($action['children'] as &$child)
 			{
 				static::customise_mail_actions($child);
 			}

api/src/Egw.php

Braces +37 added lines, -10 removed lines

@@ -118,7 +118,7 @@ 
 			'config_app'  => 'phpgwapi',
 			'config_name' => array('system_charset','install_id','temp_dir'),
 		),__LINE__,__FILE__) as $row)
-		{
+			{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
 		if ($GLOBALS['egw_info']['server']['system_charset'] && $GLOBALS['egw_info']['server']['system_charset'] != 'utf-8')
@@ -131,11 +131,14 @@ 
 		// if no server timezone set, use date_default_timezone_get() to determine it once
 		// it fills to log with deprecated warnings under 5.3 otherwise
 		if (empty($GLOBALS['egw_info']['server']['server_timezone']) ||
-			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')	// treat invalid tz like empty!
+			$GLOBALS['egw_info']['server']['server_timezone'] == 'System/Localtime')
+		{
+			// treat invalid tz like empty!
 		{
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
+		}
 				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
 				error_log(__METHOD__."() stored server_timezone=".$GLOBALS['egw_info']['server']['server_timezone']);
 			}
@@ -301,14 +304,20 @@ 
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
-		if ($this->session->verify()) return true;
+		if ($this->session->verify())
+		{
+			return true;
+		}
 
 		$account = null;
 		if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
-			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)	// $account_call_back returns true, false or a session-id
+			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)
+		{
+			// $account_call_back returns true, false or a session-id
 		{
 			$sessionid = $this->session->create($account);
 		}
+		}
 		if (!$sessionid)
 		{
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
@@ -337,9 +346,15 @@ 
 			{
 				$redirect = '/login.php?';
 				// only add "your session could not be verified", if a sessionid is given (cookie or on url)
-				if (Session::get_sessionid()) $redirect .= 'cd=10&';
+				if (Session::get_sessionid())
+				{
+					$redirect .= 'cd=10&';
+				}
+			}
+			if ($relpath)
+			{
+				$redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			}
-			if ($relpath) $redirect .= 'phpgw_forward='.urlencode($relpath.(!empty($query) ? '?'.$query : ''));
 			self::redirect_link($redirect);
 		}
 	}
@@ -357,7 +372,9 @@ 
 	{
 		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
 
-		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))	// give everyone implicit api rights
+		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))
+		{
+			// give everyone implicit api rights
 		{
 			// This will need to use ACL in the future
 			if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||
@@ -370,6 +387,7 @@ 
 					if (($sessionid = Session::get_sessionid(true)))
 					{
 						$GLOBALS['egw']->session->destroy($sessionid);
+		}
 					}
 					throw new Exception\Redirect(self::link('/logout.php'));
 				}
@@ -555,7 +573,10 @@ 
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
 					$callback = array_shift($data);
-					if (!is_array($callback) || strpos($callback[1], 'session') === false) continue;
+					if (!is_array($callback) || strpos($callback[1], 'session') === false)
+					{
+						continue;
+					}
 					call_user_func_array($callback, $data);
 				}
 				catch (\Exception $ex) {
@@ -565,7 +586,10 @@ 
 			}
 			// now we can close the session
 			// without closing the session fastcgi_finish_request() will NOT send output to user
-			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session)) $GLOBALS['egw']->session->commit_session();
+			if (isset($GLOBALS['egw']->session) && is_object($GLOBALS['egw']->session))
+			{
+				$GLOBALS['egw']->session->commit_session();
+			}
 
 			// flush all output to user
 			/* does NOT work on Apache :-(
@@ -593,9 +617,12 @@ 
 				}
 			}
 			// call the asyncservice check_run function if it is not explicitly set to cron-only
-			if (!$GLOBALS['egw_info']['server']['asyncservice'])	// is default
+			if (!$GLOBALS['egw_info']['server']['asyncservice'])
+			{
+				// is default
 			{
 				$async = new Asyncservice();
+			}
 				$async->check_run('fallback');
 			}
 			$this->db->disconnect();

Spacing +77 added lines, -77 removed lines

@@ -44,7 +44,7 @@ 
 	 * @var	string
 	 * @access	public
 	 */
-	var $debug = 0;		// This will turn on debugging information.
+	var $debug = 0; // This will turn on debugging information.
 	/**
 	 * Instance of the account object
 	 *
@@ -58,10 +58,10 @@ 
 	 * @author RalfBecker@outdoor-training.de
 	 * @param array $domain_names array with valid egw-domain names
 	 */
-	function __construct($domain_names=null)
+	function __construct($domain_names = null)
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
-		$this->setup($domain_names,True);
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
+		$this->setup($domain_names, True);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 * @param array|null $domain_names =null array with valid egw-domain names
 	 * @param boolean $createsessionobject True to create the session object (default=True)
 	 */
-	function setup($domain_names,$createsessionobject=True)
+	function setup($domain_names, $createsessionobject = True)
 	{
 		// create the DB-object
 		// as SiteMgr, Wiki, KnowledgeBase and probably more still use eg next_record(), we stick with Db\Deprecated for now
@@ -85,18 +85,18 @@ 
 		// check if eGW is already setup, if not redirect to setup/
 		try {
 			$this->db->connect();
-			$num_config = $this->db->select(Config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+			$num_config = $this->db->select(Config::TABLE, 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 		}
-		catch(Db\Exception\Connection $e) {
+		catch (Db\Exception\Connection $e) {
 			// ignore exception, get handled below
 		}
-		catch(Db\Exception\InvalidSql $e1) {
-			unset($e1);	// not used
+		catch (Db\Exception\InvalidSql $e1) {
+			unset($e1); // not used
 			try {
-				$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
+				$phpgw_config = $this->db->select('phpgw_config', 'COUNT(config_name)', false, __LINE__, __FILE__)->fetchColumn();
 			}
 			catch (Db\Exception\InvalidSql $e2) {
-				unset($e2);	// not used
+				unset($e2); // not used
 				// ignor error, get handled below
 			}
 		}
@@ -105,20 +105,20 @@ 
 			// we check for the old table too, to not scare updating users ;-)
 			if ($phpgw_config)
 			{
-				throw new Exception('You need to update EGroupware before you can continue using it.',999);
+				throw new Exception('You need to update EGroupware before you can continue using it.', 999);
 			}
 			if ($e)
 			{
 				throw new Db\Exception\Setup('Connection with '.$e->getMessage()."\n\n".
-					'Maybe you not created a database for EGroupware yet.',999);
+					'Maybe you not created a database for EGroupware yet.', 999);
 			}
-			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.',999);
+			throw new Db\Exception\Setup('It appears that you have not created the database tables for EGroupware.', 999);
 		}
 		// Set the DB's client charset if a system-charset is set and some other values needed by egw_cache (used in Config::read)
-			foreach($this->db->select(Config::TABLE,'config_name,config_value',array(
+			foreach ($this->db->select(Config::TABLE, 'config_name,config_value', array(
 			'config_app'  => 'phpgwapi',
-			'config_name' => array('system_charset','install_id','temp_dir'),
-		),__LINE__,__FILE__) as $row)
+			'config_name' => array('system_charset', 'install_id', 'temp_dir'),
+		), __LINE__, __FILE__) as $row)
 		{
 			$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
 		}
@@ -152,10 +152,10 @@ 
 			try
 			{
 				$tz = new \DateTimeZone(date_default_timezone_get());
-				Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(),'phpgwapi');
+				Config::save_value('server_timezone', $GLOBALS['egw_info']['server']['server_timezone'] = $tz->getName(), 'phpgwapi');
 				error_log(__METHOD__."() stored server_timezone=".$GLOBALS['egw_info']['server']['server_timezone']);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				// do nothing if new DateTimeZone fails (eg. 'System/Localtime' returned), specially do NOT store it!
 				error_log(__METHOD__."() NO valid 'date.timezone' set in your php.ini!");
@@ -166,24 +166,24 @@ 
 		// if phpgwapi exists we prefer accounts and egw_session, as they have some deprecated methods
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
-			$this->accounts       = new egw_accounts();
+			$this->accounts = new egw_accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new egw_session($domain_names);
+				$this->session = new egw_session($domain_names);
 			}
 		}
 		else
 		{
-			$this->accounts       = new Accounts();
+			$this->accounts = new Accounts();
 			/* Do not create the session object if called by the sessions class.  This way
 			 * we ensure the correct db based on the user domain.
 			 */
-			if($createsessionobject)
+			if ($createsessionobject)
 			{
-				$this->session    = new Session($domain_names);
+				$this->session = new Session($domain_names);
 			}
 		}
 		// setup the other subclasses
@@ -194,7 +194,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'login' && $GLOBALS['egw_info']['flags']['currentapp'] != 'logout')
 		{
 			$this->verify_session();
-			$this->applications->read_installed_apps();	// to get translated app-titles, has to be after verify_session
+			$this->applications->read_installed_apps(); // to get translated app-titles, has to be after verify_session
 
 			$this->define_egw_constants();
 
@@ -215,9 +215,9 @@ 
 	 */
 	function __wakeup()
 	{
-		$GLOBALS['egw'] =& $this;	// we need to be immediately available there for the other classes we instantiate
+		$GLOBALS['egw'] = & $this; // we need to be immediately available there for the other classes we instantiate
 		// for the migration: reference us to the old phpgw object
-		$GLOBALS['phpgw'] =& $this;
+		$GLOBALS['phpgw'] = & $this;
 
 		if ($GLOBALS['egw_info']['server']['system_charset'])
 		{
@@ -279,15 +279,15 @@ 
 		if (defined('EGW_APP_INC'))
 		{
 			// Load the (depricated) app include files if they exists
-			if (EGW_APP_INC != "" && ! preg_match ('/phpgwapi/i', EGW_APP_INC) &&
-				file_exists(EGW_APP_INC . '/functions.inc.php') && !isset($_GET['menuaction']))
+			if (EGW_APP_INC != "" && !preg_match('/phpgwapi/i', EGW_APP_INC) &&
+				file_exists(EGW_APP_INC.'/functions.inc.php') && !isset($_GET['menuaction']))
 			{
-				include(EGW_APP_INC . '/functions.inc.php');
+				include(EGW_APP_INC.'/functions.inc.php');
 			}
 			if (!@$GLOBALS['egw_info']['flags']['noheader'] && !@$GLOBALS['egw_info']['flags']['noappheader'] &&
-				file_exists(EGW_APP_INC . '/header.inc.php') && !isset($_GET['menuaction']))
+				file_exists(EGW_APP_INC.'/header.inc.php') && !isset($_GET['menuaction']))
 			{
-				include(EGW_APP_INC . '/header.inc.php');
+				include(EGW_APP_INC.'/header.inc.php');
 			}
 		}
 	}
@@ -304,9 +304,9 @@ 
 	 */
 	function verify_session()
 	{
-		if($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
+		if ($GLOBALS['egw_info']['server']['enforce_ssl'] === 'redirect' && !$_SERVER['HTTPS'])
 		{
-			Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+			Header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 			exit;
 		}
 		// check if we have a session, if not try to automatic create one
@@ -314,7 +314,7 @@ 
 
 		$account = null;
 		if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
-			($sessionid = call_user_func_array($account_callback,array(&$account))) === true)	// $account_call_back returns true, false or a session-id
+			($sessionid = call_user_func_array($account_callback, array(&$account))) === true)	// $account_call_back returns true, false or a session-id
 		{
 			$sessionid = $this->session->create($account);
 		}
@@ -323,15 +323,15 @@ 
 			//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
 			// we forward to the same place after the re-login
 			if ($GLOBALS['egw_info']['server']['webserver_url'] && $GLOBALS['egw_info']['server']['webserver_url'] != '/' &&
-				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)) && $webserver_path != '/')
+				($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'], PHP_URL_PATH)) && $webserver_path != '/')
 			{
 				// we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware
-				list(,$relpath) = explode($webserver_path,parse_url($_SERVER['PHP_SELF'],PHP_URL_PATH),2);
+				list(,$relpath) = explode($webserver_path, parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH), 2);
 			}
 			else	// the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
 			{
 				$matches = null;
-				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/',$relpath=$_SERVER['PHP_SELF'],$matches))
+				if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/', $relpath = $_SERVER['PHP_SELF'], $matches))
 				{
 					$relpath = $matches[1];
 				}
@@ -343,7 +343,7 @@ 
 			header('Pragma: no-cache');
 
 			// this removes the sessiondata if its saved in the URL
-			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/','',$_SERVER['QUERY_STRING']);
+			$query = preg_replace('/[&]?sessionid(=|%3D)[^&]+&kp3(=|%3D)[^&]+&domain=.*$/', '', $_SERVER['QUERY_STRING']);
 			if ($GLOBALS['egw_info']['server']['http_auth_types'])
 			{
 				$redirect = '/api/ntlm/index.php?';
@@ -370,9 +370,9 @@ 
 	 */
 	function check_app_rights()
 	{
-		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp'];	// some apps change it later
+		$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp']; // some apps change it later
 
-		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api','about')))	// give everyone implicit api rights
+		if (!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('api', 'about')))	// give everyone implicit api rights
 		{
 			// This will need to use ACL in the future
 			if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||
@@ -402,25 +402,25 @@ 
 	 */
 	function define_egw_constants()
 	{
-		define('EGW_ACL_READ',1);
-		define('EGW_ACL_ADD',2);
-		define('EGW_ACL_EDIT',4);
-		define('EGW_ACL_DELETE',8);
-		define('EGW_ACL_PRIVATE',16);
-		define('EGW_ACL_GROUP_MANAGERS',32);
-		define('EGW_ACL_CUSTOM_1',64);
-		define('EGW_ACL_CUSTOM_2',128);
-		define('EGW_ACL_CUSTOM_3',256);
+		define('EGW_ACL_READ', 1);
+		define('EGW_ACL_ADD', 2);
+		define('EGW_ACL_EDIT', 4);
+		define('EGW_ACL_DELETE', 8);
+		define('EGW_ACL_PRIVATE', 16);
+		define('EGW_ACL_GROUP_MANAGERS', 32);
+		define('EGW_ACL_CUSTOM_1', 64);
+		define('EGW_ACL_CUSTOM_2', 128);
+		define('EGW_ACL_CUSTOM_3', 256);
 		// and the old ones
-		define('PHPGW_ACL_READ',1);
-		define('PHPGW_ACL_ADD',2);
-		define('PHPGW_ACL_EDIT',4);
-		define('PHPGW_ACL_DELETE',8);
-		define('PHPGW_ACL_PRIVATE',16);
-		define('PHPGW_ACL_GROUP_MANAGERS',32);
-		define('PHPGW_ACL_CUSTOM_1',64);
-		define('PHPGW_ACL_CUSTOM_2',128);
-		define('PHPGW_ACL_CUSTOM_3',256);
+		define('PHPGW_ACL_READ', 1);
+		define('PHPGW_ACL_ADD', 2);
+		define('PHPGW_ACL_EDIT', 4);
+		define('PHPGW_ACL_DELETE', 8);
+		define('PHPGW_ACL_PRIVATE', 16);
+		define('PHPGW_ACL_GROUP_MANAGERS', 32);
+		define('PHPGW_ACL_CUSTOM_1', 64);
+		define('PHPGW_ACL_CUSTOM_2', 128);
+		define('PHPGW_ACL_CUSTOM_3', 256);
 		// A few hacker resistant constants that will be used throught the program
 		if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
 		{
@@ -439,14 +439,14 @@ 
 			define('EGW_IMAGES', common::get_image_path());
 			define('EGW_APP_IMAGES_DIR', common::get_image_dir());
 			// and the old ones
-			define('PHPGW_TEMPLATE_DIR',EGW_TEMPLATE_DIR);
-			define('PHPGW_IMAGES_DIR',EGW_IMAGES_DIR);
-			define('PHPGW_IMAGES_FILEDIR',EGW_IMAGES_FILEDIR);
-			define('PHPGW_APP_ROOT',EGW_APP_ROOT);
-			define('PHPGW_APP_INC',EGW_APP_INC);
-			define('PHPGW_APP_TPL',EGW_APP_TPL);
-			define('PHPGW_IMAGES',EGW_IMAGES);
-			define('PHPGW_APP_IMAGES_DIR',EGW_APP_IMAGES_DIR);
+			define('PHPGW_TEMPLATE_DIR', EGW_TEMPLATE_DIR);
+			define('PHPGW_IMAGES_DIR', EGW_IMAGES_DIR);
+			define('PHPGW_IMAGES_FILEDIR', EGW_IMAGES_FILEDIR);
+			define('PHPGW_APP_ROOT', EGW_APP_ROOT);
+			define('PHPGW_APP_INC', EGW_APP_INC);
+			define('PHPGW_APP_TPL', EGW_APP_TPL);
+			define('PHPGW_IMAGES', EGW_IMAGES);
+			define('PHPGW_APP_IMAGES_DIR', EGW_APP_IMAGES_DIR);
 		}
 	}
 
@@ -485,7 +485,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->link($url, $extravars, $link_app);
 	}
@@ -498,7 +498,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		return $GLOBALS['egw']->framework->redirect_link($url, $extravars, $link_app);
 	}
@@ -511,7 +511,7 @@ 
 	 * @param string $url url to redirect to
 	 * @param string $link_app =null appname to redirect for, default currentapp
 	 */
-	static function redirect($url, $link_app=null)
+	static function redirect($url, $link_app = null)
 	{
 		Framework::redirect($url, $link_app);
 	}
@@ -525,14 +525,14 @@ 
 	 * @param  string	The key for the phrase
 	 * @see	Translation::translate()
 	 */
-	static function lang($key,$args=null)
+	static function lang($key, $args = null)
 	{
 		if (!is_array($args))
 		{
 			$args = func_get_args();
 			array_shift($args);
 		}
-		return Translation::translate($key,$args);
+		return Translation::translate($key, $args);
 	}
 
 	/**
@@ -551,7 +551,7 @@ 
 	 * @param callable $callback use array($classname, $method) for static methods
 	 * @param array $args =array()
 	 */
-	public static function on_shutdown($callback, array $args=array())
+	public static function on_shutdown($callback, array $args = array())
 	{
 		array_unshift($args, $callback);
 
@@ -566,7 +566,7 @@ 
 	{
 		if (!defined('EGW_SHUTDOWN'))
 		{
-			define('EGW_SHUTDOWN',True);
+			define('EGW_SHUTDOWN', True);
 
 			// send json response BEFORE flushing output
 			if (Json\Request::isJSONRequest())
@@ -575,7 +575,7 @@ 
 			}
 
 			// run all on_shutdown callbacks with session in their name (eg. egw_link::save_session_cache), do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $n => $data)
+			foreach (self::$shutdown_callbacks as $n => $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));
@@ -606,7 +606,7 @@ 
 			}
 
 			// run all on_shutdown, do NOT stop on exceptions
-			foreach(self::$shutdown_callbacks as $data)
+			foreach (self::$shutdown_callbacks as $data)
 			{
 				try {
 					//error_log(__METHOD__."() running ".array2string($data));

api/src/Contacts.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1500,7 +1500,7 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with id - title pairs of the matching entries
 	 */
-	function link_query($pattern, Array &$options = array())
+	function link_query($pattern, array &$options = array())
 	{
 		$result = $criteria = array();
 		$limit = false;
@@ -1553,7 +1553,7 @@ 
 	 * @param array $options
 	 * @return Ambigous <multitype:, string, multitype:Ambigous <multitype:, string> string >
 	 */
-	function link_query_email($pattern, Array &$options = array())
+	function link_query_email($pattern, array &$options = array())
 	{
 		if (isset($options['filter']) && !is_array($options['filter']))
 		{

Indentation +30 added lines, -30 removed lines

@@ -152,19 +152,19 @@ 
 	var $categories;
 
 	/**
-	* Tracking changes
-	*
-	* @var Contacts\Tracking
-	*/
+	 * Tracking changes
+	 *
+	 * @var Contacts\Tracking
+	 */
 	protected $tracking;
 
 	/**
-	* Keep deleted addresses, or really delete them
-	* Set in Admin -> Addressbook -> Site Configuration
-	* ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
- 	*
-	* @var string
- 	*/
+	 * Keep deleted addresses, or really delete them
+	 * Set in Admin -> Addressbook -> Site Configuration
+	 * ''=really delete, 'history'=keep, only admins delete, 'userpurge'=keep, users delete
+	 *
+	 * @var string
+	 */
 	protected $delete_history = '';
 
 	/**
@@ -797,13 +797,13 @@ 
 	}
 
 	/**
-	* deletes contact in db
-	*
-	* @param mixed &$contact contact array with key id or (array of) id(s)
-	* @param boolean $deny_account_delete =true if true never allow to delete accounts
-	* @param int $check_etag =null
-	* @return boolean|int true on success or false on failiure, 0 if etag does not match
-	*/
+	 * deletes contact in db
+	 *
+	 * @param mixed &$contact contact array with key id or (array of) id(s)
+	 * @param boolean $deny_account_delete =true if true never allow to delete accounts
+	 * @param int $check_etag =null
+	 * @return boolean|int true on success or false on failiure, 0 if etag does not match
+	 */
 	function delete($contact,$deny_account_delete=true,$check_etag=null)
 	{
 		if (is_array($contact) && isset($contact['id']))
@@ -855,13 +855,13 @@ 
 	}
 
 	/**
-	* saves contact to db
-	*
-	* @param array &$contact contact array from etemplate::exec
-	* @param boolean $ignore_acl =false should the acl be checked or not
-	* @param boolean $touch_modified =true should modified/r be updated
-	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
-	*/
+	 * saves contact to db
+	 *
+	 * @param array &$contact contact array from etemplate::exec
+	 * @param boolean $ignore_acl =false should the acl be checked or not
+	 * @param boolean $touch_modified =true should modified/r be updated
+	 * @return int/string/boolean id on success, false on failure, the error-message is in $this->error
+	 */
 	function save(&$contact, $ignore_acl=false, $touch_modified=true)
 	{
 		// Make sure photo remains unchanged unless its purposely set to be false
@@ -1110,12 +1110,12 @@ 
 	}
 
 	/**
-	* reads contacts matched by key and puts all cols in the data array
-	*
-	* @param int|string $contact_id
-	* @param boolean $ignore_acl =false true: no acl check
-	* @return array|boolean array with contact data, null if not found or false on no view perms
-	*/
+	 * reads contacts matched by key and puts all cols in the data array
+	 *
+	 * @param int|string $contact_id
+	 * @param boolean $ignore_acl =false true: no acl check
+	 * @return array|boolean array with contact data, null if not found or false on no view perms
+	 */
 	function read($contact_id, $ignore_acl=false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl

Doc Comments +8 added lines, -6 removed lines

@@ -495,7 +495,6 @@ 
 	/**
 	 * get selectbox options for the customfields
 	 *
-	 * @param array $field =null
 	 * @return array with options:
 	 */
 	public static function cf_options()
@@ -547,7 +546,7 @@ 
 	 * @param string $fileas_type '' or type of $this->fileas_types
 	 * @param int $all =false update all contacts or only ones with empty values
 	 * @param int &$errors=null on return number of errors
-	 * @return int|boolean number of contacts updated, false for wrong fileas type
+	 * @return string|null number of contacts updated, false for wrong fileas type
 	 */
 	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
 	{
@@ -608,7 +607,7 @@ 
 	 * remove unneeded carriage returns or set empty fields to NULL
 	 *
 	 * @param int &$errors=null on return number of errors
-	 * @return int|boolean number of contacts updated
+	 * @return string|null number of contacts updated
 	 */
 	function set_all_cleanup(&$errors=null,$ignore_acl=false)
 	{
@@ -1066,7 +1065,7 @@ 
 	 * Since birthdays are cached for the instance for BIRTHDAY_CACHE_TIME, we
 	 * need to clear them if a birthday changes.
 	 *
-	 * @param type $year
+	 * @param integer $year
 	 */
 	protected function clear_birthday_cache($year, $owner)
 	{
@@ -1178,7 +1177,7 @@ 
 	 * @param mixed $contact contact as array or the contact-id
 	 * @param boolean $deny_account_delete =false if true never allow to delete accounts
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
@@ -1239,7 +1238,7 @@ 
 	 * @param int $check Acl::READ for read and Acl::EDIT for write or delete access
 	 * @param string $rel_path =null currently not used in InfoLog
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if access is granted or false otherwise
+	 * @return null|boolean true if access is granted or false otherwise
 	 */
 	function file_access($id,$check,$rel_path=null,$user=null)
 	{
@@ -2251,6 +2250,9 @@ 
 		return $cat_id_list;
 	}
 
+	/**
+	 * @param string $cat_id_list
+	 */
 	function get_categories($cat_id_list)
 	{
 		if (!is_object($this->categories))

Braces +251 added lines, -66 removed lines

@@ -301,7 +301,10 @@ 
 		);
 		//_debug_array($this->contact_fields);
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
-		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		if (!is_array($this->own_account_acl))
+		{
+			$this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
+		}
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
 		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
 		{
@@ -310,7 +313,10 @@ 
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
 			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
-			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
+			if (!is_array($this->org_fields))
+			{
+				$this->org_fields = unserialize($this->org_fields);
+			}
 
 			// Set country code if country name is selected
 			$supported_fields = $this->get_fields('supported',null,0);
@@ -367,7 +373,10 @@ 
 		}
 
 		$addressbooks = $to_sort = array();
-		if ($extra_label) $addressbooks[''] = $extra_label;
+		if ($extra_label)
+		{
+			$addressbooks[''] = $extra_label;
+		}
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
 		foreach($grants as $uid => $rights)
@@ -421,10 +430,19 @@ 
 	 */
 	function fileas($contact,$type=null, $isUpdate=false)
 	{
-		if (is_null($type)) $type = $contact['fileas_type'];
-		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		if (is_null($type))
+		{
+			$type = $contact['fileas_type'];
+		}
+		if (!$type)
+		{
+			$type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
+		}
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type,'n_fn') !== false)
+		{
+			$contact['n_fn'] = $this->fullname($contact);
+		}
 
 		if($isUpdate)
 		{
@@ -434,7 +452,10 @@ 
 			{
 				if(!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if(is_null($old))
+					{
+						$old = $this->read($contact['id']);
+					}
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -477,7 +498,10 @@ 
 	 */
 	function fileas_type($contact,$file_as=null)
 	{
-		if (is_null($file_as)) $file_as = $contact['n_fileas'];
+		if (is_null($file_as))
+		{
+			$file_as = $contact['n_fileas'];
+		}
 
 		if ($file_as)
 		{
@@ -530,7 +554,10 @@ 
 		);
 		foreach(array_keys($labels) as $name)
 		{
-			if ($contact[$name]) $labels[$name] = $contact[$name];
+			if ($contact[$name])
+			{
+				$labels[$name] = $contact[$name];
+			}
 		}
 		foreach($this->fileas_types as $fileas_type)
 		{
@@ -643,7 +670,11 @@ 
 				$fields_to_update = array();
 				foreach($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if($fields_exclude[$field_name] === true)
+					{
+						continue;
+					}
+					// dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -702,15 +733,21 @@ 
 	 */
 	function fullname($contact)
 	{
-		if (empty($contact['n_family']) && empty($contact['n_given'])) {
+		if (empty($contact['n_family']) && empty($contact['n_given']))
+		{
 			$cpart = array('org_name');
-		} else {
+		}
+		else
+		{
 			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
 		}
 		$parts = array();
 		foreach($cpart as $n)
 		{
-			if ($contact[$n]) $parts[] = $contact[$n];
+			if ($contact[$n])
+			{
+				$parts[] = $contact[$n];
+			}
 		}
 		return implode(' ',$parts);
 	}
@@ -821,7 +858,10 @@ 
 			$ok = false;
 			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
 			{
-				if (!($old = $this->read($id))) return false;
+				if (!($old = $this->read($id)))
+				{
+					return false;
+				}
 				// check if we only mark contacts as deleted, or really delete them
 				// already marked as deleted item and accounts are always really deleted
 				// we cant mark accounts as deleted, as no such thing exists for accounts!
@@ -829,8 +869,15 @@ 
 				{
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
-					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
+					if ($check_etag)
+					{
+						$delete['etag'] = $check_etag;
+					}
+					if (($ok = $this->save($delete)))
+					{
+						$ok = true;
+					}
+					// we have to return true or false
 					Link::unlink(0,'addressbook',$id,'','','',true);
 				}
 				elseif (($ok = parent::delete($id,$check_etag)))
@@ -841,7 +888,10 @@ 
 				// Don't notify of final purge
 				if ($ok && $old['tid'] != self::DELETED_TYPE)
 				{
-					if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+					if (!isset($this->tracking))
+					{
+						$this->tracking = new Contacts\Tracking($this);
+					}
 					$this->tracking->track(array('id' => $id), array('id' => $id), null, true);
 				}
 			}
@@ -866,18 +916,24 @@ 
 	{
 		// Make sure photo remains unchanged unless its purposely set to be false
 		// which means photo has changed.
-		if (!array_key_exists('photo_unchanged',$contact)) $contact['photo_unchanged'] = true;
+		if (!array_key_exists('photo_unchanged',$contact))
+		{
+			$contact['photo_unchanged'] = true;
+		}
 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
 		{
-			if (!isset($contact['owner']) || !isset($contact['private']))	// owner/private not set on update, eg. SyncML
+			if (!isset($contact['owner']) || !isset($contact['private']))
+			{
+				// owner/private not set on update, eg. SyncML
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
 					if(!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
+			}
 					}
 					if(!isset($contact['private']))
 					{
@@ -893,18 +949,33 @@ 
 		else
 		{
 			// if no owner/addressbook set use the setting of the add_default prefs (if set, otherwise the users personal addressbook)
-			if (!isset($contact['owner'])) $contact['owner'] = $this->default_addressbook;
-			if (!isset($contact['private'])) $contact['private'] = (int)$this->default_private;
+			if (!isset($contact['owner']))
+			{
+				$contact['owner'] = $this->default_addressbook;
+			}
+			if (!isset($contact['private']))
+			{
+				$contact['private'] = (int)$this->default_private;
+			}
 			// do NOT allow to create new accounts via addressbook, they are broken without an account_id
 			if (!$contact['owner'] && empty($contact['account_id']))
 			{
 				$contact['owner'] = $this->default_addressbook ? $this->default_addressbook : $this->user;
 			}
 			// allow admins to import contacts with creator / created date set
-			if (!$contact['creator'] || !$ignore_acl && !$this->is_admin($contact)) $contact['creator'] = $this->user;
-			if (!$contact['created'] || !$ignore_acl && !$this->is_admin($contact)) $contact['created'] = $this->now_su;
+			if (!$contact['creator'] || !$ignore_acl && !$this->is_admin($contact))
+			{
+				$contact['creator'] = $this->user;
+			}
+			if (!$contact['created'] || !$ignore_acl && !$this->is_admin($contact))
+			{
+				$contact['created'] = $this->now_su;
+			}
 
-			if (!$contact['tid']) $contact['tid'] = 'n';
+			if (!$contact['tid'])
+			{
+				$contact['tid'] = 'n';
+			}
 		}
 		// ensure accounts and group addressbooks are never private!
 		if ($contact['owner'] <= 0)
@@ -928,7 +999,8 @@ 
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+		foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+		{
 			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
@@ -958,7 +1030,10 @@ 
 		{
 			$contact['n_fn'] = $this->fullname($contact);
 		}
-		if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact, null, false);
+		if (isset($contact['org_name']))
+		{
+			$contact['n_fileas'] = $this->fileas($contact, null, false);
+		}
 
 		// Get old record for tracking changes
 		if (!isset($old) && $isUpdate)
@@ -1045,7 +1120,10 @@ 
 			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
-				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
+				if (!isset($this->tracking))
+				{
+					$this->tracking = new Contacts\Tracking($this);
+				}
 				$this->tracking->track($to_write, $old ? $old : null, null, $deleted);
 			}
 
@@ -1153,10 +1231,12 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if($data['adr_one_countrycode'] != null)
+			{
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if($data['adr_two_countrycode'] != null)
+			{
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1182,7 +1262,10 @@ 
 	 */
 	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1256,8 +1339,14 @@ 
 	 */
 	function read_org($org_id)
 	{
-		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (!$org_id)
+		{
+			return false;
+		}
+		if (strpos($org_id,'*AND*')!== false)
+		{
+			$org_id = str_replace('*AND*','&',$org_id);
+		}
 		$org = array();
 		foreach(explode('|||',$org_id) as $part)
 		{
@@ -1287,7 +1376,10 @@ 
 		}
 		// read the regular fields
 		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
-		if (!$contacts) return false;
+		if (!$contacts)
+		{
+			return false;
+		}
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
@@ -1335,7 +1427,10 @@ 
 		}
 		foreach($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name,$this->org_fields))
+			{
+				continue;
+			}
 
 			arsort($values,SORT_NUMERIC);
 			list($value,$num) = each($values);
@@ -1405,16 +1500,25 @@ 
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
 		{
-			if (!empty($from[$code])) $from[$name] = '';
-			if (!empty($to[$code])) $to[$name] = '';
+			if (!empty($from[$code]))
+			{
+				$from[$name] = '';
+			}
+			if (!empty($to[$code]))
+			{
+				$to[$name] = '';
+			}
 		}
 		$changed = array();
 		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name,array('modified','modifier')))
+			{
+				// never count these
 			{
 				continue;
 			}
+			}
 			if ((string) $from[$name] != (string) $to[$name])
 			{
 				$changed[$name] = $from[$name];
@@ -1434,13 +1538,19 @@ 
 	 */
 	function change_org($org_name,$from,$to,$members=null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from,$to,true)))
+		{
+			return false;
+		}
 
 		if (is_null($members) || !is_array($members))
 		{
 			$members = $this->org_similar($org_name,$changed);
 		}
-		if (!$members) return false;
+		if (!$members)
+		{
+			return false;
+		}
 
 		$ids = array();
 		foreach($members as $member)
@@ -1505,7 +1615,10 @@ 
 		$type = $this->prefs['link_title'];
 		if (!$type || $type === 'n_fileas')
 		{
-			if ($contact['n_fileas']) return $contact['n_fileas'];
+			if ($contact['n_fileas'])
+			{
+				return $contact['n_fileas'];
+			}
 			$type = null;
 		}
 		$title =  $this->fileas($contact,$type);
@@ -1581,7 +1694,10 @@ 
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1') $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1')
+		{
+			$filter['account_id'] = null;
+		}
 		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
 		{
 			$ids = array();
@@ -1644,12 +1760,18 @@ 
 	 */
 	function calendar_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach(!is_array($ids) ? array($ids) : $ids as $id)
 		{
-			if (!($contact = $this->read($id))) continue;
+			if (!($contact = $this->read($id)))
+			{
+				continue;
+			}
 
 			$data[] = array(
 				'res_id' => $id,
@@ -1671,7 +1793,10 @@ 
 	 */
 	function read_calendar($uids,$extra_title=true)
 	{
-		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
+		if (!$GLOBALS['egw_info']['user']['apps']['calendar'])
+		{
+			return array();
+		}
 
 		$split_uids = array();
 		$events = array();
@@ -1727,7 +1852,10 @@ 
 
 		$contacts =& $this->db->query($sql, __LINE__, __FILE__);
 
-		if (!$contacts) return array();
+		if (!$contacts)
+		{
+			return array();
+		}
 
 		// Extract the event info and generate what is needed for next/last event
 		$do_event = function($key, $contact) use (&$bocal, &$calendars, $type, $extra_title)
@@ -1887,27 +2015,36 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach(parent::search(array('id'=>$ids),false) as $contact)
+		{
+			// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
+		}
 					return false;	// we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
 			}
 			// Add in custom fields
-			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			if (is_array($custom_field_list[$contact['id']]))
+			{
+				$contact = array_merge($contact, $custom_field_list[$contact['id']]);
+			}
 
 			$pos = array_search($contact['id'],$ids);
 			$contacts[$pos] = $contact;
 		}
-		if (!is_null($account))	// we found an account, so we merge the contacts into it
+		if (!is_null($account))
+		{
+			// we found an account, so we merge the contacts into it
 		{
 			$target = $account;
+		}
 			unset($account);
 		}
 		else					// we found no account, so we merge all but the first into the first
@@ -1924,7 +2061,10 @@ 
 		{
 			foreach($contact as $name => $value)
 			{
-				if (!$value) continue;
+				if (!$value)
+				{
+					continue;
+				}
 
 				switch($name)
 				{
@@ -1936,20 +2076,31 @@ 
 						break;	// ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						if (!is_array($target['cat_id']))
+						{
+							$target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
+						}
 						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if($name[0] == '#')
+						{
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1)
+							{
+								if (!is_array($target[$name]))
+								{
+									$target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
+								}
 								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
 							}
 						}
-						if (!$target[$name]) $target[$name] = $value;
+						if (!$target[$name])
+						{
+							$target[$name] = $value;
+						}
 						break;
 				}
 			}
@@ -1961,7 +2112,10 @@ 
 				parent::add2list($target['id'], $list_id);
 			}
 		}
-		if (!$this->save($target)) return 0;
+		if (!$this->save($target))
+		{
+			return 0;
+		}
 
 		$success = 1;
 		foreach($contacts as $contact)
@@ -1994,7 +2148,10 @@ 
 			// Update calendar
 			$this->merge_calendar('c'.$contact['id'], $target['account_id'] ? 'u'.$target['account_id'] : 'c'.$target['id']);
 
-			if ($this->delete($contact['id'])) $success++;
+			if ($this->delete($contact['id']))
+			{
+				$success++;
+			}
 		}
 		return $success;
 	}
@@ -2063,11 +2220,17 @@ 
 	 */
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner))
+		{
+			return false;
+		}
 
 		try {
 			$ret = parent::add_list($keys,$owner,$contacts,$data);
-			if ($ret) unset(self::$list_cache[$ret]);
+			if ($ret)
+			{
+				unset(self::$list_cache[$ret]);
+			}
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
 		catch(Db\Exception\InvalidSql $e) {
@@ -2087,7 +2250,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		unset(self::$list_cache[$list]);
 
@@ -2103,7 +2269,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list,Acl::EDIT))
+		{
+			return false;
+		}
 
 		if ($list)
 		{
@@ -2127,7 +2296,10 @@ 
 	{
 		foreach((array)$list as $l)
 		{
-			if (!$this->check_list($l, Acl::DELETE)) return false;
+			if (!$this->check_list($l, Acl::DELETE))
+			{
+				return false;
+			}
 
 			unset(self::$list_cache[$l]);
 		}
@@ -2143,7 +2315,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (isset(self::$list_cache[$list])) return self::$list_cache[$list];
+		if (isset(self::$list_cache[$list]))
+		{
+			return self::$list_cache[$list];
+		}
 
 		return self::$list_cache[$list] = parent::read_list($list);
 	}
@@ -2398,7 +2573,10 @@ 
 
 		foreach ($columns_to_search as $field)
 		{
-			if ($relax && in_array($field, $tolerance_fields)) continue;
+			if ($relax && in_array($field, $tolerance_fields))
+			{
+				continue;
+			}
 
 			if (empty($contact[$field]))
 			{
@@ -2463,7 +2641,10 @@ 
 		}
 
 		// No need for more searches for relaxed matching
-		if ($relax || count($matchingContacts)) return $matchingContacts;
+		if ($relax || count($matchingContacts))
+		{
+			return $matchingContacts;
+		}
 
 
 		if (!$empty_addr_one && $empty_addr_two)
@@ -2516,7 +2697,8 @@ 
 			}
 		}
 		elseif (!$empty_addr_one && !$empty_addr_two)
-		{ // try again after address swap
+		{
+// try again after address swap
 
 			foreach ($addr_one_fields as $key => $field)
 			{
@@ -2563,7 +2745,10 @@ 
 	{
 		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
-		if (!is_null($owner)) $filter['owner'] = $owner;
+		if (!is_null($owner))
+		{
+			$filter['owner'] = $owner;
+		}
 
 		// should we hide the accounts addressbook
 		if (!$owner && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1')

Spacing +281 added lines, -282 removed lines

@@ -16,7 +16,7 @@ 
 
 namespace EGroupware\Api;
 
-use calendar_bo;	// to_do: do NOT require it, just use if there
+use calendar_bo; // to_do: do NOT require it, just use if there
 
 /**
  * Business object for contacts
@@ -38,7 +38,7 @@ 
 	/**
 	 * @var array $timestamps timestamps
 	 */
-	var $timestamps = array('modified','created');
+	var $timestamps = array('modified', 'created');
 
 	/**
 	 * @var array $fileas_types
@@ -173,32 +173,32 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Db $db=null)
+	function __construct($contact_app = 'addressbook', Db $db = null)
 	{
-		parent::__construct($contact_app,$db);
+		parent::__construct($contact_app, $db);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir'].'/log-addressbook_bo';
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3 ,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3, $this->logfile);
 		}
 
-		$this->now_su = DateTime::to('now','ts');
+		$this->now_su = DateTime::to('now', 'ts');
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
-		if(!isset($this->prefs['hide_accounts']))
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+		if (!isset($this->prefs['hide_accounts']))
 		{
 			$this->prefs['hide_accounts'] = '0';
 		}
 		// get the default addressbook from the users prefs
 		$this->default_addressbook = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] ?
 			(int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] : $this->user;
-		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],-1) == 'p';
+		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'], -1) == 'p';
 		if ($this->default_addressbook > 0 && $this->default_addressbook != $this->user &&
 			($this->default_private ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->forced['addressbook']['add_default'] ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->default['addressbook']['add_default']))
 		{
-			$this->default_addressbook = $this->user;	// admin set a default or forced pref for personal addressbook
+			$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
 		}
 		$this->private_addressbook = self::private_addressbook($this->contact_repository == 'sql', $this->prefs);
 
@@ -303,27 +303,27 @@ 
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
 		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
-		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
+		if ($this->own_account_acl && in_array('n_fn', $this->own_account_acl))
 		{
-			$this->own_account_acl = array_merge($this->own_account_acl,array('n_prefix','n_given','n_middle','n_family','n_suffix'));
+			$this->own_account_acl = array_merge($this->own_account_acl, array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix'));
 		}
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
-			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
+			$this->org_fields = $GLOBALS['egw_info']['server']['org_fileds_to_update'];
 			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
 
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$this->org_fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$this->org_fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_two_countrycode';
 			}
 		}
-		$this->categories = new Categories($this->user,'addressbook');
+		$this->categories = new Categories($this->user, 'addressbook');
 
 		$this->delete_history = $GLOBALS['egw_info']['server']['history'];
 	}
@@ -337,7 +337,7 @@ 
 	 * @param array $prefs addressbook preferences
 	 * @return boolean
 	 */
-	public static function private_addressbook($contact_repository, array $prefs=null)
+	public static function private_addressbook($contact_repository, array $prefs = null)
 	{
 		return $contact_repository == 'sql' && $prefs['private_addressbook'];
 	}
@@ -351,7 +351,7 @@ 
 	 * @param int $user =null account_id or null for current user
 	 * @return array with owner => label pairs
 	 */
-	function get_addressbooks($required=Acl::READ,$extra_label=null,$user=null)
+	function get_addressbooks($required = Acl::READ, $extra_label = null, $user = null)
 	{
 		if (is_null($user))
 		{
@@ -370,11 +370,11 @@ 
 		if ($extra_label) $addressbooks[''] = $extra_label;
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			if (($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 			{
-				$to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+				$to_sort[$uid] = lang('Group %1', $GLOBALS['egw']->accounts->id2name($uid));
 			}
 		}
 		if ($to_sort)
@@ -382,19 +382,19 @@ 
 			asort($to_sort);
 			$addressbooks += $to_sort;
 		}
-		if ($required != Acl::ADD &&	// do NOT allow to set accounts as default addressbook (AB can add accounts)
+		if ($required != Acl::ADD && // do NOT allow to set accounts as default addressbook (AB can add accounts)
 			$preferences['addressbook']['hide_accounts'] !== '1' && (
-				($grants[0] & $required) == $required ||
+				($grants[0]&$required) == $required ||
 				$preferences['common']['account_selection'] == 'groupmembers' &&
-				$this->account_repository != 'ldap' && ($required & Acl::READ)))
+				$this->account_repository != 'ldap' && ($required&Acl::READ)))
 		{
 			$addressbooks[0] = lang('Accounts');
 		}
 		// add all other user addressbooks the user has the necessary rights too
 		$to_sort = array();
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if ($uid != $user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			if ($uid != $user && ($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
 			{
 				$to_sort[$uid] = Accounts::username($uid);
 			}
@@ -419,22 +419,22 @@ 
 	 * @param boolean $isUpdate =false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null, $isUpdate=false)
+	function fileas($contact, $type = null, $isUpdate = false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type, 'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
-		if($isUpdate)
+		if ($isUpdate)
 		{
-			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
+			$fileas_fields = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix', 'n_fn', 'org_name', 'org_unit', 'adr_one_locality', 'bday');
 			$old = null;
-			foreach($fileas_fields as $field)
+			foreach ($fileas_fields as $field)
 			{
-				if(!isset($contact[$field]))
+				if (!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if (is_null($old)) $old = $this->read($contact['id']);
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -442,8 +442,8 @@ 
 		}
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
-			array(': ',': ',': ',', ',': ',''),
+		$fileas = str_replace(array(', , : ', ', : ', ': , ', ', , ', ': : ', ' ()'),
+			array(': ', ': ', ': ', ', ', ': ', ''),
 			strtr($type, array(
 				'n_prefix' => $contact['n_prefix'],
 				'n_given'  => $contact['n_given'],
@@ -457,13 +457,13 @@ 
 				'bday'     => (int)$contact['bday'] ? DateTime::to($contact['bday'], true) : $contact['bday'],
 			)));
 
-		while ($fileas[0] == ':' ||  $fileas[0] == ',')
+		while ($fileas[0] == ':' || $fileas[0] == ',')
 		{
-			$fileas = substr($fileas,2);
+			$fileas = substr($fileas, 2);
 		}
-		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ')
+		while (substr($fileas, -2) == ': ' || substr($fileas, -2) == ', ')
 		{
-			$fileas = substr($fileas,0,-2);
+			$fileas = substr($fileas, 0, -2);
 		}
 		return $fileas;
 	}
@@ -475,15 +475,15 @@ 
 	 * @param string $file_as =null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
-	function fileas_type($contact,$file_as=null)
+	function fileas_type($contact, $file_as = null)
 	{
 		if (is_null($file_as)) $file_as = $contact['n_fileas'];
 
 		if ($file_as)
 		{
-			foreach($this->fileas_types as $type)
+			foreach ($this->fileas_types as $type)
 			{
-				if ($this->fileas($contact,$type) == $file_as)
+				if ($this->fileas($contact, $type) == $file_as)
 				{
 					return $type;
 				}
@@ -500,10 +500,10 @@ 
 	 */
 	public static function cf_options()
 	{
-		$cf_fields = Storage\Customfields::get('addressbook',TRUE);
-		foreach ($cf_fields as $key => $value )
+		$cf_fields = Storage\Customfields::get('addressbook', TRUE);
+		foreach ($cf_fields as $key => $value)
 		{
-			$options[$key]= $value['label'];
+			$options[$key] = $value['label'];
 		}
 		return $options;
 	}
@@ -514,7 +514,7 @@ 
 	 * @param array $contact =null real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
-	function fileas_options($contact=null)
+	function fileas_options($contact = null)
 	{
 		$labels = array(
 			'n_prefix' => lang('prefix'),
@@ -528,13 +528,13 @@ 
 			'adr_one_locality' => lang('city'),
 			'bday'     => lang('Birthday'),
 		);
-		foreach(array_keys($labels) as $name)
+		foreach (array_keys($labels) as $name)
 		{
 			if ($contact[$name]) $labels[$name] = $contact[$name];
 		}
-		foreach($this->fileas_types as $fileas_type)
+		foreach ($this->fileas_types as $fileas_type)
 		{
-			$options[$fileas_type] = $this->fileas($labels,$fileas_type);
+			$options[$fileas_type] = $this->fileas($labels, $fileas_type);
 		}
 		return $options;
 	}
@@ -549,7 +549,7 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
-	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	function set_all_fileas($fileas_type, $all = false, &$errors = null, $ignore_acl = false)
 	{
 		if ($fileas_type != '' && !in_array($fileas_type, $this->fileas_types))
 		{
@@ -557,17 +557,17 @@ 
 		}
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+		for ($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
 			'n_fileas IS NULL',
 			"n_fileas=''",
 			'n_fn IS NULL',
 			"n_fn=''",
-		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$old_fn     = $contact['n_fn'];
 				$old_fileas = $contact['n_fileas'];
@@ -575,19 +575,19 @@ 
 				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
 				if ($fileas_type && ($all || empty($contact['n_fileas'])))
 				{
-					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+					$contact['n_fileas'] = $this->fileas($contact, $fileas_type);
 				}
 				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
 				{
 					// only specify/write updated fields plus "keys"
-					$contact = array_intersect_key($contact,array(
+					$contact = array_intersect_key($contact, array(
 						'id' => true,
 						'owner' => true,
 						'private' => true,
 						'account_id' => true,
 						'uid' => true,
-					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
-					if ($this->save($contact,$ignore_acl))
+					) + ($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array()) + ($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -610,11 +610,11 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated
 	 */
-	function set_all_cleanup(&$errors=null,$ignore_acl=false)
+	function set_all_cleanup(&$errors = null, $ignore_acl = false)
 	{
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 
 		// fields that must not be touched
@@ -636,14 +636,14 @@ 
 		);
 
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search(array(),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		for ($n = $updated = $errors = 0; ($contacts = parent::search(array(), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$fields_to_update = array();
-				foreach($contact as $field_name => $field_value)
+				foreach ($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if ($fields_exclude[$field_name] === true) continue; // dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -653,9 +653,9 @@ 
 							$fields_to_update[$field_name] = $field_value = trim($field_value);
 						}
 						// check if field contains a carriage return - exclude notes
-						if ($field_name != 'note' && strpos($field_value,"\x0D\x0A") !== false)
+						if ($field_name != 'note' && strpos($field_value, "\x0D\x0A") !== false)
 						{
-							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A"," ",$field_value);
+							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A", " ", $field_value);
 						}
 					}
 					// check if a field contains an empty string
@@ -665,13 +665,13 @@ 
 					}
 					// check for valid birthday date
 					if ($field_name == 'bday' && $field_value != null &&
-						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/',$field_value))
+						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $field_value))
 					{
 						$fields_to_update[$field_name] = $field_value = null;
 					}
 				}
 
-				if(count($fields_to_update) > 0)
+				if (count($fields_to_update) > 0)
 				{
 					$contact_to_save = array(
 						'id' => $contact['id'],
@@ -680,7 +680,7 @@ 
 						'account_id' => $contact['account_id'],
 						'uid' => $contact['uid']) + $fields_to_update;
 
-					if ($this->save($contact_to_save,$ignore_acl))
+					if ($this->save($contact_to_save, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -705,14 +705,14 @@ 
 		if (empty($contact['n_family']) && empty($contact['n_given'])) {
 			$cpart = array('org_name');
 		} else {
-			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+			$cpart = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix');
 		}
 		$parts = array();
-		foreach($cpart as $n)
+		foreach ($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
-		return implode(' ',$parts);
+		return implode(' ', $parts);
 	}
 
 	/**
@@ -726,7 +726,7 @@ 
 	 *
 	 * @return array updated data
 	 */
-	function db2data($data, $date_format='ts')
+	function db2data($data, $date_format = 'ts')
 	{
 		static $fb_url = false;
 
@@ -738,7 +738,7 @@ 
 				$data[$name] = DateTime::server2user($data[$name], $date_format);
 			}
 		}
-		$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'] || ($data['files'] & self::FILES_BIT_PHOTO), '', $data['etag']);
+		$data['photo'] = $this->photo_src($data['id'], $data['jpegphoto'] || ($data['files']&self::FILES_BIT_PHOTO), '', $data['etag']);
 
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@@ -761,13 +761,13 @@ 
 	 * @param string $etag =null etag to set in url to allow caching with Expires header
 	 * @return string/array
 	 */
-	function photo_src($id,$jpeg,$default='',$etag=null)
+	function photo_src($id, $jpeg, $default = '', $etag = null)
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg ? array(
 			'menuaction' => 'addressbook.addressbook_ui.photo',
 			'contact_id' => $id,
-		)+(isset($etag) ? array(
+		) + (isset($etag) ? array(
 			'etag'       => $etag,
 		) : array()) : $default;
 	}
@@ -783,7 +783,7 @@ 
 	 *
 	 * @return array upated data
 	 */
-	function data2db($data, $date_format='ts')
+	function data2db($data, $date_format = 'ts')
 	{
 		// convert timestamps from user-time to server-time in the db
 		foreach ($this->timestamps as $name)
@@ -804,7 +804,7 @@ 
 	* @param int $check_etag =null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$deny_account_delete=true,$check_etag=null)
+	function delete($contact, $deny_account_delete = true, $check_etag = null)
 	{
 		if (is_array($contact) && isset($contact['id']))
 		{
@@ -814,12 +814,12 @@ 
 		{
 			$contact = array($contact);
 		}
-		foreach($contact as $c)
+		foreach ($contact as $c)
 		{
 			$id = is_array($c) ? $c['id'] : $c;
 
 			$ok = false;
-			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
+			if ($this->check_perms(Acl::DELETE, $c, $deny_account_delete))
 			{
 				if (!($old = $this->read($id))) return false;
 				// check if we only mark contacts as deleted, or really delete them
@@ -830,12 +830,12 @@ 
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
 					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
-					Link::unlink(0,'addressbook',$id,'','','',true);
+					if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
+					Link::unlink(0, 'addressbook', $id, '', '', '', true);
 				}
-				elseif (($ok = parent::delete($id,$check_etag)))
+				elseif (($ok = parent::delete($id, $check_etag)))
 				{
-					Link::unlink(0,'addressbook',$id);
+					Link::unlink(0, 'addressbook', $id);
 				}
 
 				// Don't notify of final purge
@@ -862,11 +862,11 @@ 
 	* @param boolean $touch_modified =true should modified/r be updated
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
-	function save(&$contact, $ignore_acl=false, $touch_modified=true)
+	function save(&$contact, $ignore_acl = false, $touch_modified = true)
 	{
 		// Make sure photo remains unchanged unless its purposely set to be false
 		// which means photo has changed.
-		if (!array_key_exists('photo_unchanged',$contact)) $contact['photo_unchanged'] = true;
+		if (!array_key_exists('photo_unchanged', $contact)) $contact['photo_unchanged'] = true;
 
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
@@ -875,11 +875,11 @@ 
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
-					if(!isset($contact['owner']))
+					if (!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
 					}
-					if(!isset($contact['private']))
+					if (!isset($contact['private']))
 					{
 						$contact['private'] = $old['private'];
 					}
@@ -911,7 +911,7 @@ 
 		{
 			$contact['private'] = 0;
 		}
-		if(!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD,$contact))
+		if (!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD, $contact))
 		{
 			$this->error = 'access denied';
 			return false;
@@ -924,15 +924,15 @@ 
 		// convert categories
 		if (is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$contact['cat_id']);
+			$contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
+		foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+			if ($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
-				if(strlen($code) == 2)
+				if (strlen($code) == 2)
 				{
 					$contact[$c_prefix.'countrycode'] = $code;
 				}
@@ -941,7 +941,7 @@ 
 					$contact[$c_prefix.'countrycode'] = null;
 				}
 			}
-			if($contact[$c_prefix.'countrycode'] != null)
+			if ($contact[$c_prefix.'countrycode'] != null)
 			{
 				$contact[$c_prefix.'countryname'] = null;
 			}
@@ -969,9 +969,9 @@ 
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !($this->is_admin($contact) || $this->allow_account_edit()))
 		{
-			foreach(array_keys($contact) as $field)
+			foreach (array_keys($contact) as $field)
 			{
-				if (!in_array($field,$this->own_account_acl) && !in_array($field,array('id','owner','account_id','modified','modifier')))
+				if (!in_array($field, $this->own_account_acl) && !in_array($field, array('id', 'owner', 'account_id', 'modified', 'modifier')))
 				{
 					// user is not allowed to change that
 					if ($old)
@@ -992,12 +992,12 @@ 
 		{
 			if (isset($to_write['owner']) && !empty($to_write['owner']))
 			{
-				error_log(__METHOD__.__LINE__." Trying to change account to owner:". $to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
+				error_log(__METHOD__.__LINE__." Trying to change account to owner:".$to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
 				unset($to_write['owner']);
 			}
 		}
 
-		if(!($this->error = parent::save($to_write)))
+		if (!($this->error = parent::save($to_write)))
 		{
 			$contact['id'] = $to_write['id'];
 			$contact['uid'] = $to_write['uid'];
@@ -1006,9 +1006,9 @@ 
 
 			// Clear any files saved with new entries
 			// They've been dealt with already and they cause errors with linking
-			foreach(array_keys($this->customfields) as $field)
+			foreach (array_keys($this->customfields) as $field)
 			{
-				if(is_array($to_write[Storage::CF_PREFIX.$field]))
+				if (is_array($to_write[Storage::CF_PREFIX.$field]))
 				{
 					unset($to_write[Storage::CF_PREFIX.$field]);
 				}
@@ -1022,27 +1022,27 @@ 
 				$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
 				// call edit-accout hook, to let other apps know about changed account (names or email)
 				$GLOBALS['hook_values'] = (array)$GLOBALS['egw']->accounts->read($contact['account_id']);
-				Hooks::process($GLOBALS['hook_values']+array(
+				Hooks::process($GLOBALS['hook_values'] + array(
 					'location' => 'editaccount',
-				),False,True);	// called for every app now, not only enabled ones)
+				), False, True); // called for every app now, not only enabled ones)
 			}
 			// notify interested apps about changes in the account-contact data
 			if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
 			{
 				$to_write['location'] = 'editaccountcontact';
-				Hooks::process($to_write,False,True);	// called for every app now, not only enabled ones));
+				Hooks::process($to_write, False, True); // called for every app now, not only enabled ones));
 			}
 			// Notify linked apps about changes in the contact data
-			Link::notify_update('addressbook',  $contact['id'], $contact);
+			Link::notify_update('addressbook', $contact['id'], $contact);
 
 			// Check for restore of deleted contact, restore held links
-			if($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
+			if ($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
 			{
 				Link::restore('addressbook', $contact['id']);
 			}
 
 			// Record change history for sql - doesn't work for LDAP accounts
-			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
+			if (!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
 				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
@@ -1050,9 +1050,9 @@ 
 			}
 
 			// Expire birthday cache for this year and next if birthday changed
-			if($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
+			if ($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
 			{
-				$year = (int) date('Y',time());
+				$year = (int)date('Y', time());
 				$this->clear_birthday_cache($year, $to_write['owner']);
 				$year++;
 				$this->clear_birthday_cache($year, $to_write['owner']);
@@ -1071,9 +1071,9 @@ 
 	protected function clear_birthday_cache($year, $owner)
 	{
 		// Cache is kept per-language, so clear them all
-		foreach(array_keys(Translation::get_installed_langs()) as $lang)
+		foreach (array_keys(Translation::get_installed_langs()) as $lang)
 		{
-			Cache::unsetInstance(__CLASS__,"birthday-$year-{$owner}-$lang");
+			Cache::unsetInstance(__CLASS__, "birthday-$year-{$owner}-$lang");
 		}
 	}
 
@@ -1086,7 +1086,7 @@ 
 	 * @param int $dst_w =240 max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
-	public static function resize_photo($photo, $dst_w=240)
+	public static function resize_photo($photo, $dst_w = 240)
 	{
 		if (is_resource($photo))
 		{
@@ -1102,15 +1102,15 @@ 
 		//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
 
 		// if $photo is to width or not a jpeg image --> resize it
-		if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
+		if ($src_w > $dst_w || cut_bytes($photo, 0, 2) !== "\377\330")
 		{
 			//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
 			// scale the image to a width of 60 and a height according to the proportion of the source image
-			$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
-			imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
+			$resized = imagecreatetruecolor($dst_w, $dst_h = round($src_h * $dst_w / $src_w));
+			imagecopyresized($resized, $image, 0, 0, 0, 0, $dst_w, $dst_h, $src_w, $src_h);
 
 			ob_start();
-			imagejpeg($resized,null,90);
+			imagejpeg($resized, null, 90);
 			$photo = ob_get_contents();
 			ob_end_clean();
 
@@ -1131,7 +1131,7 @@ 
 	* @param boolean $ignore_acl =false true: no acl check
 	* @return array|boolean array with contact data, null if not found or false on no view perms
 	*/
-	function read($contact_id, $ignore_acl=false)
+	function read($contact_id, $ignore_acl = false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl
 		if ($ignore_acl && is_a($this->somain, __CLASS__.'\\Sql'))
@@ -1141,11 +1141,11 @@ 
 		}
 		if (!($data = parent::read($contact_id)))
 		{
-			$data = null;	// not found
+			$data = null; // not found
 		}
-		elseif (!$ignore_acl && !$this->check_perms(Acl::READ,$data))
+		elseif (!$ignore_acl && !$this->check_perms(Acl::READ, $data))
 		{
-			$data = false;	// no view perms
+			$data = false; // no view perms
 		}
 		else
 		{
@@ -1153,10 +1153,10 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if ($data['adr_one_countrycode'] != null) {
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if ($data['adr_two_countrycode'] != null) {
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1180,7 +1180,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
-	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
+	function check_perms($needed, $contact, $deny_account_delete = false, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1191,7 +1191,7 @@ 
 		else
 		{
 			$grants = $this->get_grants($user);
-			$memberships =  $GLOBALS['egw']->accounts->memberships($user,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		}
 
 		if ((!is_array($contact) || !isset($contact['owner'])) &&
@@ -1217,12 +1217,12 @@ 
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
-			$access = !!array_intersect($memberships,$GLOBALS['egw']->accounts->memberships($contact['account_id'],true));
+			$access = !!array_intersect($memberships, $GLOBALS['egw']->accounts->memberships($contact['account_id'], true));
 		}
 		else
 		{
-			$access = ($grants[$owner] & $needed) &&
-				(!$contact['private'] || ($grants[$owner] & Acl::PRIVAT) || in_array($owner,$memberships));
+			$access = ($grants[$owner]&$needed) &&
+				(!$contact['private'] || ($grants[$owner]&Acl::PRIVAT) || in_array($owner, $memberships));
 		}
 		//error_log(__METHOD__."($needed,$contact[id],$deny_account_delete,$user) returning ".array2string($access));
 		return $access;
@@ -1237,11 +1237,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,false,$user);
+		return $this->check_perms($check, $id, false, $user);
 	}
 
 	/**
@@ -1253,18 +1253,18 @@ 
 	function read_org($org_id)
 	{
 		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (strpos($org_id, '*AND*') !== false) $org_id = str_replace('*AND*', '&', $org_id);
 		$org = array();
-		foreach(explode('|||',$org_id) as $part)
+		foreach (explode('|||', $org_id) as $part)
 		{
-			list($name,$value) = explode(':',$part,2);
+			list($name, $value) = explode(':', $part, 2);
 			$org[$name] = $value;
 		}
-		$csvs = array('cat_id');	// fields with comma-separated-values
+		$csvs = array('cat_id'); // fields with comma-separated-values
 
 		// split regular fields and custom fields
 		$custom_fields = $regular_fields = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if ($name[0] != '#')
 			{
@@ -1272,9 +1272,9 @@ 
 			}
 			else
 			{
-				$custom_fields[] = $name = substr($name,1);
+				$custom_fields[] = $name = substr($name, 1);
 				$regular_fields['id'] = 'id';
-				if (substr($this->customfields[$name]['type'],0,6)=='select' && $this->customfields[$name]['rows'] ||	// multiselection
+				if (substr($this->customfields[$name]['type'], 0, 6) == 'select' && $this->customfields[$name]['rows'] || // multiselection
 					$this->customfields[$name]['type'] == 'radio')
 				{
 					$csvs[] = '#'.$name;
@@ -1282,24 +1282,24 @@ 
 			}
 		}
 		// read the regular fields
-		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
+		$contacts = parent::search('', $regular_fields, '', '', '', false, 'AND', false, $org);
 		if (!$contacts) return false;
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
-			if (($cfs = $this->read_customfields($ids,$custom_fields)))
+			if (($cfs = $this->read_customfields($ids, $custom_fields)))
 			{
 				foreach ($contacts as &$contact)
 				{
 					$id = $contact['id'];
 					if (isset($cfs[$id]))
 					{
-						foreach($cfs[$id] as $name => $value)
+						foreach ($cfs[$id] as $name => $value)
 						{
 							$contact['#'.$name] = $value;
 						}
@@ -1311,33 +1311,33 @@ 
 
 		// create a statistic about the commonness of each fields values
 		$fields = array();
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$fields[$name][$value]++;
 				}
 				else
 				{
 					// for comma separated fields, we have to use each single value
-					foreach(explode(',',$value) as $val)
+					foreach (explode(',', $value) as $val)
 					{
 						$fields[$name][$val]++;
 					}
 				}
 			}
 		}
-		foreach($fields as $name => $values)
+		foreach ($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name, $this->org_fields)) continue;
 
-			arsort($values,SORT_NUMERIC);
-			list($value,$num) = each($values);
-			if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+			arsort($values, SORT_NUMERIC);
+			list($value, $num) = each($values);
+			if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$org[$name] = $value;
 				}
@@ -1346,12 +1346,12 @@ 
 					$org[$name] = array();
 					foreach ($values as $value => $num)
 					{
-						if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+						if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 						{
 							$org[$name][] = $value;
 						}
 					}
-					$org[$name] = implode(',',$org[$name]);
+					$org[$name] = implode(',', $org[$name]);
 				}
 			}
 		}
@@ -1365,10 +1365,10 @@ 
 	 * @param array $fields field-name => value pairs
 	 * @return array with contacts
 	 */
-	function org_similar($org_name,$fields)
+	function org_similar($org_name, $fields)
 	{
 		$criteria = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if (isset($fields[$name]))
 			{
@@ -1382,7 +1382,7 @@ 
 				}
 			}
 		}
-		return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name));
+		return parent::search($criteria, false, 'n_family,n_given', '', '', false, 'OR', false, array('org_name'=>$org_name));
 	}
 
 	/**
@@ -1393,10 +1393,10 @@ 
 	 * @param boolean $only_org_fields =true check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
-	function changed_fields($from,$to,$only_org_fields=true)
+	function changed_fields($from, $to, $only_org_fields = true)
 	{
 		// we only care about countryname, if contrycode is empty
-		foreach(array(
+		foreach (array(
 			'adr_one_countryname' => 'adr_one_countrycode',
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
@@ -1405,13 +1405,13 @@ 
 			if (!empty($to[$code])) $to[$name] = '';
 		}
 		$changed = array();
-		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
+		foreach ($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name, array('modified', 'modifier')))	// never count these
 			{
 				continue;
 			}
-			if ((string) $from[$name] != (string) $to[$name])
+			if ((string)$from[$name] != (string)$to[$name])
 			{
 				$changed[$name] = $from[$name];
 			}
@@ -1428,35 +1428,35 @@ 
 	 * @param array $members =null org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
-	function change_org($org_name,$from,$to,$members=null)
+	function change_org($org_name, $from, $to, $members = null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from, $to, true))) return false;
 
 		if (is_null($members) || !is_array($members))
 		{
-			$members = $this->org_similar($org_name,$changed);
+			$members = $this->org_similar($org_name, $changed);
 		}
 		if (!$members) return false;
 
 		$ids = array();
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			$ids[] = $member['id'];
 		}
 		$customfields = $this->read_customfields($ids);
 
 		$changed_members = $changed_fields = $failed_members = 0;
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			if (isset($customfields[$member['id']]))
 			{
-				foreach(array_keys($this->customfields) as $name)
+				foreach (array_keys($this->customfields) as $name)
 				{
 					$member['#'.$name] = $customfields[$member['id']][$name];
 				}
 			}
 			$fields = 0;
-			foreach($changed as $name => $value)
+			foreach ($changed as $name => $value)
 			{
 				if ((string)$value == (string)$member[$name])
 				{
@@ -1466,7 +1466,7 @@ 
 			}
 			if ($fields)
 			{
-				if (!$this->check_perms(Acl::EDIT,$member) || !$this->save($member))
+				if (!$this->check_perms(Acl::EDIT, $member) || !$this->save($member))
 				{
 					++$failed_members;
 				}
@@ -1477,7 +1477,7 @@ 
 				}
 			}
 		}
-		return array($changed_members,$changed_fields,$failed_members);
+		return array($changed_members, $changed_fields, $failed_members);
 	}
 
 	/**
@@ -1504,20 +1504,20 @@ 
 			if ($contact['n_fileas']) return $contact['n_fileas'];
 			$type = null;
 		}
-		$title =  $this->fileas($contact,$type);
+		$title = $this->fileas($contact, $type);
 
 		if (!empty($this->prefs['link_title_cf']))
 		{
 			$field_list = is_string($this->prefs['link_title_cf']) ? explode(',', $this->prefs['link_title_cf']) : $this->prefs['link_title_cf'];
 			foreach ($field_list as $field)
 			{
-				if($contact['#'.$field])
+				if ($contact['#'.$field])
 				{
-				   $title .= ', ' . $contact['#'.$field];
+				   $title .= ', '.$contact['#'.$field];
 				}
 			}
 		}
-		return $title ;
+		return $title;
 	}
 
 	/**
@@ -1531,21 +1531,21 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($contacts =& $this->search(array('contact_id' => $ids),false)))
+		if (($contacts = & $this->search(array('contact_id' => $ids), false)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-			   	$titles[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+			   	$titles[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -1572,23 +1572,23 @@ 
 		{
 			$criteria = is_array($pattern) ? $pattern['search'] : $pattern;
 		}
-		if($options['start'] || $options['num_rows'])
+		if ($options['start'] || $options['num_rows'])
 		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] === '1') $filter['account_id'] = null;
-		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
+		if (($contacts = & parent::search($criteria, false, 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', $limit, $filter)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-				$result[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+				$result[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 				// make sure to return a correctly quoted rfc822 address, if requested
 				if ($options['type'] === 'email')
 				{
@@ -1629,7 +1629,7 @@ 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
 
-		return $this->link_query($pattern,$options);
+		return $this->link_query($pattern, $options);
 	}
 
 	/**
@@ -1643,14 +1643,14 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach(!is_array($ids) ? array($ids) : $ids as $id)
+		foreach (!is_array($ids) ? array($ids) : $ids as $id)
 		{
 			if (!($contact = $this->read($id))) continue;
 
 			$data[] = array(
 				'res_id' => $id,
 				'email' => $contact['email'] ? $contact['email'] : $contact['email_home'],
-				'rights' => Acl::CUSTOM1|Acl::CUSTOM3,	// calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
+				'rights' => Acl::CUSTOM1|Acl::CUSTOM3, // calendar_bo::ACL_READ_FOR_PARTICIPANTS|ACL_INVITE
 				'name' => $this->link_title($contact),
 				'cn' => trim($contact['n_given'].' '.$contact['n_family']),
 			);
@@ -1665,37 +1665,37 @@ 
 	 * @param boolean $extra_title =true if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
-	function read_calendar($uids,$extra_title=true)
+	function read_calendar($uids, $extra_title = true)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
 		$split_uids = array();
 		$events = array();
 
-		foreach($uids as $id => $uid)
+		foreach ($uids as $id => $uid)
 		{
 			$type = is_numeric($uid[0]) ? 'u' : $uid[0];
-			if($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u')
+			if ($GLOBALS['egw_info']['server']['disable_event_column'] == 'contacts' && $type == 'u')
 			{
 				continue;
 			}
 			$split_uids[$type][$id] = str_replace($type, '', $uid);
 		}
 
-		foreach($split_uids as $type => $s_uids)
+		foreach ($split_uids as $type => $s_uids)
 		{
 			$events += $this->read_calendar_type($s_uids, $type, $extra_title);
 		}
 		return $events;
 	}
 
-	private function read_calendar_type($uids, $type='c', $extra_title = true)
+	private function read_calendar_type($uids, $type = 'c', $extra_title = true)
 	{
 		$calendars = array();
 		$bocal = new calendar_bo();
-		$type_field = $type=='u' ? 'account_id' : 'contact_id';
+		$type_field = $type == 'u' ? 'account_id' : 'contact_id';
 		$type_field_varchar = $this->db->to_varchar($type_field);
-		$concat_start_id_recurrance = $this->db->concat('cal_start',"':'",'egw_cal_user.cal_id',"':'",'cal_recur_date');
+		$concat_start_id_recurrance = $this->db->concat('cal_start', "':'", 'egw_cal_user.cal_id', "':'", 'cal_recur_date');
 		$now = $this->db->unix_timestamp('NOW()');
 		$sql = "SELECT n_fn,org_name,$type_field AS user_id,
 			(
@@ -1704,7 +1704,7 @@ 
 				JOIN egw_cal_dates on egw_cal_dates.cal_id=egw_cal_user.cal_id and (cal_recur_date=0 or cal_recur_date=cal_start)
 				JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id AND egw_cal.cal_deleted IS NULL
 				WHERE cal_user_type='$type' and cal_user_id=$type_field_varchar and cal_start < $now";
-		if ( !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
+		if (!$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
 		{
 			$sql .= " AND egw_cal_user.cal_status != 'R'";
 		}
@@ -1717,7 +1717,7 @@ 
 				JOIN egw_cal_dates on egw_cal_dates.cal_id=egw_cal_user.cal_id and (cal_recur_date=0 or cal_recur_date=cal_start)
 				JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id AND egw_cal.cal_deleted IS NULL
 				WHERE cal_user_type='$type' and cal_user_id=$type_field_varchar and cal_start > $now";
-		if ( !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
+		if (!$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
 		{
 			$sql .= " AND egw_cal_user.cal_status != 'R'";
 		}
@@ -1728,7 +1728,7 @@ 
 			WHERE '.$this->db->expression('egw_addressbook', array($type_field => $uids));
 
 
-		$contacts =& $this->db->query($sql, __LINE__, __FILE__);
+		$contacts = & $this->db->query($sql, __LINE__, __FILE__);
 
 		if (!$contacts) return array();
 
@@ -1738,11 +1738,11 @@ 
 			list($start, $cal_id, $recur_date) = explode(':', $contact[$key.'_event']);
 
 			$link = array(
-				'id' => $cal_id,//.':'.$start,
+				'id' => $cal_id, //.':'.$start,
 				'app' => 'calendar',
-				'title' => $bocal->link_title($cal_id . ($start ? '-'.$start : '')),
+				'title' => $bocal->link_title($cal_id.($start ? '-'.$start : '')),
 				'extra_args' => array(
-					'date' => \EGroupware\Api\DateTime::server2user($start,\EGroupware\Api\DateTime::ET2),
+					'date' => \EGroupware\Api\DateTime::server2user($start, \EGroupware\Api\DateTime::ET2),
 					'exception'=> 1
 				),
 			);
@@ -1751,18 +1751,18 @@ 
 				$link['extra_title'] = $link['title'];
 				$link['title'] = \EGroupware\Api\DateTime::server2user($start, true);
 			}
-			$user_id = ($type == 'u' ? '' : $type) . $contact['user_id'];
+			$user_id = ($type == 'u' ? '' : $type).$contact['user_id'];
 			$calendars[$user_id][$key.'_event'] = $start;
 			$calendars[$user_id][$key.'_link'] = $link;
 		};
 
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if($contact['last_event'])
+			if ($contact['last_event'])
 			{
 				$do_event('last', $contact);
 			}
-			if($contact['next_event'])
+			if ($contact['next_event'])
 			{
 				$do_event('next', $contact);
 			}
@@ -1779,7 +1779,7 @@ 
 	 */
 	public function read_birthdays($addressbook, $year)
 	{
-		if (($birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'])) !== null)
+		if (($birthdays = Cache::getInstance(__CLASS__, "birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'])) !== null)
 		{
 			return $birthdays;
 		}
@@ -1790,7 +1790,7 @@ 
 			'n_family' => "!''",
 			'bday' => "!''",
 		);
-		$bdays =& $this->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
+		$bdays = & $this->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
 			'contact_bday ASC', '', '', false, 'AND', false, $filter);
 
 		if ($bdays)
@@ -1798,35 +1798,34 @@ 
 			// sort by month and day only
 			usort($bdays, function($a, $b)
 			{
-				return (int) $a['bday'] == (int) $b['bday'] ?
-					strcmp($a['bday'], $b['bday']) :
-					(int) $a['bday'] - (int) $b['bday'];
+				return (int)$a['bday'] == (int)$b['bday'] ?
+					strcmp($a['bday'], $b['bday']) : (int)$a['bday'] - (int)$b['bday'];
 			});
-			foreach($bdays as $pers)
+			foreach ($bdays as $pers)
 			{
-				if (empty($pers['bday']) || $pers['bday']=='0000-00-00 0' || $pers['bday']=='0000-00-00' || $pers['bday']=='0.0.00')
+				if (empty($pers['bday']) || $pers['bday'] == '0000-00-00 0' || $pers['bday'] == '0000-00-00' || $pers['bday'] == '0.0.00')
 				{
 					//error_log(__METHOD__.__LINE__.' Skipping entry for invalid birthday:'.array2string($pers));
 					continue;
 				}
-				list($y,$m,$d) = explode('-',$pers['bday']);
+				list($y, $m, $d) = explode('-', $pers['bday']);
 				if ($y > $year)
 				{
 					// not yet born
 					continue;
 				}
-				$birthdays[sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+				$birthdays[sprintf('%04d%02d%02d', $year, $m, $d)][] = array(
 					'day'       => $d,
 					'month'     => $m,
 					'occurence' => 0,
-					'name'      => implode(' ', array_filter(array(lang('Birthday'),($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']), $pers['n_middle'],
-						$pers['n_family'], ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ($year - $y): '')))).
-						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('','age')) ? ' ('.$y.')' : ''),
-					'birthyear' => $y,	// this can be used to identify birthdays from holidays
+					'name'      => implode(' ', array_filter(array(lang('Birthday'), ($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']), $pers['n_middle'],
+						$pers['n_family'], ($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ($year - $y) : '')))).
+						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('', 'age')) ? ' ('.$y.')' : ''),
+					'birthyear' => $y, // this can be used to identify birthdays from holidays
 				);
 			}
 		}
-		Cache::setInstance(__CLASS__,"birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'], $birthdays, self::BIRTHDAY_CACHE_TIME);
+		Cache::setInstance(__CLASS__, "birthday-$year-$addressbook-".$GLOBALS['egw_info']['user']['preferences']['common']['lang'], $birthdays, self::BIRTHDAY_CACHE_TIME);
 		return $birthdays;
 	}
 
@@ -1849,7 +1848,7 @@ 
 	{
 		// get all cats if you want to drop sub cats
 		$drop_subs = ($data['drop_subs'] && !$data['modify_subs']);
-		if($drop_subs)
+		if ($drop_subs)
 		{
 			$cats = new Categories('', 'addressbook');
 			$cat_ids = $cats->return_all_children($data['cat_id']);
@@ -1860,14 +1859,14 @@ 
 		}
 
 		// Get addresses that use the category
-		@set_time_limit( 0 );
-		foreach($cat_ids as $cat_id)
+		@set_time_limit(0);
+		foreach ($cat_ids as $cat_id)
 		{
 			if (($ids = $this->search(array('cat_id' => $cat_id), false)))
 			{
-				foreach($ids as &$info)
+				foreach ($ids as &$info)
 				{
-					$info['cat_id'] = implode(',',array_diff(explode(',',$info['cat_id']), $cat_ids));
+					$info['cat_id'] = implode(',', array_diff(explode(',', $info['cat_id']), $cat_ids));
 					$this->save($info);
 				}
 			}
@@ -1889,14 +1888,14 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach (parent::search(array('id'=>$ids), false) as $contact)	// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
-					return false;	// we dont deal with two accounts!
+					return false; // we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
@@ -1904,7 +1903,7 @@ 
 			// Add in custom fields
 			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
 
-			$pos = array_search($contact['id'],$ids);
+			$pos = array_search($contact['id'], $ids);
 			$contacts[$pos] = $contact;
 		}
 		if (!is_null($account))	// we found an account, so we merge the contacts into it
@@ -1917,38 +1916,38 @@ 
 			$target = $contacts[0];
 			unset($contacts[0]);
 		}
-		if (!$this->check_perms(Acl::EDIT,$target))
+		if (!$this->check_perms(Acl::EDIT, $target))
 		{
 			echo $this->error = 'No edit permission for the target contact!';
 			return 0;
 		}
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
 				if (!$value) continue;
 
-				switch($name)
+				switch ($name)
 				{
 					case 'id':
 					case 'tid':
 					case 'owner':
 					case 'private':
 					case 'etag';
-						break;	// ignored
+						break; // ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
-						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
+						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',', $target['cat_id']) : array();
+						$target['cat_id'] = array_unique(array_merge($target['cat_id'], is_array($value) ? $value : explode(',', $value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if ($name[0] == '#') {
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
-								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
+							if ($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
+								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',', $target[$name]) : array();
+								$target[$name] = implode(',', array_unique(array_merge($target[$name], is_array($value) ? $value : explode(',', $value))));
 							}
 						}
 						if (!$target[$name]) $target[$name] = $value;
@@ -1958,7 +1957,7 @@ 
 
 			// Merge distribution lists
 			$lists = $this->read_distributionlist(array($contact['id']));
-			foreach($lists[$contact['id']] as $list_id => $list_name)
+			foreach ($lists[$contact['id']] as $list_id => $list_name)
 			{
 				parent::add2list($target['id'], $list_id);
 			}
@@ -1966,29 +1965,29 @@ 
 		if (!$this->save($target)) return 0;
 
 		$success = 1;
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if (!$this->check_perms(Acl::DELETE,$contact))
+			if (!$this->check_perms(Acl::DELETE, $contact))
 			{
 				continue;
 			}
-			foreach(Link::get_links('addressbook',$contact['id']) as $data)
+			foreach (Link::get_links('addressbook', $contact['id']) as $data)
 			{
 				//_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
 				// info_from and info_link_id (main link)
-				$newlinkID = Link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
+				$newlinkID = Link::link('addressbook', $target['id'], $data['app'], $data['id'], $data['remark'], $target['owner']);
 				//_debug_array(array('newLinkID'=>$newlinkID));
 				if ($newlinkID)
 				{
 					// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
-					if ($data['app']=='infolog')
+					if ($data['app'] == 'infolog')
 					{
-						$this->db->update('egw_infolog',array(
+						$this->db->update('egw_infolog', array(
 								'info_link_id' => $newlinkID
-							),array(
+							), array(
 								'info_id' => $data['id'],
 								'info_link_id' => $data['link_id']
-							),__LINE__,__FILE__,'infolog');
+							), __LINE__, __FILE__, 'infolog');
 					}
 					unset($newlinkID);
 				}
@@ -2011,7 +2010,7 @@ 
 	protected function merge_calendar($old_id, $new_id)
 	{
 		static $bo;
-		if(!is_object($bo))
+		if (!is_object($bo))
 		{
 			$bo = new \calendar_boupdate();
 		}
@@ -2019,7 +2018,7 @@ 
 		// Find all events with this contact
 		$events = $bo->search(array('users' => $old_id, 'ignore_acl' => true));
 
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$event['participants'][$new_id] = $event['participants'][$old_id];
 			unset($event['participants'][$old_id]);
@@ -2044,14 +2043,14 @@ 
 	 * @param int $owner =null
 	 * @return boolean
 	 */
-	function check_list($list,$required,$owner=null)
+	function check_list($list, $required, $owner = null)
 	{
 		if ($list && ($list_data = $this->read_list($list)))
 		{
 			$owner = $list_data['list_owner'];
 		}
 		//error_log(__METHOD__."($list, $required, $owner) grants[$owner]=".$this->grants[$owner]." returning ".array2string(!!($this->grants[$owner] & $required)));
-		return !!($this->grants[$owner] & $required);
+		return !!($this->grants[$owner]&$required);
 	}
 
 	/**
@@ -2063,17 +2062,17 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null, Acl::ADD|Acl::EDIT, $owner)) return false;
 
 		try {
-			$ret = parent::add_list($keys,$owner,$contacts,$data);
+			$ret = parent::add_list($keys, $owner, $contacts, $data);
 			if ($ret) unset(self::$list_cache[$ret]);
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
-		catch(Db\Exception\InvalidSql $e) {
-			unset($e);	// not used
+		catch (Db\Exception\InvalidSql $e) {
+			unset($e); // not used
 			return false;
 		}
 		return $ret;
@@ -2087,13 +2086,13 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list, Acl::EDIT)) return false;
 
 		unset(self::$list_cache[$list]);
 
-		return parent::add2list($contact,$list,$existing);
+		return parent::add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -2103,9 +2102,9 @@ 
 	 * @param int $list list-id
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list, Acl::EDIT)) return false;
 
 		if ($list)
 		{
@@ -2116,7 +2115,7 @@ 
 			self::$list_cache = array();
 		}
 
-		return parent::remove_from_list($contact,$list);
+		return parent::remove_from_list($contact, $list);
 	}
 
 	/**
@@ -2127,7 +2126,7 @@ 
 	 */
 	function delete_list($list)
 	{
-		foreach((array)$list as $l)
+		foreach ((array)$list as $l)
 		{
 			if (!$this->check_list($l, Acl::DELETE)) return false;
 
@@ -2165,7 +2164,7 @@ 
 	{
 		$code = Country::country_code($country);
 
-		switch($code)
+		switch ($code)
 		{
 			case 'AU':
 			case 'CA':
@@ -2229,12 +2228,12 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $contact_id=null)
+	function find_or_add_categories($catname_list, $contact_id = null)
 	{
 		if ($contact_id && $contact_id > 0 && ($old_contact = $this->read($contact_id)))
 		{
 			// preserve categories without users read access
-			$old_categories = explode(',',$old_contact['cat_id']);
+			$old_categories = explode(',', $old_contact['cat_id']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2288,15 +2287,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Categories($this->user,'addressbook');
+			$this->categories = new Categories($this->user, 'addressbook');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -2328,14 +2327,14 @@ 
 	 * @param boolean $relax =false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
-	function find_contact($contact, $relax=false)
+	function find_contact($contact, $relax = false)
 	{
 		$empty_addr_one = $empty_addr_two = true;
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX': 'EXACT') . ')[ContactData]:'
+				. '('.($relax ? 'RELAX' : 'EXACT').')[ContactData]:'
 				. array2string($contact)
 				. "\n", 3, $this->logfile);
 		}
@@ -2346,7 +2345,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactID]: ' . $contact['id']
+					. '()[ContactID]: '.$contact['id']
 					. "\n", 3, $this->logfile);
 			}
 			// We only do a simple consistency check
@@ -2364,11 +2363,11 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactUID]: ' . $contact['uid']
+					. '()[ContactUID]: '.$contact['uid']
 					. "\n", 3, $this->logfile);
 			}
 			// Try the given UID first
-			$criteria = array ('contact_uid' => $contact['uid']);
+			$criteria = array('contact_uid' => $contact['uid']);
 			if (($foundContacts = parent::search($criteria)))
 			{
 				foreach ($foundContacts as $egwContact)
@@ -2451,7 +2450,7 @@ 
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 				. '()[Addressbook FIND Step 1]: '
-				. 'CRITERIA = ' . array2string($criteria)
+				. 'CRITERIA = '.array2string($criteria)
 				. "\n", 3, $this->logfile);
 		}
 
@@ -2480,7 +2479,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 2]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 
@@ -2504,7 +2503,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[Addressbook FIND Step 3]: '
-						. 'CRITERIA = ' . array2string($criteria)
+						. 'CRITERIA = '.array2string($criteria)
 						. "\n", 3, $this->logfile);
 				}
 
@@ -2530,7 +2529,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 4]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 			if (($foundContacts = parent::search($criteria, true, '', '', '', true)))
@@ -2544,7 +2543,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]: ' . array2string($matchingContacts)
+				. '()[FOUND]: '.array2string($matchingContacts)
 				. "\n", 3, $this->logfile);
 		}
 		return $matchingContacts;
@@ -2561,9 +2560,9 @@ 
 	 * @param int|array $owner =null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
-	public function get_ctag($owner=null)
+	public function get_ctag($owner = null)
 	{
-		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
+		$filter = array('tid' => null); // tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
 		if (!is_null($owner)) $filter['owner'] = $owner;
 
@@ -2572,11 +2571,11 @@ 
 		{
 			$filter['account_id'] = null;
 		}
-		$result = $this->search(array(),'contact_modified','contact_modified DESC','','',false,'AND',array(0,1),$filter);
+		$result = $this->search(array(), 'contact_modified', 'contact_modified DESC', '', '', false, 'AND', array(0, 1), $filter);
 
 		if (!$result || !isset($result[0]['modified']))
 		{
-			$ctag = 'empty';	// ctag for empty addressbook
+			$ctag = 'empty'; // ctag for empty addressbook
 		}
 		else
 		{

api/src/Etemplate/Widget/Url.php

Braces +4 added lines, -1 removed lines

@@ -114,7 +114,10 @@
 						break;
 				}
 			}
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value));
 		}
 	}

Doc Comments +1 added lines, -2 removed lines

@@ -61,7 +61,6 @@ 
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 * @param array $content
 	 * @param array &$validated=array() validated content
-	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{
@@ -132,7 +131,7 @@ 
 	/**
 	 * Handle ajax searches for existing contact based on email
 	 *
-	 * @return boolean $_email exists or not
+	 * @return boolean|null $_email exists or not
 	 */
 	public static function ajax_contact($_email)
 	{

Spacing +12 added lines, -12 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param array &$validated=array() validated content
 	 * @param array $expand=array values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -73,12 +73,12 @@ 
 
 			if ((string)$value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!'), '');
 				return;
 			}
 			elseif ((string)$value != '' && !isset($this->attrs['preg']))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					case 'url':
 						// if no protocol given eg. "www.egroupware.org" prepend "http://" for validation
@@ -88,7 +88,7 @@ 
 						}
 						$url_valid = filter_var($value, FILTER_VALIDATE_URL) ||
 							// Remove intl chars & check again, but if it passes we'll keep the original
-							filter_var(preg_replace('/[^[:print:]]/','',$value), FILTER_VALIDATE_URL);
+							filter_var(preg_replace('/[^[:print:]]/', '', $value), FILTER_VALIDATE_URL);
 						//error_log(__METHOD__."() filter_var(value=".array2string($value).", FILTER_VALIDATE_URL)=".array2string(filter_var($value, FILTER_VALIDATE_URL))." --> url_valid=".array2string($url_valid));
 						// remove http:// validation prefix again
 						if ($missing_protocol)
@@ -97,7 +97,7 @@ 
 						}
 						if (!$url_valid)
 						{
-							self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value),'');
+							self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value), '');
 							return;
 						}
 						$this->attrs['preg'] = self::URL_PREG;
@@ -108,19 +108,19 @@ 
 				}
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
+			if ((int)$this->attrs['maxlength'] > 0 && strlen($value) > (int)$this->attrs['maxlength'])
 			{
-				$value = substr($value,0,(int) $this->attrs['maxlength']);
+				$value = substr($value, 0, (int)$this->attrs['maxlength']);
 			}
-			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'],$value))
+			if ($this->attrs['preg'] && !preg_match($this->attrs['preg'], $value))
 			{
-				switch($this->type)
+				switch ($this->type)
 				{
 					default:
 						//error_log("preg_match('{$this->attrs['preg']}', '$value')=".array2string(preg_match($this->attrs['preg'], $value)));
-						self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
+						self::set_validation_error($form_name, lang("'%1' has an invalid format !!!", $value)/*." !preg_match('$this->attrs[preg]', '$value')"*/, '');
 						break;
 				}
 			}
@@ -137,7 +137,7 @@ 
 	public static function ajax_contact($_email)
 	{
 		$email = \EGroupware\Api\Mail::stripRFC822Addresses(array($_email));
-		$result = $GLOBALS['egw']->contacts->search(array('contact_email'=>$email[0], 'contact_email_home' => $email[0]), array('email','email_home'),
+		$result = $GLOBALS['egw']->contacts->search(array('contact_email'=>$email[0], 'contact_email_home' => $email[0]), array('email', 'email_home'),
 			'', '', '', false, 'OR', false);
 		\EGroupware\Api\Json\Response::data($result ? true : false);
 	}