EGroupware / egroupware

api/src/Accounts/Ldap.php

Doc Comments +2 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{
@@ -995,7 +995,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1097,7 +1097,6 @@ 
 	 * @param int $gid gidnumber of group to set
 	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
-	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

Spacing +138 added lines, -141 removed lines

@@ -89,14 +89,14 @@ 
 	 */
 	var $requiredObjectClasses = array(
 		'user' => array(
-			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
+			'top', 'person', 'organizationalperson', 'inetorgperson', 'posixaccount', 'shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
 			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
 			'univentionperson', 'univentionmail', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
-			'top','posixgroup','groupofnames'
+			'top', 'posixgroup', 'groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
 			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
@@ -115,8 +115,8 @@ 
 	 */
 	var $group_mail_classes = array(
 		'dbmailforwardingaddress' => 'mailforwardingaddress',
-		'dbmailuser' => array('mailforwardingaddress','uid'),
-		'qmailuser' => array('mailforwardingaddress','uid'),
+		'dbmailuser' => array('mailforwardingaddress', 'uid'),
+		'qmailuser' => array('mailforwardingaddress', 'uid'),
 		'mailaccount' => 'mailalias',
 		'univentiongroup' => array(false, false, true),
 	);
@@ -158,7 +158,7 @@ 
 		$this->use_session_cache = true;
 
 		$this->ldap = Api\Ldap::factory(false, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 		$this->ds = $this->ldap->ds;
 
 		$this->user_context  = $this->frontend->config['ldap_context'];
@@ -196,7 +196,7 @@ 
 	{
 		$is_group = $data['account_id'] < 0 || $data['account_type'] === 'g';
 
-		$data_utf8 = Api\Translation::convert($data,Api\Translation::charset(),'utf-8');
+		$data_utf8 = Api\Translation::convert($data, Api\Translation::charset(), 'utf-8');
 		$members = $data['account_members'];
 
 		if (!is_object($this->ldapServerInfo))
@@ -208,8 +208,7 @@ 
 		if ($data_utf8['account_id'] && $data_utf8['account_lid'])
 		{
 			// read the entry first, to check if the dn (account_lid) has changed
-			$sri = $is_group ? ldap_search($this->ds,$this->group_context,'gidnumber='.abs($data['account_id'])) :
-				ldap_search($this->ds,$this->user_context,'uidnumber='.$data['account_id']);
+			$sri = $is_group ? ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($data['account_id'])) : ldap_search($this->ds, $this->user_context, 'uidnumber='.$data['account_id']);
 			$old = ldap_get_entries($this->ds, $sri);
 
 			if (!$old['count'])
@@ -221,9 +220,9 @@ 
 				$old = Api\Ldap::result2array($old[0]);
 				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
-				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
-					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
-					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'],0,4) != 'uid='))
+				if ($is_group && ($key = array_search('namedobject', $old['objectclass'])) !== false ||
+					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 3) != 'cn=') ||
+					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 4) != 'uid='))
 				{
 					// query the memberships to set them again later
 					if (!$is_group)
@@ -252,7 +251,7 @@ 
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
-		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'],$old['objectclass']))
+		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'], $old['objectclass']))
 		{
 			// additional objectclasse might be already set in $to_write or $old
 			if (!is_array($to_write['objectclass']))
@@ -261,7 +260,7 @@ 
 			}
 			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
+				foreach ($this->requiredObjectClasses[$is_group ? 'group-if-supported' : 'user-if-supported'] as $additional)
 				{
 					$add = array();
 					if (is_array($additional))
@@ -283,8 +282,7 @@ 
 		{
 			if (!$data['account_lid']) return false;
 
-			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
-				'uid='.$data_utf8['account_lid'].','.$this->user_context;
+			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context : 'uid='.$data_utf8['account_lid'].','.$this->user_context;
 		}
 		// now we merge the user or group data
 		if ($is_group)
@@ -293,23 +291,23 @@ 
 			$data['account_type'] = 'g';
 
 			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
-			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
+			if ($members || !$old && array_intersect(array('groupofnames', 'groupofuniquenames', 'univentiongroup'), $objectclass))
 			{
 				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
-			foreach($this->group_mail_classes as $objectclass => $forward)
+			foreach ($this->group_mail_classes as $objectclass => $forward)
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward)) list($forward, $extra_attr, $keep_objectclass) = $forward;
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
+					($old && in_array($objectclass, $old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
 					if ($data_utf8['account_email'])	// setting an email
 					{
-						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
+						if (!in_array($objectclass, $old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
 							$to_write['objectclass'][] = $objectclass;
@@ -323,19 +321,19 @@ 
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
-								if (($email = $this->id2name($member,'account_email')))
+								if (($email = $this->id2name($member, 'account_email')))
 								{
 									$to_write[$forward][] = $email;
 								}
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif ($old)	// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
 						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass, $old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -349,7 +347,7 @@ 
 		}
 		else
 		{
-			$to_write = $this->_merge_user($to_write,$data_utf8,!$old);
+			$to_write = $this->_merge_user($to_write, $data_utf8, !$old);
 			// make sure multiple email-addresses in the mail attribute "survive"
 			if (isset($to_write[static::MAIL_ATTR]) && count($old[static::MAIL_ATTR]) > 1)
 			{
@@ -368,21 +366,21 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if (!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
-		if ($old && !@ldap_modify($this->ds,$dn,$to_write) ||
-			!$old && !@ldap_add($this->ds,$dn,$to_write))
+		if ($old && !@ldap_modify($this->ds, $dn, $to_write) ||
+			!$old && !@ldap_add($this->ds, $dn, $to_write))
 		{
 			$err = true;
-			if ($is_group && ($key = array_search('groupofnames',$to_write['objectclass'])) !== false)
+			if ($is_group && ($key = array_search('groupofnames', $to_write['objectclass'])) !== false)
 			{
 				// try again with removed groupOfNames stuff, as I cant detect if posixGroup is a structural object
 				unset($to_write['objectclass'][$key]);
 				$to_write['objectclass'] = array_values($to_write['objectclass']);
 				unset($to_write['member']);
-				$err = $old ? !ldap_modify($this->ds,$dn,$to_write) : !ldap_add($this->ds,$dn,$to_write);
+				$err = $old ? !ldap_modify($this->ds, $dn, $to_write) : !ldap_add($this->ds, $dn, $to_write);
 			}
 			if ($err)
 			{
@@ -392,7 +390,7 @@ 
 		}
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		return $data['account_id'];
 	}
@@ -409,14 +407,14 @@ 
 
 		if ($account_id < 0)
 		{
-			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber=' . abs($account_id));
+			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($account_id));
 		}
 		else
 		{
 			// remove the user's memberships
-			$this->set_memberships(array(),$account_id);
+			$this->set_memberships(array(), $account_id);
 
-			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
+			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber='.$account_id);
 		}
 		if (!$sri) return false;
 
@@ -440,7 +438,7 @@ 
 		{
 			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
 		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
+		foreach (array_keys($this->group_mail_classes) as $objectclass)
 		{
 			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
@@ -448,15 +446,15 @@ 
 				break;
 			}
 		}
-		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(gidnumber='.abs($account_id).'))',
 			array('dn', 'gidnumber', 'cn', 'objectclass', static::MAIL_ATTR, 'memberuid', 'description'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 		unset($data['objectclass']['count']);
 
 		$group += array(
@@ -477,7 +475,7 @@ 
 		{
 			unset($data['memberuid']['count']);
 
-			foreach($data['memberuid'] as $lid)
+			foreach ($data['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -498,16 +496,16 @@ 
 	 */
 	protected function _read_user($account_id)
 	{
-		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber=' . (int)$account_id.'))',
-			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn',static::MAIL_ATTR,'userpassword','telephonenumber',
-				'shadowexpire','shadowlastchange','homedirectory','loginshell','createtimestamp','modifytimestamp'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber='.(int)$account_id.'))',
+			array('dn', 'uidnumber', 'uid', 'gidnumber', 'givenname', 'sn', 'cn', static::MAIL_ATTR, 'userpassword', 'telephonenumber',
+				'shadowexpire', 'shadowlastchange', 'homedirectory', 'loginshell', 'createtimestamp', 'modifytimestamp'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 
 		$utc_diff = date('Z');
 		$user = array(
@@ -527,13 +525,13 @@ 
 			// - if it's set to 0, the account is disabled
 			// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
-			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+($data['shadowlastchange'][0]!=0?$utc_diff:0) : null,
+			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0] * 24 * 3600 + $utc_diff < time() ? false : 'A',
+			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
+			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0] * 24 * 3600 + ($data['shadowlastchange'][0] != 0 ? $utc_diff : 0) : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
-			'person_id'         => $data['uid'][0],	// id of associated contact
+			'person_id'         => $data['uid'][0], // id of associated contact
 			'account_created' => isset($data['createtimestamp'][0]) ? self::accounts_ldap2ts($data['createtimestamp'][0]) : null,
 			'account_modified' => isset($data['modifytimestamp'][0]) ? self::accounts_ldap2ts($data['modifytimestamp'][0]) : null,
 		);
@@ -554,7 +552,7 @@ 
 	 * @param array $data array with account-data in utf-8
 	 * @return array merged data
 	 */
-	protected function _merge_group($to_write,$data,$old=null)
+	protected function _merge_group($to_write, $data, $old = null)
 	{
 		$to_write['gidnumber'] = abs($data['account_id']);
 		$to_write['cn'] = $data['account_lid'];
@@ -574,7 +572,7 @@ 
 	 * @param boolean $new_entry
 	 * @return array merged data
 	 */
-	protected function _merge_user($to_write,$data,$new_entry)
+	protected function _merge_user($to_write, $data, $new_entry)
 	{
 		$to_write['uidnumber'] = $data['account_id'];
 		$to_write['uid']       = $data['account_lid'];
@@ -583,12 +581,12 @@ 
 		{
 			$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
 		}
-		$to_write['sn']        = $data['account_lastname'];
+		$to_write['sn'] = $data['account_lastname'];
 		if (!$new_entry || $data['account_email'])
 		{
-			$to_write[static::MAIL_ATTR]  = $data['account_email'] ? $data['account_email'] : array();
+			$to_write[static::MAIL_ATTR] = $data['account_email'] ? $data['account_email'] : array();
 		}
-		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
+		$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
@@ -597,47 +595,46 @@ 
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']))	// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
+			$to_write['shadowlastchange'] = round((time() - $utc_diff) / (24 * 3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
+		$shadowexpire = ($data['account_expires'] - $utc_diff) / (24 * 3600);
 
 		$to_write['shadowexpire'] = !$data['account_status'] ?
-			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) :
-			($data['account_expires'] != -1 ? round($shadowexpire) : array());	// array() = unset value
+			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) : ($data['account_expires'] != -1 ? round($shadowexpire) : array()); // array() = unset value
 
 		if ($new_entry && is_array($to_write['shadowexpire']) && !count($to_write['shadowexpire']))
 		{
-			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
+			unset($to_write['shadowexpire']); // gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change'] - $utc_diff) / (24 * 3600));
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change'] == 0) $to_write['shadowlastchange'] = 0;
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
+			if (isset($data['homedirectory'])) $to_write['homedirectory'] = $data['homedirectory'];
 			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
-			$to_write['homedirectory']  = '/dev/null';	// is a required attribute of posixAccount
+			$to_write['homedirectory'] = '/dev/null'; // is a required attribute of posixAccount
 		}
 		if ($new_entry && empty($to_write['loginshell']))
 		{
-			unset($to_write['loginshell']);	// setting array() for new entry gives "Protocol error", must not set it
+			unset($to_write['loginshell']); // setting array() for new entry gives "Protocol error", must not set it
 		}
 		return $to_write;
 	}
@@ -665,7 +662,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__."(".array2string($param).")");
-		$account_search =& Api\Accounts::$cache['account_search'];
+		$account_search = & Api\Accounts::$cache['account_search'];
 
 		// check if the query is cached
 		$serial = serialize($param);
@@ -691,12 +688,12 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] != 'groups')
+			if ($param['type'] != 'groups')
 			{
 				$filter = "(&(objectclass=posixaccount)";
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -723,7 +720,7 @@ 
 					}
 				}
 				// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
-				$filter .= str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$this->account_filter);
+				$filter .= str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $this->account_filter);
 				$filter .= ')';
 
 				if ($param['type'] != 'both')
@@ -742,9 +739,9 @@ 
 						'account_fullname'  => 'cn',
 						'account_primary_group' => 'gidnumber',
 					);
-					$orders = explode(',',$param['order']);
+					$orders = explode(',', $param['order']);
 					$order = isset($propertyMap[$orders[0]]) ? $propertyMap[$orders[0]] : 'uid';
-					$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid', $order));
+					$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', $order));
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
@@ -754,7 +751,7 @@ 
 					if (is_numeric($param['type'])) // return only group-members
 					{
 						$relevantAccounts = array();
-						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
+						$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=".abs($param['type'])."))", array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
 					}
@@ -763,26 +760,26 @@ 
 					$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
 					$sortFn($fullSet);
 					$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
-					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter.')';
-					$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
+					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=', $relevantAccounts).'))'.$this->account_filter.')';
+					$filter = str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $filter);
 				}
-				$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn',static::MAIL_ATTR,'shadowExpire','createtimestamp','modifytimestamp','objectclass','gidNumber'));
+				$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', 'uidNumber', 'givenname', 'sn', static::MAIL_ATTR, 'shadowExpire', 'createtimestamp', 'modifytimestamp', 'objectclass', 'gidNumber'));
 
 				$utc_diff = date('Z');
-				foreach(ldap_get_entries($this->ds, $sri) as $allVals)
+				foreach (ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
 						$account = Array(
 							'account_id'        => $allVals['uidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['uid'][0], 'utf-8'),
 							'account_type'      => 'u',
-							'account_firstname' => Api\Translation::convert($allVals['givenname'][0],'utf-8'),
-							'account_lastname'  => Api\Translation::convert($allVals['sn'][0],'utf-8'),
-							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0]*24*3600-$utc_diff < time() ? false : 'A',
-							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
+							'account_firstname' => Api\Translation::convert($allVals['givenname'][0], 'utf-8'),
+							'account_lastname'  => Api\Translation::convert($allVals['sn'][0], 'utf-8'),
+							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0] * 24 * 3600 - $utc_diff < time() ? false : 'A',
+							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
 							'account_email'     => $allVals[static::MAIL_ATTR][0],
 							'account_created' => isset($allVals['createtimestamp'][0]) ? self::accounts_ldap2ts($allVals['createtimestamp'][0]) : null,
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
@@ -808,13 +805,13 @@ 
 			}
 			if ($param['type'] == 'groups' || $param['type'] == 'both')
 			{
-				if(empty($query) || $query == '*')
+				if (empty($query) || $query == '*')
 				{
 					$filter = '(objectclass=posixgroup)';
 				}
 				else
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -828,21 +825,21 @@ 
 					}
 					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
-				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
-				foreach((array)ldap_get_entries($this->ds, $sri) as $allVals)
+				$sri = ldap_search($this->ds, $this->group_context, $filter, array('cn', 'gidNumber'));
+				foreach ((array)ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
 						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
 							'account_id'        => -$allVals['gidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_type'      => 'g',
-							'account_firstname' => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_firstname' => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_lastname'  => lang('Group'),
 							'account_status'    => 'A',
-							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_fullname'  => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 						);
 						if (isset($totalcount)) ++$totalcount;
 					}
@@ -850,9 +847,9 @@ 
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$this->total = isset($totalcount) ? $totalcount : count($accounts);
 
 			// if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
@@ -864,7 +861,7 @@ 
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['total'] = $this->total;
 			return $account_search[$serial]['data'] = isset($totalcount) ? $sortedAccounts : array_slice($sortedAccounts, $start, $offset);
@@ -892,19 +889,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function _sort_callback($a,$b)
+	function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -923,8 +920,8 @@ 
 	{
 		if (!empty($date))
 		{
-			return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-				substr($date,4,2),substr($date,6,2),substr($date,0,4));
+			return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+				substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 		}
 		return NULL;
 	}
@@ -941,14 +938,14 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($_name,$which='account_lid',$account_type=null)
+	function name2id($_name, $which = 'account_lid', $account_type = null)
 	{
-		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
+		$name = Api\Ldap::quote(Api\Translation::convert($_name, Api\Translation::charset(), 'utf-8'));
 
 		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
 		{
 
-			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+			$sri = ldap_search($this->ds, $this->group_context, '(&(cn='.$name.')(objectclass=posixgroup))', array('gidNumber'));
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -965,7 +962,7 @@ 
 		    return False;
 		}
 
-		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'='.$name.')(objectclass=posixaccount))', array('uidNumber'));
 
 		$allValues = ldap_get_entries($this->ds, $sri);
 
@@ -985,9 +982,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1000,7 +997,7 @@ 
 	function update_lastlogin($_account_id, $ip)
 	{
 		unset($_account_id, $ip);
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1011,11 +1008,11 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int)$account_id || !($account_lid = $this->id2name($account_id))) return false;
 
-		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))', array('cn', 'gidnumber'));
 		$memberships = array();
-		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
+		foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
 			if ($key === 'count') continue;
 
@@ -1035,13 +1032,13 @@ 
 		if (!is_numeric($_gid))
 		{
 			// try to recover
-			$_gid = $this->name2id($_gid,'account_lid','g');
+			$_gid = $this->name2id($_gid, 'account_lid', 'g');
 			if (!is_numeric($_gid)) return false;
 		}
 
-		$gid = abs($_gid);	// our gid is negative!
+		$gid = abs($_gid); // our gid is negative!
 
-		$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=$gid))",array('memberuid'));
+		$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=$gid))", array('memberuid'));
 		$group = ldap_get_entries($this->ds, $sri);
 
 		$members = array();
@@ -1049,7 +1046,7 @@ 
 		{
 			unset($group[0]['memberuid']['count']);
 
-			foreach($group[0]['memberuid'] as $lid)
+			foreach ($group[0]['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -1066,27 +1063,27 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		// remove not longer existing memberships
 		if (($old_memberships = $this->memberships($account_id)))
 		{
 			$old_memberships = array_keys($old_memberships);
-			foreach(array_diff($old_memberships,$groups) as $gid)
+			foreach (array_diff($old_memberships, $groups) as $gid)
 			{
 				if (($members = $this->members($gid)))
 				{
 					unset($members[$account_id]);
-					$this->set_members($members,$gid);
+					$this->set_members($members, $gid);
 				}
 			}
 		}
 		// adding new memberships
-		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
+		foreach ($old_memberships ? array_diff($groups, $old_memberships) : $groups as $gid)
 		{
 			$members = $this->members($gid);
 			$members[$account_id] = $this->id2name($account_id);
-			$this->set_members($members,$gid);
+			$this->set_members($members, $gid);
 		}
 	}
 
@@ -1100,15 +1097,15 @@ 
 	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
+	function set_members($members, $gid, array $objectclass = null, $use_cn = null)
 	{
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid, 'objectclass');
 
 		$to_write = array('memberuid' => array());
-		foreach((array)$members as $key => $member)
+		foreach ((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
@@ -1120,7 +1117,7 @@ 
 				{
 					$to_write['member'][] = $member_dn;
 				}
-				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass))
 				{
 					$to_write['uniquemember'][] = $member_dn;
 				}
@@ -1131,31 +1128,31 @@ 
 		{
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass) && !$to_write['uniquemember'])
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
-		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
+		if ($this->id2name($gid, 'account_email') && ($objectclass = $this->id2name($gid, 'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if (is_array($forward)) list($forward, $extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
-				foreach($members as $key => $member)
+				foreach ($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member, 'account_email')))	$to_write[$forward][] = $email;
 				}
 			}
 		}
-		if (!ldap_modify($this->ds,'cn='.Api\Ldap::quote($cn).','.$this->group_context,$to_write))
+		if (!ldap_modify($this->ds, 'cn='.Api\Ldap::quote($cn).','.$this->group_context, $to_write))
 		{
-			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write,true)."))\n";
+			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write, true)."))\n";
 			return false;
 		}
 		return true;
@@ -1168,7 +1165,7 @@ 
 	 * @param string $account_type ='u' (optional, default to 'u')
 	 * @return int|boolean integer account_id (negative for groups) or false if none is free anymore
 	 */
-	protected function _get_nextid($account_type='u')
+	protected function _get_nextid($account_type = 'u')
 	{
 		$min = $this->frontend->config['account_min_id'] ? $this->frontend->config['account_min_id'] : 0;
 		$max = $this->frontend->config['account_max_id'] ? $this->frontend->config['account_max_id'] : 0;
@@ -1190,15 +1187,15 @@ 
 		/* Loop until we find a free id */
 		do
 		{
-			$account_id = (int) self::next_id($type,$min,$max);
+			$account_id = (int)self::next_id($type, $min, $max);
 		}
-		while ($account_id && ($this->frontend->exists($sign * $account_id) ||	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || // check need to include the sign!
 			$this->frontend->exists(-1 * $sign * $account_id) ||
 			// if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number
 			// to ease migration to AD or Samba4
 			$GLOBALS['egw_info']['apps']['sambaadmin'] && ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id)));
 
-		if	(!$account_id || $max && $account_id > $max)
+		if (!$account_id || $max && $account_id > $max)
 		{
 			return False;
 		}
@@ -1213,14 +1210,14 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean the next id or false if $max given and exceeded
 	 */
-	static function next_id($location,$min=0,$max=0)
+	static function next_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if ($max && $id >= $max)
 		{
@@ -1228,10 +1225,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if ($id < $min) $id = $min;
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
-		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;
+		$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location] = $id;
 
 		return (int)$id;
 	}
@@ -1244,18 +1241,18 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
 	 */
-	static function last_id($location,$min=0,$max=0)
+	static function last_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if (!$id || $id < $min)
 		{
-			return self::next_id($location,$min,$max);
+			return self::next_id($location, $min, $max);
 		}
 		if ($max && $id > $max)
 		{
@@ -1270,6 +1267,6 @@ 
 	function __wakeup()
 	{
 		$this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 	}
 }

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

@@ -775,7 +775,7 @@ 
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
-						$account = Array(
+						$account = array(
 							'account_id'        => $allVals['uidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
 							'account_type'      => 'u',
@@ -835,7 +835,7 @@ 
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
-						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
+						$accounts[(string)-$allVals['gidnumber'][0]] = array(
 							'account_id'        => -$allVals['gidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 							'account_type'      => 'g',

Braces +172 added lines, -44 removed lines

@@ -175,7 +175,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -238,17 +241,23 @@ 
 					$this->delete($data['account_id']);
 					unset($old['dn']);
 					// removing the namedObject object-class, if it's included
-					if ($key !== false) unset($old['objectclass'][$key]);
+					if ($key !== false)
+					{
+						unset($old['objectclass'][$key]);
+					}
 					$to_write = $old;
 					unset($old);
 				}
 			}
 		}
-		if (!$data['account_id'])	// new account
+		if (!$data['account_id'])
+		{
+			// new account
 		{
 			if (!($data['account_id'] = $data_utf8['account_id'] = $this->_get_nextid($is_group ? 'g' : 'u')))
 			{
 				return false;
+		}
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
@@ -259,11 +268,14 @@ 
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)
+			{
+				// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					$add = array();
+			}
 					if (is_array($additional))
 					{
 						$add = $additional;
@@ -272,7 +284,10 @@ 
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
-						if ($add) $to_write += $add;
+						if ($add)
+						{
+							$to_write += $add;
+						}
 					}
 				}
 			}
@@ -281,7 +296,10 @@ 
 		}
 		if (!($dn = $old['dn']))
 		{
-			if (!$data['account_lid']) return false;
+			if (!$data['account_lid'])
+			{
+				return false;
+			}
 
 			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
 				'uid='.$data_utf8['account_lid'].','.$this->user_context;
@@ -302,24 +320,36 @@ 
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward))
+				{
+					list($forward,$extra_attr,$keep_objectclass) = $forward;
+				}
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
-					if ($data_utf8['account_email'])	// setting an email
+					if ($data_utf8['account_email'])
+					{
+						// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
+					}
 							$to_write['objectclass'][] = $objectclass;
 						}
-						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = $data_utf8['account_lid'];
+						}
 						$to_write[static::MAIL_ATTR] = $data_utf8['account_email'];
 
 						if ($forward)
 						{
-							if (!$members) $members = $this->members($data['account_id']);
+							if (!$members)
+							{
+								$members = $this->members($data['account_id']);
+							}
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
@@ -330,11 +360,20 @@ 
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif($old)
+					{
+						// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
-						if ($forward) $to_write[$forward] = array();
-						if ($extra_attr) $to_write[$extra_attr] = array();
+					}
+						if ($forward)
+						{
+							$to_write[$forward] = array();
+						}
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = array();
+						}
 						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
@@ -368,7 +407,8 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid']))
+		{
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
@@ -405,7 +445,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -418,10 +461,16 @@ 
 
 			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
 		}
-		if (!$sri) return false;
+		if (!$sri)
+		{
+			return false;
+		}
 
 		$allValues = ldap_get_entries($this->ds, $sri);
-		if (!$allValues['count']) return false;
+		if (!$allValues['count'])
+		{
+			return false;
+		}
 
 		return ldap_delete($this->ds, $allValues[0]['dn']);
 	}
@@ -593,14 +642,20 @@ 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
-			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))	// md5 --> ldap md5
+			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))
+			{
+				// md5 --> ldap md5
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			}
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))
+			{
+				// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
+			}
 			$to_write['userpassword'] = $data['account_passwd'];
 			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
 		}
@@ -620,16 +675,28 @@ 
 			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change'])
+		{
+			$to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
+		}
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0)
+		{
+			$to_write['shadowlastchange'] = 0;
+		}
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
-			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			if (isset($data['homedirectory']))
+			{
+				$to_write['homedirectory']  = $data['homedirectory'];
+			}
+			if (isset($data['loginshell']))
+			{
+				$to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			}
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
@@ -676,8 +743,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -748,12 +821,18 @@ 
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
-						if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
+						if ($key !== 'count')
+						{
+							$fullSet[$entry['uid'][0]] = $entry[$order][0];
+						}
 					}
 
-					if (is_numeric($param['type'])) // return only group-members
+					if (is_numeric($param['type']))
+					{
+						// return only group-members
 					{
 						$relevantAccounts = array();
+					}
 						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
@@ -791,7 +870,10 @@ 
 						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
-							if (isset($totalcount)) --$totalcount;
+							if (isset($totalcount))
+							{
+								--$totalcount;
+							}
 							continue;
 						}
 						$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],
@@ -844,7 +926,10 @@ 
 							'account_status'    => 'A',
 							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 						);
-						if (isset($totalcount)) ++$totalcount;
+						if (isset($totalcount))
+						{
+							++$totalcount;
+						}
 					}
 				}
 			}
@@ -945,10 +1030,13 @@ 
 	{
 		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
 
-		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
+		if ($which == 'account_lid' && $account_type !== 'u')
+		{
+			// groups only support account_lid
 		{
 
 			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+		}
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -961,7 +1049,8 @@ 
 			'account_email' => static::MAIL_ATTR,
 			'account_fullname' => 'cn',
 		);
-		if (!isset($to_ldap[$which]) || $account_type === 'g') {
+		if (!isset($to_ldap[$which]) || $account_type === 'g')
+		{
 		    return False;
 		}
 
@@ -1011,13 +1100,19 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int) $account_id || !($account_lid = $this->id2name($account_id)))
+		{
+			return false;
+		}
 
 		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
 		$memberships = array();
 		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$memberships[(string) -$data['gidnumber'][0]] = $data['cn'][0];
 		}
@@ -1037,7 +1132,10 @@ 
 		{
 			// try to recover
 			$_gid = $this->name2id($_gid,'account_lid','g');
-			if (!is_numeric($_gid)) return false;
+			if (!is_numeric($_gid))
+			{
+				return false;
+			}
 		}
 
 		$gid = abs($_gid);	// our gid is negative!
@@ -1085,7 +1183,10 @@ 
 		// adding new memberships
 		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
 		{
-			if (!($members = $this->members($gid))) $members = array();
+			if (!($members = $this->members($gid)))
+			{
+				$members = array();
+			}
 			$members[$account_id] = $this->id2name($account_id);
 			$this->set_members($members,$gid);
 		}
@@ -1103,16 +1204,25 @@ 
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
-		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
+		if (!($cn = $use_cn) && !($cn = $this->id2name($gid)))
+		{
+			return false;
+		}
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass))
+		{
+			$objectclass = $this->id2name($gid,'objectclass');
+		}
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
-			if (is_numeric($member)) $member = $this->id2name($member);
+			if (is_numeric($member))
+			{
+				$member = $this->id2name($member);
+			}
 
 			if ($member)
 			{
@@ -1136,21 +1246,33 @@ 
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if ($use_cn) return $to_write;
+		if ($use_cn)
+		{
+			return $to_write;
+		}
 
 		// set the member email addresses as forwards
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
-			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
+			if (is_array($forward))
+			{
+				list($forward,$extra_attr) = $forward;
+			}
+			if ($extra_attr && ($uid = $this->id2name($gid)))
+			{
+				$to_write[$extra_attr] = $uid;
+			}
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
 				foreach($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member,'account_email')))
+					{
+						$to_write[$forward][] = $email;
+					}
 				}
 			}
 		}
@@ -1176,7 +1298,10 @@ 
 
 		// prefer ids above 1000 (below reserved for system users under AD or Linux),
 		// if that's possible within what is configured, or nothing is configured
-		if ($min < 1000 && (!$max || $max > 1000)) $min = 1000;
+		if ($min < 1000 && (!$max || $max > 1000))
+		{
+			$min = 1000;
+		}
 
 		if ($account_type == 'g')
 		{
@@ -1229,7 +1354,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if($id < $min)
+		{
+			$id = $min;
+		}
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
 		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;

api/src/Accounts/Univention.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 					catch(Exception $e) {
 						unset($e);
 					}
-					if (empty($hostname)) $hostname = trim(system('hostname -f'));
+					if (empty($hostname))
+					{
+						$hostname = trim(system('hostname -f'));
+					}
 					$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 				}
 				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));

Spacing +6 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 			if (!$data['account_id'] && $data['account_type'] !== 'g')
 			{
 				$params = array(
-					'users/user','create',
+					'users/user', 'create',
 					'--binddn', $config['ldap_root_dn'],
 					'--bindpwd', 5=>$config['ldap_root_pw'],
 					'--position', $config['ldap_context'],
@@ -87,7 +87,7 @@ 
 						}
 						$hostname = $account->acc_imap_host;
 					}
-					catch(\Exception $e) {
+					catch (\Exception $e) {
 						unset($e);
 					}
 					if (empty($hostname)) $hostname = trim(system('hostname -f'));
@@ -99,14 +99,14 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
 				$data['account_dn'] = $matches[1];
 				$data['account_id'] = $this->name2id($data['account_lid'], 'account_lid', 'u');
 			}
-			elseif($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
+			elseif ($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
 				$data['account_lid'] != $data['old_loginid'] &&
 				($data['account_dn'] = $this->id2name($data['account_id'], 'account_dn')))
 			{
@@ -123,12 +123,11 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object modified: ((uid|cn)=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
-				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] :
-					// duno why but directory-manager returns old dn for groups ...
+				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] : // duno why but directory-manager returns old dn for groups ...
 					preg_replace('/^cn=[^,]+,/', 'cn='.$data['account_lid'].',', $data['account_dn']);
 			}
 		}

api/src/Acl.php

Doc Comments +3 added lines, -3 removed lines

@@ -166,7 +166,7 @@ 
 	 * Delete ACL record in the repository of the class
 	 *
 	 * @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp']
-	 * @param string/boolean $location location or false for all locations
+	 * @param boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
 	function delete($appname,$location)
@@ -267,8 +267,8 @@ 
 	/**
 	 * check required rights agains the internal repository (included rights of $this->account_id and all it's memberships)
 	 *
-	 * @param $location app location
-	 * @param $required required right to check against
+	 * @param string $location app location
+	 * @param integer $required required right to check against
 	 * @param $appname optional defaults to currentapp
 	 * @return boolean
 	 */

Spacing +98 added lines, -98 removed lines

@@ -51,15 +51,15 @@ 
 	/**
 	 * Constants for acl rights, like old EGW_ACL_* defines
 	 */
-	const READ      = 1;	// EGW_ACL_READ
-	const ADD       = 2;	// EGW_ACL_ADD
-	const EDIT      = 4;	// EGW_ACL_EDIT
-	const DELETE    = 8;	// EGW_ACL_DELETE
-	const PRIVAT    = 16;	// EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
-	const GROUPMGRS = 32;	// EGW_ACL_GROUP_MANAGERS
-	const CUSTOM1  = 64;		// EGW_ACL_CUSTOM_1
-	const CUSTOM2  = 128;	// EGW_ACL_CUSTOM_2
-	const CUSTOM3  = 256;	// EGW_ACL_CUSTOM_3
+	const READ      = 1; // EGW_ACL_READ
+	const ADD       = 2; // EGW_ACL_ADD
+	const EDIT      = 4; // EGW_ACL_EDIT
+	const DELETE    = 8; // EGW_ACL_DELETE
+	const PRIVAT    = 16; // EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
+	const GROUPMGRS = 32; // EGW_ACL_GROUP_MANAGERS
+	const CUSTOM1  = 64; // EGW_ACL_CUSTOM_1
+	const CUSTOM2  = 128; // EGW_ACL_CUSTOM_2
+	const CUSTOM3  = 256; // EGW_ACL_CUSTOM_3
 
 	/**
 	 * ACL constructor for setting account id
@@ -82,7 +82,7 @@ 
 		}
 		if ((int)$this->account_id != (int)$account_id)
 		{
-			$this->account_id = get_account_id((int)$account_id,@$GLOBALS['egw_info']['user']['account_id']);
+			$this->account_id = get_account_id((int)$account_id, @$GLOBALS['egw_info']['user']['account_id']);
 		}
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @param boolean|array $no_groups = false if true, do not use memberships, if array do not use given groups
 	 * @return array along with storing it in $acl->data.  <br>
 	 */
-	function read_repository($no_groups=false)
+	function read_repository($no_groups = false)
 	{
 		// For some reason, calling this via XML-RPC doesn't call the constructor.
 		// Here is yet another work around(tm) (jengo)
@@ -111,14 +111,14 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
-			array_unshift($acl_acc_list,$this->account_id);
+			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list, $no_groups);
+			array_unshift($acl_acc_list, $this->account_id);
 		}
 
 		$this->data = Array();
-		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select(self::TABLE, '*', array('acl_account' => $acl_acc_list), __LINE__, __FILE__) as $row)
 		{
-			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
+			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row, 'acl_');
 		}
 		return $this->data;
 	}
@@ -147,15 +147,15 @@ 
 	 * @param int $rights rights
 	 * @return array all ACL records from $this->data.
 	 */
-	function add($appname,$location,$rights)
+	function add($appname, $location, $rights)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$row = array(
 			'appname'  => $appname,
 			'location' => $location,
-			'account'  => (int) $this->account_id,
-			'rights'   => (int) $rights
+			'account'  => (int)$this->account_id,
+			'rights'   => (int)$rights
 		);
 		$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
 
@@ -169,11 +169,11 @@ 
 	 * @param string/boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
-	function delete($appname,$location)
+	function delete($appname, $location)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		foreach($this->data as $idx => $value)
+		foreach ($this->data as $idx => $value)
 		{
 			if ($value['appname'] == $appname &&
 				($location === false || $value['location'] == $location) &&
@@ -192,24 +192,24 @@ 
 	 */
 	function save_repository()
 	{
-		$this->db->delete(self::TABLE,array(
+		$this->db->delete(self::TABLE, array(
 			'acl_account' => $this->account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['account'] == $this->account_id)
 			{
-				$this->db->insert(self::TABLE,array(
+				$this->db->insert(self::TABLE, array(
 					'acl_appname'  => $value['appname'],
 					'acl_location' => $value['location'],
 					'acl_account'  => $this->account_id,
 					'acl_rights'   => $value['rights'],
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -227,7 +227,7 @@ 
 	 * @param string $appname optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return int all rights or'ed together
 	 */
-	function get_rights($location,$appname = '')
+	function get_rights($location, $appname = '')
 	{
 		// For XML-RPC, change this once its working correctly for passing parameters (jengo)
 		if (is_array($location))
@@ -247,7 +247,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -274,9 +274,9 @@ 
 	 */
 	function check($location, $required, $appname = False)
 	{
-		$rights = $this->get_rights($location,$appname);
+		$rights = $this->get_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**
@@ -287,7 +287,7 @@ 
 	 * @param array $memberships = array() additional account_id, eg. memberships to match beside $this->account_id, default none
 	 * @return int $rights
 	 */
-	function get_specific_rights($location, $appname = '', $memberships=array())
+	function get_specific_rights($location, $appname = '', $memberships = array())
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -297,10 +297,10 @@ 
 		}
 		$rights = 0;
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname &&
-				($value['location'] == $location ||	$value['location'] == 'everywhere') &&
+				($value['location'] == $location || $value['location'] == 'everywhere') &&
 				($value['account'] == $this->account_id || $memberships && in_array($value['account'], $memberships)))
 			{
 				if ($value['rights'] == 0)
@@ -323,9 +323,9 @@ 
 	 */
 	function check_specific($location, $required, $appname = '')
 	{
-		$rights = $this->get_specific_rights($location,$appname);
+		$rights = $this->get_specific_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**************************************************************************\
@@ -344,16 +344,16 @@ 
 	function add_repository($app, $location, $account_id, $rights)
 	{
 		//echo "<p>self::add_repository('$app','$location',$account_id,$rights);</p>\n";
-		$this->db->insert(self::TABLE,array(
+		$this->db->insert(self::TABLE, array(
 			'acl_rights' => $rights,
-		),array(
+		), array(
 			'acl_appname' => $app,
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -368,7 +368,7 @@ 
 	 * @param int/boolean $accountid = '' account id, default 0=$this->account_id, or false to delete all entries for $app/$location
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='')
+	function delete_repository($app, $location, $accountid = '')
 	{
 		static $cache_accountid = array();
 
@@ -378,22 +378,22 @@ 
 		);
 		if ($accountid !== false)
 		{
-			if(isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
+			if (isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
 			{
 				$where['acl_account'] = $cache_accountid[$accountid];
 			}
 			else
 			{
-				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -406,15 +406,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return int/boolean rights or false if none exist
 	 */
-	function get_specific_rights_for_account($account_id,$location,$appname='')
+	function get_specific_rights_for_account($account_id, $location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		return $this->db->select(self::TABLE,'acl_rights',array(
+		return $this->db->select(self::TABLE, 'acl_rights', array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -424,15 +424,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return array with account => rights pairs
 	 */
-	function get_all_rights($location,$appname='')
+	function get_all_rights($location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_account,acl_rights', array(
 			'acl_location' => $location,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_account']] = $row['acl_rights'];
 		}
@@ -447,7 +447,7 @@ 
 	 * @param boolean $use_memberships = true
 	 * @return array with location => rights pairs
 	 */
-	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
+	function get_all_location_rights($account_id, $appname = '', $use_memberships = true)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -458,10 +458,10 @@ 
 			$accounts[] = $account_id;
 		}
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_account' => $accounts,
 			'acl_appname' => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_location']] |= $row['acl_rights'];
 		}
@@ -480,28 +480,28 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		$rights = 0;
 		$apps = false;
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if ($row['acl_rights'] == 0)
 			{
 				return False;
 			}
 			$rights |= $row['acl_rights'];
-			if (!!($rights & $required))
+			if (!!($rights&$required))
 			{
 				$apps[] = $row['acl_appname'];
 			}
@@ -521,21 +521,21 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$accountid = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+			$accountid = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 		}
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_appname' => $app,
 			'acl_account' => $accountid,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if ($row['acl_rights'] & $required)
+			if ($row['acl_rights']&$required)
 			{
 				$locations[] = $row['acl_location'];
 			}
@@ -556,14 +556,14 @@ 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$accounts = false;
-		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights'), array(
 			'acl_appname'  => $app,
 			'acl_location' => $location,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if (!!($row['acl_rights'] & $required))
+			if (!!($row['acl_rights']&$required))
 			{
-				$accounts[] = (int) $row['acl_account'];
+				$accounts[] = (int)$row['acl_account'];
 			}
 		}
 		return $accounts;
@@ -575,14 +575,14 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return boolean/array false if there are no matching location in the db or array of locations
 	 */
-	function get_locations_for_app($app='')
+	function get_locations_for_app($app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
+		foreach ($this->db->select(self::TABLE, 'DISTINCT '.'acl_location', array(
 			'acl_appname'  => $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{
@@ -600,38 +600,38 @@ 
 	 * @param boolean $add_implicit_apps = true true: add apps every user has implicit rights
 	 * @return array containing list of apps
 	 */
-	function get_user_applications($accountid = '', $use_memberships=true, $add_implicit_apps=true)
+	function get_user_applications($accountid = '', $use_memberships = true, $add_implicit_apps = true)
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => 'run',
 			'acl_account'  => $memberships,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$app = $row['acl_appname'];
-			if(!isset($apps[$app]))
+			if (!isset($apps[$app]))
 			{
 				$apps[$app] = 0;
 			}
-			$apps[$app] |= (int) $row['acl_rights'];
+			$apps[$app] |= (int)$row['acl_rights'];
 		}
 		if ($add_implicit_apps)
 		{
-			$apps['api'] = 1;	// give everyone implicit rights for the home app
+			$apps['api'] = 1; // give everyone implicit rights for the home app
 		}
 		return $apps;
 	}
@@ -645,29 +645,29 @@ 
 	 * @param int $user = null user whos grants to return, default current user
 	 * @return array with account-ids (of owners) and granted rights as values
 	 */
-	function get_grants($app='',$enum_group_acls=true,$user=null)
+	function get_grants($app = '', $enum_group_acls = true, $user = null)
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$user) $user = $this->account_id;
 
-		static $cache = array();	// some caching withing the request
+		static $cache = array(); // some caching withing the request
 
-		$grants =& $cache[$app][$user];
+		$grants = & $cache[$app][$user];
 		if (!isset($grants))
 		{
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
-			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
+			foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights', 'acl_location'), array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$grantor    = $row['acl_account'];
 				$rights     = $row['acl_rights'];
 
-				if(!isset($grants[$grantor]))
+				if (!isset($grants[$grantor]))
 				{
 					$grants[$grantor] = 0;
 				}
@@ -675,17 +675,17 @@ 
 
 				// if the right is granted from a group and we enummerated group ACL's
 				if ($GLOBALS['egw']->accounts->get_type($grantor) == 'g' && $enum_group_acls &&
-					(!is_array($enum_group_acls) || !in_array($grantor,$enum_group_acls)))
+					(!is_array($enum_group_acls) || !in_array($grantor, $enum_group_acls)))
 				{
 					// return the grant for each member of the group (false = also for no longer active users)
-					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
+					foreach ((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor) continue; // can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
 
-						if(!isset($grants[$grantor]))
+						if (!isset($grants[$grantor]))
 						{
 							$grants[$grantor] = 0;
 						}
@@ -707,21 +707,21 @@ 
 	 */
 	function delete_account($account_id)
 	{
-		if ((int) $account_id)
+		if ((int)$account_id)
 		{
 			// Delete all grants from this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_account' => $account_id
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			// Delete all grants to this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_location' => $account_id
-			),__LINE__, __FILE__);
+			), __LINE__, __FILE__);
 			// delete all memberships in account_id (if it is a group)
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_appname' => 'phpgw_group',
 				'acl_location' => $account_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -732,15 +732,15 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return array with location => array(account => rights) pairs
 	 */
-	function get_location_grants($location,$app='')
+	function get_location_grants($location, $app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_account,acl_rights', array(
 			'acl_appname'  => $app,
 			'acl_location LIKE '.$this->db->quote($location),
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{

Braces +81 added lines, -20 removed lines

@@ -111,7 +111,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -149,7 +152,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -171,7 +177,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -209,10 +218,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -240,7 +252,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -289,7 +304,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -426,7 +456,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -449,7 +482,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -553,7 +589,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -577,7 +616,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -613,7 +655,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -647,15 +692,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -680,7 +734,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -734,7 +792,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

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

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var array $data internal repository with acl rows for the given app and account-id (incl. memberships)
 	 */
-	var $data = Array();
+	var $data = array();
 	/**
 	 * internal copy of the db-object
 	 *
@@ -115,7 +115,7 @@ 
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
-		$this->data = Array();
+		$this->data = array();
 		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
 		{
 			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
@@ -658,7 +658,7 @@ 
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
-			$grants = $accounts = Array();
+			$grants = $accounts = array();
 			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,

api/src/Asyncservice.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 	 * cancels a timer
 	 *
 	 * @param string $id has to be the one used to set it.
-	 * @return boolean True if the timer exists and is not expired.
+	 * @return integer True if the timer exists and is not expired.
 	 */
 	function cancel_timer($id)
 	{
@@ -470,7 +470,7 @@ 
 	/**
 	 * reads all matching db-rows / jobs
 	 *
-	 * @param string $id =0 reads all expired rows / jobs ready to run\
+	 * @param integer $id =0 reads all expired rows / jobs ready to run\
 	 * 	!= 0 reads all rows/jobs matching $id (sql-wildcards '%' and '_' can be used)
 	 * @param array|string $cols ='*' string or array of column-names / select-expressions
 	 * @param int|bool $offset =False offset for a limited query or False (default)
@@ -558,7 +558,7 @@ 
 	/**
 	 * delete db-row / job with $id
 	 *
-	 * @return boolean False if $id not found else True
+	 * @return integer False if $id not found else True
 	 */
 	function delete($id)
 	{

Spacing +74 added lines, -76 removed lines

@@ -49,9 +49,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -158,7 +158,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -176,24 +176,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -210,7 +210,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -302,12 +301,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -339,7 +338,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -361,7 +360,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -377,7 +376,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists) $where = array('async_next=0 OR async_next<'.(time() - 600));
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -386,20 +385,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -408,7 +407,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					Link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -420,7 +419,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -435,12 +434,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				Translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -478,7 +476,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
 
@@ -486,7 +484,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -500,21 +498,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(Db::strip_array_keys($row,'async_'), true);
+				$this->write(Db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = Db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = Db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -531,7 +529,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -587,38 +585,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -665,12 +663,12 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False ||
+				elseif (strpos($line, $this->cronline) !== False ||
 					// also check of old phpgwapi/cron path
 					strpos($line, str_replace('/api/', '/phpgwapi/cron/', $this->cronline)) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -701,29 +699,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->other_cronlines as $cronline)
 				{
-					fwrite($crontab,$cronline);		// preserv the other lines on install
+					fwrite($crontab, $cronline); // preserv the other lines on install
 				}
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

Braces +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists)
+			{
+				$where = array('async_next=0 OR async_next<'.(time()-600));
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -388,7 +432,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -410,7 +457,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -480,7 +530,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -533,9 +586,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -600,9 +659,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -622,10 +684,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5[0] == '/')	// we found a php5 binary
+			if ($this->php5[0] == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -698,7 +767,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines

api/src/Auth.php

Doc Comments +5 added lines, -4 removed lines

@@ -84,8 +84,8 @@ 
 	 * check if users are supposed to change their password every x sdays, then check if password is of old age
 	 * or the devil-admin reset the users password and forced the user to change his password on next login.
 	 *
-	 * @param string& $message =null on return false: message why password needs to be changed
-	 * @return boolean true: all good, false: password change required, null: password expires in N days
+	 * @param string $message =null on return false: message why password needs to be changed
+	 * @return boolean|null true: all good, false: password change required, null: password expires in N days
 	 */
 	static function check_password_change(&$message=null)
 	{
@@ -294,7 +294,7 @@ 
 	 *
 	 * uses the encryption type set in setup and calls the appropriate encryption functions
 	 *
-	 * @param $password password to encrypt
+	 * @param string $password password to encrypt
 	 */
 	static function encrypt_password($password,$sql=False)
 	{
@@ -406,6 +406,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
+	 * @param string $type
 	 * @return boolean	 True on successful comparison
 	*/
 	static function crypt_compare($form_val, $db_val, &$type)
@@ -618,7 +619,7 @@ 
 	 * @param string $forbid_name =null if "yes" username or full-name split by delimiters AND longer then 3 chars are
 	 *  forbidden to be included in password, default to whatever set in config for "passwd_forbid_name"
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
-	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
+	 * @return string|false false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{

Indentation +4 added lines, -4 removed lines

@@ -407,7 +407,7 @@ 
 	 * @param string $db_val   stored value / hash (from database)
 	 * @param string &$type    detected crypt type on return
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function crypt_compare($form_val, $db_val, &$type)
 	{
 		// detect type of hash by salt part of $db_val
@@ -706,7 +706,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function smd5_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SMD5} */
@@ -728,7 +728,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
-	*/
+	 */
 	static function sha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SHA} */
@@ -745,7 +745,7 @@ 
 	 * @param string $form_val user input value for comparison
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
-	*/
+	 */
 	static function ssha_compare($form_val,$db_val)
 	{
 		/* Start with the first char after {SSHA} */

Spacing +92 added lines, -92 removed lines

@@ -20,7 +20,7 @@ 
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = $GLOBALS['egw_info']['server']['auth_type_'.$GLOBALS['egw_info']['flags']['currentapp']];
 }
-if(empty($GLOBALS['egw_info']['server']['auth_type']))
+if (empty($GLOBALS['egw_info']['server']['auth_type']))
 {
 	$GLOBALS['egw_info']['server']['auth_type'] = 'sql';
 }
@@ -60,7 +60,7 @@ 
 	 *
 	 * @param Backend $type =null
 	 */
-	static function backend($type=null)
+	static function backend($type = null)
 	{
 		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['auth_type'];
 
@@ -87,29 +87,29 @@ 
 	 * @param string& $message =null on return false: message why password needs to be changed
 	 * @return boolean true: all good, false: password change required, null: password expires in N days
 	 */
-	static function check_password_change(&$message=null)
+	static function check_password_change(&$message = null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
 		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
-		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		static $UserKnowsAboutPwdChange = null;
+		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange = & Cache::getSession('phpgwapi', 'auth_UserKnowsAboutPwdChange');
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
-		static $alpwchange_val=null;
-		static $pwdTsChecked=null;
+		static $alpwchange_val = null;
+		static $pwdTsChecked = null;
 		if (is_null($pwdTsChecked) && is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 		{
-			$alpwchange_val =& Cache::getSession('phpgwapi','auth_alpwchange_val'); // set that one with the session stored value
+			$alpwchange_val = & Cache::getSession('phpgwapi', 'auth_alpwchange_val'); // set that one with the session stored value
 			// initalize statics - better readability of conditions
 			if (is_null($alpwchange_val) || (string)$alpwchange_val === '0')
 			{
 				$backend = self::backend();
 				// this may change behavior, as it should detect forced PasswordChanges from your Authentication System too.
 				// on the other side, if your auth system does not require an forcedPasswordChange, you will not be asked.
-				if (method_exists($backend,'getLastPwdChange'))
+				if (method_exists($backend, 'getLastPwdChange'))
 				{
 					$alpwchange_val = $backend->getLastPwdChange($GLOBALS['egw']->session->account_lid);
 					$pwdTsChecked = true;
@@ -123,8 +123,8 @@ 
 				//error_log(__METHOD__.__LINE__.'#'.$alpwchange_val.'# is null:'.is_null($alpwchange_val).'# is empty:'.empty($alpwchange_val).'# is set:'.isset($alpwchange_val));
 			}
 		}
-		static $passwordAgeBorder=null;
-		static $daysLeftUntilChangeReq=null;
+		static $passwordAgeBorder = null;
+		static $daysLeftUntilChangeReq = null;
 
 		// if neither timestamp isset return true, nothing to do (exept this means the password is too old)
 		if (is_null($alpwchange_val) &&
@@ -134,15 +134,15 @@ 
 		}
 		if (is_null($passwordAgeBorder) && $GLOBALS['egw_info']['server']['change_pwd_every_x_days'])
 		{
-			$passwordAgeBorder = (DateTime::to('now','ts')-($GLOBALS['egw_info']['server']['change_pwd_every_x_days']*86400));
+			$passwordAgeBorder = (DateTime::to('now', 'ts') - ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] * 86400));
 		}
 		if (is_null($daysLeftUntilChangeReq) && $GLOBALS['egw_info']['server']['warn_about_upcoming_pwd_change'])
 		{
 			// maxage - passwordage = days left until change is required
-			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((DateTime::to('now','ts')-($alpwchange_val?$alpwchange_val:0))/86400));
+			$daysLeftUntilChangeReq = ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] - ((DateTime::to('now', 'ts') - ($alpwchange_val ? $alpwchange_val : 0)) / 86400));
 		}
-		if ($alpwchange_val == 0 ||	// admin requested password change
-			$passwordAgeBorder > $alpwchange_val ||	// change password every N days policy requests change
+		if ($alpwchange_val == 0 || // admin requested password change
+			$passwordAgeBorder > $alpwchange_val || // change password every N days policy requests change
 			// user should be warned N days in advance about change and is not yet
 			$GLOBALS['egw_info']['server']['change_pwd_every_x_days'] &&
 			$GLOBALS['egw_info']['user']['apps']['preferences'] &&
@@ -159,7 +159,7 @@ 
 				error_log(__METHOD__.' Password of '.$GLOBALS['egw_info']['user']['account_lid'].' ('.$GLOBALS['egw_info']['user']['account_fullname'].') is of old age.'.array2string(array(
 					'ts'=> $alpwchange_val,
 					'date'=>DateTime::to($alpwchange_val))));
-				$message = lang('It has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+				$message = lang('It has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 			}
 			else
 			{
@@ -170,7 +170,7 @@ 
 				{
 					$UserKnowsAboutPwdChange = true;
 				}
-				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
+				$message = lang('Your password is about to expire in %1 days, you may change your password now', round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
 				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
 				return null;
@@ -188,7 +188,7 @@ 
 	 */
 	function getLastPwdChange($username)
 	{
-		if (method_exists($this->backend,'getLastPwdChange'))
+		if (method_exists($this->backend, 'getLastPwdChange'))
 		{
 			return $this->backend->getLastPwdChange($username);
 		}
@@ -203,9 +203,9 @@ 
 	 * @param int $lastpwdchange must be a unixtimestamp
 	 * @return boolean true if account_lastpwd_change successful changed, false otherwise
 	 */
-	function setLastPwdChange($account_id=0, $passwd=NULL, $lastpwdchange=NULL)
+	function setLastPwdChange($account_id = 0, $passwd = NULL, $lastpwdchange = NULL)
 	{
-		if (method_exists($this->backend,'setLastPwdChange'))
+		if (method_exists($this->backend, 'setLastPwdChange'))
 		{
 			return $this->backend->setLastPwdChange($account_id, $passwd, $lastpwdchange);
 		}
@@ -220,7 +220,7 @@ 
 	 * @param string $passwd_type ='text' 'text' for cleartext passwords (default)
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($username, $passwd, $passwd_type='text')
+	function authenticate($username, $passwd, $passwd_type = 'text')
 	{
 		return $this->backend->authenticate($username, $passwd, $passwd_type);
 	}
@@ -235,9 +235,9 @@ 
 	 * @throws Exception from backends having extra requirements
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0)
+	function change_password($old_passwd, $new_passwd, $account_id = 0)
 	{
-		if (($err = self::crackcheck($new_passwd,null,null,null,$account_id)))
+		if (($err = self::crackcheck($new_passwd, null, null, null, $account_id)))
 		{
 			throw new Exception\WrongUserinput($err);
 		}
@@ -248,7 +248,7 @@ 
 				// need to change current users password in session
 				Cache::setSession('phpgwapi', 'password', base64_encode($new_passwd));
 				$GLOBALS['egw_info']['user']['passwd'] = $new_passwd;
-				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = DateTime::to('now','ts');
+				$GLOBALS['egw_info']['user']['account_lastpwd_change'] = DateTime::to('now', 'ts');
 				// invalidate EGroupware session, as password is stored in egw_info in session
 				Egw::invalidate_session_cache();
 			}
@@ -260,9 +260,9 @@ 
 				'old_passwd'  => $old_passwd,
 				'new_passwd'  => $new_passwd,
 			);
-			Hooks::process($GLOBALS['hook_values']+array(
+			Hooks::process($GLOBALS['hook_values'] + array(
 				'location' => 'changepassword'
-			),False,True);	// called for every app now, not only enabled ones)
+			), False, True); // called for every app now, not only enabled ones)
 		}
 		return $ret;
 	}
@@ -275,16 +275,16 @@ 
 	static function randomstring($size)
 	{
 		static $random_char = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 		);
 
 		$s = '';
-		for ($i=0; $i<$size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$s .= $random_char[mt_rand(1,61)];
+			$s .= $random_char[mt_rand(1, 61)];
 		}
 		return $s;
 	}
@@ -296,9 +296,9 @@ 
 	 *
 	 * @param $password password to encrypt
 	 */
-	static function encrypt_password($password,$sql=False)
+	static function encrypt_password($password, $sql = False)
 	{
-		if($sql)
+		if ($sql)
 		{
 			return self::encrypt_sql($password);
 		}
@@ -317,21 +317,21 @@ 
 	 * @param string &$type =null on return detected type of hash
 	 * @return boolean
 	 */
-	static function compare_password($cleartext, $encrypted, $type_in, $username='', &$type=null)
+	static function compare_password($cleartext, $encrypted, $type_in, $username = '', &$type = null)
 	{
 		// allow to specify the hash type to prefix the hash, to easy migrate passwords from ldap
 		$type = $type_in;
 		$saved_enc = $encrypted;
 		$matches = null;
-		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i',$encrypted,$matches))
+		if (preg_match('/^\\{([a-z_5]+)\\}(.+)$/i', $encrypted, $matches))
 		{
 			$type = strtolower($matches[1]);
 			$encrypted = $matches[2];
 
-			switch($type)	// some hashs are specially "packed" in ldap
+			switch ($type)	// some hashs are specially "packed" in ldap
 			{
 				case 'md5':
-					$encrypted = implode('',unpack('H*',base64_decode($encrypted)));
+					$encrypted = implode('', unpack('H*', base64_decode($encrypted)));
 					break;
 				case 'plain':
 				case 'crypt':
@@ -342,24 +342,24 @@ 
 					break;
 			}
 		}
-		elseif($encrypted[0] == '$')
+		elseif ($encrypted[0] == '$')
 		{
 			$type = 'crypt';
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				$ret = $cleartext === $encrypted;
 				break;
 			case 'smd5':
-				$ret = self::smd5_compare($cleartext,$encrypted);
+				$ret = self::smd5_compare($cleartext, $encrypted);
 				break;
 			case 'sha':
-				$ret = self::sha_compare($cleartext,$encrypted);
+				$ret = self::sha_compare($cleartext, $encrypted);
 				break;
 			case 'ssha':
-				$ret = self::ssha_compare($cleartext,$encrypted);
+				$ret = self::ssha_compare($cleartext, $encrypted);
 				break;
 			case 'crypt':
 			case 'des':
@@ -372,7 +372,7 @@ 
 				$ret = self::crypt_compare($cleartext, $encrypted, $type);
 				break;
 			case 'md5_hmac':
-				$ret = self::md5_hmac_compare($cleartext,$encrypted,$username);
+				$ret = self::md5_hmac_compare($cleartext, $encrypted, $username);
 				break;
 			default:
 				$type = 'md5';
@@ -395,9 +395,9 @@ 
 		'ext_crypt' => array('CRYPT_EXT_DES', '_J9..', 4, ''),
 		'md5_crypt' => array('CRYPT_MD5', '$1$', 8, '$'),
 		//'old_blowfish_crypt' => array('CRYPT_BLOWFISH', '$2$', 13, ''),	// old blowfish hash not in line with php.net docu, but could be in use
-		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''),	// $2a$12$ = 2^12 = 4096 rounds
-		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
-		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'),	// no "round=N$" --> default of 5000 rounds
+		'blowfish_crypt' => array('CRYPT_BLOWFISH', '$2a$12$', 22, ''), // $2a$12$ = 2^12 = 4096 rounds
+		'sha256_crypt' => array('CRYPT_SHA256', '$5$', 16, '$'), // no "round=N$" --> default of 5000 rounds
+		'sha512_crypt' => array('CRYPT_SHA512', '$6$', 16, '$'), // no "round=N$" --> default of 5000 rounds
 	);
 
 	/**
@@ -412,17 +412,17 @@ 
 	{
 		// detect type of hash by salt part of $db_val
 		list($first, $dollar, $salt, $salt2) = explode('$', $db_val);
-		foreach(self::$crypt_params as $type => $params)
+		foreach (self::$crypt_params as $type => $params)
 		{
 			list(,$prefix, $random, $postfix) = $params;
 			list(,$d) = explode('$', $prefix);
 			if ($dollar === $d || !$dollar && ($first[0] === $prefix[0] || $first[0] !== '_' && !$prefix))
 			{
-				$len = !$postfix ? strlen($prefix)+$random : strlen($prefix.$salt.$postfix);
+				$len = !$postfix ? strlen($prefix) + $random : strlen($prefix.$salt.$postfix);
 				// sha(256|512) might contain options, explicit $rounds=N$ prefix in salt
 				if (($type == 'sha256_crypt' || $type == 'sha512_crypt') && substr($salt, 0, 7) === 'rounds=')
 				{
-					$len += strlen($salt2)+1;
+					$len += strlen($salt2) + 1;
 				}
 				break;
 			}
@@ -444,12 +444,12 @@ 
 	 * @param string $type =null default to $GLOBALS['egw_info']['server']['ldap_encryption_type']
 	 * @return string
 	 */
-	static function encrypt_ldap($password, $type=null)
+	static function encrypt_ldap($password, $type = null)
 	{
 		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
 
 		$salt = '';
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			default:	// eg. setup >> config never saved
 			case 'des':
@@ -463,7 +463,7 @@ 
 			case 'md5_crypt':
 			case 'ext_crypt':
 				list($const, $prefix, $len, $postfix) = self::$crypt_params[$type];
-				if(defined($const) && constant($const) == 1)
+				if (defined($const) && constant($const) == 1)
 				{
 					$salt = $prefix.self::randomstring($len).$postfix;
 					$e_password = '{crypt}'.crypt($password, $salt);
@@ -476,20 +476,20 @@ 
 				/* New method taken from the openldap-software list as recommended by
 				 * Kervin L. Pierre" <kervin@blueprint-tech.com>
 				 */
-				$e_password = '{md5}' . base64_encode(pack("H*",md5($password)));
+				$e_password = '{md5}'.base64_encode(pack("H*", md5($password)));
 				break;
 			case 'smd5':
 				$salt = self::randomstring(16);
-				$hash = md5($password . $salt, true);
-				$e_password = '{SMD5}' . base64_encode($hash . $salt);
+				$hash = md5($password.$salt, true);
+				$e_password = '{SMD5}'.base64_encode($hash.$salt);
 				break;
 			case 'sha':
-				$e_password = '{SHA}' . base64_encode(sha1($password,true));
+				$e_password = '{SHA}'.base64_encode(sha1($password, true));
 				break;
 			case 'ssha':
 				$salt = self::randomstring(16);
-				$hash = sha1($password . $salt, true);
-				$e_password = '{SSHA}' . base64_encode($hash . $salt);
+				$hash = sha1($password.$salt, true);
+				$e_password = '{SSHA}'.base64_encode($hash.$salt);
 				break;
 			case 'plain':
 				// if plain no type is prepended
@@ -507,7 +507,7 @@ 
 	 * @param string $type =null default $GLOBALS['egw_info']['server']['sql_encryption_type']
 	 * @return string hash
 	 */
-	static function encrypt_sql($password, $type=null)
+	static function encrypt_sql($password, $type = null)
 	{
 		/* Grab configured type, or default to md5() (old method) */
 		if (is_null($type))
@@ -515,7 +515,7 @@ 
 			$type = @$GLOBALS['egw_info']['server']['sql_encryption_type'] ?
 				strtolower($GLOBALS['egw_info']['server']['sql_encryption_type']) : 'md5';
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'plain':
 				// since md5 is the default, type plain must be prepended, for eGroupware to understand
@@ -557,28 +557,28 @@ 
 	 * @param string &$securest =null on return securest available hash
 	 * @return array hash => label
 	 */
-	public static function passwdhashes(&$securest=null)
+	public static function passwdhashes(&$securest = null)
 	{
 		$hashes = array();
 
 		/* Check for available crypt methods based on what is defined by php */
-		if(defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
+		if (defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
 		{
 			$hashes['blowfish_crypt'] = 'blowfish_crypt';
 		}
-		if(defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
+		if (defined('CRYPT_SHA512') && CRYPT_SHA512 == 1)
 		{
 			$hashes['sha512_crypt'] = 'sha512_crypt';
 		}
-		if(defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
+		if (defined('CRYPT_SHA256') && CRYPT_SHA256 == 1)
 		{
 			$hashes['sha256_crypt'] = 'sha256_crypt';
 		}
-		if(defined('CRYPT_MD5') && CRYPT_MD5 == 1)
+		if (defined('CRYPT_MD5') && CRYPT_MD5 == 1)
 		{
 			$hashes['md5_crypt'] = 'md5_crypt';
 		}
-		if(defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
+		if (defined('CRYPT_EXT_DES') && CRYPT_EXT_DES == 1)
 		{
 			$hashes['ext_crypt'] = 'ext_crypt';
 		}
@@ -587,7 +587,7 @@ 
 			'smd5' => 'smd5',
 			'sha'  => 'sha',
 		);
-		if(@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
+		if (@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
 		{
 			$hashes['crypt'] = 'crypt';
 		}
@@ -620,7 +620,7 @@ 
 	 * @param array|int $account =null array with account_lid and account_fullname or account_id for $forbid_name check
 	 * @return mixed false if password is considered "safe" (or no requirements) or a string $message if "unsafe"
 	 */
-	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
+	static function crackcheck($passwd, $reqstrength = null, $minlength = null, $forbid_name = null, $account = null)
 	{
 		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
 		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
@@ -634,11 +634,11 @@ 
 		{
 			if (!isset($reqstrength) || $reqstrength == 5)
 			{
-				Config::save_value('force_pwd_strength', $reqstrength=4, 'phpgwapi');
+				Config::save_value('force_pwd_strength', $reqstrength = 4, 'phpgwapi');
 			}
 			if (!isset($minlength))
 			{
-				Config::save_value('force_pwd_length', $minlength=7, 'phpgwapi');
+				Config::save_value('force_pwd_length', $minlength = 7, 'phpgwapi');
 			}
 			Config::save_value('check_save_passwd', null, 'phpgwapi');
 		}
@@ -657,7 +657,7 @@ 
 				throw new Exception\WrongParameter('crackcheck(..., forbid_name=true, account) requires account-data!');
 			}
 			$parts = preg_split("/[,._ \t0-9-]+/", $account['account_fullname'].','.$account['account_lid']);
-			foreach($parts as $part)
+			foreach ($parts as $part)
 			{
 				if (strlen($part) > 2 && stripos($passwd, $part) !== false)
 				{
@@ -670,15 +670,15 @@ 
 		if ($reqstrength)
 		{
 			$missing = array();
-			if (!preg_match('/(.*\d.*){'. ($non=1). ',}/',$passwd))
+			if (!preg_match('/(.*\d.*){'.($non = 1).',}/', $passwd))
 			{
 				$missing[] = lang('numbers');
 			}
-			if (!preg_match('/(.*[[:upper:]].*){'. ($nou=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:upper:]].*){'.($nou = 1).',}/', $passwd))
 			{
 				$missing[] = lang('uppercase letters');
 			}
-			if (!preg_match('/(.*[[:lower:]].*){'. ($nol=1). ',}/',$passwd))
+			if (!preg_match('/(.*[[:lower:]].*){'.($nol = 1).',}/', $passwd))
 			{
 				$missing[] = lang('lowercase letters');
 			}
@@ -689,7 +689,7 @@ 
 			if (4 - count($missing) < $reqstrength)
 			{
 				$errors[] = lang('password contains only %1 of required %2 character classes: no %3',
-					4-count($missing), $reqstrength, implode(', ', $missing));
+					4 - count($missing), $reqstrength, implode(', ', $missing));
 			}
 		}
 		if ($errors)
@@ -707,19 +707,19 @@ 
 	 * @param string $db_val stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function smd5_compare($form_val,$db_val)
+	static function smd5_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SMD5} */
-		$hash = base64_decode(substr($db_val,6));
+		$hash = base64_decode(substr($db_val, 6));
 
 		/* SMD5 hashes are 16 bytes long */
-		$orig_hash = cut_bytes($hash, 0, 16);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 16); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 16);
 
-		$new_hash = md5($form_val . $salt,true);
+		$new_hash = md5($form_val.$salt, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -729,14 +729,14 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean True on successful comparison
 	*/
-	static function sha_compare($form_val,$db_val)
+	static function sha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SHA} */
-		$hash = base64_decode(substr($db_val,5));
-		$new_hash = sha1($form_val,true);
+		$hash = base64_decode(substr($db_val, 5));
+		$new_hash = sha1($form_val, true);
 		//echo '<br>  DB: ' . base64_encode($orig_hash) . '<br>FORM: ' . base64_encode($new_hash);
 
-		return strcmp($hash,$new_hash) == 0;
+		return strcmp($hash, $new_hash) == 0;
 	}
 
 	/**
@@ -746,18 +746,18 @@ 
 	 * @param string $db_val   stored value (from database)
 	 * @return boolean	 True on successful comparison
 	*/
-	static function ssha_compare($form_val,$db_val)
+	static function ssha_compare($form_val, $db_val)
 	{
 		/* Start with the first char after {SSHA} */
 		$hash = base64_decode(substr($db_val, 6));
 
 		// SHA-1 hashes are 160 bits long
-		$orig_hash = cut_bytes($hash, 0, 20);	// binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
+		$orig_hash = cut_bytes($hash, 0, 20); // binary string need to use cut_bytes, not mb_substr(,,'utf-8')!
 		$salt = cut_bytes($hash, 20);
-		$new_hash = sha1($form_val . $salt,true);
+		$new_hash = sha1($form_val.$salt, true);
 
 		//error_log(__METHOD__."('$form_val', '$db_val') hash='$hash', orig_hash='$orig_hash', salt='$salt', new_hash='$new_hash' returning ".array2string(strcmp($orig_hash,$new_hash) == 0));
-		return strcmp($orig_hash,$new_hash) == 0;
+		return strcmp($orig_hash, $new_hash) == 0;
 	}
 
 	/**
@@ -768,11 +768,11 @@ 
 	 * @param string $_key       key for md5_hmac-encryption (username for imported smf users)
 	 * @return boolean	 True on successful comparison
 	 */
-	static function md5_hmac_compare($form_val,$db_val,$_key)
+	static function md5_hmac_compare($form_val, $db_val, $_key)
 	{
 		$key = str_pad(strlen($_key) <= 64 ? $_key : pack('H*', md5($_key)), 64, chr(0x00));
-		$md5_hmac = md5(($key ^ str_repeat(chr(0x5c), 64)) . pack('H*', md5(($key ^ str_repeat(chr(0x36), 64)). $form_val)));
+		$md5_hmac = md5(($key^str_repeat(chr(0x5c), 64)).pack('H*', md5(($key^str_repeat(chr(0x36), 64)).$form_val)));
 
-		return strcmp($md5_hmac,$db_val) == 0;
+		return strcmp($md5_hmac, $db_val) == 0;
 	}
 }

Braces +32 added lines, -8 removed lines

@@ -62,7 +62,10 @@ 
 	 */
 	static function backend($type=null)
 	{
-		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['auth_type'];
+		if (is_null($type))
+		{
+			$type = $GLOBALS['egw_info']['server']['auth_type'];
+		}
 
 		$backend_class = __CLASS__.'\\'.ucfirst($type);
 
@@ -90,12 +93,18 @@ 
 	static function check_password_change(&$message=null)
 	{
 		// dont check anything for anonymous sessions/ users that are flagged as anonymous
-		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A') return true;
+		if (is_object($GLOBALS['egw']->session) && $GLOBALS['egw']->session->session_flags == 'A')
+		{
+			return true;
+		}
 
 		// some statics (and initialisation to make information and timecalculation a) more readable in conditions b) persistent per request
 		// if user has to be warned about an upcomming passwordchange, remember for the session, that he was informed
 		static $UserKnowsAboutPwdChange=null;
-		if (is_null($UserKnowsAboutPwdChange)) $UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		if (is_null($UserKnowsAboutPwdChange))
+		{
+			$UserKnowsAboutPwdChange =& Cache::getSession('phpgwapi','auth_UserKnowsAboutPwdChange');
+		}
 
 		// retrieve the timestamp regarding the last change of the password from auth system and store it with the session
 		static $alpwchange_val=null;
@@ -172,7 +181,10 @@ 
 				}
 				$message = lang('Your password is about to expire in %1 days, you may change your password now',round($daysLeftUntilChangeReq));
 				// user has no rights to change password --> do NOT warn, as only forced check ignores rights
-				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) return true;
+				if ($GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences'))
+				{
+					return true;
+				}
 				return null;
 			}
 			return false;
@@ -446,7 +458,10 @@ 
 	 */
 	static function encrypt_ldap($password, $type=null)
 	{
-		if (is_null($type)) $type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		if (is_null($type))
+		{
+			$type = $GLOBALS['egw_info']['server']['ldap_encryption_type'];
+		}
 
 		$salt = '';
 		switch(strtolower($type))
@@ -622,9 +637,18 @@ 
 	 */
 	static function crackcheck($passwd, $reqstrength=null, $minlength=null, $forbid_name=null, $account=null)
 	{
-		if (!isset($reqstrength)) $reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
-		if (!isset($minlength)) $minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
-		if (!isset($forbid_name)) $forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		if (!isset($reqstrength))
+		{
+			$reqstrength = $GLOBALS['egw_info']['server']['force_pwd_strength'];
+		}
+		if (!isset($minlength))
+		{
+			$minlength = $GLOBALS['egw_info']['server']['force_pwd_length'];
+		}
+		if (!isset($forbid_name))
+		{
+			$forbid_name = $GLOBALS['egw_info']['server']['passwd_forbid_name'];
+		}
 
 		// load preferences translations, as changepassword get's called from admin too
 		Translation::add_app('preferences');

api/src/CalDAV/Handler.php

Doc Comments +3 added lines, -4 removed lines

@@ -151,7 +151,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start false=return all or array(start,num)
+	 * @param integer[] $start false=return all or array(start,num)
 	 * @param int &$total
 	 * @return array with "files" array with values for keys path and props
 	 */
@@ -193,7 +193,6 @@ 
 	 * Read an entry
 	 *
 	 * @param string|int $id
-	 * @param string $path =null implementation can use it, used in call from _common_get_put_delete
 	 * @return array|boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	abstract function read($id /*,$path=null*/);
@@ -238,7 +237,7 @@ 
 	 * Get the etag for an entry, can be reimplemented for other algorithm or field names
 	 *
 	 * @param array|int $entry array with event or cal_id
-	 * @return string|boolean string with etag or false
+	 * @return false|string string with etag or false
 	 */
 	function get_etag($entry)
 	{
@@ -423,7 +422,7 @@ 
 	/**
 	 * Identify know GroupDAV agents by HTTP_USER_AGENT header
 	 *
-	 * @return string|boolean agent name or false
+	 * @return string|false agent name or false
 	 */
 	static function get_agent()
 	{

Braces +60 added lines, -15 removed lines

@@ -123,7 +123,10 @@ 
 	function __construct($app, Api\CalDAV $caldav)
 	{
 		$this->app = $app;
-		if (!is_null($caldav->debug)) $this->debug = $caldav->debug;
+		if (!is_null($caldav->debug))
+		{
+			$this->debug = $caldav->debug;
+		}
 		$this->base_uri = $caldav->base_uri;
 		$this->caldav = $caldav;
 
@@ -282,11 +285,17 @@ 
 	 */
 	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension)
+		{
+			$id = basename($id,self::$path_extension);
+		}
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
-			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
+			}
 			return '403 Forbidden';		// no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
@@ -295,12 +304,18 @@ 
 		{
 			if ($return_no_access && !is_null($entry))
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id,$return_no_access) \$entry=".array2string($entry).", \$return_no_access set to false");
+				}
 				$return_no_access = false;
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				}
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -313,11 +328,17 @@ 
 			{
 				$this->http_if_match = $_SERVER['HTTP_IF_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($this->http_if_match[0] == '"') $this->http_if_match = substr($this->http_if_match, 1, -1);
+				if ($this->http_if_match[0] == '"')
+				{
+					$this->http_if_match = substr($this->http_if_match, 1, -1);
+				}
 
 				if ($this->http_if_match !== $etag)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,path=$options[path],$id) HTTP_IF_MATCH='$_SERVER[HTTP_IF_MATCH]', etag='$etag': 412 Precondition failed".array2string($entry));
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -327,17 +348,26 @@ 
 			{
 				$if_none_match = $_SERVER['HTTP_IF_NONE_MATCH'];
 				// strip of quotes around etag, if they exist, that way we allow etag with and without quotes
-				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
+				if ($if_none_match[0] == '"')
+				{
+					$if_none_match = substr($if_none_match, 1, -1);
+				}
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
 				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
+					}
 					return '304 Not Modified';
 				}
 				if ($method == 'PUT' && ($if_none_match == '*' || $if_none_match == $etag))
 				{
-					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 412 Precondition failed");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id);
 					return '412 Precondition Failed';
@@ -376,7 +406,10 @@ 
 
 			if (($ret = $this->get($options, $id ? $id : $this->new_id, $user)) && !empty($options['data']))
 			{
-				if (!$this->caldav->use_compression()) header('Content-Length: '.$this->caldav->bytes($options['data']));
+				if (!$this->caldav->use_compression())
+				{
+					header('Content-Length: '.$this->caldav->bytes($options['data']));
+				}
 				header('Content-Type: '.$options['mimetype']);
 				echo $options['data'];
 			}
@@ -412,7 +445,10 @@ 
 		if (!array_key_exists($app,$handler_cache))
 		{
 			$class = $app.'_groupdav';
-			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app))) return null;
+			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app)))
+			{
+				return null;
+			}
 
 			$handler_cache[$app] = new $class($app, $groupdav);
 		}
@@ -474,7 +510,10 @@ 
 						$matches = null;
 						if (preg_match('/address%20book\/([0-9.]+)/', $user_agent, $matches))
 						{
-							if ((int)$matches[1] < 868) $agent .= '_old';
+							if ((int)$matches[1] < 868)
+							{
+								$agent .= '_old';
+							}
 						}
 						break;
 					case 'kde':
@@ -575,7 +614,10 @@ 
 		// --> as all clients dislike not getting an ETag for a PUT, we sending it again even not storing byte-by-byte
 		//if (get_class($this) == 'addressbook_groupdav' && in_array(self::get_agent(),array('thunderbird','lightning')))
 		{
-			if (is_null($etag)) $etag = $this->get_etag($entry);
+			if (is_null($etag))
+			{
+				$etag = $this->get_etag($entry);
+			}
 			header('ETag: "'.$etag.'"');
 		}
 
@@ -741,7 +783,10 @@ 
 	 */
 	public function get_sync_token($path, $user, $token=null)
 	{
-		if (!isset($token)) $token = $this->getctag($path, $user);
+		if (!isset($token))
+		{
+			$token = $this->getctag($path, $user);
+		}
 
 		// never return current time, as more modifications might happen due to second granularity --> return 1sec less
 		if ($token >= (int)$GLOBALS['egw_info']['flags']['page_start_time'])

Spacing +59 added lines, -59 removed lines

@@ -144,7 +144,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function propfind($path,&$options,&$files,$user);
+	abstract function propfind($path, &$options, &$files, $user);
 
 	/**
 	 * Propfind callback, if interator is used
@@ -156,7 +156,7 @@ 
 	 */
 	function &propfind_callback($path, array $filter, $start)
 	{
-		unset($path, $filter, $start);	// not used, but required by function signature
+		unset($path, $filter, $start); // not used, but required by function signature
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function get(&$options,$id,$user=null);
+	abstract function get(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -177,7 +177,7 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function put(&$options,$id,$user=null);
+	abstract function put(&$options, $id, $user = null);
 
 	/**
 	 * Handle get request for an applications entry
@@ -186,7 +186,7 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	abstract function delete(&$options,$id);
+	abstract function delete(&$options, $id);
 
 	/**
 	 * Read an entry
@@ -215,7 +215,7 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	abstract function check_access($acl,$entry);
+	abstract function check_access($acl, $entry);
 
 	/**
 	 * Add extra properties for collections
@@ -226,9 +226,9 @@ 
 	 * @param int $user =null account_id of owner of collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null)
 	{
-		unset($displayname, $base_uri, $user);	// not used, but required by function signature
+		unset($displayname, $base_uri, $user); // not used, but required by function signature
 
 		return $props;
 	}
@@ -261,7 +261,7 @@ 
 	 */
 	static function etag2value($etag)
 	{
-		list(,$val) = explode(':',$etag,2);
+		list(,$val) = explode(':', $etag, 2);
 
 		return $val;
 	}
@@ -279,18 +279,18 @@ 
 	 * @param boolean $ignore_if_match =false if true, ignore If-Match precondition
 	 * @return array|string entry on success, string with http-error-code on failure, null for PUT on an unknown id
 	 */
-	function _common_get_put_delete($method,&$options,&$id,&$return_no_access=false,$ignore_if_match=false)
+	function _common_get_put_delete($method, &$options, &$id, &$return_no_access = false, $ignore_if_match = false)
 	{
-		if (self::$path_extension) $id = basename($id,self::$path_extension);
+		if (self::$path_extension) $id = basename($id, self::$path_extension);
 
 		if ($this->app != 'principals' && !$GLOBALS['egw_info']['user']['apps'][$this->app])
 		{
 			if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden: no app rights for '$this->app'");
-			return '403 Forbidden';		// no app rights
+			return '403 Forbidden'; // no app rights
 		}
 		$extra_acl = $this->method2acl[$method];
 		if ($id && !($entry = $this->read($id, $options['path'])) && ($method != 'PUT' || $entry === false) ||
-			($extra_acl != Api\Acl::READ && $this->check_access($extra_acl,$entry) === false))
+			($extra_acl != Api\Acl::READ && $this->check_access($extra_acl, $entry) === false))
 		{
 			if ($return_no_access && !is_null($entry))
 			{
@@ -299,7 +299,7 @@ 
 			}
 			else
 			{
-				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry===false?'false':'null'));
+				if ($this->debug) error_log(__METHOD__."($method,,$id) 403 Forbidden/404 Not Found: read($id)==".($entry === false ? 'false' : 'null'));
 				return !is_null($entry) ? '403 Forbidden' : '404 Not Found';
 			}
 		}
@@ -329,7 +329,7 @@ 
 				if ($if_none_match[0] == '"') $if_none_match = substr($if_none_match, 1, -1);
 
 				// if an IF_NONE_MATCH is given, check if we need to send a new export, or the current one is still up-to-date
-				if (in_array($method, array('GET','HEAD')) && $etag === $if_none_match)
+				if (in_array($method, array('GET', 'HEAD')) && $etag === $if_none_match)
 				{
 					if ($this->debug) error_log(__METHOD__."($method,,$id) HTTP_IF_NONE_MATCH='$_SERVER[HTTP_IF_NONE_MATCH]', etag='$etag': 304 Not Modified");
 					return '304 Not Modified';
@@ -354,7 +354,7 @@ 
 	 * @param int $user =null account_id
 	 * @return string|boolean http status of get or null if no representation was requested
 	 */
-	public function check_return_representation($options, $id, $user=null)
+	public function check_return_representation($options, $id, $user = null)
 	{
 		//error_log(__METHOD__."(, $id, $user) start ".function_backtrace());
 		if (isset($_SERVER['HTTP_PREFER']) && in_array('return=representation', preg_split('/, ?/', $_SERVER['HTTP_PREFER'])))
@@ -393,7 +393,7 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		unset($entry);	// not used, but required by function signature
+		unset($entry); // not used, but required by function signature
 	}
 
 	/**
@@ -408,7 +408,7 @@ 
 	{
 		static $handler_cache = array();
 
-		if (!array_key_exists($app,$handler_cache))
+		if (!array_key_exists($app, $handler_cache))
 		{
 			$class = $app.'_groupdav';
 			if (!class_exists($class) && !class_exists($class = __NAMESPACE__.'\\'.ucfirst($app))) return null;
@@ -426,36 +426,36 @@ 
 	 */
 	static function get_agent()
 	{
-		static $agent=null;
+		static $agent = null;
 
 		if (is_null($agent))
 		{
 			$agent = false;
 			// identify the agent (GroupDAV client) from the HTTP_USER_AGENT header
 			$user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-			foreach(array(
-				'carddav-sync'      => 'carddav-sync',	// dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
-				'iphone'            => 'iphone',	// Apple iPhone iCal
-				'davkit'            => 'davkit',	// Apple iCal 10.6
-				'coredav'           => 'coredav',	// Apple iCal 10.7
-				'calendarstore'     => 'calendarstore',	// Apple iCal 5.0.1 under OS X 10.7.2
-				'calendaragent/'    => 'calendaragent',	// Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
-				'dataaccess'        => 'dataaccess',	// Apple addressbook iPhone
-				'cfnetwork'         => 'cfnetwork',	// Apple Addressbook 10.6/7
-				'addressbook/'      => 'cfnetwork',	// Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
-				'bionicmessage.net' => 'funambol',	// funambol GroupDAV connector from bionicmessage.net
-				'zideone'           => 'zideone',	// zideone outlook plugin
-				'lightning'         => 'lightning',	// Lighting (incl. SOGo connector for addressbook)
-				'webkit'			=> 'webkit',	// Webkit Browser (also reports KHTML!)
-				'akonadi'			=> 'akonadi',	// new KDE PIM framework (also reports KHTML!)
-				'khtml'             => 'kde',		// KDE clients
+			foreach (array(
+				'carddav-sync'      => 'carddav-sync', // dmfs.org CardDAV client for Android: CardDAV-Sync (Android) (like iOS/5.0.1 (9A405) dataaccessd/1.0) gzip
+				'iphone'            => 'iphone', // Apple iPhone iCal
+				'davkit'            => 'davkit', // Apple iCal 10.6
+				'coredav'           => 'coredav', // Apple iCal 10.7
+				'calendarstore'     => 'calendarstore', // Apple iCal 5.0.1 under OS X 10.7.2
+				'calendaragent/'    => 'calendaragent', // Apple iCal OS X 10.8*: Mac OS X/10.8.2 (12C54) CalendarAgent/55
+				'dataaccess'        => 'dataaccess', // Apple addressbook iPhone
+				'cfnetwork'         => 'cfnetwork', // Apple Addressbook 10.6/7
+				'addressbook/'      => 'cfnetwork', // Apple Addressbook OS X 10.8*: Mac OS X/10.8.2 (12C54) AddressBook/1167
+				'bionicmessage.net' => 'funambol', // funambol GroupDAV connector from bionicmessage.net
+				'zideone'           => 'zideone', // zideone outlook plugin
+				'lightning'         => 'lightning', // Lighting (incl. SOGo connector for addressbook)
+				'webkit'			=> 'webkit', // Webkit Browser (also reports KHTML!)
+				'akonadi'			=> 'akonadi', // new KDE PIM framework (also reports KHTML!)
+				'khtml'             => 'kde', // KDE clients
 				'neon'              => 'neon',
-				'ical4ol'			=> 'ical4ol',	// iCal4OL client
-				'evolution'         => 'evolution',	// Evolution
-				'thunderbird'       => 'thunderbird',	// SOGo connector for addressbook, no Lightning installed
+				'ical4ol'			=> 'ical4ol', // iCal4OL client
+				'evolution'         => 'evolution', // Evolution
+				'thunderbird'       => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
 			) as $pattern => $name)
 			{
-				if (strpos($user_agent,$pattern) !== false)
+				if (strpos($user_agent, $pattern) !== false)
 				{
 					$agent = $name;
 					break;
@@ -511,35 +511,35 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
-		static $grants=null;
+		static $grants = null;
 		if (is_null($grants))
 		{
 			$grants = $this->get_grants();
 		}
 		$priviledes = array('read-current-user-privilege-set' => 'read-current-user-privilege-set');
 
-		if (is_null($user) || $grants[$user] & Api\Acl::READ)
+		if (is_null($user) || $grants[$user]&Api\Acl::READ)
 		{
 			$priviledes['read'] = 'read';
 			// allows on all calendars/addressbooks to write properties, as we store them on a per-user basis
 			// and only allow to modify explicit named properties in CalDAV, CardDAV or Calendarserver name-space
 			$priviledes['write-properties'] = 'write-properties';
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::ADD)
+		if (is_null($user) || $grants[$user]&Api\Acl::ADD)
 		{
-			$priviledes['bind'] = 'bind';	// PUT for new resources
+			$priviledes['bind'] = 'bind'; // PUT for new resources
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::EDIT)
+		if (is_null($user) || $grants[$user]&Api\Acl::EDIT)
 		{
-			$priviledes['write-content'] = 'write-content';	// otherwise iOS calendar does not allow to add events
+			$priviledes['write-content'] = 'write-content'; // otherwise iOS calendar does not allow to add events
 		}
-		if (is_null($user) || $grants[$user] & Api\Acl::DELETE)
+		if (is_null($user) || $grants[$user]&Api\Acl::DELETE)
 		{
-			$priviledes['unbind'] = 'unbind';	// DELETE
+			$priviledes['unbind'] = 'unbind'; // DELETE
 		}
 		// copy/move of existing resources might require write-properties, thought we do not support an explicit PROPATCH
 		//error_log(__METHOD__."('$path', ".array2string($user).') returning '.array2string($priviledes).' '.function_backtrace());
@@ -566,7 +566,7 @@ 
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 * @param string $etag =null etag, to not calculate it again (if != null)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true, $etag=null)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true, $etag = null)
 	{
 		//error_log(__METHOD__."(".array2string($entry).", '$path', ".array2string($retval).", path_attr_is_name=$path_attr_is_name, etag=".array2string($etag).")");
 		// we should not return an etag here, as EGroupware never stores ical/vcard byte-by-byte
@@ -609,7 +609,7 @@ 
 	 */
 	static function get_settings($hook_data)
 	{
-		unset($hook_data);	// not used, but required by function signature
+		unset($hook_data); // not used, but required by function signature
 
 		return array();
 	}
@@ -629,7 +629,7 @@ 
 		{
 			$props['getetag'] = $this->get_etag($entry);
 		}
-		foreach(array(
+		foreach (array(
 			'getcontenttype' => 'text/calendar',
 			'getlastmodified' => $entry['modified'],
 			'displayname' => $entry['title'],
@@ -667,17 +667,17 @@ 
 	 * @param boolean $full_uri =true
 	 * @return string eg. https://domain.com/egroupware/groupdav.php
 	 */
-	public function base_uri($full_uri=true)
+	public function base_uri($full_uri = true)
 	{
-		static $uri=null;
-		static $path=null;
+		static $uri = null;
+		static $path = null;
 
 		if (!isset($uri))
 		{
 			$uri = $path = $this->caldav->base_uri;
 			if ($uri[0] == '/')
 			{
-				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:") .'//' . $_SERVER['HTTP_HOST'] . $uri;
+				$uri = ($_SERVER["HTTPS"] === "on" ? "https:" : "http:").'//'.$_SERVER['HTTP_HOST'].$uri;
 			}
 			else
 			{
@@ -701,7 +701,7 @@ 
 	 * @param int $user parameter necessary to call getctag, if no $token specified
 	 * @return string
 	 */
-	public function get_sync_collection_token($path, $user=null, $more_results=null)
+	public function get_sync_collection_token($path, $user = null, $more_results = null)
 	{
 		//error_log(__METHOD__."('$path', $user, more_results=$more_results) this->sync_collection_token=".$this->sync_collection_token);
 		if ($more_results)
@@ -715,7 +715,7 @@ 
 ';
 			if ($this->caldav->crrnd)
 			{
-				$error = str_replace(array('<D:', '</D:'),  array('<', '</'), $error);
+				$error = str_replace(array('<D:', '</D:'), array('<', '</'), $error);
 			}
 			echo $error;
 		}
@@ -738,7 +738,7 @@ 
 	 * @param int $token =null modification time, default call getctag($path, $user) to fetch it
 	 * @return string
 	 */
-	public function get_sync_token($path, $user, $token=null)
+	public function get_sync_token($path, $user, $token = null)
 	{
 		if (!isset($token)) $token = $this->getctag($path, $user);
 

api/src/CalDAV/Principals.php

Doc Comments +8 added lines, -11 removed lines

@@ -256,7 +256,7 @@ 
 	 * @param array &$options
 	 * @param array &$files
 	 * @param int $user account_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 expand_property_report($path,&$options,&$files,$user)
 	{
@@ -1191,7 +1191,7 @@ 
 	 * Check if resource is a location
 	 *
 	 * @param array|int $resource
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public static function resource_is_location($resource)
 	{
@@ -1470,7 +1470,6 @@ 
 	 * Get proxy-groups for given user $account: users or groups who GRANT proxy rights to $account
 	 *
 	 * @param int $account who is the proxy
-	 * @param string|array $app_proxys =null applications for which proxys should be added
 	 * @return array with href props
 	 */
 	protected function get_resource_proxy_groups($account)
@@ -1608,8 +1607,6 @@ 
 	/**
 	 * Do propfind of /principals/
 	 *
-	 * @param string $name name of group or empty
-	 * @param string $rest name of rest of path behind group-name
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
@@ -1640,7 +1637,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 boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -1655,7 +1652,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
-	 * @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 put(&$options,$id,$user=null)
 	{
@@ -1669,7 +1666,7 @@ 
 	 *
 	 * @param array &$options
 	 * @param int $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 delete(&$options,$id)
 	{
@@ -1681,7 +1678,7 @@ 
 	/**
 	 * Read an entry
 	 *
-	 * @param string|int $id
+	 * @param integer $id
 	 * @return array/boolean array with entry, false if no read rights, null if $id does not exist
 	 */
 	function read($id)
@@ -1696,7 +1693,7 @@ 
 	 *
 	 * @param int $acl Api\Acl::READ, Api\Acl::EDIT or Api\Acl::DELETE
 	 * @param array|int $entry entry-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,$entry)
 	{
@@ -1739,7 +1736,7 @@ 
 	 *
 	 * @param string $path path of collection
 	 * @param int $user =null owner of the collection, default current user
-	 * @return array with privileges
+	 * @return string[] with privileges
 	 */
 	public function current_user_privileges($path, $user=null)
 	{

Spacing +186 added lines, -187 removed lines

@@ -89,19 +89,18 @@ 
 	 * @param array $reports =null
 	 * @return array Api\CalDAV::mkprop('supported-report-set', ...)
 	 */
-	protected function supported_report_set($path, array $reports=null)
+	protected function supported_report_set($path, array $reports = null)
 	{
-		unset($path);	// not used, but required by function signature
+		unset($path); // not used, but required by function signature
 
 		if (is_null($reports)) $reports = $this->supported_reports;
 
 		$supported = array();
-		foreach($reports as $name => $data)
+		foreach ($reports as $name => $data)
 		{
-			$supported[$name] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					!$data['ns'] ? Api\CalDAV::mkprop($name, '') :
-						Api\CalDAV::mkprop($data['ns'], $name, '')))));
+			$supported[$name] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					!$data['ns'] ? Api\CalDAV::mkprop($name, '') : Api\CalDAV::mkprop($data['ns'], $name, '')))));
 		}
 		return $supported;
 	}
@@ -115,7 +114,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function propfind($path,&$options,&$files,$user)
+	function propfind($path, &$options, &$files, $user)
 	{
 		if (($report = isset($_GET['report']) ? $_GET['report'] : $options['root']['name']) && $report != 'propfind')
 		{
@@ -127,7 +126,7 @@ 
 			$this->caldav->log(__METHOD__."('$path', ".array2string($options).",, $user) not implemented report, returning 501 Not Implemented");
 			return '501 Not Implemented';
 		}
-		list(,,$type,$name,$rest) = explode('/',$path,5);
+		list(,, $type, $name, $rest) = explode('/', $path, 5);
 		// /principals/users/$name/
 		//            /users/$name/calendar-proxy-read/
 		//            /users/$name/calendar-proxy-write/
@@ -136,19 +135,19 @@ 
 		//            /locations/$resource/
 		//            /__uids__/$uid/.../
 
-		switch($type)
+		switch ($type)
 		{
 			case 'users':
-				$files['files'] = $this->propfind_users($name,$rest,$options);
+				$files['files'] = $this->propfind_users($name, $rest, $options);
 				break;
 			case 'groups':
-				$files['files'] = $this->propfind_groups($name,$rest,$options);
+				$files['files'] = $this->propfind_groups($name, $rest, $options);
 				break;
 			case 'resources':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,false);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, false);
 				break;
 			case 'locations':
-				$files['files'] = $this->propfind_resources($name,$rest,$options,true);
+				$files['files'] = $this->propfind_resources($name, $rest, $options, true);
 				break;
 			/*case '__uids__':
 				$files['files'] = $this->propfind_uids($name,$rest,$options);
@@ -258,11 +257,11 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function expand_property_report($path,&$options,&$files,$user)
+	function expand_property_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 		$requested_props = $options['other'];
-		while(($requested_prop = array_shift($requested_props)))
+		while (($requested_prop = array_shift($requested_props)))
 		{
 			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
 
@@ -270,11 +269,11 @@ 
 			$prop_name = $requested_prop['attrs']['name'];
 			$prop_path = $path;
 			// calendarserver has some special property-names for expansion
-			switch($prop_name)
+			switch ($prop_name)
 			{
 				case 'calendar-proxy-read-for':
 				case 'calendar-proxy-write-for':
-					$prop_path = $path . substr($prop_name, 0, -4).'/';
+					$prop_path = $path.substr($prop_name, 0, -4).'/';
 					$prop_name = 'group-member-set';
 					$prop_ns = Api\CalDAV::DAV;
 					break;
@@ -294,14 +293,14 @@ 
 				'xmlns' => $prop_ns,
 			));
 			$prop_files = array();
-			$this->caldav->options = $options;	// also modify global variable
+			$this->caldav->options = $options; // also modify global variable
 			if (empty($prop_name) || $this->propfind($prop_path, $options, $prop_files, $user) !== true)
 			{
 				$this->caldav->log('### NO expand-property report for '.$requested_prop['attrs']['name']);
 				continue;
 			}
 			// find prop to expand
-			foreach($prop_files['files'][0]['props'] as $expand_prop)
+			foreach ($prop_files['files'][0]['props'] as $expand_prop)
 			{
 				if ($expand_prop['name'] === $prop_name) break;
 			}
@@ -315,7 +314,7 @@ 
 			// requested properties of each href are in depth=2 properties
 			// set them as regular propfind properties to $options['props']
 			$options2 = array('props' => 'all');
-			while(($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
+			while (($prop = array_shift($requested_props)) && $prop['depth'] >= 2)
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
@@ -331,10 +330,10 @@ 
 			}
 			// put back evtl. read top-level property
 			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
-			$this->caldav->options = $options2;	// also modify global variable
+			$this->caldav->options = $options2; // also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
-			foreach($expand_prop['val'] as $key => &$prop_val)
+			foreach ($expand_prop['val'] as $key => &$prop_val)
 			{
 				list(,$expand_path) = explode($this->caldav->base_uri, $prop_val['val']);
 				//error_log(__METHOD__."('$path', ..., $user) calling propfind('$expand_path', ".array2string($options2).', '.array2string($prop_val).", $user)");
@@ -429,23 +428,23 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_property_search_report($path,&$options,&$files,$user)
+	function principal_property_search_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
 		// cant find the test attribute to root principal-property-search element in WebDAV rfc, but iPhones use it ...
-		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof';	// "allof" (default) or "anyof"
+		$anyof = !empty($options['root']['attrs']['test']) && $options['root']['attrs']['test'] == 'anyof'; // "allof" (default) or "anyof"
 
 		// parse property-search prop(s) contained in $options['other']
-		foreach($options['other'] as $n => $prop)
+		foreach ($options['other'] as $n => $prop)
 		{
-			switch($prop['name'])
+			switch ($prop['name'])
 			{
 				case 'apply-to-principal-collection-set':	// optinal prop to apply search on principal-collection-set == '/principals/'
 					$path = '/principals/';
 					break;
 				case 'property-search':
-					$property_search = $n;	// should be 1
+					$property_search = $n; // should be 1
 					break;
 				case 'prop':
 					if (isset($property_search))
@@ -475,7 +474,7 @@ 
 			return '400 Bad Request';
 		}
 		// make sure search property is included in toplevel props (can be missing and defaults to property-search/prop's)
-		foreach($search_props as $prop)
+		foreach ($search_props as $prop)
 		{
 			if (!$this->caldav->prop_requested($prop['name'], $prop['xmlns']))
 			{
@@ -488,7 +487,7 @@ 
 			// but interprets returning all principals (all have a matching calendar-home-set) as NOT supporting CalDAV scheduling
 			// --> search only current user's principal
 			if ($prop['name'] == 'calendar-home-set' && stripos($_SERVER['HTTP_USER_AGENT'], 'Lightning') !== false &&
-				substr($search_props[0]['match'],-13) == '/groupdav.php')
+				substr($search_props[0]['match'], -13) == '/groupdav.php')
 			{
 				$path = '/principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 				$this->caldav->log('Enabling hack for Lightning prior 1.1.1 for searching calendar-home-set matching "/groupdav.php": limiting search to '.$path);
@@ -497,7 +496,7 @@ 
 		// check type attribute to limit search on a certain tree
 		if (isset($options['root']['attrs']['type']))
 		{
-			switch($options['root']['attrs']['type'])
+			switch ($options['root']['attrs']['type'])
 			{
 				case 'INDIVIDUAL':
 					$path = '/principals/users/';
@@ -524,7 +523,7 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
 			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
 			{
@@ -533,18 +532,18 @@ 
 			}
 			// match with $search_props
 			$matches = 0;
-			foreach($search_props as $search_prop)
+			foreach ($search_props as $search_prop)
 			{
 				// search resource for $search_prop
-				foreach($resource['props'] as $prop)
+				foreach ($resource['props'] as $prop)
 				{
 					if ($prop['name'] === $search_prop['name']) break;
 				}
 				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
 				{
-					foreach((array)$prop['val'] as $value)
+					foreach ((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
+						if (is_array($value)) $value = $value['val']; // eg. href prop
 						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
 						{
 							++$matches;
@@ -556,7 +555,7 @@ 
 				if ($anyof && $matches || $matches == count($search_props))
 				{
 					//error_log("$resource[path]: anyof=$anyof, $matches matches --> keep");
-					continue 2;	// enough matches --> keep
+					continue 2; // enough matches --> keep
 				}
 			}
 			//error_log("$resource[path]: anyof=$anyof, $matches matches --> skip");
@@ -574,9 +573,9 @@ 
 	 * @param string $match criteria/sub-string
 	 * @param string $match_type ='contains' 'starts-with', 'ends-with' or 'equals'
 	 */
-	private static function match($value, $match, $match_type='contains')
+	private static function match($value, $match, $match_type = 'contains')
 	{
-		switch($match_type)
+		switch ($match_type)
 		{
 			case 'equals':
 				return $value === $match;
@@ -646,9 +645,9 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function principal_search_property_set_report($path,&$options,&$files,$user)
+	function principal_search_property_set_report($path, &$options, &$files, $user)
 	{
-		unset($path, $options, $files, $user);	// not used, but required by function signature
+		unset($path, $options, $files, $user); // not used, but required by function signature
 
 		static $search_props = array(
 			// from iOS iCal
@@ -670,7 +669,7 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs(null, 'principal-search-property-set', 'DAV:');
 
-		foreach($search_props as $name => $data)
+		foreach ($search_props as $name => $data)
 		{
 			$xml->startElement('principal-search-property');
 			$xml->startElement('prop');
@@ -682,16 +681,16 @@ 
 			{
 				$xml->writeElement($name);
 			}
-			$xml->endElement();	// prop
+			$xml->endElement(); // prop
 
 			$xml->startElement('description');
 			$xml->writeAttribute('xml:lang', 'en');
 			$xml->text(is_array($data) ? $data['description'] : $data);
-			$xml->endElement();	// description
+			$xml->endElement(); // description
 
-			$xml->endElement();	// principal-search-property
+			$xml->endElement(); // principal-search-property
 		}
-		$xml->endElement();	// principal-search-property-set
+		$xml->endElement(); // principal-search-property-set
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -726,7 +725,7 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function acl_principal_prop_set_report($path,&$options,&$files,$user)
+	function acl_principal_prop_set_report($path, &$options, &$files, $user)
 	{
 		//error_log(__METHOD__."('$path', ".array2string($options).",, $user)");
 
@@ -745,13 +744,13 @@ 
 			return $ret;
 		}
 		// now filter out not matching "files"
-		foreach($files['files'] as $n => $resource)
+		foreach ($files['files'] as $n => $resource)
 		{
-			foreach($resource['props']['resourcetype']['val'] as $prop)
+			foreach ($resource['props']['resourcetype']['val'] as $prop)
 			{
 				if ($prop['name'] == 'principal') continue 2;
 			}
-			unset($files['files'][$n]);	// not a principal --> do not return
+			unset($files['files'][$n]); // not a principal --> do not return
 		}
 		// we should not return it
 		unset($options['props']['resourcetype']);
@@ -767,7 +766,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_users($name,$rest,array $options)
+	protected function propfind_users($name, $rest, array $options)
 	{
 		//error_log(__METHOD__."($name,$rest,".array2string($options).')');
 		if (empty($name))
@@ -786,7 +785,7 @@ 
 				else
 				{
 					// add all users (account_selection == groupmembers is handled by accounts->search())
-					foreach($this->accounts->search(array('type' => 'accounts','order' => 'account_lid')) as $account)
+					foreach ($this->accounts->search(array('type' => 'accounts', 'order' => 'account_lid')) as $account)
 					{
 						$files[] = $this->add_account($account);
 					}
@@ -795,18 +794,18 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','u')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'u')) ||
 				!($account = $this->accounts->read($id)) ||
 				!$this->accounts->visible($name))
 			{
 				$this->caldav->log(__METHOD__."('$name', ...) account '$name' NOT found OR not visible to you (check account-selection preference)!");
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_account($account);
@@ -836,7 +835,7 @@ 
 	 * @param array $options
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_groups($name,$rest,array $options)
+	protected function propfind_groups($name, $rest, array $options)
 	{
 		//echo "<p>".__METHOD__."($name,$rest,".array2string($options).")</p>\n";
 		if (empty($name))
@@ -848,11 +847,11 @@ 
 			if ($options['depth'])
 			{
 				// only show own groups, if account-selection is groupmembers or none
-				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) ?
+				$type = in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) ?
 					'owngroups' : 'groups';
 
 				// add all groups or only membergroups
-				foreach($this->accounts->search(array('type' => $type,'order' => 'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => $type, 'order' => 'account_lid')) as $account)
 				{
 					$files[] = $this->add_group($account);
 				}
@@ -860,19 +859,19 @@ 
 		}
 		else
 		{
-			if (!($id = $this->accounts->name2id($name,'account_lid','g')) ||
+			if (!($id = $this->accounts->name2id($name, 'account_lid', 'g')) ||
 				!($account = $this->accounts->read($id)) ||
 				// do NOT allow other groups, if account-selection is groupmembers or none
-				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers','none')) &&
-				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true)))
+				in_array($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'], array('groupmembers', 'none')) &&
+				!in_array($account['account_id'], $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)))
 			{
 				return '404 Not Found';
 			}
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_group($account);
@@ -903,10 +902,10 @@ 
 	{
 		$addressbooks = array();
 		$ab_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($ab_home_set)) $ab_home_set = 'P';	// personal addressbook
+		if (empty($ab_home_set)) $ab_home_set = 'P'; // personal addressbook
 		$addressbook_home_set = explode(',', $ab_home_set);
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'P' => $GLOBALS['egw_info']['user']['account_id'],
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 			'U' => '0',
@@ -917,13 +916,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O', $addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
-		foreach(array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
+		foreach (array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
 		{
-			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
+			if ((in_array('A', $addressbook_home_set) || in_array((string)$id, $addressbook_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$addressbooks[] = '/'.$owner.'/';
@@ -947,45 +946,45 @@ 
 		$calendars[] = Api\CalDAV::mkprop('href',
 			$this->base_uri.'/'.$account['account_lid'].'/');
 
-		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(),'utf-8');
+		$displayname = Api\Translation::convert($account['account_fullname'], Api\Translation::charset(), 'utf-8');
 
 		return $this->add_principal('users/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
 			// CalDAV
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',$calendars),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', $calendars),
 			// CalDAV scheduling
-			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-outbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
-			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'schedule-inbox-URL',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email']),
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'schedule-outbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-outbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/outbox/'))),
+			'schedule-inbox-URL' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'schedule-inbox-URL', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email']),
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','INDIVIDUAL'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'INDIVIDUAL'),
 			// Calendarserver
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',array(
-				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address',$account['account_email']))),
-			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'last-name',$account['account_lastname']),
-			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'first-name',$account['account_firstname']),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','users'),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', array(
+				Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address', $account['account_email']))),
+			'last-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'last-name', $account['account_lastname']),
+			'first-name' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'first-name', $account['account_firstname']),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'users'),
 			// WebDAV ACL and CalDAV proxy
 			'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']),
-				array('calendar', 'resources'), $account['account_id']),	// add proxy-rights
+				array('calendar', 'resources'), $account['account_id']), // add proxy-rights
 			'alternate-URI-set' => array(
-				Api\CalDAV::mkprop('href','mailto:'.$account['account_email'])),
+				Api\CalDAV::mkprop('href', 'mailto:'.$account['account_email'])),
 			// CardDAV
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',$addressbooks),
-			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'principal-address',
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', $addressbooks),
+			'principal-address' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'principal-address',
 				$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] ? '' : array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
+				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook-accounts/'.$account['person_id'].'.vcf'))),
 			// CardDAV directory
-			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway',array(
+			'directory-gateway' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'directory-gateway', array(
 				Api\CalDAV::mkprop('href', $this->base_uri.'/addressbook/'))),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -997,7 +996,7 @@ 
 	 * @param string $cn =null common name to be stored in case of an "e" uid
 	 * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
 	 */
-	static public function url2uid($url, $only_type=null, $cn=null)
+	static public function url2uid($url, $only_type = null, $cn = null)
 	{
 		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
 
@@ -1011,17 +1010,17 @@ 
 		}
 		if (empty($rest)) return false;
 
-		switch(strtolower($schema))
+		switch (strtolower($schema))
 		{
 			case 'http':
 			case 'https':
 				list(,$rest) = explode('/groupdav.php/principals/', $url);
 				list($type, $name) = explode('/', $rest);
-				switch($type)
+				switch ($type)
 				{
 					case 'users':
 					case 'groups':
-						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]);	// u=users, g=groups
+						$uid = $GLOBALS['egw']->accounts->name2id($name, 'account_lid', $type[0]); // u=users, g=groups
 						break;
 					case 'resources':
 					case 'locations':
@@ -1038,9 +1037,9 @@ 
 				}
 				// search contacts for email
 				if ((list($data) = $GLOBALS['egw']->contacts->search(array('email' => $rest, 'email_home' => $rest),
-					array('id','egw_addressbook.account_id as account_id','n_fn'),
+					array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 					'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-					'','',false,'OR')))
+					'', '', false, 'OR')))
 				{
 					// found an addressbook entry
 					$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
@@ -1058,7 +1057,7 @@ 
 				list($type, $id, $install_id) = explode('-', $uid);
 				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
-					list($type, , $id_abs, $install_id) = explode('-', $uid);
+					list($type,, $id_abs, $install_id) = explode('-', $uid);
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1071,9 +1070,9 @@ 
 					}
 					else
 					{
-						static $calendar_bo=null;
+						static $calendar_bo = null;
 						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
-						foreach($calendar_bo->resources as $letter => $info)
+						foreach ($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
 							{
@@ -1086,7 +1085,7 @@ 
 				break;
 
 			default:
-				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'],'groupdav'))
+				if (isset($GLOBALS['groupdav']) && is_a($GLOBALS['groupdav'], 'groupdav'))
 				{
 					$GLOBALS['groupdav']->log(__METHOD__."('$url') unsupported principal URL '$url'!");
 				}
@@ -1104,7 +1103,7 @@ 
 	 */
 	protected function add_group(array $account)
 	{
-		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert(lang('Group').' '.$account['account_lid'], Api\Translation::charset(), 'utf-8');
 
 		// only return current user, if account-selection == 'none'
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none')
@@ -1119,19 +1118,19 @@ 
 		return $this->add_principal('groups/'.$account['account_lid'], array(
 			'getetag' => $this->get_etag($account),
 			'displayname' => $displayname,
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/'))),
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'addressbook-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CARDDAV, 'addressbook-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$account['account_lid'].'/'))),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/groups/'.$account['account_lid'].'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type','groups'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type','GROUP'),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', 'groups'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', 'GROUP'),
 			'group-member-set' => $this->principal_set('group-member-set', $groupmembers),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('accounts', $account['account_id']))),
 		));
 	}
 
@@ -1142,7 +1141,7 @@ 
 	 * @param boolean $is_location =null
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal_resource(array $resource, $is_location=null)
+	protected function add_principal_resource(array $resource, $is_location = null)
 	{
 		$displayname = null;
 		$name = $this->resource2name($resource, $is_location, $displayname);
@@ -1150,18 +1149,18 @@ 
 		return $this->add_principal($name, array(
 			'getetag' => $this->get_resource_etag($resource),
 			'displayname' => $displayname,
-			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-address-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri(true).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href',$this->base_uri(false).'/principals/'.$name.'/'),
-				Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
+			'calendar-user-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-address-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri(true).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', $this->base_uri(false).'/principals/'.$name.'/'),
+				Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id'])),
 			)),
-			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'record-type',$is_location ? 'locations' : 'resources'),
-			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-user-type',$is_location ? 'ROOM' : 'RESOURCE'),
-			'resource-id' => array(Api\CalDAV::mkprop('href','urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
+			'record-type' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'record-type', $is_location ? 'locations' : 'resources'),
+			'calendar-user-type' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-user-type', $is_location ? 'ROOM' : 'RESOURCE'),
+			'resource-id' => array(Api\CalDAV::mkprop('href', 'urn:uuid:'.Api\CalDAV::generate_uid('resources', $resource['res_id']))),
 			// Calendarserver also reports empty email-address-set, thought iCal still does not show resources (only locations)
-			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER,'email-address-set',''),
-			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-home-set',array(
-				Api\CalDAV::mkprop('href',$this->base_uri.'/'.$name.'/'))),
+			'email-address-set' => Api\CalDAV::mkprop(Api\CalDAV::CALENDARSERVER, 'email-address-set', ''),
+			'calendar-home-set' => Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-home-set', array(
+				Api\CalDAV::mkprop('href', $this->base_uri.'/'.$name.'/'))),
 		));
 	}
 
@@ -1173,7 +1172,7 @@ 
 	 * @param string &$displayname=null on return displayname of resource
 	 * @return string eg. "locations/123-some-room" or "resouces/345-some-device"
 	 */
-	public static function resource2name($resource, &$is_location=null, &$displayname=null)
+	public static function resource2name($resource, &$is_location = null, &$displayname = null)
 	{
 		if (!is_array($resource) && !($resource = self::read_resource($resource)))
 		{
@@ -1181,10 +1180,10 @@ 
 		}
 		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
 
-		$displayname = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
+		$displayname = Api\Translation::convert($resource['name'], Api\Translation::charset(), 'utf-8');
 
 		return ($is_location ? 'locations/' : 'resources/').$resource['res_id'].'-'.
-			preg_replace('/[^a-z0-9]+/i','-', Api\Translation::to_ascii($resource['name']));
+			preg_replace('/[^a-z0-9]+/i', '-', Api\Translation::to_ascii($resource['name']));
 	}
 
 	/**
@@ -1195,7 +1194,7 @@ 
 	 */
 	public static function resource_is_location($resource)
 	{
-		static $location_cats=null;
+		static $location_cats = null;
 		if (is_null($location_cats))
 		{
 			$config = Api\Config::read('resources');
@@ -1216,7 +1215,7 @@ 
 	 */
 	public static function read_resource($res_id)
 	{
-		static $cache=null;	// some per-request caching
+		static $cache = null; // some per-request caching
 
 		if (isset(self::$all_resources) && isset(self::$all_resources[$res_id]))
 		{
@@ -1258,7 +1257,7 @@ 
 	 * @param int $user =null account_if of user, or null for current user
 	 * @return array of array with values for res_id, cat_id and name (no other values1)
 	 */
-	public static function get_resources($user=null)
+	public static function get_resources($user = null)
 	{
 		if (!isset(self::$all_resources))
 		{
@@ -1266,18 +1265,18 @@ 
 
 			self::$all_resources = array();
 			$query = array(
-				'show_bookable' => true,	// ignore non-bookable resources
+				'show_bookable' => true, // ignore non-bookable resources
 				'filter2' => -3,
 				'start' => 0,
-				'num_rows' => 10000,	// return all aka first 10000 entries
+				'num_rows' => 10000, // return all aka first 10000 entries
 			);
 			$rows = $readonlys = null;
 			if (self::$resources->get_rows($query, $rows, $readonlys))
 			{
 				//_debug_array($rows);
-				foreach($rows as $resource)
+				foreach ($rows as $resource)
 				{
-					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true,'cat_id'=>true,'name'=>true));
+					self::$all_resources[$resource['res_id']] = array_intersect_key($resource, array('res_id'=>true, 'cat_id'=>true, 'name'=>true));
 				}
 			}
 		}
@@ -1293,7 +1292,7 @@ 
 	 */
 	protected function get_resource_rights()
 	{
-		static $grants=null;
+		static $grants = null;
 
 		if (is_null($grants))
 		{
@@ -1326,19 +1325,19 @@ 
 	 * @param string $principal_url =null include given principal url, relative to principal-collection-set, default $principal
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_principal($principal, array $props = array(), $principal_url=null)
+	protected function add_principal($principal, array $props = array(), $principal_url = null)
 	{
 		$props['resourcetype'][] = Api\CalDAV::mkprop('principal', '');
 
 		// required props per WebDAV ACL
-		foreach(array('alternate-URI-set', 'group-membership') as $name)
+		foreach (array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name, '');
 		}
 		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
-			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
+			Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$principal.'/'));
 
 		return $this->add_collection('/principals/'.$principal.'/', $props);
 	}
@@ -1354,20 +1353,20 @@ 
 	 * @param array $resource =null resource to use (to not query it multiple times from the database)
 	 * @return array with values for 'path' and 'props'
 	 */
-	protected function add_proxys($principal, $type, array $proxys=array(), array $resource=null)
+	protected function add_proxys($principal, $type, array $proxys = array(), array $resource = null)
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
-		list($account_type,$account) = explode('/', $principal);
+		if (true) $proxys = array(); // ignore parameter!
+		list($account_type, $account) = explode('/', $principal);
 
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'users':
 			case 'groups':
 				$account = $location = $this->accounts->name2id($account, 'account_lid', $account_type[0]);
 				$right = $what == 'write' ? Api\Acl::EDIT : Api\Acl::READ;
-				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ;	// do NOT report write+read in read
+				$mask = $what == 'write' ? Api\Acl::EDIT : Api\Acl::EDIT|Api\Acl::READ; // do NOT report write+read in read
 				break;
 
 			case 'locations':
@@ -1379,18 +1378,18 @@ 
 				}
 				$location = 'L'.$resource['cat_id'];
 				$right = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_CALREAD;
-				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD;	// do NOT report write+read in read
+				$mask = $what == 'write' ? EGW_ACL_DIRECT_BOOKING : EGW_ACL_DIRECT_BOOKING|EGW_ACL_CALREAD; // do NOT report write+read in read
 				break;
 		}
 		static $principal2grants = array();
-		$grants =& $principal2grants[$principal];
+		$grants = & $principal2grants[$principal];
 		if (!isset($grants))
 		{
-			switch($app)
+			switch ($app)
 			{
 				case 'resources':
 					$res_grants = $this->get_resource_rights();
-					$grants = (array)$res_grants[$location];	// returns array($location => $grants)
+					$grants = (array)$res_grants[$location]; // returns array($location => $grants)
 					break;
 
 				case 'calendar':
@@ -1400,9 +1399,9 @@ 
 			}
 			//echo "<p>type=$type --> app=$app, what=$what --> right=$right, mask=$mask, account=$account, location=$location --> grants=".array2string($grants)."</p>\n";
 		}
-		foreach($grants as $account_id => $rights)
+		foreach ($grants as $account_id => $rights)
 		{
-			if ($account_id !== 'run' && $account_id != $account && ($rights & $mask) == $right &&
+			if ($account_id !== 'run' && $account_id != $account && ($rights&$mask) == $right &&
 				($account_lid = $this->accounts->id2name($account_id)))
 			{
 				// ignore "broken" grants (eg. negative account_id for a user), as they lead to further errors (no members)
@@ -1433,12 +1432,12 @@ 
 	 * @param int $account who is the proxy
 	 * @return array with href props
 	 */
-	protected function principal_set($prop, array $accounts=array(), $app_proxys=null, $account=null)
+	protected function principal_set($prop, array $accounts = array(), $app_proxys = null, $account = null)
 	{
-		unset($prop);	// not used, but required by function signature
+		unset($prop); // not used, but required by function signature
 
 		$set = array();
-		foreach($accounts as $account_id => $account_lid)
+		foreach ($accounts as $account_id => $account_lid)
 		{
 			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
@@ -1447,11 +1446,11 @@ 
 		}
 		if ($app_proxys)
 		{
-			foreach((array)$app_proxys as $app)
+			foreach ((array)$app_proxys as $app)
 			{
 				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
 
-				switch($app)
+				switch ($app)
 				{
 					case 'resources':
 						$proxy_groups = $this->get_resource_proxy_groups($account);
@@ -1483,11 +1482,11 @@ 
 			// get location grants for $account (incl. his memberships)
 			$memberships = $GLOBALS['egw']->accounts->memberships($account, true);
 			$location_grants = array();
-			foreach($all_location_grants as $location => $grants)
+			foreach ($all_location_grants as $location => $grants)
 			{
-				foreach($grants as $account_id => $rights)
+				foreach ($grants as $account_id => $rights)
 				{
-					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
+					if (($rights&(EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) && // we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
 						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
@@ -1496,13 +1495,13 @@ 
 				}
 			}
 			// now add proxy-groups for all resources user has rights to
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$rights = $location_grants['L'.$resource['cat_id']];
 				if (isset($rights))
 				{
 					$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.$this->resource2name($resource).
-						'/calendar-proxy-'.($rights & EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
+						'/calendar-proxy-'.($rights&EGW_ACL_DIRECT_BOOKING ? 'write' : 'read').'/');
 				}
 			}
 		}
@@ -1517,18 +1516,18 @@ 
 	 * @param string|array $app ='calendar' applications for which proxys should be added
 	 * @return array with href props
 	 */
-	protected function get_calendar_proxy_groups($account, $app='calendar')
+	protected function get_calendar_proxy_groups($account, $app = 'calendar')
 	{
 		$set = array();
-		foreach($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
+		foreach ($this->acl->get_grants($app, $app != 'addressbook', $account) as $account_id => $rights)
 		{
-			if ($account_id != $account && ($rights & Api\Acl::READ) &&
+			if ($account_id != $account && ($rights&Api\Acl::READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
 				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
-					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
+					$account_lid.'/'.$app.'-proxy-'.($rights&Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
 		}
 		return $set;
@@ -1543,7 +1542,7 @@ 
 	 * @param boolean $do_locations =false false: /principal/resources, true: /principals/locations
 	 * @return array|string array with files or HTTP error code
 	 */
-	protected function propfind_resources($name,$rest,array $options,$do_locations=false)
+	protected function propfind_resources($name, $rest, array $options, $do_locations = false)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
@@ -1562,7 +1561,7 @@ 
 				if (($resources = $this->get_resources()))
 				{
 					//_debug_array($resources);
-					foreach($resources as $resource)
+					foreach ($resources as $resource)
 					{
 						if (($is_location = self::resource_is_location($resource)) == $do_locations)
 						{
@@ -1579,11 +1578,11 @@ 
 				return '404 Not Found';
 			}
 			$path = ($is_location ? 'locations/' : 'resources/').$name;
-			while (substr($rest,-1) == '/')
+			while (substr($rest, -1) == '/')
 			{
-				$rest = substr($rest,0,-1);
+				$rest = substr($rest, 0, -1);
 			}
-			switch((string)$rest)
+			switch ((string)$rest)
 			{
 				case '':
 					$files[] = $this->add_principal_resource($resource);
@@ -1622,12 +1621,12 @@ 
 		if ($options['depth'])
 		{
 			if (is_numeric($options['depth'])) --$options['depth'];
-			$files = array_merge($files, $this->propfind_users('','',$options),
-				$this->propfind_groups('','',$options));
+			$files = array_merge($files, $this->propfind_users('', '', $options),
+				$this->propfind_groups('', '', $options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])
 			{
-				$files = array_merge($files, $this->propfind_resources('','',$options,false),	// resources
-					$this->propfind_resources('','',$options,true));	// locations
+				$files = array_merge($files, $this->propfind_resources('', '', $options, false), // resources
+					$this->propfind_resources('', '', $options, true)); // locations
 			}
 			//$files = array_merge($files,$this->propfind_uids('','',$options));
 		}
@@ -1642,9 +1641,9 @@ 
 	 * @param int $user =null account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function get(&$options,$id,$user=null)
+	function get(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1657,9 +1656,9 @@ 
 	 * @param int $user =null account_id of owner, default null
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null)
+	function put(&$options, $id, $user = null)
 	{
-		unset($options, $id, $user);	// not used, but required by function signature
+		unset($options, $id, $user); // not used, but required by function signature
 
 		return false;
 	}
@@ -1671,9 +1670,9 @@ 
 	 * @param int $id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id)
+	function delete(&$options, $id)
 	{
-		unset($options, $id);	// not used, but required by function signature
+		unset($options, $id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1686,7 +1685,7 @@ 
 	 */
 	function read($id)
 	{
-		unset($id);	// not used, but required by function signature
+		unset($id); // not used, but required by function signature
 
 		return false;
 	}
@@ -1698,13 +1697,13 @@ 
 	 * @param array|int $entry entry-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$entry)
+	function check_access($acl, $entry)
 	{
 		if ($acl != Api\Acl::READ)
 		{
 			return false;
 		}
-		if (!is_array($entry) && !$this->accounts->name2id($entry,'account_lid','u'))
+		if (!is_array($entry) && !$this->accounts->name2id($entry, 'account_lid', 'u'))
 		{
 			return null;
 		}
@@ -1741,9 +1740,9 @@ 
 	 * @param int $user =null owner of the collection, default current user
 	 * @return array with privileges
 	 */
-	public function current_user_privileges($path, $user=null)
+	public function current_user_privileges($path, $user = null)
 	{
-		unset($path, $user);	// not used, but required by function signature
+		unset($path, $user); // not used, but required by function signature
 
 		return array('read', 'read-current-user-privilege-set');
 	}

Braces +116 added lines, -29 removed lines

@@ -49,7 +49,10 @@ 
 	{
 		parent::__construct($app, $caldav);
 
-		if (!isset(self::$resources)) self::$resources = new resources_bo();
+		if (!isset(self::$resources))
+		{
+			self::$resources = new resources_bo();
+		}
 	}
 
 	/**
@@ -93,7 +96,10 @@ 
 	{
 		unset($path);	// not used, but required by function signature
 
-		if (is_null($reports)) $reports = $this->supported_reports;
+		if (is_null($reports))
+		{
+			$reports = $this->supported_reports;
+		}
 
 		$supported = array();
 		foreach($reports as $name => $data)
@@ -264,7 +270,10 @@ 
 		$requested_props = $options['other'];
 		while(($requested_prop = array_shift($requested_props)))
 		{
-			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1) continue;
+			if ($requested_prop['name'] != 'property' || $requested_prop['depth'] != 1)
+			{
+				continue;
+			}
 
 			$prop_ns = $requested_prop['attrs']['namespace'];
 			$prop_name = $requested_prop['attrs']['name'];
@@ -303,7 +312,10 @@ 
 			// find prop to expand
 			foreach($prop_files['files'][0]['props'] as $expand_prop)
 			{
-				if ($expand_prop['name'] === $prop_name) break;
+				if ($expand_prop['name'] === $prop_name)
+				{
+					break;
+				}
 			}
 			if ($expand_prop['name'] !== $prop_name || !is_array($expand_prop['val']) ||
 				$expand_prop['val'] && $expand_prop['val'][0]['name'] !== 'href')
@@ -319,10 +331,13 @@ 
 			{
 				if ($prop['name'] == 'property' && $prop['depth'] == 2)
 				{
-					if (!is_array($options2['props']))	// is "all" initially
+					if (!is_array($options2['props']))
+					{
+						// is "all" initially
 					{
 						$options2['props'] = array();
 					}
+					}
 					$options2['props'][] = array(
 						'name' => $prop['attrs']['name'],
 						'xmlns' => isset($prop['attrs']['namespace']) ? $prop['attrs']['namespace'] : $prop['xmlns'],
@@ -330,7 +345,10 @@ 
 				}
 			}
 			// put back evtl. read top-level property
-			if ($prop && $prop['depth'] == 1) array_unshift($requested_props, $prop);
+			if ($prop && $prop['depth'] == 1)
+			{
+				array_unshift($requested_props, $prop);
+			}
 			$this->caldav->options = $options2;	// also modify global variable
 
 			// run regular profind to get requested 2.-level properties for each href
@@ -526,9 +544,12 @@ 
 		// now filter out not matching "files"
 		foreach($files['files'] as $n => $resource)
 		{
-			if (count(explode('/', $resource['path'])) < 5)	// hack to only return principals, not the collections itself
+			if (count(explode('/', $resource['path'])) < 5)
+			{
+				// hack to only return principals, not the collections itself
 			{
 				unset($files['files'][$n]);
+			}
 				continue;
 			}
 			// match with $search_props
@@ -538,16 +559,26 @@ 
 				// search resource for $search_prop
 				foreach($resource['props'] as $prop)
 				{
-					if ($prop['name'] === $search_prop['name']) break;
+					if ($prop['name'] === $search_prop['name'])
+					{
+						break;
+					}
 				}
-				if ($prop['name'] === $search_prop['name'])	// search_prop NOT found
+				if ($prop['name'] === $search_prop['name'])
+				{
+					// search_prop NOT found
 				{
 					foreach((array)$prop['val'] as $value)
 					{
-						if (is_array($value)) $value = $value['val'];	// eg. href prop
-						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)	// prop does match
+						if (is_array($value)) $value = $value['val'];
+				}
+				// eg. href prop
+						if (self::match($value, $search_prop['match'], $search_prop['match-type']) !== false)
+						{
+							// prop does match
 						{
 							++$matches;
+						}
 							//error_log("$matches: $resource[path]: $search_prop[name]=".array2string($prop['name'] !== $search_prop['name'] ? null : $prop['val'])." does match '$search_prop[match]'");
 							break;
 						}
@@ -749,7 +780,10 @@ 
 		{
 			foreach($resource['props']['resourcetype']['val'] as $prop)
 			{
-				if ($prop['name'] == 'principal') continue 2;
+				if ($prop['name'] == 'principal')
+				{
+					continue 2;
+				}
 			}
 			unset($files['files'][$n]);	// not a principal --> do not return
 		}
@@ -903,7 +937,11 @@ 
 	{
 		$addressbooks = array();
 		$ab_home_set = $GLOBALS['egw_info']['user']['preferences']['groupdav']['addressbook-home-set'];
-		if (empty($ab_home_set)) $ab_home_set = 'P';	// personal addressbook
+		if (empty($ab_home_set))
+		{
+			$ab_home_set = 'P';
+		}
+		// personal addressbook
 		$addressbook_home_set = explode(',', $ab_home_set);
 		// replace symbolic id's with real nummeric id's
 		foreach(array(
@@ -917,10 +955,13 @@ 
 				$addressbook_home_set[$key] = $id;
 			}
 		}
-		if (in_array('O',$addressbook_home_set))	// "all in one" from groupdav.php/addressbook/
+		if (in_array('O',$addressbook_home_set))
+		{
+			// "all in one" from groupdav.php/addressbook/
 		{
 			$addressbooks[] = '/';
 		}
+		}
 		foreach(array_keys($GLOBALS['egw']->contacts->get_addressbooks(Api\Acl::READ)) as $id)
 		{
 			if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
@@ -999,7 +1040,10 @@ 
 	 */
 	static public function url2uid($url, $only_type=null, $cn=null)
 	{
-		if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		if (!$only_type)
+		{
+			$only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
+		}
 
 		if ($url[0] == '/')
 		{
@@ -1009,7 +1053,10 @@ 
 		{
 			list($schema, $rest) = explode(':', $url, 2);
 		}
-		if (empty($rest)) return false;
+		if (empty($rest))
+		{
+			return false;
+		}
 
 		switch(strtolower($schema))
 		{
@@ -1056,9 +1103,12 @@ 
 			case 'urn':
 				list($urn_type, $uid) = explode(':', $rest, 2);
 				list($type, $id, $install_id) = explode('-', $uid);
-				if ($type == 'accounts' && empty($id))	// groups have a negative id, eg. "urn:uuid:accounts--1-..."
+				if ($type == 'accounts' && empty($id))
+				{
+					// groups have a negative id, eg. "urn:uuid:accounts--1-..."
 				{
 					list($type, , $id_abs, $install_id) = explode('-', $uid);
+				}
 					$id = -$id_abs;
 				}
 				// own urn
@@ -1072,7 +1122,10 @@ 
 					else
 					{
 						static $calendar_bo=null;
-						if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
+						if (is_null($calendar_bo))
+						{
+							$calendar_bo = new calendar_bo();
+						}
 						foreach($calendar_bo->resources as $letter => $info)
 						{
 							if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
@@ -1179,7 +1232,10 @@ 
 		{
 			return null;
 		}
-		if (is_null($is_location)) $is_location = self::resource_is_location($resource);
+		if (is_null($is_location))
+		{
+			$is_location = self::resource_is_location($resource);
+		}
 
 		$displayname = Api\Translation::convert($resource['name'],	Api\Translation::charset(), 'utf-8');
 
@@ -1225,7 +1281,10 @@ 
 
 		if (!isset($cache[$res_id]))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo();
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo();
+			}
 
 			if (!($cache[$res_id] = self::$resources->read($res_id)))
 			{
@@ -1262,7 +1321,10 @@ 
 	{
 		if (!isset(self::$all_resources))
 		{
-			if (!isset(self::$resources)) self::$resources = new resources_bo($user);
+			if (!isset(self::$resources))
+			{
+				self::$resources = new resources_bo($user);
+			}
 
 			self::$all_resources = array();
 			$query = array(
@@ -1333,9 +1395,15 @@ 
 		// required props per WebDAV ACL
 		foreach(array('alternate-URI-set', 'group-membership') as $name)
 		{
-			if (!isset($props[$name])) $props[$name] = Api\CalDAV::mkprop($name,'');
+			if (!isset($props[$name]))
+			{
+				$props[$name] = Api\CalDAV::mkprop($name,'');
+			}
+		}
+		if (!$principal_url)
+		{
+			$principal_url = $principal;
 		}
-		if (!$principal_url) $principal_url = $principal;
 
 		$props['principal-URL'] = array(
 			Api\CalDAV::mkprop('href',$this->base_uri.'/principals/'.$principal.'/'));
@@ -1358,7 +1426,11 @@ 
 	{
 		list($app,,$what) = explode('-', $type);
 
-		if (true) $proxys = array();	// ignore parameter!
+		if (true)
+		{
+			$proxys = array();
+		}
+		// ignore parameter!
 		list($account_type,$account) = explode('/', $principal);
 
 		switch($account_type)
@@ -1440,16 +1512,22 @@ 
 		$set = array();
 		foreach($accounts as $account_id => $account_lid)
 		{
-			if ($this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+			if ($this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.($account_id < 0 ? 'groups/' : 'users/').$account_lid.'/');
 			}
+			}
 		}
 		if ($app_proxys)
 		{
 			foreach((array)$app_proxys as $app)
 			{
-				if (!isset($GLOBALS['egw_info']['user']['apps'][$app])) continue;
+				if (!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+				{
+					continue;
+				}
 
 				switch($app)
 				{
@@ -1490,7 +1568,10 @@ 
 					if (($rights & (EGW_ACL_CALREAD|EGW_ACL_DIRECT_BOOKING)) &&	// we only care for these rights
 						($account_id == $account || in_array($account_id, $memberships)))
 					{
-						if (!isset($location_grants[$location])) $location_grants[$location] = 0;
+						if (!isset($location_grants[$location]))
+						{
+							$location_grants[$location] = 0;
+						}
 						$location_grants[$location] |= $rights;
 					}
 				}
@@ -1524,12 +1605,15 @@ 
 		{
 			if ($account_id != $account && ($rights & Api\Acl::READ) &&
 				($account_lid = $this->accounts->id2name($account_id)) &&
-				$this->accounts->visible($account_lid))	// only add visible accounts, gives error in iCal otherwise
+				$this->accounts->visible($account_lid))
+			{
+				// only add visible accounts, gives error in iCal otherwise
 			{
 				$set[] = Api\CalDAV::mkprop('href', $this->base_uri.'/principals/'.
 					($account_id < 0 ? 'groups/' : 'users/').
 					$account_lid.'/'.$app.'-proxy-'.($rights & Api\Acl::EDIT ? 'write' : 'read').'/');
 			}
+			}
 		}
 		return $set;
 	}
@@ -1621,7 +1705,10 @@ 
 
 		if ($options['depth'])
 		{
-			if (is_numeric($options['depth'])) --$options['depth'];
+			if (is_numeric($options['depth']))
+			{
+				--$options['depth'];
+			}
 			$files = array_merge($files, $this->propfind_users('','',$options),
 				$this->propfind_groups('','',$options));
 			if ($GLOBALS['egw_info']['user']['apps']['resources'])

api/src/CalDAV/PropfindIterator.php

Doc Comments +1 added lines

@@ -94,6 +94,7 @@
 	 * @param Handler $handler
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
+	 * @param string $path
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @var int
 	 */
-	protected $start=0;
+	protected $start = 0;
 
 	/**
 	 * Number of entries queried from callback in one call
@@ -95,7 +95,7 @@ 
 	 * @param array $filter filter for propfind call
 	 * @param array $files =array() extra files/responses to return too
 	 */
-	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
+	public function __construct(Handler $handler, $path, array $filter, array &$files = array())
 	{
 		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
 		$this->path    = $path;
@@ -126,7 +126,7 @@ 
 		$current = current($this->files);
 
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
-		return $current['path'];	// we return path as key
+		return $current['path']; // we return path as key
 	}
 
 	/**
@@ -146,11 +146,11 @@ 
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
-		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
+		$this->files = $this->handler->propfind_callback($this->path, $this->filter, array($this->start, self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
 			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
-			return false;	// no further entries
+			return false; // no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
@@ -169,7 +169,7 @@ 
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files) $this->next(); // otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -178,7 +178,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
 		return current($this->files) !== false;

Braces +41 added lines, -10 removed lines

@@ -97,7 +97,10 @@ 
 	 */
 	public function __construct(Handler $handler, $path, array $filter,array &$files=array())
 	{
-		if ($this->debug) error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$path', ".array2string($filter).",)");
+		}
 		$this->path    = $path;
 		$this->handler = $handler;
 		$this->filter  = $filter;
@@ -112,7 +115,10 @@ 
 	 */
 	public function current()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files)));
+		}
 		return current($this->files);
 	}
 
@@ -125,7 +131,10 @@ 
 	{
 		$current = current($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string($current['path']));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string($current['path']));
+		}
 		return $current['path'];	// we return path as key
 	}
 
@@ -136,26 +145,38 @@ 
 	{
 		if (next($this->files) !== false)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning TRUE");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning TRUE");
+			}
 			return true;
 		}
 		// check if previous query gave less then CHUNK_SIZE entries --> we're done
 		if ($this->start && count($this->files) < self::CHUNK_SIZE)
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;
 		}
 		// try query further files via propfind callback of handler and store result in $this->files
 		$this->files = $this->handler->propfind_callback($this->path,$this->filter,array($this->start,self::CHUNK_SIZE));
 		if (!is_array($this->files) || !($entries = count($this->files)))
 		{
-			if ($this->debug) error_log(__METHOD__."() returning FALSE (no more entries)");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() returning FALSE (no more entries)");
+			}
 			return false;	// no further entries
 		}
 		$this->start += self::CHUNK_SIZE;
 		reset($this->files);
 
-		if ($this->debug) error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() this->start=$this->start, entries=$entries, count(this->files)=".count($this->files)." returning ".array2string(current($this->files) !== false));
+		}
 
 		return current($this->files) !== false;
 	}
@@ -165,11 +186,18 @@ 
 	 */
 	public function rewind()
 	{
-		if ($this->debug) error_log(__METHOD__."()");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."()");
+		}
 
 		$this->start = 0;
 		$this->files = $this->common_files;
-		if (!$this->files) $this->next();	// otherwise valid will return false and nothing get returned
+		if (!$this->files)
+		{
+			$this->next();
+		}
+		// otherwise valid will return false and nothing get returned
 		reset($this->files);
 	}
 
@@ -180,7 +208,10 @@ 
 	 */
 	public function valid ()
 	{
-		if ($this->debug) error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() returning ".array2string(current($this->files) !== false));
+		}
 		return current($this->files) !== false;
 	}
 }

api/src/Categories.php

Doc Comments +6 added lines, -6 removed lines

@@ -322,13 +322,13 @@ 
 	 * return a sorted array populated with categories (main sorting criteria is hierachy!)
 	 *
 	 * @param int $start =0 see $limit
-	 * @param boolean|int $limit if true limited query to maxmatches rows (starting with $start)
+	 * @param boolean $limit if true limited query to maxmatches rows (starting with $start)
 	 * @param string $query ='' query-pattern
 	 * @param string $sort ='ASC' sort order, either defaults to 'ASC'
 	 * @param string $order ='cat_name' order by
 	 * @param boolean|string $globals includes the global egroupware categories or not,
 	 * 	'all_no_acl' to return global and all non-private user categories independent of ACL
-	 * @param array|int $parent_id =0 return only subcats of $parent_id(s)
+	 * @param integer $parent_id =0 return only subcats of $parent_id(s)
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
@@ -507,7 +507,7 @@ 
 	 * @param mixed $category category as array or the category_id
 	 * @param boolean $no_acl_check =false if true, grants are NOT checked, gives access to all non-private categories of all users
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
-	 * @return boolean true permission granted, false for permission denied, null for category does not exist
+	 * @return null|boolean true permission granted, false for permission denied, null for category does not exist
 	 */
 	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
 	{
@@ -675,7 +675,7 @@ 
 	 * check_consistency4update - for edit
 	 *
 	 * @param array $values array with cat-data (it need to be complete, as everything get's written)
-	 * @return mixed string/boolean errorstring if consitency check failed / true if the consistency check did not fail
+	 * @return string|boolean string/boolean errorstring if consitency check failed / true if the consistency check did not fail
 	 */
 	function check_consistency4update($values)
 	{
@@ -822,7 +822,7 @@ 
 	 *
 	 * @param int|array $cat
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	static function is_global($cat,$application_global=false)
 	{
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @param string appname
 	 *
-	 * @return Returns the URL, but you do not need to do anything with it.
+	 * @return string the URL, but you do not need to do anything with it.
 	 */
 	public static function css($appname)
 	{

Indentation +7 added lines, -7 removed lines

@@ -1044,13 +1044,13 @@
 	}
 
 	/**
-	* Get the color of a category
-	*
-	* For multiple cats, the first with a color is used
-	*
-	* @param int|string $_cats multiple comma-separated cat_id's
-	* @return string
-	*/
+	 * Get the color of a category
+	 *
+	 * For multiple cats, the first with a color is used
+	 *
+	 * @param int|string $_cats multiple comma-separated cat_id's
+	 * @return string
+	 */
 	static function cats2color($_cats)
 	{
 		static $cat2color = array();

Braces +208 added lines, -52 removed lines

@@ -122,7 +122,10 @@ 
 	 */
 	function __construct($accountid='',$app_name = '')
 	{
-		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app_name)
+		{
+			$app_name = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
@@ -138,10 +141,13 @@ 
 		$this->app_name		= $app_name;
 		$this->db			= $GLOBALS['egw']->db;
 
-		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
+		if (is_null(self::$cache))
+		{
+			// should not be necessary, as cache is load and restored by egw object
 		{
 			self::init_cache();
 		}
+		}
 		if (is_null(self::$global_marker))
 		{
 			// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
@@ -189,7 +195,9 @@ 
 		$cats = array();
 		foreach(self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter)
+			{
+				foreach($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
@@ -197,10 +205,14 @@ 
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
 						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+			}
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val,1))
+						{
+							continue 2;
+						}
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +220,17 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val))
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col],$val))
+						{
+							continue 2;
+						}
 					}
 				}
 				else
@@ -220,16 +238,25 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] != $val && trim($cat[$col]) != $val) continue 2;
+						if ($cat[$col] != $val && trim($cat[$col]) != $val)
+						{
+							continue 2;
+						}
 					}
 					else
 					{
-						if ($cat[$col] != $val) continue 2;
+						if ($cat[$col] != $val)
+						{
+							continue 2;
+						}
 					}
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'],(array)$parent_id))
+			{
+				continue;
+			}
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -247,30 +274,55 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent'])
+					{
+						continue 2;
+					}
+					// 2 for switch AND foreach!
 					break;
 				case 'mains':
-					if ($cat['parent']) continue 2;
+					if ($cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandmains':
-					if ($cat['appname'] != $this->app_name || $cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'appandsubs':
-					if ($cat['appname'] != $this->app_name || !$cat['parent']) continue 2;
+					if ($cat['appname'] != $this->app_name || !$cat['parent'])
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobal':
-					if ($cat['appname'] == $this->app_name) continue 2;
+					if ($cat['appname'] == $this->app_name)
+					{
+						continue 2;
+					}
 					break;
 				case 'noglobalapp':
-					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id) continue 2;
+					if ($cat['appname'] != $this->app_name || $cat['owner'] == (int)$this->account_id)
+					{
+						continue 2;
+					}
 					break;
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false)
+			{
+				continue;
+			}
 
 			// check if last modified since
-			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
+			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod)
+			{
+				continue;
+			}
 
 			$cat['data'] = $cat['data'] ? json_php_unserialize($cat['data'], true) : array();
 
@@ -281,13 +333,23 @@ 
 			//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=$parent_id,$lastmod,$column) account_id=$this->account_id, appname=$this->app_name = FALSE");
 			return array();
 		}
-		if (!$sort) $sort = 'ASC';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
 			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order,'cat_data') !== false)
+			{
+				$order = 'cat_data';
+			}
+			// sitemgr orders by round(cat_data)!
+			if (substr($order,0,4) == 'cat_')
+			{
+				$order = substr($order,4);
+			}
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
@@ -301,7 +363,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		// return only a certain column (why not return is as value?)
@@ -334,15 +399,24 @@ 
 	 */
 	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
 	{
-		if (!$sort)  $sort = 'ASC';
-		if (!$order) $order = 'cat_name';
+		if (!$sort)
+		{
+			$sort = 'ASC';
+		}
+		if (!$order)
+		{
+			$order = 'cat_name';
+		}
 
 		//error_log(__METHOD__."($start,$limit,$query,$sort,$order,globals=$globals,parent=$parent_id,$unserialize_data) account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if($parent_id !== false && $parent_id !== null)
+		{
+			$parent_id = (array)$parent_id;
+		}
 		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
 		{
 			$cats = array();
@@ -352,7 +426,9 @@ 
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if($parent_id || !$cats)
+		{
+			// Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
@@ -360,6 +436,7 @@ 
 				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
 				{
 					break;
+		}
 				}
 				$parents = $children = array();
 				foreach($subs as $cat)
@@ -391,7 +468,10 @@ 
 		// limit the number of returned rows
 		if ($limit)
 		{
-			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			if (!is_int($limit))
+			{
+				$limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
+			}
 			$cats = array_slice($cats,(int)$start,$limit);
 		}
 		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
@@ -410,9 +490,15 @@ 
 	 */
 	static function read($id)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
-		if (!isset(self::$cache[$id])) return false;
+		if (!isset(self::$cache[$id]))
+		{
+			return false;
+		}
 
 		$cat = self::$cache[$id];
 		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
@@ -475,8 +561,11 @@ 
 	 * @return string truncated commaseparated list of category ids
 	 */
 	function check_list($needed, $cat_list)
- 	{
-		if (empty($cat_list)) return $cat_list;
+	{
+		if (empty($cat_list))
+		{
+			return $cat_list;
+		}
 		if (is_array($cat_list))
 		{
 			$cat_list = implode(',',$cat_list);
@@ -487,10 +576,13 @@ 
 		{
 			foreach($cat_arr as $id=>$cat_id)
 			{
-				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
+				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))
+				{
+					// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
+				}
 			}
 			$cat_list = implode(',',$cat_arr);
 		}
@@ -596,9 +688,15 @@ 
 				{
 					$update = array('cat_level' => $cat['level']-1);
 
-					if ($new_main) $update['cat_main'] = $new_main;
+					if ($new_main)
+					{
+						$update['cat_main'] = $new_main;
+					}
 
-					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
+					if ($cat['parent'] == $cat_id)
+					{
+						$update['cat_parent'] = $new_parent;
+					}
 
 					$this->db->update(self::TABLE,$update,array(
 						'cat_id' => $cat['id'],
@@ -624,9 +722,13 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if($this->is_global($cat_id, true))
+		{
+			// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'],False,True);
+		}
+		// called for every app now, not only enabled ones)
 		}
 		else
 		{
@@ -682,12 +784,22 @@ 
 		// check if we try to move an element down its own subtree, which will fail
 		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
 		{
-			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			if ($cat['id'] == $values['parent'])
+			{
+				return lang('Cannot set a category as parent, which is part of this categorys subtree!');
+			}
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent']==$values['id'])
+		{
+			return lang('Cannot set this cat as its own parent!');
+		}
+		// deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent']>0 && !$this->read($values['parent']))
+		{
+			return lang('Chosen parent category no longer exists');
+		}
 		return true;
 	}
 
@@ -704,7 +816,10 @@ 
 		if (isset($values['old_parent']) && (int)$values['old_parent'] != (int)$values['parent'])
 		{
 			$ret = $this->check_consistency4update($values);
-			if ($ret !== true) throw new Exception\WrongUserinput($ret);
+			if ($ret !== true)
+			{
+				throw new Exception\WrongUserinput($ret);
+			}
 			// everything seems in order -> proceed
 			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
 			$this->adapt_level_in_subtree($values);
@@ -717,7 +832,10 @@ 
 			if ($values['parent'] > 0)
 			{
 				$ret = $this->check_consistency4update($values);
-				if ($ret !== true) throw new Exception\WrongUserinput($ret);
+				if ($ret !== true)
+				{
+					throw new Exception\WrongUserinput($ret);
+				}
 
 				// everything seems in order -> proceed
 				$values['main']  = $this->id2name($values['parent'],'main');
@@ -773,7 +891,10 @@ 
 	{
 		static $cache = array();	// a litle bit of caching
 
-		if (isset($cache[$cat_name])) return $cache[$cat_name];
+		if (isset($cache[$cat_name]))
+		{
+			return $cache[$cat_name];
+		}
 
 		if ($strip === true)
 		{
@@ -826,7 +947,11 @@ 
 	 */
 	static function is_global($cat,$application_global=false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat)))
+		{
+			return null;
+		}
+		// cat not found
 
 		$global_owner = false;
 		foreach(explode(',',$cat['owner']) as $owner)
@@ -848,10 +973,19 @@ 
 	 */
 	static function id2name($cat_id=0, $item='name')
 	{
-		if(!$cat_id) return '--';
-		if (!$item) $item = 'parent';
+		if(!$cat_id)
+		{
+			return '--';
+		}
+		if (!$item)
+		{
+			$item = 'parent';
+		}
 
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$cat = self::$cache[$cat_id];
 		if ($item == 'path')
@@ -892,7 +1026,10 @@ 
 		if ($cat_name)
 		{
 			$filter['name'] = $cat_name;
-			if ($cat_id) $filter['id'] = '!'.(int)$cat_id;
+			if ($cat_id)
+			{
+				$filter['id'] = '!'.(int)$cat_id;
+			}
 		}
 		elseif ($cat_id)
 		{
@@ -921,7 +1058,10 @@ 
 	{
 		$where = array('cat_owner' => $owner);
 
-		if ($app) $where['cat_appname'] = $app;
+		if ($app)
+		{
+			$where['cat_appname'] = $app;
+		}
 
 		if ((int)$to)
 		{
@@ -967,7 +1107,11 @@ 
 				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
 				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				if ($cat['appname'] == '*update*')
+				{
+					continue;
+				}
+				// --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -1058,7 +1202,10 @@ 
 		// ACL check
 		$cats = $GLOBALS['egw']->categories->check_list(Acl::READ, $_cats);
 
-		if (!$cats) return null;
+		if (!$cats)
+		{
+			return null;
+		}
 
 		if (isset($cat2color[$cats]))
 		{
@@ -1090,7 +1237,10 @@ 
 	 */
 	public static function delete_account($account_id, $new_owner=null)
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$deleted = 0;
 		$cat = null;
@@ -1110,7 +1260,10 @@ 
 				else
 				{
 					unset($owners[$owner_key]);
-					if ($new_owner && $account_id > 0) $owners[] = $new_owner;
+					if ($new_owner && $account_id > 0)
+					{
+						$owners[] = $new_owner;
+					}
 					$data['owner'] = implode(',', $owners);
 					// app_name have to match cat to update!
 					if (!isset($cat) || $cat->app_name != $data['appname'])
@@ -1132,7 +1285,10 @@ 
 	 */
 	public static function delete_orphans()
 	{
-		if (is_null(self::$cache)) self::init_cache();
+		if (is_null(self::$cache))
+		{
+			self::init_cache();
+		}
 
 		$checked = array();
 		$deleted = 0;

Spacing +119 added lines, -119 removed lines

@@ -120,23 +120,23 @@ 
 	 * @param int|string $accountid ='' account id or lid, default to current user
 	 * @param string $app_name ='' app name defaults to current app
 	 */
-	function __construct($accountid='',$app_name = '')
+	function __construct($accountid = '', $app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		if ($accountid === self::GLOBAL_ACCOUNT ||
 			$accountid < 0 && $GLOBALS['egw']->accounts->exists($accountid) == 2)
 		{
-			$this->account_id = (int) $accountid;
+			$this->account_id = (int)$accountid;
 		}
 		else
 		{
-			$this->account_id	= (int) get_account_id($accountid);
+			$this->account_id = (int)get_account_id($accountid);
 			$this->global_owners = $this->account_id ? $GLOBALS['egw']->accounts->memberships($this->account_id, true) : array();
 			$this->global_owners[] = self::GLOBAL_ACCOUNT;
 		}
-		$this->app_name		= $app_name;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->app_name = $app_name;
+		$this->db = $GLOBALS['egw']->db;
 
 		if (is_null(self::$cache))	// should not be necessary, as cache is load and restored by egw object
 		{
@@ -158,10 +158,10 @@ 
 	{
 		$all_children = array_map('intval', (array)$cat_id);
 
-		$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
+		$children = $this->return_array('subs', 0, False, '', '', '', True, $cat_id, -1, 'id');
 		if (is_array($children) && count($children))
 		{
-			$all_children = array_merge($all_children,$this->return_all_children($children));
+			$all_children = array_merge($all_children, $this->return_all_children($children));
 		}
 		return $all_children;
 	}
@@ -183,24 +183,24 @@ 
 	 * @param array $filter =null array with column-name (without cat_-prefix) => value pairs (! negates the value)
 	 * @return array of cat-arrays or $column values
 	 */
-	function return_array($type='all', $start=0, $limit=true, $query='', $sort='ASC',$order='',$globals=false, $parent_id=null, $lastmod=-1, $column='', $filter=null)
+	function return_array($type = 'all', $start = 0, $limit = true, $query = '', $sort = 'ASC', $order = '', $globals = false, $parent_id = null, $lastmod = -1, $column = '', $filter = null)
 	{
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,globals=$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).") account_id=$this->account_id, appname=$this->app_name: ".function_backtrace());
 		$cats = array();
-		foreach(self::$cache as $cat)
+		foreach (self::$cache as $cat)
 		{
-			if ($filter) foreach($filter as $col => $val)
+			if ($filter) foreach ($filter as $col => $val)
 			{
 				if (!is_array($val) && $val[0] === '!')
 				{
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if ($cat[$col] == substr($val,1) || trim($cat[$col]) == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1) || trim($cat[$col]) == substr($val, 1)) continue 2;
 					}
 					else
 					{
-						if ($cat[$col] == substr($val,1)) continue 2;
+						if ($cat[$col] == substr($val, 1)) continue 2;
 					}
 				}
 				elseif (is_array($val))
@@ -208,11 +208,11 @@ 
 					// also match against trimmed database entry on name and description fields
 					if (($col == 'name' || $col == 'description') && is_string($cat[$col]))
 					{
-						if (!in_array($cat[$col],$val) && !in_array(trim($cat[$col]),$val)) continue 2;
+						if (!in_array($cat[$col], $val) && !in_array(trim($cat[$col]), $val)) continue 2;
 					}
 					else
 					{
-						if (!in_array($cat[$col],$val)) continue 2;
+						if (!in_array($cat[$col], $val)) continue 2;
 					}
 				}
 				else
@@ -229,7 +229,7 @@ 
 				}
 			}
 			// check if certain parent required
-			if ($parent_id && !in_array($cat['parent'],(array)$parent_id)) continue;
+			if ($parent_id && !in_array($cat['parent'], (array)$parent_id)) continue;
 
 			// return global categories just if $globals is set
 			if (!$globals && $cat['appname'] == self::GLOBAL_APPNAME)
@@ -238,7 +238,7 @@ 
 			}
 
 			// check for read permission
-			if(!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
+			if (!$this->check_perms(Acl::READ, $cat, $globals === 'all_no_acl'))
 			{
 				continue;
 			}
@@ -247,7 +247,7 @@ 
 			switch ($type)
 			{
 				case 'subs':
-					if (!$cat['parent']) continue 2;	// 2 for switch AND foreach!
+					if (!$cat['parent']) continue 2; // 2 for switch AND foreach!
 					break;
 				case 'mains':
 					if ($cat['parent']) continue 2;
@@ -267,7 +267,7 @@ 
 			}
 
 			// check name and description for $query
-			if ($query && stristr($cat['name'],$query) === false && stristr($cat['description'],$query) === false) continue;
+			if ($query && stristr($cat['name'], $query) === false && stristr($cat['description'], $query) === false) continue;
 
 			// check if last modified since
 			if ($lastmod > 0 && $cat['last_mod'] <= $lastmod) continue;
@@ -284,37 +284,37 @@ 
 		if (!$sort) $sort = 'ASC';
 		// order the entries if necessary (cache is already ordered in or default order: cat_main, cat_level, cat_name ASC)
 		if ($this->total_records > 1 && !empty($order) &&
-			preg_match('/^[a-zA-Z_(), ]+$/',$order) && preg_match('/^(ASC|DESC|asc|desc)$/',$sort))
+			preg_match('/^[a-zA-Z_(), ]+$/', $order) && preg_match('/^(ASC|DESC|asc|desc)$/', $sort))
 		{
-			if (strstr($order,'cat_data') !== false) $order = 'cat_data';	// sitemgr orders by round(cat_data)!
-			if (substr($order,0,4) == 'cat_') $order = substr($order,4);
+			if (strstr($order, 'cat_data') !== false) $order = 'cat_data'; // sitemgr orders by round(cat_data)!
+			if (substr($order, 0, 4) == 'cat_') $order = substr($order, 4);
 			$sign = strtoupper($sort) == 'DESC' ? -1 : 1;
 			usort($cats, function($a, $b) use ($order, $sign)
 			{
-				if (in_array($order, array('name','description','appname','app_name')))
+				if (in_array($order, array('name', 'description', 'appname', 'app_name')))
 				{
 					return $sign * strcasecmp($a[$order], $b[$order]);
 				}
-				return $sign*(int)$a[$order] - $sign*(int)$b[$order];
+				return $sign * (int)$a[$order] - $sign * (int)$b[$order];
 			});
 		}
 		// limit the number of returned rows
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
 		// return only a certain column (why not return is as value?)
 		if ($column)
 		{
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k] = $cat[$column];
 			}
 		}
 		//error_log(__METHOD__."($type,$start,$limit,$query,$sort,$order,$globals,parent=".array2string($parent_id).",$lastmod,$column,filter=".array2string($filter).",$unserialize_data) account_id=$this->account_id, appname=$this->app_name = ".array2string($cats));
 
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @param boolean $unserialize_data =true return $cat['data'] as array (not serialized array)
 	 * @return array with cats
 	 */
-	function return_sorted_array($start=0,$limit=True,$query='',$sort='ASC',$order='cat_name',$globals=False, $parent_id=0,$unserialize_data=true,$filter=null)
+	function return_sorted_array($start = 0, $limit = True, $query = '', $sort = 'ASC', $order = 'cat_name', $globals = False, $parent_id = 0, $unserialize_data = true, $filter = null)
 	{
 		if (!$sort)  $sort = 'ASC';
 		if (!$order) $order = 'cat_name';
@@ -342,27 +342,27 @@ 
 		$parents = $cats = array();
 
 		// Cast parent_id to array, but only if there is one
-		if($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
-		if (!($cats = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parent_id,-1,'',$filter,$unserialize_data)))
+		if ($parent_id !== false && $parent_id !== null) $parent_id = (array)$parent_id;
+		if (!($cats = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parent_id, -1, '', $filter, $unserialize_data)))
 		{
 			$cats = array();
 		}
-		foreach($cats as $cat)
+		foreach ($cats as $cat)
 		{
 			$parents[] = $cat['id'];
 		}
 
-		if($parent_id || !$cats) // Avoid wiping search results
+		if ($parent_id || !$cats) // Avoid wiping search results
 		{
 			// Go find the children
 			while (count($parents))
 			{
-				if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents,-1,'',$filter,$unserialize_data)))
+				if (!($subs = $this->return_array('all', 0, false, $query, $sort, $order, $globals, $parents, -1, '', $filter, $unserialize_data)))
 				{
 					break;
 				}
 				$parents = $children = array();
-				foreach($subs as $cat)
+				foreach ($subs as $cat)
 				{
 					$parents[] = $cat['id'];
 					$children[$cat['parent']][] = $cat;
@@ -372,12 +372,12 @@ 
 				{
 					$cats2 = $cats;
 					$cats = array();
-					foreach($cats2 as $cat)
+					foreach ($cats2 as $cat)
 					{
 						$cats[] = $cat;
 						if (isset($children[$cat['id']]))
 						{
-							foreach($children[$cat['id']] as $child)
+							foreach ($children[$cat['id']] as $child)
 							{
 								$cats[] = $child;
 							}
@@ -392,9 +392,9 @@ 
 		if ($limit)
 		{
 			if (!is_int($limit)) $limit = (int)$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'];
-			$cats = array_slice($cats,(int)$start,$limit);
+			$cats = array_slice($cats, (int)$start, $limit);
 		}
-		reset($cats);	// some old code (eg. sitemgr) relies on the array-pointer!
+		reset($cats); // some old code (eg. sitemgr) relies on the array-pointer!
 		return $cats;
 	}
 
@@ -415,7 +415,7 @@ 
 		if (!isset(self::$cache[$id])) return false;
 
 		$cat = self::$cache[$id];
-		$cat['data'] = $cat['data'] ? ((($arr=json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
+		$cat['data'] = $cat['data'] ? ((($arr = json_php_unserialize($cat['data'], true)) !== false || $cat['data'] === 'b:0;') ?
 			$arr : $cat['data']) : array();
 
 		return $cat;
@@ -433,31 +433,31 @@ 
 	{
 		if ((int)$values['parent'] > 0)
 		{
-			$values['level'] = $this->id2name($values['parent'],'level')+1;
-			$values['main'] = $this->id2name($values['parent'],'main');
+			$values['level'] = $this->id2name($values['parent'], 'level') + 1;
+			$values['main'] = $this->id2name($values['parent'], 'main');
 		}
 		else
 		{
 			$values['level'] = 0;
 		}
-		$this->db->insert(self::TABLE,$cat=array(
+		$this->db->insert(self::TABLE, $cat = array(
 			'cat_parent'  => $values['parent'],
 			'cat_owner' => isset($values['owner']) ? $values['owner'] : $this->account_id,
 			'cat_access'  => isset($values['access']) ? $values['access'] : 'public',
 			'cat_appname' => $this->app_name,
 			'cat_name'    => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from returned one
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from returned one
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_main'    => $values['main'],
 			'cat_level'   => $values['level'],
 			'last_mod'    => time(),
-		),(int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(),__LINE__,__FILE__);
+		), (int)$values['id'] > 0 ? array('cat_id' =>  $values['id']) : array(), __LINE__, __FILE__);
 
-		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE,'cat_id');
+		$cat['cat_id'] = $id = (int)$values['id'] > 0 ? (int)$values['id'] : $this->db->get_last_insert_id(self::TABLE, 'cat_id');
 
 		if (!(int)$values['parent'] && $id != $values['main'])
 		{
-			$this->db->update(self::TABLE,array('cat_main' => $id),array('cat_id' => $id),__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_main' => $id), array('cat_id' => $id), __LINE__, __FILE__);
 			$cat['cat_main'] = $id;
 		}
 		// update cache accordingly
@@ -479,20 +479,20 @@ 
 		if (empty($cat_list)) return $cat_list;
 		if (is_array($cat_list))
 		{
-			$cat_list = implode(',',$cat_list);
+			$cat_list = implode(',', $cat_list);
 			//error_log(__METHOD__.__LINE__.' string expected, array found for cat_list. Converted to:'.$cat_list);
 		}
-		$cat_arr = explode(',',$cat_list);
+		$cat_arr = explode(',', $cat_list);
 		if (!empty($cat_arr) && is_array($cat_arr) && count($cat_arr) > 0)
 		{
-			foreach($cat_arr as $id=>$cat_id)
+			foreach ($cat_arr as $id=>$cat_id)
 			{
 				if (!$this->check_perms($needed, $cat_id, false, $needed == Acl::READ))	// allow reading all global cats
 				{
 					unset($cat_arr[$id]);
 				}
 			}
-			$cat_list = implode(',',$cat_arr);
+			$cat_list = implode(',', $cat_arr);
 		}
 
 		return $cat_list;
@@ -509,7 +509,7 @@ 
 	 * @param boolean $allow_global_read if true, global cats are allowed (independent of app) for reading
 	 * @return boolean true permission granted, false for permission denied, null for category does not exist
 	 */
-	public function check_perms($needed, $category, $no_acl_check=false, $allow_global_read=false)
+	public function check_perms($needed, $category, $no_acl_check = false, $allow_global_read = false)
 	{
 		if (!is_array($category) && !($category = self::read($category)))
 		{
@@ -525,8 +525,8 @@ 
 		}
 
 		// Read access to global categories
-		if ($needed == Acl::READ && (($is_global=array_intersect(explode(',',$category['owner']),$this->global_owners)) ||
-			$no_acl_check && $category['access'] == 'public') &&	// no_acl_check only means public cats
+		if ($needed == Acl::READ && (($is_global = array_intersect(explode(',', $category['owner']), $this->global_owners)) ||
+			$no_acl_check && $category['access'] == 'public') && // no_acl_check only means public cats
 			($category['appname'] == self::GLOBAL_APPNAME || $category['appname'] == $this->app_name ||
 			$is_global && $allow_global_read))
 		{
@@ -549,16 +549,16 @@ 
 		// Load the application grants
 		if ($category['appname'] == $this->app_name && is_null($this->grants))
 		{
-			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name,true);
+			$this->grants = $GLOBALS['egw']->acl->get_grants($this->app_name, true);
 		}
 
 		// Check for ACL granted access, the self::GLOBAL_ACCOUNT user must not get access by ACL to keep old behaviour
 		$acl_grant = $this->account_id != self::GLOBAL_ACCOUNT && $category['appname'] == $this->app_name;
 		$owner_grant = false;
-		foreach(explode(',',$category['owner']) as $owner)
+		foreach (explode(',', $category['owner']) as $owner)
 		{
-			$owner_grant = $owner_grant || (($this->grants[$owner] & $needed) &&
-				($category['access'] == 'public' ||  ($this->grants[$owner] & Acl::PRIVAT)));
+			$owner_grant = $owner_grant || (($this->grants[$owner]&$needed) &&
+				($category['access'] == 'public' || ($this->grants[$owner]&Acl::PRIVAT)));
 		}
 		return $acl_grant && $owner_grant;
 	}
@@ -575,35 +575,35 @@ 
 		//error_log(__METHOD__."(".array2string($cat_id).', drop_subs='.array2string($drop_subs).', modify_subs='.array2string($modify_subs).') '.function_backtrace());
 		if ($modify_subs)
 		{
-			$new_parent = $this->id2name($cat_id,'parent');
+			$new_parent = $this->id2name($cat_id, 'parent');
 
-			foreach ((array) $this->return_sorted_array('',False,'','','',False, $cat_id) as $cat)
+			foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $cat_id) as $cat)
 			{
 				if ($cat['level'] == 1)
 				{
-					$this->db->update(self::TABLE,array(
+					$this->db->update(self::TABLE, array(
 						'cat_level'  => 0,
 						'cat_parent' => 0,
 						'cat_main'   => $cat['id'],
-					),array(
+					), array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 
 					$new_main = $cat['id'];
 				}
 				else
 				{
-					$update = array('cat_level' => $cat['level']-1);
+					$update = array('cat_level' => $cat['level'] - 1);
 
 					if ($new_main) $update['cat_main'] = $new_main;
 
 					if ($cat['parent'] == $cat_id) $update['cat_parent'] = $new_parent;
 
-					$this->db->update(self::TABLE,$update,array(
+					$this->db->update(self::TABLE, $update, array(
 						'cat_id' => $cat['id'],
 						'cat_appname' => $this->app_name,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 		}
@@ -624,16 +624,16 @@ 
 			'modify_subs' => $modify_subs,
 			'location'    => 'delete_category'
 		);
-		if($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
+		if ($this->is_global($cat_id, true))	// true = application global (otherwise eg. global addressbook categories call all apps)
 		{
-			Hooks::process($GLOBALS['hook_values'],False,True);  // called for every app now, not only enabled ones)
+			Hooks::process($GLOBALS['hook_values'], False, True); // called for every app now, not only enabled ones)
 		}
 		else
 		{
-			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id,'appname'));
+			Hooks::single($GLOBALS['hook_values'], self::id2name($cat_id, 'appname'));
 		}
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		// update cache accordingly
 		self::invalidate_cache($modify_subs ? null : $where['cat_id']);
@@ -649,17 +649,17 @@ 
 	 */
 	function adapt_level_in_subtree($values)
 	{
-		foreach ((array) $this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ((array)$this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['parent'] == $values['id'])
 			{
-				$this->db->update(self::TABLE,array(
-					'cat_level' => $values['level']+1,
+				$this->db->update(self::TABLE, array(
+					'cat_level' => $values['level'] + 1,
 					'last_mod' => time(),
-				),array(
+				), array(
 					'cat_id' => $cat['id'],
 					'cat_appname' => $this->app_name,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 				$cat['level'] = $values['level'] + 1;
 				self::invalidate_cache($cat['id']);
 				$this->adapt_level_in_subtree($cat);
@@ -680,14 +680,14 @@ 
 	function check_consistency4update($values)
 	{
 		// check if we try to move an element down its own subtree, which will fail
-		foreach ($this->return_sorted_array('',False,'','','',False, $values['id']) as $cat)
+		foreach ($this->return_sorted_array('', False, '', '', '', False, $values['id']) as $cat)
 		{
 			if ($cat['id'] == $values['parent']) return lang('Cannot set a category as parent, which is part of this categorys subtree!');
 		}
 		// check if we try to be our own parent
-		if ($values['parent']==$values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
+		if ($values['parent'] == $values['id']) return lang('Cannot set this cat as its own parent!'); // deny to be our own parent
 		// check if parent still exists
-		if ((int)$values['parent']>0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
+		if ((int)$values['parent'] > 0 && !$this->read($values['parent'])) return lang('Chosen parent category no longer exists');
 		return true;
 	}
 
@@ -706,7 +706,7 @@ 
 			$ret = $this->check_consistency4update($values);
 			if ($ret !== true) throw new Exception\WrongUserinput($ret);
 			// everything seems in order -> proceed
-			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'],'level')+1:0);
+			$values['level'] = ($values['parent'] ? $this->id2name($values['parent'], 'level') + 1 : 0);
 			$this->adapt_level_in_subtree($values);
 
 			return $this->add($values);
@@ -720,8 +720,8 @@ 
 				if ($ret !== true) throw new Exception\WrongUserinput($ret);
 
 				// everything seems in order -> proceed
-				$values['main']  = $this->id2name($values['parent'],'main');
-				$values['level'] = $this->id2name($values['parent'],'level') + 1;
+				$values['main']  = $this->id2name($values['parent'], 'main');
+				$values['level'] = $this->id2name($values['parent'], 'level') + 1;
 			}
 			else
 			{
@@ -732,9 +732,9 @@ 
 			// adapt the level info in each child
 			$this->adapt_level_in_subtree($values);
 		}
-		$this->db->update(self::TABLE,$cat=array(
+		$this->db->update(self::TABLE, $cat = array(
 			'cat_name' => $values['name'],
-			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'],	// support old name different from the one read
+			'cat_description' => isset($values['description']) ? $values['description'] : $values['descr'], // support old name different from the one read
 			'cat_data'    => is_array($values['data']) ? json_encode($values['data']) : $values['data'],
 			'cat_parent' => $values['parent'],
 			'cat_access' => $values['access'],
@@ -742,10 +742,10 @@ 
 			'cat_main' => $values['main'],
 			'cat_level' => $values['level'],
 			'last_mod' => time(),
-		),array(
+		), array(
 			'cat_id' => $values['id'],
 			'cat_appname' => $this->app_name,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$cat['cat_id'] = $values['id'];
 		$cat['cat_appname'] = $this->app_name;
@@ -769,9 +769,9 @@ 
 	 * @param boolean|string $strip =false if true, strips 'X-'  ($strip) from category names added by some SyncML clients
 	 * @return int cat-id or 0 if not found
 	 */
-	function name2id($cat_name, $strip=false)
+	function name2id($cat_name, $strip = false)
 	{
-		static $cache = array();	// a litle bit of caching
+		static $cache = array(); // a litle bit of caching
 
 		if (isset($cache[$cat_name])) return $cache[$cat_name];
 
@@ -792,17 +792,17 @@ 
 			$cats[] = $stripped_cat_name;
 		}
 
-		if (!($cats = $this->return_array('all',0,false,'','','',true,null,-1,'',array(
+		if (!($cats = $this->return_array('all', 0, false, '', '', '', true, null, -1, '', array(
 			'name' => $cats,
 			'appname' => array($this->app_name, self::GLOBAL_APPNAME),
 		))))
 		{
-			return 0;	// cat not found, dont cache it, as it might be created in this request
+			return 0; // cat not found, dont cache it, as it might be created in this request
 		}
 		if (count($cats) > 1)
 		{
 			// if more the one cat matches we weight them by: exact name match; own, global, other users cat; appplication cats
-			foreach($cats as $k => $cat)
+			foreach ($cats as $k => $cat)
 			{
 				$cats[$k]['weight'] = 100 * ($cat['name'] == $cat_name) +
 					10 * ($cat['owner'] == $this->account_id ? 3 : ($cat['owner'] <= self::GLOBAL_ACCOUNT ? 2 : 1)) +
@@ -814,7 +814,7 @@ 
 				return $b['weight'] - $a['weight'];
 			});
 		}
-		return $cache[$cat['cat_name']] = (int) $cats[0]['id'];
+		return $cache[$cat['cat_name']] = (int)$cats[0]['id'];
 	}
 
 	/**
@@ -824,12 +824,12 @@ 
 	 * @param boolean $application_global =false true check for application global categories only (appname == 'phpgw')
 	 * @return boolean
 	 */
-	static function is_global($cat,$application_global=false)
+	static function is_global($cat, $application_global = false)
 	{
-		if (!is_array($cat) && !($cat = self::read($cat))) return null;	// cat not found
+		if (!is_array($cat) && !($cat = self::read($cat))) return null; // cat not found
 
 		$global_owner = false;
-		foreach(explode(',',$cat['owner']) as $owner)
+		foreach (explode(',', $cat['owner']) as $owner)
 		{
 			$global_owner = $global_owner || $owner <= self::GLOBAL_ACCOUNT;
 		}
@@ -846,9 +846,9 @@ 
 	 * @param string $item ='name' requested information, 'path' = / delimited path of category names (incl. parents)
 	 * @return string information or '--' if not found or !$cat_id
 	 */
-	static function id2name($cat_id=0, $item='name')
+	static function id2name($cat_id = 0, $item = 'name')
 	{
-		if(!$cat_id) return '--';
+		if (!$cat_id) return '--';
 		if (!$item) $item = 'parent';
 
 		if (is_null(self::$cache)) self::init_cache();
@@ -858,7 +858,7 @@ 
 		{
 			if ($cat['parent'])
 			{
-				return self::id2name($cat['parent'],'path').' / '.$cat['name'];
+				return self::id2name($cat['parent'], 'path').' / '.$cat['name'];
 			}
 			$item = 'name';
 		}
@@ -887,7 +887,7 @@ 
 	 * @param int $parent =0 category id of parent
 	 * @return int/boolean cat_id or false if cat not exists
 	 */
-	function exists($type,$cat_name = '',$cat_id = 0,$parent = 0)
+	function exists($type, $cat_name = '', $cat_id = 0, $parent = 0)
 	{
 		if ($cat_name)
 		{
@@ -898,7 +898,7 @@ 
 		{
 			$filter['id'] = $cat_id;
 		}
-		if (!($cats = $this->return_array($type,0,false,'','','',true,$parent,-1,'id',$filter)))
+		if (!($cats = $this->return_array($type, 0, false, '', '', '', true, $parent, -1, 'id', $filter)))
 		{
 			$ret = false;
 		}
@@ -917,7 +917,7 @@ 
 	 * @param int $to =0 new owner or 0 to delete the cats
 	 * @param string $app ='' if given only cats matching $app are modifed/deleted
 	 */
-	function change_owner($owner,$to=0,$app='')
+	function change_owner($owner, $to = 0, $app = '')
 	{
 		$where = array('cat_owner' => $owner);
 
@@ -925,11 +925,11 @@ 
 
 		if ((int)$to)
 		{
-			$this->db->update(self::TABLE,array('cat_owner' => $to),$where,__LINE__,__FILE__);
+			$this->db->update(self::TABLE, array('cat_owner' => $to), $where, __LINE__, __FILE__);
 		}
 		else
 		{
-			$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+			$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 		}
 		// update cache accordingly
 		self::invalidate_cache();
@@ -947,10 +947,10 @@ 
 		if (is_null(self::$cache))
 		{
 			// check if we are already updated to global owner == 0, if not do it now
-			if (!$GLOBALS['egw']->db->select(self::TABLE,'COUNT(*)',array('cat_owner'=>'0'),__LINE__,__FILE__)->fetchColumn())
+			if (!$GLOBALS['egw']->db->select(self::TABLE, 'COUNT(*)', array('cat_owner'=>'0'), __LINE__, __FILE__)->fetchColumn())
 			{
-				$GLOBALS['egw']->db->update(self::TABLE,array('cat_owner'=>'0'),"(cat_owner='-1' OR cat_appname='phpgw')",__LINE__,__FILE__);
-				$GLOBALS['egw']->db->insert(self::TABLE,array(
+				$GLOBALS['egw']->db->update(self::TABLE, array('cat_owner'=>'0'), "(cat_owner='-1' OR cat_appname='phpgw')", __LINE__, __FILE__);
+				$GLOBALS['egw']->db->insert(self::TABLE, array(
 					'cat_main'    => 0,
 					'cat_parent'  => 0,
 					'cat_level'   => 0,
@@ -959,15 +959,15 @@ 
 					'cat_name'    => 'global=0',
 					'cat_description' => 'global=0',
 					'last_mod'    => time(),
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 			self::$cache = array();
 			// read all cats (cant use $this->db!)
-			foreach($GLOBALS['egw']->db->select(self::TABLE,'*',false,__LINE__,__FILE__,
-				false,'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
+			foreach ($GLOBALS['egw']->db->select(self::TABLE, '*', false, __LINE__, __FILE__,
+				false, 'ORDER BY cat_main, cat_level, cat_name ASC') as $cat)
 			{
-				$cat = Db::strip_array_keys($cat,'cat_');
-				if ($cat['appname'] == '*update*') continue;	// --> ignore update marker
+				$cat = Db::strip_array_keys($cat, 'cat_');
+				if ($cat['appname'] == '*update*') continue; // --> ignore update marker
 				$cat['app_name'] = $cat['appname'];
 				// backlink children to their parent
 				if ($cat['parent'])
@@ -977,7 +977,7 @@ 
 				if (isset(self::$cache[$cat['id']]))
 				{
 					$cat['children'] = self::$cache[$cat['id']]['children'];
-					unset(self::$cache[$cat['id']]);	// otherwise the order gets messed up!
+					unset(self::$cache[$cat['id']]); // otherwise the order gets messed up!
 				}
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @param int|array $cat concerned id(s) or array with cat-data or null for all cats
 	 */
-	public static function invalidate_cache($cat=null)
+	public static function invalidate_cache($cat = null)
 	{
 		//error_log(__METHOD__."(".array2string($cat).') '.function_backtrace());
 
@@ -1006,12 +1006,12 @@ 
 		{
 			if (!is_array($cat) || isset($cat[0]))
 			{
-				foreach((array)$cat as $cat_id)
+				foreach ((array)$cat as $cat_id)
 				{
 					unset(self::$cache[$cat_id]);
 				}
 			}
-			elseif($cat['id'])
+			elseif ($cat['id'])
 			{
 				self::$cache[$cat['id']] = $cat;
 			}
@@ -1034,8 +1034,8 @@ 
 	 */
 	public static function css($appname)
 	{
-		$cats = new Categories('',$appname);
-		$last_mod = $cats->return_array('all',0,1,'','DESC','last_mod', $appname == self::GLOBAL_APPNAME);
+		$cats = new Categories('', $appname);
+		$last_mod = $cats->return_array('all', 0, 1, '', 'DESC', 'last_mod', $appname == self::GLOBAL_APPNAME);
 		$time = count($last_mod) ? $last_mod[0]['last_mod'] : time();
 		$path = '/api/categories.php?app='.$appname.'&'.$time;
 		Framework::includeCSS($path);
@@ -1065,7 +1065,7 @@ 
 			return $cat2color[$cats];
 		}
 
-		foreach(explode(',', $cats) as $cat)
+		foreach (explode(',', $cats) as $cat)
 		{
 			if (isset($cat2color[$cat]))
 			{
@@ -1088,13 +1088,13 @@ 
 	 * @param int $new_owner =null for users data can be transfered to new owner
 	 * @return int number of deleted or modified categories
 	 */
-	public static function delete_account($account_id, $new_owner=null)
+	public static function delete_account($account_id, $new_owner = null)
 	{
 		if (is_null(self::$cache)) self::init_cache();
 
 		$deleted = 0;
 		$cat = null;
-		foreach(self::$cache as $cat_id => $data)
+		foreach (self::$cache as $cat_id => $data)
 		{
 			if ($data['owner'] && ($owners = explode(',', $data['owner'])) && ($owner_key = array_search($account_id, $owners)) !== false)
 			{
@@ -1136,9 +1136,9 @@ 
 
 		$checked = array();
 		$deleted = 0;
-		foreach(self::$cache as $data)
+		foreach (self::$cache as $data)
 		{
-			foreach(explode(',', $data['owner']) as $owner)
+			foreach (explode(',', $data['owner']) as $owner)
 			{
 				if ($owner && !in_array($owner, $checked))
 				{