bearsunday / BEAR.Package

src/Provide/ApplicationLogger/ResourceLog/Writer/Zf2Log.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-     * @param $hasServerInfo
+     * @param boolean $hasServerInfo
      *
      * @return string
      */

Spacing +4 added lines, -4 removed lines

@@ -46,10 +46,10 @@
         $this->pageId = rtrim(base64_encode(pack('H*', md5($_SERVER['REQUEST_TIME_FLOAT']))), '=');
         $id = "{$this->pageId}";
         /** @var $logger \Zend\Log\LoggerInterface */
-        $msg = "id:{$id}\treq:" . $request->toUriWithMethod();
-        $msg .= "\tcode:" . $result->code;
-        $msg .= "\tbody:" . json_encode($result->body);
-        $msg .= "\theader:" . json_encode($result->headers);
+        $msg = "id:{$id}\treq:".$request->toUriWithMethod();
+        $msg .= "\tcode:".$result->code;
+        $msg .= "\tbody:".json_encode($result->body);
+        $msg .= "\theader:".json_encode($result->headers);
         $path = $this->getPath(isset($_SERVER['PATH_INFO']));
         $msg .= "\tpath:$path";
         try {

src/Provide/ResourceView/DevTemplateEngineRenderer.php

Doc Comments +4 added lines, -4 removed lines

@@ -227,7 +227,7 @@ 
      *
      * @param string $file
      *
-     * @return mixed
+     * @return string
      * @return string
      */
     private function makeRelativePath($file)
@@ -240,9 +240,9 @@ 
     /**
      * Return label
      *
-     * @param                $body
+     * @param                string $body
      * @param ResourceObject $resourceObject
-     * @param                $templateFile
+     * @param                string $templateFile
      *
      * @return string
      */
@@ -265,7 +265,7 @@ 
 
     /**
      * @param ResourceObject $resourceObject
-     * @param                $labelColor
+     * @param                string $labelColor
      * @param                $templateFile
      * @param                $body
      *

Spacing +16 added lines, -16 removed lines

@@ -181,7 +181,7 @@ 
             $this->templateEngineAdapter->assignAll($resourceObject->body);
         }
         // rendering with original render
-        $view =  $this->templateEngineRenderer->render($resourceObject);
+        $view = $this->templateEngineRenderer->render($resourceObject);
 
         // add tool bar
         $resourceObject->view = $view;
@@ -273,10 +273,10 @@ 
      */
     private function addResourceMetaInfo(ResourceObject $resourceObject, $labelColor, $templateFile, $body)
     {
-        $resourceName = ($resourceObject->uri ? : get_class($resourceObject));
+        $resourceName = ($resourceObject->uri ?: get_class($resourceObject));
         // code editor
         $ref = new ReflectionObject($resourceObject);
-        $codeFile = ($resourceObject instanceof WeavedInterface) ? $ref->getParentClass()->getFileName(): $ref->getFileName();
+        $codeFile = ($resourceObject instanceof WeavedInterface) ? $ref->getParentClass()->getFileName() : $ref->getFileName();
         $codeFile = $this->makeRelativePath($codeFile);
         $var = $this->getVar($resourceObject->body);
         $resourceKey = spl_object_hash($resourceObject);
@@ -284,7 +284,7 @@ 
 
         $resourceBody = preg_replace_callback(
             '/<!-- resource(.*?)resource_tab_end -->/s',
-            function ($matches) {
+            function($matches) {
                 $uri = substr(explode(' ', $matches[1])[0], 1);
                 preg_match('/ <!-- resource_body_start -->(.*?)<!-- resource_body_end -->/s', $matches[1], $resourceBodyMatch);
                 return "<!-- resource:$uri -->{$resourceBodyMatch[1]}<!-- /resource:$uri -->";
@@ -293,7 +293,7 @@ 
         );
         $resourceBodyHtml = highlight_string($resourceBody, true);
         $info = $this->getResourceInfo($resourceObject);
-        $rmReturn = function ($str) {
+        $rmReturn = function($str) {
             return str_replace("\n", '', $str);
         };
         $result = <<<EOT
@@ -369,16 +369,16 @@ 
         }
         array_walk_recursive(
             $body,
-            function (&$value) {
+            function(&$value) {
                 if ($value instanceof Request) {
-                    $value = '(Request)' . $value->toUri();
+                    $value = '(Request)'.$value->toUri();
                 }
                 if ($value instanceof ResourceObject) {
                     $value = $value->body;
                 }
                 if (is_object($value)) {
                     /** @var $value object */
-                    $value = '(object) ' . get_class($value);
+                    $value = '(object) '.get_class($value);
                 }
             }
         );
@@ -413,7 +413,7 @@ 
      */
     private function getParamsInfo(ResourceObject $resourceObject)
     {
-        $result = self::BADGE_ARGS . self::DIV_WELL;
+        $result = self::BADGE_ARGS.self::DIV_WELL;
         if (isset($resourceObject->headers[DevInvoker::HEADER_PARAMS])) {
             $params = json_decode($resourceObject->headers[DevInvoker::HEADER_PARAMS], true);
         } else {
@@ -441,7 +441,7 @@ 
         /** @noinspection PhpUndefinedVariableInspection */
         $result .= "<ul>{$paramInfo}</ul>";
 
-        return $result . '</div>';
+        return $result.'</div>';
     }
 
     /**
@@ -453,9 +453,9 @@ 
      */
     private function getInterceptorInfo(ResourceObject $resourceObject)
     {
-        $result = self::BADGE_INTERCEPTORS . self::DIV_WELL;
+        $result = self::BADGE_INTERCEPTORS.self::DIV_WELL;
         if (!isset($resourceObject->headers[DevInvoker::HEADER_INTERCEPTORS])) {
-            return $result . 'n/a</div>';
+            return $result.'n/a</div>';
         }
         $result .= '<ul class="unstyled">';
         $interceptors = json_decode($resourceObject->headers[DevInvoker::HEADER_INTERCEPTORS], true);
@@ -486,9 +486,9 @@ 
             $resourceObject->headers[CacheLoader::HEADER_CACHE],
             true
         ) : false;
-        $result = self::BADGE_CACHE . self::DIV_WELL;
+        $result = self::BADGE_CACHE.self::DIV_WELL;
         if ($cache === false) {
-            return $result . 'n/a</div>';
+            return $result.'n/a</div>';
         }
         $iconLife = self::ICON_LIFE;
         $iconTime = self::ICON_TIME;
@@ -508,7 +508,7 @@ 
             $result .= "Read {$iconLife} {$life} {$iconTime} {$time}";
         }
 
-        return $result . '</div>';
+        return $result.'</div>';
     }
 
     /**
@@ -521,7 +521,7 @@ 
     private function getProfileInfo(ResourceObject $resourceObject)
     {
         // memory, time
-        $result = self::BADGE_PROFILE . self::DIV_WELL;
+        $result = self::BADGE_PROFILE.self::DIV_WELL;
         if (isset($resourceObject->headers[DevInvoker::HEADER_EXECUTION_TIME])) {
             $time = number_format($resourceObject->headers[DevInvoker::HEADER_EXECUTION_TIME], 3);
         } else {

src/Provide/ResourceView/HalFactory.php

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 use Nocarrier\Hal;
 use BEAR\Resource\Link;
 use Ray\Di\Di\Inject;
-use Ray\Di\Di\Named;
 
 class HalFactory implements HalFactoryInterface
 {

src/Provide/WebResponse/HttpFoundation.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
  */
 namespace BEAR\Package\Provide\WebResponse;
 
-use BEAR\Resource\ResourceObject as Page;
 use BEAR\Resource\ResourceObject;
 use BEAR\Resource\RenderInterface;
 use BEAR\Sunday\Exception\InvalidResourceType;

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      */
     public function render(RenderInterface $renderer = null)
     {
-        $this->view = is_null($renderer) ?  (string) $this->resource : $renderer->render($this->resource);
+        $this->view = is_null($renderer) ? (string) $this->resource : $renderer->render($this->resource);
 
         return $this;
     }
@@ -130,7 +130,7 @@ 
         // compliant with RFC 2616.
         $this->response;
 
-        if (! $this->isCli) {
+        if (!$this->isCli) {
             $this->response->send();
             return $this;
         }

var/www/admin/apc/apc.php

Doc Comments +4 added lines

@@ -465,6 +465,10 @@
 }
 
 // create menu entry
+/**
+ * @param integer $ob
+ * @param string $title
+ */
 function menu_entry($ob,$title) {
 	global $MYREQUEST,$MY_SELF;
 	if ($MYREQUEST['OB']!=$ob) {

Indentation +555 added lines, -555 removed lines

@@ -37,13 +37,13 @@ 
 ////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
 
 defaults('USE_AUTHENTICATION',0);			// Use (internal) authentication - best choice if
-											// no other authentication is available
-											// If set to 0:
-											//  There will be no further authentication. You
-											//  will have to handle this by yourself!
-											// If set to 1:
-											//  You need to change ADMIN_PASSWORD to make
-											//  this work!
+                                            // no other authentication is available
+                                            // If set to 0:
+                                            //  There will be no further authentication. You
+                                            //  will have to handle this by yourself!
+                                            // 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!!!
 
@@ -62,7 +62,7 @@ 
 
 // "define if not defined"
 function defaults($d,$v) {
-	if (!defined($d)) define($d,$v); // or just @define(...)
+    if (!defined($d)) define($d,$v); // or just @define(...)
 }
 
 // rewrite $PHP_SELF to block XSS attacks
@@ -72,7 +72,7 @@ 
 $host = php_uname('n');
 if($host) { $host = '('.$host.')'; }
 if (isset($_SERVER['SERVER_ADDR'])) {
-  $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
+    $host .= ' ('.$_SERVER['SERVER_ADDR'].')';
 }
 
 // operation constants
@@ -82,50 +82,50 @@ 
 
 // 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
-	'SEARCH'	=> '~^[a-zA-Z0-9/_.-]*$~'			// aggregation by dir level
+    '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(
-	'A' => 'cache_list',
-	'D' => 'deleted_list'
+    'A' => 'cache_list',
+    'D' => 'deleted_list'
 );
 
 // handle POST and GET requests
 if (empty($_REQUEST)) {
-	if (!empty($_GET) && !empty($_POST)) {
-		$_REQUEST = array_merge($_GET, $_POST);
-	} else if (!empty($_GET)) {
-		$_REQUEST = $_GET;
-	} else if (!empty($_POST)) {
-		$_REQUEST = $_POST;
-	} else {
-		$_REQUEST = array();
-	}
+    if (!empty($_GET) && !empty($_POST)) {
+        $_REQUEST = array_merge($_GET, $_POST);
+    } else if (!empty($_GET)) {
+        $_REQUEST = $_GET;
+    } else if (!empty($_POST)) {
+        $_REQUEST = $_POST;
+    } else {
+        $_REQUEST = array();
+    }
 }
 
 // check parameter syntax
 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];
-	} else {
-		$MYREQUEST[$var]=$_REQUEST[$var]=NULL;
-	}
+    if (!isset($_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;
+    }
 }
 
 // check parameter sematics
@@ -137,58 +137,58 @@ 
 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'];
+    "$PHP_SELF".
+    "?SCOPE=".$MYREQUEST['SCOPE'].
+    "&SORT1=".$MYREQUEST['SORT1'].
+    "&SORT2=".$MYREQUEST['SORT2'].
+    "&COUNT=".$MYREQUEST['COUNT'];
 $MY_SELF_WO_SORT=
-	"$PHP_SELF".
-	"?SCOPE=".$MYREQUEST['SCOPE'].
-	"&COUNT=".$MYREQUEST['COUNT'];
+    "$PHP_SELF".
+    "?SCOPE=".$MYREQUEST['SCOPE'].
+    "&COUNT=".$MYREQUEST['COUNT'];
 
 // 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']) ||
-			$_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||
-			$_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
-			Header("WWW-Authenticate: Basic realm=\"APC Login\"");
-			Header("HTTP/1.0 401 Unauthorized");
+        if (!isset($_SERVER['PHP_AUTH_USER']) ||
+            !isset($_SERVER['PHP_AUTH_PW']) ||
+            $_SERVER['PHP_AUTH_USER'] != ADMIN_USERNAME ||
+            $_SERVER['PHP_AUTH_PW'] != ADMIN_PASSWORD) {
+            Header("WWW-Authenticate: Basic realm=\"APC Login\"");
+            Header("HTTP/1.0 401 Unauthorized");
 
-			echo <<<EOB
+            echo <<<EOB
 				<html><body>
 				<h1>Rejected!</h1>
 				<big>Wrong Username or Password!</big><br/>&nbsp;<br/>&nbsp;
 				<big><a href='$PHP_SELF?OB={$MYREQUEST['OB']}'>Continue...</a></big>
 				</body></html>
 EOB;
-			exit;
+            exit;
 
-		} else {
-			$AUTHENTICATED=1;
-		}
-	}
+        } else {
+            $AUTHENTICATED=1;
+        }
+    }
 }
 
 // clear cache
 if ($AUTHENTICATED && isset($MYREQUEST['CC']) && $MYREQUEST['CC']) {
-	apcu_clear_cache();
+    apcu_clear_cache();
 }
 
 if ($AUTHENTICATED && !empty($MYREQUEST['DU'])) {
-	apcu_delete($MYREQUEST['DU']);
+    apcu_delete($MYREQUEST['DU']);
 }
 
 if(!function_exists('apcu_cache_info')) {
-	echo "No cache info available.  APC does not appear to be running.";
-  exit;
+    echo "No cache info available.  APC does not appear to be running.";
+    exit;
 }
 
 $cache = apcu_cache_info();
@@ -226,286 +226,286 @@ 
 // create graphics
 //
 function graphics_avail() {
-	return extension_loaded('gd');
+    return extension_loaded('gd');
 }
 if (isset($MYREQUEST['IMG']))
 {
-	if (!graphics_avail()) {
-		exit(0);
-	}
+    if (!graphics_avail()) {
+        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);
-
-
-		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 {
-			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);
-		}
-		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 {
-				imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
-			}
-		}
-	}
+    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 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);
-
-		} else {
-			imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
-		}
-	}
+        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 {
+            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);
+        }
+        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 {
+                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='') {
-		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);
-		imagerectangle($im, $x, $y1, $x1, $y, $color1);
-		if ($text) {
-			if ($placeindex>0) {
-
-				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);
-
-				} else {
-					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;
-					}
-					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);
-			}
-		}
-	}
+    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);
 
-	$size = GRAPH_SIZE; // image size
-	if ($MYREQUEST['IMG']==3)
-		$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);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$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;
-		$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_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'];
-			}
-			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])));
-		}
-		break;
-
-	case 2:
-		$s=$cache['nhits']+$cache['nmisses'];
-		$a=$cache['nhits'];
-
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['nhits']*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['nmisses']*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) {
+        } 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='') {
+        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);
+        imagerectangle($im, $x, $y1, $x1, $y, $color1);
+        if ($text) {
+            if ($placeindex>0) {
+
+                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);
+
+                } else {
+                    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;
+                    }
+                    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);
+            }
+        }
+    }
+
+
+    $size = GRAPH_SIZE; // image size
+    if ($MYREQUEST['IMG']==3)
+        $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);
+    $col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
+    $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;
+        $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_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'];
+            }
+            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])));
+        }
+        break;
+
+    case 2:
+        $s=$cache['nhits']+$cache['nmisses'];
+        $a=$cache['nhits'];
+
+        fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['nhits']*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['nmisses']*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);
+                        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) {
+                    $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_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
-				$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;
-
-		case 4:
-			$s=$cache['nhits']+$cache['nmisses'];
-			$a=$cache['nhits'];
-
-			fill_box($image, 30,$size,50,$s ? -$a*($size-21)/$s : 0,$col_black,$col_green,sprintf("%.1f%%", $s ? $cache['nhits']*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['nmisses']*100/$s : 0));
-		break;
-	}
+                $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++);
+                }
+            }
+        }
+        break;
+
+        case 4:
+            $s=$cache['nhits']+$cache['nmisses'];
+            $a=$cache['nhits'];
+
+            fill_box($image, 30,$size,50,$s ? -$a*($size-21)/$s : 0,$col_black,$col_green,sprintf("%.1f%%", $s ? $cache['nhits']*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['nmisses']*100/$s : 0));
+        break;
+    }
 
-	header("Content-type: image/png");
-	imagepng($image);
-	exit;
+    header("Content-type: image/png");
+    imagepng($image);
+    exit;
 }
 
 // pretty printer for byte values
 //
 function bsize($s) {
-	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
-		$s/=1024;
-	}
-	return sprintf("%5.1f %sBytes",$s,$k);
+    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='') {
-	global $MYREQUEST, $MY_SELF_WO_SORT;
+    global $MYREQUEST, $MY_SELF_WO_SORT;
 
-	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>";
+    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) {
-		return "<li><a href=\"$MY_SELF&OB=$ob\">$title</a></li>";
-	} else if (empty($MYREQUEST['SH'])) {
-		return "<li><span class=active>$title</span></li>";
-	} else {
-		return "<li><a class=\"child_active\" href=\"$MY_SELF&OB=$ob\">$title</a></li>";
-	}
+    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>";
+    } else {
+        return "<li><a class=\"child_active\" href=\"$MY_SELF&OB=$ob\">$title</a></li>";
+    }
 }
 
 function put_login_link($s="Login")
 {
-	global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
-	// needs ADMIN_PASSWORD to be changed!
-	//
-	if (!USE_AUTHENTICATION) {
-		return;
-	} else if (ADMIN_PASSWORD=='password')
-	{
-		print <<<EOB
+    global $MY_SELF,$MYREQUEST,$AUTHENTICATED;
+    // needs ADMIN_PASSWORD to be changed!
+    //
+    if (!USE_AUTHENTICATION) {
+        return;
+    } 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) {
-		print <<<EOB
+    } else if ($AUTHENTICATED) {
+        print <<<EOB
 			'{$_SERVER['PHP_AUTH_USER']}'&nbsp;logged&nbsp;in!
 EOB;
-	} else{
-		print <<<EOB
+    } else{
+        print <<<EOB
 			<a href="$MY_SELF&LO=1&OB={$MYREQUEST['OB']}">$s</a>
 EOB;
-	}
+    }
 }
 
 function block_sort($array1, $array2)
 {
-	if ($array1['offset'] > $array2['offset']) {
-		return 1;
-	} else {
-		return -1;
-	}
+    if ($array1['offset'] > $array2['offset']) {
+        return 1;
+    } else {
+        return -1;
+    }
 }
 
 
@@ -729,12 +729,12 @@ 
 	<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
+    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;
 }
@@ -755,40 +755,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['nhits'] ? (($cache['nhits']+$cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'])/($time-$cache['stime'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts'])/($time-$cache['stime'])) : 0);
-	$apcversion = phpversion('apcu');
-	$phpversion = phpversion();
-	$number_vars = $cache['nentries'];
+    $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['nhits'] ? (($cache['nhits']+$cache['nmisses'])/($time-$cache['stime'])) : 0);
+    $hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'])/($time-$cache['stime'])) : 0);
+    $miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses'])/($time-$cache['stime'])) : 0);
+    $insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts'])/($time-$cache['stime'])) : 0);
+    $apcversion = phpversion('apcu');
+    $phpversion = phpversion();
+    $number_vars = $cache['nentries'];
     $size_vars = bsize($cache['mem_size']);
-	$i=0;
-	echo <<< EOB
+    $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;
 
-	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
+    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['stime']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['stime']),'</td></tr>';
-	echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
-	echo <<<EOB
+    echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['stime']),'</td></tr>';
+    echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['stime']),'</td></tr>';
+    echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
+    echo <<<EOB
 		</tbody></table>
 		</div>
 
@@ -810,25 +810,25 @@ 
 		<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);
+    $size='width='.(GRAPH_SIZE+50).' height='.(GRAPH_SIZE+10);
 echo <<<EOB
 		<tr>
 		<td class=td-0>$mem_note</td>
@@ -836,20 +836,20 @@ 
 		</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['nhits'].@sprintf(" (%.1f%%)",$cache['nhits']*100/($cache['nhits']+$cache['nmisses'])),"</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['nmisses'].@sprintf(" (%.1f%%)",$cache['nmisses']*100/($cache['nhits']+$cache['nmisses'])),"</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['nhits'].@sprintf(" (%.1f%%)",$cache['nhits']*100/($cache['nhits']+$cache['nmisses'])),"</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['nmisses'].@sprintf(" (%.1f%%)",$cache['nmisses']*100/($cache['nhits']+$cache['nmisses'])),"</td>\n";
+    echo <<< EOB
 		</tr>
 		</tbody></table>
 
@@ -860,284 +860,284 @@ 
 		<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;
-			}
-			$ptr = $block['offset'] + $block['size'];
+    // 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'];
-		}
-		$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);
-		echo <<<EOB
+    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
+    }
+    echo <<<EOB
 		</br>Fragmentation: $frag
 		</td>
 		</tr>
 EOB;
         if(isset($mem['adist'])) {
-          foreach($mem['adist'] as $i=>$v) {
+            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) {
+    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='key';
-	$fieldheading='User Entry Label';
-	$fieldkey='key';
-
-	$cols=6;
-	echo <<<EOB
+        put_login_link("Login now!");
+        echo '</div>';
+        break;
+    }
+    $fieldname='key';
+    $fieldheading='User Entry Label';
+    $fieldkey='key';
+
+    $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>',
+    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();
-
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
-			case 'A': $k=sprintf('%015d-',$entry['atime']);  	    break;
-			case 'H': $k=sprintf('%015d-',$entry['nhits']); 		break;
-			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
-			case 'M': $k=sprintf('%015d-',$entry['mtime']);			break;
-			case 'C': $k=sprintf('%015d-',$entry['ctime']);	        break;
-			case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
-			case 'D': $k=sprintf('%015d-',$entry['dtime']);      	break;
-			case 'S': $k=$entry["key"];								break;
-		}
-		if (!$AUTHENTICATED) {
-			// hide all path entries if not logged in
-			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
-		} else {
-			$list[$k.$entry[$fieldname]]=$entry;
-		}
-	}
+        '&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();
+
+    foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+        switch($MYREQUEST['SORT1']) {
+            case 'A': $k=sprintf('%015d-',$entry['atime']);  	    break;
+            case 'H': $k=sprintf('%015d-',$entry['nhits']); 		break;
+            case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
+            case 'M': $k=sprintf('%015d-',$entry['mtime']);			break;
+            case 'C': $k=sprintf('%015d-',$entry['ctime']);	        break;
+            case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
+            case 'D': $k=sprintf('%015d-',$entry['dtime']);      	break;
+            case 'S': $k=$entry["key"];								break;
+        }
+        if (!$AUTHENTICATED) {
+            // hide all path entries if not logged in
+            $list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
+        } else {
+            $list[$k.$entry[$fieldname]]=$entry;
+        }
+    }
+
+    if ($list) {
+        // sort list
+        //
+        switch ($MYREQUEST['SORT2']) {
+            case "A":	krsort($list);	break;
+            case "D":	ksort($list);	break;
+        }
 
-	if ($list) {
-		// sort list
-		//
-		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) {
-		$sh=md5($entry["key"]);
+        // output list
+        $i=0;
+        foreach($list as $k => $entry) {
+        if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'], $entry[$fieldname]) != 0) {
+        $sh=md5($entry["key"]);
         $field_value = htmlentities(strip_tags($entry[$fieldname],''), ENT_QUOTES, 'UTF-8');
         echo
-          '<tr class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['nhits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['atime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['ctime']),'</td>';
+            '<tr class=tr-',$i%2,'>',
+            "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"\">",$field_value,'</a></td>',
+            '<td class="td-n center">',$entry['nhits'],'</td>',
+            '<td class="td-n right">',$entry['mem_size'],'</td>',
+            '<td class="td-n center">',date(DATE_FORMAT,$entry['atime']),'</td>',
+            '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
+            '<td class="td-n center">',date(DATE_FORMAT,$entry['ctime']),'</td>';
 
         if($fieldname=='info') {
-          if($entry['ttl'])
+            if($entry['ttl'])
             echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
-          else
+            else
             echo '<td class="td-n center">None</td>';
         }
         if ($entry['dtime']) {
 
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['dtime']), '</td>';
+            echo '<td class="td-last center">', date(DATE_FORMAT,$entry['dtime']), '</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>';
+            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 '<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['key']), 1)).'</pre></td>';
-			echo '</tr>';
-		}
+        if ($sh == $MYREQUEST["SH"]) {
+            echo '<tr>';
+            echo '<td colspan="7"><pre>'.htmlentities(print_r(apcu_fetch($entry['key']), 1)).'</pre></td>';
+            echo '</tr>';
+        }
         $i++;
         if ($i == $MYREQUEST['COUNT'])
-          break;
-      }
-		}
+            break;
+        }
+        }
 
-	} else {
-		echo '<tr class=tr-0><td class="center" colspan=',$cols,'><i>No data</i></td></tr>';
-	}
-	echo <<< EOB
+    } 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)) {
-		echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
-	}
+    if ($list && $i < count($list)) {
+        echo "<a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&COUNT=0\"><i>",count($list)-$i,' more available...</i></a>';
+    }
 
-	echo <<< EOB
+    echo <<< EOB
 		</div>
 EOB;
-	break;
+    break;
 
 // -----------------------------------------------
 // Version check
 // -----------------------------------------------
 case OB_VERSION_CHECK:
-	echo <<<EOB
+    echo <<<EOB
 		<div class="info"><h2>APCu Version Information</h2>
 		<table cellspacing=0><tbody>
 		<tr>
 		<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) {
-		echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
-	} else {
-		$apcversion = phpversion('apc');
-
-		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.'),
+    }
+    if (!$rss) {
+        echo '<tr class="td-last center"><td>Unable to fetch version information.</td></tr>';
+    } else {
+        $apcversion = phpversion('apc');
+
+        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;
-			}
-			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 <<< EOB
+            $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 '</td></tr>';
+    }
+    echo <<< EOB
 		</tbody></table>
 		</div>
 EOB;
-	break;
+    break;
 
 }
 

Switch Indentation +318 added lines, -318 removed lines

@@ -329,105 +329,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;
-					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_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])));
-		}
-		break;
-
-	case 2:
-		$s=$cache['nhits']+$cache['nmisses'];
-		$a=$cache['nhits'];
-
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['nhits']*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['nmisses']*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_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++);
-				}
-			}
-		}
-		break;
+	    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_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'];
+			    }
+			    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])));
+		    }
+		    break;
+
+	    case 2:
+		    $s=$cache['nhits']+$cache['nmisses'];
+		    $a=$cache['nhits'];
+
+		    fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['nhits']*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['nmisses']*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_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++);
+				    }
+			    }
+		    }
+		    break;
 
 		case 4:
 			$s=$cache['nhits']+$cache['nmisses'];
@@ -754,41 +754,41 @@ 
 // -----------------------------------------------
 // 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['nhits'] ? (($cache['nhits']+$cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'])/($time-$cache['stime'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts'])/($time-$cache['stime'])) : 0);
-	$apcversion = phpversion('apcu');
-	$phpversion = phpversion();
-	$number_vars = $cache['nentries'];
-    $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['nhits'] ? (($cache['nhits']+$cache['nmisses'])/($time-$cache['stime'])) : 0);
+	    $hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'])/($time-$cache['stime'])) : 0);
+	    $miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses'])/($time-$cache['stime'])) : 0);
+	    $insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts'])/($time-$cache['stime'])) : 0);
+	    $apcversion = phpversion('apcu');
+	    $phpversion = phpversion();
+	    $number_vars = $cache['nentries'];
+        $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['stime']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['stime']),'</td></tr>';
-	echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
-	echo <<<EOB
+	    echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$cache['stime']),'</td></tr>';
+	    echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['stime']),'</td></tr>';
+	    echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
+	    echo <<<EOB
 		</tbody></table>
 		</div>
 
@@ -810,46 +810,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['nhits'].@sprintf(" (%.1f%%)",$cache['nhits']*100/($cache['nhits']+$cache['nmisses'])),"</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['nmisses'].@sprintf(" (%.1f%%)",$cache['nmisses']*100/($cache['nhits']+$cache['nmisses'])),"</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['nhits'].@sprintf(" (%.1f%%)",$cache['nhits']*100/($cache['nhits']+$cache['nmisses'])),"</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['nmisses'].@sprintf(" (%.1f%%)",$cache['nmisses']*100/($cache['nhits']+$cache['nmisses'])),"</td>\n";
+	    echo <<< EOB
 		</tr>
 		</tbody></table>
 
@@ -860,141 +860,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;
-			}
-			$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]);
-	}
-
-	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);
-		echo <<<EOB
-			<img alt="" $size src="$PHP_SELF?IMG=3&$time">
-EOB;
-	}
-	echo <<<EOB
-		</br>Fragmentation: $frag
+	    // 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'];
+		    }
+		    $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 (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
+    		</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;
-
-
-// -----------------------------------------------
-// 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='key';
-	$fieldheading='User Entry Label';
-	$fieldkey='key';
-
-	$cols=6;
-	echo <<<EOB
+	    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='key';
+	    $fieldheading='User Entry Label';
+	    $fieldkey='key';
+
+	    $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>';
-
-	// builds list with alpha numeric sortable keys
-	//
-	$list = array();
+	    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;
+       }
+      }
 
-	foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
-		switch($MYREQUEST['SORT1']) {
+      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();
+
+	    foreach($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+		    switch($MYREQUEST['SORT1']) {
 			case 'A': $k=sprintf('%015d-',$entry['atime']);  	    break;
 			case 'H': $k=sprintf('%015d-',$entry['nhits']); 		break;
 			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
@@ -1003,7 +1003,7 @@ 
 			case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
 			case 'D': $k=sprintf('%015d-',$entry['dtime']);      	break;
 			case 'S': $k=$entry["key"];								break;
-		}
+		    }
 		if (!$AUTHENTICATED) {
 			// hide all path entries if not logged in
 			$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|\\\\)/','*hidden*/',$entry);
@@ -1083,61 +1083,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('apc');
-
-		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.'),
+      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('apc');
+
+		    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;
-			}
-			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 <<< EOB
+			    $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 '</td></tr>';
+	    }
+	    echo <<< EOB
 		</tbody></table>
 		</div>
 EOB;
-	break;
+	    break;
 
 }
 

Spacing +284 added lines, -284 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$autoload = dirname(dirname(__DIR__)) . '/bootstrap/autoload.php';
+$autoload = dirname(dirname(__DIR__)).'/bootstrap/autoload.php';
 if (file_exists($autoload)) {
     include $autoload;
 }
@@ -28,7 +28,7 @@ 
 
  */
 
-$VERSION='$Id$';
+$VERSION = '$Id$';
 
 ////////// READ OPTIONAL CONFIGURATION FILE ////////////
 if (file_exists("apc.conf.php")) include("apc.conf.php");
@@ -36,7 +36,7 @@ 
 
 ////////// BEGIN OF DEFAULT CONFIG AREA ///////////////////////////////////////////////////////////
 
-defaults('USE_AUTHENTICATION',0);			// Use (internal) authentication - best choice if
+defaults('USE_AUTHENTICATION', 0); // Use (internal) authentication - best choice if
 											// no other authentication is available
 											// If set to 0:
 											//  There will be no further authentication. You
@@ -44,16 +44,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');
 
@@ -61,45 +61,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'
 );
@@ -118,31 +118,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'];
@@ -150,10 +150,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']) ||
@@ -172,7 +172,7 @@ 
 			exit;
 
 		} else {
-			$AUTHENTICATED=1;
+			$AUTHENTICATED = 1;
 		}
 	}
 }
@@ -186,39 +186,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;
 }
@@ -234,207 +234,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);
+			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['nhits']+$cache['nmisses'];
-		$a=$cache['nhits'];
+		$s = $cache['nhits'] + $cache['nmisses'];
+		$a = $cache['nhits'];
 
-		fill_box($image, 30,$size,50,$s ? (-$a*($size-21)/$s) : 0,$col_black,$col_green,sprintf("%.1f%%",$s ? $cache['nhits']*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['nmisses']*100/$s : 0));
+		fill_box($image, 30, $size, 50, $s ? (-$a * ($size - 21) / $s) : 0, $col_black, $col_green, sprintf("%.1f%%", $s ? $cache['nhits'] * 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['nmisses'] * 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['nhits']+$cache['nmisses'];
-			$a=$cache['nhits'];
+			$s = $cache['nhits'] + $cache['nmisses'];
+			$a = $cache['nhits'];
 
-			fill_box($image, 30,$size,50,$s ? -$a*($size-21)/$s : 0,$col_black,$col_green,sprintf("%.1f%%", $s ? $cache['nhits']*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['nmisses']*100/$s : 0));
+			fill_box($image, 30, $size, 50, $s ? -$a * ($size - 21) / $s : 0, $col_black, $col_green, sprintf("%.1f%%", $s ? $cache['nhits'] * 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['nmisses'] * 100 / $s : 0));
 		break;
 	}
 
@@ -446,28 +446,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>";
@@ -476,14 +476,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>
@@ -492,7 +492,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;
@@ -729,9 +729,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
@@ -755,19 +755,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['nhits'] ? (($cache['nhits']+$cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'])/($time-$cache['stime'])) : 0);
-	$miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses'])/($time-$cache['stime'])) : 0);
-	$insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts'])/($time-$cache['stime'])) : 0);
+	$req_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits'] + $cache['nmisses']) / ($time - $cache['stime'])) : 0);
+	$hit_rate_user = sprintf("%.2f", $cache['nhits'] ? (($cache['nhits']) / ($time - $cache['stime'])) : 0);
+	$miss_rate_user = sprintf("%.2f", $cache['nmisses'] ? (($cache['nmisses']) / ($time - $cache['stime'])) : 0);
+	$insert_rate_user = sprintf("%.2f", $cache['ninserts'] ? (($cache['ninserts']) / ($time - $cache['stime'])) : 0);
 	$apcversion = phpversion('apcu');
 	$phpversion = phpversion();
 	$number_vars = $cache['nentries'];
     $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>
@@ -775,9 +775,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
@@ -785,9 +785,9 @@ 
     <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['stime']),'</td></tr>';
-	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>',duration($cache['stime']),'</td></tr>';
-	echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>',$cache['file_upload_progress'],'</td></tr>';
+	echo   '<tr class=tr-1><td class=td-0>Start Time</td><td>', date(DATE_FORMAT, $cache['stime']), '</td></tr>';
+	echo   '<tr class=tr-0><td class=td-0>Uptime</td><td>', duration($cache['stime']), '</td></tr>';
+	echo   '<tr class=tr-1><td class=td-0>File Upload Support</td><td>', $cache['file_upload_progress'], '</td></tr>';
 	echo <<<EOB
 		</tbody></table>
 		</div>
@@ -812,11 +812,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";
@@ -828,7 +828,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>
@@ -843,12 +843,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['nhits'].@sprintf(" (%.1f%%)",$cache['nhits']*100/($cache['nhits']+$cache['nmisses'])),"</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['nhits'].@sprintf(" (%.1f%%)", $cache['nhits'] * 100 / ($cache['nhits'] + $cache['nmisses'])), "</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['nmisses'].@sprintf(" (%.1f%%)",$cache['nmisses']*100/($cache['nhits']+$cache['nmisses'])),"</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['nmisses'].@sprintf(" (%.1f%%)", $cache['nmisses'] * 100 / ($cache['nhits'] + $cache['nmisses'])), "</td>\n";
 	echo <<< EOB
 		</tr>
 		</tbody></table>
@@ -862,28 +862,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;
@@ -893,10 +893,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";
           }
@@ -919,47 +919,47 @@ 
 		echo '</div>';
 		break;
 	}
-	$fieldname='key';
-	$fieldheading='User Entry Label';
-	$fieldkey='key';
+	$fieldname = 'key';
+	$fieldheading = 'User Entry Label';
+	$fieldkey = 'key';
 
-	$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>';
 
@@ -976,39 +976,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['atime']);  	    break;
-			case 'H': $k=sprintf('%015d-',$entry['nhits']); 		break;
-			case 'Z': $k=sprintf('%015d-',$entry['mem_size']); 		break;
-			case 'M': $k=sprintf('%015d-',$entry['mtime']);			break;
-			case 'C': $k=sprintf('%015d-',$entry['ctime']);	        break;
-			case 'T': $k=sprintf('%015d-',$entry['ttl']);			break;
-			case 'D': $k=sprintf('%015d-',$entry['dtime']);      	break;
-			case 'S': $k=$entry["key"];								break;
+	foreach ($cache[$scope_list[$MYREQUEST['SCOPE']]] as $i => $entry) {
+		switch ($MYREQUEST['SORT1']) {
+			case 'A': $k = sprintf('%015d-', $entry['atime']); break;
+			case 'H': $k = sprintf('%015d-', $entry['nhits']); break;
+			case 'Z': $k = sprintf('%015d-', $entry['mem_size']); break;
+			case 'M': $k = sprintf('%015d-', $entry['mtime']); break;
+			case 'C': $k = sprintf('%015d-', $entry['ctime']); break;
+			case 'T': $k = sprintf('%015d-', $entry['ttl']); break;
+			case 'D': $k = sprintf('%015d-', $entry['dtime']); break;
+			case 'S': $k = $entry["key"]; 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;
 		}
 	}
 
@@ -1016,34 +1016,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["key"]);
-        $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["key"]);
+        $field_value = htmlentities(strip_tags($entry[$fieldname], ''), ENT_QUOTES, 'UTF-8');
         echo
-          '<tr class=tr-',$i%2,'>',
-          "<td class=td-0><a href=\"$MY_SELF&OB=",$MYREQUEST['OB'],"&SH=",$sh,"\">",$field_value,'</a></td>',
-          '<td class="td-n center">',$entry['nhits'],'</td>',
-          '<td class="td-n right">',$entry['mem_size'],'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['atime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['mtime']),'</td>',
-          '<td class="td-n center">',date(DATE_FORMAT,$entry['ctime']),'</td>';
-
-        if($fieldname=='info') {
-          if($entry['ttl'])
+          '<tr class=tr-', $i % 2, '>',
+          "<td class=td-0><a href=\"$MY_SELF&OB=", $MYREQUEST['OB'], "&SH=", $sh, "\">", $field_value, '</a></td>',
+          '<td class="td-n center">', $entry['nhits'], '</td>',
+          '<td class="td-n right">', $entry['mem_size'], '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['atime']), '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['mtime']), '</td>',
+          '<td class="td-n center">', date(DATE_FORMAT, $entry['ctime']), '</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['dtime']) {
 
-          echo '<td class="td-last center">', date(DATE_FORMAT,$entry['dtime']), '</td>';
+          echo '<td class="td-last center">', date(DATE_FORMAT, $entry['dtime']), '</td>';
         } else if ($MYREQUEST['OB'] == OB_USER_CACHE) {
 
           echo '<td class="td-last center">';
@@ -1065,14 +1065,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
@@ -1092,7 +1092,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 +116 added lines, -50 removed lines

@@ -31,7 +31,9 @@ 
 $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 ///////////////////////////////////////////////////////////
@@ -62,7 +64,10 @@ 
 
 // "define if not defined"
 function defaults($d,$v) {
-	if (!defined($d)) define($d,$v); // or just @define(...)
+	if (!defined($d)) {
+	    define($d,$v);
+	}
+	// or just @define(...)
 }
 
 // rewrite $PHP_SELF to block XSS attacks
@@ -129,12 +134,24 @@ 
 }
 
 // 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".
@@ -210,16 +227,35 @@ 
     $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;
 }
 
@@ -282,8 +318,11 @@ 
 		$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) {
@@ -316,10 +355,11 @@ 
 
 
 	$size = GRAPH_SIZE; // image size
-	if ($MYREQUEST['IMG']==3)
-		$image = imagecreate(2*$size+150, $size+10);
-	else
-		$image = imagecreate($size+50, $size+10);
+	if ($MYREQUEST['IMG']==3) {
+			$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);
@@ -346,7 +386,9 @@ 
 			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+$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) {
@@ -356,7 +398,9 @@ 
 					$angle_from = $angle_to;
 				}
 				$angle_to = $angle_from+($block['size'])/$s;
-				if(($angle_to+$fuzz)>1) $angle_to = 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) {
@@ -368,7 +412,9 @@ 
 			}
 			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) {
 					array_push($string_placement, array($angle_from,$angle_to));
@@ -406,16 +452,22 @@ 
 					$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;
 				}
 				$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'];
@@ -447,7 +499,9 @@ 
 //
 function bsize($s) {
 	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
+		if ($s < 1024) {
+		    break;
+		}
 		$s/=1024;
 	}
 	return sprintf("%5.1f %sBytes",$s,$k);
@@ -775,10 +829,12 @@ 
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
 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
@@ -816,10 +872,11 @@ 
 		$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
 		</tbody></table>
@@ -870,7 +927,9 @@ 
 			}
 			$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]);
@@ -896,8 +955,11 @@ 
         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";
           }
         }
@@ -941,8 +1003,10 @@ 
 		"<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>',
@@ -1036,10 +1100,11 @@ 
           '<td class="td-n center">',date(DATE_FORMAT,$entry['ctime']),'</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['ttl']) {
+                      echo '<td class="td-n center">'.$entry['ttl'].' seconds</td>';
+          } else {
+                      echo '<td class="td-n center">None</td>';
+          }
         }
         if ($entry['dtime']) {
 
@@ -1059,8 +1124,9 @@ 
 			echo '</tr>';
 		}
         $i++;
-        if ($i == $MYREQUEST['COUNT'])
-          break;
+        if ($i == $MYREQUEST['COUNT']) {
+                  break;
+        }
       }
 		}
 

var/www/admin/memcache/index.php

Doc Comments +10 added lines

@@ -57,6 +57,9 @@ 
 	}
 }
 
+/**
+ * @param string $command
+ */
 function sendMemcacheCommands($command){
     global $MEMCACHE_SERVERS;
 	$result = array();
@@ -94,6 +97,9 @@ 
     fclose($s);
     return parseMemcacheResults($buf);
 }
+/**
+ * @param string $str
+ */
 function parseMemcacheResults($str){
     
 	$res = array();
@@ -285,6 +291,10 @@ 
 }
 
 // create menu entry
+/**
+ * @param integer $ob
+ * @param string $title
+ */
 function menu_entry($ob,$title) {
 	global $PHP_SELF;
 	if ($ob==$_GET['op']){

Indentation +335 added lines, -335 removed lines

@@ -48,73 +48,73 @@ 
 ///////////MEMCACHE FUNCTIONS /////////////////////////////////////////////////////////////////////
 
 function get_host_port_from_server($server){
-	$values = explode(':', $server);
-	if (($values[0] == 'unix') && (!is_numeric( $values[1]))) {
-		return array($server, 0);
-	}
-	else {
-		return $values;
-	}
+    $values = explode(':', $server);
+    if (($values[0] == 'unix') && (!is_numeric( $values[1]))) {
+        return array($server, 0);
+    }
+    else {
+        return $values;
+    }
 }
 
 function sendMemcacheCommands($command){
     global $MEMCACHE_SERVERS;
-	$result = array();
+    $result = array();
 
-	foreach($MEMCACHE_SERVERS as $server){
-		$strs = get_host_port_from_server($server);
-		$host = $strs[0];
-		$port = $strs[1];
-		$result[$server] = sendMemcacheCommand($host,$port,$command);
-	}
-	return $result;
+    foreach($MEMCACHE_SERVERS as $server){
+        $strs = get_host_port_from_server($server);
+        $host = $strs[0];
+        $port = $strs[1];
+        $result[$server] = sendMemcacheCommand($host,$port,$command);
+    }
+    return $result;
 }
 function sendMemcacheCommand($server,$port,$command){
 
-	$s = @fsockopen($server,$port);
-	if (!$s){
-		die("Cant connect to:".$server.':'.$port);
-	}
+    $s = @fsockopen($server,$port);
+    if (!$s){
+        die("Cant connect to:".$server.':'.$port);
+    }
 
-	fwrite($s, $command."\r\n");
-
-	$buf='';
-	while ((!feof($s))) {
-		$buf .= fgets($s, 256);
-		if (strpos($buf,"END\r\n")!==false){ // stat says end
-		    break;
-		}
-		if (strpos($buf,"DELETED\r\n")!==false || strpos($buf,"NOT_FOUND\r\n")!==false){ // delete says these
-		    break;
-		}
-		if (strpos($buf,"OK\r\n")!==false){ // flush_all says ok
-		    break;
-		}
-	}
+    fwrite($s, $command."\r\n");
+
+    $buf='';
+    while ((!feof($s))) {
+        $buf .= fgets($s, 256);
+        if (strpos($buf,"END\r\n")!==false){ // stat says end
+            break;
+        }
+        if (strpos($buf,"DELETED\r\n")!==false || strpos($buf,"NOT_FOUND\r\n")!==false){ // delete says these
+            break;
+        }
+        if (strpos($buf,"OK\r\n")!==false){ // flush_all says ok
+            break;
+        }
+    }
     fclose($s);
     return parseMemcacheResults($buf);
 }
 function parseMemcacheResults($str){
     
-	$res = array();
-	$lines = explode("\r\n",$str);
-	$cnt = count($lines);
-	for($i=0; $i< $cnt; $i++){
-	    $line = $lines[$i];
-		$l = explode(' ',$line,3);
-		if (count($l)==3){
-			$res[$l[0]][$l[1]]=$l[2];
-			if ($l[0]=='VALUE'){ // next line is the value
-			    $res[$l[0]][$l[1]] = array();
-			    list ($flag,$size)=explode(' ',$l[2]);
-			    $res[$l[0]][$l[1]]['stat']=array('flag'=>$flag,'size'=>$size);
-			    $res[$l[0]][$l[1]]['value']=$lines[++$i];
-			}
-		}elseif($line=='DELETED' || $line=='NOT_FOUND' || $line=='OK'){
-		    return $line;
-		}
-	}
-	return $res;
+    $res = array();
+    $lines = explode("\r\n",$str);
+    $cnt = count($lines);
+    for($i=0; $i< $cnt; $i++){
+        $line = $lines[$i];
+        $l = explode(' ',$line,3);
+        if (count($l)==3){
+            $res[$l[0]][$l[1]]=$l[2];
+            if ($l[0]=='VALUE'){ // next line is the value
+                $res[$l[0]][$l[1]] = array();
+                list ($flag,$size)=explode(' ',$l[2]);
+                $res[$l[0]][$l[1]]['stat']=array('flag'=>$flag,'size'=>$size);
+                $res[$l[0]][$l[1]]['value']=$lines[++$i];
+            }
+        }elseif($line=='DELETED' || $line=='NOT_FOUND' || $line=='OK'){
+            return $line;
+        }
+    }
+    return $res;
 
 }
 
@@ -122,7 +122,7 @@ 
     list($host,$port) = get_host_port_from_server($server);
     $resp = sendMemcacheCommand($host,$port,'stats cachedump '.$slabId.' '.$limit);
 
-   return $resp;
+    return $resp;
 
 }
 
@@ -132,10 +132,10 @@ 
     return $resp;
 }
 function getCacheItems(){
- $items = sendMemcacheCommands('stats items');
- $serverItems = array();
- $totalItems = array();
- foreach ($items as $server=>$itemlist){
+    $items = sendMemcacheCommands('stats items');
+    $serverItems = array();
+    $totalItems = array();
+    foreach ($items as $server=>$itemlist){
     $serverItems[$server] = array();
     $totalItems[$server]=0;
     if (!isset($itemlist['STAT'])){
@@ -152,91 +152,91 @@ 
             }
         }
     }
- }
- return array('items'=>$serverItems,'counts'=>$totalItems);
+    }
+    return array('items'=>$serverItems,'counts'=>$totalItems);
 }
 function getMemcacheStats($total=true){
-	$resp = sendMemcacheCommands('stats');
-	if ($total){
-		$res = array();
-		foreach($resp as $server=>$r){
-			foreach($r['STAT'] as $key=>$row){
-				if (!isset($res[$key])){
-					$res[$key]=null;
-				}
-				switch ($key){
-					case 'pid':
-						$res['pid'][$server]=$row;
-						break;
-					case 'uptime':
-						$res['uptime'][$server]=$row;
-						break;
-					case 'time':
-						$res['time'][$server]=$row;
-						break;
-					case 'version':
-						$res['version'][$server]=$row;
-						break;
-					case 'pointer_size':
-						$res['pointer_size'][$server]=$row;
-						break;
-					case 'rusage_user':
-						$res['rusage_user'][$server]=$row;
-						break;
-					case 'rusage_system':
-						$res['rusage_system'][$server]=$row;
-						break;
-					case 'curr_items':
-						$res['curr_items']+=$row;
-						break;
-					case 'total_items':
-						$res['total_items']+=$row;
-						break;
-					case 'bytes':
-						$res['bytes']+=$row;
-						break;
-					case 'curr_connections':
-						$res['curr_connections']+=$row;
-						break;
-					case 'total_connections':
-						$res['total_connections']+=$row;
-						break;
-					case 'connection_structures':
-						$res['connection_structures']+=$row;
-						break;
-					case 'cmd_get':
-						$res['cmd_get']+=$row;
-						break;
-					case 'cmd_set':
-						$res['cmd_set']+=$row;
-						break;
-					case 'get_hits':
-						$res['get_hits']+=$row;
-						break;
-					case 'get_misses':
-						$res['get_misses']+=$row;
-						break;
-					case 'evictions':
-						$res['evictions']+=$row;
-						break;
-					case 'bytes_read':
-						$res['bytes_read']+=$row;
-						break;
-					case 'bytes_written':
-						$res['bytes_written']+=$row;
-						break;
-					case 'limit_maxbytes':
-						$res['limit_maxbytes']+=$row;
-						break;
-					case 'threads':
-						$res['rusage_system'][$server]=$row;
-						break;
-				}
-			}
-		}
-		return $res;
-	}
-	return $resp;
+    $resp = sendMemcacheCommands('stats');
+    if ($total){
+        $res = array();
+        foreach($resp as $server=>$r){
+            foreach($r['STAT'] as $key=>$row){
+                if (!isset($res[$key])){
+                    $res[$key]=null;
+                }
+                switch ($key){
+                    case 'pid':
+                        $res['pid'][$server]=$row;
+                        break;
+                    case 'uptime':
+                        $res['uptime'][$server]=$row;
+                        break;
+                    case 'time':
+                        $res['time'][$server]=$row;
+                        break;
+                    case 'version':
+                        $res['version'][$server]=$row;
+                        break;
+                    case 'pointer_size':
+                        $res['pointer_size'][$server]=$row;
+                        break;
+                    case 'rusage_user':
+                        $res['rusage_user'][$server]=$row;
+                        break;
+                    case 'rusage_system':
+                        $res['rusage_system'][$server]=$row;
+                        break;
+                    case 'curr_items':
+                        $res['curr_items']+=$row;
+                        break;
+                    case 'total_items':
+                        $res['total_items']+=$row;
+                        break;
+                    case 'bytes':
+                        $res['bytes']+=$row;
+                        break;
+                    case 'curr_connections':
+                        $res['curr_connections']+=$row;
+                        break;
+                    case 'total_connections':
+                        $res['total_connections']+=$row;
+                        break;
+                    case 'connection_structures':
+                        $res['connection_structures']+=$row;
+                        break;
+                    case 'cmd_get':
+                        $res['cmd_get']+=$row;
+                        break;
+                    case 'cmd_set':
+                        $res['cmd_set']+=$row;
+                        break;
+                    case 'get_hits':
+                        $res['get_hits']+=$row;
+                        break;
+                    case 'get_misses':
+                        $res['get_misses']+=$row;
+                        break;
+                    case 'evictions':
+                        $res['evictions']+=$row;
+                        break;
+                    case 'bytes_read':
+                        $res['bytes_read']+=$row;
+                        break;
+                    case 'bytes_written':
+                        $res['bytes_written']+=$row;
+                        break;
+                    case 'limit_maxbytes':
+                        $res['limit_maxbytes']+=$row;
+                        break;
+                    case 'threads':
+                        $res['rusage_system'][$server]=$row;
+                        break;
+                }
+            }
+        }
+        return $res;
+    }
+    return $resp;
 }
 
 //////////////////////////////////////////////////////
@@ -273,24 +273,24 @@ 
 // create graphics
 //
 function graphics_avail() {
-	return extension_loaded('gd');
+    return extension_loaded('gd');
 }
 
 function bsize($s) {
-	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
-		$s/=1024;
-	}
-	return sprintf("%5.1f %sBytes",$s,$k);
+    foreach (array('','K','M','G') as $i => $k) {
+        if ($s < 1024) break;
+        $s/=1024;
+    }
+    return sprintf("%5.1f %sBytes",$s,$k);
 }
 
 // create menu entry
 function menu_entry($ob,$title) {
-	global $PHP_SELF;
-	if ($ob==$_GET['op']){
-	    return "<li><a class=\"child_active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
-	}
-	return "<li><a class=\"active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
+    global $PHP_SELF;
+    if ($ob==$_GET['op']){
+        return "<li><a class=\"child_active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
+    }
+    return "<li><a class=\"active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
 }
 
 function getHeader(){
@@ -513,8 +513,8 @@ 
 EOB;
 }
 echo
-	menu_entry(1,'View Host Stats'),
-	menu_entry(2,'Variables');
+    menu_entry(1,'View Host Stats'),
+    menu_entry(2,'Variables');
 
 echo <<<EOB
 	</ol>
@@ -548,115 +548,115 @@ 
     $memcacheStatsSingle = getMemcacheStats(false);
 
     if (!graphics_avail()) {
-		exit(0);
-	}
+        exit(0);
+    }
 
-	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);
-		imagerectangle($im, $x, $y1, $x1, $y, $color1);
-		if ($text) {
-			if ($placeindex>0) {
-
-				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);
-
-				} else {
-					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;
-					}
-					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);
-			}
-		}
-	}
+    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);
+        imagerectangle($im, $x, $y1, $x1, $y, $color1);
+        if ($text) {
+            if ($placeindex>0) {
+
+                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);
+
+                } else {
+                    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;
+                    }
+                    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);
+            }
+        }
+    }
 
 
     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, $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);
-		}
-		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 {
-				imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
-			}
-		}
-	}
-	$size = GRAPH_SIZE; // image size
-	$image = imagecreate($size+50, $size+10);
+        $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, $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);
+        }
+        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);
 
-	$col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
-	$col_red   = imagecolorallocate($image, 0xD0, 0x60,  0x30);
-	$col_green = imagecolorallocate($image, 0x60, 0xF0, 0x60);
-	$col_black = imagecolorallocate($image,   0,   0,   0);
+            } else {
+                imagestring($im,4,$centerX + $r*cos($w)/2, $centerY + $r*sin($w)/2,$text,$color1);
+            }
+        }
+    }
+    $size = GRAPH_SIZE; // image size
+    $image = imagecreate($size+50, $size+10);
+
+    $col_white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+    $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);
+    imagecolortransparent($image,$col_white);
 
     switch ($_GET['IMG']){
         case 1: // pie chart
             $tsize=$memcacheStats['limit_maxbytes'];
-    		$avail=$tsize-$memcacheStats['bytes'];
-    		$x=$y=$size/2;
-    		$angle_from = 0;
-    		$fuzz = 0.000001;
+            $avail=$tsize-$memcacheStats['bytes'];
+            $x=$y=$size/2;
+            $angle_from = 0;
+            $fuzz = 0.000001;
 
             foreach($memcacheStatsSingle as $serv=>$mcs) {
-    			$free = $mcs['STAT']['limit_maxbytes']-$mcs['STAT']['bytes'];
-    			$used = $mcs['STAT']['bytes'];
+                $free = $mcs['STAT']['limit_maxbytes']-$mcs['STAT']['bytes'];
+                $used = $mcs['STAT']['bytes'];
 
 
                 if ($free>0){
-    			// draw free
-    			    $angle_to = ($free*360)/$tsize;
+                // draw free
+                    $angle_to = ($free*360)/$tsize;
                     $perc =sprintf("%.2f%%", ($free *100) / $tsize) ;
 
-        			fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_green,$perc);
-        			$angle_from = $angle_from + $angle_to ;
+                    fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_green,$perc);
+                    $angle_from = $angle_from + $angle_to ;
                 }
-    			if ($used>0){
-    			// draw used
-        			$angle_to = ($used*360)/$tsize;
-        			$perc =sprintf("%.2f%%", ($used *100) / $tsize) ;
-        			fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_red, '('.$perc.')' );
+                if ($used>0){
+                // draw used
+                    $angle_to = ($used*360)/$tsize;
+                    $perc =sprintf("%.2f%%", ($used *100) / $tsize) ;
+                    fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_red, '('.$perc.')' );
                     $angle_from = $angle_from+ $angle_to ;
-    			}
-    			}
+                }
+                }
 
         break;
 
@@ -666,14 +666,14 @@ 
             $misses = ($memcacheStats['get_misses']==0) ? 1:$memcacheStats['get_misses'];
             $total = $hits + $misses ;
 
-	       	fill_box($image, 30,$size,50,-$hits*($size-21)/$total,$col_black,$col_green,sprintf("%.1f%%",$hits*100/$total));
-		    fill_box($image,130,$size,50,-max(4,($total-$hits)*($size-21)/$total),$col_black,$col_red,sprintf("%.1f%%",$misses*100/$total));
-		break;
+                fill_box($image, 30,$size,50,-$hits*($size-21)/$total,$col_black,$col_green,sprintf("%.1f%%",$hits*100/$total));
+            fill_box($image,130,$size,50,-max(4,($total-$hits)*($size-21)/$total),$col_black,$col_red,sprintf("%.1f%%",$misses*100/$total));
+        break;
 		
     }
     header("Content-type: image/png");
-	imagepng($image);
-	exit;
+    imagepng($image);
+    exit;
 }
 
 echo getHeader();
@@ -682,14 +682,14 @@ 
 switch ($_GET['op']) {
 
     case 1: // host stats
-    	$phpversion = phpversion();
+        $phpversion = phpversion();
         $memcacheStats = getMemcacheStats();
         $memcacheStatsSingle = getMemcacheStats(false);
 
         $mem_size = $memcacheStats['limit_maxbytes'];
-    	$mem_used = $memcacheStats['bytes'];
-	    $mem_avail= $mem_size-$mem_used;
-	    $startTime = time()-array_sum($memcacheStats['uptime']);
+        $mem_used = $memcacheStats['bytes'];
+        $mem_avail= $mem_size-$mem_used;
+        $startTime = time()-array_sum($memcacheStats['uptime']);
 
         $curr_items = $memcacheStats['curr_items'];
         $total_items = $memcacheStats['total_items'];
@@ -697,33 +697,33 @@ 
         $misses = ($memcacheStats['get_misses']==0) ? 1:$memcacheStats['get_misses'];
         $sets = $memcacheStats['cmd_set'];
 
-       	$req_rate = sprintf("%.2f",($hits+$misses)/($time-$startTime));
-	    $hit_rate = sprintf("%.2f",($hits)/($time-$startTime));
-	    $miss_rate = sprintf("%.2f",($misses)/($time-$startTime));
-	    $set_rate = sprintf("%.2f",($sets)/($time-$startTime));
+            $req_rate = sprintf("%.2f",($hits+$misses)/($time-$startTime));
+        $hit_rate = sprintf("%.2f",($hits)/($time-$startTime));
+        $miss_rate = sprintf("%.2f",($misses)/($time-$startTime));
+        $set_rate = sprintf("%.2f",($sets)/($time-$startTime));
 
-	    echo <<< EOB
+        echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
 		<table cellspacing=0><tbody>
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
 EOB;
-		echo "<tr class=tr-0><td class=td-0>Memcached Host". ((count($MEMCACHE_SERVERS)>1) ? 's':'')."</td><td>";
-		$i=0;
-		if (!isset($_GET['singleout']) && count($MEMCACHE_SERVERS)>1){
-    		foreach($MEMCACHE_SERVERS as $server){
-    		      echo ($i+1).'. <a href="'.$PHP_SELF.'&singleout='.$i++.'">'.$server.'</a><br/>';
-    		}
-		}
-		else{
-		    echo '1.'.$MEMCACHE_SERVERS[0];
-		}
-		if (isset($_GET['singleout'])){
-		      echo '<a href="'.$PHP_SELF.'">(all servers)</a><br/>';
-		}
-		echo "</td></tr>\n";
-		echo "<tr class=tr-1><td class=td-0>Total Memcache Cache</td><td>".bsize($memcacheStats['limit_maxbytes'])."</td></tr>\n";
-
-	echo <<<EOB
+        echo "<tr class=tr-0><td class=td-0>Memcached Host". ((count($MEMCACHE_SERVERS)>1) ? 's':'')."</td><td>";
+        $i=0;
+        if (!isset($_GET['singleout']) && count($MEMCACHE_SERVERS)>1){
+            foreach($MEMCACHE_SERVERS as $server){
+                    echo ($i+1).'. <a href="'.$PHP_SELF.'&singleout='.$i++.'">'.$server.'</a><br/>';
+            }
+        }
+        else{
+            echo '1.'.$MEMCACHE_SERVERS[0];
+        }
+        if (isset($_GET['singleout'])){
+                echo '<a href="'.$PHP_SELF.'">(all servers)</a><br/>';
+        }
+        echo "</td></tr>\n";
+        echo "<tr class=tr-1><td class=td-0>Total Memcache Cache</td><td>".bsize($memcacheStats['limit_maxbytes'])."</td></tr>\n";
+
+    echo <<<EOB
 		</tbody></table>
 		</div>
 
@@ -732,13 +732,13 @@ 
         foreach($MEMCACHE_SERVERS as $server){
             echo '<table cellspacing=0><tbody>';
             echo '<tr class=tr-1><td class=td-1>'.$server.'</td><td><a href="'.$PHP_SELF.'&server='.array_search($server,$MEMCACHE_SERVERS).'&op=6">[<b>Flush this server</b>]</a></td></tr>';
-    		echo '<tr class=tr-0><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
-    		echo '<tr class=tr-1><td class=td-0>Uptime</td><td>',duration($memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
-    		echo '<tr class=tr-0><td class=td-0>Memcached Server Version</td><td>'.$memcacheStatsSingle[$server]['STAT']['version'].'</td></tr>';
-    		echo '<tr class=tr-1><td class=td-0>Used Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['bytes']),'</td></tr>';
-    		echo '<tr class=tr-0><td class=td-0>Total Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['limit_maxbytes']),'</td></tr>';
-    		echo '</tbody></table>';
-	   }
+            echo '<tr class=tr-0><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
+            echo '<tr class=tr-1><td class=td-0>Uptime</td><td>',duration($memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
+            echo '<tr class=tr-0><td class=td-0>Memcached Server Version</td><td>'.$memcacheStatsSingle[$server]['STAT']['version'].'</td></tr>';
+            echo '<tr class=tr-1><td class=td-0>Used Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['bytes']),'</td></tr>';
+            echo '<tr class=tr-0><td class=td-0>Total Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['limit_maxbytes']),'</td></tr>';
+            echo '</tbody></table>';
+        }
     echo <<<EOB
 
 		</div>
@@ -746,28 +746,28 @@ 
 		<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>Cache Usage</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&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$time\"></td>".
-			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF&IMG=2&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$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: ',$hits.sprintf(" (%.1f%%)",$hits*100/($hits+$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: ',$misses.sprintf(" (%.1f%%)",$misses*100/($hits+$misses)),"</td>\n";
-		echo <<< EOB
+    echo
+        graphics_avail() ?
+              '<tr>'.
+                "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF&IMG=1&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$time\"></td>".
+                "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF&IMG=2&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$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: ',$hits.sprintf(" (%.1f%%)",$hits*100/($hits+$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: ',$misses.sprintf(" (%.1f%%)",$misses*100/($hits+$misses)),"</td>\n";
+        echo <<< EOB
 	</tr>
 	</tbody></table>
 <br/>
@@ -789,31 +789,31 @@ 
 
     case 2: // variables
 
-		$m=0;
-		$cacheItems= getCacheItems();
-		$items = $cacheItems['items'];
-		$totals = $cacheItems['counts'];
-		$maxDump = MAX_ITEM_DUMP;
-		foreach($items as $server => $entries) {
+        $m=0;
+        $cacheItems= getCacheItems();
+        $items = $cacheItems['items'];
+        $totals = $cacheItems['counts'];
+        $maxDump = MAX_ITEM_DUMP;
+        foreach($items as $server => $entries) {
 
-    	echo <<< EOB
+        echo <<< EOB
 
 			<div class="info"><table cellspacing=0><tbody>
 			<tr><th colspan="2">$server</th></tr>
 			<tr><th>Slab Id</th><th>Info</th></tr>
 EOB;
 
-			foreach($entries as $slabId => $slab) {
-			    $dumpUrl = $PHP_SELF.'&op=2&server='.(array_search($server,$MEMCACHE_SERVERS)).'&dumpslab='.$slabId;
-				echo
-					"<tr class=tr-$m>",
-					"<td class=td-0><center>",'<a href="',$dumpUrl,'">',$slabId,'</a>',"</center></td>",
-					"<td class=td-last><b>Item count:</b> ",$slab['number'],'<br/><b>Age:</b>',duration($time-$slab['age']),'<br/> <b>Evicted:</b>',((isset($slab['evicted']) && $slab['evicted']==1)? 'Yes':'No');
-					if ((isset($_GET['dumpslab']) && $_GET['dumpslab']==$slabId) &&  (isset($_GET['server']) && $_GET['server']==array_search($server,$MEMCACHE_SERVERS))){
-					    echo "<br/><b>Items: item</b><br/>";
-					    $items = dumpCacheSlab($server,$slabId,$slab['number']);
+            foreach($entries as $slabId => $slab) {
+                $dumpUrl = $PHP_SELF.'&op=2&server='.(array_search($server,$MEMCACHE_SERVERS)).'&dumpslab='.$slabId;
+                echo
+                    "<tr class=tr-$m>",
+                    "<td class=td-0><center>",'<a href="',$dumpUrl,'">',$slabId,'</a>',"</center></td>",
+                    "<td class=td-last><b>Item count:</b> ",$slab['number'],'<br/><b>Age:</b>',duration($time-$slab['age']),'<br/> <b>Evicted:</b>',((isset($slab['evicted']) && $slab['evicted']==1)? 'Yes':'No');
+                    if ((isset($_GET['dumpslab']) && $_GET['dumpslab']==$slabId) &&  (isset($_GET['server']) && $_GET['server']==array_search($server,$MEMCACHE_SERVERS))){
+                        echo "<br/><b>Items: item</b><br/>";
+                        $items = dumpCacheSlab($server,$slabId,$slab['number']);
                         // maybe someone likes to do a pagination here :)
-					    $i=1;
+                        $i=1;
                         foreach($items['ITEM'] as $itemKey=>$itemInfo){
                             $itemInfo = trim($itemInfo,'[ ]');
 
@@ -826,17 +826,17 @@ 
                                 echo ',';
                             }
                         }
-					}
+                    }
 
-					echo "</td></tr>";
-				$m=1-$m;
-			}
-		echo <<<EOB
+                    echo "</td></tr>";
+                $m=1-$m;
+            }
+        echo <<<EOB
 			</tbody></table>
 			</div><hr/>
 EOB;
 }
-		break;
+        break;
 
     break;
 
@@ -859,16 +859,16 @@ 
 EOB;
         if (!isset($r['VALUE'])) {
             echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
-                 "</td><td>[The requested item was not found or has expired]</td>",
-                 "<td></td>","</tr>";
+                    "</td><td>[The requested item was not found or has expired]</td>",
+                    "<td></td>","</tr>";
         }
         else {
 
             echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
-                 " <br/>flag:",$r['VALUE'][$theKey]['stat']['flag'],
-                 " <br/>Size:",bsize($r['VALUE'][$theKey]['stat']['size']),
-                 "</td><td>",chunk_split($r['VALUE'][$theKey]['value'],40),"</td>",
-                 '<td><a href="',$PHP_SELF,'&op=5&server=',(int)$_GET['server'],'&key=',base64_encode($theKey),"\">Delete</a></td>","</tr>";
+                    " <br/>flag:",$r['VALUE'][$theKey]['stat']['flag'],
+                    " <br/>Size:",bsize($r['VALUE'][$theKey]['stat']['size']),
+                    "</td><td>",chunk_split($r['VALUE'][$theKey]['value'],40),"</td>",
+                    '<td><a href="',$PHP_SELF,'&op=5&server=',(int)$_GET['server'],'&key=',base64_encode($theKey),"\">Delete</a></td>","</tr>";
         }
         echo <<<EOB
 			</tbody></table>
@@ -876,22 +876,22 @@ 
 EOB;
     break;
     case 5: // item delete
-    	if (!isset($_GET['key']) || !isset($_GET['server'])){
-			echo "No key set!";
-			break;
+        if (!isset($_GET['key']) || !isset($_GET['server'])){
+            echo "No key set!";
+            break;
         }
         $theKey = htmlentities(base64_decode($_GET['key']));
-		$theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
-		list($h,$p) = get_host_port_from_server($theserver);
+        $theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
+        list($h,$p) = get_host_port_from_server($theserver);
         $r = sendMemcacheCommand($h,$p,'delete '.$theKey);
         echo 'Deleting '.$theKey.':'.$r;
-	break;
+    break;
     
-   case 6: // flush server
+    case 6: // flush server
         $theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
         $r = flushServer($theserver);
         echo 'Flush  '.$theserver.":".$r;
-   break;
+    break;
 }
 echo getFooter();
 

Spacing +226 added lines, -226 removed lines

@@ -17,13 +17,13 @@ 
   +----------------------------------------------------------------------+
 */
 
-$VERSION='$Id$';
+$VERSION = '$Id$';
 
-define('ADMIN_USERNAME',''); 	// Admin Username
-define('ADMIN_PASSWORD','');  	// Admin Password
-define('DATE_FORMAT','Y/m/d H:i:s');
-define('GRAPH_SIZE',200);
-define('MAX_ITEM_DUMP',50);
+define('ADMIN_USERNAME', ''); // Admin Username
+define('ADMIN_PASSWORD', ''); // Admin Password
+define('DATE_FORMAT', 'Y/m/d H:i:s');
+define('GRAPH_SIZE', 200);
+define('MAX_ITEM_DUMP', 50);
 
 $MEMCACHE_SERVERS[] = 'localhost:11211'; // add more as an array
 
@@ -47,9 +47,9 @@ 
 
 ///////////MEMCACHE FUNCTIONS /////////////////////////////////////////////////////////////////////
 
-function get_host_port_from_server($server){
+function get_host_port_from_server($server) {
 	$values = explode(':', $server);
-	if (($values[0] == 'unix') && (!is_numeric( $values[1]))) {
+	if (($values[0] == 'unix') && (!is_numeric($values[1]))) {
 		return array($server, 0);
 	}
 	else {
@@ -57,60 +57,60 @@ 
 	}
 }
 
-function sendMemcacheCommands($command){
+function sendMemcacheCommands($command) {
     global $MEMCACHE_SERVERS;
 	$result = array();
 
-	foreach($MEMCACHE_SERVERS as $server){
+	foreach ($MEMCACHE_SERVERS as $server) {
 		$strs = get_host_port_from_server($server);
 		$host = $strs[0];
 		$port = $strs[1];
-		$result[$server] = sendMemcacheCommand($host,$port,$command);
+		$result[$server] = sendMemcacheCommand($host, $port, $command);
 	}
 	return $result;
 }
-function sendMemcacheCommand($server,$port,$command){
+function sendMemcacheCommand($server, $port, $command) {
 
-	$s = @fsockopen($server,$port);
-	if (!$s){
+	$s = @fsockopen($server, $port);
+	if (!$s) {
 		die("Cant connect to:".$server.':'.$port);
 	}
 
 	fwrite($s, $command."\r\n");
 
-	$buf='';
+	$buf = '';
 	while ((!feof($s))) {
 		$buf .= fgets($s, 256);
-		if (strpos($buf,"END\r\n")!==false){ // stat says end
+		if (strpos($buf, "END\r\n") !== false) { // stat says end
 		    break;
 		}
-		if (strpos($buf,"DELETED\r\n")!==false || strpos($buf,"NOT_FOUND\r\n")!==false){ // delete says these
+		if (strpos($buf, "DELETED\r\n") !== false || strpos($buf, "NOT_FOUND\r\n") !== false) { // delete says these
 		    break;
 		}
-		if (strpos($buf,"OK\r\n")!==false){ // flush_all says ok
+		if (strpos($buf, "OK\r\n") !== false) { // flush_all says ok
 		    break;
 		}
 	}
     fclose($s);
     return parseMemcacheResults($buf);
 }
-function parseMemcacheResults($str){
+function parseMemcacheResults($str) {
     
 	$res = array();
-	$lines = explode("\r\n",$str);
+	$lines = explode("\r\n", $str);
 	$cnt = count($lines);
-	for($i=0; $i< $cnt; $i++){
+	for ($i = 0; $i < $cnt; $i++) {
 	    $line = $lines[$i];
-		$l = explode(' ',$line,3);
-		if (count($l)==3){
-			$res[$l[0]][$l[1]]=$l[2];
-			if ($l[0]=='VALUE'){ // next line is the value
+		$l = explode(' ', $line, 3);
+		if (count($l) == 3) {
+			$res[$l[0]][$l[1]] = $l[2];
+			if ($l[0] == 'VALUE') { // next line is the value
 			    $res[$l[0]][$l[1]] = array();
-			    list ($flag,$size)=explode(' ',$l[2]);
-			    $res[$l[0]][$l[1]]['stat']=array('flag'=>$flag,'size'=>$size);
-			    $res[$l[0]][$l[1]]['value']=$lines[++$i];
+			    list ($flag, $size) = explode(' ', $l[2]);
+			    $res[$l[0]][$l[1]]['stat'] = array('flag'=>$flag, 'size'=>$size);
+			    $res[$l[0]][$l[1]]['value'] = $lines[++$i];
 			}
-		}elseif($line=='DELETED' || $line=='NOT_FOUND' || $line=='OK'){
+		}elseif ($line == 'DELETED' || $line == 'NOT_FOUND' || $line == 'OK') {
 		    return $line;
 		}
 	}
@@ -118,118 +118,118 @@ 
 
 }
 
-function dumpCacheSlab($server,$slabId,$limit){
-    list($host,$port) = get_host_port_from_server($server);
-    $resp = sendMemcacheCommand($host,$port,'stats cachedump '.$slabId.' '.$limit);
+function dumpCacheSlab($server, $slabId, $limit) {
+    list($host, $port) = get_host_port_from_server($server);
+    $resp = sendMemcacheCommand($host, $port, 'stats cachedump '.$slabId.' '.$limit);
 
    return $resp;
 
 }
 
-function flushServer($server){
-    list($host,$port) = get_host_port_from_server($server);
-    $resp = sendMemcacheCommand($host,$port,'flush_all');
+function flushServer($server) {
+    list($host, $port) = get_host_port_from_server($server);
+    $resp = sendMemcacheCommand($host, $port, 'flush_all');
     return $resp;
 }
-function getCacheItems(){
+function getCacheItems() {
  $items = sendMemcacheCommands('stats items');
  $serverItems = array();
  $totalItems = array();
- foreach ($items as $server=>$itemlist){
+ foreach ($items as $server=>$itemlist) {
     $serverItems[$server] = array();
-    $totalItems[$server]=0;
-    if (!isset($itemlist['STAT'])){
+    $totalItems[$server] = 0;
+    if (!isset($itemlist['STAT'])) {
         continue;
     }
 
     $iteminfo = $itemlist['STAT'];
 
-    foreach($iteminfo as $keyinfo=>$value){
-        if (preg_match('/items\:(\d+?)\:(.+?)$/',$keyinfo,$matches)){
+    foreach ($iteminfo as $keyinfo=>$value) {
+        if (preg_match('/items\:(\d+?)\:(.+?)$/', $keyinfo, $matches)) {
             $serverItems[$server][$matches[1]][$matches[2]] = $value;
-            if ($matches[2]=='number'){
-                $totalItems[$server] +=$value;
+            if ($matches[2] == 'number') {
+                $totalItems[$server] += $value;
             }
         }
     }
  }
- return array('items'=>$serverItems,'counts'=>$totalItems);
+ return array('items'=>$serverItems, 'counts'=>$totalItems);
 }
-function getMemcacheStats($total=true){
+function getMemcacheStats($total = true) {
 	$resp = sendMemcacheCommands('stats');
-	if ($total){
+	if ($total) {
 		$res = array();
-		foreach($resp as $server=>$r){
-			foreach($r['STAT'] as $key=>$row){
-				if (!isset($res[$key])){
-					$res[$key]=null;
+		foreach ($resp as $server=>$r) {
+			foreach ($r['STAT'] as $key=>$row) {
+				if (!isset($res[$key])) {
+					$res[$key] = null;
 				}
-				switch ($key){
+				switch ($key) {
 					case 'pid':
-						$res['pid'][$server]=$row;
+						$res['pid'][$server] = $row;
 						break;
 					case 'uptime':
-						$res['uptime'][$server]=$row;
+						$res['uptime'][$server] = $row;
 						break;
 					case 'time':
-						$res['time'][$server]=$row;
+						$res['time'][$server] = $row;
 						break;
 					case 'version':
-						$res['version'][$server]=$row;
+						$res['version'][$server] = $row;
 						break;
 					case 'pointer_size':
-						$res['pointer_size'][$server]=$row;
+						$res['pointer_size'][$server] = $row;
 						break;
 					case 'rusage_user':
-						$res['rusage_user'][$server]=$row;
+						$res['rusage_user'][$server] = $row;
 						break;
 					case 'rusage_system':
-						$res['rusage_system'][$server]=$row;
+						$res['rusage_system'][$server] = $row;
 						break;
 					case 'curr_items':
-						$res['curr_items']+=$row;
+						$res['curr_items'] += $row;
 						break;
 					case 'total_items':
-						$res['total_items']+=$row;
+						$res['total_items'] += $row;
 						break;
 					case 'bytes':
-						$res['bytes']+=$row;
+						$res['bytes'] += $row;
 						break;
 					case 'curr_connections':
-						$res['curr_connections']+=$row;
+						$res['curr_connections'] += $row;
 						break;
 					case 'total_connections':
-						$res['total_connections']+=$row;
+						$res['total_connections'] += $row;
 						break;
 					case 'connection_structures':
-						$res['connection_structures']+=$row;
+						$res['connection_structures'] += $row;
 						break;
 					case 'cmd_get':
-						$res['cmd_get']+=$row;
+						$res['cmd_get'] += $row;
 						break;
 					case 'cmd_set':
-						$res['cmd_set']+=$row;
+						$res['cmd_set'] += $row;
 						break;
 					case 'get_hits':
-						$res['get_hits']+=$row;
+						$res['get_hits'] += $row;
 						break;
 					case 'get_misses':
-						$res['get_misses']+=$row;
+						$res['get_misses'] += $row;
 						break;
 					case 'evictions':
-						$res['evictions']+=$row;
+						$res['evictions'] += $row;
 						break;
 					case 'bytes_read':
-						$res['bytes_read']+=$row;
+						$res['bytes_read'] += $row;
 						break;
 					case 'bytes_written':
-						$res['bytes_written']+=$row;
+						$res['bytes_written'] += $row;
 						break;
 					case 'limit_maxbytes':
-						$res['limit_maxbytes']+=$row;
+						$res['limit_maxbytes'] += $row;
 						break;
 					case 'threads':
-						$res['rusage_system'][$server]=$row;
+						$res['rusage_system'][$server] = $row;
 						break;
 				}
 			}
@@ -244,28 +244,28 @@ 
 //
 // 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;
 }
@@ -277,23 +277,23 @@ 
 }
 
 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);
 }
 
 // create menu entry
-function menu_entry($ob,$title) {
+function menu_entry($ob, $title) {
 	global $PHP_SELF;
-	if ($ob==$_GET['op']){
+	if ($ob == $_GET['op']) {
 	    return "<li><a class=\"child_active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
 	}
 	return "<li><a class=\"active\" href=\"$PHP_SELF&op=$ob\">$title</a></li>";
 }
 
-function getHeader(){
+function getHeader() {
     $header = <<<EOB
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -490,7 +490,7 @@ 
 
     return $header;
 }
-function getFooter(){
+function getFooter() {
     global $VERSION;
     $footer = '</div><!-- Based on apc.php '.$VERSION.'--></body>
 </html>
@@ -499,10 +499,10 @@ 
     return $footer;
 
 }
-function getMenu(){
+function getMenu() {
     global $PHP_SELF;
 echo "<ol class=menu>";
-if ($_GET['op']!=4){
+if ($_GET['op'] != 4) {
 echo <<<EOB
     <li><a href="$PHP_SELF&op={$_GET['op']}">Refresh Data</a></li>
 EOB;
@@ -513,8 +513,8 @@ 
 EOB;
 }
 echo
-	menu_entry(1,'View Host Stats'),
-	menu_entry(2,'Variables');
+	menu_entry(1, 'View Host Stats'),
+	menu_entry(2, 'Variables');
 
 echo <<<EOB
 	</ol>
@@ -524,26 +524,26 @@ 
 
 // TODO, AUTH
 
-$_GET['op'] = !isset($_GET['op'])? '1':$_GET['op'];
-$PHP_SELF= isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'],'')) : '';
+$_GET['op'] = !isset($_GET['op']) ? '1' : $_GET['op'];
+$PHP_SELF = isset($_SERVER['PHP_SELF']) ? htmlentities(strip_tags($_SERVER['PHP_SELF'], '')) : '';
 
-$PHP_SELF=$PHP_SELF.'?';
+$PHP_SELF = $PHP_SELF.'?';
 $time = time();
 // sanitize _GET
 
-foreach($_GET as $key=>$g){
-    $_GET[$key]=htmlentities($g);
+foreach ($_GET as $key=>$g) {
+    $_GET[$key] = htmlentities($g);
 }
 
 
 // singleout
 // when singleout is set, it only gives details for that server.
-if (isset($_GET['singleout']) && $_GET['singleout']>=0 && $_GET['singleout'] <count($MEMCACHE_SERVERS)){
+if (isset($_GET['singleout']) && $_GET['singleout'] >= 0 && $_GET['singleout'] < count($MEMCACHE_SERVERS)) {
     $MEMCACHE_SERVERS = array($MEMCACHE_SERVERS[$_GET['singleout']]);
 }
 
 // display images
-if (isset($_GET['IMG'])){
+if (isset($_GET['IMG'])) {
     $memcacheStats = getMemcacheStats();
     $memcacheStatsSingle = getMemcacheStats(false);
 
@@ -551,110 +551,110 @@ 
 		exit(0);
 	}
 
-	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);
 			}
 		}
 	}
 
 
-    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);
+			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);
 			}
 		}
 	}
 	$size = GRAPH_SIZE; // image size
-	$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);
+	$col_black = imagecolorallocate($image, 0, 0, 0);
 
-	imagecolortransparent($image,$col_white);
+	imagecolortransparent($image, $col_white);
 
-    switch ($_GET['IMG']){
+    switch ($_GET['IMG']) {
         case 1: // pie chart
-            $tsize=$memcacheStats['limit_maxbytes'];
-    		$avail=$tsize-$memcacheStats['bytes'];
-    		$x=$y=$size/2;
+            $tsize = $memcacheStats['limit_maxbytes'];
+    		$avail = $tsize - $memcacheStats['bytes'];
+    		$x = $y = $size / 2;
     		$angle_from = 0;
     		$fuzz = 0.000001;
 
-            foreach($memcacheStatsSingle as $serv=>$mcs) {
-    			$free = $mcs['STAT']['limit_maxbytes']-$mcs['STAT']['bytes'];
+            foreach ($memcacheStatsSingle as $serv=>$mcs) {
+    			$free = $mcs['STAT']['limit_maxbytes'] - $mcs['STAT']['bytes'];
     			$used = $mcs['STAT']['bytes'];
 
 
-                if ($free>0){
+                if ($free > 0) {
     			// draw free
-    			    $angle_to = ($free*360)/$tsize;
-                    $perc =sprintf("%.2f%%", ($free *100) / $tsize) ;
+    			    $angle_to = ($free * 360) / $tsize;
+                    $perc = sprintf("%.2f%%", ($free * 100) / $tsize);
 
-        			fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_green,$perc);
-        			$angle_from = $angle_from + $angle_to ;
+        			fill_arc($image, $x, $y, $size, $angle_from, $angle_from + $angle_to, $col_black, $col_green, $perc);
+        			$angle_from = $angle_from + $angle_to;
                 }
-    			if ($used>0){
+    			if ($used > 0) {
     			// draw used
-        			$angle_to = ($used*360)/$tsize;
-        			$perc =sprintf("%.2f%%", ($used *100) / $tsize) ;
-        			fill_arc($image,$x,$y,$size,$angle_from,$angle_from + $angle_to ,$col_black,$col_red, '('.$perc.')' );
-                    $angle_from = $angle_from+ $angle_to ;
+        			$angle_to = ($used * 360) / $tsize;
+        			$perc = sprintf("%.2f%%", ($used * 100) / $tsize);
+        			fill_arc($image, $x, $y, $size, $angle_from, $angle_from + $angle_to, $col_black, $col_red, '('.$perc.')');
+                    $angle_from = $angle_from + $angle_to;
     			}
     			}
 
@@ -662,12 +662,12 @@ 
 
         case 2: // hit miss
 
-            $hits = ($memcacheStats['get_hits']==0) ? 1:$memcacheStats['get_hits'];
-            $misses = ($memcacheStats['get_misses']==0) ? 1:$memcacheStats['get_misses'];
-            $total = $hits + $misses ;
+            $hits = ($memcacheStats['get_hits'] == 0) ? 1 : $memcacheStats['get_hits'];
+            $misses = ($memcacheStats['get_misses'] == 0) ? 1 : $memcacheStats['get_misses'];
+            $total = $hits + $misses;
 
-	       	fill_box($image, 30,$size,50,-$hits*($size-21)/$total,$col_black,$col_green,sprintf("%.1f%%",$hits*100/$total));
-		    fill_box($image,130,$size,50,-max(4,($total-$hits)*($size-21)/$total),$col_black,$col_red,sprintf("%.1f%%",$misses*100/$total));
+	       	fill_box($image, 30, $size, 50, -$hits * ($size - 21) / $total, $col_black, $col_green, sprintf("%.1f%%", $hits * 100 / $total));
+		    fill_box($image, 130, $size, 50, -max(4, ($total - $hits) * ($size - 21) / $total), $col_black, $col_red, sprintf("%.1f%%", $misses * 100 / $total));
 		break;
 		
     }
@@ -688,36 +688,36 @@ 
 
         $mem_size = $memcacheStats['limit_maxbytes'];
     	$mem_used = $memcacheStats['bytes'];
-	    $mem_avail= $mem_size-$mem_used;
-	    $startTime = time()-array_sum($memcacheStats['uptime']);
+	    $mem_avail = $mem_size - $mem_used;
+	    $startTime = time() - array_sum($memcacheStats['uptime']);
 
         $curr_items = $memcacheStats['curr_items'];
         $total_items = $memcacheStats['total_items'];
-        $hits = ($memcacheStats['get_hits']==0) ? 1:$memcacheStats['get_hits'];
-        $misses = ($memcacheStats['get_misses']==0) ? 1:$memcacheStats['get_misses'];
+        $hits = ($memcacheStats['get_hits'] == 0) ? 1 : $memcacheStats['get_hits'];
+        $misses = ($memcacheStats['get_misses'] == 0) ? 1 : $memcacheStats['get_misses'];
         $sets = $memcacheStats['cmd_set'];
 
-       	$req_rate = sprintf("%.2f",($hits+$misses)/($time-$startTime));
-	    $hit_rate = sprintf("%.2f",($hits)/($time-$startTime));
-	    $miss_rate = sprintf("%.2f",($misses)/($time-$startTime));
-	    $set_rate = sprintf("%.2f",($sets)/($time-$startTime));
+       	$req_rate = sprintf("%.2f", ($hits + $misses) / ($time - $startTime));
+	    $hit_rate = sprintf("%.2f", ($hits) / ($time - $startTime));
+	    $miss_rate = sprintf("%.2f", ($misses) / ($time - $startTime));
+	    $set_rate = sprintf("%.2f", ($sets) / ($time - $startTime));
 
 	    echo <<< EOB
 		<div class="info div1"><h2>General Cache Information</h2>
 		<table cellspacing=0><tbody>
 		<tr class=tr-1><td class=td-0>PHP Version</td><td>$phpversion</td></tr>
 EOB;
-		echo "<tr class=tr-0><td class=td-0>Memcached Host". ((count($MEMCACHE_SERVERS)>1) ? 's':'')."</td><td>";
-		$i=0;
-		if (!isset($_GET['singleout']) && count($MEMCACHE_SERVERS)>1){
-    		foreach($MEMCACHE_SERVERS as $server){
-    		      echo ($i+1).'. <a href="'.$PHP_SELF.'&singleout='.$i++.'">'.$server.'</a><br/>';
+		echo "<tr class=tr-0><td class=td-0>Memcached Host".((count($MEMCACHE_SERVERS) > 1) ? 's' : '')."</td><td>";
+		$i = 0;
+		if (!isset($_GET['singleout']) && count($MEMCACHE_SERVERS) > 1) {
+    		foreach ($MEMCACHE_SERVERS as $server) {
+    		      echo ($i + 1).'. <a href="'.$PHP_SELF.'&singleout='.$i++.'">'.$server.'</a><br/>';
     		}
 		}
-		else{
+		else {
 		    echo '1.'.$MEMCACHE_SERVERS[0];
 		}
-		if (isset($_GET['singleout'])){
+		if (isset($_GET['singleout'])) {
 		      echo '<a href="'.$PHP_SELF.'">(all servers)</a><br/>';
 		}
 		echo "</td></tr>\n";
@@ -729,14 +729,14 @@ 
 
 		<div class="info div1"><h2>Memcache Server Information</h2>
 EOB;
-        foreach($MEMCACHE_SERVERS as $server){
+        foreach ($MEMCACHE_SERVERS as $server) {
             echo '<table cellspacing=0><tbody>';
-            echo '<tr class=tr-1><td class=td-1>'.$server.'</td><td><a href="'.$PHP_SELF.'&server='.array_search($server,$MEMCACHE_SERVERS).'&op=6">[<b>Flush this server</b>]</a></td></tr>';
-    		echo '<tr class=tr-0><td class=td-0>Start Time</td><td>',date(DATE_FORMAT,$memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
-    		echo '<tr class=tr-1><td class=td-0>Uptime</td><td>',duration($memcacheStatsSingle[$server]['STAT']['time']-$memcacheStatsSingle[$server]['STAT']['uptime']),'</td></tr>';
+            echo '<tr class=tr-1><td class=td-1>'.$server.'</td><td><a href="'.$PHP_SELF.'&server='.array_search($server, $MEMCACHE_SERVERS).'&op=6">[<b>Flush this server</b>]</a></td></tr>';
+    		echo '<tr class=tr-0><td class=td-0>Start Time</td><td>', date(DATE_FORMAT, $memcacheStatsSingle[$server]['STAT']['time'] - $memcacheStatsSingle[$server]['STAT']['uptime']), '</td></tr>';
+    		echo '<tr class=tr-1><td class=td-0>Uptime</td><td>', duration($memcacheStatsSingle[$server]['STAT']['time'] - $memcacheStatsSingle[$server]['STAT']['uptime']), '</td></tr>';
     		echo '<tr class=tr-0><td class=td-0>Memcached Server Version</td><td>'.$memcacheStatsSingle[$server]['STAT']['version'].'</td></tr>';
-    		echo '<tr class=tr-1><td class=td-0>Used Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['bytes']),'</td></tr>';
-    		echo '<tr class=tr-0><td class=td-0>Total Cache Size</td><td>',bsize($memcacheStatsSingle[$server]['STAT']['limit_maxbytes']),'</td></tr>';
+    		echo '<tr class=tr-1><td class=td-0>Used Cache Size</td><td>', bsize($memcacheStatsSingle[$server]['STAT']['bytes']), '</td></tr>';
+    		echo '<tr class=tr-0><td class=td-0>Total Cache Size</td><td>', bsize($memcacheStatsSingle[$server]['STAT']['limit_maxbytes']), '</td></tr>';
     		echo '</tbody></table>';
 	   }
     echo <<<EOB
@@ -746,7 +746,7 @@ 
 		<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>Cache Usage</td>
@@ -757,16 +757,16 @@ 
 	echo
 		graphics_avail() ?
 			  '<tr>'.
-			  "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF&IMG=1&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$time\"></td>".
-			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF&IMG=2&".(isset($_GET['singleout'])? 'singleout='.$_GET['singleout'].'&':'')."$time\"></td></tr>\n"
+			  "<td class=td-0><img alt=\"\" $size src=\"$PHP_SELF&IMG=1&".(isset($_GET['singleout']) ? 'singleout='.$_GET['singleout'].'&' : '')."$time\"></td>".
+			  "<td class=td-1><img alt=\"\" $size src=\"$PHP_SELF&IMG=2&".(isset($_GET['singleout']) ? 'singleout='.$_GET['singleout'].'&' : '')."$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: ',$hits.sprintf(" (%.1f%%)",$hits*100/($hits+$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: ', $hits.sprintf(" (%.1f%%)", $hits * 100 / ($hits + $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: ',$misses.sprintf(" (%.1f%%)",$misses*100/($hits+$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: ', $misses.sprintf(" (%.1f%%)", $misses * 100 / ($hits + $misses)), "</td>\n";
 		echo <<< EOB
 	</tr>
 	</tbody></table>
@@ -789,12 +789,12 @@ 
 
     case 2: // variables
 
-		$m=0;
-		$cacheItems= getCacheItems();
+		$m = 0;
+		$cacheItems = getCacheItems();
 		$items = $cacheItems['items'];
 		$totals = $cacheItems['counts'];
 		$maxDump = MAX_ITEM_DUMP;
-		foreach($items as $server => $entries) {
+		foreach ($items as $server => $entries) {
 
     	echo <<< EOB
 
@@ -803,33 +803,33 @@ 
 			<tr><th>Slab Id</th><th>Info</th></tr>
 EOB;
 
-			foreach($entries as $slabId => $slab) {
-			    $dumpUrl = $PHP_SELF.'&op=2&server='.(array_search($server,$MEMCACHE_SERVERS)).'&dumpslab='.$slabId;
+			foreach ($entries as $slabId => $slab) {
+			    $dumpUrl = $PHP_SELF.'&op=2&server='.(array_search($server, $MEMCACHE_SERVERS)).'&dumpslab='.$slabId;
 				echo
 					"<tr class=tr-$m>",
-					"<td class=td-0><center>",'<a href="',$dumpUrl,'">',$slabId,'</a>',"</center></td>",
-					"<td class=td-last><b>Item count:</b> ",$slab['number'],'<br/><b>Age:</b>',duration($time-$slab['age']),'<br/> <b>Evicted:</b>',((isset($slab['evicted']) && $slab['evicted']==1)? 'Yes':'No');
-					if ((isset($_GET['dumpslab']) && $_GET['dumpslab']==$slabId) &&  (isset($_GET['server']) && $_GET['server']==array_search($server,$MEMCACHE_SERVERS))){
+					"<td class=td-0><center>", '<a href="', $dumpUrl, '">', $slabId, '</a>', "</center></td>",
+					"<td class=td-last><b>Item count:</b> ", $slab['number'], '<br/><b>Age:</b>', duration($time - $slab['age']), '<br/> <b>Evicted:</b>', ((isset($slab['evicted']) && $slab['evicted'] == 1) ? 'Yes' : 'No');
+					if ((isset($_GET['dumpslab']) && $_GET['dumpslab'] == $slabId) && (isset($_GET['server']) && $_GET['server'] == array_search($server, $MEMCACHE_SERVERS))) {
 					    echo "<br/><b>Items: item</b><br/>";
-					    $items = dumpCacheSlab($server,$slabId,$slab['number']);
+					    $items = dumpCacheSlab($server, $slabId, $slab['number']);
                         // maybe someone likes to do a pagination here :)
-					    $i=1;
-                        foreach($items['ITEM'] as $itemKey=>$itemInfo){
-                            $itemInfo = trim($itemInfo,'[ ]');
+					    $i = 1;
+                        foreach ($items['ITEM'] as $itemKey=>$itemInfo) {
+                            $itemInfo = trim($itemInfo, '[ ]');
 
 
-                            echo '<a href="',$PHP_SELF,'&op=4&server=',(array_search($server,$MEMCACHE_SERVERS)),'&key=',base64_encode($itemKey).'">',$itemKey,'</a>';
+                            echo '<a href="', $PHP_SELF, '&op=4&server=', (array_search($server, $MEMCACHE_SERVERS)), '&key=', base64_encode($itemKey).'">', $itemKey, '</a>';
                             if ($i++ % 10 == 0) {
                                 echo '<br/>';
                             }
-                            elseif ($i!=$slab['number']+1){
+                            elseif ($i != $slab['number'] + 1) {
                                 echo ',';
                             }
                         }
 					}
 
 					echo "</td></tr>";
-				$m=1-$m;
+				$m = 1 - $m;
 			}
 		echo <<<EOB
 			</tbody></table>
@@ -841,7 +841,7 @@ 
     break;
 
     case 4: //item dump
-        if (!isset($_GET['key']) || !isset($_GET['server'])){
+        if (!isset($_GET['key']) || !isset($_GET['server'])) {
             echo "No key set!";
             break;
         }
@@ -850,25 +850,25 @@ 
         // somebody has to do a fix to this.
         $theKey = htmlentities(base64_decode($_GET['key']));
 
-        $theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
-        list($h,$p) = get_host_port_from_server($theserver);
-        $r = sendMemcacheCommand($h,$p,'get '.$theKey);
+        $theserver = $MEMCACHE_SERVERS[(int) $_GET['server']];
+        list($h, $p) = get_host_port_from_server($theserver);
+        $r = sendMemcacheCommand($h, $p, 'get '.$theKey);
         echo <<<EOB
         <div class="info"><table cellspacing=0><tbody>
 			<tr><th>Server<th>Key</th><th>Value</th><th>Delete</th></tr>
 EOB;
         if (!isset($r['VALUE'])) {
-            echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
+            echo "<tr><td class=td-0>", $theserver, "</td><td class=td-0>", $theKey,
                  "</td><td>[The requested item was not found or has expired]</td>",
-                 "<td></td>","</tr>";
+                 "<td></td>", "</tr>";
         }
         else {
 
-            echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
-                 " <br/>flag:",$r['VALUE'][$theKey]['stat']['flag'],
-                 " <br/>Size:",bsize($r['VALUE'][$theKey]['stat']['size']),
-                 "</td><td>",chunk_split($r['VALUE'][$theKey]['value'],40),"</td>",
-                 '<td><a href="',$PHP_SELF,'&op=5&server=',(int)$_GET['server'],'&key=',base64_encode($theKey),"\">Delete</a></td>","</tr>";
+            echo "<tr><td class=td-0>", $theserver, "</td><td class=td-0>", $theKey,
+                 " <br/>flag:", $r['VALUE'][$theKey]['stat']['flag'],
+                 " <br/>Size:", bsize($r['VALUE'][$theKey]['stat']['size']),
+                 "</td><td>", chunk_split($r['VALUE'][$theKey]['value'], 40), "</td>",
+                 '<td><a href="', $PHP_SELF, '&op=5&server=', (int) $_GET['server'], '&key=', base64_encode($theKey), "\">Delete</a></td>", "</tr>";
         }
         echo <<<EOB
 			</tbody></table>
@@ -876,19 +876,19 @@ 
 EOB;
     break;
     case 5: // item delete
-    	if (!isset($_GET['key']) || !isset($_GET['server'])){
+    	if (!isset($_GET['key']) || !isset($_GET['server'])) {
 			echo "No key set!";
 			break;
         }
         $theKey = htmlentities(base64_decode($_GET['key']));
-		$theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
-		list($h,$p) = get_host_port_from_server($theserver);
-        $r = sendMemcacheCommand($h,$p,'delete '.$theKey);
+		$theserver = $MEMCACHE_SERVERS[(int) $_GET['server']];
+		list($h, $p) = get_host_port_from_server($theserver);
+        $r = sendMemcacheCommand($h, $p, 'delete '.$theKey);
         echo 'Deleting '.$theKey.':'.$r;
 	break;
     
    case 6: // flush server
-        $theserver = $MEMCACHE_SERVERS[(int)$_GET['server']];
+        $theserver = $MEMCACHE_SERVERS[(int) $_GET['server']];
         $r = flushServer($theserver);
         echo 'Flush  '.$theserver.":".$r;
    break;

Braces +43 added lines, -24 removed lines

@@ -51,8 +51,7 @@ 
 	$values = explode(':', $server);
 	if (($values[0] == 'unix') && (!is_numeric( $values[1]))) {
 		return array($server, 0);
-	}
-	else {
+	} else {
 		return $values;
 	}
 }
@@ -110,7 +109,7 @@ 
 			    $res[$l[0]][$l[1]]['stat']=array('flag'=>$flag,'size'=>$size);
 			    $res[$l[0]][$l[1]]['value']=$lines[++$i];
 			}
-		}elseif($line=='DELETED' || $line=='NOT_FOUND' || $line=='OK'){
+		} elseif($line=='DELETED' || $line=='NOT_FOUND' || $line=='OK'){
 		    return $line;
 		}
 	}
@@ -257,16 +256,35 @@ 
     $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;
 }
 
@@ -278,7 +296,9 @@ 
 
 function bsize($s) {
 	foreach (array('','K','M','G') as $i => $k) {
-		if ($s < 1024) break;
+		if ($s < 1024) {
+		    break;
+		}
 		$s/=1024;
 	}
 	return sprintf("%5.1f %sBytes",$s,$k);
@@ -506,8 +526,7 @@ 
 echo <<<EOB
     <li><a href="$PHP_SELF&op={$_GET['op']}">Refresh Data</a></li>
 EOB;
-}
-else {
+} else {
 echo <<<EOB
     <li><a href="$PHP_SELF&op=2}">Back</a></li>
 EOB;
@@ -557,8 +576,11 @@ 
 		$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) {
@@ -713,8 +735,7 @@ 
     		foreach($MEMCACHE_SERVERS as $server){
     		      echo ($i+1).'. <a href="'.$PHP_SELF.'&singleout='.$i++.'">'.$server.'</a><br/>';
     		}
-		}
-		else{
+		} else{
 		    echo '1.'.$MEMCACHE_SERVERS[0];
 		}
 		if (isset($_GET['singleout'])){
@@ -821,8 +842,7 @@ 
                             echo '<a href="',$PHP_SELF,'&op=4&server=',(array_search($server,$MEMCACHE_SERVERS)),'&key=',base64_encode($itemKey).'">',$itemKey,'</a>';
                             if ($i++ % 10 == 0) {
                                 echo '<br/>';
-                            }
-                            elseif ($i!=$slab['number']+1){
+                            } elseif ($i!=$slab['number']+1){
                                 echo ',';
                             }
                         }
@@ -861,8 +881,7 @@ 
             echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
                  "</td><td>[The requested item was not found or has expired]</td>",
                  "<td></td>","</tr>";
-        }
-        else {
+        } else {
 
             echo "<tr><td class=td-0>",$theserver,"</td><td class=td-0>",$theKey,
                  " <br/>flag:",$r['VALUE'][$theKey]['stat']['flag'],

var/www/dev/resource/item.php

Doc Comments +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 class Controller
 {
     /**
-     * @param Doctrine\Common\Annotations\Reader             $reader
-     * @param BEAR\Sunday\Extension\Application\AppInterface $app
+     * @param Reader             $reader
+     * @param AppInterface $app
      *
      * @Ray\Di\Di\Inject
      */

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 control: {
     $mode = "Dev";
-    $app = require $appDir . '/bootstrap/instance.php';
+    $app = require $appDir.'/bootstrap/instance.php';
     /** @var $app \BEAR\Package\Provide\Application\AbstractApp */
     $appReflector = new ApplicationReflector($app);
     $resourceInfo = $appReflector->getResources()[$_GET['uri']];
@@ -95,5 +95,5 @@ 
 
 EOT;
     // two step view
-    echo include $devDir . '/view/layout.php';
+    echo include $devDir.'/view/layout.php';
 }

src/Installer.php

Spacing +7 added lines, -7 removed lines

@@ -21,13 +21,13 @@ 
         $version = $event->getComposer()->getPackage()->getPrettyVersion();
         $hash = $event->getComposer()->getLocker()->getLockData()['hash'];
         $packageDir = dirname(__DIR__);
-        file_put_contents($packageDir . '/VERSION', $version);
-        file_put_contents($packageDir . '/ID', $hash);
+        file_put_contents($packageDir.'/VERSION', $version);
+        file_put_contents($packageDir.'/ID', $hash);
 
-        $targetHello = dirname(__DIR__) . '/vendor/bear/demo-apps/Demo.Helloworld';
-        $targetSandbox = dirname(__DIR__) . '/vendor/bear/demo-apps/Demo.Sandbox';
-        $helloApp = dirname(__DIR__) . '/apps/Demo.Helloworld';
-        $sandboxApp = dirname(__DIR__) . '/apps/Demo.Sandbox';
+        $targetHello = dirname(__DIR__).'/vendor/bear/demo-apps/Demo.Helloworld';
+        $targetSandbox = dirname(__DIR__).'/vendor/bear/demo-apps/Demo.Sandbox';
+        $helloApp = dirname(__DIR__).'/apps/Demo.Helloworld';
+        $sandboxApp = dirname(__DIR__).'/apps/Demo.Sandbox';
 
         if (file_exists($helloApp)) {
             unlink($helloApp);
@@ -38,6 +38,6 @@ 
         symlink($targetHello, $helloApp);
         symlink($targetSandbox, $sandboxApp);
 
-        include $packageDir . '/bin/bear.env';
+        include $packageDir.'/bin/bear.env';
     }
 }

src/Dev/Dev.php

Spacing +15 added lines, -15 removed lines

@@ -98,7 +98,7 @@ 
     ) {
         global $argv;
 
-        $this->web = $web ? : new Web;
+        $this->web = $web ?: new Web;
         if (is_null($server) && isset($_SERVER)) {
             $server = $_SERVER;
         }
@@ -107,7 +107,7 @@ 
         } elseif (isset($argv[2])) {
             $this->requestUri = $argv[2];
         }
-        $this->sapiName = $sapiName ? : php_sapi_name();
+        $this->sapiName = $sapiName ?: php_sapi_name();
     }
 
     /**
@@ -131,10 +131,10 @@ 
 
         // stop
         register_shutdown_function(
-            function () {
+            function() {
                 $xhprof = xhprof_disable();
                 if (!$xhprof) {
-                    error_log('xhprof failed in ' . __FILE__);
+                    error_log('xhprof failed in '.__FILE__);
 
                     return;
                 }
@@ -159,7 +159,7 @@ 
         ini_set('xdebug.collect_params', 0);
         ini_set('xdebug.max_nesting_level', 500);
         ini_set('xdebug.file_link_format', '/dev/edit/?file=%f&line=$l');
-        if (! ini_get('date.timezone')) {
+        if (!ini_get('date.timezone')) {
             date_default_timezone_set('Asia/Tokyo');
         }
 
@@ -171,7 +171,7 @@ 
      */
     public function registerErrorHandler()
     {
-        set_error_handler( function ($errNo, $errStr, $errFile, $errLine) {
+        set_error_handler(function($errNo, $errStr, $errFile, $errLine) {
             if (error_reporting() === 0) {
 
                 // return in error-control operator(@)
@@ -208,10 +208,10 @@ 
     public function registerExceptionHandler($logDir)
     {
         set_exception_handler(
-            function (\Exception $e) use ($logDir) {
+            function(\Exception $e) use ($logDir) {
                 $handler = new ExceptionHandler(
                     new SymfonyResponse(new ConsoleOutput),
-                    (dirname(__DIR__)) . '/Dev/Module/ExceptionHandle/template/exception.php'
+                    (dirname(__DIR__)).'/Dev/Module/ExceptionHandle/template/exception.php'
                 );
                 $handler->setLogDir($logDir);
                 $handler->handle($e);
@@ -250,7 +250,7 @@ 
     public function registerFatalErrorHandler()
     {
         register_shutdown_function(
-            function () {
+            function() {
                 if (PHP_SAPI === 'cli') {
                     return;
                 }
@@ -269,7 +269,7 @@ 
                 $outputBuffer = ob_get_clean();
                 error_log($outputBuffer);
                 http_response_code(500);
-                $html = require __DIR__ . '/view/fatal_error.php';
+                $html = require __DIR__.'/view/fatal_error.php';
                 echo $html;
                 exit(1);
             }
@@ -302,10 +302,10 @@ 
         if (isset($this->app->router)) {
             $this->route($this->app);
         }
-        if (! $this->web->isDevWebService($this->sapiName, $this->requestUri)) {
+        if (!$this->web->isDevWebService($this->sapiName, $this->requestUri)) {
             return '';
         }
-        $requestUri = $requestUri ? : $_SERVER['REQUEST_URI'];
+        $requestUri = $requestUri ?: $_SERVER['REQUEST_URI'];
         $html = $this->web->service($requestUri, $this->app, $this->appDir);
 
         return $html;
@@ -327,7 +327,7 @@ 
      */
     public function loadDevFunctions()
     {
-        error_log(__METHOD__  . ' is no longer necessary.');
+        error_log(__METHOD__.' is no longer necessary.');
 
         return $this;
     }
@@ -356,11 +356,11 @@ 
      */
     private function getVendorDirectory()
     {
-        $vendorDir = dirname(dirname(__DIR__)) . '/vendor';
+        $vendorDir = dirname(dirname(__DIR__)).'/vendor';
 
         if (strpos(__DIR__, '/vendor/bear/package') !== false) {
             $baseDir = explode('/vendor/bear/package', __DIR__)[0];
-            $vendorDir = $baseDir . '/vendor';
+            $vendorDir = $baseDir.'/vendor';
         }
         return $vendorDir;
     }