EGroupware / egroupware

infolog/inc/class.infolog_so.inc.php

Braces +115 added lines, -28 removed lines

@@ -95,7 +95,10 @@ 
 	 */
 	function is_responsible($info,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		return self::is_responsible_user($info, $user);
 	}
@@ -132,20 +135,32 @@ 
 	 */
 	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
 	{
-		if (is_null($grants)) $grants = $this->grants;
-		if (!$user) $user = $this->user;
+		if (is_null($grants))
+		{
+			$grants = $this->grants;
+		}
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 
 		// if info-array, but no owner given, force reading of info from db
-		if (is_array($info) && !$info['info_owner']) $info = $info['info_id'];
+		if (is_array($info) && !$info['info_owner'])
+		{
+			$info = $info['info_id'];
+		}
 
 		if (is_array($info))
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int) $info != $this->data['info_id'])
+		{
+			// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
+		}
 			$info = $this->read(array('info_id'=>$info));
 			$this->data = $backup_data;
 		}
@@ -178,7 +193,10 @@ 
 	 */
 	function responsible_filter($users, $deleted_too=false)
 	{
-		if (!$users) return '0';
+		if (!$users)
+		{
+			return '0';
+		}
 
 		$responsible = array();
 		foreach((array)$users as $user)
@@ -271,11 +289,14 @@ 
 						" OR info_status = 'offer' AND $public_access" : '').")".
 				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
 			}
-			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
+			elseif ($filter != 'my' && $filter != 'responsible')
+			{
+				// none --> all entrys user has rights to see
 			{
 				if ($has_private_access)
 				{
 					$filtermethod .= " OR $has_private_access";
+			}
 				}
 				if (count($public_user_list))
 				{
@@ -439,7 +460,10 @@ 
 			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
 			foreach($this->data['info_responsible'] as $k => $v)
 			{
-				if (!is_numeric($v)) unset($this->data['info_responsible'][$k]);
+				if (!is_numeric($v))
+				{
+					unset($this->data['info_responsible'][$k]);
+				}
 			}
 			$this->data['info_responsible'] = array_values($this->data['info_responsible']);
 		}
@@ -579,12 +603,18 @@ 
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
-		if ($to_write['info_price'] === '') $to_write['info_price'] = NULL;
+		if ($to_write['info_price'] === '')
+		{
+			$to_write['info_price'] = NULL;
+		}
 
 		if (($this->data['info_id'] = $info_id) && !$force_insert)
 		{
 			$where = array('info_id' => $info_id);
-			if ($check_modified) $where['info_datemodified'] = $check_modified;
+			if ($check_modified)
+			{
+				$where['info_datemodified'] = $check_modified;
+			}
 			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
@@ -598,7 +628,11 @@ 
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent']))
+			{
+				$to_write['info_id_parent'] = 0;
+			}
+			// must not be null
 
 			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
 			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
@@ -627,7 +661,10 @@ 
 		if ($purge_cfs)
 		{
 			$where = array('info_id' => $info_id);
-			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
+			if ($purge_cfs == 'ical')
+			{
+				$where[] = "info_extra_name LIKE '#%'";
+			}
 			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
 		}
 		$to_delete = array();
@@ -741,7 +778,10 @@ 
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
-			if ((int)$info_id <= 0) return 0;
+			if ((int)$info_id <= 0)
+			{
+				return 0;
+			}
 		}
 		$counts = array();
 		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
@@ -815,11 +855,20 @@ 
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def))
+					{
+						$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+					}
+					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val]))
+					{
+						$val = 'info_'.$val;
+					}
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
-						if (!$this->db->capabilities['order_on_text']) continue;
+						if (!$this->db->capabilities['order_on_text'])
+						{
+							continue;
+						}
 
 						$val = sprintf($this->db->capabilities['order_on_text'],$val);
 					}
@@ -833,7 +882,10 @@ 
 			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
 		}
 		$filtermethod = $no_acl ? '1=1' : $this->aclFilter($query['filter']);
-		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
+		if (!$query['col_filter']['info_status'])
+		{
+			$filtermethod .= $this->statusFilter($query['filter']);
+		}
 		$filtermethod .= $this->dateFilter($query['filter']);
 		$cfcolfilter=0;
 		if (is_array($query['col_filter']))
@@ -845,14 +897,21 @@ 
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col]))
+				{
+					$col = 'info_'.$col;
+				}
 				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
 							$data = (int) $data;
-							if (!$data) continue 2;	// +1 for switch
+							if (!$data)
+							{
+								continue 2;
+							}
+							// +1 for switch
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR $this->users_table.account_id IS NULL AND ".
 								$this->db->expression($this->info_table,array(
 									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
@@ -901,12 +960,22 @@ 
 			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
-		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
+		if ($query['query'])
+		{
+			$query['search'] = $query['query'];
+		}
+		// allow both names
+		if ($query['search'])
+		{
+			// we search in _from, _subject, _des and _extra_value for $query
 		{
 			$columns = array('info_from','info_location','info_subject');
+		}
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
-			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
+			if ($this->db->capabilities['like_on_text'])
+			{
+				$columns[] = 'info_des';
+			}
 
 			$wildcard = '%'; $op = null;
 			$so_sql = new Api\Storage('infolog', $this->info_table, $this->extra_table, '', 'info_extra_name', 'info_extra_value', 'info_id', $this->db);
@@ -959,7 +1028,10 @@ 
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
-				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
+				if (!isset($custom_fields))
+				{
+					$custom_fields = Api\Storage\Customfields::get('infolog');
+				}
 				switch($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
@@ -979,7 +1051,10 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
+				if (is_array($cols))
+				{
+					$cols = implode(',',$cols);
+				}
 				$cols .= ','.$this->db->group_concat('attendees.account_id').' AS info_responsible';
 				$cols .= ','.$this->db->group_concat('attendees.info_res_attendee').' AS info_cc';
 				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.
@@ -1004,7 +1079,10 @@ 
 				$info['info_responsible'] = $info['info_responsible'] ? array_unique(explode(',',$info['info_responsible'])) : array();
 				foreach($info['info_responsible'] as $k => $v)
 				{
-					if (!is_numeric($v)) unset($info['info_responsible'][$k]);
+					if (!is_numeric($v))
+					{
+						unset($info['info_responsible'][$k]);
+					}
 				}
 				$info['info_responsible'] = array_values($info['info_responsible']);
 
@@ -1015,7 +1093,10 @@ 
 			{
 				$config_data = Api\Config::read('infolog');
 				$index_load_cfs = $config_data['index_load_cfs'];
-				if (!is_array($index_load_cfs)) $index_load_cfs = explode(',', $index_load_cfs);
+				if (!is_array($index_load_cfs))
+				{
+					$index_load_cfs = explode(',', $index_load_cfs);
+				}
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
@@ -1028,7 +1109,10 @@ 
 					$where['info_extra_name'] = array();
 					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#')
+						{
+							$where['info_extra_name'][] = substr($col,1);
+						}
 					}
 				}
 				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
@@ -1078,7 +1162,10 @@ 
 			{
 				foreach((array)$responsible as $user)
 				{
-					if ($user && !in_array($user,$users)) $users[] = $user;
+					if ($user && !in_array($user,$users))
+					{
+						$users[] = $user;
+					}
 				}
 			}
 		}

api/src/Contacts/Storage.php

Braces +140 added lines, -35 removed lines

@@ -348,7 +348,10 @@ 
 	 */
 	function get_grants($user, $contact_app='addressbook', $preferences=null)
 	{
-		if (!isset($preferences)) $preferences = $GLOBALS['egw_info']['user']['preferences'];
+		if (!isset($preferences))
+		{
+			$preferences = $GLOBALS['egw_info']['user']['preferences'];
+		}
 
 		if ($user)
 		{
@@ -376,12 +379,25 @@ 
 				$grants[0] = Api\Acl::READ;
 			}
 			// add account grants for admins (only for current user!)
-			if ($user == $this->user && $this->is_admin())	// admin rights can be limited by ACL!
+			if ($user == $this->user && $this->is_admin())
+			{
+				// admin rights can be limited by ACL!
 			{
-				$grants[0] = Api\Acl::READ;	// admins always have read-access
-				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin')) $grants[0] |= Api\Acl::EDIT;
-				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))  $grants[0] |= Api\Acl::ADD;
-				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin')) $grants[0] |= Api\Acl::DELETE;
+				$grants[0] = Api\Acl::READ;
+			}
+			// admins always have read-access
+				if (!$GLOBALS['egw']->acl->check('account_access',16,'admin'))
+				{
+					$grants[0] |= Api\Acl::EDIT;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',4,'admin'))
+				{
+					$grants[0] |= Api\Acl::ADD;
+				}
+				if (!$GLOBALS['egw']->acl->check('account_access',32,'admin'))
+				{
+					$grants[0] |= Api\Acl::DELETE;
+				}
 			}
 			// allow certain groups to edit contact-data of accounts
 			if (self::allow_account_edit($user))
@@ -451,12 +467,22 @@ 
 		}
 		foreach($ids as $key => $id)
 		{
-			if (!is_numeric($id)) unset($ids[$key]);
+			if (!is_numeric($id))
+			{
+				unset($ids[$key]);
+			}
+		}
+		if (!$ids)
+		{
+			return array();
 		}
-		if (!$ids) return array();	// nothing to do, eg. all these contacts are in ldap
+		// nothing to do, eg. all these contacts are in ldap
 		$fields = array();
 		$filter[$this->distri_id]=$ids;
-		if (count($dl_allowed)) $filter[$this->distri_key]=$dl_allowed;
+		if (count($dl_allowed))
+		{
+			$filter[$this->distri_key]=$dl_allowed;
+		}
 		$distri_view = str_replace(') d_view',' and '.$this->distri_id.' in ('.implode(',',$ids).')) d_view',$this->distributionlist_view);
 		#_debug_array($this->distributionlist_tabledef);
 		foreach($this->db->select($distri_view, '*', $filter, __LINE__, __FILE__,
@@ -506,10 +532,16 @@ 
 	*/
 	function delete($contact,$check_etag=null)
 	{
-		if (is_array($contact)) $contact = $contact['id'];
+		if (is_array($contact))
+		{
+			$contact = $contact['id'];
+		}
 
 		$where = array('id' => $contact);
-		if ($check_etag) $where['etag'] = $check_etag;
+		if ($check_etag)
+		{
+			$where['etag'] = $check_etag;
+		}
 
 		// delete mainfields
 		if ($this->somain->delete($where))
@@ -586,7 +618,10 @@ 
 				}
 			}
 		}
-		if($error_nr) return $error_nr;
+		if($error_nr)
+		{
+			return $error_nr;
+		}
 
 		return false;	// no error
 	}
@@ -614,7 +649,10 @@ 
 			return $contact;
 		}
 		$dl_list=$this->read_distributionlist(array($contact['id']));
-		if (count($dl_list)) $contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		if (count($dl_list))
+		{
+			$contact['distrib_lists']=implode("\n",$dl_list[$contact['id']]);
+		}
 		return $this->db2data($contact);
 	}
 
@@ -648,7 +686,10 @@ 
 			unset($filter['adr_one_countrycode']);
 		}
 		// Hide deleted items unless type is specifically deleted
-		if(!is_array($filter)) $filter = $filter ? (array) $filter : array();
+		if(!is_array($filter))
+		{
+			$filter = $filter ? (array) $filter : array();
+		}
 
 		if (isset($filter['cols_to_search']))
 		{
@@ -659,10 +700,13 @@ 
 		// if no tid set or tid==='' do NOT return deleted entries ($tid === null returns all entries incl. deleted)
 		if(!array_key_exists('tid', $filter) || $filter['tid'] === '')
 		{
-			if ($join && strpos($join,'RIGHT JOIN') !== false)	// used eg. to search for groups
+			if ($join && strpos($join,'RIGHT JOIN') !== false)
+			{
+				// used eg. to search for groups
 			{
 				$filter[] = '(contact_tid != \'' . self::DELETED_TYPE . '\' OR contact_tid IS NULL)';
 			}
+			}
 			else
 			{
 				$filter[] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
@@ -710,7 +754,10 @@ 
 							unset($cols[$key]);
 						}
 					}
-					if ($col=='contact_id') $col='egw_addressbook.contact_id';
+					if ($col=='contact_id')
+					{
+						$col='egw_addressbook.contact_id';
+					}
 				}
 
 				$backend->columns_to_search = $cols;
@@ -785,7 +832,11 @@ 
 			{
 				foreach($this->columns_to_search as $col)
 				{
-					if ($col != 'contact_value') $param['search'][$col] = $search;	// we dont search the customfields
+					if ($col != 'contact_value')
+					{
+						$param['search'][$col] = $search;
+					}
+					// we dont search the customfields
 				}
 			}
 		}
@@ -805,11 +856,17 @@ 
 		$rows = $this->somain->organisations($param);
 		$this->total = $this->somain->total;
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as $n => $row)
 		{
-			if (strpos($row['org_name'],'&')!==false) $row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			if (strpos($row['org_name'],'&')!==false)
+			{
+				$row['org_name'] = str_replace('&','*AND*',$row['org_name']);
+			}
 			$rows[$n]['id'] = 'org_name:'.$row['org_name'];
 			foreach(array(
 				'org_unit' => lang('departments'),
@@ -822,7 +879,10 @@ 
 				}
 				else
 				{
-					if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+					if (strpos($row[$by],'&')!==false)
+					{
+						$row[$by] = str_replace('&','*AND*',$row[$by]);
+					}
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
 				}
 			}
@@ -865,7 +925,10 @@ 
 				foreach($this->columns_to_search as $col)
 				{
 					// we don't search the customfields
-					if ($col != 'contact_value') $param['search'][$col] = $search;
+					if ($col != 'contact_value')
+					{
+						$param['search'][$col] = $search;
+					}
 				}
 			}
 		}
@@ -897,14 +960,20 @@ 
 		$rows = $this->somain->duplicates($param);
 		$this->total = $this->somain->total;
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as $n => $row)
 		{
 			$rows[$n]['id'] = 'duplicate:';
 			foreach(array_keys(static::$duplicate_fields) as $by)
 			{
-				if (strpos($row[$by],'&')!==false) $row[$by] = str_replace('&','*AND*',$row[$by]);
+				if (strpos($row[$by],'&')!==false)
+				{
+					$row[$by] = str_replace('&','*AND*',$row[$by]);
+				}
 				if($row[$by])
 				{
 					$rows[$n]['id'] .= '|||'.$by.':'.$row[$by];
@@ -966,7 +1035,10 @@ 
 	 */
 	function get_backend($keys=null,$owner=null)
 	{
-		if ($owner === '') $owner = null;
+		if ($owner === '')
+		{
+			$owner = null;
+		}
 
 		$contact_id = !is_array($keys) ? $keys :
 			(isset($keys['id']) ? $keys['id'] : $keys['contact_id']);
@@ -1038,7 +1110,10 @@ 
 			$ldap_contacts = new Ldap(null, $ds);
 		}
 
-		if (!is_array($type)) $type = explode(',', $type);
+		if (!is_array($type))
+		{
+			$type = explode(',', $type);
+		}
 
 		$start = $n = 0;
 		$num = 100;
@@ -1054,7 +1129,10 @@ 
 			{
 				foreach($contacts as $contact)
 				{
-					if ($contact['account_id']) $contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					if ($contact['account_id'])
+					{
+						$contact['id'] = $GLOBALS['egw']->accounts->id2name($contact['account_id']);
+					}
 
 					$ldap_contacts->data = $contact;
 					$n++;
@@ -1082,10 +1160,13 @@ 
 				false, $filter) as $contact)
 			{
 				//error_log(__METHOD__."(".array2string($type).") do=".array2string($type)." migrating ".array2string($contact));
-				if ($contact['jpegphoto'])	// photo is NOT read by LDAP backend on search, need to do an extra read
+				if ($contact['jpegphoto'])
+				{
+					// photo is NOT read by LDAP backend on search, need to do an extra read
 				{
 					$contact = $ldap_contacts->read($contact['id']);
 				}
+				}
 				$old_contact_id = $contact['id'];
 				unset($contact['id']);	// ldap uid/account_lid
 				if ($contact['account_id'] && ($old = $sql_contacts->read(array('account_id' => $contact['account_id']))))
@@ -1146,7 +1227,10 @@ 
 			foreach($this->grants as $uid => $rights)
 			{
 				// only requests groups / list in accounts addressbook for read
-				if (!$uid && $required != Api\Acl::READ) continue;
+				if (!$uid && $required != Api\Acl::READ)
+				{
+					continue;
+				}
 
 				if (($rights & $required) == $required)
 				{
@@ -1191,7 +1275,10 @@ 
 	function read_lists($keys,$member_attr=null,$limit_in_ab=false)
 	{
 		$backend = (string)$limit_in_ab === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'get_lists')) return false;
+		if (!method_exists($backend, 'get_lists'))
+		{
+			return false;
+		}
 
 		return $backend->get_lists($keys,null,$member_attr,$limit_in_ab);
 	}
@@ -1208,7 +1295,10 @@ 
 	function add_list($keys,$owner,$contacts=array(),array &$data=array())
 	{
 		$backend = (string)$owner === '0' && $this->so_accounts ? $this->so_accounts : $this->somain;
-		if (!method_exists($backend, 'add_list')) return false;
+		if (!method_exists($backend, 'add_list'))
+		{
+			return false;
+		}
 
 		return $backend->add_list($keys,$owner,$contacts,$data);
 	}
@@ -1223,7 +1313,10 @@ 
 	 */
 	function add2list($contact,$list,array $existing=null)
 	{
-		if (!method_exists($this->somain,'add2list')) return false;
+		if (!method_exists($this->somain,'add2list'))
+		{
+			return false;
+		}
 
 		return $this->somain->add2list($contact,$list,$existing);
 	}
@@ -1237,7 +1330,10 @@ 
 	 */
 	function remove_from_list($contact,$list=null)
 	{
-		if (!method_exists($this->somain,'remove_from_list')) return false;
+		if (!method_exists($this->somain,'remove_from_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->remove_from_list($contact,$list);
 	}
@@ -1250,7 +1346,10 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!method_exists($this->somain,'delete_list')) return false;
+		if (!method_exists($this->somain,'delete_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->delete_list($list);
 	}
@@ -1263,7 +1362,10 @@ 
 	 */
 	function read_list($list)
 	{
-		if (!method_exists($this->somain,'read_list')) return false;
+		if (!method_exists($this->somain,'read_list'))
+		{
+			return false;
+		}
 
 		return $this->somain->read_list($list);
 	}
@@ -1289,7 +1391,10 @@ 
 	 */
 	function lists_ctag($owner=null)
 	{
-		if (!method_exists($this->somain,'lists_ctag')) return 0;
+		if (!method_exists($this->somain,'lists_ctag'))
+		{
+			return 0;
+		}
 
 		return $this->somain->lists_ctag($owner);
 	}