EGroupware / egroupware

api/src/Db/Pdo.php

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
 	{
 		$egw_db = isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		switch($egw_db->Type)
+		switch ($egw_db->Type)
 		{
 			case 'mysqli':
 			case 'mysqlt':
@@ -90,17 +90,17 @@ 
 
 		$dsn = self::$pdo_type.':dbname='.$egw_db->Database.($host ? ';host='.$host.($egw_db->Port ? ';port='.$egw_db->Port : '') : '');
 		// check once if pdo extension and DB specific driver is loaded or can be loaded
-		static $pdo_available=null;
+		static $pdo_available = null;
 		if (is_null($pdo_available))
 		{
-			foreach(array('pdo','pdo_'.self::$pdo_type) as $ext)
+			foreach (array('pdo', 'pdo_'.self::$pdo_type) as $ext)
 			{
-				check_load_extension($ext,true);	// true = throw Exception
+				check_load_extension($ext, true); // true = throw Exception
 			}
 			$pdo_available = true;
 		}
 		// set client charset of the connection
-		switch(self::$pdo_type)
+		switch (self::$pdo_type)
 		{
 			case 'mysql':
 				$dsn .= ';charset=utf8';
@@ -110,15 +110,15 @@ 
 				break;
 		}
 		try {
-			self::$pdo = new \PDO($dsn,$egw_db->User,$egw_db->Password,array(
+			self::$pdo = new \PDO($dsn, $egw_db->User, $egw_db->Password, array(
 				\PDO::ATTR_ERRMODE=>\PDO::ERRMODE_EXCEPTION,
 			));
 		}
-		catch(\PDOException $e)
+		catch (\PDOException $e)
 		{
 			unset($e);
 			// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
-			self::$pdo = new \PDO($dsn,$egw_db->User,'$egw_db->Password');
+			self::$pdo = new \PDO($dsn, $egw_db->User, '$egw_db->Password');
 		}
 		if ($query)
 		{
@@ -137,7 +137,7 @@ 
 	{
 		if (is_numeric($time))
 		{
-			$time = date('Y-m-d H:i:s',$time);
+			$time = date('Y-m-d H:i:s', $time);
 		}
 		return $time;
 	}

infolog/inc/class.infolog_zpush.inc.php

Spacing +25 added lines, -25 removed lines

@@ -37,12 +37,12 @@ 
 	 */
 	static public $mapping = array(
 		'body'	=> 'info_des',
-		'categories' => 'info_cat',	// infolog supports only a single category
-		'complete' => 'info_status', 	// 0 or 1 <--> 'done', ....
+		'categories' => 'info_cat', // infolog supports only a single category
+		'complete' => 'info_status', // 0 or 1 <--> 'done', ....
 		'datecompleted' => 'info_datecompleted',
 		'duedate' => 'info_enddate',
-		'importance' => 'info_priority',	// 0=Low, 1=Normal, 2=High (EGW additional 3=Urgent)
-		'sensitivity' => 'info_access',	// 0=Normal, 1=Personal, 2=Private, 3=Confiential <--> 'public', 'private'
+		'importance' => 'info_priority', // 0=Low, 1=Normal, 2=High (EGW additional 3=Urgent)
+		'sensitivity' => 'info_access', // 0=Normal, 1=Personal, 2=Private, 3=Confiential <--> 'public', 'private'
 		'startdate' => 'info_startdate',
 		'subject' => 'info_subject',
 		//'recurrence' => EGroupware InfoLog does NOT support recuring tasks
@@ -75,7 +75,7 @@ 
 	 * @param int $account =null account_id of addressbook or null to get array of all addressbooks
 	 * @return string|array folder name of array with int account_id => folder name pairs
 	 */
-	private function get_folders($account=null)
+	private function get_folders($account = null)
 	{
 		$folders = array(
 			$GLOBALS['egw_info']['user']['account_id'] => lang('InfoLog'),
@@ -95,7 +95,7 @@ 
 		foreach ($this->get_folders() as $account => $label)
 		{
 			$folderlist[] = array(
-				'id'	=>	$this->backend->createID('infolog',$account),
+				'id'	=>	$this->backend->createID('infolog', $account),
 				'mod'	=>	$label,
 				'parent'=>	'0',
 			);
@@ -191,14 +191,14 @@ 
 	 * @param int $cutoffdate =null
 	 * @return array
   	 */
-	function GetMessageList($id, $cutoffdate=NULL)
+	function GetMessageList($id, $cutoffdate = NULL)
 	{
-		unset($cutoffdate);	// not used, but required by function signature
+		unset($cutoffdate); // not used, but required by function signature
 
 		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
 
 		$type = $user = null;
-		$this->backend->splitID($id,$type,$user);
+		$this->backend->splitID($id, $type, $user);
 		if (!($infolog_types = $GLOBALS['egw_info']['user']['preferences']['activesync']['infolog-types']))
 		{
 			$infolog_types = 'task';
@@ -212,9 +212,9 @@ 
 		$messagelist = array();
 		// reading tasks in chunks of 100, to keep memory down for huge infologs
 		$filter['num_rows'] = 100;
-		for($filter['start']=0; ($infologs = $this->infolog->search($filter)); $filter['start'] += $filter['num_rows'])
+		for ($filter['start'] = 0; ($infologs = $this->infolog->search($filter)); $filter['start'] += $filter['num_rows'])
 		{
-			foreach($infologs as $infolog)
+			foreach ($infologs as $infolog)
 			{
 				$messagelist[] = $this->StatMessage($id, $infolog);
 			}
@@ -251,7 +251,7 @@ 
 			return false;
 		}
 		$message = new SyncTask();
-		foreach(self::$mapping as $key => $attr)
+		foreach (self::$mapping as $key => $attr)
 		{
 			switch ($attr)
 			{
@@ -264,11 +264,11 @@ 
 					}
 					else
 					{
-						if (strlen ($infolog[$attr]) > 0)
+						if (strlen($infolog[$attr]) > 0)
 						{
 							ZLog::Write(LOGLEVEL_DEBUG, "airsyncbasebody!");
 							$message->asbody = new SyncBaseBody();
-							$message->nativebodytype=1;
+							$message->nativebodytype = 1;
 							$this->backend->note2messagenote($infolog[$attr], $bodypreference, $message->asbody);
 						}
 					}
@@ -276,7 +276,7 @@ 
 
 				case 'info_cat':
 					$message->$key = array();
-					foreach($infolog[$attr] ? explode(',',$infolog[$attr]) : array() as $cat_id)
+					foreach ($infolog[$attr] ? explode(',', $infolog[$attr]) : array() as $cat_id)
 					{
 						$message->categories[] = Api\Categories::id2name($cat_id);
 					}
@@ -300,7 +300,7 @@ 
 					break;
 
 				case 'info_priority':
-					if ($infolog[$attr] > 2) $infolog[$attr] = 2;	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
+					if ($infolog[$attr] > 2) $infolog[$attr] = 2; // AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
 					// fall through
 				default:
 					if (!empty($infolog[$attr])) $message->$key = $infolog[$attr];
@@ -324,7 +324,7 @@ 
 	 */
 	public function StatMessage($folderid, $infolog)
 	{
-		unset($folderid);	// not used, info_id does not depend on folder
+		unset($folderid); // not used, info_id does not depend on folder
 
 		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
 
@@ -360,7 +360,7 @@ 
 	 */
 	public function ChangeFolder($id, $oldid, $displayname, $type)
 	{
-		unset($id, $oldid, $displayname, $type);	// not used
+		unset($id, $oldid, $displayname, $type); // not used
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." not implemented");
 	}
@@ -377,7 +377,7 @@ 
 	 */
 	public function DeleteFolder($parentid, $id)
 	{
-		unset($parentid, $id);	// not used
+		unset($parentid, $id); // not used
 
 		ZLog::Write(LOGLEVEL_DEBUG, __METHOD__." not implemented");
 	}
@@ -432,7 +432,7 @@ 
 					case 'info_cat':
 						if (is_array($message->$key))
 						{
-							$infolog[$attr] = implode(',', array_filter($this->infolog->find_or_add_categories($message->$key, $id),'strlen'));
+							$infolog[$attr] = implode(',', array_filter($this->infolog->find_or_add_categories($message->$key, $id), 'strlen'));
 						}
 						break;
 
@@ -449,7 +449,7 @@ 
 						break;
 
 					case 'info_priority':	// AS does not know 3=Urgent (only 0=Low, 1=Normal, 2=High)
-						if ($infolog[$attr] == 3 && $message->$key == 2) break;	// --> do NOT change Urgent, if AS reports High
+						if ($infolog[$attr] == 3 && $message->$key == 2) break; // --> do NOT change Urgent, if AS reports High
 						// fall through
 					default:
 						$infolog[$attr] = $message->$key;
@@ -504,7 +504,7 @@ 
 	 */
 	public function DeleteMessage($folderid, $id, $contentParameters)
 	{
-		unset($contentParameters);	// not used
+		unset($contentParameters); // not used
 
 		if (!isset($this->infolog)) $this->infolog = new infolog_bo();
 
@@ -532,7 +532,7 @@ 
 	 */
 	public function SetReadFlag($folderid, $id, $flags, $contentParameters)
 	{
-		unset($folderid, $id, $flags, $contentParameters);	// not used
+		unset($folderid, $id, $flags, $contentParameters); // not used
 
 		return false;
 	}
@@ -549,7 +549,7 @@ 
 	 */
 	function ChangeMessageFlag($folderid, $id, $flags)
 	{
-		unset($folderid, $id, $flags);	// not used
+		unset($folderid, $id, $flags); // not used
 
 		return false;
 	}
@@ -582,7 +582,7 @@ 
 			'info_type' => explode(',', $infolog_types),
 		));
 
-		$changes = array();	// no change
+		$changes = array(); // no change
 		//$syncstate_was = $syncstate;
 
 		if ($ctag !== $syncstate)

api/src/Ldap.php

Spacing +18 added lines, -18 removed lines

@@ -49,14 +49,14 @@ 
 	 *
 	 * @var boolean $exception_on_error
 	 */
-	var $exception_on_error=false;
+	var $exception_on_error = false;
 
 	/**
 	 * Constructor
 	 *
 	 * @param boolean $exception_on_error =false true: throw Exceptions in ldapConnect instead of echoing error and returning false
 	 */
-	function __construct($exception_on_error=false)
+	function __construct($exception_on_error = false)
 	{
 		$this->exception_on_error = $exception_on_error;
 		$this->restoreSessionData();
@@ -83,7 +83,7 @@ 
 	 * @throws Exception\AssertingFailed 'LDAP support unavailable!' (no ldap extension)
 	 * @throws Exception\NoPermission if bind fails
 	 */
-	public static function factory($ressource=true, $host='', $dn='', $passwd='')
+	public static function factory($ressource = true, $host = '', $dn = '', $passwd = '')
 	{
 		$key = md5($host.':'.$dn.':'.$passwd);
 
@@ -118,7 +118,7 @@ 
 	 */
 	static function quote($string)
 	{
-		return str_replace(array('\\','*','(',')','\0',' '),array('\\\\','\*','\(','\)','\\0','\20'),$string);
+		return str_replace(array('\\', '*', '(', ')', '\0', ' '), array('\\\\', '\*', '\(', '\)', '\\0', '\20'), $string);
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 		if (!is_array($ldap)) return false;
 
 		$arr = array();
-		foreach($ldap as $var => $val)
+		foreach ($ldap as $var => $val)
 		{
 			if (is_int($var) || $var == 'count') continue;
 
@@ -164,13 +164,13 @@ 
 	 * @throws Exception\AssertingFailed 'LDAP support unavailable!' (no ldap extension)
 	 * @throws Exception\NoPermission if bind fails
 	 */
-	function ldapConnect($host='', $dn='', $passwd='')
+	function ldapConnect($host = '', $dn = '', $passwd = '')
 	{
-		if(!function_exists('ldap_connect'))
+		if (!function_exists('ldap_connect'))
 		{
 			if ($this->exception_on_error) throw new Exception\AssertionFailed('LDAP support unavailable!');
 
-			printf('<b>Error: LDAP support unavailable</b><br>',$host);
+			printf('<b>Error: LDAP support unavailable</b><br>', $host);
 			return False;
 		}
 		if (empty($host))
@@ -188,7 +188,7 @@ 
 		{
 			$host = $_SESSION['ldapConnect'][$host];
 		}
-		foreach($hosts=preg_split('/[ ,;]+/', $host) as $h)
+		foreach ($hosts = preg_split('/[ ,;]+/', $host) as $h)
 		{
 			if ($this->_connect($h, $dn, $passwd))
 			{
@@ -196,7 +196,7 @@ 
 				{
 					if (isset($_SESSION))	// store working host as first choice in session
 					{
-						$_SESSION['ldapConnect'][$host] = implode(' ',array_unique(array_merge(array($h),$hosts)));
+						$_SESSION['ldapConnect'][$host] = implode(' ', array_unique(array_merge(array($h), $hosts)));
 					}
 				}
 				return $this->ds;
@@ -221,20 +221,20 @@ 
 	 */
 	private function _connect($host, $dn, $passwd)
 	{
-		if (($use_tls = substr($host,0,6) == 'tls://'))
+		if (($use_tls = substr($host, 0, 6) == 'tls://'))
 		{
-			$port = parse_url($host,PHP_URL_PORT);
-			$host = parse_url($host,PHP_URL_HOST);
+			$port = parse_url($host, PHP_URL_PORT);
+			$host = parse_url($host, PHP_URL_HOST);
 		}
 		// connect to ldap server (never fails, as connection happens in bind!)
-		if(!$host || !($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
+		if (!$host || !($this->ds = !empty($port) ? ldap_connect($host, $port) : ldap_connect($host)))
 		{
 			return False;
 		}
 		// set network timeout to not block for minutes
 		ldap_set_option($this->ds, LDAP_OPT_NETWORK_TIMEOUT, 5);
 
-		if(ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
+		if (ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3))
 		{
 			$supportedLDAPVersion = 3;
 		}
@@ -245,7 +245,7 @@ 
 		if ($use_tls) ldap_start_tls($this->ds);
 
 		if (!isset($this->ldapserverinfo) ||
-			!is_a($this->ldapserverinfo,'EGroupware\Ldap\ServerInfo') ||
+			!is_a($this->ldapserverinfo, 'EGroupware\Ldap\ServerInfo') ||
 			$this->ldapserverinfo->host != $host)
 		{
 			//error_log("no ldap server info found");
@@ -255,7 +255,7 @@ 
 			$this->saveSessionData();
 		}
 
-		if(!@ldap_bind($this->ds, $dn, $passwd))
+		if (!@ldap_bind($this->ds, $dn, $passwd))
 		{
 			return False;
 		}
@@ -268,7 +268,7 @@ 
 	 */
 	function ldapDisconnect()
 	{
-		if(is_resource($this->ds))
+		if (is_resource($this->ds))
 		{
 			ldap_unbind($this->ds);
 			unset($this->ds);

api/src/Auth/Sql.php

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;
 	}

admin/apcu.php

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");

calendar/inc/class.calendar_wizard_import_csv.inc.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('calendar');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -56,7 +56,7 @@ 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
+		$content['msg'] .= "\n*";
 
 		return $result;
 	}
@@ -71,7 +71,7 @@ 
 			'id'	=>	'Calendar ID'
 		);
 		
-		if(!$content['skip_conflicts'] && $content['plugin_options']['skip_conflicts'])
+		if (!$content['skip_conflicts'] && $content['plugin_options']['skip_conflicts'])
 		{
 			$content['skip_conflicts'] = $content['plugin_options']['skip_conflicts'];
 		}

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);
 						}

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/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)