EGroupware / egroupware

api/src/Auth/Sql.php

Doc Comments -1 removed lines

@@ -241,7 +241,6 @@
 	 * changes password in sql datababse
 	 *
 	 * @param string $encrypted_passwd
-	 * @param string $new_passwd cleartext
 	 * @param int $account_id account id of user whose passwd should be changed
 	 * @param boolean $admin =false called by admin, if not update password in the session
 	 * @param boolean $update_lastpw_change =true

Spacing +31 added lines, -31 removed lines

@@ -52,7 +52,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')
 	{
 		/* normal web form login */
 		$where = array(
@@ -65,26 +65,26 @@ 
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
 			unset($where['account_lid']);
 		}
-		if($passwd_type == 'text')
+		if ($passwd_type == 'text')
 		{
-			if (!($row = $this->db->select($this->table,'account_lid,account_pwd,account_lastlogin,account_id',$where,__LINE__,__FILE__)->fetch()) ||
+			if (!($row = $this->db->select($this->table, 'account_lid,account_pwd,account_lastlogin,account_id', $where, __LINE__, __FILE__)->fetch()) ||
 				empty($row['account_pwd']) ||
 				$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 			{
 				return false;
 			}
 			$type = null;
-			if(!($match = Api\Auth::compare_password($passwd, $row['account_pwd'], $this->type, strtolower($username), $type)) ||
-				$type != $this->type && in_array($type, explode(',',strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
+			if (!($match = Api\Auth::compare_password($passwd, $row['account_pwd'], $this->type, strtolower($username), $type)) ||
+				$type != $this->type && in_array($type, explode(',', strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
 			{
 				// do we have to migrate an old password ?
-				if($GLOBALS['egw_info']['server']['pwd_migration_allowed'] && !empty($GLOBALS['egw_info']['server']['pwd_migration_types']))
+				if ($GLOBALS['egw_info']['server']['pwd_migration_allowed'] && !empty($GLOBALS['egw_info']['server']['pwd_migration_types']))
 				{
 					if (!$match)
 					{
-						foreach(explode(',', $GLOBALS['egw_info']['server']['pwd_migration_types']) as $type)
+						foreach (explode(',', $GLOBALS['egw_info']['server']['pwd_migration_types']) as $type)
 						{
-							if(($match = Api\Auth::compare_password($passwd,$row['account_pwd'],$type,strtolower($username))))
+							if (($match = Api\Auth::compare_password($passwd, $row['account_pwd'], $type, strtolower($username))))
 							{
 								break;
 							}
@@ -102,7 +102,7 @@ 
 		else
 		{
 			$where['account_pwd'] = $passwd;
-			if (!($row = $this->db->select($this->table,'account_lid,account_lastlogin',$where,__LINE__,__FILE__)->fetch()) ||
+			if (!($row = $this->db->select($this->table, 'account_lid,account_lastlogin', $where, __LINE__, __FILE__)->fetch()) ||
 				$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 			{
 				return false;
@@ -133,7 +133,7 @@ 
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
 			unset($where['account_lid']);
 		}
-		if (!($row = $this->db->select($this->table,'account_lid,account_lastpwd_change',$where,__LINE__,__FILE__)->fetch()) ||
+		if (!($row = $this->db->select($this->table, 'account_lid,account_lastpwd_change', $where, __LINE__, __FILE__)->fetch()) ||
 			$GLOBALS['egw_info']['server']['case_sensitive_username'] && $row['account_lid'] != $username)
 		{
 			return false;
@@ -152,11 +152,11 @@ 
 	 * @param int $_lastpwdchange =null 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)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$admin = False;
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -167,27 +167,27 @@ 
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
 
-		if (($pw = $this->db->select($this->table,'account_pwd',array(
+		if (($pw = $this->db->select($this->table, 'account_pwd', array(
 			'account_id'     => $account_id,
 			'account_type'   => 'u',
 			'account_status' => 'A',
-		),__LINE__,__FILE__)->fetchColumn()) === false)
+		), __LINE__, __FILE__)->fetchColumn()) === false)
 		{
-			return false;	// account not found
+			return false; // account not found
 		}
 		// Check the passwd to make sure this is legal
-		if(!$admin && !Api\Auth::compare_password($passwd,$pw,$this->type,strtolower($username)))
+		if (!$admin && !Api\Auth::compare_password($passwd, $pw, $this->type, strtolower($username)))
 		{
 			return false;
 		}
 		$lastpwdchange = (is_null($_lastpwdchange) || $_lastpwdchange < 0 ? time() : $_lastpwdchange);
-		$this->db->update($this->table,array(
+		$this->db->update($this->table, array(
 			'account_lastpwd_change' => $lastpwdchange,
-		),array(
+		), array(
 			'account_id' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		if(!$this->db->affected_rows()) return false;
+		if (!$this->db->affected_rows()) return false;
 		if (!$admin) Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
 		return true;
 	}
@@ -200,11 +200,11 @@ 
 	 * @param int $account_id account id of user whose passwd should be changed
 	 * @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)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id)
+		if (!$account_id)
 		{
 			$admin = False;
 			$account_id = $GLOBALS['egw_info']['user']['account_id'];
@@ -215,15 +215,15 @@ 
 			$username = $GLOBALS['egw']->accounts->id2name($account_id);
 		}
 
-		if (($pw = $this->db->select($this->table,'account_pwd',array(
+		if (($pw = $this->db->select($this->table, 'account_pwd', array(
 			'account_id'     => $account_id,
 			'account_type'   => 'u',
-		),__LINE__,__FILE__)->fetchColumn()) === false)
+		), __LINE__, __FILE__)->fetchColumn()) === false)
 		{
-			return false;	// account not found
+			return false; // account not found
 		}
 		// Check the old_passwd to make sure this is legal
-		if(!$admin && !Api\Auth::compare_password($old_passwd,$pw,$this->type,strtolower($username)))
+		if (!$admin && !Api\Auth::compare_password($old_passwd, $pw, $this->type, strtolower($username)))
 		{
 			return false;
 		}
@@ -247,21 +247,21 @@ 
 	 * @param boolean $update_lastpw_change =true
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	private function _update_passwd($encrypted_passwd, $account_id, $admin=false, $update_lastpw_change=true)
+	private function _update_passwd($encrypted_passwd, $account_id, $admin = false, $update_lastpw_change = true)
 	{
 		$update = array('account_pwd' => $encrypted_passwd);
 		if ($update_lastpw_change) $update['account_lastpwd_change'] = time();
 
-		if (!$this->db->update($this->table,$update,array(
+		if (!$this->db->update($this->table, $update, array(
 			'account_id' => $account_id,
-		),__LINE__,__FILE__))
+		), __LINE__, __FILE__))
 		{
 			return false;
 		}
 
-		if(!$admin)
+		if (!$admin)
 		{
-			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',$update['account_lastpwd_change']);
+			Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $update['account_lastpwd_change']);
 		}
 		return true;
 	}

Braces +24 added lines, -6 removed lines

@@ -60,9 +60,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if($passwd_type == 'text')
@@ -95,7 +98,10 @@ 
 						$this->_update_passwd($encrypted_passwd, $row['account_id'], false, true);
 					}
 				}
-				if (!$match) return false;
+				if (!$match)
+				{
+					return false;
+				}
 			}
 		}
 		/* Auth via crypted password. NOTE: mail needs cleartext password to authenticate against mailserver! */
@@ -128,9 +134,12 @@ 
 			'account_type'   => 'u',
 			'account_status' => 'A'
 		);
-		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])	// = is case sensitiv eg. on postgres, but not on mysql!
+		if (!$GLOBALS['egw_info']['server']['case_sensitive_username'])
+		{
+			// = is case sensitiv eg. on postgres, but not on mysql!
 		{
 			$where[] = 'account_lid '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($username);
+		}
 			unset($where['account_lid']);
 		}
 		if (!($row = $this->db->select($this->table,'account_lid,account_lastpwd_change',$where,__LINE__,__FILE__)->fetch()) ||
@@ -187,8 +196,14 @@ 
 			'account_id' => $account_id,
 		),__LINE__,__FILE__);
 
-		if(!$this->db->affected_rows()) return false;
-		if (!$admin) Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
+		if(!$this->db->affected_rows())
+		{
+			return false;
+		}
+		if (!$admin)
+		{
+			Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', $lastpwdchange);
+		}
 		return true;
 	}
 
@@ -250,7 +265,10 @@ 
 	private function _update_passwd($encrypted_passwd, $account_id, $admin=false, $update_lastpw_change=true)
 	{
 		$update = array('account_pwd' => $encrypted_passwd);
-		if ($update_lastpw_change) $update['account_lastpwd_change'] = time();
+		if ($update_lastpw_change)
+		{
+			$update['account_lastpwd_change'] = time();
+		}
 
 		if (!$this->db->update($this->table,$update,array(
 			'account_id' => $account_id,

admin/apcu.php

Indentation +77 added lines, -77 removed lines

@@ -217,25 +217,25 @@ 
 header("Pragma: no-cache");                                    // HTTP/1.0
 
 function duration($ts) {
-    global $time;
-    $years = (int)((($time - $ts)/(7*86400))/52.177457);
-    $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
-    $weeks = (int)(($rem)/(7*86400));
-    $days = (int)(($rem)/86400) - $weeks*7;
-    $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
-    $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
-    $str = '';
-    if($years==1) $str .= "$years year, ";
-    if($years>1) $str .= "$years years, ";
-    if($weeks==1) $str .= "$weeks week, ";
-    if($weeks>1) $str .= "$weeks weeks, ";
-    if($days==1) $str .= "$days day,";
-    if($days>1) $str .= "$days days,";
-    if($hours == 1) $str .= " $hours hour and";
-    if($hours>1) $str .= " $hours hours and";
-    if($mins == 1) $str .= " 1 minute";
-    else $str .= " $mins minutes";
-    return $str;
+	global $time;
+	$years = (int)((($time - $ts)/(7*86400))/52.177457);
+	$rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
+	$weeks = (int)(($rem)/(7*86400));
+	$days = (int)(($rem)/86400) - $weeks*7;
+	$hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
+	$mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
+	$str = '';
+	if($years==1) $str .= "$years year, ";
+	if($years>1) $str .= "$years years, ";
+	if($weeks==1) $str .= "$weeks week, ";
+	if($weeks>1) $str .= "$weeks weeks, ";
+	if($days==1) $str .= "$days day,";
+	if($days>1) $str .= "$days days,";
+	if($hours == 1) $str .= " $hours hour and";
+	if($hours>1) $str .= " $hours hours and";
+	if($mins == 1) $str .= " 1 minute";
+	else $str .= " $mins minutes";
+	return $str;
 }
 
 // create graphics
@@ -420,18 +420,18 @@ 
 				if($block['offset']!=$ptr) {       // Used block
 					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
 					if ($h>0) {
-                                                $j++;
+												$j++;
 						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
-                                        }
+												else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+										}
 					$y+=$h;
 				}
 				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
 				if ($h>0) {
-                                        $j++;
+										$j++;
 					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
 					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
-                                }
+								}
 				$y+=$h;
 				$ptr = $block['offset']+$block['size'];
 			}
@@ -781,7 +781,7 @@ 
 	$apcversion = phpversion('apcu');
 	$phpversion = phpversion();
 	$number_vars = $cache['num_entries'];
-    $size_vars = bsize($cache['mem_size']);
+	$size_vars = bsize($cache['mem_size']);
 	$i=0;
 	echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
@@ -883,9 +883,9 @@ 
 				++$nseg;
 			}
 			$ptr = $block['offset'] + $block['size'];
-                        /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
+						/* Only consider blocks <5M for the fragmentation % */
+						if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+						$freetotal+=$block['size'];
 		}
 		$freeseg += count($mem['block_lists'][$i]);
 	}
@@ -907,15 +907,15 @@ 
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
-            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
-          }
-        }
-        echo <<<EOB
+		if(isset($mem['adist'])) {
+		  foreach($mem['adist'] as $i=>$v) {
+			$cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
+			if($i==0) $range = "1";
+			else $range = "$cur - $nxt";
+			echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
+		  }
+		}
+		echo <<<EOB
 		</tbody></table>
 		</div>
 EOB;
@@ -928,7 +928,7 @@ 
 // -----------------------------------------------
 case OB_USER_CACHE:
 	if (!$AUTHENTICATED) {
-    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
+	echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
 		put_login_link("Login now!");
 		echo '</div>';
 		break;
@@ -973,7 +973,7 @@ 
 		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
 		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
 		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+	'&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
 		'&nbsp;<input type=submit value="GO!">',
 		'</form></div>';
 
@@ -982,8 +982,8 @@ 
    // regular expression subpattern.
    $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
    if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
-     echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
-     break;
+	 echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
+	 break;
    }
   }
 
@@ -1037,45 +1037,45 @@ 
 		// output list
 		$i=0;
 		foreach($list as $k => $entry) {
-      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+	  if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
 		$sh=md5($entry["info"]);
-        $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
-        echo
-          '<tr id="key-'. $sh .'" class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"#key-". $sh ."\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['num_hits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
-
-        if($fieldname=='info') {
-          if($entry['ttl'])
-            echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
-          else
-            echo '<td class="td-n center">None</td>';
-        }
-        if ($entry['deletion_time']) {
-
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
-        } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
-
-          echo '<td class="td-last center">';
-          echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
-          echo '</td>';
-        } else {
-          echo '<td class="td-last center"> &nbsp; </td>';
-        }
-        echo '</tr>';
+		$field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
+		echo
+		  '<tr id="key-'. $sh .'" class=tr-',$i%2,'>',
+		  "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"#key-". $sh ."\">",$field_value,'</a></td>',
+		  '<td class="td-n center">',$entry['num_hits'],'</td>',
+		  '<td class="td-n right">',$entry['mem_size'],'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
+		  '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
+
+		if($fieldname=='info') {
+		  if($entry['ttl'])
+			echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
+		  else
+			echo '<td class="td-n center">None</td>';
+		}
+		if ($entry['deletion_time']) {
+
+		  echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
+		} else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
+
+		  echo '<td class="td-last center">';
+		  echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
+		  echo '</td>';
+		} else {
+		  echo '<td class="td-last center"> &nbsp; </td>';
+		}
+		echo '</tr>';
 		if ($sh == $MYREQUEST["SH"]) {
 			echo '<tr>';
 			echo '<td colspan="7"><pre>'.htmlentities(print_r(apcu_fetch($entry['info']), 1)).'</pre></td>';
 			echo '</tr>';
 		}
-        $i++;
-        if ($i == $MYREQUEST['COUNT'])
-          break;
-      }
+		$i++;
+		if ($i == $MYREQUEST['COUNT'])
+		  break;
+	  }
 		}
 
 	} else {
@@ -1106,10 +1106,10 @@ 
 		</tr>
 EOB;
   if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
+	$ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
   } else {
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
+	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
   }
 	if (!$rss) {
 		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';

Switch Indentation +284 added lines, -284 removed lines

@@ -344,105 +344,105 @@ 
 
 	switch ($MYREQUEST['IMG']) {
 
-	case 1:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=$y=$size/2;
-		$fuzz = 0.000001;
-
-		// This block of code creates the pie chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		$angle_from = 0;
-		$string_placement=array();
-		for($i=0; $i<$mem['num_seg']; $i++) {
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$angle_to = $angle_from+($block['offset']-$ptr)/$s;
+		case 1:
+			$s=$mem['num_seg']*$mem['seg_size'];
+			$a=$mem['avail_mem'];
+			$x=$y=$size/2;
+			$fuzz = 0.000001;
+
+			// This block of code creates the pie chart.  It is a lot more complex than you
+			// would expect because we try to visualize any memory fragmentation as well.
+			$angle_from = 0;
+			$string_placement=array();
+			for($i=0; $i<$mem['num_seg']; $i++) {
+				$ptr = 0;
+				$free = $mem['block_lists'][$i];
+				uasort($free, 'block_sort');
+				foreach($free as $block) {
+					if($block['offset']!=$ptr) {       // Used block
+						$angle_to = $angle_from+($block['offset']-$ptr)/$s;
+						if(($angle_to+$fuzz)>1) $angle_to = 1;
+						if( ($angle_to*360) - ($angle_from*360) >= 1) {
+							fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+							if (($angle_to-$angle_from)>0.05) {
+								array_push($string_placement, array($angle_from,$angle_to));
+							}
+						}
+						$angle_from = $angle_to;
+					}
+					$angle_to = $angle_from+($block['size'])/$s;
 					if(($angle_to+$fuzz)>1) $angle_to = 1;
 					if( ($angle_to*360) - ($angle_from*360) >= 1) {
-						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
+						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
 						if (($angle_to-$angle_from)>0.05) {
 							array_push($string_placement, array($angle_from,$angle_to));
 						}
 					}
 					$angle_from = $angle_to;
+					$ptr = $block['offset']+$block['size'];
 				}
-				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				if( ($angle_to*360) - ($angle_from*360) >= 1) {
-					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
+				if ($ptr < $mem['seg_size']) { // memory at the end
+					$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
+					if(($angle_to+$fuzz)>1) $angle_to = 1;
+					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
 					if (($angle_to-$angle_from)>0.05) {
 						array_push($string_placement, array($angle_from,$angle_to));
 					}
 				}
-				$angle_from = $angle_to;
-				$ptr = $block['offset']+$block['size'];
 			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
-				$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-				if (($angle_to-$angle_from)>0.05) {
-					array_push($string_placement, array($angle_from,$angle_to));
-				}
+			foreach ($string_placement as $angle) {
+				text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
 			}
-		}
-		foreach ($string_placement as $angle) {
-			text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
-		}
-		break;
-
-	case 2:
-		$s=$cache['num_hits']+$cache['num_misses'];
-		$a=$cache['num_hits'];
+			break;
 
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['num_hits']*100/$s : 0));
-		fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%",$s ? $cache['num_misses']*100/$s : 0));
-		break;
-
-	case 3:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=130;
-		$y=1;
-		$j=1;
+		case 2:
+			$s=$cache['num_hits']+$cache['num_misses'];
+			$a=$cache['num_hits'];
 
-		// This block of code creates the bar chart.  It is a lot more complex than you
-		// would expect because we try to visualize any memory fragmentation as well.
-		for($i=0; $i<$mem['num_seg']; $i++) {
-			$ptr = 0;
-			$free = $mem['block_lists'][$i];
-			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
+			fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['num_hits']*100/$s : 0));
+			fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%",$s ? $cache['num_misses']*100/$s : 0));
+			break;
+
+		case 3:
+			$s=$mem['num_seg']*$mem['seg_size'];
+			$a=$mem['avail_mem'];
+			$x=130;
+			$y=1;
+			$j=1;
+
+			// This block of code creates the bar chart.  It is a lot more complex than you
+			// would expect because we try to visualize any memory fragmentation as well.
+			for($i=0; $i<$mem['num_seg']; $i++) {
+				$ptr = 0;
+				$free = $mem['block_lists'][$i];
+				uasort($free, 'block_sort');
+				foreach($free as $block) {
+					if($block['offset']!=$ptr) {       // Used block
+						$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
+						if ($h>0) {
+                                                	$j++;
+							if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
+                                                	else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+                                        	}
+						$y+=$h;
+					}
+					$h=(GRAPH_SIZE-5)*($block['size'])/$s;
 					if ($h>0) {
-                                                $j++;
-						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
-                                        }
+                                        	$j++;
+						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
+						else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+                                	}
 					$y+=$h;
+					$ptr = $block['offset']+$block['size'];
 				}
-				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
-				if ($h>0) {
-                                        $j++;
-					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
-					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
-                                }
-				$y+=$h;
-				$ptr = $block['offset']+$block['size'];
-			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
-				$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
-				if ($h > 0) {
-					fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+				if ($ptr < $mem['seg_size']) { // memory at the end
+					$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
+					if ($h > 0) {
+						fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+					}
 				}
 			}
-		}
-		break;
+			break;
 
 		case 4:
 			$s=$cache['num_hits']+$cache['num_misses'];
@@ -769,40 +769,40 @@ 
 // -----------------------------------------------
 // Host Stats
 // -----------------------------------------------
-case OB_HOST_STATS:
-	$mem_size = $mem['num_seg']*$mem['seg_size'];
-	$mem_avail= $mem['avail_mem'];
-	$mem_used = $mem_size-$mem_avail;
-	$seg_size = bsize($mem['seg_size']);
-	$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'])/($time-$cache['start_time'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/($time-$cache['start_time'])) : 0);
-	$apcversion = phpversion('apcu');
-	$phpversion = phpversion();
-	$number_vars = $cache['num_entries'];
-    $size_vars = bsize($cache['mem_size']);
-	$i=0;
-	echo <<< EOB
+	case OB_HOST_STATS:
+		$mem_size = $mem['num_seg']*$mem['seg_size'];
+		$mem_avail= $mem['avail_mem'];
+		$mem_used = $mem_size-$mem_avail;
+		$seg_size = bsize($mem['seg_size']);
+		$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])) : 0);
+		$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'])/($time-$cache['start_time'])) : 0);
+		$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses'])/($time-$cache['start_time'])) : 0);
+		$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/($time-$cache['start_time'])) : 0);
+		$apcversion = phpversion('apcu');
+		$phpversion = phpversion();
+		$number_vars = $cache['num_entries'];
+    	$size_vars = bsize($cache['mem_size']);
+		$i=0;
+		echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
 		<table cellspacing=0><tbody>
 		<tr class=tr-0><td class=td-0>APCu Version</td><td>$apcversion</td></tr>
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
-EOB;
+	EOB;
 
-	if(!empty($_SERVER['SERVER_NAME']))
-		echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
-	if(!empty($_SERVER['SERVER_SOFTWARE']))
-		echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
+		if(!empty($_SERVER['SERVER_NAME']))
+			echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
+		if(!empty($_SERVER['SERVER_SOFTWARE']))
+			echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
 
-	echo <<<EOB
-		<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
+		echo <<<EOB
+			<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
     <br/> ({$cache['memory_type']} memory)
     </td></tr>
 EOB;
-	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
-	echo <<<EOB
+		echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
+		echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
+		echo <<<EOB
 		</tbody></table>
 		</div>
 
@@ -824,46 +824,46 @@ 
 		<div class="info div2"><h2>Runtime Settings</h2><table cellspacing=0><tbody>
 EOB;
 
-	$j = 0;
-	foreach (ini_get_all('apcu') as $k => $v) {
-		echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
-		$j = 1 - $j;
-	}
+		$j = 0;
+		foreach (ini_get_all('apcu') as $k => $v) {
+			echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
+			$j = 1 - $j;
+		}
 
-	if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
-		$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
-	else
-		$mem_note = "Memory Usage";
+		if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
+			$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
+		else
+			$mem_note = "Memory Usage";
 
-	echo <<< EOB
+		echo <<< EOB
 		</tbody></table>
 		</div>
 
 		<div class="graph div3"><h2>Host Status Diagrams</h2>
 		<table cellspacing=0><tbody>
 EOB;
-	$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
-echo <<<EOB
+		$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
+	echo <<<EOB
 		<tr>
 		<td class=td-0>$mem_note</td>
 		<td class=td-1>Hits &amp; Misses</td>
 		</tr>
 EOB;
 
-	echo
-		graphics_avail() ?
-			  '<tr>'.
-			  "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
-			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
-			: "",
-		'<tr>',
-		'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].@sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
-		'</tr>',
-		'<tr>',
-		'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].@sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
-	echo <<< EOB
+		echo
+			graphics_avail() ?
+			  	'<tr>'.
+			  	"<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF?IMG=1&$time\"></td>".
+			  	"<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
+				: "",
+			'<tr>',
+			'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
+			'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].@sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
+			'</tr>',
+			'<tr>',
+			'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
+			'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].@sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
+		echo <<< EOB
 		</tr>
 		</tbody></table>
 
@@ -874,141 +874,141 @@ 
 		<td class=td-0 colspan=2><br/>
 EOB;
 
-	// Fragementation: (freeseg - 1) / total_seg
-	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for($i=0; $i<$mem['num_seg']; $i++) {
-		$ptr = 0;
-		foreach($mem['block_lists'][$i] as $block) {
-			if ($block['offset'] != $ptr) {
-				++$nseg;
+		// Fragementation: (freeseg - 1) / total_seg
+		$nseg = $freeseg = $fragsize = $freetotal = 0;
+		for($i=0; $i<$mem['num_seg']; $i++) {
+			$ptr = 0;
+			foreach($mem['block_lists'][$i] as $block) {
+				if ($block['offset'] != $ptr) {
+					++$nseg;
+				}
+				$ptr = $block['offset'] + $block['size'];
+                        	/* Only consider blocks <5M for the fragmentation % */
+                        	if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+                        	$freetotal+=$block['size'];
 			}
-			$ptr = $block['offset'] + $block['size'];
-                        /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
+			$freeseg += count($mem['block_lists'][$i]);
 		}
-		$freeseg += count($mem['block_lists'][$i]);
-	}
 
-	if ($freeseg > 1) {
-		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
-	} else {
-		$frag = "0%";
-	}
+		if ($freeseg > 1) {
+			$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
+		} else {
+			$frag = "0%";
+		}
 
-	if (graphics_avail()) {
-		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+		if (graphics_avail()) {
+			$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+			echo <<<EOB
+				<img alt="" $size src="$PHP_SELF?IMG=3&$time">
+	EOB;
+		}
 		echo <<<EOB
-			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
-EOB;
-	}
-	echo <<<EOB
-		</br>Fragmentation: $frag
+			</br>Fragmentation: $frag
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
-            echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
-          }
-        }
-        echo <<<EOB
+        	if(isset($mem['adist'])) {
+          	foreach($mem['adist'] as $i=>$v) {
+            	$cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
+            	if($i==0) $range = "1";
+            	else $range = "$cur - $nxt";
+            	echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
+          	}
+        	}
+        	echo <<<EOB
 		</tbody></table>
 		</div>
 EOB;
 
-	break;
+		break;
 
 
-// -----------------------------------------------
-// User Cache Entries
-// -----------------------------------------------
-case OB_USER_CACHE:
-	if (!$AUTHENTICATED) {
-    echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
-		put_login_link("Login now!");
-		echo '</div>';
-		break;
-	}
-	$fieldname='info';
-	$fieldheading='User Entry Label';
-	$fieldkey='info';
+	// -----------------------------------------------
+	// User Cache Entries
+	// -----------------------------------------------
+	case OB_USER_CACHE:
+		if (!$AUTHENTICATED) {
+    	echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
+			put_login_link("Login now!");
+			echo '</div>';
+			break;
+		}
+		$fieldname='info';
+		$fieldheading='User Entry Label';
+		$fieldkey='info';
 
-	$cols=6;
-	echo <<<EOB
+		$cols=6;
+		echo <<<EOB
 		<div class=sorting><form>Scope:
 		<input type=hidden name=OB value={$MYREQUEST['OB']}>
 		<select name=SCOPE>
 EOB;
-	echo
-		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
-		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
-		"</select>",
-		", Sorting:<select name=SORT1>",
-		"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
-		"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
-		"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
-		"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
-		"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
-		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
-		"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
-	if($fieldname=='info') echo
-		"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
-	echo
-		'</select>',
-		'<select name=SORT2>',
-		'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
-		'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
-		'</select>',
-		'<select name=COUNT onChange="form.submit()">',
-		'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
-		'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
-		'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
-		'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
-		'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
-		'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
-		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
-		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
-		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
-		'&nbsp;<input type=submit value="GO!">',
-		'</form></div>';
-
-  if (isset($MYREQUEST['SEARCH'])) {
-   // Don't use preg_quote because we want the user to be able to specify a
-   // regular expression subpattern.
-   $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
-   if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
-     echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
-     break;
-   }
-  }
-
-  echo
-		'<div class="info"><table cellspacing=0><tbody>',
-		'<tr>',
-		'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
-
-	if($fieldname=='info') {
-		$cols+=2;
-		 echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
-	}
-	echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
+		echo
+			"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
+			"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
+			"</select>",
+			", Sorting:<select name=SORT1>",
+			"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
+			"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
+			"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
+			"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
+			"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
+			"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
+			"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
+		if($fieldname=='info') echo
+			"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
+		echo
+			'</select>',
+			'<select name=SORT2>',
+			'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
+			'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
+			'</select>',
+			'<select name=COUNT onChange="form.submit()">',
+			'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
+			'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
+			'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
+			'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
+			'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
+			'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
+			'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
+			'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
+			'</select>',
+    	'&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+			'&nbsp;<input type=submit value="GO!">',
+			'</form></div>';
+
+  	if (isset($MYREQUEST['SEARCH'])) {
+   	// Don't use preg_quote because we want the user to be able to specify a
+   	// regular expression subpattern.
+   	$MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
+   	if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
+     	echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
+     	break;
+   	}
+  	}
+
+  	echo
+			'<div class="info"><table cellspacing=0><tbody>',
+			'<tr>',
+			'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
+			'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
+
+		if($fieldname=='info') {
+			$cols+=2;
+		 	echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
+		}
+		echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
 
-	// builds list with alpha numeric sortable keys
-	//
-	$list = array();
+		// builds list with alpha numeric sortable keys
+		//
+		$list = array();
 
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
+		foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+			switch($MYREQUEST['SORT1']) {
 			case 'A': $k=sprintf('%015d-',$entry['access_time']);  	     break;
 			case 'H': $k=sprintf('%015d-',$entry['num_hits']); 	     break;
 			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 	     break;
@@ -1017,7 +1017,7 @@ 
 			case 'T': $k=sprintf('%015d-',$entry['ttl']);		     break;
 			case 'D': $k=sprintf('%015d-',$entry['deletion_time']);      break;
 			case 'S': $k=$entry["info"];				     break;
-		}
+			}
 		if (!$AUTHENTICATED) {
 			// hide all path entries if not logged in
 			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
@@ -1097,61 +1097,61 @@ 
 // -----------------------------------------------
 // Version check
 // -----------------------------------------------
-case OB_VERSION_CHECK:
-	echo <<<EOB
+	case OB_VERSION_CHECK:
+		echo <<<EOB
 		<div class="info"><h2>APCu Version Information</h2>
 		<table cellspacing=0><tbody>
 		<tr>
 		<th></th>
 		</tr>
 EOB;
-  if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
-  } else {
-    $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
-  }
-	if (!$rss) {
-		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
-	} else {
-		$apcversion = phpversion('apcu');
-
-		preg_match('!<title>APCu ([0-9.]+)</title>!', $rss, $match);
-		echo '<tr class="tr-0 center"><td>';
-		if (version_compare($apcversion, $match[1], '>=')) {
-			echo '<div class="ok">You are running the latest version of APCu ('.$apcversion.')</div>';
-			$i = 3;
+  	if (defined('PROXY')) {
+    	$ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+    	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
+  	} else {
+    	$rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
+  	}
+		if (!$rss) {
+			echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
 		} else {
-			echo '<div class="failed">You are running an older version of APCu ('.$apcversion.'),
+			$apcversion = phpversion('apcu');
+
+			preg_match('!<title>APCu ([0-9.]+)</title>!', $rss, $match);
+			echo '<tr class="tr-0 center"><td>';
+			if (version_compare($apcversion, $match[1], '>=')) {
+				echo '<div class="ok">You are running the latest version of APCu ('.$apcversion.')</div>';
+				$i = 3;
+			} else {
+				echo '<div class="failed">You are running an older version of APCu ('.$apcversion.'),
 				newer version '.$match[1].' is available at <a href="http://pecl.php.net/package/APCu/'.$match[1].'">
 				http://pecl.php.net/package/APCu/'.$match[1].'</a>
 				</div>';
-			$i = -1;
-		}
-		echo '</td></tr>';
-		echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
-
-		preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
-		next($match[2]); next($match[2]);
-
-		while (list(,$v) = each($match[2])) {
-			list(,$ver) = explode(' ', $v, 2);
-			if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
-				break;
-			} else if (!$i--) {
-				break;
+				$i = -1;
+			}
+			echo '</td></tr>';
+			echo '<tr class="tr-0"><td><h3>Change Log:</h3><br/>';
+
+			preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
+			next($match[2]); next($match[2]);
+
+			while (list(,$v) = each($match[2])) {
+				list(,$ver) = explode(' ', $v, 2);
+				if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
+					break;
+				} else if (!$i--) {
+					break;
+				}
+				echo "<b><a href=\"http://pecl.php.net/package/APCu/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
+				echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
+				next($match[2]);
 			}
-			echo "<b><a href=\"http://pecl.php.net/package/APCu/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";
-			echo nl2br(htmlspecialchars(current($match[2]), ENT_QUOTES, 'UTF-8'))."</blockquote>";
-			next($match[2]);
+			echo '</td></tr>';
 		}
-		echo '</td></tr>';
-	}
-	echo <<< EOB
+		echo <<< EOB
 		</tbody></table>
 		</div>
 EOB;
-	break;
+		break;
 
 }
 

Spacing +282 added lines, -282 removed lines

@@ -15,7 +15,7 @@ 
 );
 include('../header.inc.php');
 
-if ($GLOBALS['egw']->acl->check('info_access',1,'admin'))
+if ($GLOBALS['egw']->acl->check('info_access', 1, 'admin'))
 {
 	$GLOBALS['egw']->redirect_link('/index.php');
 }
@@ -43,7 +43,7 @@ 
 
  */
 
-$VERSION='$Id$';
+$VERSION = '$Id$';
 
 ////////// READ OPTIONAL CONFIGURATION FILE ////////////
 if (file_exists("apc.conf.php")) include("apc.conf.php");
@@ -51,7 +51,7 @@ 
 
 ////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
 
-defaults('USE_AUTHENTICATION',1);			// Use (internal) authentication - best choice if
+defaults('USE_AUTHENTICATION', 1); // Use (internal) authentication - best choice if
 											// no other authentication is available
 											// If set to 0:
 											//  There will be no further authentication. You
@@ -59,16 +59,16 @@ 
 											// If set to 1:
 											//  You need to change ADMIN_PASSWORD to make
 											//  this work!
-defaults('ADMIN_USERNAME','apc'); 			// Admin Username
-defaults('ADMIN_PASSWORD','password');  	// Admin Password - CHANGE THIS TO ENABLE!!!
+defaults('ADMIN_USERNAME', 'apc'); // Admin Username
+defaults('ADMIN_PASSWORD', 'password'); // Admin Password - CHANGE THIS TO ENABLE!!!
 
 // (beckerr) I'm using a clear text password here, because I've no good idea how to let
 //           users generate a md5 or crypt password in a easy way to fill it in above
 
 //defaults('DATE_FORMAT', "d.m.Y H:i:s");	// German
-defaults('DATE_FORMAT', 'Y/m/d H:i:s'); 	// US
+defaults('DATE_FORMAT', 'Y/m/d H:i:s'); // US
 
-defaults('GRAPH_SIZE',200);					// Image size
+defaults('GRAPH_SIZE', 200); // Image size
 
 //defaults('PROXY', 'tcp://127.0.0.1:8080');
 
@@ -76,45 +76,45 @@ 
 
 
 // "define if not defined"
-function defaults($d,$v) {
-	if (!defined($d)) define($d,$v); // or just @define(...)
+function defaults($d, $v) {
+	if (!defined($d)) define($d, $v); // or just @define(...)
 }
 
 // rewrite $PHP_SELF to block XSS attacks
 //
-$PHP_SELF= isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES, 'UTF-8') : '';
+$PHP_SELF = isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'], ''), ENT_QUOTES, 'UTF-8') : '';
 $time = time();
 $host = php_uname('n');
-if($host) { $host = '('.$host.')'; }
+if ($host) { $host = '('.$host.')'; }
 if (isset($_SERVER['SERVER_ADDR'])) {
   $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
 }
 
 // operation constants
-define('OB_HOST_STATS',1);
-define('OB_USER_CACHE',2);
-define('OB_VERSION_CHECK',3);
+define('OB_HOST_STATS', 1);
+define('OB_USER_CACHE', 2);
+define('OB_VERSION_CHECK', 3);
 
 // check validity of input variables
-$vardom=array(
-	'OB'	=> '/^\d+$/',			// operational mode switch
-	'CC'	=> '/^[01]$/',			// clear cache requested
-	'DU'	=> '/^.*$/',			// Delete User Key
-	'SH'	=> '/^[a-z0-9]+$/',		// shared object description
-
-	'IMG'	=> '/^[123]$/',			// image to generate
-	'LO'	=> '/^1$/',				// login requested
-
-	'COUNT'	=> '/^\d+$/',			// number of line displayed in list
-	'SCOPE'	=> '/^[AD]$/',			// list view scope
-	'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
-	'SORT2'	=> '/^[DA]$/',			// second sort key
-	'AGGR'	=> '/^\d+$/',			// aggregation by dir level
+$vardom = array(
+	'OB'	=> '/^\d+$/', // operational mode switch
+	'CC'	=> '/^[01]$/', // clear cache requested
+	'DU'	=> '/^.*$/', // Delete User Key
+	'SH'	=> '/^[a-z0-9]+$/', // shared object description
+
+	'IMG'	=> '/^[123]$/', // image to generate
+	'LO'	=> '/^1$/', // login requested
+
+	'COUNT'	=> '/^\d+$/', // number of line displayed in list
+	'SCOPE'	=> '/^[AD]$/', // list view scope
+	'SORT1'	=> '/^[AHSMCDTZ]$/', // first sort key
+	'SORT2'	=> '/^[DA]$/', // second sort key
+	'AGGR'	=> '/^\d+$/', // aggregation by dir level
 	'SEARCH'	=> '~^[a-zA-Z0-9/_.-]*$~'			// aggregation by dir level
 );
 
 // cache scope
-$scope_list=array(
+$scope_list = array(
 	'A' => 'cache_list',
 	'D' => 'deleted_list'
 );
@@ -133,31 +133,31 @@ 
 }
 
 // check parameter syntax
-foreach($vardom as $var => $dom) {
+foreach ($vardom as $var => $dom) {
 	if (!isset($_REQUEST[$var])) {
-		$MYREQUEST[$var]=NULL;
-	} else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D',$_REQUEST[$var])) {
-		$MYREQUEST[$var]=$_REQUEST[$var];
+		$MYREQUEST[$var] = NULL;
+	} else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D', $_REQUEST[$var])) {
+		$MYREQUEST[$var] = $_REQUEST[$var];
 	} else {
-		$MYREQUEST[$var]=$_REQUEST[$var]=NULL;
+		$MYREQUEST[$var] = $_REQUEST[$var] = NULL;
 	}
 }
 
 // check parameter sematics
-if (empty($MYREQUEST['SCOPE'])) $MYREQUEST['SCOPE']="A";
-if (empty($MYREQUEST['SORT1'])) $MYREQUEST['SORT1']="H";
-if (empty($MYREQUEST['SORT2'])) $MYREQUEST['SORT2']="D";
-if (empty($MYREQUEST['OB']))	$MYREQUEST['OB']=OB_HOST_STATS;
-if (!isset($MYREQUEST['COUNT'])) $MYREQUEST['COUNT']=20;
-if (!isset($scope_list[$MYREQUEST['SCOPE']])) $MYREQUEST['SCOPE']='A';
-
-$MY_SELF=
+if (empty($MYREQUEST['SCOPE'])) $MYREQUEST['SCOPE'] = "A";
+if (empty($MYREQUEST['SORT1'])) $MYREQUEST['SORT1'] = "H";
+if (empty($MYREQUEST['SORT2'])) $MYREQUEST['SORT2'] = "D";
+if (empty($MYREQUEST['OB']))	$MYREQUEST['OB'] = OB_HOST_STATS;
+if (!isset($MYREQUEST['COUNT'])) $MYREQUEST['COUNT'] = 20;
+if (!isset($scope_list[$MYREQUEST['SCOPE']])) $MYREQUEST['SCOPE'] = 'A';
+
+$MY_SELF =
 	"$PHP_SELF".
 	"?SCOPE=".$MYREQUEST['SCOPE'].
 	"&SORT1=".$MYREQUEST['SORT1'].
 	"&SORT2=".$MYREQUEST['SORT2'].
 	"&COUNT=".$MYREQUEST['COUNT'];
-$MY_SELF_WO_SORT=
+$MY_SELF_WO_SORT =
 	"$PHP_SELF".
 	"?SCOPE=".$MYREQUEST['SCOPE'].
 	"&COUNT=".$MYREQUEST['COUNT'];
@@ -165,10 +165,10 @@ 
 // authentication needed?
 //
 if (!USE_AUTHENTICATION) {
-	$AUTHENTICATED=1;
+	$AUTHENTICATED = 1;
 } else {
-	$AUTHENTICATED=0;
-	if (ADMIN_PASSWORD!='password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER']))) {
+	$AUTHENTICATED = 0;
+	if (ADMIN_PASSWORD != 'password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER']))) {
 
 		if (!isset($_SERVER['PHP_AUTH_USER']) ||
 			!isset($_SERVER['PHP_AUTH_PW']) ||
@@ -187,7 +187,7 @@ 
 			exit;
 
 		} else {
-			$AUTHENTICATED=1;
+			$AUTHENTICATED = 1;
 		}
 	}
 }
@@ -201,39 +201,39 @@ 
 	apcu_delete($MYREQUEST['DU']);
 }
 
-if(!function_exists('apcu_cache_info')) {
+if (!function_exists('apcu_cache_info')) {
 	echo "No cache info available.  APC does not appear to be running.";
   exit;
 }
 
 $cache = apcu_cache_info();
 
-$mem=apcu_sma_info();
+$mem = apcu_sma_info();
 
 // don't cache this page
 //
-header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
+header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
 header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");                                    // HTTP/1.0
+header("Pragma: no-cache"); // HTTP/1.0
 
 function duration($ts) {
     global $time;
-    $years = (int)((($time - $ts)/(7*86400))/52.177457);
-    $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
-    $weeks = (int)(($rem)/(7*86400));
-    $days = (int)(($rem)/86400) - $weeks*7;
-    $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
-    $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
+    $years = (int)((($time - $ts) / (7 * 86400)) / 52.177457);
+    $rem = (int)(($time - $ts) - ($years * 52.177457 * 7 * 86400));
+    $weeks = (int)(($rem) / (7 * 86400));
+    $days = (int)(($rem) / 86400) - $weeks * 7;
+    $hours = (int)(($rem) / 3600) - $days * 24 - $weeks * 7 * 24;
+    $mins = (int)(($rem) / 60) - $hours * 60 - $days * 24 * 60 - $weeks * 7 * 24 * 60;
     $str = '';
-    if($years==1) $str .= "$years year, ";
-    if($years>1) $str .= "$years years, ";
-    if($weeks==1) $str .= "$weeks week, ";
-    if($weeks>1) $str .= "$weeks weeks, ";
-    if($days==1) $str .= "$days day,";
-    if($days>1) $str .= "$days days,";
-    if($hours == 1) $str .= " $hours hour and";
-    if($hours>1) $str .= " $hours hours and";
-    if($mins == 1) $str .= " 1 minute";
+    if ($years == 1) $str .= "$years year, ";
+    if ($years > 1) $str .= "$years years, ";
+    if ($weeks == 1) $str .= "$weeks week, ";
+    if ($weeks > 1) $str .= "$weeks weeks, ";
+    if ($days == 1) $str .= "$days day,";
+    if ($days > 1) $str .= "$days days,";
+    if ($hours == 1) $str .= " $hours hour and";
+    if ($hours > 1) $str .= " $hours hours and";
+    if ($mins == 1) $str .= " 1 minute";
     else $str .= " $mins minutes";
     return $str;
 }
@@ -249,207 +249,207 @@ 
 		exit(0);
 	}
 
-	function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$color2,$text='',$placeindex=0) {
-		$r=$diameter/2;
-		$w=deg2rad((360+$start+($end-$start)/2)%360);
+	function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $color2, $text = '', $placeindex = 0) {
+		$r = $diameter / 2;
+		$w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
 
 
 		if (function_exists("imagefilledarc")) {
 			// exists only if GD 2.0.1 is avaliable
-			imagefilledarc($im, $centerX+1, $centerY+1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
+			imagefilledarc($im, $centerX + 1, $centerY + 1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
 			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
 			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL|IMG_ARC_EDGED);
 		} else {
 			imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
 			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start+1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end-1))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
-			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
-			imagefill($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2, $color2);
+			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start + 1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
+			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end - 1)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
+			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end)) * $r, $centerY + sin(deg2rad($end)) * $r, $color2);
+			imagefill($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $color2);
 		}
 		if ($text) {
-			if ($placeindex>0) {
-				imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
-				imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
+			if ($placeindex > 0) {
+				imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
+				imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
 
 			} else {
-				imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
+				imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
 			}
 		}
 	}
 
-	function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$text,$placeindex=0) {
-		$r=$diameter/2;
-		$w=deg2rad((360+$start+($end-$start)/2)%360);
+	function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1, $text, $placeindex = 0) {
+		$r = $diameter / 2;
+		$w = deg2rad((360 + $start + ($end - $start) / 2) % 360);
 
-		if ($placeindex>0) {
-			imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
-			imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
+		if ($placeindex > 0) {
+			imageline($im, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $diameter, $placeindex * 12, $color1);
+			imagestring($im, 4, $diameter, $placeindex * 12, $text, $color1);
 
 		} else {
-			imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
+			imagestring($im, 4, $centerX + $r * cos($w) / 2, $centerY + $r * sin($w) / 2, $text, $color1);
 		}
 	}
 
-	function fill_box($im, $x, $y, $w, $h, $color1, $color2,$text='',$placeindex='') {
+	function fill_box($im, $x, $y, $w, $h, $color1, $color2, $text = '', $placeindex = '') {
 		global $col_black;
-		$x1=$x+$w-1;
-		$y1=$y+$h-1;
+		$x1 = $x + $w - 1;
+		$y1 = $y + $h - 1;
 
-		imagerectangle($im, $x, $y1, $x1+1, $y+1, $col_black);
-		if($y1>$y) imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
+		imagerectangle($im, $x, $y1, $x1 + 1, $y + 1, $col_black);
+		if ($y1 > $y) imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
 		else imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
 		imagerectangle($im, $x, $y1, $x1, $y, $color1);
 		if ($text) {
-			if ($placeindex>0) {
+			if ($placeindex > 0) {
 
-				if ($placeindex<16)
+				if ($placeindex < 16)
 				{
-					$px=5;
-					$py=$placeindex*12+6;
-					imagefilledrectangle($im, $px+90, $py+3, $px+90-4, $py-3, $color2);
-					imageline($im,$x,$y+$h/2,$px+90,$py,$color2);
-					imagestring($im,2,$px,$py-6,$text,$color1);
+					$px = 5;
+					$py = $placeindex * 12 + 6;
+					imagefilledrectangle($im, $px + 90, $py + 3, $px + 90 - 4, $py - 3, $color2);
+					imageline($im, $x, $y + $h / 2, $px + 90, $py, $color2);
+					imagestring($im, 2, $px, $py - 6, $text, $color1);
 
 				} else {
-					if ($placeindex<31) {
-						$px=$x+40*2;
-						$py=($placeindex-15)*12+6;
+					if ($placeindex < 31) {
+						$px = $x + 40 * 2;
+						$py = ($placeindex - 15) * 12 + 6;
 					} else {
-						$px=$x+40*2+100*intval(($placeindex-15)/15);
-						$py=($placeindex%15)*12+6;
+						$px = $x + 40 * 2 + 100 * intval(($placeindex - 15) / 15);
+						$py = ($placeindex % 15) * 12 + 6;
 					}
-					imagefilledrectangle($im, $px, $py+3, $px-4, $py-3, $color2);
-					imageline($im,$x+$w,$y+$h/2,$px,$py,$color2);
-					imagestring($im,2,$px+2,$py-6,$text,$color1);
+					imagefilledrectangle($im, $px, $py + 3, $px - 4, $py - 3, $color2);
+					imageline($im, $x + $w, $y + $h / 2, $px, $py, $color2);
+					imagestring($im, 2, $px + 2, $py - 6, $text, $color1);
 				}
 			} else {
-				imagestring($im,4,$x+5,$y1-16,$text,$color1);
+				imagestring($im, 4, $x + 5, $y1 - 16, $text, $color1);
 			}
 		}
 	}
 
 
 	$size = GRAPH_SIZE; // image size
-	if ($MYREQUEST['IMG']==3)
-		$image = imagecreate(2*$size+150, $size+10);
+	if ($MYREQUEST['IMG'] == 3)
+		$image = imagecreate(2 * $size + 150, $size + 10);
 	else
-		$image = imagecreate($size+50, $size+10);
+		$image = imagecreate($size + 50, $size + 10);
 
 	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red   = imagecolorallocate($image, 0xD0, 0x60,  0x30);
+	$col_red   = imagecolorallocate($image, 0xD0, 0x60, 0x30);
 	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image,   0,   0,   0);
-	imagecolortransparent($image,$col_white);
+	$col_black = imagecolorallocate($image, 0, 0, 0);
+	imagecolortransparent($image, $col_white);
 
 	switch ($MYREQUEST['IMG']) {
 
 	case 1:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=$y=$size/2;
+		$s = $mem['num_seg'] * $mem['seg_size'];
+		$a = $mem['avail_mem'];
+		$x = $y = $size / 2;
 		$fuzz = 0.000001;
 
 		// This block of code creates the pie chart.  It is a lot more complex than you
 		// would expect because we try to visualize any memory fragmentation as well.
 		$angle_from = 0;
-		$string_placement=array();
-		for($i=0; $i<$mem['num_seg']; $i++) {
+		$string_placement = array();
+		for ($i = 0; $i < $mem['num_seg']; $i++) {
 			$ptr = 0;
 			$free = $mem['block_lists'][$i];
 			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$angle_to = $angle_from+($block['offset']-$ptr)/$s;
-					if(($angle_to+$fuzz)>1) $angle_to = 1;
-					if( ($angle_to*360) - ($angle_from*360) >= 1) {
-						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-						if (($angle_to-$angle_from)>0.05) {
-							array_push($string_placement, array($angle_from,$angle_to));
+			foreach ($free as $block) {
+				if ($block['offset'] != $ptr) {       // Used block
+					$angle_to = $angle_from + ($block['offset'] - $ptr) / $s;
+					if (($angle_to + $fuzz) > 1) $angle_to = 1;
+					if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+						fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+						if (($angle_to - $angle_from) > 0.05) {
+							array_push($string_placement, array($angle_from, $angle_to));
 						}
 					}
 					$angle_from = $angle_to;
 				}
-				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				if( ($angle_to*360) - ($angle_from*360) >= 1) {
-					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
-					if (($angle_to-$angle_from)>0.05) {
-						array_push($string_placement, array($angle_from,$angle_to));
+				$angle_to = $angle_from + ($block['size']) / $s;
+				if (($angle_to + $fuzz) > 1) $angle_to = 1;
+				if (($angle_to * 360) - ($angle_from * 360) >= 1) {
+					fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_green);
+					if (($angle_to - $angle_from) > 0.05) {
+						array_push($string_placement, array($angle_from, $angle_to));
 					}
 				}
 				$angle_from = $angle_to;
-				$ptr = $block['offset']+$block['size'];
+				$ptr = $block['offset'] + $block['size'];
 			}
 			if ($ptr < $mem['seg_size']) { // memory at the end
-				$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-				if (($angle_to-$angle_from)>0.05) {
-					array_push($string_placement, array($angle_from,$angle_to));
+				$angle_to = $angle_from + ($mem['seg_size'] - $ptr) / $s;
+				if (($angle_to + $fuzz) > 1) $angle_to = 1;
+				fill_arc($image, $x, $y, $size, $angle_from * 360, $angle_to * 360, $col_black, $col_red);
+				if (($angle_to - $angle_from) > 0.05) {
+					array_push($string_placement, array($angle_from, $angle_to));
 				}
 			}
 		}
 		foreach ($string_placement as $angle) {
-			text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
+			text_arc($image, $x, $y, $size, $angle[0] * 360, $angle[1] * 360, $col_black, bsize($s * ($angle[1] - $angle[0])));
 		}
 		break;
 
 	case 2:
-		$s=$cache['num_hits']+$cache['num_misses'];
-		$a=$cache['num_hits'];
+		$s = $cache['num_hits'] + $cache['num_misses'];
+		$a = $cache['num_hits'];
 
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['num_hits']*100/$s : 0));
-		fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%",$s ? $cache['num_misses']*100/$s : 0));
+		fill_box($image, 30, $size, 50, $s ? (-$a * ($size - 21) / $s) : 0, $col_black, $col_green, sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0));
+		fill_box($image, 130, $size, 50, $s ? -max(4, ($s - $a) * ($size - 21) / $s) : 0, $col_black, $col_red, sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0));
 		break;
 
 	case 3:
-		$s=$mem['num_seg']*$mem['seg_size'];
-		$a=$mem['avail_mem'];
-		$x=130;
-		$y=1;
-		$j=1;
+		$s = $mem['num_seg'] * $mem['seg_size'];
+		$a = $mem['avail_mem'];
+		$x = 130;
+		$y = 1;
+		$j = 1;
 
 		// This block of code creates the bar chart.  It is a lot more complex than you
 		// would expect because we try to visualize any memory fragmentation as well.
-		for($i=0; $i<$mem['num_seg']; $i++) {
+		for ($i = 0; $i < $mem['num_seg']; $i++) {
 			$ptr = 0;
 			$free = $mem['block_lists'][$i];
 			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
-					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
-					if ($h>0) {
+			foreach ($free as $block) {
+				if ($block['offset'] != $ptr) {       // Used block
+					$h = (GRAPH_SIZE - 5) * ($block['offset'] - $ptr) / $s;
+					if ($h > 0) {
                                                 $j++;
-						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+						if ($j < 75) fill_box($image, $x, $y, 50, $h, $col_black, $col_red, bsize($block['offset'] - $ptr), $j);
+                                                else fill_box($image, $x, $y, 50, $h, $col_black, $col_red);
                                         }
-					$y+=$h;
+					$y += $h;
 				}
-				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
-				if ($h>0) {
+				$h = (GRAPH_SIZE - 5) * ($block['size']) / $s;
+				if ($h > 0) {
                                         $j++;
-					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
-					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+					if ($j < 75) fill_box($image, $x, $y, 50, $h, $col_black, $col_green, bsize($block['size']), $j);
+					else fill_box($image, $x, $y, 50, $h, $col_black, $col_green);
                                 }
-				$y+=$h;
-				$ptr = $block['offset']+$block['size'];
+				$y += $h;
+				$ptr = $block['offset'] + $block['size'];
 			}
 			if ($ptr < $mem['seg_size']) { // memory at the end
-				$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
+				$h = (GRAPH_SIZE - 5) * ($mem['seg_size'] - $ptr) / $s;
 				if ($h > 0) {
-					fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
+					fill_box($image, $x, $y, 50, $h, $col_black, $col_red, bsize($mem['seg_size'] - $ptr), $j++);
 				}
 			}
 		}
 		break;
 
 		case 4:
-			$s=$cache['num_hits']+$cache['num_misses'];
-			$a=$cache['num_hits'];
+			$s = $cache['num_hits'] + $cache['num_misses'];
+			$a = $cache['num_hits'];
 
-			fill_box($image, 30,$size,50,$s ? -$a*($size-21)/$s : 0,$col_black,$col_green,sprintf("%.1f%%", $s ? $cache['num_hits']*100/$s : 0));
-			fill_box($image,130,$size,50,$s ? -max(4,($s-$a)*($size-21)/$s) : 0,$col_black,$col_red,sprintf("%.1f%%", $s ? $cache['num_misses']*100/$s : 0));
+			fill_box($image, 30, $size, 50, $s ? -$a * ($size - 21) / $s : 0, $col_black, $col_green, sprintf("%.1f%%", $s ? $cache['num_hits'] * 100 / $s : 0));
+			fill_box($image, 130, $size, 50, $s ? -max(4, ($s - $a) * ($size - 21) / $s) : 0, $col_black, $col_red, sprintf("%.1f%%", $s ? $cache['num_misses'] * 100 / $s : 0));
 		break;
 	}
 
@@ -461,28 +461,28 @@ 
 // pretty printer for byte values
 //
 function bsize($s) {
-	foreach (array('','K','M','G') as $i => $k) {
+	foreach (array('', 'K', 'M', 'G') as $i => $k) {
 		if ($s < 1024) break;
-		$s/=1024;
+		$s /= 1024;
 	}
-	return sprintf("%5.1f %sBytes",$s,$k);
+	return sprintf("%5.1f %sBytes", $s, $k);
 }
 
 // sortable table header in "scripts for this host" view
-function sortheader($key,$name,$extra='') {
+function sortheader($key, $name, $extra = '') {
 	global $MYREQUEST, $MY_SELF_WO_SORT;
 
-	if ($MYREQUEST['SORT1']==$key) {
-		$MYREQUEST['SORT2'] = $MYREQUEST['SORT2']=='A' ? 'D' : 'A';
+	if ($MYREQUEST['SORT1'] == $key) {
+		$MYREQUEST['SORT2'] = $MYREQUEST['SORT2'] == 'A' ? 'D' : 'A';
 	}
 	return "<a class=sortable href=\"$MY_SELF_WO_SORT$extra&SORT1=$key&SORT2=".$MYREQUEST['SORT2']."\">$name</a>";
 
 }
 
 // create menu entry
-function menu_entry($ob,$title) {
-	global $MYREQUEST,$MY_SELF;
-	if ($MYREQUEST['OB']!=$ob) {
+function menu_entry($ob, $title) {
+	global $MYREQUEST, $MY_SELF;
+	if ($MYREQUEST['OB'] != $ob) {
 		return "<li><a href=\"$MY_SELF&OB=$ob\">$title</a></li>";
 	} else if (empty($MYREQUEST['SH'])) {
 		return "<li><span class=active>$title</span></li>";
@@ -491,14 +491,14 @@ 
 	}
 }
 
-function put_login_link($s="Login")
+function put_login_link($s = "Login")
 {
-	global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
+	global $MY_SELF, $MYREQUEST, $AUTHENTICATED;
 	// needs ADMIN_PASSWORD to be changed!
 	//
 	if (!USE_AUTHENTICATION) {
 		return;
-	} else if (ADMIN_PASSWORD=='password')
+	} else if (ADMIN_PASSWORD == 'password')
 	{
 		print <<<EOB
 			<a href="#" onClick="javascript:alert('You need to set a password at the top of apc.php before this will work!');return false";>$s</a>
@@ -507,7 +507,7 @@ 
 		print <<<EOB
 			'{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
 EOB;
-	} else{
+	} else {
 		print <<<EOB
 			<a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
 EOB;
@@ -744,9 +744,9 @@ 
 	<li><a href="$MY_SELF&OB={$MYREQUEST['OB']}&SH={$MYREQUEST['SH']}">Refresh Data</a></li>
 EOB;
 echo
-	menu_entry(OB_HOST_STATS,'View Host Stats'),
-	menu_entry(OB_USER_CACHE,'User Cache Entries'),
-	menu_entry(OB_VERSION_CHECK,'Version Check');
+	menu_entry(OB_HOST_STATS, 'View Host Stats'),
+	menu_entry(OB_USER_CACHE, 'User Cache Entries'),
+	menu_entry(OB_VERSION_CHECK, 'Version Check');
 
 if ($AUTHENTICATED) {
 	echo <<<EOB
@@ -770,19 +770,19 @@ 
 // Host Stats
 // -----------------------------------------------
 case OB_HOST_STATS:
-	$mem_size = $mem['num_seg']*$mem['seg_size'];
-	$mem_avail= $mem['avail_mem'];
-	$mem_used = $mem_size-$mem_avail;
+	$mem_size = $mem['num_seg'] * $mem['seg_size'];
+	$mem_avail = $mem['avail_mem'];
+	$mem_used = $mem_size - $mem_avail;
 	$seg_size = bsize($mem['seg_size']);
-	$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']+$cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'])/($time-$cache['start_time'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses'])/($time-$cache['start_time'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts'])/($time-$cache['start_time'])) : 0);
+	$req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / ($time - $cache['start_time'])) : 0);
+	$hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']) / ($time - $cache['start_time'])) : 0);
+	$miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses']) / ($time - $cache['start_time'])) : 0);
+	$insert_rate_user = sprintf("%.2f", $cache['num_inserts'] ? (($cache['num_inserts']) / ($time - $cache['start_time'])) : 0);
 	$apcversion = phpversion('apcu');
 	$phpversion = phpversion();
 	$number_vars = $cache['num_entries'];
     $size_vars = bsize($cache['mem_size']);
-	$i=0;
+	$i = 0;
 	echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
 		<table cellspacing=0><tbody>
@@ -790,9 +790,9 @@ 
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
 EOB;
 
-	if(!empty($_SERVER['SERVER_NAME']))
+	if (!empty($_SERVER['SERVER_NAME']))
 		echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
-	if(!empty($_SERVER['SERVER_SOFTWARE']))
+	if (!empty($_SERVER['SERVER_SOFTWARE']))
 		echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
 
 	echo <<<EOB
@@ -800,8 +800,8 @@ 
     <br/> ({$cache['memory_type']} memory)
     </td></tr>
 EOB;
-	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
+	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>', date(DATE_FORMAT, $cache['start_time']), '</td></tr>';
+	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>', duration($cache['start_time']), '</td></tr>';
 	echo <<<EOB
 		</tbody></table>
 		</div>
@@ -826,11 +826,11 @@ 
 
 	$j = 0;
 	foreach (ini_get_all('apcu') as $k => $v) {
-		echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
+		echo "<tr class=tr-$j><td class=td-0>", $k, "</td><td>", str_replace(',', ',<br />', $v['local_value']), "</td></tr>\n";
 		$j = 1 - $j;
 	}
 
-	if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
+	if ($mem['num_seg'] > 1 || $mem['num_seg'] == 1 && count($mem['block_lists'][0]) > 1)
 		$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
 	else
 		$mem_note = "Memory Usage";
@@ -842,7 +842,7 @@ 
 		<div class="graph div3"><h2>Host Status Diagrams</h2>
 		<table cellspacing=0><tbody>
 EOB;
-	$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
+	$size = 'width='.(GRAPH_SIZE + 50).' height='.(GRAPH_SIZE + 10);
 echo <<<EOB
 		<tr>
 		<td class=td-0>$mem_note</td>
@@ -857,12 +857,12 @@ 
 			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF?IMG=2&$time\"></td></tr>\n"
 			: "",
 		'<tr>',
-		'<td class=td-0><span class="green box">&nbsp;</span>Free: ',bsize($mem_avail).sprintf(" (%.1f%%)",$mem_avail*100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="green box">&nbsp;</span>Hits: ',$cache['num_hits'].@sprintf(" (%.1f%%)",$cache['num_hits']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n",
+		'<td class=td-0><span class="green box">&nbsp;</span>Free: ', bsize($mem_avail).sprintf(" (%.1f%%)", $mem_avail * 100 / $mem_size), "</td>\n",
+		'<td class=td-1><span class="green box">&nbsp;</span>Hits: ', $cache['num_hits'].@sprintf(" (%.1f%%)", $cache['num_hits'] * 100 / ($cache['num_hits'] + $cache['num_misses'])), "</td>\n",
 		'</tr>',
 		'<tr>',
-		'<td class=td-0><span class="red box">&nbsp;</span>Used: ',bsize($mem_used).sprintf(" (%.1f%%)",$mem_used *100/$mem_size),"</td>\n",
-		'<td class=td-1><span class="red box">&nbsp;</span>Misses: ',$cache['num_misses'].@sprintf(" (%.1f%%)",$cache['num_misses']*100/($cache['num_hits']+$cache['num_misses'])),"</td>\n";
+		'<td class=td-0><span class="red box">&nbsp;</span>Used: ', bsize($mem_used).sprintf(" (%.1f%%)", $mem_used * 100 / $mem_size), "</td>\n",
+		'<td class=td-1><span class="red box">&nbsp;</span>Misses: ', $cache['num_misses'].@sprintf(" (%.1f%%)", $cache['num_misses'] * 100 / ($cache['num_hits'] + $cache['num_misses'])), "</td>\n";
 	echo <<< EOB
 		</tr>
 		</tbody></table>
@@ -876,28 +876,28 @@ 
 
 	// Fragementation: (freeseg - 1) / total_seg
 	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for($i=0; $i<$mem['num_seg']; $i++) {
+	for ($i = 0; $i < $mem['num_seg']; $i++) {
 		$ptr = 0;
-		foreach($mem['block_lists'][$i] as $block) {
+		foreach ($mem['block_lists'][$i] as $block) {
 			if ($block['offset'] != $ptr) {
 				++$nseg;
 			}
 			$ptr = $block['offset'] + $block['size'];
                         /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
-                        $freetotal+=$block['size'];
+                        if ($block['size'] < (5 * 1024 * 1024)) $fragsize += $block['size'];
+                        $freetotal += $block['size'];
 		}
 		$freeseg += count($mem['block_lists'][$i]);
 	}
 
 	if ($freeseg > 1) {
-		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
+		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize / $freetotal) * 100, bsize($fragsize), bsize($freetotal), $freeseg);
 	} else {
 		$frag = "0%";
 	}
 
 	if (graphics_avail()) {
-		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
+		$size = 'width='.(2 * GRAPH_SIZE + 150).' height='.(GRAPH_SIZE + 10);
 		echo <<<EOB
 			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
 EOB;
@@ -907,10 +907,10 @@ 
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
-            $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
+        if (isset($mem['adist'])) {
+          foreach ($mem['adist'] as $i=>$v) {
+            $cur = pow(2, $i); $nxt = pow(2, $i + 1) - 1;
+            if ($i == 0) $range = "1";
             else $range = "$cur - $nxt";
             echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
           }
@@ -933,47 +933,47 @@ 
 		echo '</div>';
 		break;
 	}
-	$fieldname='info';
-	$fieldheading='User Entry Label';
-	$fieldkey='info';
+	$fieldname = 'info';
+	$fieldheading = 'User Entry Label';
+	$fieldkey = 'info';
 
-	$cols=6;
+	$cols = 6;
 	echo <<<EOB
 		<div class=sorting><form>Scope:
 		<input type=hidden name=OB value={$MYREQUEST['OB']}>
 		<select name=SCOPE>
 EOB;
 	echo
-		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
-		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
+		"<option value=A", $MYREQUEST['SCOPE'] == 'A' ? " selected" : "", ">Active</option>",
+		"<option value=D", $MYREQUEST['SCOPE'] == 'D' ? " selected" : "", ">Deleted</option>",
 		"</select>",
 		", Sorting:<select name=SORT1>",
-		"<option value=H",$MYREQUEST['SORT1']=='H' ? " selected":"",">Hits</option>",
-		"<option value=Z",$MYREQUEST['SORT1']=='Z' ? " selected":"",">Size</option>",
-		"<option value=S",$MYREQUEST['SORT1']=='S' ? " selected":"",">$fieldheading</option>",
-		"<option value=A",$MYREQUEST['SORT1']=='A' ? " selected":"",">Last accessed</option>",
-		"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
-		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
-		"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
-	if($fieldname=='info') echo
-		"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
+		"<option value=H", $MYREQUEST['SORT1'] == 'H' ? " selected" : "", ">Hits</option>",
+		"<option value=Z", $MYREQUEST['SORT1'] == 'Z' ? " selected" : "", ">Size</option>",
+		"<option value=S", $MYREQUEST['SORT1'] == 'S' ? " selected" : "", ">$fieldheading</option>",
+		"<option value=A", $MYREQUEST['SORT1'] == 'A' ? " selected" : "", ">Last accessed</option>",
+		"<option value=M", $MYREQUEST['SORT1'] == 'M' ? " selected" : "", ">Last modified</option>",
+		"<option value=C", $MYREQUEST['SORT1'] == 'C' ? " selected" : "", ">Created at</option>",
+		"<option value=D", $MYREQUEST['SORT1'] == 'D' ? " selected" : "", ">Deleted at</option>";
+	if ($fieldname == 'info') echo
+		"<option value=D", $MYREQUEST['SORT1'] == 'T' ? " selected" : "", ">Timeout</option>";
 	echo
 		'</select>',
 		'<select name=SORT2>',
-		'<option value=D',$MYREQUEST['SORT2']=='D' ? ' selected':'','>DESC</option>',
-		'<option value=A',$MYREQUEST['SORT2']=='A' ? ' selected':'','>ASC</option>',
+		'<option value=D', $MYREQUEST['SORT2'] == 'D' ? ' selected' : '', '>DESC</option>',
+		'<option value=A', $MYREQUEST['SORT2'] == 'A' ? ' selected' : '', '>ASC</option>',
 		'</select>',
 		'<select name=COUNT onChange="form.submit()">',
-		'<option value=10 ',$MYREQUEST['COUNT']=='10' ? ' selected':'','>Top 10</option>',
-		'<option value=20 ',$MYREQUEST['COUNT']=='20' ? ' selected':'','>Top 20</option>',
-		'<option value=50 ',$MYREQUEST['COUNT']=='50' ? ' selected':'','>Top 50</option>',
-		'<option value=100',$MYREQUEST['COUNT']=='100'? ' selected':'','>Top 100</option>',
-		'<option value=150',$MYREQUEST['COUNT']=='150'? ' selected':'','>Top 150</option>',
-		'<option value=200',$MYREQUEST['COUNT']=='200'? ' selected':'','>Top 200</option>',
-		'<option value=500',$MYREQUEST['COUNT']=='500'? ' selected':'','>Top 500</option>',
-		'<option value=0  ',$MYREQUEST['COUNT']=='0'  ? ' selected':'','>All</option>',
+		'<option value=10 ', $MYREQUEST['COUNT'] == '10' ? ' selected' : '', '>Top 10</option>',
+		'<option value=20 ', $MYREQUEST['COUNT'] == '20' ? ' selected' : '', '>Top 20</option>',
+		'<option value=50 ', $MYREQUEST['COUNT'] == '50' ? ' selected' : '', '>Top 50</option>',
+		'<option value=100', $MYREQUEST['COUNT'] == '100' ? ' selected' : '', '>Top 100</option>',
+		'<option value=150', $MYREQUEST['COUNT'] == '150' ? ' selected' : '', '>Top 150</option>',
+		'<option value=200', $MYREQUEST['COUNT'] == '200' ? ' selected' : '', '>Top 200</option>',
+		'<option value=500', $MYREQUEST['COUNT'] == '500' ? ' selected' : '', '>Top 500</option>',
+		'<option value=0  ', $MYREQUEST['COUNT'] == '0' ? ' selected' : '', '>All</option>',
 		'</select>',
-    '&nbsp; Search: <input name=SEARCH value="',$MYREQUEST['SEARCH'],'" type=text size=25/>',
+    '&nbsp; Search: <input name=SEARCH value="', $MYREQUEST['SEARCH'], '" type=text size=25/>',
 		'&nbsp;<input type=submit value="GO!">',
 		'</form></div>';
 
@@ -990,39 +990,39 @@ 
   echo
 		'<div class="info"><table cellspacing=0><tbody>',
 		'<tr>',
-		'<th>',sortheader('S',$fieldheading,  "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('H','Hits',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('Z','Size',         "&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('A','Last accessed',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
-		'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
-
-	if($fieldname=='info') {
-		$cols+=2;
-		 echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
+		'<th>', sortheader('S', $fieldheading, "&OB=".$MYREQUEST['OB']), '</th>',
+		'<th>', sortheader('H', 'Hits', "&OB=".$MYREQUEST['OB']), '</th>',
+		'<th>', sortheader('Z', 'Size', "&OB=".$MYREQUEST['OB']), '</th>',
+		'<th>', sortheader('A', 'Last accessed', "&OB=".$MYREQUEST['OB']), '</th>',
+		'<th>', sortheader('M', 'Last modified', "&OB=".$MYREQUEST['OB']), '</th>',
+		'<th>', sortheader('C', 'Created at', "&OB=".$MYREQUEST['OB']), '</th>';
+
+	if ($fieldname == 'info') {
+		$cols += 2;
+		 echo '<th>', sortheader('T', 'Timeout', "&OB=".$MYREQUEST['OB']), '</th>';
 	}
-	echo '<th>',sortheader('D','Deleted at',"&OB=".$MYREQUEST['OB']),'</th></tr>';
+	echo '<th>', sortheader('D', 'Deleted at', "&OB=".$MYREQUEST['OB']), '</th></tr>';
 
 	// builds list with alpha numeric sortable keys
 	//
 	$list = array();
 
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
-			case 'A': $k=sprintf('%015d-',$entry['access_time']);  	     break;
-			case 'H': $k=sprintf('%015d-',$entry['num_hits']); 	     break;
-			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 	     break;
-			case 'M': $k=sprintf('%015d-',$entry['mtime']);  break;
-			case 'C': $k=sprintf('%015d-',$entry['creation_time']);      break;
-			case 'T': $k=sprintf('%015d-',$entry['ttl']);		     break;
-			case 'D': $k=sprintf('%015d-',$entry['deletion_time']);      break;
-			case 'S': $k=$entry["info"];				     break;
+	foreach ($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+		switch ($MYREQUEST['SORT1']) {
+			case 'A': $k = sprintf('%015d-', $entry['access_time']); break;
+			case 'H': $k = sprintf('%015d-', $entry['num_hits']); break;
+			case 'Z': $k = sprintf('%015d-', $entry['mem_size']); break;
+			case 'M': $k = sprintf('%015d-', $entry['mtime']); break;
+			case 'C': $k = sprintf('%015d-', $entry['creation_time']); break;
+			case 'T': $k = sprintf('%015d-', $entry['ttl']); break;
+			case 'D': $k = sprintf('%015d-', $entry['deletion_time']); break;
+			case 'S': $k = $entry["info"]; break;
 		}
 		if (!$AUTHENTICATED) {
 			// hide all path entries if not logged in
-			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
+			$list[$k.$entry[$fieldname]] = preg_replace('/^.*(\\/|\\\\)/', '*hidden*/', $entry);
 		} else {
-			$list[$k.$entry[$fieldname]]=$entry;
+			$list[$k.$entry[$fieldname]] = $entry;
 		}
 	}
 
@@ -1030,34 +1030,34 @@ 
 		// sort list
 		//
 		switch ($MYREQUEST['SORT2']) {
-			case "A":	krsort($list);	break;
-			case "D":	ksort($list);	break;
+			case "A":	krsort($list); break;
+			case "D":	ksort($list); break;
 		}
 
 		// output list
-		$i=0;
-		foreach($list as $k => $entry) {
-      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
-		$sh=md5($entry["info"]);
-        $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
+		$i = 0;
+		foreach ($list as $k => $entry) {
+      if (!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+		$sh = md5($entry["info"]);
+        $field_value = htmlentities(strip_tags($entry[$fieldname], ''), ENT_QUOTES, 'UTF-8');
         echo
-          '<tr id="key-'. $sh .'" class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"#key-". $sh ."\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['num_hits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['access_time']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
-
-        if($fieldname=='info') {
-          if($entry['ttl'])
+          '<tr id="key-'.$sh.'" class=tr-', $i % 2, '>',
+          "<td class=td-0><a href=\"$MY_SELF&OB=", $MYREQUEST['OB'], "&SH=", $sh, "#key-".$sh."\">", $field_value, '</a></td>',
+          '<td class="td-n center">', $entry['num_hits'], '</td>',
+          '<td class="td-n right">', $entry['mem_size'], '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['access_time']), '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['mtime']), '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['creation_time']), '</td>';
+
+        if ($fieldname == 'info') {
+          if ($entry['ttl'])
             echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
           else
             echo '<td class="td-n center">None</td>';
         }
         if ($entry['deletion_time']) {
 
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
+          echo '<td class="td-last center">', date(DATE_FORMAT, $entry['deletion_time']), '</td>';
         } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
 
           echo '<td class="td-last center">';
@@ -1079,14 +1079,14 @@ 
 		}
 
 	} else {
-		echo '<tr class=tr-0><td class="center" colspan=',$cols,'><i>No data</i></td></tr>';
+		echo '<tr class=tr-0><td class="center" colspan=', $cols, '><i>No data</i></td></tr>';
 	}
 	echo <<< EOB
 		</tbody></table>
 EOB;
 
 	if ($list && $i < count($list)) {
-		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
+		echo "<a href=\"$MY_SELF&OB=", $MYREQUEST['OB'], "&COUNT=0\"><i>", count($list) - $i, ' more available...</i></a>';
 	}
 
 	echo <<< EOB
@@ -1106,7 +1106,7 @@ 
 		</tr>
 EOB;
   if (defined('PROXY')) {
-    $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
+    $ctxt = stream_context_create(array('http' => array('proxy' => PROXY, 'request_fulluri' => True)));
     $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
   } else {
     $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");

Braces +403 added lines, -154 removed lines

@@ -46,7 +46,10 @@ 
 $VERSION='$Id$';
 
 ////////// READ OPTIONAL CONFIGURATION FILE ////////////
-if (file_exists("apc.conf.php")) include("apc.conf.php");
+if (file_exists("apc.conf.php"))
+{
+	include("apc.conf.php");
+}
 ////////////////////////////////////////////////////////
 
 ////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
@@ -76,8 +79,13 @@ 
 
 
 // "define if not defined"
-function defaults($d,$v) {
-	if (!defined($d)) define($d,$v); // or just @define(...)
+function defaults($d,$v)
+{
+	if (!defined($d))
+	{
+		define($d,$v);
+	}
+	// or just @define(...)
 }
 
 // rewrite $PHP_SELF to block XSS attacks
@@ -85,8 +93,11 @@ 
 $PHP_SELF= isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES, 'UTF-8') : '';
 $time = time();
 $host = php_uname('n');
-if($host) { $host = '('.$host.')'; }
-if (isset($_SERVER['SERVER_ADDR'])) {
+if($host)
+{
+$host = '('.$host.')'; }
+if (isset($_SERVER['SERVER_ADDR']))
+{
   $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
 }
 
@@ -120,36 +131,68 @@ 
 );
 
 // handle POST and GET requests
-if (empty($_REQUEST)) {
-	if (!empty($_GET) && !empty($_POST)) {
+if (empty($_REQUEST))
+{
+	if (!empty($_GET) && !empty($_POST))
+	{
 		$_REQUEST = array_merge($_GET, $_POST);
-	} else if (!empty($_GET)) {
+	}
+	else if (!empty($_GET))
+	{
 		$_REQUEST = $_GET;
-	} else if (!empty($_POST)) {
+	}
+	else if (!empty($_POST))
+	{
 		$_REQUEST = $_POST;
-	} else {
+	}
+	else
+	{
 		$_REQUEST = array();
 	}
 }
 
 // check parameter syntax
-foreach($vardom as $var => $dom) {
-	if (!isset($_REQUEST[$var])) {
+foreach($vardom as $var => $dom)
+{
+	if (!isset($_REQUEST[$var]))
+	{
 		$MYREQUEST[$var]=NULL;
-	} else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D',$_REQUEST[$var])) {
+	}
+	else if (!is_array($_REQUEST[$var]) && preg_match($dom.'D',$_REQUEST[$var]))
+	{
 		$MYREQUEST[$var]=$_REQUEST[$var];
-	} else {
+	}
+	else
+	{
 		$MYREQUEST[$var]=$_REQUEST[$var]=NULL;
 	}
 }
 
 // check parameter sematics
-if (empty($MYREQUEST['SCOPE'])) $MYREQUEST['SCOPE']="A";
-if (empty($MYREQUEST['SORT1'])) $MYREQUEST['SORT1']="H";
-if (empty($MYREQUEST['SORT2'])) $MYREQUEST['SORT2']="D";
-if (empty($MYREQUEST['OB']))	$MYREQUEST['OB']=OB_HOST_STATS;
-if (!isset($MYREQUEST['COUNT'])) $MYREQUEST['COUNT']=20;
-if (!isset($scope_list[$MYREQUEST['SCOPE']])) $MYREQUEST['SCOPE']='A';
+if (empty($MYREQUEST['SCOPE']))
+{
+	$MYREQUEST['SCOPE']="A";
+}
+if (empty($MYREQUEST['SORT1']))
+{
+	$MYREQUEST['SORT1']="H";
+}
+if (empty($MYREQUEST['SORT2']))
+{
+	$MYREQUEST['SORT2']="D";
+}
+if (empty($MYREQUEST['OB']))
+{
+	$MYREQUEST['OB']=OB_HOST_STATS;
+}
+if (!isset($MYREQUEST['COUNT']))
+{
+	$MYREQUEST['COUNT']=20;
+}
+if (!isset($scope_list[$MYREQUEST['SCOPE']]))
+{
+	$MYREQUEST['SCOPE']='A';
+}
 
 $MY_SELF=
 	"$PHP_SELF".
@@ -164,16 +207,21 @@ 
 
 // authentication needed?
 //
-if (!USE_AUTHENTICATION) {
+if (!USE_AUTHENTICATION)
+{
 	$AUTHENTICATED=1;
-} else {
+}
+else
+{
 	$AUTHENTICATED=0;
-	if (ADMIN_PASSWORD!='password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER']))) {
+	if (ADMIN_PASSWORD!='password' && ($MYREQUEST['LO'] == 1 || isset($_SERVER['PHP_AUTH_USER'])))
+	{
 
 		if (!isset($_SERVER['PHP_AUTH_USER']) ||
 			!isset($_SERVER['PHP_AUTH_PW']) ||
 			$_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||
-			$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
+			$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD)
+		{
 			Header("WWW-Authenticate: Basic realm=\"APC Login\"");
 			Header("HTTP/1.0 401 Unauthorized");
 
@@ -186,22 +234,27 @@ 
 EOB;
 			exit;
 
-		} else {
+		}
+		else
+		{
 			$AUTHENTICATED=1;
 		}
 	}
 }
 
 // clear cache
-if ($AUTHENTICATED && isset($MYREQUEST['CC']) && $MYREQUEST['CC']) {
+if ($AUTHENTICATED && isset($MYREQUEST['CC']) && $MYREQUEST['CC'])
+{
 	apcu_clear_cache();
 }
 
-if ($AUTHENTICATED && !empty($MYREQUEST['DU'])) {
+if ($AUTHENTICATED && !empty($MYREQUEST['DU']))
+{
 	apcu_delete($MYREQUEST['DU']);
 }
 
-if(!function_exists('apcu_cache_info')) {
+if(!function_exists('apcu_cache_info'))
+{
 	echo "No cache info available.  APC does not appear to be running.";
   exit;
 }
@@ -216,7 +269,8 @@ 
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");                                    // HTTP/1.0
 
-function duration($ts) {
+function duration($ts)
+{
     global $time;
     $years = (int)((($time - $ts)/(7*86400))/52.177457);
     $rem = (int)(($time-$ts)-($years * 52.177457 * 7 * 86400));
@@ -225,41 +279,76 @@ 
     $hours = (int)(($rem)/3600) - $days*24 - $weeks*7*24;
     $mins = (int)(($rem)/60) - $hours*60 - $days*24*60 - $weeks*7*24*60;
     $str = '';
-    if($years==1) $str .= "$years year, ";
-    if($years>1) $str .= "$years years, ";
-    if($weeks==1) $str .= "$weeks week, ";
-    if($weeks>1) $str .= "$weeks weeks, ";
-    if($days==1) $str .= "$days day,";
-    if($days>1) $str .= "$days days,";
-    if($hours == 1) $str .= " $hours hour and";
-    if($hours>1) $str .= " $hours hours and";
-    if($mins == 1) $str .= " 1 minute";
-    else $str .= " $mins minutes";
+    if($years==1)
+    {
+    	$str .= "$years year, ";
+    }
+    if($years>1)
+    {
+    	$str .= "$years years, ";
+    }
+    if($weeks==1)
+    {
+    	$str .= "$weeks week, ";
+    }
+    if($weeks>1)
+    {
+    	$str .= "$weeks weeks, ";
+    }
+    if($days==1)
+    {
+    	$str .= "$days day,";
+    }
+    if($days>1)
+    {
+    	$str .= "$days days,";
+    }
+    if($hours == 1)
+    {
+    	$str .= " $hours hour and";
+    }
+    if($hours>1)
+    {
+    	$str .= " $hours hours and";
+    }
+    if($mins == 1)
+    {
+    	$str .= " 1 minute";
+    }
+    else {
+    	$str .= " $mins minutes";
+    }
     return $str;
 }
 
 // create graphics
 //
-function graphics_avail() {
+function graphics_avail()
+{
 	return extension_loaded('gd');
 }
 if (isset($MYREQUEST['IMG']))
 {
-	if (!graphics_avail()) {
+	if (!graphics_avail())
+	{
 		exit(0);
 	}
 
-	function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$color2,$text='',$placeindex=0) {
+	function fill_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$color2,$text='',$placeindex=0)
+	{
 		$r=$diameter/2;
 		$w=deg2rad((360+$start+($end-$start)/2)%360);
 
 
-		if (function_exists("imagefilledarc")) {
+		if (function_exists("imagefilledarc"))
+		{
 			// exists only if GD 2.0.1 is avaliable
 			imagefilledarc($im, $centerX+1, $centerY+1, $diameter, $diameter, $start, $end, $color1, IMG_ARC_PIE);
 			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2, IMG_ARC_PIE);
 			imagefilledarc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color1, IMG_ARC_NOFILL|IMG_ARC_EDGED);
-		} else {
+		}
+		else
+		{
 			imagearc($im, $centerX, $centerY, $diameter, $diameter, $start, $end, $color2);
 			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
 			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($start+1)) * $r, $centerY + sin(deg2rad($start)) * $r, $color2);
@@ -267,41 +356,57 @@ 
 			imageline($im, $centerX, $centerY, $centerX + cos(deg2rad($end))   * $r, $centerY + sin(deg2rad($end))   * $r, $color2);
 			imagefill($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2, $color2);
 		}
-		if ($text) {
-			if ($placeindex>0) {
+		if ($text)
+		{
+			if ($placeindex>0)
+			{
 				imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
 				imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
 
-			} else {
+			}
+			else
+			{
 				imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
 			}
 		}
 	}
 
-	function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$text,$placeindex=0) {
+	function text_arc($im, $centerX, $centerY, $diameter, $start, $end, $color1,$text,$placeindex=0)
+	{
 		$r=$diameter/2;
 		$w=deg2rad((360+$start+($end-$start)/2)%360);
 
-		if ($placeindex>0) {
+		if ($placeindex>0)
+		{
 			imageline($im,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$diameter, $placeindex*12,$color1);
 			imagestring($im,4,$diameter, $placeindex*12,$text,$color1);
 
-		} else {
+		}
+		else
+		{
 			imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
 		}
 	}
 
-	function fill_box($im, $x, $y, $w, $h, $color1, $color2,$text='',$placeindex='') {
+	function fill_box($im, $x, $y, $w, $h, $color1, $color2,$text='',$placeindex='')
+	{
 		global $col_black;
 		$x1=$x+$w-1;
 		$y1=$y+$h-1;
 
 		imagerectangle($im, $x, $y1, $x1+1, $y+1, $col_black);
-		if($y1>$y) imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
-		else imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
+		if($y1>$y)
+		{
+			imagefilledrectangle($im, $x, $y, $x1, $y1, $color2);
+		}
+		else {
+			imagefilledrectangle($im, $x, $y1, $x1, $y, $color2);
+		}
 		imagerectangle($im, $x, $y1, $x1, $y, $color1);
-		if ($text) {
-			if ($placeindex>0) {
+		if ($text)
+		{
+			if ($placeindex>0)
+			{
 
 				if ($placeindex<16)
 				{
@@ -311,11 +416,16 @@ 
 					imageline($im,$x,$y+$h/2,$px+90,$py,$color2);
 					imagestring($im,2,$px,$py-6,$text,$color1);
 
-				} else {
-					if ($placeindex<31) {
+				}
+				else
+				{
+					if ($placeindex<31)
+					{
 						$px=$x+40*2;
 						$py=($placeindex-15)*12+6;
-					} else {
+					}
+					else
+					{
 						$px=$x+40*2+100*intval(($placeindex-15)/15);
 						$py=($placeindex%15)*12+6;
 					}
@@ -323,7 +433,9 @@ 
 					imageline($im,$x+$w,$y+$h/2,$px,$py,$color2);
 					imagestring($im,2,$px+2,$py-6,$text,$color1);
 				}
-			} else {
+			}
+			else
+			{
 				imagestring($im,4,$x+5,$y1-16,$text,$color1);
 			}
 		}
@@ -332,9 +444,12 @@ 
 
 	$size = GRAPH_SIZE; // image size
 	if ($MYREQUEST['IMG']==3)
-		$image = imagecreate(2*$size+150, $size+10);
-	else
-		$image = imagecreate($size+50, $size+10);
+	{
+			$image = imagecreate(2*$size+150, $size+10);
+	}
+	else {
+			$image = imagecreate($size+50, $size+10);
+	}
 
 	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 	$col_red   = imagecolorallocate($image, 0xD0, 0x60,  0x30);
@@ -342,7 +457,8 @@ 
 	$col_black = imagecolorallocate($image,   0,   0,   0);
 	imagecolortransparent($image,$col_white);
 
-	switch ($MYREQUEST['IMG']) {
+	switch ($MYREQUEST['IMG'])
+	{
 
 	case 1:
 		$s=$mem['num_seg']*$mem['seg_size'];
@@ -354,43 +470,64 @@ 
 		// would expect because we try to visualize any memory fragmentation as well.
 		$angle_from = 0;
 		$string_placement=array();
-		for($i=0; $i<$mem['num_seg']; $i++) {
+		for($i=0; $i<$mem['num_seg']; $i++)
+		{
 			$ptr = 0;
 			$free = $mem['block_lists'][$i];
 			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
+			foreach($free as $block)
+			{
+				if($block['offset']!=$ptr)
+				{
+// Used block
 					$angle_to = $angle_from+($block['offset']-$ptr)/$s;
-					if(($angle_to+$fuzz)>1) $angle_to = 1;
-					if( ($angle_to*360) - ($angle_from*360) >= 1) {
+					if(($angle_to+$fuzz)>1)
+					{
+						$angle_to = 1;
+					}
+					if( ($angle_to*360) - ($angle_from*360) >= 1)
+					{
 						fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-						if (($angle_to-$angle_from)>0.05) {
+						if (($angle_to-$angle_from)>0.05)
+						{
 							array_push($string_placement, array($angle_from,$angle_to));
 						}
 					}
 					$angle_from = $angle_to;
 				}
 				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
-				if( ($angle_to*360) - ($angle_from*360) >= 1) {
+				if(($angle_to+$fuzz)>1)
+				{
+					$angle_to = 1;
+				}
+				if( ($angle_to*360) - ($angle_from*360) >= 1)
+				{
 					fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_green);
-					if (($angle_to-$angle_from)>0.05) {
+					if (($angle_to-$angle_from)>0.05)
+					{
 						array_push($string_placement, array($angle_from,$angle_to));
 					}
 				}
 				$angle_from = $angle_to;
 				$ptr = $block['offset']+$block['size'];
 			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
+			if ($ptr < $mem['seg_size'])
+			{
+// memory at the end
 				$angle_to = $angle_from + ($mem['seg_size'] - $ptr)/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 1;
+				if(($angle_to+$fuzz)>1)
+				{
+					$angle_to = 1;
+				}
 				fill_arc($image,$x,$y,$size,$angle_from*360,$angle_to*360,$col_black,$col_red);
-				if (($angle_to-$angle_from)>0.05) {
+				if (($angle_to-$angle_from)>0.05)
+				{
 					array_push($string_placement, array($angle_from,$angle_to));
 				}
 			}
 		}
-		foreach ($string_placement as $angle) {
+		foreach ($string_placement as $angle)
+		{
 			text_arc($image,$x,$y,$size,$angle[0]*360,$angle[1]*360,$col_black,bsize($s*($angle[1]-$angle[0])));
 		}
 		break;
@@ -412,32 +549,51 @@ 
 
 		// This block of code creates the bar chart.  It is a lot more complex than you
 		// would expect because we try to visualize any memory fragmentation as well.
-		for($i=0; $i<$mem['num_seg']; $i++) {
+		for($i=0; $i<$mem['num_seg']; $i++)
+		{
 			$ptr = 0;
 			$free = $mem['block_lists'][$i];
 			uasort($free, 'block_sort');
-			foreach($free as $block) {
-				if($block['offset']!=$ptr) {       // Used block
+			foreach($free as $block)
+			{
+				if($block['offset']!=$ptr)
+				{
+// Used block
 					$h=(GRAPH_SIZE-5)*($block['offset']-$ptr)/$s;
-					if ($h>0) {
+					if ($h>0)
+					{
                                                 $j++;
-						if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
-                                                else fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+						if($j<75)
+						{
+							fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($block['offset']-$ptr),$j);
+						}
+                                                else {
+                                                	fill_box($image,$x,$y,50,$h,$col_black,$col_red);
+                                                }
                                         }
 					$y+=$h;
 				}
 				$h=(GRAPH_SIZE-5)*($block['size'])/$s;
-				if ($h>0) {
+				if ($h>0)
+				{
                                         $j++;
-					if($j<75) fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
-					else fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+					if($j<75)
+					{
+						fill_box($image,$x,$y,50,$h,$col_black,$col_green,bsize($block['size']),$j);
+					}
+					else {
+						fill_box($image,$x,$y,50,$h,$col_black,$col_green);
+					}
                                 }
 				$y+=$h;
 				$ptr = $block['offset']+$block['size'];
 			}
-			if ($ptr < $mem['seg_size']) { // memory at the end
+			if ($ptr < $mem['seg_size'])
+			{
+// memory at the end
 				$h = (GRAPH_SIZE-5) * ($mem['seg_size'] - $ptr) / $s;
-				if ($h > 0) {
+				if ($h > 0)
+				{
 					fill_box($image,$x,$y,50,$h,$col_black,$col_red,bsize($mem['seg_size']-$ptr),$j++);
 				}
 			}
@@ -460,19 +616,26 @@ 
 
 // pretty printer for byte values
 //
-function bsize($s) {
-	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
+function bsize($s)
+{
+	foreach (array('','K','M','G') as $i => $k)
+	{
+		if ($s < 1024)
+		{
+			break;
+		}
 		$s/=1024;
 	}
 	return sprintf("%5.1f %sBytes",$s,$k);
 }
 
 // sortable table header in "scripts for this host" view
-function sortheader($key,$name,$extra='') {
+function sortheader($key,$name,$extra='')
+{
 	global $MYREQUEST, $MY_SELF_WO_SORT;
 
-	if ($MYREQUEST['SORT1']==$key) {
+	if ($MYREQUEST['SORT1']==$key)
+	{
 		$MYREQUEST['SORT2'] = $MYREQUEST['SORT2']=='A' ? 'D' : 'A';
 	}
 	return "<a class=sortable href=\"$MY_SELF_WO_SORT$extra&SORT1=$key&SORT2=".$MYREQUEST['SORT2']."\">$name</a>";
@@ -480,13 +643,19 @@ 
 }
 
 // create menu entry
-function menu_entry($ob,$title) {
+function menu_entry($ob,$title)
+{
 	global $MYREQUEST,$MY_SELF;
-	if ($MYREQUEST['OB']!=$ob) {
+	if ($MYREQUEST['OB']!=$ob)
+	{
 		return "<li><a href=\"$MY_SELF&OB=$ob\">$title</a></li>";
-	} else if (empty($MYREQUEST['SH'])) {
+	}
+	else if (empty($MYREQUEST['SH']))
+	{
 		return "<li><span class=active>$title</span></li>";
-	} else {
+	}
+	else
+	{
 		return "<li><a class=\"child_active\" href=\"$MY_SELF&OB=$ob\">$title</a></li>";
 	}
 }
@@ -496,18 +665,24 @@ 
 	global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
 	// needs ADMIN_PASSWORD to be changed!
 	//
-	if (!USE_AUTHENTICATION) {
+	if (!USE_AUTHENTICATION)
+	{
 		return;
-	} else if (ADMIN_PASSWORD=='password')
+	}
+	else if (ADMIN_PASSWORD=='password')
 	{
 		print <<<EOB
 			<a href="#" onClick="javascript:alert('You need to set a password at the top of apc.php before this will work!');return false";>$s</a>
 EOB;
-	} else if ($AUTHENTICATED) {
+	}
+	else if ($AUTHENTICATED)
+	{
 		print <<<EOB
 			'{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
 EOB;
-	} else{
+	}
+	else
+	{
 		print <<<EOB
 			<a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
 EOB;
@@ -516,9 +691,12 @@ 
 
 function block_sort($array1, $array2)
 {
-	if ($array1['offset'] > $array2['offset']) {
+	if ($array1['offset'] > $array2['offset'])
+	{
 		return 1;
-	} else {
+	}
+	else
+	{
 		return -1;
 	}
 }
@@ -748,7 +926,8 @@ 
 	menu_entry(OB_USER_CACHE,'User Cache Entries'),
 	menu_entry(OB_VERSION_CHECK,'Version Check');
 
-if ($AUTHENTICATED) {
+if ($AUTHENTICATED)
+{
 	echo <<<EOB
 		<li><a class="aright" href="$MY_SELF&CC=1&OB={$MYREQUEST['OB']}" onClick="javascript:return confirm('Are you sure?');">Clear Cache</a></li>
 EOB;
@@ -765,7 +944,8 @@ 
 
 // MAIN SWITCH STATEMENT
 
-switch ($MYREQUEST['OB']) {
+switch ($MYREQUEST['OB'])
+{
 // -----------------------------------------------
 // Host Stats
 // -----------------------------------------------
@@ -791,9 +971,13 @@ 
 EOB;
 
 	if(!empty($_SERVER['SERVER_NAME']))
-		echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
+	{
+			echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
+	}
 	if(!empty($_SERVER['SERVER_SOFTWARE']))
-		echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
+	{
+			echo "<tr class=tr-1><td class=td-0>Server Software</td><td>{$_SERVER['SERVER_SOFTWARE']}</td></tr>\n";
+	}
 
 	echo <<<EOB
 		<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
@@ -825,15 +1009,19 @@ 
 EOB;
 
 	$j = 0;
-	foreach (ini_get_all('apcu') as $k => $v) {
+	foreach (ini_get_all('apcu') as $k => $v)
+	{
 		echo "<tr class=tr-$j><td class=td-0>",$k,"</td><td>",str_replace(',',',<br />',$v['local_value']),"</td></tr>\n";
 		$j = 1 - $j;
 	}
 
 	if($mem['num_seg']>1 || $mem['num_seg']==1 && count($mem['block_lists'][0])>1)
-		$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
-	else
-		$mem_note = "Memory Usage";
+	{
+			$mem_note = "Memory Usage<br /><font size=-2>(multiple slices indicate fragments)</font>";
+	}
+	else {
+			$mem_note = "Memory Usage";
+	}
 
 	echo <<< EOB
 		</tbody></table>
@@ -876,27 +1064,37 @@ 
 
 	// Fragementation: (freeseg - 1) / total_seg
 	$nseg = $freeseg = $fragsize = $freetotal = 0;
-	for($i=0; $i<$mem['num_seg']; $i++) {
+	for($i=0; $i<$mem['num_seg']; $i++)
+	{
 		$ptr = 0;
-		foreach($mem['block_lists'][$i] as $block) {
-			if ($block['offset'] != $ptr) {
+		foreach($mem['block_lists'][$i] as $block)
+		{
+			if ($block['offset'] != $ptr)
+			{
 				++$nseg;
 			}
 			$ptr = $block['offset'] + $block['size'];
                         /* Only consider blocks <5M for the fragmentation % */
-                        if($block['size']<(5*1024*1024)) $fragsize+=$block['size'];
+                        if($block['size']<(5*1024*1024))
+                        {
+                        	$fragsize+=$block['size'];
+                        }
                         $freetotal+=$block['size'];
 		}
 		$freeseg += count($mem['block_lists'][$i]);
 	}
 
-	if ($freeseg > 1) {
+	if ($freeseg > 1)
+	{
 		$frag = sprintf("%.2f%% (%s out of %s in %d fragments)", ($fragsize/$freetotal)*100,bsize($fragsize),bsize($freetotal),$freeseg);
-	} else {
+	}
+	else
+	{
 		$frag = "0%";
 	}
 
-	if (graphics_avail()) {
+	if (graphics_avail())
+	{
 		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
 		echo <<<EOB
 			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
@@ -907,11 +1105,18 @@ 
 		</td>
 		</tr>
 EOB;
-        if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
+        if(isset($mem['adist']))
+        {
+          foreach($mem['adist'] as $i=>$v)
+          {
             $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
-            if($i==0) $range = "1";
-            else $range = "$cur - $nxt";
+            if($i==0)
+            {
+            	$range = "1";
+            }
+            else {
+            	$range = "$cur - $nxt";
+            }
             echo "<tr><th align=right>$range</th><td align=right>$v</td></tr>\n";
           }
         }
@@ -927,7 +1132,8 @@ 
 // User Cache Entries
 // -----------------------------------------------
 case OB_USER_CACHE:
-	if (!$AUTHENTICATED) {
+	if (!$AUTHENTICATED)
+	{
     echo '<div class="error">You need to login to see the user values here!<br/>&nbsp;<br/>';
 		put_login_link("Login now!");
 		echo '</div>';
@@ -955,8 +1161,11 @@ 
 		"<option value=M",$MYREQUEST['SORT1']=='M' ? " selected":"",">Last modified</option>",
 		"<option value=C",$MYREQUEST['SORT1']=='C' ? " selected":"",">Created at</option>",
 		"<option value=D",$MYREQUEST['SORT1']=='D' ? " selected":"",">Deleted at</option>";
-	if($fieldname=='info') echo
+	if($fieldname=='info')
+	{
+		echo
 		"<option value=D",$MYREQUEST['SORT1']=='T' ? " selected":"",">Timeout</option>";
+	}
 	echo
 		'</select>',
 		'<select name=SORT2>',
@@ -977,11 +1186,13 @@ 
 		'&nbsp;<input type=submit value="GO!">',
 		'</form></div>';
 
-  if (isset($MYREQUEST['SEARCH'])) {
+  if (isset($MYREQUEST['SEARCH']))
+  {
    // Don't use preg_quote because we want the user to be able to specify a
    // regular expression subpattern.
    $MYREQUEST['SEARCH'] = '/'.str_replace('/', '\\/', $MYREQUEST['SEARCH']).'/i';
-   if (preg_match($MYREQUEST['SEARCH'], 'test') === false) {
+   if (preg_match($MYREQUEST['SEARCH'], 'test') === false)
+   {
      echo '<div class="error">Error: enter a valid regular expression as a search query.</div>';
      break;
    }
@@ -997,7 +1208,8 @@ 
 		'<th>',sortheader('M','Last modified',"&OB=".$MYREQUEST['OB']),'</th>',
 		'<th>',sortheader('C','Created at',   "&OB=".$MYREQUEST['OB']),'</th>';
 
-	if($fieldname=='info') {
+	if($fieldname=='info')
+	{
 		$cols+=2;
 		 echo '<th>',sortheader('T','Timeout',"&OB=".$MYREQUEST['OB']),'</th>';
 	}
@@ -1007,8 +1219,10 @@ 
 	//
 	$list = array();
 
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
+	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry)
+	{
+		switch($MYREQUEST['SORT1'])
+		{
 			case 'A': $k=sprintf('%015d-',$entry['access_time']);  	     break;
 			case 'H': $k=sprintf('%015d-',$entry['num_hits']); 	     break;
 			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 	     break;
@@ -1018,26 +1232,33 @@ 
 			case 'D': $k=sprintf('%015d-',$entry['deletion_time']);      break;
 			case 'S': $k=$entry["info"];				     break;
 		}
-		if (!$AUTHENTICATED) {
+		if (!$AUTHENTICATED)
+		{
 			// hide all path entries if not logged in
 			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
-		} else {
+		}
+		else
+		{
 			$list[$k.$entry[$fieldname]]=$entry;
 		}
 	}
 
-	if ($list) {
+	if ($list)
+	{
 		// sort list
 		//
-		switch ($MYREQUEST['SORT2']) {
+		switch ($MYREQUEST['SORT2'])
+		{
 			case "A":	krsort($list);	break;
 			case "D":	ksort($list);	break;
 		}
 
 		// output list
 		$i=0;
-		foreach($list as $k => $entry) {
-      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+		foreach($list as $k => $entry)
+		{
+      if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0)
+      {
 		$sh=md5($entry["info"]);
         $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
         echo
@@ -1049,43 +1270,58 @@ 
           '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
           '<td class="td-n center">',date(DATE_FORMAT,$entry['creation_time']),'</td>';
 
-        if($fieldname=='info') {
+        if($fieldname=='info')
+        {
           if($entry['ttl'])
-            echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
-          else
-            echo '<td class="td-n center">None</td>';
+          {
+                      echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
+          }
+          else {
+                      echo '<td class="td-n center">None</td>';
+          }
         }
-        if ($entry['deletion_time']) {
+        if ($entry['deletion_time'])
+        {
 
           echo '<td class="td-last center">', date(DATE_FORMAT,$entry['deletion_time']), '</td>';
-        } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
+        }
+        else if ($MYREQUEST['OB'] == OB_USER_CACHE)
+        {
 
           echo '<td class="td-last center">';
           echo '[<a href="', $MY_SELF, '&OB=', $MYREQUEST['OB'], '&DU=', urlencode($entry[$fieldkey]), '">Delete Now</a>]';
           echo '</td>';
-        } else {
+        }
+        else
+        {
           echo '<td class="td-last center"> &nbsp; </td>';
         }
         echo '</tr>';
-		if ($sh == $MYREQUEST["SH"]) {
+		if ($sh == $MYREQUEST["SH"])
+		{
 			echo '<tr>';
 			echo '<td colspan="7"><pre>'.htmlentities(print_r(apcu_fetch($entry['info']), 1)).'</pre></td>';
 			echo '</tr>';
 		}
         $i++;
         if ($i == $MYREQUEST['COUNT'])
-          break;
+        {
+                  break;
+        }
       }
 		}
 
-	} else {
+	}
+	else
+	{
 		echo '<tr class=tr-0><td class="center" colspan=',$cols,'><i>No data</i></td></tr>';
 	}
 	echo <<< EOB
 		</tbody></table>
 EOB;
 
-	if ($list && $i < count($list)) {
+	if ($list && $i < count($list))
+	{
 		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
 	}
 
@@ -1105,23 +1341,32 @@ 
 		<th></th>
 		</tr>
 EOB;
-  if (defined('PROXY')) {
+  if (defined('PROXY'))
+  {
     $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
     $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
-  } else {
+  }
+  else
+  {
     $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss");
   }
-	if (!$rss) {
+	if (!$rss)
+	{
 		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
-	} else {
+	}
+	else
+	{
 		$apcversion = phpversion('apcu');
 
 		preg_match('!<title>APCu ([0-9.]+)</title>!', $rss, $match);
 		echo '<tr class="tr-0 center"><td>';
-		if (version_compare($apcversion, $match[1], '>=')) {
+		if (version_compare($apcversion, $match[1], '>='))
+		{
 			echo '<div class="ok">You are running the latest version of APCu ('.$apcversion.')</div>';
 			$i = 3;
-		} else {
+		}
+		else
+		{
 			echo '<div class="failed">You are running an older version of APCu ('.$apcversion.'),
 				newer version '.$match[1].' is available at <a href="http://pecl.php.net/package/APCu/'.$match[1].'">
 				http://pecl.php.net/package/APCu/'.$match[1].'</a>
@@ -1134,11 +1379,15 @@ 
 		preg_match_all('!<(title|description)>([^<]+)</\\1>!', $rss, $match);
 		next($match[2]); next($match[2]);
 
-		while (list(,$v) = each($match[2])) {
+		while (list(,$v) = each($match[2]))
+		{
 			list(,$ver) = explode(' ', $v, 2);
-			if ($i < 0 && version_compare($apcversion, $ver, '>=')) {
+			if ($i < 0 && version_compare($apcversion, $ver, '>='))
+			{
 				break;
-			} else if (!$i--) {
+			}
+			else if (!$i--)
+			{
 				break;
 			}
 			echo "<b><a href=\"http://pecl.php.net/package/APCu/$ver\">".htmlspecialchars($v, ENT_QUOTES, 'UTF-8')."</a></b><br><blockquote>";

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

@@ -183,7 +183,7 @@ 
 				<big>Wrong Username or Password!</big><br/>&nbsp;<br/>&nbsp;
 				<big><a href='$PHP_SELF?OB={$MYREQUEST['OB']}'>Continue...</a></big>
 				</body></html>
-EOB;
+eob;
 			exit;
 
 		} else {
@@ -502,15 +502,15 @@ 
 	{
 		print <<<EOB
 			<a href="#" onClick="javascript:alert('You need to set a password at the top of apc.php before this will work!');return false";>$s</a>
-EOB;
+eob;
 	} else if ($AUTHENTICATED) {
 		print <<<EOB
 			'{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
-EOB;
+eob;
 	} else{
 		print <<<EOB
 			<a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
-EOB;
+eob;
 	}
 }
 
@@ -742,7 +742,7 @@ 
 echo <<<EOB
 	<ol class=menu>
 	<li><a href="$MY_SELF&OB={$MYREQUEST['OB']}&SH={$MYREQUEST['SH']}">Refresh Data</a></li>
-EOB;
+eob;
 echo
 	menu_entry(OB_HOST_STATS,'View Host Stats'),
 	menu_entry(OB_USER_CACHE,'User Cache Entries'),
@@ -751,17 +751,17 @@ 
 if ($AUTHENTICATED) {
 	echo <<<EOB
 		<li><a class="aright" href="$MY_SELF&CC=1&OB={$MYREQUEST['OB']}" onClick="javascript:return confirm('Are you sure?');">Clear Cache</a></li>
-EOB;
+eob;
 }
 echo <<<EOB
 	</ol>
-EOB;
+eob;
 
 
 // CONTENT
 echo <<<EOB
 	<div class=content>
-EOB;
+eob;
 
 // MAIN SWITCH STATEMENT
 
@@ -788,7 +788,7 @@ 
 		<table cellspacing=0><tbody>
 		<tr class=tr-0><td class=td-0>APCu Version</td><td>$apcversion</td></tr>
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
-EOB;
+eob;
 
 	if(!empty($_SERVER['SERVER_NAME']))
 		echo "<tr class=tr-0><td class=td-0>APCu Host</td><td>{$_SERVER['SERVER_NAME']} $host</td></tr>\n";
@@ -799,7 +799,7 @@ 
 		<tr class=tr-0><td class=td-0>Shared Memory</td><td>{$mem['num_seg']} Segment(s) with $seg_size
     <br/> ({$cache['memory_type']} memory)
     </td></tr>
-EOB;
+eob;
 	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['start_time']),'</td></tr>';
 	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['start_time']),'</td></tr>';
 	echo <<<EOB
@@ -822,7 +822,7 @@ 
 		</div>
 
 		<div class="info div2"><h2>Runtime Settings</h2><table cellspacing=0><tbody>
-EOB;
+eob;
 
 	$j = 0;
 	foreach (ini_get_all('apcu') as $k => $v) {
@@ -841,14 +841,14 @@ 
 
 		<div class="graph div3"><h2>Host Status Diagrams</h2>
 		<table cellspacing=0><tbody>
-EOB;
+eob;
 	$size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
 echo <<<EOB
 		<tr>
 		<td class=td-0>$mem_note</td>
 		<td class=td-1>Hits &amp; Misses</td>
 		</tr>
-EOB;
+eob;
 
 	echo
 		graphics_avail() ?
@@ -872,7 +872,7 @@ 
 		<table cellspacing=0><tbody>
 		<tr>
 		<td class=td-0 colspan=2><br/>
-EOB;
+eob;
 
 	// Fragementation: (freeseg - 1) / total_seg
 	$nseg = $freeseg = $fragsize = $freetotal = 0;
@@ -900,13 +900,13 @@ 
 		$size='width='.(2*GRAPH_SIZE+150).' height='.(GRAPH_SIZE+10);
 		echo <<<EOB
 			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
-EOB;
+eob;
 	}
 	echo <<<EOB
 		</br>Fragmentation: $frag
 		</td>
 		</tr>
-EOB;
+eob;
         if(isset($mem['adist'])) {
           foreach($mem['adist'] as $i=>$v) {
             $cur = pow(2,$i); $nxt = pow(2,$i+1)-1;
@@ -918,7 +918,7 @@ 
         echo <<<EOB
 		</tbody></table>
 		</div>
-EOB;
+eob;
 
 	break;
 
@@ -942,7 +942,7 @@ 
 		<div class=sorting><form>Scope:
 		<input type=hidden name=OB value={$MYREQUEST['OB']}>
 		<select name=SCOPE>
-EOB;
+eob;
 	echo
 		"<option value=A",$MYREQUEST['SCOPE']=='A' ? " selected":"",">Active</option>",
 		"<option value=D",$MYREQUEST['SCOPE']=='D' ? " selected":"",">Deleted</option>",
@@ -1083,7 +1083,7 @@ 
 	}
 	echo <<< EOB
 		</tbody></table>
-EOB;
+eob;
 
 	if ($list && $i < count($list)) {
 		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
@@ -1091,7 +1091,7 @@ 
 
 	echo <<< EOB
 		</div>
-EOB;
+eob;
 	break;
 
 // -----------------------------------------------
@@ -1104,7 +1104,7 @@ 
 		<tr>
 		<th></th>
 		</tr>
-EOB;
+eob;
   if (defined('PROXY')) {
     $ctxt = stream_context_create( array( 'http' => array( 'proxy' => PROXY, 'request_fulluri' => True ) ) );
     $rss = @file_get_contents("http://pecl.php.net/feeds/pkg_apcu.rss", False, $ctxt);
@@ -1150,14 +1150,14 @@ 
 	echo <<< EOB
 		</tbody></table>
 		</div>
-EOB;
+eob;
 	break;
 
 }
 
 echo <<< EOB
 	</div>
-EOB;
+eob;
 
 ?>
 

doc/test-cli.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 		// Find all /test/*Test.php files/classes
 		foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file)
 		{
-			if ($file->isFile() && preg_match('|/test/[^/]+Test\.php$|', $path=$file->getPathname()))
+			if ($file->isFile() && preg_match('|/test/[^/]+Test\.php$|', $path = $file->getPathname()))
 			{
 				// Include the test suite, as it is NOT autoloadable in test directory!
 				require_once($path);
@@ -46,7 +46,7 @@ 
 					$class = 'EGroupware\\'.ucfirst($matches[1]);
 					if (!empty($matches[2]))
 					{
-						foreach(explode('/', $matches[3]) as $name)
+						foreach (explode('/', $matches[3]) as $name)
 						{
 							$class .= '\\'.ucfirst($name);
 						}

Braces +4 added lines, -1 removed lines

@@ -7,10 +7,13 @@
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling as web-page
 {
 	die('<h1>test-cli.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 ini_set('apc.enable_cli', true);
 

api/src/loader/deprecated_factory.php

Spacing +16 added lines, -16 removed lines

@@ -27,7 +27,7 @@ 
  */
 function CreateObject($class)
 {
-	list($appname,$classname) = explode('.',$class);
+	list($appname, $classname) = explode('.', $class);
 
 	if (!class_exists($classname))
 	{
@@ -53,7 +53,7 @@ 
 				$classname = $replace[$classname];
 			}
 		}
-		if (!file_exists($f=EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
+		if (!file_exists($f = EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php'))
 		{
 			throw new Api\Exception\AssertionFailed(__FUNCTION__."($classname) file $f not found!");
 		}
@@ -61,7 +61,7 @@ 
 		require_once(EGW_INCLUDE_ROOT.'/'.$appname.'/inc/class.'.$classname.'.inc.php');
 	}
 	$args = func_get_args();
-	switch(count($args))
+	switch (count($args))
 	{
 		case 1:
 			$obj = new $classname;
@@ -70,18 +70,18 @@ 
 			$obj = new $classname($args[1]);
 			break;
 		case 3:
-			$obj = new $classname($args[1],$args[2]);
+			$obj = new $classname($args[1], $args[2]);
 			break;
 		case 4:
-			$obj = new $classname($args[1],$args[2],$args[3]);
+			$obj = new $classname($args[1], $args[2], $args[3]);
 			break;
 		default:
-			$code = '$obj = new ' . $classname . '(';
-			foreach(array_keys($args) as $n)
+			$code = '$obj = new '.$classname.'(';
+			foreach (array_keys($args) as $n)
 			{
 				if ($n)
 				{
-					$code .= ($n > 1 ? ',' : '') . '$args[' . $n . ']';
+					$code .= ($n > 1 ? ',' : '').'$args['.$n.']';
 				}
 			}
 			$code .= ');';
@@ -107,7 +107,7 @@ 
 {
 	if (!is_callable($acm))
 	{
-		list(,$class,$method) = explode('.',$acm);
+		list(,$class, $method) = explode('.', $acm);
 
 		if (class_exists($class))
 		{
@@ -118,17 +118,17 @@ 
 			$obj = CreateObject($acm);
 		}
 
-		if (!method_exists($obj,$method))
+		if (!method_exists($obj, $method))
 		{
 			echo "<p><b>".function_backtrace()."</b>: no methode '$method' in class '$class'</p>\n";
 			return False;
 		}
-		$acm = array($obj,$method);
+		$acm = array($obj, $method);
 	}
 	$args = func_get_args();
 	unset($args[0]);
 
-	return call_user_func_array($acm,$args);
+	return call_user_func_array($acm, $args);
 }
 
 /**
@@ -146,13 +146,13 @@ 
  */
 function ExecMethod($method, $functionparam = '_UNDEF_', $loglevel = 3, $classparams = '_UNDEF_')
 {
-	unset($loglevel);	// not used
+	unset($loglevel); // not used
 	/* Need to make sure this is working against a single dimensional object */
-	$partscount = count(explode('.',$method)) - 1;
+	$partscount = count(explode('.', $method)) - 1;
 
 	if (!is_callable($method) && $partscount == 2)
 	{
-		list($appname,$classname,$functionname) = explode(".", $method);
+		list($appname, $classname, $functionname) = explode(".", $method);
 
 		if ($classparams != '_UNDEF_' && ($classparams || $classparams != 'True'))
 		{
@@ -176,7 +176,7 @@ 
 	}
 	if (is_callable($method))
 	{
-		return $functionparam != '_UNDEF_' ? call_user_func($method,$functionparam) : call_user_func($method);
+		return $functionparam != '_UNDEF_' ? call_user_func($method, $functionparam) : call_user_func($method);
 	}
 	error_log("ExecMethod('$method', ...) Error in parts! ".function_backtrace());
 	return false;

api/src/Accounts/Ads.php

Doc Comments +8 added lines, -8 removed lines

@@ -129,7 +129,7 @@ 
 	/**
 	 * Factory method and singelton to get adLDAP object for given configuration or default server config
 	 *
-	 * @param array $config=null values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
+	 * @param array $config values for keys 'ads_domain', 'ads_host' (required) and optional 'ads_admin_user', 'ads_admin_passwd', 'ads_connection'
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
@@ -308,7 +308,7 @@ 
 	 * Convert binary GUID to string
 	 *
 	 * @param string $objectguid
-	 * @return int
+	 * @return string
 	 */
 	public function objectguid2str($objectguid)
 	{
@@ -319,7 +319,7 @@ 
 	 * Convert a string GUID to hex string used in filter
 	 *
 	 * @param string $strGUID
-	 * @return int
+	 * @return string
 	 */
 	public function objectguid2hex($strGUID)
 	{
@@ -378,7 +378,7 @@ 
 	 * Delete one account, deletes also all acl-entries for that account
 	 *
 	 * @param int $account_id numeric account_id
-	 * @return boolean true on success, false otherwise
+	 * @return string|boolean true on success, false otherwise
 	 */
 	function delete($account_id)
 	{
@@ -1138,7 +1138,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1335,7 +1335,7 @@ 
 	 * - activate user
 	 *
 	 * @param array $attributes The attributes to set to the user account
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{
@@ -1525,7 +1525,7 @@ 
     * @param string $username The username to query
     * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
     * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
+    * @return string|boolean
     */
     public function modify($username, $attributes, $isGUID = false)
     {
@@ -1590,7 +1590,7 @@ 
 	 * Extended to allow to specify $attribute["container"] as string, because array hardcodes "OU=", while Samba4 and win2008r2 uses "CN=Users"
 	 *
 	 * @param array $attributes Default attributes of the group
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function create($attributes)
 	{

Indentation +174 added lines, -174 removed lines

@@ -807,11 +807,11 @@ 
 	}
 
 	/**
-	* Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
-	*
-	* @param long $unixTime
-	* @return long windowsTime
-	*/
+	 * Add seconds between 1601-01-01 and 1970-01-01 and multiply by 10000000
+	 *
+	 * @param long $unixTime
+	 * @return long windowsTime
+	 */
 	public static function convertUnixTimeToWindowsTime($unixTime)
 	{
 		return ($unixTime + 11644477200) * 10000000;
@@ -1263,10 +1263,10 @@ 
 	}
 
 	/**
-    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
-    *
-    * Extended to use mbstring to convert from arbitrary charset to utf-8
-	*/
+	 * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to utf-8
+	 */
 	public function encode8Bit(&$item, $key)
 	{
 		if ($this->charset != 'utf-8' && $key != 'password')
@@ -1294,29 +1294,29 @@ 
 		return $this->userClass;
 	}
 
-    /**
-    * Get the group class interface
-    *
-    * @return adLDAPGroups
-    */
-    public function group() {
-        if (!$this->groupClass) {
-            $this->groupClass = new adLDAPGroups($this);
-        }
-        return $this->groupClass;
-    }
-
-    /**
-    * Get the utils class interface
-    *
-    * @return adLDAPUtils
-    */
-    public function utilities() {
-        if (!$this->utilClass) {
-            $this->utilClass = new adLDAPUtils($this);
-        }
-        return $this->utilClass;
-    }
+	/**
+	 * Get the group class interface
+	 *
+	 * @return adLDAPGroups
+	 */
+	public function group() {
+		if (!$this->groupClass) {
+			$this->groupClass = new adLDAPGroups($this);
+		}
+		return $this->groupClass;
+	}
+
+	/**
+	 * Get the utils class interface
+	 *
+	 * @return adLDAPUtils
+	 */
+	public function utilities() {
+		if (!$this->utilClass) {
+			$this->utilClass = new adLDAPUtils($this);
+		}
+		return $this->utilClass;
+	}
 }
 
 /**
@@ -1405,45 +1405,45 @@ 
 		return true;
 	}
 
-    /**
-    * Encode a password for transmission over LDAP
-    *
-    * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
-    *
-    * @param string $password The password to encode
-    * @return string
-    */
-    public function encodePassword($password)
-    {
-        $password="\"".$password."\"";
-        if (function_exists('mb_convert_encoding') && !empty($this->adldap->charset))
-        {
-            return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
-        }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
-        return $encoded;
-    }
-
-    /**
-     * Set a password
-     *
-     * Requires "Reset password" priviledges from bind user!
-     *
+	/**
+	 * Encode a password for transmission over LDAP
+	 *
+	 * Extended to use mbstring to convert from arbitrary charset to UTF-16LE
+	 *
+	 * @param string $password The password to encode
+	 * @return string
+	 */
+	public function encodePassword($password)
+	{
+		$password="\"".$password."\"";
+		if (function_exists('mb_convert_encoding') && !empty($this->adldap->charset))
+		{
+			return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
+		}
+		$encoded="";
+		for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+		return $encoded;
+	}
+
+	/**
+	 * Set a password
+	 *
+	 * Requires "Reset password" priviledges from bind user!
+	 *
 	 * We can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2!
 	 *
-     * @param string $dn
-     * @param string $password
-     * @return boolean
-     */
-    public function setPassword($dn, $password)
-    {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
-    		'unicodePwd' => $this->encodePassword($password),
-    	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
-    	return $result;
-    }
+	 * @param string $dn
+	 * @param string $password
+	 * @return boolean
+	 */
+	public function setPassword($dn, $password)
+	{
+		$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+			'unicodePwd' => $this->encodePassword($password),
+		));
+		if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+		return $result;
+	}
 
 	/**
 	 * Check if we can to a real password change, not just a password reset
@@ -1457,30 +1457,30 @@ 
 		return function_exists('ldap_modify_batch');
 	}
 
-    /**
-    * Set the password of a user - This must be performed over SSL
-    *
-    * @param string $username The username to modify
-    * @param string $password The new password
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-	* @param string $old_password old password for password change, if supported
-    * @return bool
-    */
-    public function password($username, $password, $isGUID = false, $old_password=null)
-    {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        $add=array();
+	/**
+	 * Set the password of a user - This must be performed over SSL
+	 *
+	 * @param string $username The username to modify
+	 * @param string $password The new password
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @param string $old_password old password for password change, if supported
+	 * @return bool
+	 */
+	public function password($username, $password, $isGUID = false, $old_password=null)
+	{
+		if ($username === NULL) { return false; }
+		if ($password === NULL) { return false; }
+		if (!$this->adldap->getLdapBind()) { return false; }
+		if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		$add=array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1502,76 +1502,76 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
-            $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
-                    $msg .= ' Your password might not match the password policy.';
-                }
-                throw new adLDAPException($msg);
-            }
-            else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-    * Modify a user
-    *
-    * @param string $username The username to query
-    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
-    * @param bool $isGUID Is the username passed a GUID or a samAccountName
-    * @return bool
-    */
-    public function modify($username, $attributes, $isGUID = false)
-    {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
-            throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
-        }
-
-        // Find the dn of the user
-        $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
-            return false;
-        }
-
-        // Translate the update to the LDAP schema
-        $mod = $this->adldap->adldap_schema($attributes);
-
-        // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
-            return false;
-        }
-
-        // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
-                $controlOptions = array("NORMAL_ACCOUNT");
-            }
-            else {
-                $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
-            }
-            $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
-        }
+		if ($result === false){
+			$err = ldap_errno($this->adldap->getLdapConnection());
+			if ($err) {
+				$msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
+				if($err == 53) {
+					$msg .= ' Your password might not match the password policy.';
+				}
+				throw new adLDAPException($msg);
+			}
+			else {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Modify a user
+	 *
+	 * @param string $username The username to query
+	 * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+	 * @param bool $isGUID Is the username passed a GUID or a samAccountName
+	 * @return bool
+	 */
+	public function modify($username, $attributes, $isGUID = false)
+	{
+		if ($username === NULL) { return "Missing compulsory field [username]"; }
+		if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+			throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
+		}
+
+		// Find the dn of the user
+		$userDn = $this->dn($username, $isGUID);
+		if ($userDn === false) {
+			return false;
+		}
+
+		// Translate the update to the LDAP schema
+		$mod = $this->adldap->adldap_schema($attributes);
+
+		// Check to see if this is an enabled status update
+		if (!$mod && !array_key_exists("enabled", $attributes)){
+			return false;
+		}
+
+		// Set the account control attribute (only if specified)
+		if (array_key_exists("enabled", $attributes)){
+			if ($attributes["enabled"]){
+				$controlOptions = array("NORMAL_ACCOUNT");
+			}
+			else {
+				$controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
+			}
+			$mod["userAccountControl"][0] = $this->accountControl($controlOptions);
+		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($mod['unicodePwd']);
 
 		if ($mod)
 		{
-	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
+			// Do the update
+			$result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+			if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
-	        	return false;
-	        }
+				return false;
+			}
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+		if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1636,23 +1636,23 @@ 
 		return $this->adldap->encode8bit($item, $key);
 	}
 
-    /**
-    * Escape strings for the use in LDAP filters
-    *
-    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
-    * Ported from Perl's Net::LDAP::Util escape_filter_value
-    *
-    * @param string $str The string the parse
-    * @author Port by Andreas Gohr <andi@splitbrain.org>
-    * @return string
-    */
-    public function ldapSlashes($str){
-        return preg_replace_callback(
-      		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
-            	return "\\".join("", unpack("H2", $matches[1]));
-        	},
-        	$str
-    	);
-    }
+	/**
+	 * Escape strings for the use in LDAP filters
+	 *
+	 * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+	 * Ported from Perl's Net::LDAP::Util escape_filter_value
+	 *
+	 * @param string $str The string the parse
+	 * @author Port by Andreas Gohr <andi@splitbrain.org>
+	 * @return string
+	 */
+	public function ldapSlashes($str){
+		return preg_replace_callback(
+	  		'/([\x00-\x1F\*\(\)\\\\])/',
+			function ($matches) {
+				return "\\".join("", unpack("H2", $matches[1]));
+			},
+			$str
+		);
+	}
 }

Braces +238 added lines, -79 removed lines

@@ -136,12 +136,21 @@ 
 	public static function get_adldap(array &$config=null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config)
+		{
+			$config =& $GLOBALS['egw_info']['server'];
+		}
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
-			if (empty($config['ads_host'])) throw new Api\Exception("Required ADS host name(s) missing!");
-			if (empty($config['ads_domain'])) throw new Api\Exception("Required ADS domain missing!");
+			if (empty($config['ads_host']))
+			{
+				throw new Api\Exception("Required ADS host name(s) missing!");
+			}
+			if (empty($config['ads_domain']))
+			{
+				throw new Api\Exception("Required ADS domain missing!");
+			}
 
 			$base_dn_parts = array();
 			foreach(explode('.', $config['ads_domain']) as $dc)
@@ -160,7 +169,10 @@ 
 				'charset' => Api\Translation::charset(),
 			);
 			$adldap[$config['ads_domain']] = new adLDAP($options);
-			if (self::$debug) error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			if (self::$debug)
+			{
+				error_log(__METHOD__."() new adLDAP(".array2string($options).") returned ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
+			}
 		}
 		//else error_log(__METHOD__."() returning cached adLDAP ".array2string($adldap[$config['ads_domain']]).' '.function_backtrace());
 		return $adldap[$config['ads_domain']];
@@ -241,7 +253,10 @@ 
 			throw new Api\Exception\WrongUserinput("Wrong or not configured ADS context '$context' (baseDN='$base')!");
 		}
 		$container = $matches[1];
-		if (self::$debug) error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."() context='$context', base='$base' returning ".array2string($container));
+		}
 		return $container;
 	}
 
@@ -334,10 +349,16 @@ 
 	 */
 	public function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		$ret = $account_id < 0 ? $this->_read_group($account_id) : $this->_read_user($account_id);
-		if (self::$debug) error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -370,7 +391,10 @@ 
 		}
 		$ret = $is_group ? $this->_save_group($data, $old) : $this->_save_user($data, $old);
 
-		if (self::$debug) error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($data).') returning '.array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -400,7 +424,10 @@ 
 		{
 			$ret = $this->adldap->user()->delete($account_lid);
 		}
-		if (self::$debug) error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."($account_id) account_lid='$account_lid' returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -562,11 +589,17 @@ 
 	protected static function _when2ts($_when)
 	{
 		static $utc=null;
-		if (!isset($utc)) $utc = new \DateTimeZone('UTC');
+		if (!isset($utc))
+		{
+			$utc = new \DateTimeZone('UTC');
+		}
 
 		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
 		$datetime = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
-		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
+		if (Api\DateTime::$server_timezone)
+		{
+			$datetime->setTimezone(Api\DateTime::$server_timezone);
+		}
 
 		return $datetime->getTimestamp();
 	}
@@ -583,12 +616,15 @@ 
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
-		if (!$old)	// new entry
+		if (!$old)
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'group_name',
 				'account_description' => 'description',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -668,7 +704,9 @@ 
 			$data['account_fullname'] = $data['account_firstname'].' '.$data['account_lastname'];
 		}
 
-		if (($new_entry = !$old))	// new entry
+		if (($new_entry = !$old))
+		{
+			// new entry
 		{
 			static $new2adldap = array(
 				'account_lid'       => 'username',
@@ -679,6 +717,7 @@ 
 				'account_passwd'    => 'password',
 				'account_status'    => 'enabled',
 			);
+		}
 			$attributes = array();
 			foreach($new2adldap as $egw => $adldap)
 			{
@@ -687,7 +726,10 @@ 
 				{
 					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
-				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
+				if (isset($data[$egw]))
+				{
+					$attributes[$adldap] = $data[$egw];
+				}
 			}
 			$attributes['enabled'] = !isset($data['account_status']) || $data['account_status'] === 'A';
 			$attributes['container'] = $this->_get_container();
@@ -773,7 +815,11 @@ 
 							self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd']))
+						{
+							continue;
+						}
+						// cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -853,8 +899,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);
@@ -945,7 +997,10 @@ 
 			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
 			foreach($this->_callback_order as &$col)
 			{
-				if (substr($col, 0, 8) !== 'account_') $col = 'account_'.$col;
+				if (substr($col, 0, 8) !== 'account_')
+				{
+					$col = 'account_'.$col;
+				}
 			}
 			$sortedAccounts = $accounts;
 			uasort($sortedAccounts,array($this,'_sort_callback'));
@@ -1055,7 +1110,10 @@ 
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
-			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			if (self::$debug)
+			{
+				error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
+			}
 			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
@@ -1064,7 +1122,10 @@ 
 		{
 			foreach($allValues as $key => $data)
 			{
-				if ($key === 'count') continue;
+				if ($key === 'count')
+				{
+					continue;
+				}
 
 				if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ||
 					$account_type == 'g' && $data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP))
@@ -1082,7 +1143,10 @@ 
 					$attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
 			}
 		}
-		else if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		else if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter')=$sri allValues=".array2string($allValues));
+		}
 
 		//error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returning ".array2string($accounts).' '.function_backtrace());
 		return $accounts;
@@ -1119,7 +1183,10 @@ 
 				break;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		if (self::$debug)
+		{
+			error_log(__METHOD__."('$name', '$which', '$account_type') returning ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1161,7 +1228,10 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0) return false;
+		if (!($data = $this->frontend->read($account_id)) || $data['account_id'] <= 0)
+		{
+			return false;
+		}
 
 		return $data['memberships'];
 	}
@@ -1176,7 +1246,10 @@ 
 	 */
 	function members($gid)
 	{
-		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0) return false;
+		if (!($data = $this->frontend->read($gid)) || $data['account_id'] >= 0)
+		{
+			return false;
+		}
 
 		return $data['members'];
 	}
@@ -1190,7 +1263,10 @@ 
 	 */
 	function set_memberships($groups,$account_id)
 	{
-		if (!($account = $this->id2name($account_id))) return;
+		if (!($account = $this->id2name($account_id)))
+		{
+			return;
+		}
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
@@ -1207,7 +1283,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($groups).", $account_id) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 
@@ -1220,7 +1299,10 @@ 
 	 */
 	function set_members($users, $gid)
 	{
-		if (!($group = $this->id2name($gid))) return;
+		if (!($group = $this->id2name($gid)))
+		{
+			return;
+		}
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
@@ -1237,7 +1319,10 @@ 
 				$changed += (int)$ok;
 			}
 		}
-		if (self::$debug) error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		if (self::$debug)
+		{
+			error_log(__METHOD__.'('.array2string($users).", $gid) current=".array2string($current)." returning $changed");
+		}
 		return $changed;
 	}
 }
@@ -1291,8 +1376,10 @@ 
 	 *
 	 * @return adLDAPUsers
 	 */
-	public function user() {
-		if (!$this->userClass) {
+	public function user()
+	{
+		if (!$this->userClass)
+		{
 			$this->userClass = new adLDAPUsers($this);
 		}
 		return $this->userClass;
@@ -1303,8 +1390,10 @@ 
     *
     * @return adLDAPGroups
     */
-    public function group() {
-        if (!$this->groupClass) {
+    public function group()
+    {
+        if (!$this->groupClass)
+        {
             $this->groupClass = new adLDAPGroups($this);
         }
         return $this->groupClass;
@@ -1315,8 +1404,10 @@ 
     *
     * @return adLDAPUtils
     */
-    public function utilities() {
-        if (!$this->utilClass) {
+    public function utilities()
+    {
+        if (!$this->utilClass)
+        {
             $this->utilClass = new adLDAPUtils($this);
         }
         return $this->utilClass;
@@ -1344,18 +1435,32 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes))
+		{
+return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes))
+		{
+return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes))
+		{
+return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes))
+		{
+return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
+		{
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
-		if (!array_key_exists("display_name", $attributes)) {
+		if (!array_key_exists("display_name", $attributes))
+		{
 			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
 		}
 
@@ -1377,7 +1482,8 @@ 
 		$add["userAccountControl"][0] = $this->accountControl($control_options);
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
@@ -1386,7 +1492,8 @@ 
 
 		// Add the entry
 		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
@@ -1394,7 +1501,10 @@ 
 		// now password can be added to still disabled account
 		if (array_key_exists("password",$attributes))
 		{
-			if (!$this->setPassword($dn, $attributes['password'])) return false;
+			if (!$this->setPassword($dn, $attributes['password']))
+			{
+				return false;
+			}
 
 			// now account can be enabled
 			if ($attributes["enabled"])
@@ -1402,7 +1512,10 @@ 
 				$control_options = array("NORMAL_ACCOUNT");
 				$mod = array("userAccountControl" => $this->accountControl($control_options));
 				$result = ldap_modify($ds, $dn, $mod);
-				if (!$result) error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				if (!$result)
+				{
+					error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$dn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
+				}
 			}
 		}
 
@@ -1425,7 +1538,9 @@ 
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
         $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        for ($i=0; $i <strlen($password); $i++)
+        {
+$encoded.="{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1445,7 +1560,10 @@ 
     	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
-    	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	if (!$result)
+    	{
+    		error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
+    	}
     	return $result;
     }
 
@@ -1472,26 +1590,36 @@ 
     */
     public function password($username, $password, $isGUID = false, $old_password=null)
     {
-        if ($username === NULL) { return false; }
-        if ($password === NULL) { return false; }
-        if (!$this->adldap->getLdapBind()) { return false; }
-        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return false; }
+        if ($password === NULL)
+        {
+return false; }
+        if (!$this->adldap->getLdapBind())
+        {
+return false; }
+        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
         $add=array();
 
-		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
+		if (empty($old_password) || !function_exists('ldap_modify_batch'))
+		{
 			$add["unicodePwd"][0] = $this->encodePassword($password);
 
 			$result = @ldap_mod_replace($this->adldap->getLdapConnection(), $userDn, $add);
 		}
-		else {
+		else
+		{
 			$mods = array(
 				array(
 					"attrib"  => "unicodePwd",
@@ -1506,16 +1634,20 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false)
+        {
             $err = ldap_errno($this->adldap->getLdapConnection());
-            if ($err) {
+            if ($err)
+            {
                 $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                if($err == 53)
+                {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
             }
-            else {
+            else
+            {
                 return false;
             }
         }
@@ -1533,14 +1665,18 @@ 
     */
     public function modify($username, $attributes, $isGUID = false)
     {
-        if ($username === NULL) { return "Missing compulsory field [username]"; }
-        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) {
+        if ($username === NULL)
+        {
+return "Missing compulsory field [username]"; }
+        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())
+        {
             throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
         }
 
         // Find the dn of the user
         $userDn = $this->dn($username, $isGUID);
-        if ($userDn === false) {
+        if ($userDn === false)
+        {
             return false;
         }
 
@@ -1548,16 +1684,20 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes))
+        {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes))
+        {
+            if ($attributes["enabled"])
+            {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
-            else {
+            else
+            {
                 $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE");
             }
             $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
@@ -1569,14 +1709,18 @@ 
 		{
 	        // Do the update
 	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
-	        if ($result == false) {
-				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
+	        if ($result == false)
+	        {
+				if (isset($mod['unicodePwd']))
+				{
+					$mod['unicodePwd'] = '***';
+				}
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
         if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
-		{
+        {
 			return false;
 		}
 		return true;
@@ -1598,10 +1742,18 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes))
+		{
+return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes))
+		{
+return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes))
+		{
+return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"]))
+		{
+return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1611,16 +1763,21 @@ 
 		$add["cn"] = $attributes["group_name"];
 		$add["samaccountname"] = $attributes["group_name"];
 		$add["objectClass"] = "Group";
-		if (!empty($attributes["description"])) $add["description"] = $attributes["description"];
+		if (!empty($attributes["description"]))
+		{
+			$add["description"] = $attributes["description"];
+		}
 		//$add["member"] = $member_array; UNTESTED
 
 		// Determine the container
-		if (is_array($attributes['container'])) {
+		if (is_array($attributes['container']))
+		{
 			$attributes["container"] = array_reverse($attributes["container"]);
 			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
 		}
 		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
-		if ($result != true) {
+		if ($result != true)
+		{
 			return false;
 		}
 		return true;
@@ -1650,10 +1807,12 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str)
+    {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function ($matches)
+        	{
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

Spacing +110 added lines, -115 removed lines

@@ -133,10 +133,10 @@ 
 	 * @return adLDAP
 	 * @throws adLDAPException
 	 */
-	public static function get_adldap(array &$config=null)
+	public static function get_adldap(array &$config = null)
 	{
 		static $adldap = array();
-		if (!$config) $config =& $GLOBALS['egw_info']['server'];
+		if (!$config) $config = & $GLOBALS['egw_info']['server'];
 
 		if (!isset($adldap[$config['ads_domain']]))
 		{
@@ -144,7 +144,7 @@ 
 			if (empty($config['ads_domain'])) throw new Api\Exception("Required ADS domain missing!");
 
 			$base_dn_parts = array();
-			foreach(explode('.', $config['ads_domain']) as $dc)
+			foreach (explode('.', $config['ads_domain']) as $dc)
 			{
 				$base_dn_parts[] = 'DC='.$dc;
 			}
@@ -172,7 +172,7 @@ 
 	 * @param int $account_id
 	 * @return string|NULL
 	 */
-	protected function get_sid($account_id=null)
+	protected function get_sid($account_id = null)
 	{
 		static $domain_sid = null;
 		if (!isset($domain_sid))
@@ -207,14 +207,14 @@ 
 	 * @param boolean $set_if_empty =false true set from DN of "Domain Users" group #
 	 * @return string
 	 */
-	public function ads_context($set_if_empty=false)
+	public function ads_context($set_if_empty = false)
 	{
 		if (empty($this->frontend->config[self::ADS_CONTEXT]))
 		{
 			if ($set_if_empty && ($dn = $this->id2name(-self::DOMAIN_USERS_GROUP, 'account_dn')))
 			{
 				$dn = preg_replace('/^CN=.*?,(CN|OU)=/i', '$1=', $dn);
-				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT]=$dn, 'phpgwapi');
+				Api\Config::save_value(self::ADS_CONTEXT, $this->frontend->config[self::ADS_CONTEXT] = $dn, 'phpgwapi');
 			}
 			else
 			{
@@ -251,7 +251,7 @@ 
 	 * @param boolean $reconnect =false true: reconnect even if already connected
 	 * @return resource
 	 */
-	public function ldap_connection($reconnect=false)
+	public function ldap_connection($reconnect = false)
 	{
 		if (($reconnect || !($ds = $this->adldap->getLdapConnection())) &&
 			// call connect, thought I dont know how it can be not connected ...
@@ -415,8 +415,7 @@ 
 		$data = Api\Translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = -self::sid2account_id($sid);
 
 		$group = array(
@@ -453,7 +452,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'g', self::$group_attributes)))
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
 		$group = $this->_ldap2group(array_shift($data));
 
@@ -476,8 +475,7 @@ 
 		$data = Api\Translation::convert($_data, 'utf-8');
 
 		// no need to calculate sid, if already calculated
-		$sid = is_string($data['objectsid']) ? $data['objectsid'] :
-			$this->adldap->utilities()->getTextSID($data['objectsid'][0]);
+		$sid = is_string($data['objectsid']) ? $data['objectsid'] : $this->adldap->utilities()->getTextSID($data['objectsid'][0]);
 		$account_id = self::sid2account_id($sid);
 
 		$user = array(
@@ -493,12 +491,10 @@ 
 			'account_email'     => $data['mail'][0],
 			'account_fullname'  => $data['displayname'][0],
 			'account_phone'     => $data['telephonenumber'][0],
-			'account_status'    => $data['useraccountcontrol'][0] & 2 ? false : 'A',
+			'account_status'    => $data['useraccountcontrol'][0]&2 ? false : 'A',
 			'account_expires'   => !isset($data['accountexpires']) || !$data['accountexpires'][0] ||
-				$data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
-			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 :
-				$this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
+				$data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]),
+			'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),
 			'account_created' => !isset($data['whencreated'][0]) ? null :
 				self::_when2ts($data['whencreated'][0]),
 			'account_modified' => !isset($data['whenchanged'][0]) ? null :
@@ -509,7 +505,7 @@ 
 		{
 			$user['account_status'] = false;
 		}
-		$user['person_id'] = $user['account_guid'];	// id of contact
+		$user['person_id'] = $user['account_guid']; // id of contact
 		//error_log(__METHOD__."(".array2string($data).") returning ".array2string($user));
 		return $user;
 	}
@@ -539,7 +535,7 @@ 
 	{
 		if (!($data = $this->filter(array('objectsid' => $this->get_sid($account_id)), 'u', self::$user_attributes)))
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
 		$user = $this->_ldap2user(array_shift($data));
 
@@ -562,10 +558,10 @@ 
 	 */
 	protected static function _when2ts($_when)
 	{
-		static $utc=null;
+		static $utc = null;
 		if (!isset($utc)) $utc = new \DateTimeZone('UTC');
 
-		list($when) = explode('.', $_when);	// remove .0Z not understood by createFromFormat
+		list($when) = explode('.', $_when); // remove .0Z not understood by createFromFormat
 		$datetime = Api\DateTime::createFromFormat(self::WHEN_FORMAT, $when, $utc);
 		if (Api\DateTime::$server_timezone) $datetime->setTimezone(Api\DateTime::$server_timezone);
 
@@ -580,7 +576,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_group(array &$data, array $old=null)
+	protected function _save_group(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 
@@ -591,7 +587,7 @@ 
 				'account_description' => 'description',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				$attributes[$adldap] = (string)$data[$egw];
 			}
@@ -628,11 +624,11 @@ 
 			'account_description' => 'description',
 		);
 		$ldap = array();
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_description':
 						$ldap[$adldap] = !empty($data[$egw]) ? $data[$egw] : array();
@@ -645,7 +641,7 @@ 
 			}
 		}
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret));
 			return false;
@@ -661,7 +657,7 @@ 
 	 * @param array $old =null current data
 	 * @return int|false account_id or false on error
 	 */
-	protected function _save_user(array &$data, array $old=null)
+	protected function _save_user(array &$data, array $old = null)
 	{
 		//error_log(__METHOD__.'('.array2string($data).', old='.array2string($old).')');
 		if (!isset($data['account_fullname']) && !empty($data['account_firstname']) && !empty($data['account_lastname']))
@@ -681,12 +677,12 @@ 
 				'account_status'    => 'enabled',
 			);
 			$attributes = array();
-			foreach($new2adldap as $egw => $adldap)
+			foreach ($new2adldap as $egw => $adldap)
 			{
 				if ($egw == 'account_passwd' && (empty($data[$egw]) ||
 					!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()))
 				{
-					continue;	// do not try to set password, if no SSL or TLS, whole user creation will fail
+					continue; // do not try to set password, if no SSL or TLS, whole user creation will fail
 				}
 				if (isset($data[$egw])) $attributes[$adldap] = $data[$egw];
 			}
@@ -723,7 +719,7 @@ 
 			'account_firstname' => 'firstname',
 			'account_lastname'  => 'surname',
 			'account_email'     => 'email',
-			'account_fullname'  => 'display_name',	// handeled currently in rename above, as not supported by adLDAP
+			'account_fullname'  => 'display_name', // handeled currently in rename above, as not supported by adLDAP
 			'account_passwd'    => 'password',
 			'account_status'    => 'enabled',
 			'account_primary_group' => 'primarygroupid',
@@ -736,7 +732,7 @@ 
 		// for a new entry set certain values (eg. profilePath) to in setup configured value
 		if ($new_entry)
 		{
-			foreach($this->frontend->config as $name => $value)
+			foreach ($this->frontend->config as $name => $value)
 			{
 				if (substr($name, 0, 8) == 'ads_new_')
 				{
@@ -744,22 +740,22 @@ 
 				}
 			}
 		}
-		foreach($egw2adldap as $egw => $adldap)
+		foreach ($egw2adldap as $egw => $adldap)
 		{
 			if (isset($data[$egw]) && (string)$data[$egw] != (string)$old[$egw])
 			{
-				switch($egw)
+				switch ($egw)
 				{
 					case 'account_passwd':
 						if (!empty($data[$egw]) && ($this->adldap->getUseSSL() || $this->adldap->getUseTLS()))
 						{
-							$attributes[$adldap] = $data[$egw];	// only try to set password, if no SSL or TLS
+							$attributes[$adldap] = $data[$egw]; // only try to set password, if no SSL or TLS
 						}
 						break;
 					case 'account_primary_group':
 						// setting a primary group seems to fail, if user is no member of that group
 						if (isset($old['memberships'][$data[$egw]]) ||
-							($group=$this->id2name($data[$egw])) && $this->adldap->group()->addUser($group, $data['account_id']))
+							($group = $this->id2name($data[$egw])) && $this->adldap->group()->addUser($group, $data['account_id']))
 						{
 							$old['memberships'][$data[$egw]] = $group;
 							$ldap[$adldap] = abs($data[$egw]);
@@ -770,11 +766,10 @@ 
 						$ldap['userPrincipalName'] = $data[$egw].'@'.$this->frontend->config['ads_domain'];
 						break;
 					case 'account_expires':
-						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER :
-							self::convertUnixTimeToWindowsTime($data[$egw]);
+						$attributes[$adldap] = $data[$egw] == -1 ? self::EXPIRES_NEVER : self::convertUnixTimeToWindowsTime($data[$egw]);
 						break;
 					case 'account_status':
-						if ($new_entry && empty($data['account_passwd'])) continue;	// cant active new account without passwd!
+						if ($new_entry && empty($data['account_passwd'])) continue; // cant active new account without passwd!
 						$attributes[$adldap] = $data[$egw] == 'A';
 						break;
 					case 'account_lastpwd_change':
@@ -796,7 +791,7 @@ 
 		}
 		//elseif ($attributes) error_log(__METHOD__."(".array2string($data).") adldap->user()->modify('$data[account_lid]', ".array2string($attributes).') returned '.array2string($ret).' '.function_backtrace());
 		// attributes not (yet) suppored by adldap
-		if ($ldap && !($ret = @ldap_modify($ds=$this->ldap_connection(), $old['account_dn'], $ldap)))
+		if ($ldap && !($ret = @ldap_modify($ds = $this->ldap_connection(), $old['account_dn'], $ldap)))
 		{
 			error_log(__METHOD__."(".array2string($data).") ldap_modify($ds, '$old[account_dn]', ".array2string($ldap).') returned '.array2string($ret).' ('.ldap_error($ds).') '.function_backtrace());
 			return false;
@@ -869,11 +864,11 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] !== 'groups')
+			if ($param['type'] !== 'groups')
 			{
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -904,14 +899,14 @@ 
 					$membership_filter = '(|(memberOf='.$this->id2name((int)$param['type'], 'account_dn').')(PrimaryGroupId='.abs($param['type']).'))';
 					$filter = $filter ? "(&$membership_filter$filter)" : $membership_filter;
 				}
-				foreach($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'u', self::$user_attributes) as $account_id => $data)
 				{
 					$account = $this->_ldap2user($data);
 					if ($param['active'] && !$this->frontend->is_active($account))
 					{
 						continue;
 					}
-					$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],$account['account_firstname'],$account['account_lastname'],$account['account_id']);
+					$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'], $account['account_firstname'], $account['account_lastname'], $account['account_id']);
 					$accounts[$account_id] = $account;
 				}
 			}
@@ -920,9 +915,9 @@ 
 				$query = Api\Ldap::quote(strtolower($param['query']));
 
 				$filter = null;
-				if(!empty($query) && $query != '*')
+				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -936,27 +931,27 @@ 
 					}
 					$filter = "(|(cn=$query)(description=$query))";
 				}
-				foreach($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
+				foreach ($this->filter($filter, 'g', self::$group_attributes) as $account_id => $data)
 				{
 					$accounts[$account_id] = $this->_ldap2group($data);
 				}
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
-			foreach($this->_callback_order as &$col)
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
+			foreach ($this->_callback_order as &$col)
 			{
 				if (substr($col, 0, 8) !== 'account_') $col = 'account_'.$col;
 			}
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$account_search[$unl_serial]['data'] = $sortedAccounts;
 
 			$account_search[$unl_serial]['total'] = $this->total = count($accounts);
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['data'] = array_slice($sortedAccounts, $start, $offset);
 			$account_search[$serial]['total'] = $this->total;
@@ -987,19 +982,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	protected function _sort_callback($a,$b)
+	protected 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;
 			}
@@ -1018,9 +1013,9 @@ 
 	 * @param array $accounts =array() array to add filtered accounts too, default empty array
 	 * @return array account_id => account_lid or values for $attrs pairs
 	 */
-	protected function filter($attr_filter, $account_type=null, array $attrs=null, array $accounts=array())
+	protected function filter($attr_filter, $account_type = null, array $attrs = null, array $accounts = array())
 	{
-		switch($account_type)
+		switch ($account_type)
 		{
 			case 'u':
 				$type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')';
@@ -1045,25 +1040,25 @@ 
 			}
 			else
 			{
-				foreach($attr_filter as $attr => $value)
+				foreach ($attr_filter as $attr => $value)
 				{
 					$filter .= '('.$attr.'='.$this->adldap->utilities()->ldapSlashes($value).')';
 				}
 			}
 			$filter .= $type_filter.')';
 		}
-		$sri = ldap_search($ds=$this->ldap_connection(), $context=$this->ads_context(), $filter,
+		$sri = ldap_search($ds = $this->ldap_connection(), $context = $this->ads_context(), $filter,
 			$attrs ? $attrs : self::$default_attributes);
 		if (!$sri)
 		{
 			if (self::$debug) error_log(__METHOD__.'('.array2string($attr_filter).", '$account_type') ldap_search($ds, '$context', '$filter') returned ".array2string($sri).' trying to reconnect ...');
-			$sri = ldap_search($ds=$this->ldap_connection(true), $context=$this->ads_context(), $filter,
+			$sri = ldap_search($ds = $this->ldap_connection(true), $context = $this->ads_context(), $filter,
 				$attrs ? $attrs : self::$default_attributes);
 		}
 
 		if ($sri && ($allValues = ldap_get_entries($ds, $sri)))
 		{
-			foreach($allValues as $key => $data)
+			foreach ($allValues as $key => $data)
 			{
 				if ($key === 'count') continue;
 
@@ -1077,7 +1072,7 @@ 
 
 				if ($data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT && $rid < self::MIN_ACCOUNT_ID)
 				{
-					continue;	// ignore system accounts incl. "Administrator"
+					continue; // ignore system accounts incl. "Administrator"
 				}
 				$accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP ? '-' : '').$rid] =
 					$attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
@@ -1101,7 +1096,7 @@ 
 	 * @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)
 	 */
-	public function name2id($name, $which='account_lid', $account_type=null)
+	public function name2id($name, $which = 'account_lid', $account_type = null)
 	{
 		static $to_ldap = array(
 			'account_lid'   => 'samaccountname',
@@ -1113,7 +1108,7 @@ 
 		$ret = false;
 		if (isset($to_ldap[$which]))
 		{
-			foreach($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
+			foreach ($this->filter(array($to_ldap[$which] => $name), $account_type) as $account_id => $account_lid)
 			{
 				unset($account_lid);
 				$ret = $account_id;
@@ -1133,9 +1128,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)
 	 */
-	public function id2name($account_id, $which='account_lid')
+	public function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1147,9 +1142,9 @@ 
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
-		unset($_account_id, $ip);	// not used, but required by function signature
+		unset($_account_id, $ip); // not used, but required by function signature
 
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1189,21 +1184,21 @@ 
 	 * @param int $account_id uidnumber
 	 * @return int number of added or removed memberships
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		if (!($account = $this->id2name($account_id))) return;
 		$current = array_keys($this->memberships($account_id));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($groups, $current),		// add account to all groups he is currently not in
-			'remove' => array_diff($current, $groups),	// remove account from all groups he is only currently in
+		foreach (array(
+			'add' => array_diff($groups, $current), // add account to all groups he is currently not in
+			'remove' => array_diff($current, $groups), // remove account from all groups he is only currently in
 		) as $op => $memberships)
 		{
 			$func = $op.($account_id > 0 ? 'User' : 'Group');
-			foreach($memberships as $gid)
+			foreach ($memberships as $gid)
 			{
-				$ok = $this->adldap->group()->$func($group=$this->id2name($gid), $account);
+				$ok = $this->adldap->group()->$func($group = $this->id2name($gid), $account);
 				//error_log(__METHOD__.'('.array2string($groups).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1225,15 +1220,15 @@ 
 		$current = array_keys($this->members($gid));
 
 		$changed = 0;
-		foreach(array(
-			'add' => array_diff($users, $current),	// add members currently not in
-			'remove' => array_diff($current, $users),	// remove members only currently in
+		foreach (array(
+			'add' => array_diff($users, $current), // add members currently not in
+			'remove' => array_diff($current, $users), // remove members only currently in
 		) as $op => $members)
 		{
-			foreach($members as $account_id)
+			foreach ($members as $account_id)
 			{
 				$func = $op.($account_id > 0 ? 'User' : 'Group');
-				$ok = $this->adldap->group()->$func($group, $account=$this->id2name($account_id));
+				$ok = $this->adldap->group()->$func($group, $account = $this->id2name($account_id));
 				//error_log(__METHOD__.'('.array2string($users).", $account_id) $func('$group', '$account') returned ".array2string($ok));
 				$changed += (int)$ok;
 			}
@@ -1258,7 +1253,7 @@ 
 	 */
 	public $charset = 'iso-8859-1';
 
-	function __construct(array $options=array())
+	function __construct(array $options = array())
 	{
 		if (isset($options['charset']))
 		{
@@ -1345,19 +1340,19 @@ 
 	public function create($attributes)
 	{
 		// Check for compulsory fields
-		if (!array_key_exists("username", $attributes)){ return "Missing compulsory field [username]"; }
-		if (!array_key_exists("firstname", $attributes)){ return "Missing compulsory field [firstname]"; }
-		if (!array_key_exists("surname", $attributes)){ return "Missing compulsory field [surname]"; }
-		if (!array_key_exists("email", $attributes)){ return "Missing compulsory field [email]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
-
-		if (array_key_exists("password",$attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())){
+		if (!array_key_exists("username", $attributes)) { return "Missing compulsory field [username]"; }
+		if (!array_key_exists("firstname", $attributes)) { return "Missing compulsory field [firstname]"; }
+		if (!array_key_exists("surname", $attributes)) { return "Missing compulsory field [surname]"; }
+		if (!array_key_exists("email", $attributes)) { return "Missing compulsory field [email]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
+
+		if (array_key_exists("password", $attributes) && (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS())) {
 			throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
 		}
 
 		if (!array_key_exists("display_name", $attributes)) {
-			$attributes["display_name"] = $attributes["firstname"] . " " . $attributes["surname"];
+			$attributes["display_name"] = $attributes["firstname"]." ".$attributes["surname"];
 		}
 
 		// Translate the schema
@@ -1380,20 +1375,20 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
 		// we can NOT set password with ldap_add or ldap_modify, it needs ldap_mod_replace, at least under Win2008r2
 		unset($add['unicodePwd']);
 
 		// Add the entry
-		$result = ldap_add($ds=$this->adldap->getLdapConnection(), $dn="CN=" . $add["cn"][0] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($ds = $this->adldap->getLdapConnection(), $dn = "CN=".$add["cn"][0].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			error_log(__METHOD__."(".array2string($attributes).") ldap_add($ds, '$dn', ".array2string($add).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 			return false;
 		}
 
 		// now password can be added to still disabled account
-		if (array_key_exists("password",$attributes))
+		if (array_key_exists("password", $attributes))
 		{
 			if (!$this->setPassword($dn, $attributes['password'])) return false;
 
@@ -1420,13 +1415,13 @@ 
     */
     public function encodePassword($password)
     {
-        $password="\"".$password."\"";
+        $password = "\"".$password."\"";
         if (function_exists('mb_convert_encoding') && !empty($this->adldap->charset))
         {
             return mb_convert_encoding($password, 'UTF-16LE', $this->adldap->charset);
         }
-        $encoded="";
-        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        $encoded = "";
+        for ($i = 0; $i < strlen($password); $i++) { $encoded .= "{$password{$i}}\000"; }
         return $encoded;
     }
 
@@ -1443,7 +1438,7 @@ 
      */
     public function setPassword($dn, $password)
     {
-    	$result = ldap_mod_replace($ds=$this->adldap->getLdapConnection(), $dn, array(
+    	$result = ldap_mod_replace($ds = $this->adldap->getLdapConnection(), $dn, array(
     		'unicodePwd' => $this->encodePassword($password),
     	));
     	if (!$result) error_log(__METHOD__."('$dn', '$password') ldap_mod_replace($ds, '$dn', \$password) returned FALSE: ".ldap_error($ds));
@@ -1471,7 +1466,7 @@ 
 	* @param string $old_password old password for password change, if supported
     * @return bool
     */
-    public function password($username, $password, $isGUID = false, $old_password=null)
+    public function password($username, $password, $isGUID = false, $old_password = null)
     {
         if ($username === NULL) { return false; }
         if ($password === NULL) { return false; }
@@ -1485,7 +1480,7 @@ 
             return false;
         }
 
-        $add=array();
+        $add = array();
 
 		if (empty($old_password) || !function_exists('ldap_modify_batch')) {
 			$add["unicodePwd"][0] = $this->encodePassword($password);
@@ -1507,11 +1502,11 @@ 
 			);
 			$result = ldap_modify_batch($this->adldap->getLdapConnection(), $userDn, $mods);
 		}
-        if ($result === false){
+        if ($result === false) {
             $err = ldap_errno($this->adldap->getLdapConnection());
             if ($err) {
-                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
-                if($err == 53) {
+                $msg = 'Error '.$err.': '.ldap_err2str($err).'.';
+                if ($err == 53) {
                     $msg .= ' Your password might not match the password policy.';
                 }
                 throw new adLDAPException($msg);
@@ -1549,13 +1544,13 @@ 
         $mod = $this->adldap->adldap_schema($attributes);
 
         // Check to see if this is an enabled status update
-        if (!$mod && !array_key_exists("enabled", $attributes)){
+        if (!$mod && !array_key_exists("enabled", $attributes)) {
             return false;
         }
 
         // Set the account control attribute (only if specified)
-        if (array_key_exists("enabled", $attributes)){
-            if ($attributes["enabled"]){
+        if (array_key_exists("enabled", $attributes)) {
+            if ($attributes["enabled"]) {
                 $controlOptions = array("NORMAL_ACCOUNT");
             }
             else {
@@ -1569,14 +1564,14 @@ 
 		if ($mod)
 		{
 	        // Do the update
-	        $result = @ldap_modify($ds=$this->adldap->getLdapConnection(), $userDn, $mod);
+	        $result = @ldap_modify($ds = $this->adldap->getLdapConnection(), $userDn, $mod);
 	        if ($result == false) {
 				if (isset($mod['unicodePwd'])) $mod['unicodePwd'] = '***';
 				error_log(__METHOD__."(".array2string($attributes).") ldap_modify($ds, '$userDn', ".array2string($mod).") returned ".array2string($result)." ldap_error()=".ldap_error($ds));
 	        	return false;
 	        }
 		}
-        if (array_key_exists("password",$attributes) && !$this->setPassword($userDn, $attributes['password']))
+        if (array_key_exists("password", $attributes) && !$this->setPassword($userDn, $attributes['password']))
 		{
 			return false;
 		}
@@ -1599,10 +1594,10 @@ 
 	 */
 	public function create($attributes)
 	{
-		if (!is_array($attributes)){ return "Attributes must be an array"; }
-		if (!array_key_exists("group_name", $attributes)){ return "Missing compulsory field [group_name]"; }
-		if (!array_key_exists("container", $attributes)){ return "Missing compulsory field [container]"; }
-		if (empty($attributes["container"])){ return "Container attribute must be an array or string."; }
+		if (!is_array($attributes)) { return "Attributes must be an array"; }
+		if (!array_key_exists("group_name", $attributes)) { return "Missing compulsory field [group_name]"; }
+		if (!array_key_exists("container", $attributes)) { return "Missing compulsory field [container]"; }
+		if (empty($attributes["container"])) { return "Container attribute must be an array or string."; }
 
 		//$member_array = array();
 		//$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
@@ -1618,9 +1613,9 @@ 
 		// Determine the container
 		if (is_array($attributes['container'])) {
 			$attributes["container"] = array_reverse($attributes["container"]);
-			$attributes["container"] = "OU=" . implode(",OU=",$attributes["container"]);
+			$attributes["container"] = "OU=".implode(",OU=", $attributes["container"]);
 		}
-		$result = ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"] . "," . $attributes["container"] . "," . $this->adldap->getBaseDn(), $add);
+		$result = ldap_add($this->adldap->getLdapConnection(), "CN=".$add["cn"].",".$attributes["container"].",".$this->adldap->getBaseDn(), $add);
 		if ($result != true) {
 			return false;
 		}
@@ -1651,10 +1646,10 @@ 
     * @author Port by Andreas Gohr <andi@splitbrain.org>
     * @return string
     */
-    public function ldapSlashes($str){
+    public function ldapSlashes($str) {
         return preg_replace_callback(
       		'/([\x00-\x1F\*\(\)\\\\])/',
-        	function ($matches) {
+        	function($matches) {
             	return "\\".join("", unpack("H2", $matches[1]));
         	},
         	$str

api/ntlm/index.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 function check_domain($url)
 {
 	$whitelisted = array(
-		$_SERVER['HTTP_HOST'],	// can contain :port
+		$_SERVER['HTTP_HOST'], // can contain :port
 		// add additional domains-names (just full qualified hostnames) here
 
 	);
@@ -50,13 +50,13 @@ 
 
 	if (isset($_SERVER['REMOTE_USER']) && $_SERVER['REMOTE_USER'] && isset($_SERVER['AUTH_TYPE']) &&
 		isset($GLOBALS['egw_info']['server']['http_auth_types']) && $GLOBALS['egw_info']['server']['http_auth_types'] &&
-		in_array(strtoupper($_SERVER['AUTH_TYPE']),explode(',',strtoupper($GLOBALS['egw_info']['server']['http_auth_types']))))
+		in_array(strtoupper($_SERVER['AUTH_TYPE']), explode(',', strtoupper($GLOBALS['egw_info']['server']['http_auth_types']))))
 	{
-		if (strpos($account=$_SERVER['REMOTE_USER'],'\\') !== false)
+		if (strpos($account = $_SERVER['REMOTE_USER'], '\\') !== false)
 		{
-			list(,$account) = explode('\\',$account,2);
+			list(,$account) = explode('\\', $account, 2);
 		}
-		$sessionid = $GLOBALS['egw']->session->create($account,null,'ntlm',false,false);	// false=no auth check
+		$sessionid = $GLOBALS['egw']->session->create($account, null, 'ntlm', false, false); // false=no auth check
 		//error_log("create('$account',null,'ntlm',false,false)=$sessionid ({$GLOBALS['egw']->session->reason})");
 	}
 	if (!$sessionid)

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

calendar/inc/class.calendar_groupdav.inc.php

Doc Comments +9 added lines, -9 removed lines

@@ -315,7 +315,7 @@ 
 	 *
 	 * @param string $path
 	 * @param array $filter
-	 * @param array|boolean $start =false false=return all or array(start,num)
+	 * @param integer[] $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
@@ -620,7 +620,7 @@ 
 	 * @param array &$options
 	 * @param int $id
 	 * @param int $user =null account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function get(&$options,$id,$user=null)
 	{
@@ -793,7 +793,7 @@ 
 	 * Check if $user is a participant of given $event incl. group-invitations
 	 *
 	 * @param array $event
-	 * @param int|string $user
+	 * @param integer $user
 	 * @return boolean
 	 */
 	public static function isParticipant(array $event, $user)
@@ -810,7 +810,7 @@ 
 	 * @param int $id
 	 * @param int $user =null account_id of owner, default null
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
@@ -1038,7 +1038,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 string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function post(&$options,$id,$user=null)
 	{
@@ -1112,7 +1112,7 @@ 
 	 * @param string $charset of ical
 	 * @param int $user account_id of owner
 	 * @param array &$options
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|boolean boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	protected function outbox_freebusy_request($ical, $charset, $user, array &$options)
 	{
@@ -1187,7 +1187,7 @@ 
 	 * @param string $path
 	 * @param array $options
 	 * @param int $user account_id
-	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
+	 * @return string|null boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
 	function free_busy_report($path,$options,$user)
 	{
@@ -1416,7 +1416,7 @@ 
 	/**
 	 * Query ctag for calendar
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	public function getctag($path,$user)
 	{
@@ -1449,7 +1449,7 @@ 
 	 *
 	 * @param int|array $entry id or array of new created entry
 	 * @param string $path
-	 * @param int|string $retval
+	 * @param string|boolean $retval
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 */
 	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true)

Indentation +5 added lines, -5 removed lines

@@ -134,11 +134,11 @@
 	}
 
 /**
-	 * Create the path for an event
-	 *
-	 * @param array|int $event
-	 * @return string
-	 */
+ * Create the path for an event
+ *
+ * @param array|int $event
+ * @return string
+ */
 	function get_path($event)
 	{
 		if (is_numeric($event) && self::$path_attr == 'id')

Spacing +144 added lines, -144 removed lines

@@ -153,7 +153,7 @@ 
 	 * @param string $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,$id='')
+	function propfind($path, &$options, &$files, $user, $id = '')
 	{
 		if ($this->debug)
 		{
@@ -179,10 +179,10 @@ 
 			'enum_recuring' => false,
 			'daywise' => false,
 			'date_format' => 'server',
-			'no_total' => true,	// we need no total number of rows (saves extra query)
-			'cfs' => array(),	// return custom-fields, as we use them to store X- attributes
+			'no_total' => true, // we need no total number of rows (saves extra query)
+			'cfs' => array(), // return custom-fields, as we use them to store X- attributes
 		);
-		foreach(array(
+		foreach (array(
 			'start' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-past-limit'],
 			'end' => $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-future-limit'],
 		) as $name => $value)
@@ -191,7 +191,7 @@ 
 			{
 				$value = $name == 'start' ? self::PAST_LIMIT : self::FUTURE_LIMIT;
 			}
-			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
+			$filter[$name] = $this->bo->now + 24 * 3600 * ($name == 'start' ? -1 : 1) * abs($value);
 		}
 		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
 		{
@@ -203,13 +203,13 @@ 
 			$filter['filter'] = 'owner';
 		}
 		// scheduling inbox, shows only not yet accepted or rejected events
-		elseif (substr($path,-7) == '/inbox/')
+		elseif (substr($path, -7) == '/inbox/')
 		{
 			$filter['filter'] = 'unknown';
-			$filter['start'] = $this->bo->now;	// only return future invitations
+			$filter['start'] = $this->bo->now; // only return future invitations
 		}
 		// ToDo: not sure what scheduling outbox is supposed to show, leave it empty for now
-		elseif (substr($path,-8) == '/outbox/')
+		elseif (substr($path, -8) == '/outbox/')
 		{
 			return true;
 		}
@@ -226,7 +226,7 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -243,7 +243,7 @@ 
 
 			$this->sync_collection_token = null;
 
-			$filter['order'] = 'cal_modified ASC';	// return oldest modifications first
+			$filter['order'] = 'cal_modified ASC'; // return oldest modifications first
 			$filter['sync-collection'] = true;
 			// no end-date / limit into the future, as unchanged entries would never be transferted later on
 			unset($filter['end']);
@@ -251,7 +251,7 @@ 
 
 		if (isset($nresults))
 		{
-			unset($filter['no_total']);	// we need the total!
+			unset($filter['no_total']); // we need the total!
 			$files['files'] = $this->propfind_callback($path, $filter, array(0, (int)$nresults));
 
 			// hack to support limit with sync-collection report: events are returned in modified ASC order (oldest first)
@@ -260,13 +260,13 @@ 
 			if ($options['root']['name'] == 'sync-collection' && $this->bo->total > $nresults)
 			{
 				--$this->sync_collection_token;
-				$files['sync-token-params'][] = true;	// tel get_sync_collection_token that we have more entries
+				$files['sync-token-params'][] = true; // tel get_sync_collection_token that we have more entries
 			}
 		}
 		else
 		{
 			// return iterator, calling ourself to return result in chunks
-			$files['files'] = new Api\CalDAV\PropfindIterator($this,$path,$filter,$files['files']);
+			$files['files'] = new Api\CalDAV\PropfindIterator($this, $path, $filter, $files['files']);
 		}
 		if (isset($_GET['download']))
 		{
@@ -286,9 +286,9 @@ 
 		Api\Header\Content::type('calendar.ics', 'text/calendar');
 
 		$n = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++) continue; // first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -312,7 +312,7 @@ 
 						echo substr($icalendar, 0, $start);
 					}
 				}
-				echo substr($icalendar, $start, $end-$start);
+				echo substr($icalendar, $start, $end - $start);
 			}
 		}
 		if ($icalendar && $end)
@@ -330,12 +330,12 @@ 
 	 * @param array|boolean $start =false false=return all or array(start,num)
 	 * @return array with "files" array with values for keys path and props
 	 */
-	function &propfind_callback($path,array $filter,$start=false)
+	function &propfind_callback($path, array $filter, $start = false)
 	{
 		if ($this->debug) $starttime = microtime(true);
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data)) $calendar_data = false; // not in allprop or autoindex
 
 		$files = array();
 
@@ -347,11 +347,11 @@ 
 		$requested_multiget_ids = (array)$filter['query'][self::$path_attr];
 		$sync_collection = $filter['sync-collection'];
 
-		$events =& $this->bo->search($filter);
+		$events = & $this->bo->search($filter);
 
 		if ($events)
 		{
-			foreach($events as $event)
+			foreach ($events as $event)
 			{
 				// remove event from requested multiget ids, to be able to report not found urls
 				if ($requested_multiget_ids && ($k = array_search($event[self::$path_attr], $requested_multiget_ids)) !== false)
@@ -359,7 +359,7 @@ 
 					unset($requested_multiget_ids[$k]);
 				}
 				// sync-collection report: deleted entries need to be reported without properties, same for rejected or deleted invitations
-				if ($sync_collection && ($event['deleted'] && !$event['cal_reference'] || in_array($event['participants'][$filter['users']][0], array('R','X'))))
+				if ($sync_collection && ($event['deleted'] && !$event['cal_reference'] || in_array($event['participants'][$filter['users']][0], array('R', 'X'))))
 				{
 					$files[] = array('path' => $path.urldecode($this->get_path($event)));
 					continue;
@@ -390,7 +390,7 @@ 
 						!isset($calendar_data['children']['expand']) ? false :
 							($calendar_data['children']['expand']['attrs'] ? $calendar_data['children']['expand']['attrs'] : true));
 					$props['getcontentlength'] = bytes($content);
-					$props['calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data',$content);
+					$props['calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', $content);
 				}
 				/* Calendarserver reports new events with schedule-changes: action: create, which iCal request
 				 * adding it, unfortunately does not lead to showing the new event in the users inbox
@@ -409,7 +409,7 @@ 
 		// report not found multiget urls
 		if ($requested_multiget_ids)
 		{
-			foreach($requested_multiget_ids as $id)
+			foreach ($requested_multiget_ids as $id)
 			{
 				$files[] = array('path' => $path.$id.self::$path_extension);
 			}
@@ -445,7 +445,7 @@ 
 	private function _created_updated_by_prop($user, $time)
 	{
 		$props = array();
-		foreach(array(
+		foreach (array(
 			'first-name' => 'account_firstname',
 			'last-name' => 'account_lastname',
 			'href' => 'account_email',
@@ -488,23 +488,23 @@ 
 			$cal_end = $cal_filters['end']; unset($cal_filters['end']);
 			$num_filters = count($cal_filters);
 
-			foreach($options['filters'] as $filter)
+			foreach ($options['filters'] as $filter)
 			{
-				switch($filter['name'])
+				switch ($filter['name'])
 				{
 					case 'comp-filter':
 						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
 
-						switch($filter['attrs']['name'])
+						switch ($filter['attrs']['name'])
 						{
 							case 'VTODO':
-								return false;	// return nothing for now, todo: check if we can pass it on to the infolog handler
+								return false; // return nothing for now, todo: check if we can pass it on to the infolog handler
 								// todos are handled by the infolog handler
 								//$infolog_handler = new groupdav_infolog();
 								//return $infolog_handler->propfind($options['path'],$options,$options['files'],$user,$method);
 							case 'VCALENDAR':
 							case 'VEVENT':
-								break;			// that's our default anyway
+								break; // that's our default anyway
 						}
 						break;
 					case 'prop-filter':
@@ -527,14 +527,14 @@ 
 						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
 				 		}
 				 		if (!empty($filter['attrs']['end']))
 				 		{
-					 		$cal_filters['end']   = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
+					 		$cal_filters['end'] = $this->vCalendar->_parseDateTime($filter['attrs']['end']);
 				 		}
 						break;
 					default:
@@ -555,9 +555,9 @@ 
 		    <B:nresults>10</B:nresults>
 		  </B:limit>
 		*/
-		foreach((array)$options['other'] as $option)
+		foreach ((array)$options['other'] as $option)
 		{
-			switch($option['name'])
+			switch ($option['name'])
 			{
 				case 'nresults':
 					$nresults = (int)$option['data'];
@@ -566,7 +566,7 @@ 
 				case 'limit':
 					break;
 				case 'href':
-					break;	// from addressbook-multiget, handled below
+					break; // from addressbook-multiget, handled below
 				// rfc 6578 sync-report
 				case 'sync-token':
 					if (!empty($option['data']))
@@ -574,7 +574,7 @@ 
 						$parts = explode('/', $option['data']);
 						$sync_token = array_pop($parts);
 						$cal_filters['query'][] = 'cal_modified>'.(int)$sync_token;
-						$cal_filters['filter'] = 'everything';	// to return deleted entries too
+						$cal_filters['filter'] = 'everything'; // to return deleted entries too
 						// no standard time-range!
 						unset($cal_filters['start']);
 					}
@@ -603,25 +603,25 @@ 
 			if ($id)
 			{
 				$cal_filters['query'][self::$path_attr] = self::$path_extension ?
-					basename($id,self::$path_extension) : $id;
+					basename($id, self::$path_extension) : $id;
 			}
 			else	// fetch all given url's
 			{
-				foreach($options['other'] as $option)
+				foreach ($options['other'] as $option)
 				{
 					if ($option['name'] == 'href')
 					{
-						$parts = explode('/',$option['data']);
+						$parts = explode('/', $option['data']);
 						if (($id = urldecode(array_pop($parts))))
 						{
 							$cal_filters['query'][self::$path_attr][] = self::$path_extension ?
-								basename($id,self::$path_extension) : $id;
+								basename($id, self::$path_extension) : $id;
 						}
 					}
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1) error_log(__FILE__.__METHOD__."($options[path],...,$id) calendar-multiget: ids=".implode(',', $ids).', cal_filters='.array2string($cal_filters));
 		}
 		return true;
 	}
@@ -634,9 +634,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)
 	{
-		if (!is_array($event = $this->_common_get_put_delete('GET',$options,$id)))
+		if (!is_array($event = $this->_common_get_put_delete('GET', $options, $id)))
 		{
 			return $event;
 		}
@@ -664,7 +664,7 @@ 
 	 * @param boolean|array $expand =false true or array with values for 'start', 'end' to expand recurrences
 	 * @return string
 	 */
-	private function iCal(array $event,$user=null, $method=null, $expand=false)
+	private function iCal(array $event, $user = null, $method = null, $expand = false)
 	{
 		static $handler = null;
 		if (is_null($handler)) $handler = $this->_get_handler();
@@ -688,13 +688,13 @@ 
 				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
 				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
 			}
-			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
+			$events = & self::get_series($event['uid'], $this->bo, $expand, $user);
 			// as alarm is now only on next recurrence, set alarm from original event on master
 			if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
 		}
-		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
+		elseif (!$this->client_shared_uid_exceptions && $event['reference'])
 		{
-			$events[0]['uid'] .= '-'.$event['id'];	// force a different uid
+			$events[0]['uid'] .= '-'.$event['id']; // force a different uid
 		}
 		return $handler->exportVCal($events, '2.0', $method);
 	}
@@ -710,20 +710,20 @@ 
 	 * @param int $user =null account_id of calendar to display, to remove master, if current user does not participate in
 	 * @return array
 	 */
-	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
+	private static function &get_series($uid, calendar_bo $bo = null, $expand = false, $user = null)
 	{
 		if (is_null($bo)) $bo = new calendar_bopdate();
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
-			'filter' => 'owner',  // return all possible entries
+			'filter' => 'owner', // return all possible entries
 			'daywise' => false,
 			'date_format' => 'server',
-			'cfs' => array(),	// read cfs as we use them to store X- attributes
+			'cfs' => array(), // read cfs as we use them to store X- attributes
 		);
 		if (is_array($expand)) $params += $expand;
 
-		if (!($events =& $bo->search($params)))
+		if (!($events = & $bo->search($params)))
 		{
 			return array();
 		}
@@ -731,12 +731,12 @@ 
 		// find master, which is not always first event, eg. when first event is an exception
 		$master = null;
 		$exceptions = array();
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if ($recurrence['recur_type'])
 			{
 				$master = $recurrence;
-				$exceptions =& $master['recur_exception'];
+				$exceptions = & $master['recur_exception'];
 				unset($events[$k]);
 				break;
 			}
@@ -744,13 +744,13 @@ 
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
 		if (!isset($master)) $master = $bo->read($uid);
 
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
 			if ($master && $recurrence['reference'] != $master['id'])
 			{
 				unset($events[$k]);
-				continue;	// same uid, but references a different event or is own master
+				continue; // same uid, but references a different event or is own master
 			}
 			if (!$master || $recurrence['id'] != $master['id'])	// real exception
 			{
@@ -771,11 +771,11 @@ 
 				// at least Lightning "understands" EXDATE as exception from what's included
 				// in the whole resource / VCALENDAR component
 				// not removing it causes Lightning to remove the exception itself
-				if (($e = array_search($recurrence['recurrence'],$exceptions)) !== false)
+				if (($e = array_search($recurrence['recurrence'], $exceptions)) !== false)
 				{
 					unset($exceptions[$e]);
 				}
-				continue;	// nothing to change
+				continue; // nothing to change
 			}
 			// add alarms from master to recurrences, as clients otherwise have no alarms on virtual exceptions
 			if ($master && $master['alarm'])
@@ -786,14 +786,14 @@ 
 			if (!$expand && $master && $master['participants'] == $recurrence['participants'])
 			{
 				//error_log('NO exception: '.array2string($recurrence));
-				unset($events[$k]);	// no exception --> remove it
+				unset($events[$k]); // no exception --> remove it
 				continue;
 			}
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
 			if ($master) $recurrence['reference'] = $master['id'];
-			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
+			$recurrence['recur_type'] = MCAL_RECUR_NONE; // is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
 		// only add master if we are not expanding and current user participates in master (and not just some exceptions)
@@ -829,11 +829,11 @@ 
 	 * @param string $prefix =null user prefix from path (eg. /ralf from /ralf/addressbook)
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function put(&$options,$id,$user=null,$prefix=null)
+	function put(&$options, $id, $user = null, $prefix = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix) $user = null; // /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// work around missing handling / racecondition in Lightning, if event already exists on server,
 		// but Lightning has not yet synced with the server: Lightning just retries the PUT, not GETing the event
@@ -850,12 +850,12 @@ 
 		{
 			$_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'] = $_SERVER['HTTP_IF_SCHEDULE'];
 		}
-		$return_no_access = true;	// as handled by importVCal anyway and allows it to set the status for participants
-		$oldEvent = $this->_common_get_put_delete('PUT',$options,$id,$return_no_access,
-			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
+		$return_no_access = true; // as handled by importVCal anyway and allows it to set the status for participants
+		$oldEvent = $this->_common_get_put_delete('PUT', $options, $id, $return_no_access,
+			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'])); // dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent, true).function_backtrace());
 			return $oldEvent;
 		}
 
@@ -947,7 +947,7 @@ 
 				if (($events = $handler->icaltoegw($vCalendar)))
 				{
 					$modified = 0;
-					foreach($events as $n => $event)
+					foreach ($events as $n => $event)
 					{
 						// for recurrances of event series, we need to read correct recurrence (or if series master is no first event)
 						if ($event['recurrence'] || $n && !$event['recurrence'] || isset($series))
@@ -958,7 +958,7 @@ 
 								$series = self::get_series($event['uid'], $this->bo);
 								//foreach($series as $s => $sEvent) error_log("series[$s]: ".array2string($sEvent));
 							}
-							foreach($series as $oldEvent)
+							foreach ($series as $oldEvent)
 							{
 								if ($oldEvent['recurrence'] == $event['recurrence']) break;
 							}
@@ -1023,9 +1023,9 @@ 
 					isset($oldEvent['participants'][$GLOBALS['egw_info']['user']['account_id']]))
 				{
 					// just update etag in database
-					$GLOBALS['egw']->db->update($this->bo->so->cal_table,'cal_etag=cal_etag+1',array(
+					$GLOBALS['egw']->db->update($this->bo->so->cal_table, 'cal_etag=cal_etag+1', array(
 						'cal_id' => $eventId,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1077,9 +1077,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 post(&$options,$id,$user=null)
+	function post(&$options, $id, $user = null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options, true));
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1101,7 +1101,7 @@ 
 			}
 		}
 
-		if (substr($options['path'],-8) == '/outbox/')
+		if (substr($options['path'], -8) == '/outbox/')
 		{
 			if (preg_match('/^METHOD:REQUEST(\r\n|\r|\n)(.*)^BEGIN:VFREEBUSY/ism', $vCalendar))
 			{
@@ -1152,7 +1152,7 @@ 
 	 */
 	protected function outbox_freebusy_request($ical, $charset, $user, array &$options)
 	{
-		unset($options);	// not used, but required by function signature
+		unset($options); // not used, but required by function signature
 
 		$vcal = new Horde_Icalendar();
 		if (!$vcal->parsevCalendar($ical, 'VCALENDAR', $charset))
@@ -1165,7 +1165,7 @@ 
 
 		$handler = $this->_get_handler();
 		$handler->setSupportedFields('groupdav');
-		$handler->calendarOwner = $handler->user = 0;	// to NOT default owner/organizer to something
+		$handler->calendarOwner = $handler->user = 0; // to NOT default owner/organizer to something
 		if (!($component = $vcal->getComponent(0)) ||
 			!($event = $handler->vevent2egw($component, $version, $handler->supportedFields, $this->caldav->current_user_principal, 'Horde_Icalendar_Vfreebusy')))
 		{
@@ -1190,13 +1190,13 @@ 
 		$xml->startDocument('1.0', 'UTF-8');
 		$xml->startElementNs('C', 'schedule-response', Api\CalDAV::CALDAV);
 
-		foreach(array_keys($event['participants']) as $uid)
+		foreach (array_keys($event['participants']) as $uid)
 		{
 			$xml->startElementNs('C', 'response', null);
 
 			$xml->startElementNs('C', 'recipient', null);
-			$xml->writeElementNs('D', 'href', 'DAV:', $attendee=array_shift($attendees));
-			$xml->endElement();	// recipient
+			$xml->writeElementNs('D', 'href', 'DAV:', $attendee = array_shift($attendees));
+			$xml->endElement(); // recipient
 
 			$xml->writeElementNs('C', 'request-status', null, '2.0;Success');
 			$xml->writeElementNs('C', 'calendar-data', null,
@@ -1204,13 +1204,13 @@ 
 					'UID' => $event['uid'],
 					'ORGANIZER' => $organizer,
 					'ATTENDEE' => $attendee,
-				)+(empty($mask_uid) || !is_string($mask_uid) ? array() : array(
+				) + (empty($mask_uid) || !is_string($mask_uid) ? array() : array(
 					'X-CALENDARSERVER-MASK-UID' => $mask_uid,
 				))));
 
-			$xml->endElement();	// response
+			$xml->endElement(); // response
 		}
-		$xml->endElement();	// schedule-response
+		$xml->endElement(); // schedule-response
 		$xml->endDocument();
 		echo $xml->outputMemory();
 
@@ -1225,14 +1225,14 @@ 
 	 * @param int $user account_id
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function free_busy_report($path,$options,$user)
+	function free_busy_report($path, $options, $user)
 	{
-		unset($path);	// unused, but required by function signature
+		unset($path); // unused, but required by function signature
 		if (!$this->bo->check_perms(calendar_bo::ACL_FREEBUSY, 0, $user))
 		{
 			return '403 Forbidden';
 		}
-		foreach($options['other'] as $filter)
+		foreach ($options['other'] as $filter)
 		{
 			if ($filter['name'] == 'time-range')
 			{
@@ -1244,7 +1244,7 @@ 
 		header('Content-Type: text/calendar');
 		echo $handler->freebusy($user, $end, true, 'utf-8', $start, 'REPLY', array());
 
-		exit();	// otherwise we get a 207 multistatus, not 200 Ok
+		exit(); // otherwise we get a 207 multistatus, not 200 Ok
 	}
 
 	/**
@@ -1256,7 +1256,7 @@ 
 	 * @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)
 	{
 		$privileges = parent::current_user_privileges($path, $user);
 		//error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges));
@@ -1299,7 +1299,7 @@ 
 
 		// get array with orginal recurrences indexed by recurrence-id
 		$org_recurrences = $exceptions = array();
-		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
+		foreach (self::get_series($events[0]['uid'], $bo) as $k => $event)
 		{
 			if (!$k) $master = $event;
 			if ($event['recurrence'])
@@ -1309,13 +1309,13 @@ 
 		}
 
 		// assign cal_id's to already existing recurrences and evtl. re-add recur_exception to master
-		foreach($events as $k => &$recurrence)
+		foreach ($events as $k => &$recurrence)
 		{
 			if (!$recurrence['recurrence'])
 			{
 				// master
 				$recurrence['id'] = $master['id'];
-				$master =& $events[$k];
+				$master = & $events[$k];
 				continue;
 			}
 
@@ -1339,12 +1339,12 @@ 
 		$master['recur_exception'] = array_merge($exceptions, $master['recur_exception']);
 
 		// delete not longer existing recurrences
-		foreach($org_recurrences as $org_recurrence)
+		foreach ($org_recurrences as $org_recurrence)
 		{
 			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']); // might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1366,14 +1366,14 @@ 
 	 * @param int $user account_id of collection owner
 	 * @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
 	 */
-	function delete(&$options,$id,$user)
+	function delete(&$options, $id, $user)
 	{
 		if (strpos($options['path'], '/inbox/') !== false)
 		{
-			return true;	// simply ignore DELETE in inbox for now
+			return true; // simply ignore DELETE in inbox for now
 		}
-		$return_no_access = true;	// to allow to check if current use is a participant and reject the event for him
-		if (!is_array($event = $this->_common_get_put_delete('DELETE',$options,$id,$return_no_access)) || !$return_no_access ||
+		$return_no_access = true; // to allow to check if current use is a participant and reject the event for him
+		if (!is_array($event = $this->_common_get_put_delete('DELETE', $options, $id, $return_no_access)) || !$return_no_access ||
 			// Work around problems with Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
 			// - sends a DELETE to reject a meeting request --> deletes event for all participants, if user has delete rights on the calendar
 			// --> only set status for everyone else but the organizer
@@ -1384,11 +1384,11 @@ 
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
-				foreach(array_keys($event['participants']) as $uid)
+				foreach (array_keys($event['participants']) as $uid)
 				{
 					if ($this->bo->user == $uid || in_array($uid, $memberships))
 					{
-						$this->bo->set_status($event,$this->bo->user, 'R');
+						$this->bo->set_status($event, $this->bo->user, 'R');
 						$ret = true;
 						break;
 					}
@@ -1403,7 +1403,7 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event) ? $event['participants'] : null).", user={$this->bo->user} --> return ".array2string($ret));
 		return $ret;
 	}
 
@@ -1418,12 +1418,12 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column = self::$path_attr, '_') === false) $column = 'cal_'.$column;
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event) $event = array_shift($event); // read with array as 1. param, returns an array of events!
 
-		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
+		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY, $event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
@@ -1459,11 +1459,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function getctag($path,$user)
+	public function getctag($path, $user)
 	{
-		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
+		$ctag = $this->bo->get_ctag($user, $path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($path)[$user] = $ctag");
 
 		return $ctag;
 	}
@@ -1475,7 +1475,7 @@ 
 	 * @param string $schedule_tag =null on return schedule-tag
 	 * @return string|boolean string with etag or false
 	 */
-	function get_etag($entry, &$schedule_tag=null)
+	function get_etag($entry, &$schedule_tag = null)
 	{
 		$etag = $this->bo->get_etag($entry, $schedule_tag, $this->client_shared_uid_exceptions);
 
@@ -1493,7 +1493,7 @@ 
 	 * @param int|string $retval
 	 * @param boolean $path_attr_is_name =true true: path_attr is ca(l|rd)dav_name, false: id (GroupDAV needs Location header)
 	 */
-	function put_response_headers($entry, $path, $retval, $path_attr_is_name=true)
+	function put_response_headers($entry, $path, $retval, $path_attr_is_name = true)
 	{
 		$schedule_tag = null;
 		$etag = $this->get_etag($entry, $schedule_tag);
@@ -1512,14 +1512,14 @@ 
 	 * @param array|int $event event-array or id
 	 * @return boolean null if entry does not exist, false if no access, true if access permitted
 	 */
-	function check_access($acl,$event)
+	function check_access($acl, $event)
 	{
 		if ($acl == Acl::READ)
 		{
 			// we need at least calendar_bo::ACL_FREEBUSY to get some information
 			$acl = calendar_bo::ACL_FREEBUSY;
 		}
-		return $this->bo->check_perms($acl,$event,0,'server');
+		return $this->bo->check_perms($acl, $event, 0, 'server');
 	}
 
 	/**
@@ -1532,52 +1532,52 @@ 
 	 * @param string $path =null path of the collection
 	 * @return array
 	 */
-	public function extra_properties(array $props, $displayname, $base_uri=null, $user=null, $path=null)
+	public function extra_properties(array $props, $displayname, $base_uri = null, $user = null, $path = null)
 	{
-		unset($base_uri);	// unused, but required by function signature
+		unset($base_uri); // unused, but required by function signature
 		if (!isset($props['calendar-description']))
 		{
 			// default calendar description: can be overwritten via PROPPATCH, in which case it's already set
-			$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-description',$displayname);
+			$props['calendar-description'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-description', $displayname);
 		}
 		$supported_components = array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VEVENT')),
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VEVENT')),
 		);
 		// outbox supports VFREEBUSY too, it is required from OS X iCal to autocomplete locations
-		if (substr($path,-8) == '/outbox/')
+		if (substr($path, -8) == '/outbox/')
 		{
-			$supported_components[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'comp',array('name' => 'VFREEBUSY'));
+			$supported_components[] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'comp', array('name' => 'VFREEBUSY'));
 		}
 		$props['supported-calendar-component-set'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,
-			'supported-calendar-component-set',$supported_components);
+			'supported-calendar-component-set', $supported_components);
 		// supported reports
 		$props['supported-report-set'] = array(
-			'calendar-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-query',''))))),
-			'calendar-multiget' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-multiget',''))))),
-			'free-busy-query' => Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'free-busy-query',''))))),
+			'calendar-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-query', ''))))),
+			'calendar-multiget' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-multiget', ''))))),
+			'free-busy-query' => Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'free-busy-query', ''))))),
 		);
 		// rfc 6578 sync-collection report for everything but outbox
 		// only if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
 		if (strpos($path, '/outbox/') === false && $GLOBALS['egw_info']['server']['calendar_delete_history'])
 		{
-			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
-				Api\CalDAV::mkprop('report',array(
-					Api\CalDAV::mkprop('sync-collection','')))));
+			$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report', array(
+				Api\CalDAV::mkprop('report', array(
+					Api\CalDAV::mkprop('sync-collection', '')))));
 		}
-		$props['supported-calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'supported-calendar-data',array(
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
-			Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
+		$props['supported-calendar-data'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'supported-calendar-data', array(
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')),
+			Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));
 
 		// get timezone of calendar
 		if ($this->caldav->prop_requested('calendar-timezone'))
 		{
-			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV,'calendar-timezone',
+			$props['calendar-timezone'] = Api\CalDAV::mkprop(Api\CalDAV::CALDAV, 'calendar-timezone',
 				calendar_timezones::user_timezone($user));
 		}
 		return $props;
@@ -1591,9 +1591,9 @@ 
 	private function _get_handler()
 	{
 		$handler = new calendar_ical();
-		$handler->setSupportedFields('GroupDAV',$this->agent);
-		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		$handler->setSupportedFields('GroupDAV', $this->agent);
+		$handler->supportedFields['attachments'] = true; // enabling attachments
+		if ($this->debug > 1) error_log("ical Handler called: ".$this->agent);
 		return $handler;
 	}
 
@@ -1608,7 +1608,7 @@ 
 		$pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set'];
 		$calendar_home_set = $pref ? explode(',', $pref) : array();
 		// replace symbolic id's with real nummeric id's
-		foreach(array(
+		foreach (array(
 			'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
 		) as $sym => $id)
 		{
@@ -1617,11 +1617,11 @@ 
 				$calendar_home_set[$key] = $id;
 			}
 		}
-		foreach(ExecMethod('calendar.calendar_bo.list_cals') as $entry)
+		foreach (ExecMethod('calendar.calendar_bo.list_cals') as $entry)
 		{
 			$id = $entry['grantor'];
-			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id &&	// no current user
-				(in_array('A',$calendar_home_set) || in_array((string)$id,$calendar_home_set)) &&
+			if ($id && $GLOBALS['egw_info']['user']['account_id'] != $id && // no current user
+				(in_array('A', $calendar_home_set) || in_array((string)$id, $calendar_home_set)) &&
 				is_numeric($id) && ($owner = $this->accounts->id2name($id)))
 			{
 				$shared[$id] = 'calendar-'.$owner;
@@ -1630,11 +1630,11 @@ 
 		// shared locations and resources
 		if ($GLOBALS['egw_info']['user']['apps']['resources'])
 		{
-			foreach(array('locations','resources') as $res)
+			foreach (array('locations', 'resources') as $res)
 			{
 				if (($pref = $GLOBALS['egw_info']['user']['preferences']['groupdav']['calendar-home-set-'.$res]))
 				{
-					foreach(explode(',', $pref) as $res_id)
+					foreach (explode(',', $pref) as $res_id)
 					{
 						$is_location = $res == 'locations';
 						$shared['r'.$res_id] = str_replace('s/', '-', Api\CalDAV\Principals::resource2name($res_id, $is_location));
@@ -1664,7 +1664,7 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0) unset($calendars[$user]); // skip current user
 		}
 
 		$settings = array();
@@ -1672,7 +1672,7 @@ 
 			'type'   => 'multiselect',
 			'label'  => 'Calendars to sync in addition to personal calendar',
 			'name'   => 'calendar-home-set',
-			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+			'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 			'values' => $calendars,
 			'xmlrpc' => True,
 			'admin'  => False,
@@ -1698,7 +1698,7 @@ 
 		if ($GLOBALS['egw_info']['user']['apps']['resources'] && ($all_resources = Api\CalDAV\Principals::get_resources()))
 		{
 			$resources = $locations = array();
-			foreach($all_resources as $resource)
+			foreach ($all_resources as $resource)
 			{
 				if (Api\CalDAV\Principals::resource_is_location($resource))
 				{
@@ -1709,7 +1709,7 @@ 
 					$resources[$resource['res_id']] = $resource['name'];
 				}
 			}
-			foreach(array(
+			foreach (array(
 				'locations' => $locations,
 				'resources' => $resources,
 			) as $name => $options)
@@ -1722,7 +1722,7 @@ 
 						'label'  => lang('%1 to sync', lang($name == 'locations' ? 'Location calendars' : 'Resource calendars')),
 						'no_lang'=> true,
 						'name'   => 'calendar-home-set-'.$name,
-						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).','CalDAV "calendar-home-set"'),
+						'help'   => lang('Only supported by a few fully conformant clients (eg. from Apple). If you have to enter a URL, it will most likly not be suppored!').'<br/>'.lang('They will be sub-folders in users home (%1 attribute).', 'CalDAV "calendar-home-set"'),
 						'values' => $options,
 						'xmlrpc' => True,
 						'admin'  => False,

Braces +229 added lines, -57 removed lines

@@ -132,7 +132,10 @@ 
 		}
 		else
 		{
-			if (!is_array($event)) $event = $this->bo->read($event);
+			if (!is_array($event))
+			{
+				$event = $this->bo->read($event);
+			}
 			$name = $event[self::$path_attr];
 		}
 		$name .= self::$path_extension;
@@ -193,10 +196,13 @@ 
 			}
 			$filter[$name] = $this->bo->now + 24*3600*($name == 'start' ? -1 : 1)*abs($value);
 		}
-		if ($this->client_shared_uid_exceptions)	// do NOT return (non-virtual) exceptions
+		if ($this->client_shared_uid_exceptions)
+		{
+			// do NOT return (non-virtual) exceptions
 		{
 			$filter['query'] = array('cal_reference' => 0);
 		}
+		}
 
 		if ($path == '/calendar/')
 		{
@@ -226,7 +232,11 @@ 
 			// when trying to request not supported components, eg. VTODO on a calendar collection
 			return true;
 		}
-		if ($id) $path = dirname($path).'/';	// caldav_name get's added anyway in the callback
+		if ($id)
+		{
+			$path = dirname($path).'/';
+		}
+		// caldav_name get's added anyway in the callback
 
 		if ($this->debug > 1)
 		{
@@ -288,7 +298,11 @@ 
 		$n = 0;
 		foreach($files as $file)
 		{
-			if (!$n++) continue;	// first entry is collection itself
+			if (!$n++)
+			{
+				continue;
+			}
+			// first entry is collection itself
 
 			$icalendar = $file['props']['calendar-data']['val'];
 			if (($start = strpos($icalendar, 'BEGIN:VEVENT')) !== false &&
@@ -332,10 +346,17 @@ 
 	 */
 	function &propfind_callback($path,array $filter,$start=false)
 	{
-		if ($this->debug) $starttime = microtime(true);
+		if ($this->debug)
+		{
+			$starttime = microtime(true);
+		}
 
 		$calendar_data = $this->caldav->prop_requested('calendar-data', Api\CalDAV::CALDAV, true);
-		if (!is_array($calendar_data)) $calendar_data = false;	// not in allprop or autoindex
+		if (!is_array($calendar_data))
+		{
+			$calendar_data = false;
+		}
+		// not in allprop or autoindex
 
 		$files = array();
 
@@ -493,7 +514,10 @@ 
 				switch($filter['name'])
 				{
 					case 'comp-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) comp-filter='{$filter['attrs']['name']}'");
+						}
 
 						switch($filter['attrs']['name'])
 						{
@@ -508,14 +532,23 @@ 
 						}
 						break;
 					case 'prop-filter':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) prop-filter='{$filter['attrs']['name']}'");
+						}
 						$prop_filter = $filter['attrs']['name'];
 						break;
 					case 'text-match':
-						if ($this->debug > 1) error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						if ($this->debug > 1)
+						{
+							error_log(__METHOD__."($options[path],...) text-match: $prop_filter='{$filter['data']}'");
+						}
 						if (!isset($this->filter_prop2cal[strtoupper($prop_filter)]))
 						{
-							if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."($options[path],".array2string($options).",...) unknown property '$prop_filter' --> ignored");
+							}
 						}
 						else
 						{
@@ -524,10 +557,16 @@ 
 						unset($prop_filter);
 						break;
 					case 'param-filter':
-						if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
+						}
 						break;
 					case 'time-range':
-				 		if ($this->debug > 1) error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		if ($this->debug > 1)
+				 		{
+				 			error_log(__FILE__ . __METHOD__."($options[path],...) time-range={$filter['attrs']['start']}-{$filter['attrs']['end']}");
+				 		}
 				 		if (!empty($filter['attrs']['start']))
 				 		{
 					 		$cal_filters['start'] = $this->vCalendar->_parseDateTime($filter['attrs']['start']);
@@ -538,13 +577,19 @@ 
 				 		}
 						break;
 					default:
-						if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						if ($this->debug)
+						{
+							error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
+						}
 						break;
 				}
 			}
-			if (count($cal_filters) == $num_filters)	// no filters set --> restore default start and end time
+			if (count($cal_filters) == $num_filters)
+			{
+				// no filters set --> restore default start and end time
 			{
 				$cal_filters['start'] = $cal_start;
+			}
 				$cal_filters['end']   = $cal_end;
 			}
 		}
@@ -621,7 +666,10 @@ 
 				}
 			}
 
-			if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			if ($this->debug > 1)
+			{
+				error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
+			}
 		}
 		return true;
 	}
@@ -667,9 +715,15 @@ 
 	private function iCal(array $event,$user=null, $method=null, $expand=false)
 	{
 		static $handler = null;
-		if (is_null($handler)) $handler = $this->_get_handler();
+		if (is_null($handler))
+		{
+			$handler = $this->_get_handler();
+		}
 
-		if (!$user) $user = $GLOBALS['egw_info']['user']['account_id'];
+		if (!$user)
+		{
+			$user = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		// only return alarms in own calendar, not other users calendars
 		if ($user != $GLOBALS['egw_info']['user']['account_id'])
@@ -685,12 +739,21 @@ 
 		{
 			if (is_array($expand))
 			{
-				if (isset($expand['start'])) $expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
-				if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				if (isset($expand['start']))
+				{
+					$expand['start'] = $this->vCalendar->_parseDateTime($expand['start']);
+				}
+				if (isset($expand['end']))
+				{
+					$expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
+				}
 			}
 			$events =& self::get_series($event['uid'], $this->bo, $expand, $user);
 			// as alarm is now only on next recurrence, set alarm from original event on master
-			if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
+			if ($event['alarm'])
+			{
+				$events[0]['alarm'] = $event['alarm'];
+			}
 		}
 		elseif(!$this->client_shared_uid_exceptions && $event['reference'])
 		{
@@ -712,7 +775,10 @@ 
 	 */
 	private static function &get_series($uid,calendar_bo $bo=null, $expand=false, $user=null)
 	{
-		if (is_null($bo)) $bo = new calendar_bopdate();
+		if (is_null($bo))
+		{
+			$bo = new calendar_bopdate();
+		}
 
 		$params = array(
 			'query' => array('cal_uid' => $uid),
@@ -721,7 +787,10 @@ 
 			'date_format' => 'server',
 			'cfs' => array(),	// read cfs as we use them to store X- attributes
 		);
-		if (is_array($expand)) $params += $expand;
+		if (is_array($expand))
+		{
+			$params += $expand;
+		}
 
 		if (!($events =& $bo->search($params)))
 		{
@@ -742,7 +811,10 @@ 
 			}
 		}
 		// if recurring event starts in future behind horizont, nothing will be returned by bo::search()
-		if (!isset($master)) $master = $bo->read($uid);
+		if (!isset($master))
+		{
+			$master = $bo->read($uid);
+		}
 
 		foreach($events as $k => &$recurrence)
 		{
@@ -752,7 +824,9 @@ 
 				unset($events[$k]);
 				continue;	// same uid, but references a different event or is own master
 			}
-			if (!$master || $recurrence['id'] != $master['id'])	// real exception
+			if (!$master || $recurrence['id'] != $master['id'])
+			{
+				// real exception
 			{
 				// user is NOT participating in this exception
 				if ($user && !self::isParticipant($recurrence, $user))
@@ -761,6 +835,7 @@ 
 					if (!$master || !self::isParticipant($master, $user))
 					{
 						unset($events[$k]);
+			}
 						continue;
 					}
 					// otherwise mark him in this exception as rejected
@@ -792,7 +867,10 @@ 
 			// this is a virtual exception now (no extra event/cal_id in DB)
 			//error_log('virtual exception: '.array2string($recurrence));
 			$recurrence['recurrence'] = $recurrence['start'];
-			if ($master) $recurrence['reference'] = $master['id'];
+			if ($master)
+			{
+				$recurrence['reference'] = $master['id'];
+			}
 			$recurrence['recur_type'] = MCAL_RECUR_NONE;	// is set, as this is a copy of the master
 			// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
 		}
@@ -831,9 +909,16 @@ 
 	 */
 	function put(&$options,$id,$user=null,$prefix=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
-		if (!$prefix) $user = null;	// /infolog/ does not imply setting the current user (for new entries it's done anyway)
+		if (!$prefix)
+		{
+			$user = null;
+		}
+		// /infolog/ does not imply setting the current user (for new entries it's done anyway)
 
 		// work around missing handling / racecondition in Lightning, if event already exists on server,
 		// but Lightning has not yet synced with the server: Lightning just retries the PUT, not GETing the event
@@ -855,7 +940,10 @@ 
 			isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']));	// dont fail with 412 Precondition Failed in that case
 		if (!is_null($oldEvent) && !is_array($oldEvent))
 		{
-			if ($this->debug) error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			if ($this->debug)
+			{
+				error_log(__METHOD__.': '.print_r($oldEvent,true).function_backtrace());
+			}
 			return $oldEvent;
 		}
 
@@ -866,7 +954,10 @@ 
 		{
 			// we have no add permission on this user's calendar
 			// ToDo: create event in current users calendar and invite only $user
-			if ($this->debug) error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,,$user) we have not enough rights on this calendar");
+			}
 			return '403 Forbidden';
 		}
 
@@ -913,13 +1004,19 @@ 
 			if ($this->use_schedule_tag && isset($_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH']))
 			{
 				$schedule_tag_match = $_SERVER['HTTP_IF_SCHEDULE_TAG_MATCH'];
-				if ($schedule_tag_match[0] == '"') $schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				if ($schedule_tag_match[0] == '"')
+				{
+					$schedule_tag_match = substr($schedule_tag_match, 1, -1);
+				}
 				$schedule_tag = null;
 				$this->get_etag($oldEvent, $schedule_tag);
 
 				if ($schedule_tag_match !== $schedule_tag)
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) schedule_tag missmatch: given '$schedule_tag_match' != '$schedule_tag'");
+					}
 					// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 					$this->check_return_representation($options, $id, $user);
 					return '412 Precondition Failed';
@@ -940,7 +1037,10 @@ 
 					// above can be true, if current user is not in master but just a recurrence
 					(!$oldEvent['recur_type'] || !($series = self::get_series($oldEvent['uid'], $this->bo))))
 				{
-					if ($this->debug) error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."(,,$user) user $user is NOT an attendee!");
+					}
 					return '403 Forbidden';
 				}
 				// update only participant status and alarms of current user
@@ -960,7 +1060,10 @@ 
 							}
 							foreach($series as $oldEvent)
 							{
-								if ($oldEvent['recurrence'] == $event['recurrence']) break;
+								if ($oldEvent['recurrence'] == $event['recurrence'])
+								{
+									break;
+								}
 							}
 							// if no exception found, check if it might be just a recurrence (no exception)
 							if ($event['recurrence'] && $oldEvent['recurrence'] != $event['recurrence'])
@@ -975,7 +1078,10 @@ 
 								}
 							}
 						}
-						if ($this->debug) error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						if ($this->debug)
+						{
+							error_log(__METHOD__."(, $id, $user, '$prefix') eventId=$eventId ($oldEvent[id]), user=$user, old-status='{$oldEvent['participants'][$user]}', new-status='{$event['participants'][$user]}', recurrence=$event[recurrence]=".Api\DateTime::to($event['recurrence']).", event=".array2string($event));
+						}
 						if (isset($event['participants']) && isset($event['participants'][$user]) &&
 							$event['participants'][$user] !== $oldEvent['participants'][$user])
 						{
@@ -983,13 +1089,19 @@ 
 								// real (not virtual) exceptions use recurrence 0 in egw_cal_user.cal_recurrence!
 								$recurrence = $eventId == $oldEvent['id'] ? $event['recurrence'] : 0))
 							{
-								if ($this->debug) error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."(,,$user) failed to set_status($oldEvent[id], $user, '{$event['participants'][$user]}', $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 								return '403 Forbidden';
 							}
 							else
 							{
 								++$modified;
-								if ($this->debug) error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								if ($this->debug)
+								{
+									error_log(__METHOD__."() set_status($oldEvent[id], $user, {$event['participants'][$user]} , $recurrence=".Api\DateTime::to($recurrence).')');
+								}
 							}
 						}
 						// import alarms, if given and changed
@@ -999,15 +1111,21 @@ 
 							$modified += $handler->sync_alarms($event, (array)$oldEvent['alarm'], $user);
 						}
 					}
-					if (!$modified)	// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
+					if (!$modified)
+					{
+						// NO modififictions, or none we understood --> log it and return Ok: "204 No Content"
 					{
 						$this->caldav->log(__METHOD__."(,,$user) NO changes for current user events=".array2string($events).', old-event='.array2string($oldEvent));
 					}
+					}
 					$this->put_response_headers($eventId, $options['path'], '204 No Content', self::$path_attr == 'caldav_name');
 
 					return '204 No Content';
 				}
-				if ($this->debug && !isset($events)) error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				if ($this->debug && !isset($events))
+				{
+					error_log(__METHOD__."(,,$user) only schedule-tag given for event without participants (only calendar owner) --> handle as regular PUT");
+				}
 			}
 			if ($return_no_access)
 			{
@@ -1044,17 +1162,23 @@ 
 		if (!($cal_id = $handler->importVCal($vCalendar, $eventId,
 			self::etag2value($this->http_if_match), false, 0, $this->caldav->current_user_principal, $user, $charset, $id)))
 		{
-			if ($this->debug) error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(,$id) eventId=$eventId: importVCal('$options[content]') returned ".array2string($cal_id));
+			}
 			if ($eventId && $cal_id === false)
 			{
 				// ignore import failures
 				$cal_id = $eventId;
 				$retval = true;
 			}
-			elseif ($cal_id === 0)	// etag failure
+			elseif ($cal_id === 0)
+			{
+				// etag failure
 			{
 				// honor Prefer: return=representation for 412 too (no need for client to explicitly reload)
 				$this->check_return_representation($options, $id, $user);
+			}
 				return '412 Precondition Failed';
 			}
 			else
@@ -1079,7 +1203,10 @@ 
 	 */
 	function post(&$options,$id,$user=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($id, $user)".print_r($options,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($id, $user)".print_r($options,true));
+		}
 
 		$vCalendar = htmlspecialchars_decode($options['content']);
 		$charset = null;
@@ -1133,7 +1260,10 @@ 
 				if (!($cal_id = $handler->importVCal($vCalendar, $eventId, null,
 					false, 0, $this->caldav->current_user_principal, $user, $charset)))
 				{
-					if ($this->debug) error_log(__METHOD__."() importVCal($eventId) returned false");
+					if ($this->debug)
+					{
+						error_log(__METHOD__."() importVCal($eventId) returned false");
+					}
 				}
 				header('ETag: "'.$this->get_etag($eventId).'"');
 			}
@@ -1301,7 +1431,10 @@ 
 		$org_recurrences = $exceptions = array();
 		foreach(self::get_series($events[0]['uid'],$bo) as $k => $event)
 		{
-			if (!$k) $master = $event;
+			if (!$k)
+			{
+				$master = $event;
+			}
 			if ($event['recurrence'])
 			{
 				$org_recurrences[$event['recurrence']] = $event;
@@ -1321,10 +1454,13 @@ 
 
 			// from now on we deal with exceptions
 			$org_recurrence = $org_recurrences[$recurrence['recurrence']];
-			if (isset($org_recurrence))	// already existing recurrence
+			if (isset($org_recurrence))
+			{
+				// already existing recurrence
 			{
 				//error_log(__METHOD__.'() setting id #'.$org_recurrence['id']).' for '.$recurrence['recurrence'].' = '.date('Y-m-d H:i:s',$recurrence['recurrence']);
 				$recurrence['id'] = $org_recurrence['id'];
+			}
 
 				// re-add (non-virtual) exceptions to master's recur_exception
 				if ($recurrence['id'] != $master['id'])
@@ -1341,10 +1477,14 @@ 
 		// delete not longer existing recurrences
 		foreach($org_recurrences as $org_recurrence)
 		{
-			if ($org_recurrence['id'] != $master['id'])	// non-virtual recurrence
+			if ($org_recurrence['id'] != $master['id'])
+			{
+				// non-virtual recurrence
 			{
 				//error_log(__METHOD__.'() deleting #'.$org_recurrence['id']);
-				$bo->delete($org_recurrence['id']);	// might fail because of permissions
+				$bo->delete($org_recurrence['id']);
+			}
+			// might fail because of permissions
 			}
 			else	// virtual recurrence
 			{
@@ -1380,7 +1520,7 @@ 
 			self::get_agent() == 'caldavsynchronizer' && is_array($event) && $event['owner'] != $user)
 		{
  			if (is_array($event) && (!$return_no_access || $event['owner'] != $user))
-			{
+ 			{
 				// check if user is a participant or one of the groups he is a member of --> reject the meeting request
 				$ret = '403 Forbidden';
 				$memberships = $GLOBALS['egw']->accounts->memberships($this->bo->user, true);
@@ -1403,7 +1543,10 @@ 
 		{
 			$ret = $this->bo->delete($event['id']);
 		}
-		if ($this->debug) error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(,$id) return_no_access=$return_no_access, event[participants]=".array2string(is_array($event)?$event['participants']:null).", user={$this->bo->user} --> return ".array2string($ret));
+		}
 		return $ret;
 	}
 
@@ -1418,16 +1561,26 @@ 
 	 */
 	function read($id)
 	{
-		if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column;
+		if (strpos($column=self::$path_attr,'_') === false)
+		{
+			$column = 'cal_'.$column;
+		}
 
 		$event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server');
-		if ($event) $event = array_shift($event);	// read with array as 1. param, returns an array of events!
+		if ($event)
+		{
+			$event = array_shift($event);
+		}
+		// read with array as 1. param, returns an array of events!
 
 		if (!($retval = $this->bo->check_perms(calendar_bo::ACL_FREEBUSY,$event, 0, 'server')) &&
 			// above can be true, if current user is not in master but just a recurrence
 			(!$event['recur_type'] || !($events = self::get_series($event['uid'], $this->bo))))
 		{
-			if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval));
+			}
 			return $retval;
 		}
 		if (!$this->bo->check_perms(Acl::READ, $event, 0, 'server'))
@@ -1435,9 +1588,15 @@ 
 			$this->bo->clear_private_infos($event, array($this->bo->user, $event['owner']));
 		}
 		// handle deleted events, as not existing
-		if ($event['deleted']) $event = null;
+		if ($event['deleted'])
+		{
+			$event = null;
+		}
 
-		if ($this->debug > 1) error_log(__METHOD__."($id) returning ".array2string($event));
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."($id) returning ".array2string($event));
+		}
 
 		return $event;
 	}
@@ -1449,7 +1608,10 @@ 
 	 */
 	public function update_tags($entry)
 	{
-		if (!is_array($entry)) $entry = $this->read($entry);
+		if (!is_array($entry))
+		{
+			$entry = $this->read($entry);
+		}
 
 		$this->bo->update($entry, true);
 	}
@@ -1463,7 +1625,10 @@ 
 	{
 		$ctag = $this->bo->get_ctag($user,$path == '/calendar/' ? 'owner' : 'default'); // default = not rejected
 
-		if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		if ($this->debug > 1)
+		{
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
+		}
 
 		return $ctag;
 	}
@@ -1593,7 +1758,10 @@ 
 		$handler = new calendar_ical();
 		$handler->setSupportedFields('GroupDAV',$this->agent);
 		$handler->supportedFields['attachments'] = true;	// enabling attachments
-		if ($this->debug > 1) error_log("ical Handler called: " . $this->agent);
+		if ($this->debug > 1)
+		{
+			error_log("ical Handler called: " . $this->agent);
+		}
 		return $handler;
 	}
 
@@ -1664,7 +1832,11 @@ 
 			{
 				$calendars[$entry['grantor']] = $entry['name'];
 			}
-			if ($user > 0) unset($calendars[$user]);	// skip current user
+			if ($user > 0)
+			{
+				unset($calendars[$user]);
+			}
+			// skip current user
 		}
 
 		$settings = array();

api/src/Auth/Ldap.php

Spacing +37 added lines, -37 removed lines

@@ -43,29 +43,29 @@ 
 	 * @param string $_passwd corresponding password
 	 * @return boolean true if successful authenticated, false otherwise
 	 */
-	function authenticate($_username, $_passwd, $passwd_type='text')
+	function authenticate($_username, $_passwd, $passwd_type = 'text')
 	{
-		unset($passwd_type);	// not used by required by function signature
+		unset($passwd_type); // not used by required by function signature
 
 		// allow non-ascii in username & password
-		$username = Api\Translation::convert($_username,Api\Translation::charset(),'utf-8');
+		$username = Api\Translation::convert($_username, Api\Translation::charset(), 'utf-8');
 		// harden ldap auth, by removing \000 bytes, causing passwords to be not empty by php, but empty to c libaries
-		$passwd = str_replace("\000", '', Api\Translation::convert($_passwd,Api\Translation::charset(),'utf-8'));
+		$passwd = str_replace("\000", '', Api\Translation::convert($_passwd, Api\Translation::charset(), 'utf-8'));
 
 		// Login with the LDAP Admin. User to find the User DN.
 		try {
 			$ldap = Api\Ldap::factory();
 		}
-		catch(Api\Exception\NoPermission $e)
+		catch (Api\Exception\NoPermission $e)
 		{
 			unset($e);
 			if ($this->debug) error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
 			return False;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
-		$attributes	= array('uid','dn','givenName','sn','mail','uidNumber','shadowExpire','homeDirectory');
+		$attributes = array('uid', 'dn', 'givenName', 'sn', 'mail', 'uidNumber', 'shadowExpire', 'homeDirectory');
 
-		$filter = str_replace(array('%user','%domain'),array(Api\Ldap::quote($username),$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array(Api\Ldap::quote($username), $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap')
@@ -84,10 +84,10 @@ 
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
-				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
+				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0] * 24 * 3600 < time())
 			{
 				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
-				return false;	// account is expired
+				return false; // account is expired
 			}
 			$userDN = $allValues[0]['dn'];
 
@@ -103,13 +103,13 @@ 
 					{
 						$GLOBALS['auto_create_acct']['homedirectory'] = $allValues[0]['homedirectory'][0];
 					}
-					if (!($id = $GLOBALS['egw']->accounts->name2id($username,'account_lid','u')))
+					if (!($id = $GLOBALS['egw']->accounts->name2id($username, 'account_lid', 'u')))
 					{
 						// account does NOT exist, check if we should create it
 						if ($GLOBALS['egw_info']['server']['auto_create_acct'])
 						{
 							// create a global array with all availible info about that account
-							foreach(array(
+							foreach (array(
 								'givenname' => 'firstname',
 								'sn'        => 'lastname',
 								'uidnumber' => 'account_id',
@@ -117,7 +117,7 @@ 
 							) as $ldap_name => $acct_name)
 							{
 								$GLOBALS['auto_create_acct'][$acct_name] =
-									Api\Translation::convert($allValues[0][$ldap_name][0],'utf-8');
+									Api\Translation::convert($allValues[0][$ldap_name][0], 'utf-8');
 							}
 							$ret = true;
 						}
@@ -130,7 +130,7 @@ 
 					// account exists, check if it is acctive
 					else
 					{
-						$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
+						$ret = $GLOBALS['egw']->accounts->id2name($id, 'account_status') == 'A';
 
 						if ($this->debug && !$ret) error_log(__METHOD__."('$username',\$password) account NOT active!");
 					}
@@ -141,12 +141,12 @@ 
 				{
 					$matches = null;
 					// try to query password from ldap server (might fail because of ACL) and check if we need to migrate the hash
-					if (($sri = ldap_search($ldap, $userDN,"(objectclass=*)", array('userPassword'))) &&
+					if (($sri = ldap_search($ldap, $userDN, "(objectclass=*)", array('userPassword'))) &&
 						($values = ldap_get_entries($ldap, $sri)) && isset($values[0]['userpassword'][0]) &&
-						($type = preg_match('/^{(.+)}/',$values[0]['userpassword'][0],$matches) ? strtolower($matches[1]) : 'plain') &&
+						($type = preg_match('/^{(.+)}/', $values[0]['userpassword'][0], $matches) ? strtolower($matches[1]) : 'plain') &&
 						// for crypt use Api\Auth::crypt_compare to detect correct sub-type, strlen("{crypt}")=7
 						($type != 'crypt' || Api\Auth::crypt_compare($passwd, substr($values[0]['userpassword'][0], 7), $type)) &&
-						in_array($type, explode(',',strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
+						in_array($type, explode(',', strtolower($GLOBALS['egw_info']['server']['pwd_migration_types']))))
 					{
 						$this->change_password($passwd, $passwd, $allValues[0]['uidnumber'][0], false);
 					}
@@ -168,7 +168,7 @@ 
 	function getLastPwdChange($_username)
 	{
 		// allow non-ascii in username & password
-		$username = Api\Translation::convert($_username,Api\Translation::charset(),'utf-8');
+		$username = Api\Translation::convert($_username, Api\Translation::charset(), 'utf-8');
 
 		// Login with the LDAP Admin. User to find the User DN.
 		try {
@@ -180,9 +180,9 @@ 
 			return false;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
-		$attributes	= array('uid','dn','shadowexpire','shadowlastchange');
+		$attributes = array('uid', 'dn', 'shadowexpire', 'shadowlastchange');
 
-		$filter = str_replace(array('%user','%domain'),array(Api\Ldap::quote($username),$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array(Api\Ldap::quote($username), $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap')
@@ -206,12 +206,12 @@ 
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
-				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
+				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0] * 24 * 3600 < time())
 			{
 				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
-				return false;	// account is expired
+				return false; // account is expired
 			}
-			return $allValues[0]['shadowlastchange'][0]*24*3600;
+			return $allValues[0]['shadowlastchange'][0] * 24 * 3600;
 		}
 		if ($this->debug) error_log(__METHOD__."('$username') dn not found or password wrong!");
 		// dn not found or password wrong
@@ -226,11 +226,11 @@ 
 	 * @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)
 	{
 		$admin = True;
 		// Don't allow password changes for other accounts when using XML-RPC
-		if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
+		if (!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
 		{
 			$admin = False;
 			$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -238,22 +238,22 @@ 
 		else
 		{
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
-				Api\Translation::charset(),'utf-8');
+				Api\Translation::charset(), 'utf-8');
 		}
 		//echo "<p>auth_Api\Ldap::change_password('$old_passwd','$new_passwd',$account_id) username='$username'</p>\n";
 
-		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array($username, $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		$ds = Api\Ldap::factory();
 		$sri = ldap_search($ds, $GLOBALS['egw_info']['server']['ldap_context'], $filter);
 		$allValues = ldap_get_entries($ds, $sri);
 
-		$entry['shadowlastchange'] = (is_null($lastpwdchange) || $lastpwdchange<0 ? round((time()-date('Z')) / (24*3600)):$lastpwdchange);
+		$entry['shadowlastchange'] = (is_null($lastpwdchange) || $lastpwdchange < 0 ? round((time() - date('Z')) / (24 * 3600)) : $lastpwdchange);
 
 		$dn = $allValues[0]['dn'];
 
-		if(!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if (!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			$ds = Api\Ldap::factory(true, '', $dn, $passwd);
 		}
@@ -262,7 +262,7 @@ 
 			return false;
 		}
 		// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-		if (!$admin) Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		if (!$admin) Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', (is_null($lastpwdchange) || $lastpwdchange < 0 ? time() : $lastpwdchange));
 		return true;
 	}
 
@@ -278,7 +278,7 @@ 
 	 * @param boolean $update_lastchange =true
 	 * @return boolean true if password successful changed, false otherwise
 	 */
-	function change_password($old_passwd, $new_passwd, $account_id=0, $update_lastchange=true)
+	function change_password($old_passwd, $new_passwd, $account_id = 0, $update_lastchange = true)
 	{
 		if (!$account_id)
 		{
@@ -287,11 +287,11 @@ 
 		else
 		{
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
-				Api\Translation::charset(),'utf-8');
+				Api\Translation::charset(), 'utf-8');
 		}
 		if ($this->debug) error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
 
-		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
+		$filter = str_replace(array('%user', '%domain'), array($username, $GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
 
 		$ds = $ds_admin = Api\Ldap::factory();
@@ -301,19 +301,19 @@ 
 		$entry['userpassword'] = Api\Auth::encrypt_password($new_passwd);
 		if ($update_lastchange)
 		{
-			$entry['shadowlastchange'] = round((time()-date('Z')) / (24*3600));
+			$entry['shadowlastchange'] = round((time() - date('Z')) / (24 * 3600));
 		}
 
 		$dn = $allValues[0]['dn'];
 
-		if($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if ($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			try {
 				$ds = Api\Ldap::factory(true, '', $dn, $old_passwd);
 			}
 			catch (Api\Exception\NoPermission $e) {
 				unset($e);
-				return false;	// wrong old user password
+				return false; // wrong old user password
 			}
 		}
 		// try changing password bind as user or as admin, to cater for all sorts of ldap configuration
@@ -322,10 +322,10 @@ 
 		{
 			return false;
 		}
-		if($old_passwd)	// if old password given (not called by admin) update the password in the session
+		if ($old_passwd)	// if old password given (not called by admin) update the password in the session
 		{
 			// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',time());
+			Api\Cache::setSession('phpgwapi', 'auth_alpwchange_val', time());
 		}
 		return $entry['userpassword'];
 	}

Braces +64 added lines, -16 removed lines

@@ -59,7 +59,10 @@ 
 		catch(Api\Exception\NoPermission $e)
 		{
 			unset($e);
-			if ($this->debug) error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."('$username',\$password) can NOT bind with ldap_root_dn to search!");
+			}
 			return False;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
@@ -80,13 +83,19 @@ 
 			if ($GLOBALS['egw_info']['server']['case_sensitive_username'] == true &&
 				$allValues[0]['uid'][0] != $username)
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) wrong case in username!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) wrong case in username!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) account is expired!");
+				}
 				return false;	// account is expired
 			}
 			$userDN = $allValues[0]['dn'];
@@ -124,7 +133,10 @@ 
 						else
 						{
 							$ret = false;
-							if ($this->debug) error_log(__METHOD__."('$username',\$password) bind as user failed!");
+							if ($this->debug)
+							{
+								error_log(__METHOD__."('$username',\$password) bind as user failed!");
+							}
 						}
 					}
 					// account exists, check if it is acctive
@@ -132,7 +144,10 @@ 
 					{
 						$ret = $GLOBALS['egw']->accounts->id2name($id,'account_status') == 'A';
 
-						if ($this->debug && !$ret) error_log(__METHOD__."('$username',\$password) account NOT active!");
+						if ($this->debug && !$ret)
+						{
+							error_log(__METHOD__."('$username',\$password) account NOT active!");
+						}
 					}
 				}
 				// account-repository is ldap --> check if passwd hash migration is enabled
@@ -154,7 +169,10 @@ 
 				return $ret;
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_username', '$_passwd') dn not found or password wrong!");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_username', '$_passwd') dn not found or password wrong!");
+		}
 		// dn not found or password wrong
 		return False;
 	}
@@ -176,7 +194,10 @@ 
 		}
 		catch (Api\Exception\NoPermission $ex) {
 			unset($ex);
-			if ($this->debug) error_log(__METHOD__."('$username') can NOT bind with ldap_root_dn to search!");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."('$username') can NOT bind with ldap_root_dn to search!");
+			}
 			return false;
 		}
 		/* find the dn for this uid, the uid is not always in the dn */
@@ -196,24 +217,36 @@ 
 		{
 			if (!isset($allValues[0]['shadowlastchange']))
 			{
-				if ($this->debug) error_log(__METHOD__."('$username') no shadowlastchange attribute!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username') no shadowlastchange attribute!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['case_sensitive_username'] == true &&
 				$allValues[0]['uid'][0] != $username)
 			{
-				if ($this->debug) error_log(__METHOD__."('$username') wrong case in username!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username') wrong case in username!");
+				}
 				return false;
 			}
 			if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 				isset($allValues[0]['shadowexpire']) && $allValues[0]['shadowexpire'][0]*24*3600 < time())
 			{
-				if ($this->debug) error_log(__METHOD__."('$username',\$password) account is expired!");
+				if ($this->debug)
+				{
+					error_log(__METHOD__."('$username',\$password) account is expired!");
+				}
 				return false;	// account is expired
 			}
 			return $allValues[0]['shadowlastchange'][0]*24*3600;
 		}
-		if ($this->debug) error_log(__METHOD__."('$username') dn not found or password wrong!");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$username') dn not found or password wrong!");
+		}
 		// dn not found or password wrong
 		return false;
 	}
@@ -253,16 +286,22 @@ 
 
 		$dn = $allValues[0]['dn'];
 
-		if(!$admin && $passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if(!$admin && $passwd)
+		{
+			// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			$ds = Api\Ldap::factory(true, '', $dn, $passwd);
 		}
+		}
 		if (!@ldap_modify($ds, $dn, $entry))
 		{
 			return false;
 		}
 		// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
-		if (!$admin) Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		if (!$admin)
+		{
+			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',(is_null($lastpwdchange) || $lastpwdchange<0 ? time():$lastpwdchange));
+		}
 		return true;
 	}
 
@@ -289,7 +328,10 @@ 
 			$username = Api\Translation::convert($GLOBALS['egw']->accounts->id2name($account_id),
 				Api\Translation::charset(),'utf-8');
 		}
-		if ($this->debug) error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$old_passwd','$new_passwd',$account_id, $update_lastchange) username='$username'");
+		}
 
 		$filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['egw_info']['user']['domain']),
 			$GLOBALS['egw_info']['server']['ldap_search_filter'] ? $GLOBALS['egw_info']['server']['ldap_search_filter'] : '(uid=%user)');
@@ -306,10 +348,13 @@ 
 
 		$dn = $allValues[0]['dn'];
 
-		if($old_passwd)	// if old password given (not called by admin) --> bind as that user to change the pw
+		if($old_passwd)
+		{
+			// if old password given (not called by admin) --> bind as that user to change the pw
 		{
 			try {
 				$ds = Api\Ldap::factory(true, '', $dn, $old_passwd);
+		}
 			}
 			catch (Api\Exception\NoPermission $e) {
 				unset($e);
@@ -322,11 +367,14 @@ 
 		{
 			return false;
 		}
-		if($old_passwd)	// if old password given (not called by admin) update the password in the session
+		if($old_passwd)
+		{
+			// if old password given (not called by admin) update the password in the session
 		{
 			// using time() is sufficient to represent the current time, we do not need the timestamp written to the storage
 			Api\Cache::setSession('phpgwapi','auth_alpwchange_val',time());
 		}
+		}
 		return $entry['userpassword'];
 	}
 }

api/src/Auth/Http.php

Spacing +4 added lines, -4 removed lines

@@ -29,9 +29,9 @@ 
 	 * @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')
 	{
-		unset($passwd, $passwd_type);	// not used, but required by interface
+		unset($passwd, $passwd_type); // not used, but required by interface
 
 		return isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] === $username;
 	}
@@ -44,9 +44,9 @@ 
 	 * @param int $account_id account id of user whose passwd should be changed
 	 * @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)
 	{
-		unset($old_passwd, $new_passwd, $account_id);	// not used, but required by interface
+		unset($old_passwd, $new_passwd, $account_id); // not used, but required by interface
 
 		return False;
 	}