EGroupware / egroupware

addressbook/inc/class.addressbook_contactform.inc.php

Doc Comments +11 added lines, -15 removed lines

@@ -30,14 +30,12 @@ 
 	/**
 	 * Shows the contactform and stores the submitted data
 	 *
-	 * @param array $content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param array $content submitted eTemplate content
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display(array $content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
@@ -49,13 +47,11 @@ 
 	 * Shows the contactform and stores the submitted data ($content is a var parameter, eg. for extending classes)
 	 *
 	 * @param array &$content=null submitted eTemplate content
-	 * @param int $addressbook=null int owner-id of addressbook to save contacts too
-	 * @param array $fields=null field-names to show
-	 * @param string $msg=null message to show after submitting the form
-	 * @param string $email=null comma-separated email addresses
-	 * @param string $tpl_name=null custom etemplate to use
-	 * @param string $subject=null subject for email
-	 * @param string $copytoreceiver=false send a copy of notification to receiver
+	 * @param int $addressbook int owner-id of addressbook to save contacts too
+	 * @param array $fields field-names to show
+	 * @param string $tpl_name custom etemplate to use
+	 * @param string $subject subject for email
+	 * @param string $copytoreceiver send a copy of notification to receiver
 	 * @return string html content
 	 */
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())

Braces +46 added lines, -13 removed lines

@@ -61,28 +61,41 @@ 
 	function display_var(array &$content=null,$addressbook=null,$fields=null,$msg=null,$email=null,$tpl_name=null,$subject=null,$copytoreceiver=false,$sel_options=array())
 	{
 		#error_log( "<p>addressbook_contactform::display(".print_r($content,true).",$addressbook,".print_r($fields,true).",$msg,$tpl_name)</p>\n");
-		if (empty($tpl_name) && !empty($content['tpl_form_name'])) $tpl_name =$content['tpl_form_name'];
+		if (empty($tpl_name) && !empty($content['tpl_form_name']))
+		{
+			$tpl_name =$content['tpl_form_name'];
+		}
 		$tpl = new etemplate($tpl_name ? $tpl_name : 'addressbook.contactform');
 		// initializing some fields
-		if (!$fields) $fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		if (!$fields)
+		{
+			$fields = array('org_name','n_fn','email','tel_work','url','note','captcha');
+		}
 		$submitted = false;
 		// check if submitted
 		if (is_array($content))
 		{
 			if ((isset($content['captcha_result']) && $content['captcha'] != $content['captcha_result']) ||	// no correct captcha OR
 				(time() - $content['start_time'] < 10 &&				// bot indicator (less then 10 sec to fill out the form and
-				!$GLOBALS['egw_info']['etemplate']['java_script']))	// javascript disabled)
+				!$GLOBALS['egw_info']['etemplate']['java_script']))
+			{
+				// javascript disabled)
 			{
 				$submitted = "truebutfalse";
+			}
 				$tpl->set_validation_error('captcha',lang('Wrong - try again ...'));
 			}
 			elseif ($content['submitit'])
 			{
 				$submitted = true;
 				$contact = new Api\Contacts();
-				if ($content['owner'])	// save the contact in the addressbook
+				if ($content['owner'])
+				{
+					// save the contact in the addressbook
 				{
-					$content['private'] = 0;	// in case default_private is set
+					$content['private'] = 0;
+				}
+				// in case default_private is set
 					if (($id = $contact->save($content)))
 					{
 						// check for fileuploads and attach the found files
@@ -139,9 +152,12 @@ 
 			$custom = 1;
 			foreach($fields as $name)
 			{
-				if ($name[0] == '#')	// custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
+				}
 					if (is_null($contact))
 					{
 						$contact = new Api\Contacts();
@@ -172,12 +188,19 @@ 
 			unset($content['submitit']);
 			$custom = 1;
 			// fieldnames are "defined" by the commit attempt, that way, we do not have to remember them
-			foreach($content as $name => $value) {
+			foreach($content as $name => $value)
+			{
 				$preserv[$name]=$value;
-				if ($name[0] == '#')     // custom field
+				if ($name[0] == '#')
+				{
+					// custom field
 				{
 					static $contact;
-					if (is_null($contact)) $contact = new Api\Contacts();
+				}
+					if (is_null($contact))
+					{
+						$contact = new Api\Contacts();
+					}
 					$content['show']['custom'.$custom] = true;
 					$content['customfield'][$custom] = $name;
 					$content['customlabel'][$custom] = $contact->customfields[substr($name,1)]['label'];
@@ -200,15 +223,25 @@ 
 		}
 		$content['addr_format'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['addr_format'];
 
-		if ($addressbook) $preserv['owner'] = $addressbook;
-		if ($msg) $preserv['msg'] = $msg;
+		if ($addressbook)
+		{
+			$preserv['owner'] = $addressbook;
+		}
+		if ($msg)
+		{
+			$preserv['msg'] = $msg;
+		}
 
 		// a simple calculation captcha
 		$num1 = rand(1,99);
 		$num2 = rand(1,99);
-		if ($num2 > $num1)	// keep the result positive
+		if ($num2 > $num1)
+		{
+			// keep the result positive
 		{
-			$n = $num1; $num1 = $num2; $num2 = $n;
+			$n = $num1;
+		}
+		$num1 = $num2; $num2 = $n;
 		}
 		if (in_array('captcha',$fields))
 		{

addressbook/inc/class.addressbook_groupdav.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 	 * @param array &$files
 	 * @param int $user account_id
 	 * @param string $id =''
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function propfind($path,&$options,&$files,$user,$id='')
 	{
@@ -188,7 +188,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array& $filter
-	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @param integer[] $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array &$filter,$start=false,$report_not_found_multiget_ids=true)
@@ -539,7 +539,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -566,7 +566,7 @@ 
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -1024,7 +1024,7 @@ 
 	 *
 	 * @param int $acl Acl::READ, Acl::EDIT or Acl::DELETE
 	 * @param array|int $contact contact-array or id
-	 * @return boolean null if entry does not exist, false if no access, true if access permitted
+	 * @return null|boolean null if entry does not exist, false if no access, true if access permitted
 	 */
 	function check_access($acl,$contact)
 	{

Braces +163 added lines, -40 removed lines

@@ -85,7 +85,10 @@ 
 			self::$path_attr = 'carddav_name';
 			self::$path_extension = '';
 		}
-		if ($this->debug) error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() contact_repository={$this->bo->contact_repository}, account_repository={$this->bo->account_repository}, REQUEST_URI=$_SERVER[REQUEST_URI] --> path_attr=".self::$path_attr.", path_extension=".self::$path_extension);
+		}
 
 		$this->home_set_pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
 		$this->home_set_pref = $this->home_set_pref ? explode(',',$this->home_set_pref) : array();
@@ -123,7 +126,10 @@ 
 			$filter['owner'] = $user;
 		}
 		// should we hide the accounts addressbook
-		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
+		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+		{
+			$filter['account_id'] = null;
+		}
 
 		// process REPORT filters or multiget href's
 		$nresults = null;
@@ -131,9 +137,16 @@ 
 		{
 			return false;
 		}
-		if ($id) $path = dirname($path).'/';	// carddav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// carddav_name get's added anyway in the callback
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
+		}
 
 		// check if we have to return the full contact data or just the etag's
 		if (!($filter['address_data'] = $options['props'] == 'all' &&
@@ -218,16 +231,25 @@ 
 
 		if (isset($filter[self::$path_attr]))
 		{
-			if (!is_array($filter[self::$path_attr])) $filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			if (!is_array($filter[self::$path_attr]))
+			{
+				$filter[self::$path_attr] = (array)$filter[self::$path_attr];
+			}
 			$requested_multiget_ids =& $filter[self::$path_attr];
 		}
 
 		$files = array();
 		// we query etag and modified, as LDAP does not have the strong sql etag
 		$cols = array('id','uid','etag','modified','n_fn');
-		if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
+		if (!in_array(self::$path_attr,$cols))
+		{
+			$cols[] = self::$path_attr;
+		}
 		// we need tid for sync-collection report
-		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols)) $cols[] = 'tid';
+		if (array_key_exists('tid', $filter) && !isset($filter['tid']) && !in_array('tid', $cols))
+		{
+			$cols[] = 'tid';
+		}
 		if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
 		{
 			foreach($contacts as &$contact)
@@ -271,7 +293,10 @@ 
 			{
 				$accounts_filter = $filter_in;
 				$accounts_filter['owner'] = '0';
-				if ($sync_collection_report) $token_was = $this->sync_collection_token;
+				if ($sync_collection_report)
+				{
+					$token_was = $this->sync_collection_token;
+				}
 				self::$path_attr = 'id';
 				self::$path_extension = '.vcf';
 				$files = array_merge($files, $this->propfind_callback($path, $accounts_filter, false, false));
@@ -294,16 +319,22 @@ 
 					list(,$sync_token) = explode('>', $filter[0]);
 					$where[] = 'list_modified>FROM_UNIXTIME('.(int)$sync_token.')';
 				}
-				if (isset($filter[self::$path_attr]))	// multiget report?
+				if (isset($filter[self::$path_attr]))
+				{
+					// multiget report?
 				{
 					$where['list_'.self::$path_attr] = $filter[self::$path_attr];
 				}
+				}
 				//error_log(__METHOD__."() filter=".array2string($filter).", do_groups=".in_array('D',$this->home_set_pref).", where=".array2string($where));
-				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))	// limit to contacts in same AB!
+				if (($lists = $this->bo->read_lists($where,'contact_uid',$where['list_owner'])))
+				{
+					// limit to contacts in same AB!
 				{
 					foreach($lists as $list)
 					{
 						$list[self::$path_attr] = $list['list_carddav_name'];
+				}
 						$etag = $list['list_id'].':'.$list['list_etag'];
 						// for all-in-one addressbook, add selected ABs to etag
 						if (isset($filter['owner']) && is_array($filter['owner']))
@@ -347,7 +378,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($path,".array2string($filter).','.array2string($start).") took ".(microtime(true) - $starttime).' to return '.count($files).' items');
+		}
 		return $files;
 	}
 
@@ -387,7 +421,11 @@ 
 			$matches = $prop_test = $column = null;
 			foreach($options['filters'] as $n => $filter)
 			{
-				if (!is_int($n)) continue;	// eg. attributes of filter xml element
+				if (!is_int($n))
+				{
+					continue;
+				}
+				// eg. attributes of filter xml element
 
 				switch((string)$filter['name'])
 				{
@@ -395,19 +433,28 @@ 
 						$this->caldav->log(__METHOD__."(...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'prop-filter':	// can be multiple prop-filter, see example
-						if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						if ($matches)
+						{
+							$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+						}
 						$matches = array();
 						$prop_filter = strtoupper($filter['attrs']['name']);
 						$prop_test = isset($filter['attrs']['test']) ? $filter['attrs']['test'] : 'anyof';
-						if ($this->debug > 1) error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."(...) prop-filter='$prop_filter', test='$prop_test'");
+						}
 						break;
 					case 'is-not-defined':
 						$matches[] = '('.$column."='' OR ".$column.' IS NULL)';
 						break;
 					case 'text-match':	// prop-filter can have multiple text-match, see example
-						if (!isset($this->filter_prop2cal[$prop_filter]))	// eg. not existing NICKNAME in EGroupware
+						if (!isset($this->filter_prop2cal[$prop_filter]))
+						{
+							// eg. not existing NICKNAME in EGroupware
 						{
 							if ($this->debug || $prop_filter != 'NICKNAME') error_log(__METHOD__."(...) text-match: $prop_filter {$filter['attrs']['match-type']} '{$filter['data']}' unknown property '$prop_filter' --> ignored");
+						}
 							$column = false;	// to ignore following data too
 						}
 						else
@@ -420,8 +467,14 @@ 
 									break;
 							}
 							$column = $this->filter_prop2cal[strtoupper($prop_filter)];
-							if (strpos($column, '_') === false) $column = 'contact_'.$column;
-							if (!isset($filters['order'])) $filters['order'] = $column;
+							if (strpos($column, '_') === false)
+							{
+								$column = 'contact_'.$column;
+							}
+							if (!isset($filters['order']))
+							{
+								$filters['order'] = $column;
+							}
 							$match_type = $filter['attrs']['match-type'];
 							$negate_condition = isset($filter['attrs']['negate-condition']) && $filter['attrs']['negate-condition'] == 'yes';
 						}
@@ -429,9 +482,12 @@ 
 					case '':	// data of text-match element
 						if (isset($filter['data']) && isset($column))
 						{
-							if ($column)	// false for properties not known to EGroupware
+							if ($column)
+							{
+								// false for properties not known to EGroupware
 							{
 								$value = str_replace(array('%', '_'), array('\\%', '\\_'), $filter['data']);
+							}
 								switch($match_type)
 								{
 									case 'equals':
@@ -450,7 +506,10 @@ 
 								}
 								$matches[] = ($negate_condition ? 'NOT ' : '').$sql_filter;
 
-								if ($this->debug > 1) error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								if ($this->debug > 1)
+								{
+									error_log(__METHOD__."(...) text-match: $prop_filter $match_type' '{$filter['data']}'");
+								}
 							}
 							unset($column);
 							break;
@@ -461,11 +520,17 @@ 
 						break;
 				}
 			}
-			if ($matches) $prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			if ($matches)
+			{
+				$prop_filters[] = implode($prop_test=='allof'?' AND ':' OR ',$matches);
+			}
 			if ($prop_filters)
 			{
 				$filters[] = $filter = '(('.implode($filter_test=='allof'?') AND (':') OR (', $prop_filters).'))';
-				if ($this->debug) error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(path=$options[path], ...) sql-filter: $filter");
+				}
 			}
 		}
 		// parse limit from $options['other']
@@ -522,8 +587,14 @@ 
 					}
 				}
 			}
-			if ($ids) $filters[self::$path_attr] = $ids;
-			if ($this->debug) error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			if ($ids)
+			{
+				$filters[self::$path_attr] = $ids;
+			}
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(...) addressbook-multiget: ids=".implode(',',$ids));
+			}
 		}
 		elseif ($id)
 		{
@@ -570,12 +641,18 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).",$id,$user)");
+		}
 
 		$oldContact = $this->_common_get_put_delete('PUT',$options,$id);
 		if (!is_null($oldContact) && !is_array($oldContact))
 		{
-			if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($oldContact));
+			}
 			return $oldContact;
 		}
 
@@ -666,15 +743,24 @@ 
 			// done here again, as _common_get_put_delete knows nothing about default addressbooks...
 			if (!($this->bo->grants[$contact['owner']] & Acl::ADD))
 			{
-				if ($this->debug) error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."(,'$id', $user, '$prefix') returning '403 Forbidden'");
+				}
 				return '403 Forbidden';
 			}
 		}
-		if ($this->http_if_match) $contact['etag'] = self::etag2value($this->http_if_match);
+		if ($this->http_if_match)
+		{
+			$contact['etag'] = self::etag2value($this->http_if_match);
+		}
 
 		if (!($save_ok = $is_group ? $this->save_group($contact, $oldContact) : $this->bo->save($contact)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) save(".array2string($contact).") failed, Ok=$save_ok");
+			}
 			if ($save_ok === 0)
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
@@ -703,7 +789,10 @@ 
 		// send evtl. necessary respose headers: Location, etag, ...
 		$this->put_response_headers($contact, $options['path'], $retval, self::$path_attr != 'id');
 
-		if ($this->debug > 1) error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(,'$id', $user, '$prefix') returning ".array2string($retval));
+		}
 		return $retval;
 	}
 
@@ -717,7 +806,10 @@ 
 	function save_group(array &$contact, $oldContact=null)
 	{
 		$data = array('list_name' => $contact['n_fn']);
-		if (!isset($contact['owner'])) $contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($contact['owner']))
+		{
+			$contact['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		foreach(array('id','carddav_name','uid','owner') as $name)
 		{
 			$data['list_'.$name] = $contact[$name];
@@ -769,13 +861,22 @@ 
 					}
 				}
 				//error_log('to_add_ids='.array2string($to_add_ids).', to_delete_ids='.array2string($to_delete_ids));
-				if ($to_add_ids) $this->bo->add2list($to_add_ids, $list_id, array());
-				if ($to_delete_ids) $this->bo->remove_from_list($to_delete_ids, $list_id);
+				if ($to_add_ids)
+				{
+					$this->bo->add2list($to_add_ids, $list_id, array());
+				}
+				if ($to_delete_ids)
+				{
+					$this->bo->remove_from_list($to_delete_ids, $list_id);
+				}
 			}
 			// reread as update of list-members updates etag and modified
 	 		$contact = $this->bo->read_list($list_id);
 		}
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($contact).', '.array2string($oldContact).') on return contact='.array2string($data).' returning '.array2string($list_id));
+		}
  		return $list_id;
 	}
 
@@ -789,11 +890,17 @@ 
 	public function getctag($path,$user)
 	{
 		static $ctags = array();	// a little per request caching, in case ctag and sync-token is both requested
-		if (isset($ctags[$path])) return $ctags[$path];
+		if (isset($ctags[$path]))
+		{
+			return $ctags[$path];
+		}
 
 		$user_in = $user;
 		// not showing addressbook of a single user?
-		if (is_null($user) || $user === '' || $path == '/addressbook/') $user = null;
+		if (is_null($user) || $user === '' || $path == '/addressbook/')
+		{
+			$user = null;
+		}
 
 		// If "Sync selected addressbooks into one" is set --> ctag need to take selected AB's into account too
 		if ($user && $user == $GLOBALS['egw_info']['user']['account_id'] && in_array('O',$this->home_set_pref))
@@ -1006,16 +1113,22 @@ 
 				$contact['etag'] .= ':'.implode('-',$limit_in_ab);
 			}
 		}
-		elseif($contact === array())	// not found from read_lists()
+		elseif($contact === array())
+		{
+			// not found from read_lists()
 		{
 			$contact = null;
 		}
+		}
 
 		if ($contact && $contact['tid'] == Api\Contacts::DELETED_TYPE)
 		{
 			$contact = null;	// handle deleted events, as not existing (404 Not Found)
 		}
-		if ($this->debug > 1) error_log(__METHOD__."('$id') returning ".array2string($contact));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."('$id') returning ".array2string($contact));
+		}
 		return $contact;
 	}
 
@@ -1045,7 +1158,10 @@ 
 		// remove add and delete grants for accounts (for admins too)
 		// as accounts can not be created as contacts, they eg. need further data
 		// and admins might not recognice they delete an account incl. its data
-		if (isset($grants[0])) $grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		if (isset($grants[0]))
+		{
+			$grants[0] &= ~(EGW_ACL_ADD|EGW_ACL_DELETE);
+		}
 
 		return $grants;
 	}
@@ -1061,7 +1177,10 @@ 
 		$shared = array();
 
 		// if "Sync all selected addressbook into one" is set --> no (additional) shared addressbooks
-		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref)) return array();
+		if (!$ignore_all_in_one && in_array('O',$this->home_set_pref))
+		{
+			return array();
+		}
 
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -1128,7 +1247,11 @@ 
 			$user = $hook_data['account_id'];
 			$addressbook_bo = new Api\Contacts();
 			$addressbooks += $addressbook_bo->get_addressbooks(Acl::READ, null, $user);
-			if ($user > 0)  unset($addressbooks[$user]);	// allways synced
+			if ($user > 0)
+			{
+				unset($addressbooks[$user]);
+			}
+			// allways synced
 			unset($addressbooks[$user.'p']);// ignore (optional) private addressbook for now
 		}
 

addressbook/inc/class.addressbook_hooks.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -423,7 +423,7 @@ 
 	 * Register addressbook for group-acl
 	 *
 	 * @param array $args hook-params (not used)
-	 * @return boolean|string true=standard group acl link, of string with link
+	 * @return boolean true=standard group acl link, of string with link
 	 */
 	static function group_acl($args)
 	{
@@ -437,7 +437,7 @@ 
 	 * For which groups should no group acl be used: addressbook always
 	 *
 	 * @param string|array $data
-	 * @return boolean|array true, false or array with group-account_id's
+	 * @return boolean true, false or array with group-account_id's
 	 */
 	static function not_enum_group_acls($data)
 	{

Braces +8 added lines, -2 removed lines

@@ -498,11 +498,14 @@ 
 			}
 		}
 		$own_account_acl['link_to'] = 'Links';
-		if ($config['account_repository'] != 'ldap')	// no custom-fields in ldap
+		if ($config['account_repository'] != 'ldap')
+		{
+			// no custom-fields in ldap
 		{
 			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$own_account_acl['#'.$name] = $data['label'];
+		}
 			}
 		}
 
@@ -522,11 +525,14 @@ 
 				$copy_fields[$field] = $label;
 			}
 		}
-		if ($config['contact_repository'] != 'ldap')	// no custom-fields in ldap
+		if ($config['contact_repository'] != 'ldap')
+		{
+			// no custom-fields in ldap
 		{
 			foreach(Api\Storage\Customfields::get('addressbook') as $name => $data)
 			{
 				$copy_fields['#'.$name] = $data['label'];
+		}
 			}
 		}
 		// Remove country codes as an option, it will be added by UI constructor

addressbook/inc/class.addressbook_import_contacts_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -44,9 +44,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition &$_definition ) {
 
@@ -84,7 +82,7 @@ 
 	 *
 	 * Updates the count of actions taken
 	 *
-	 * @return boolean success
+	 * @return null|boolean success
 	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Braces +126 added lines, -51 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class addressbook_import_contacts_csv extends importexport_basic_import_csv  {
+class addressbook_import_contacts_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * conditions for actions
@@ -48,7 +49,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition &$_definition ) {
+	public function init(importexport_definition &$_definition )
+	{
 
 		// fetch the addressbook bo
 		$this->bocontacts = new Api\Contacts();
@@ -90,22 +92,29 @@ 
 	{
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($this->definition->plugin_options['owner_from_csv'] && $record->owner) {
-			if(!is_numeric($record->owner)) {
+		if($this->definition->plugin_options['owner_from_csv'] && $record->owner)
+		{
+			if(!is_numeric($record->owner))
+			{
 				// Automatically handle text owner without explicit translation
 				$new_owner = importexport_helper_functions::account_name2id($record->owner);
-				if($new_owner == '') {
+				if($new_owner == '')
+				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Unable to convert "%1" to account ID.  Using plugin setting (%2) for owner.',
 						$record->owner,
 						Api\Accounts::username($this->user)
 					);
 					$record->owner = $this->user;
-				} else {
+				}
+				else
+				{
 					$record->owner = $new_owner;
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$record->owner = $this->user;
 		}
 
@@ -141,26 +150,41 @@ 
 		// Also handle categories in their own field
 		$record_array = $record->get_record_array();
 		$more_categories = array();
-		foreach($this->definition->plugin_options['field_mapping'] as $field_name) {
+		foreach($this->definition->plugin_options['field_mapping'] as $field_name)
+		{
 			if(!array_key_exists($field_name, $record_array) ||
-				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id') continue;
+				substr($field_name,0,3) != 'cat' || !$record->$field_name || $field_name == 'cat_id')
+			{
+				continue;
+			}
 			list(, $cat_id) = explode('-', $field_name);
-			if(is_numeric($record->$field_name) && $record->$field_name != 1) {
+			if(is_numeric($record->$field_name) && $record->$field_name != 1)
+			{
 				// Column has a single category ID
 				$more_categories[] = $record->$field_name;
-			} elseif($record->$field_name == '1' ||
-				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes')))) {
+			}
+			elseif($record->$field_name == '1' ||
+				(!is_numeric($record->$field_name) && strtolower($record->$field_name) == strtolower(lang('Yes'))))
+			{
 				// Each category got its own column.  '1' is the database value, lang('yes') is the human value
 				$more_categories[] = $cat_id;
-			} else {
+			}
+			else
+			{
 				// Text categories
 				$more_categories = array_merge($more_categories, importexport_helper_functions::cat_name2id(is_array($record->$field_name) ? $record->$field_name : explode(',',$record->$field_name), $cat_id));
 			}
 		}
-		if(count($more_categories) > 0) $record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		if(count($more_categories) > 0)
+		{
+			$record->cat_id = array_merge(is_array($record->cat_id) ? $record->cat_id : explode(',',$record->cat_id), $more_categories);
+		}
 
 		// Private set but missing causes hidden entries
-		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
+		if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == ''))
+		{
+			unset($record->private);
+		}
 
 		// Format birthday as backend requires - converter should give timestamp
 		if($record->bday && is_numeric($record->bday))
@@ -169,17 +193,24 @@ 
 			$record->bday = $time->format('Y-m-d');
 		}
 
-		if ( $this->definition->plugin_options['conditions'] ) {
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+		if ( $this->definition->plugin_options['conditions'] )
+		{
+			foreach ( $this->definition->plugin_options['conditions'] as $condition )
+			{
 				$contacts = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
-						if($record_array[$condition['string']]) {
+						if($record_array[$condition['string']])
+						{
 							$searchcondition = array( $condition['string'] => $record_array[$condition['string']]);
 							// if we use account_id for the condition, we need to set the owner for filtering, as this
 							// enables Api\Contacts\Storage to decide what backend is to be used
-							if ($condition['string']=='account_id') $searchcondition['owner']=0;
+							if ($condition['string']=='account_id')
+							{
+								$searchcondition['owner']=0;
+							}
 							$contacts = $this->bocontacts->search(
 								//array( $condition['string'] => $record[$condition['string']],),
 								'',
@@ -188,19 +219,30 @@ 
 								$searchcondition
 							);
 						}
-						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 ) {
+						if ( is_array( $contacts ) && count( array_keys( $contacts ) ) >= 1 )
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$contacts as $contact ) {
+							foreach ( (array)$contacts as $contact )
+							{
 								$record->id = $contact['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-									if ( !is_array( $record_array['cat_id'] ) ) $record->cat_id = explode( ',', $record->cat_id );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $contact['cat_id'] ) )
+									{
+										$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+									}
+									if ( !is_array( $record_array['cat_id'] ) )
+									{
+										$record->cat_id = explode( ',', $record->cat_id );
+									}
 									$record->cat_id = implode( ',', array_unique( array_merge( $record->cat_id, $contact['cat_id'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -227,9 +269,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['stop']) break;
+				if ($action['stop'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -243,15 +290,18 @@ 
 	 * @param importexport_iface_egw_record $record contact data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'delete':
 				if($_data['id'])
 				{
-					if ( $this->dry_run ) {
+					if ( $this->dry_run )
+					{
 						//print_r($_data);
 						$this->results[$_action]++;
 						return true;
@@ -272,14 +322,20 @@ 
 				// Only update if there are changes
 				$old = $this->bocontacts->read($_data['id']);
 				// if we get countrycodes as countryname, try to translate them -> the rest should be handled by bo classes.
-				foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
+				foreach(array('adr_one_', 'adr_two_') as $c_prefix)
+				{
 					if (strlen(trim($_data[$c_prefix.'countryname']))==2)
-						$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true);
+					{
+											$_data[$c_prefix.'countryname'] = $GLOBALS['egw']->country->get_full_name(trim($_data[$c_prefix.'countryname']), true);
+					}
 				}
 				// Don't change a user account into a contact
-				if($old['owner'] == 0) {
+				if($old['owner'] == 0)
+				{
 					unset($_data['owner']);
-				} elseif(!$this->definition->plugin_options['change_owner']) {
+				}
+				elseif(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -287,9 +343,12 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
-				} else {
+				}
+				else
+				{
 					//error_log(__METHOD__.__LINE__.array2string($changed).' Old:'.$old['adr_one_countryname'].' ('.$old['adr_one_countrycode'].') New:'.$_data['adr_one_countryname'].' ('.$_data['adr_one_countryname'].')');
 				}
 
@@ -298,24 +357,32 @@ 
 
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Addressbook backend doesn't like inserting with ID specified, it screws up the owner & etag
 					unset($_data['id']);
 				}
-				if(!isset($_data['org_name'])) {
+				if(!isset($_data['org_name']))
+				{
 					// org_name is a trigger to update n_fileas
 					$_data['org_name'] = '';
 				}
 
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bocontacts->save( $_data, $this->is_admin);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors[$record_num] = $this->bocontacts->error;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						// This does nothing (yet?) but update the identifier
 						$record->save($result);
@@ -333,7 +400,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook CSV import');
 	}
 
@@ -342,7 +410,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports contacts into your Addressbook from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -351,7 +420,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -367,7 +437,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -376,7 +447,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -388,7 +460,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -400,7 +473,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -412,7 +486,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }

addressbook/inc/class.addressbook_ui.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -1027,7 +1027,7 @@ 
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 contacts 'deleted'
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
-	 * @return boolean true if all actions succeded, false otherwise
+	 * @return null|boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg, $checkboxes = NULL)
 	{
@@ -1887,9 +1887,7 @@ 
 	/**
 	* Edit a contact
 	*
-	* @param array $content=null submitted content
-	* @param int $_GET['contact_id'] contact_id mainly for popup use
-	* @param bool $_GET['makecp'] true if you want to copy the contact given by $_GET['contact_id']
+	* @param array $content submitted content
 	*/
 	function edit($content=null)
 	{

Braces +363 added lines, -94 removed lines

@@ -92,7 +92,10 @@ 
 		);
 
 		// make sure the hook for export_limit is registered
-		if (!Api\Hooks::exists('export_limit','addressbook')) Api\Hooks::read(true);
+		if (!Api\Hooks::exists('export_limit','addressbook'))
+		{
+			Api\Hooks::read(true);
+		}
 
 		$this->config =& $GLOBALS['egw_info']['server'];
 
@@ -131,15 +134,21 @@ 
 		{
 			$do_email = $_content['do_email'];
 
-			if (isset($_content['nm']['rows']['delete']))	// handle a single delete like delete with the checkboxes
+			if (isset($_content['nm']['rows']['delete']))
+			{
+				// handle a single delete like delete with the checkboxes
 			{
 				list($id) = @each($_content['nm']['rows']['delete']);
+			}
 				$_content['nm']['action'] = 'delete';
 				$_content['nm']['selected'] = array($id);
 			}
-			if (isset($_content['nm']['rows']['document']))	// handle insert in default document button like an action
+			if (isset($_content['nm']['rows']['document']))
+			{
+				// handle insert in default document button like an action
 			{
 				list($id) = @each($_content['nm']['rows']['document']);
+			}
 				$_content['nm']['action'] = 'document';
 				$_content['nm']['selected'] = array($id);
 			}
@@ -149,10 +158,13 @@ 
 				{
 					$msg = lang('You need to select some contacts first');
 				}
-				elseif ($_content['nm']['action'] == 'view_org')	// org-view via context menu
+				elseif ($_content['nm']['action'] == 'view_org')
+				{
+					// org-view via context menu
 				{
 					$_content['nm']['org_view'] = array_shift($_content['nm']['selected']);
 				}
+				}
 				else
 				{
 					$success = $failed = $action_msg = null;
@@ -175,10 +187,13 @@ 
 				list($org) = each($_content['nm']['rows']['infolog']);
 				return $this->infolog_org_view($org);
 			}
-			if ($_content['nm']['rows']['view'])	// show all contacts of an organisation
+			if ($_content['nm']['rows']['view'])
+			{
+				// show all contacts of an organisation
 			{
 				list($org_view) = each($_content['nm']['rows']['view']);
 			}
+			}
 			else
 			{
 				$org_view = $_content['nm']['org_view'];
@@ -271,10 +286,14 @@ 
 		}
 
 		// Search parameter passed in
-		if ($_GET['search']) {
+		if ($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if (isset($typeselection)) $content['nm']['col_filter']['tid'] = $typeselection;
+		if (isset($typeselection))
+		{
+			$content['nm']['col_filter']['tid'] = $typeselection;
+		}
 		// save the tid for use in creating new addressbook entrys via UI. Current tid is to be used as type of new entrys
 		//error_log(__METHOD__.__LINE__.' '.$content['nm']['col_filter']['tid']);
 		Api\Cache::setSession('addressbook','active_tid',$content['nm']['col_filter']['tid']);
@@ -312,7 +331,10 @@ 
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('No country selected');
 
 		// if there is any export limit set, pass it on to the nextmatch, to be evaluated by the export
-		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit']) $content['nm']['export_limit']=$this->config['contact_export_limit'];
+		if (isset($this->config['contact_export_limit']) && (int)$this->config['contact_export_limit'])
+		{
+			$content['nm']['export_limit']=$this->config['contact_export_limit'];
+		}
 
 		// dont show tid-selection if we have only one content_type
 		// be a bit more sophisticated about it
@@ -322,7 +344,10 @@ 
 			//_debug_array(array('Typefilter:'=> $content['nm']['col_filter']['tid'],'Available Types:'=>$availabletypes,'action:'=>'remove invalid filter'));
 			unset($content['nm']['col_filter']['tid']);
 		}
-		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
+		if (!isset($content['nm']['col_filter']['tid']))
+		{
+			$content['nm']['col_filter']['tid'] = $availabletypes[0];
+		}
 		if (count($this->content_types) > 1)
 		{
 			foreach($this->content_types as $tid => $data)
@@ -421,7 +446,10 @@ 
 		$crm_apps = array('infolog','tracker');
 		foreach($crm_apps as $app)
 		{
-			if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
+			if ($GLOBALS['egw_info']['user']['apps'][$app])
+			{
+				$crm_count++;
+			}
 		}
 		if($crm_count > 1)
 		{
@@ -477,7 +505,10 @@ 
 				),
 			),
 		);
-		if (!$GLOBALS['egw_info']['user']['apps']['preferences']) unset($actions['cats']['children']['cat_edit']);
+		if (!$GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			unset($actions['cats']['children']['cat_edit']);
+		}
 		// Submenu for all distributionlist stuff
 		$actions['lists'] = array(
 			'caption' => 'Distribution lists',
@@ -490,7 +521,9 @@ 
 			),
 			'group' => $group,
 		);
-		if (($add_lists = $this->get_lists(Acl::EDIT)))	// do we have distribution lists?, and are we allowed to edit them
+		if (($add_lists = $this->get_lists(Acl::EDIT)))
+		{
+			// do we have distribution lists?, and are we allowed to edit them
 		{
 			$actions['lists']['children'] += array(
 				'to_list' => array(
@@ -526,6 +559,7 @@ 
 					'fieldValue' => '!',	// enable if list != ''
 				),
 			);
+		}
 			if(is_subclass_of('etemplate', 'etemplate_new'))
 			{
 				$actions['lists']['children']['remove_from_list']['fieldId'] = 'filter2';
@@ -534,9 +568,13 @@ 
 			}
 		}
 		// move to AB
-		if (($move2addressbooks = $this->get_addressbooks(Acl::ADD)))	// do we have addressbooks, we should
+		if (($move2addressbooks = $this->get_addressbooks(Acl::ADD)))
 		{
-			unset($move2addressbooks[0]);	// do not offer action to move contact to an account, as we dont support that currrently
+			// do we have addressbooks, we should
+		{
+			unset($move2addressbooks[0]);
+		}
+		// do not offer action to move contact to an account, as we dont support that currrently
 			foreach($move2addressbooks as $owner => $label)
 			{
 				$icon = $type_label = null;
@@ -667,7 +705,9 @@ 
 
 			);
 		if (!$this->prefs['preferredMail'])
-			$actions['email']['children']['email_business']['checked'] = true;
+		{
+					$actions['email']['children']['email_business']['checked'] = true;
+		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
@@ -811,11 +851,17 @@ 
 	private function _get_org_name($org)
 	{
 		$org_name = array();
-		if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		if (strpos($org,'*AND*')!== false)
+		{
+			$org = str_replace('*AND*','&',$org);
+		}
 		foreach(explode('|||',$org) as $part)
 		{
 			list(,$name) = explode(':',$part,2);
-			if ($name) $org_name[] = $name;
+			if ($name)
+			{
+				$org_name[] = $name;
+			}
 		}
 		$name = implode(': ',$org_name);
 		return $name ? array($org => $name) : array();
@@ -877,9 +923,15 @@ 
 		$org_contacts = array();
 		$query = !$_query ? Api\Cache::getSession('addressbook', 'index') : $_query;
 		$query['num_rows'] = -1;	// all
-		if(!is_array($query['col_filter'])) $query['col_filter'] = array();
+		if(!is_array($query['col_filter']))
+		{
+			$query['col_filter'] = array();
+		}
 
-		if(!is_array($org)) $org = array($org);
+		if(!is_array($org))
+		{
+			$org = array($org);
+		}
 		foreach($org as $org_name)
 		{
 			$query['org_view'] = $org_name;
@@ -908,14 +960,23 @@ 
 		$checked = $readonlys = null;
 		$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
 
-		if (count($checked) > 1)	// use a nicely formatted org-name as title in infolog
+		if (count($checked) > 1)
+		{
+			// use a nicely formatted org-name as title in infolog
 		{
 			$parts = array();
-			if (strpos($org,'*AND*')!== false) $org = str_replace('*AND*','&',$org);
+		}
+			if (strpos($org,'*AND*')!== false)
+			{
+				$org = str_replace('*AND*','&',$org);
+			}
 			foreach(explode('|||',$org) as $part)
 			{
 				list(,$part) = explode(':',$part,2);
-				if ($part) $parts[] = $part;
+				if ($part)
+				{
+					$parts[] = $part;
+				}
 			}
 			$org = implode(', ',$parts);
 		}
@@ -940,13 +1001,19 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if ($success) $response->addScript(Framework::set_onload(''));
+		if ($success)
+		{
+			$response->addScript(Framework::set_onload(''));
+		}
 
 		// close window only if no errors AND something added
 		if ($failed || !$success)
 		{
-			if (!$msg) $msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed) :
+			if (!$msg)
+			{
+				$msg = $failed ? lang('%1 contact(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed) :
 				lang('%1 contact(s) %2',$success,$action_msg);
+			}
 
 			$response->addScript("alert('".addslashes($msg)."')");
 			// reset the filter
@@ -954,7 +1021,10 @@ 
 		}
 		else
 		{
-			if (!$msg) $msg = lang('%1 contact(s) %2',$success,$action_msg);
+			if (!$msg)
+			{
+				$msg = lang('%1 contact(s) %2',$success,$action_msg);
+			}
 			$response->addScript("alert('".addslashes($msg)."')");
 			$response->addScript('egw(window).close();');
 		}
@@ -1063,10 +1133,16 @@ 
 				unset($query['filter2']);
 				$extra = $readonlys = null;
 				$this->get_rows($query,$extra,$readonlys,true);	// true = only return the id's
-				if ($extra[0]) $org_contacts = array_merge($org_contacts,$extra);
+				if ($extra[0])
+				{
+					$org_contacts = array_merge($org_contacts,$extra);
+				}
 			}
 		}
-		if ($org_contacts) $checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		if ($org_contacts)
+		{
+			$checked = array_unique($checked ? array_merge($checked,$org_contacts) : $org_contacts);
+		}
 		//_debug_array($checked); exit;
 
 		if (substr($action,0,8) == 'move_to_')
@@ -1083,9 +1159,12 @@ 
 			$document = substr($action,9);
 			$action = 'document';
 		}
-		elseif(substr($action,0,4) == 'cat_')	// cat_add_123 or cat_del_456
+		elseif(substr($action,0,4) == 'cat_')
+		{
+			// cat_add_123 or cat_del_456
 		{
 			$cat_id = (int)substr($action, 8);
+		}
 			$action = substr($action,0,7);
 		}
 		// Security: stop non-admins to export more then the configured number of contacts
@@ -1132,7 +1211,10 @@ 
 				return false;
 
 			case 'document':
-				if (!$document) $document = $this->prefs['default_document'];
+				if (!$document)
+				{
+					$document = $this->prefs['default_document'];
+				}
 				$document_merge = new Api\Contacts\Merge();
 				$msg = $document_merge->download($document, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1284,19 +1366,25 @@ 
 					break;
 
 				default:	// move to an other addressbook
-					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))	// might be ADD in the future
+					if (!(int)$action || !($this->grants[(string) (int) $action] & Acl::EDIT))
+					{
+						// might be ADD in the future
 					{
 						return false;
 					}
+					}
 					if (!$checkboxes['move_to_copy'])
 					{
 						$action_msg = lang('moved');
 						if (($Ok = !!($contact = $this->read($id)) && $this->check_perms(Acl::DELETE,$contact)))
 						{
-							if (!$contact['owner'])		// no (mass-)move of Api\Accounts
+							if (!$contact['owner'])
+							{
+								// no (mass-)move of Api\Accounts
 							{
 								$Ok = false;
 							}
+							}
 							elseif ($contact['owner'] != (int)$action || $contact['private'] != (int)(substr($action,-1) == 'p'))
 							{
 								$contact['owner'] = (int) $action;
@@ -1385,9 +1473,12 @@ 
 		$do_email = $query['do_email'];
 		$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
 
-		if (!$id_only && !$query['csv_export'])	// do NOT store state for csv_export or querying id's (no regular view)
+		if (!$id_only && !$query['csv_export'])
+		{
+			// do NOT store state for csv_export or querying id's (no regular view)
 		{
 			$store_query = $query;
+		}
 			// Do not store these
 			foreach(array('options-cat_id','actions') as $key)
 			{
@@ -1399,14 +1490,25 @@ 
 		{
 			$old_state = Api\Cache::getSession('addressbook', $what);
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)
+		{
+			// we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
-			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
-			if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
+		}
+			if (isset($query['col_filter']['adr_one_locality']))
+			{
+				unset($query['col_filter']['adr_one_locality']);
+			}
+			if (isset($query['col_filter']['org_unit']))
+			{
+				unset($query['col_filter']['org_unit']);
+			}
 		}
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view, reset the advanced search
+		if (isset($this->org_views[(string) $query['org_view']]))
+		{
+			// we have an org view, reset the advanced search
 		{
 			//_debug_array(array('Search'=>$query['search'],
 			//	'AdvancedSearch'=>$query['advanced_search']));
@@ -1414,10 +1516,14 @@ 
 			//unset($query['advanced_search']);
 			if(!$query['search'] && $old_state['advanced_search']) $query['advanced_search'] = $old_state['advanced_search'];
 		}
-		elseif(!$query['search'] && $old_state['advanced_search'])	// eg. paging in an advanced search
+		}
+		elseif(!$query['search'] && $old_state['advanced_search'])
+		{
+			// eg. paging in an advanced search
 		{
 			$query['advanced_search'] = $old_state['advanced_search'];
 		}
+		}
 		/* this cant work anymore, as Framework::set_onload no longer exists
 		if ($do_email && etemplate::$loop)
 		{	// remove previous addEmail() calls, otherwise they will be run again
@@ -1427,11 +1533,13 @@ 
 		// Make sure old lettersearch filter doesn't stay - current letter filter will be added later
 		foreach($query['col_filter'] as $key => $col_filter)
 		{
-			if(!is_numeric($key)) continue;
+			if(!is_numeric($key))
+			{
+				continue;
+			}
 			if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
 				' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1
-			)
-			{
+			) {
 				unset($query['col_filter'][$key]);
 			}
 		}
@@ -1442,9 +1550,13 @@ 
 			// check if accounts are stored in ldap, which does NOT yet support the org-views
 			if ($this->so_accounts && $query['filter'] === '0' && $query['org_view'])
 			{
-				if ($old_state['filter'] === '0')	// user changed to org_view
+				if ($old_state['filter'] === '0')
 				{
-					$query['filter'] = '';			// --> change filter to all contacts
+					// user changed to org_view
+				{
+					$query['filter'] = '';
+				}
+				// --> change filter to all contacts
 				}
 				else								// user changed to accounts
 				{
@@ -1481,9 +1593,12 @@ 
 		{
 			unset($query['col_filter']['cat_id']);
 		}
-		if ($query['filter'] !== '')	// not all addressbooks
+		if ($query['filter'] !== '')
+		{
+			// not all addressbooks
 		{
 			$query['col_filter']['owner'] = (string) (int) $query['filter'];
+		}
 
 			if ($this->private_addressbook)
 			{
@@ -1495,10 +1610,13 @@ 
 			unset($query['col_filter']['owner']);
 			unset($query['col_filter']['private']);
 		}
-		if ((int)$query['filter2'])	// not no distribution list
+		if ((int)$query['filter2'])
+		{
+			// not no distribution list
 		{
 			$query['col_filter']['list'] = (string) (int) $query['filter2'];
 		}
+		}
 		else
 		{
 			unset($query['col_filter']['list']);
@@ -1510,10 +1628,13 @@ 
 		// enable/disable distribution lists depending on backend
 		$query['no_filter2'] = !$this->lists_available($query['filter']);
 
-		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])	// we have an org view
+		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])
+		{
+			// we have an org view
 		{
 			// Query doesn't like empties
 			unset($query['col_filter']['parent_id']);
+		}
 
 			if($query['actions'] && $query['actions']['open'])
 			{
@@ -1566,9 +1687,12 @@ 
 			}
 			// Query doesn't like parent_id
 			unset($query['col_filter']['parent_id']);
-			if ($query['org_view'])	// view the contacts of one organisation only
+			if ($query['org_view'])
+			{
+				// view the contacts of one organisation only
 			{
 				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
+			}
 				foreach(explode('|||',$query['org_view']) as $part)
 				{
 					list($name,$value) = explode(':',$part,2);
@@ -1587,14 +1711,18 @@ 
 			// translate the select order to the really used over all 3 columns
 			$sort = $query['sort'];
 			switch($query['order'])		// "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end
-			{							// we don't exclude them, as the total would otherwise depend on the order-criteria
+			{
+// we don't exclude them, as the total would otherwise depend on the order-criteria
 				case 'org_name':
 					$order = "egw_addressbook.org_name<>''DESC,egw_addressbook.org_name $sort,n_family $sort,n_given $sort";
 					break;
 				default:
-					if ($query['order'][0] == '#')	// we order by a custom field
+					if ($query['order'][0] == '#')
+					{
+						// we order by a custom field
 					{
 						$order = "{$query['order']} $sort,org_name $sort,n_family $sort,n_given $sort";
+					}
 						break;
 					}
 					$query['order'] = 'n_family';
@@ -1618,9 +1746,12 @@ 
 				case 'contact_id':
 					$order = "egw_addressbook.$query[order] $sort";
 			}
-			if ($query['searchletter'])	// only show contacts if the order-criteria starts with the given letter
+			if ($query['searchletter'])
+			{
+				// only show contacts if the order-criteria starts with the given letter
 			{
 				$no_letter_search = array('adr_one_postalcode', 'adr_two_postalcode', 'contact_id', 'contact_created','contact_modified');
+			}
 				$query['col_filter'][] = (in_array($query['order'],$no_letter_search) ? 'org_name' : (substr($query['order'],0,1)=='#'?'':'egw_addressbook.').$query['order']).' '.
 					$GLOBALS['egw']->db->capabilities['case_insensitive_like'].' '.$GLOBALS['egw']->db->quote(strtolower($query['searchletter']).'%');
 			}
@@ -1658,11 +1789,17 @@ 
 					{
 						foreach($columselection as $col)
 						{
-							if ($col[0] == '#') $selected_cfs[] = substr($col,1);
+							if ($col[0] == '#')
+							{
+								$selected_cfs[] = substr($col,1);
+							}
 						}
 						$customfields = $this->read_customfields($ids,$selected_cfs);
 					}
-					if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($ids);
+					if ($show_calendar && !empty($ids))
+					{
+						$calendar = $this->read_calendar($ids);
+					}
 					// distributionlist memership for the entrys
 					//_debug_array($this->get_lists(Acl::EDIT));
 					if ($show_distributionlist && $available_distib_lists)
@@ -1672,7 +1809,10 @@ 
 				}
 			}
 		}
-		if (!$rows) $rows = array();
+		if (!$rows)
+		{
+			$rows = array();
+		}
 
 		if ($id_only)
 		{
@@ -1705,7 +1845,10 @@ 
 					$row['line2'] = $row['org_name'];
 					break;
 				case 'n_fileas':
-					if (!$row['n_fileas']) $row['n_fileas'] = $this->fileas($row);
+					if (!$row['n_fileas'])
+					{
+						$row['n_fileas'] = $this->fileas($row);
+					}
 					list($row['line1'],$row['line2']) = explode(': ',$row['n_fileas']);
 					break;
 			}
@@ -1779,8 +1922,14 @@ 
 			}
 
 			// hide region for address format 'postcode_city'
-			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city') unset($row['adr_one_region']);
-			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city') unset($row['adr_two_region']);
+			if (($row['addr_format']  = $this->addr_format_by_country($row['adr_one_countryname']))=='postcode_city')
+			{
+				unset($row['adr_one_region']);
+			}
+			if (($row['addr_format2'] = $this->addr_format_by_country($row['adr_two_countryname']))=='postcode_city')
+			{
+				unset($row['adr_two_region']);
+			}
 
 			// respect category permissions
 			if(!empty($row['cat_id']))
@@ -1791,7 +1940,10 @@ 
 		$rows['no_distribution_list'] = (bool)$query['filter2'];
 
 		// disable customfields column, if we have no customefield(s)
-		if (!$this->customfields) $rows['no_customfields'] = true;
+		if (!$this->customfields)
+		{
+			$rows['no_customfields'] = true;
+		}
 
 		$rows['order'] = $order;
 		$rows['call_popup'] = $this->config['call_popup'];
@@ -1830,10 +1982,13 @@ 
 			$order = $order == 'n_given' ? lang('first name') : ($order == 'n_family' ? lang('last name') : lang('Organisation'));
 			$header[] = lang("%1 starts with '%2'",$order,$query['searchletter']);
 		}
-		if ($query['search'] && !$query['advanced_search']) // do not add that, if we have advanced search active
+		if ($query['search'] && !$query['advanced_search'])
+		{
+			// do not add that, if we have advanced search active
 		{
 			$header[] = lang("Search for '%1'",$query['search']);
 		}
+		}
 		$GLOBALS['egw_info']['flags']['app_header'] = implode(': ', $header);
 
 		return $this->total;
@@ -1900,7 +2055,10 @@ 
 			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
 			$content['owner'] = (string) (int) $content['owner'];
 			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
-			if ($this->config['private_cf_tab']) $content = (array)$content['private_cfs'] + $content;
+			if ($this->config['private_cf_tab'])
+			{
+				$content = (array)$content['private_cfs'] + $content;
+			}
 			unset($content['private_cfs']);
 
 			switch($button)
@@ -2097,7 +2255,10 @@ 
 				{
 					// arguments containing a comma get quoted by etemplate/js/nextmatch_action.js
 					// leading to error in Api\Db::column_data_implode, if not unquoted
-					if ($org[0] == '"') $org = substr($org, 1, -1);
+					if ($org[0] == '"')
+					{
+						$org = substr($org, 1, -1);
+					}
 					$content = $this->read_org($org);
 				}
 				elseif ($state['org_view'] && !isset($this->org_views[$state['org_view']]))
@@ -2117,7 +2278,10 @@ 
 						$content['adr_two_countryname'] =
 							$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']);
 					}
-					if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default'];
+					if ($this->prefs['fileas_default'])
+					{
+						$content['fileas_type'] = $this->prefs['fileas_default'];
+					}
 				}
 				if (isset($_GET['owner']) && $_GET['owner'] !== '')
 				{
@@ -2142,7 +2306,10 @@ 
 				$new_type = array_keys($this->content_types);
 				// fetch active type to preset the type, if param typeid is not passed
 				$active_tid = Api\Cache::getSession('addressbook','active_tid');
-				if ($active_tid && strtoupper($active_tid) === 'D') unset($active_tid);
+				if ($active_tid && strtoupper($active_tid) === 'D')
+				{
+					unset($active_tid);
+				}
 				$content['tid'] = $_GET['typeid'] ? $_GET['typeid'] : ($active_tid?$active_tid:$new_type[0]);
 				foreach($this->get_contact_columns() as $field)
 				{
@@ -2160,19 +2327,37 @@ 
 									if (strpos($singleAddress[0]->personal,',')===false)
 									{
 										list($P_n_given,$P_n_family,$P_org_name)=explode(' ',$singleAddress[0]->personal,3);
-										if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
-										if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+										if (strlen(trim($P_n_given))>0)
+										{
+											$content['n_given'] = trim($P_n_given);
+										}
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
+										if (strlen(trim($P_org_name))>0)
+										{
+											$content['org_name'] = trim($P_org_name);
+										}
 									}
 									else
 									{
 										list($P_n_family,$P_other)=explode(',',$singleAddress[0]->personal,2);
-										if (strlen(trim($P_n_family))>0) $content['n_family'] = trim($P_n_family);
+										if (strlen(trim($P_n_family))>0)
+										{
+											$content['n_family'] = trim($P_n_family);
+										}
 										if (strlen(trim($P_other))>0)
 										{
 											list($P_n_given,$P_org_name)=explode(',',$P_other,2);
-											if (strlen(trim($P_n_given))>0) $content['n_given'] = trim($P_n_given);
-											if (strlen(trim($P_org_name))>0) $content['org_name'] = trim($P_org_name);
+											if (strlen(trim($P_n_given))>0)
+											{
+												$content['n_given'] = trim($P_n_given);
+											}
+											if (strlen(trim($P_org_name))>0)
+											{
+												$content['org_name'] = trim($P_org_name);
+											}
 										}
 									}
 								}
@@ -2200,7 +2385,10 @@ 
 							break;
 						}
 					}
-					if (empty($content['n_fn'])) $content['n_fn'] = $this->fullname($content);
+					if (empty($content['n_fn']))
+					{
+						$content['n_fn'] = $this->fullname($content);
+					}
 				}
 				$content['creator'] = $this->user;
 				$content['created'] = $this->now_su;
@@ -2208,17 +2396,27 @@ 
 				//_debug_array($content);
 			}
 
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
-			if($content && $_GET['makecp'])	// copy the contact
+			if($content && $_GET['makecp'])
+			{
+				// copy the contact
 			{
 				$this->copy_contact($content);
+			}
 				$content['msg'] = lang('Contact copied');
 				$view = false;
 			}
 			else
 			{
-				if (is_numeric($contact_id)) $content['link_to']['to_id'] = $contact_id;
+				if (is_numeric($contact_id))
+				{
+					$content['link_to']['to_id'] = $contact_id;
+				}
 			}
 			// automatic link new entries to entries specified in the url
 			if (!$contact_id && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
@@ -2227,10 +2425,13 @@ 
 				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+					if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+					{
+						// gard against XSS
 					{
 						Link::link('addressbook',$content['link_to']['to_id'],$link_app,$link_id);
 					}
+					}
 				}
 			}
 		}
@@ -2238,7 +2439,10 @@ 
 		{
 			// last and next calendar date
 			list(,$dates) = each($this->read_calendar(array($content['id']),false));
-			if(is_array($dates)) $content += $dates;
+			if(is_array($dates))
+			{
+				$content += $dates;
+			}
 		}
 		// Avoid ID conflict with tree & selectboxes
 		$content['cat_id_tree'] = $content['cat_id'];
@@ -2272,7 +2476,11 @@ 
 		$sel_options['fileas_type'] = $this->fileas_options($content);
 		$sel_options['adr_one_countrycode']['-custom-'] = lang('Custom');
 		$sel_options['owner'] = $this->get_addressbooks(Acl::ADD);
-		if ($content['owner']) unset($sel_options['owner'][0]);	// do not offer to switch to accounts, as we do not support moving contacts to accounts
+		if ($content['owner'])
+		{
+			unset($sel_options['owner'][0]);
+		}
+		// do not offer to switch to accounts, as we do not support moving contacts to accounts
 		if ((string) $content['owner'] !== '')
 		{
 			if (!isset($sel_options['owner'][(int)$content['owner']]))
@@ -2299,7 +2507,10 @@ 
 				$readonlys[$field] = false;
 			}
 		}
-		if (isset($readonlys['n_fileas'])) $readonlys['fileas_type'] = $readonlys['n_fileas'];
+		if (isset($readonlys['n_fileas']))
+		{
+			$readonlys['fileas_type'] = $readonlys['n_fileas'];
+		}
 		// disable not needed tabs
 		$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
 		$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
@@ -2307,8 +2518,14 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if (!$content['id']) $readonlys['button[delete]'] = !$content['id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if (!$content['id'])
+		{
+			$readonlys['button[delete]'] = !$content['id'];
+		}
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 		$readonlys['change_org'] = empty($content['org_name']) || $view;
 
 		// for editing the own account (by a non-admin), enable only the fields allowed via the "own_account_acl"
@@ -2356,7 +2573,10 @@ 
 
 		$content['photo'] = $this->photo_src($content['id'],$content['jpegphoto'],'photo',$content['etag']);
 
-		if ($content['private']) $content['owner'] .= 'p';
+		if ($content['private'])
+		{
+			$content['owner'] .= 'p';
+		}
 
 		// for custom types, check if we have a custom edit template named "addressbook.edit.$type", $type is the name
 		if (in_array($content['tid'], array('n',self::DELETED_TYPE)) || !$this->tmpl->read('addressbook.edit.'.$this->content_types[$content['tid']]['name']))
@@ -2378,7 +2598,10 @@ 
 		//error_log(__METHOD__."() hook_data=".array2string($hook_data));
 		foreach($hook_data as $extra_tabs)
 		{
-			if (!$extra_tabs) continue;
+			if (!$extra_tabs)
+			{
+				continue;
+			}
 
 			foreach(isset($extra_tabs[0]) ? $extra_tabs : array($extra_tabs) as $extra_tab)
 			{
@@ -2395,7 +2618,10 @@ 
 					$readonlys = array_merge($readonlys, $extra_tab['readonlys']);
 				}
 				// we must NOT add tabs and callbacks more then once!
-				if (!$first_call) continue;
+				if (!$first_call)
+				{
+					continue;
+				}
 
 				if (!empty($extra_tab['pre_save_callback']))
 				{
@@ -2479,20 +2705,27 @@ 
 	public function ajax_check_values($values, $name, $own_id=0)
 	{
 		$matches = null;
-		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches)) $name = $matches[1];	// remove exec[ ]
+		if (preg_match('/^exec\[([^\]]+)\]$/', $name, $matches))
+		{
+			$name = $matches[1];
+		}
+		// remove exec[ ]
 
 		$ret = array('doublicates' => array(), 'msg' => null);
 
 		// if email changed, check for doublicates
 		if (in_array($name, array('email', 'email_home')))
 		{
-			if (preg_match('/^'.url_widget::EMAIL_PREG.'$/i', $values[$name]))	// only search for real email addresses, to not return to many contacts
+			if (preg_match('/^'.url_widget::EMAIL_PREG.'$/i', $values[$name]))
+			{
+				// only search for real email addresses, to not return to many contacts
 			{
 				$contacts = parent::search(array(
 					'email' => $values[$name],
 					'email_home' => $values[$name],
 				), false, '', '', '', false, 'OR');
 			}
+			}
 		}
 		else
 		{
@@ -2506,10 +2739,13 @@ 
 				!empty($values['n_given'])+!empty($values['n_family'])+!empty($values['org_name']) >= 2)
 			{
 				$filter = array();
-				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)	// use email too, to exclude obvious false positives
+				foreach(array('email', 'n_given', 'n_family', 'org_name') as $n)
+				{
+					// use email too, to exclude obvious false positives
 				{
 					if (!empty($values[$n])) $filter[$n] = $values[$n];
 				}
+				}
 				$contacts = parent::search('', false, '', '', '', false, 'AND', false, $filter);
 			}
 		}
@@ -2517,7 +2753,10 @@ 
 		{
 			foreach($contacts as $contact)
 			{
-				if ($own_id && $contact['id'] == $own_id) continue;
+				if ($own_id && $contact['id'] == $own_id)
+				{
+					continue;
+				}
 
 				$ret['doublicates'][$contact['id']] = $this->fileas($contact).' ('.
 					(!$contact['owner'] ? lang('Accounts') : ($contact['owner'] == $this->user ?
@@ -2544,7 +2783,10 @@ 
 		// CRM list comes from content, request, or preference
 		$crm_list = $content['crm_list'] ? $content['crm_list'] :
 			($_GET['crm_list'] ? $_GET['crm_list'] : $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list']);
-		if(!$crm_list || $crm_list == '~edit~') $crm_list = 'infolog';
+		if(!$crm_list || $crm_list == '~edit~')
+		{
+			$crm_list = 'infolog';
+		}
 
 		if(is_array($content))
 		{
@@ -2567,7 +2809,10 @@ 
 					$inc = 1;
 					// fall through
 				case 'back':
-					if (!isset($inc)) $inc = -1;
+					if (!isset($inc))
+					{
+						$inc = -1;
+					}
 					// get next/previous contact in selection
 					$query = Api\Cache::getSession('addressbook', 'index');
 					$query['start'] = $content['index'] + $inc;
@@ -2730,11 +2975,20 @@ 
 		$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
 		$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
 			$this->account_repository != 'sql' && $content['account_id'];
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		// last and next calendar date
-		if (!empty($content['id'])) list(,$dates) = each($this->read_calendar(array($content['id']),false));
-		if(is_array($dates)) $content += $dates;
+		if (!empty($content['id']))
+		{
+			list(,$dates) = each($this->read_calendar(array($content['id']),false));
+		}
+		if(is_array($dates))
+		{
+			$content += $dates;
+		}
 
 		// Disable importexport
 		$GLOBALS['egw_info']['flags']['disable_importexport']['export'] = true;
@@ -2813,7 +3067,10 @@ 
 	 */
 	function email2link($email)
 	{
-		if (strpos($email,'@') == false) return '';
+		if (strpos($email,'@') == false)
+		{
+			return '';
+		}
 
 		if($GLOBALS['egw_info']['user']['apps']['mail'])
 		{
@@ -2865,7 +3122,10 @@ 
 				$query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select'))));
 				foreach ($query['advanced_search'] as $key => $value)
 				{
-					if(!$value) unset($query['advanced_search'][$key]);
+					if(!$value)
+					{
+						unset($query['advanced_search'][$key]);
+					}
 				}
 				// Skip n_fn, it causes problems in sql
 				unset($query['advanced_search']['n_fn']);
@@ -2921,8 +3181,14 @@ 
 			{
 				if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
 				{
-					if (!isset($content['#'.$name])) $content['#'.$name] = '';
-					if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
+					if (!isset($content['#'.$name]))
+					{
+						$content['#'.$name] = '';
+					}
+					if(!isset($data['values']['']))
+					{
+						$sel_options['#'.$name][''] = lang('Select one');
+					}
 				}
 			}
 		}
@@ -2944,7 +3210,10 @@ 
 		$content['no_tid'] = true;
 		$content['showsearchbuttons'] = true; // enable search operation and search buttons| they're disabled by default
 
-		if ($this->config['private_cf_tab']) $content['no_private_cfs'] = 0;
+		if ($this->config['private_cf_tab'])
+		{
+			$content['no_private_cfs'] = 0;
+		}
 
 		$this->tmpl->read('addressbook.edit');
 		$this->tmpl->set_cell_attribute('change_org','disabled',true);

admin/admin-cli.php

Doc Comments -1 removed lines

@@ -532,7 +532,6 @@
 /**
  * Read the IMAP ACLs
  *
- * @param array $args admin-account[@domain],admin-password,accout_lid[,pw]
  * @return int 0 on success
  */
 function do_subscribe_other($account_lid,$pw=null)

Braces +37 added lines, -9 removed lines

@@ -17,10 +17,13 @@ 
 
 chdir(dirname(__FILE__));	// to enable our relative pathes to work
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling admin-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling admin-cli as web-page
 {
 	die('<h1>admin-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 elseif ($_SERVER['argc'] > 1)
 {
 	$arguments = $_SERVER['argv'];
@@ -87,13 +90,19 @@ 
 			foreach($arg0s as $arg)
 			{
 				list($name,$value) = explode('=',$arg,2);
-				if(property_exists('admin_cmd',$name))		// dont allow to overwrite admin_cmd properties
+				if(property_exists('admin_cmd',$name))
+				{
+					// dont allow to overwrite admin_cmd properties
 				{
 					throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
 				}
-				if (substr($name,-1) == ']')	// allow 1-dim. arrays
+				}
+				if (substr($name,-1) == ']')
+				{
+					// allow 1-dim. arrays
 				{
 					list($name,$sub) = explode('[',substr($name,0,-1),2);
+				}
 					$args[$name][$sub] = $value;
 				}
 				else
@@ -178,7 +187,10 @@ 
 		if (!$dry_run)
 		{
 			$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
-			if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			if ($url[0] == '/')
+			{
+				$url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
+			}
 			$data = file_get_contents($url, false, Framework::proxy_context($user,$arg0s[1]));
 			error_log("file_get_contents('$url') returned ".array2string($data));
 			if ($data && strpos($data, '"success"') !== false)
@@ -220,10 +232,13 @@ 
 		echo lang("Wrong admin-account or -password !!!")."\n\n";
 		usage('',1);
 	}
-	if (!$GLOBALS['egw_info']['user']['apps']['admin'])	// will be tested by the header too, but whould give html error-message
+	if (!$GLOBALS['egw_info']['user']['apps']['admin'])
+	{
+		// will be tested by the header too, but whould give html error-message
 	{
 		//fail(2,lang("Permission denied !!!"));
 		echo lang("Permission denied !!!")."\n\n";
+	}
 		usage('',2);
 	}
 	return $sessionid;
@@ -379,10 +394,13 @@ 
 	try {
 		admin_cmd::parse_account($account,false);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new group
 		unset($e);	// not used
@@ -424,9 +442,12 @@ 
 	if (($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' ||
 		 empty($GLOBALS['egw_info']['server']['account_repository']) && $GLOBALS['egw_info']['server']['auth_type'] == 'ldap') &&
 		$GLOBALS['egw_info']['server']['ldap_extra_attributes'] && count($args) > 9 &&	// 9 = primary group
-		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')	// last argument start with a slash
+		($last_arg = array_pop($dummy=$args)) && $last_arg[0] == '/')
+	{
+		// last argument start with a slash
 	{
 		$data['loginshell'] = array_pop($args);
+	}
 		$data['homedirectory'] = array_pop($args);
 	}
 	$data += array(
@@ -444,10 +465,13 @@ 
 	try {
 		admin_cmd::parse_account($account,true);
 
-		foreach($data as &$value)	// existing account --> empty values mean dont change, not set them empty!
+		foreach($data as &$value)
+		{
+			// existing account --> empty values mean dont change, not set them empty!
 		{
 			if ((string)$value === '') $value = null;
 		}
+		}
 	}
 	catch (Exception $e) {	// new account
 		unset($e);	// not used
@@ -488,7 +512,11 @@ 
  */
 function do_change_account_id($args)
 {
-	if (count($args) < 4) usage();	// 4 means at least user,pw,from1,to1
+	if (count($args) < 4)
+	{
+		usage();
+	}
+	// 4 means at least user,pw,from1,to1
 
 	$ids2change = array();
 	for($n = 2; $n < count($args); $n += 2)

admin/inc/class.admin_accesslog.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -255,11 +255,10 @@
 	 *
 	 * @param type $action
 	 * @param type $checked
-	 * @param type $use_all
 	 * @param type $success
 	 * @param int $failed
 	 * @param type $action_msg
-	 * @return type number of failed
+	 * @return boolean number of failed
 	 */
 	function action($action,$checked,&$success,&$failed,&$action_msg)
 	{

Braces +22 added lines, -7 removed lines

@@ -67,9 +67,13 @@ 
 	{
 		$heartbeat_limit = Api\Session::heartbeat_limit();
 
-		if ($query['session_list'])	// filter active sessions
+		if ($query['session_list'])
+		{
+			// filter active sessions
 		{
-			$query['col_filter']['lo'] = null;	// not logged out
+			$query['col_filter']['lo'] = null;
+		}
+		// not logged out
 			$query['col_filter'][0] = 'session_dla > '.(int)(time() - $GLOBALS['egw_info']['server']['sessions_timeout']);
 			switch((string)$query['session_list'])
 			{
@@ -100,12 +104,16 @@ 
 			{
 				$row['sessionstatus'] = $row['session_php'];
 			}
-			if ($row['lo']) {
+			if ($row['lo'])
+			{
 				$row['total'] = ($row['lo'] - $row['li']) / 60;
 				$row['sessionstatus'] = 'logged out';
 			}
 			// eg. for bad login or password
-			if (!$row['account_id']) $row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			if (!$row['account_id'])
+			{
+				$row['alt_loginid'] = ($row['loginid']?$row['loginid']:lang('none'));
+			}
 
 			// do not allow to kill or select own session
 			if ($GLOBALS['egw']->session->sessionid_access_log == $row['sessionid'] && $query['session_list'])
@@ -142,7 +150,10 @@ 
 	function index(array $content=null, $msg='', $sessions_list=false)
 	{
 
-		if (is_array($content)) $sessions_list = $content['nm']['session_list'];
+		if (is_array($content))
+		{
+			$sessions_list = $content['nm']['session_list'];
+		}
 
 		// check if user has access to requested functionality
 		if ($GLOBALS['egw']->acl->check($sessions_list ? 'current_sessions' : 'access_log_acces',1,'admin'))
@@ -215,7 +226,8 @@ 
 				$success = $failed = $action = $action_msg = null;
 				if ($this->action($content['nm']['action'],$content['nm']['selected']
 					,$success,$failed,$action_msg,$msg))
-				{ // In case of action success
+				{
+// In case of action success
 					switch ($action_msg)
 					{
 						case'deleted':
@@ -225,12 +237,15 @@ 
 							$msg = lang('%1 sessions killed',$success);
 					}
 				}
-				elseif($failed) // In case of action failiure
+				elseif($failed)
+				{
+					// In case of action failiure
 				{
 					switch ($action_msg)
 					{
 						case'deleted':
 							$msg = lang('Error deleting log entry!');
+				}
 							break;
 						case'killed':
 							$msg = lang('Permission denied!');

admin/inc/class.admin_categories.inc.php

Doc Comments +2 added lines

@@ -679,6 +679,8 @@
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like '%1 entries deleted'
 	 * @param array $query get_rows parameter
+	 * @param integer $success
+	 * @param integer $failed
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($_action, $checked, $use_all, &$success, &$failed, &$action_msg, array $query)

Braces +64 added lines, -17 removed lines

@@ -150,8 +150,14 @@ 
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if(is_array($content['owner']))
+					{
+						$content['owner'] = implode(',',$content['owner']);
+					}
+					if($content['owner'] == '')
+					{
+						$content['owner'] = 0;
+					}
 					if ($content['id'] && self::$acl_edit)
 					{
 
@@ -247,7 +253,10 @@ 
 			Framework::refresh_opener($msg, $refresh_app, $content['id'], $change_color ? null : 'update', $this->appname);
 		}
 		$content['msg'] = $msg;
-		if(!$content['appname']) $content['appname'] = $appname;
+		if(!$content['appname'])
+		{
+			$content['appname'] = $appname;
+		}
 		if($content['data']['icon'])
 		{
 			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
@@ -302,7 +311,9 @@ 
 			// Allow admins access to all categories as parent
 			$content['all_cats'] = 'all_no_acl';
 			$readonlys['owner'] = false;
-		} else {
+		}
+		else
+		{
 			$readonlys['owner'] = true;
 			$readonlys['access'] = $content['owner'] != $GLOBALS['egw_info']['user']['account_id'];
 		}
@@ -313,7 +324,10 @@ 
 			$appname != $content['appname'] || // Can't edit a category from a different app
 			 ($this->appname != 'admin' && $content['owner'] != $GLOBALS['egw_info']['user']['account_id']);
 		// Make sure $content['owner'] is an array otherwise it wont show up values in the multiselectbox
-		if (!is_array($content['owner'])) $content['owner'] = explode(',',$content['owner']);
+		if (!is_array($content['owner']))
+		{
+			$content['owner'] = explode(',',$content['owner']);
+		}
 		$tmpl = new Etemplate('admin.categories.edit');
 		$tmpl->exec($this->edit_link,$content,$sel_options,$readonlys,$content+array(
 			'old_parent' => $content['old_parent'] ? $content['old_parent'] : $content['parent'], 'appname' => $appname
@@ -373,9 +387,15 @@ 
 		{
 			$globalcat = false;
 		}
-		if ($globalcat && $query['filter']) $filter['access'] = 'public';
+		if ($globalcat && $query['filter'])
+		{
+			$filter['access'] = 'public';
+		}
 		// new column-filter access has highest priority
-		if (!empty($query['col_filter']['access']))$filter['access'] = $query['col_filter']['access'];
+		if (!empty($query['col_filter']['access']))
+		{
+			$filter['access'] = $query['col_filter']['access'];
+		}
 
 		Api\Cache::setSession(__CLASS__.$query['appname'],'nm',$query);
 
@@ -404,7 +424,10 @@ 
 
 			$row['level_spacer'] = str_repeat('    ',$row['level']);
 
-			if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
+			if ($row['data']['icon'])
+			{
+				$row['icon_url'] = self::icon_url($row['data']['icon']);
+			}
 
 			$row['subs'] = count($row['children']);
 
@@ -435,13 +458,19 @@ 
 			$readonlys['nm']["add[$row[id]]"]    = !self::$acl_add_sub;
 			$readonlys['nm']["delete[$row[id]]"] = !self::$acl_delete;
 		}
-		if (true) $rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		if (true)
+		{
+			$rows = $count <= $query['num_rows'] ? array_values($rows) : array_slice($rows, $query['start'], $query['num_rows']);
+		}
 		// make appname available for actions
 		$rows['appname'] = $query['appname'];
 		$rows['edit_link'] = $this->edit_link;
 
 		// disable access column for global Categories
-		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin') $rows['no_access'] = true;
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'admin')
+		{
+			$rows['no_access'] = true;
+		}
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->appname).' - '.lang('categories').
 			($query['appname'] != Categories::GLOBAL_APPNAME ? ': '.lang($query['appname']) : '');
@@ -458,11 +487,18 @@ 
 	public function index(array $content=null,$msg='')
 	{
 		//_debug_array($_GET);
-		if ($this->appname != 'admin') Api\Translation::add_app('admin');	// need admin translations
+		if ($this->appname != 'admin')
+		{
+			Api\Translation::add_app('admin');
+		}
+		// need admin translations
 
 		if(!isset($content))
 		{
-			if (isset($_GET['msg'])) $msg = $_GET['msg'];
+			if (isset($_GET['msg']))
+			{
+				$msg = $_GET['msg'];
+			}
 
 			$appname = Categories::GLOBAL_APPNAME;
 			foreach(array($content['nm']['appname'], $_GET['cats_app'], $_GET['appname']) as $field)
@@ -602,7 +638,8 @@ 
 			$readonlys['nm']['rows']['owner'] = true;
 			$readonlys['nm']['col_filter']['owner'] = true;
 		}
-		if($appname == Categories::GLOBAL_APPNAME) {
+		if($appname == Categories::GLOBAL_APPNAME)
+		{
 			$sel_options['app'] = array(''=>'');
 			$readonlys['nm']['rows']['app'] = true;
 		}
@@ -617,7 +654,8 @@ 
 		));
 	}
 
-	protected function get_actions($appname=categories::GLOBAL_APPNAME) {
+	protected function get_actions($appname=categories::GLOBAL_APPNAME)
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -728,11 +766,17 @@ 
 				list($add_remove, $ids_csv) = explode('_', $settings, 2);
 				$ids = explode(',', $ids_csv);
 				// Adding 'All users' removes all the others
-				if($add_remove == 'add' && array_search(Categories::GLOBAL_ACCOUNT,$ids) !== false) $ids = array(Categories::GLOBAL_ACCOUNT);
+				if($add_remove == 'add' && array_search(Categories::GLOBAL_ACCOUNT,$ids) !== false)
+				{
+					$ids = array(Categories::GLOBAL_ACCOUNT);
+				}
 
 				foreach($checked as $id)
 				{
-					if (!$data = $cats->read($id)) continue;
+					if (!$data = $cats->read($id))
+					{
+						continue;
+					}
 					$data['owner'] = explode(',',$data['owner']);
 					if(array_search(Categories::GLOBAL_ACCOUNT,$data['owner']) !== false || $data['owner'][0] > 0)
 					{
@@ -772,7 +816,10 @@ 
 				continue;
 			}
 			// Skip apps that don't show in the app bar, they [usually] don't have Categories
-			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link'))) continue;
+			if($data['status'] > 1 || in_array($app, array('home','admin','felamimail','sitemgr','sitemgr-link')))
+			{
+				continue;
+			}
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
 			{
 				$apps[$app] = $data['title'] ? $data['title'] : lang($app);

admin/inc/class.admin_cmd.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -443,10 +443,10 @@ 
 	 *
 	 * @static
 	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean|string|array $only_keys =true True returns only keys, False returns all cols. or
+	 * @param boolean $only_keys =true True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
@@ -696,7 +696,7 @@ 
 	 *
 	 * @param string|boolean|int $value
 	 * @param boolean $default =null
-	 * @return boolean
+	 * @return boolean|null
 	 * @throws Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998);
 	 */
 	static function parse_boolean($value,$default=null)
@@ -925,7 +925,7 @@ 
 	 * Read data of a remote instance
 	 *
 	 * @param array|int $keys
-	 * @return array
+	 * @return string
 	 */
 	static function read_remote($keys)
 	{
@@ -1005,7 +1005,7 @@ 
 	 * Check if string is a md5 hash (32 chars of 0-9 or a-f)
 	 *
 	 * @param string $str
-	 * @return boolean
+	 * @return integer
 	 */
 	static function is_md5($str)
 	{

Braces +53 added lines, -13 removed lines

@@ -183,7 +183,10 @@ 
 				{
 					$ret = $this->remote_exec($dry_run);
 				}
-				if (is_null($this->status)) $this->status = admin_cmd::successful;
+				if (is_null($this->status))
+				{
+					$this->status = admin_cmd::successful;
+				}
 			}
 			catch (Exception $e) {
 				$this->error = $e->getMessage();
@@ -277,7 +280,10 @@ 
 	 */
 	function delete()
 	{
-		if ($this->status != admin_cmd::scheduled) return false;
+		if ($this->status != admin_cmd::scheduled)
+		{
+			return false;
+		}
 
 		$this->status = admin_cmd::deleted;
 
@@ -303,7 +309,10 @@ 
 		{
 			$this->modified = time();
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
-			if ($set_modifier) $this->modifier_email = admin_cmd::user_email();
+			if ($set_modifier)
+			{
+				$this->modifier_email = admin_cmd::user_email();
+			}
 		}
 		if (version_compare(PHP_VERSION,'5.1.2','>'))
 		{
@@ -411,10 +420,13 @@ 
 		}
 		$cmd = new $class($data);
 
-		if ($cmd instanceof admin_cmd)	// dont allow others classes to be executed that way!
+		if ($cmd instanceof admin_cmd)
+		{
+			// dont allow others classes to be executed that way!
 		{
 			return $cmd;
 		}
+		}
 		throw new Api\Exception\WrongParameter(lang('%1 is no command!',$class),0);
 	}
 
@@ -564,7 +576,10 @@ 
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data)
+		{
+			$vars = array_merge($this->data,$vars);
+		}
 
 		return $vars;
 	}
@@ -583,10 +598,13 @@ 
 			admin_cmd::_instanciate_acl($this->creator);
 			// todo: check only if and with $this->creator
 			if (!admin_cmd::$acl->check('run',1,'admin') &&		// creator is no longer admin
-				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))	// creator is explicitly forbidden to do something
+				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))
+			{
+				// creator is explicitly forbidden to do something
 			{
 				throw new Api\Exception\NoPermission\Admin();
 			}
+			}
 		}
 	}
 
@@ -603,11 +621,14 @@ 
 		{
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				foreach($GLOBALS['egw_info']['apps'] as $app => $data)	// check against title and localised name
+				foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+				{
+					// check against title and localised name
 				{
 					if (!strcasecmp($name,$data['title']) || !strcasecmp($name,lang($app)))
 					{
 						$apps[$key] = $name = $app;
+				}
 						break;
 					}
 				}
@@ -642,7 +663,11 @@ 
 		{
 			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')),15);
 		}
-		if ($type == 2 && $id > 0) $id = -$id;	// groups use negative id's internally, fix it, if user given the wrong sign
+		if ($type == 2 && $id > 0)
+		{
+			$id = -$id;
+		}
+		// groups use negative id's internally, fix it, if user given the wrong sign
 
 		return $id;
 	}
@@ -658,7 +683,10 @@ 
 	 */
 	static function parse_accounts($accounts,$allow_only_user=null)
 	{
-		if (!$accounts) return null;
+		if (!$accounts)
+		{
+			return null;
+		}
 
 		$ids = array();
 		foreach(is_array($accounts) ? $accounts : explode(',',$accounts) as $account)
@@ -677,9 +705,12 @@ 
 	 */
 	static function parse_date($date)
 	{
-		if (!is_numeric($date))	// we allow to input a timestamp
+		if (!is_numeric($date))
+		{
+			// we allow to input a timestamp
 		{
 			$datein = $date;
+		}
 			// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
 			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/','\3-\2-\1',$date);
 
@@ -837,10 +868,13 @@ 
 			return false;		// no schduled command, no need to setup the job
 		}
 		$next = $jobs[0];
-		if (($time = $next['scheduled']) < time())	// should run immediatly
+		if (($time = $next['scheduled']) < time())
+		{
+			// should run immediatly
 		{
 			return admin_cmd::run_queued_jobs();
 		}
+		}
 		$async = new Api\Asyncservice();
 
 		// we cant use this class as callback, as it's abstract and ExecMethod used by the async service instanciated the class!
@@ -944,10 +978,13 @@ 
 	{
 		admin_cmd::_instanciate_remote();
 
-		if ($data['install_id'] && $data['config_passwd'])	// calculate hash
+		if ($data['install_id'] && $data['config_passwd'])
+		{
+			// calculate hash
 		{
 			$data['remote_hash'] = self::remote_hash($data['install_id'],$data['config_passwd']);
 		}
+		}
 		elseif (!$data['remote_hash'] && !($data['install_id'] && $data['config_passwd']))
 		{
 			throw new Api\Exception\WrongUserinput(lang('Either Install ID AND Api\Config password needed OR the remote hash!'));
@@ -981,7 +1018,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter(empty($config_passwd)?'Empty Api\Config password':'install_id no md5 hash');
 		}
-		if (!self::is_md5($config_passwd)) $config_passwd = md5($config_passwd);
+		if (!self::is_md5($config_passwd))
+		{
+			$config_passwd = md5($config_passwd);
+		}
 
 		return md5($config_passwd.$install_id);
 	}