bearsunday / BEAR.Package

var/www/admin/apc/apc.php

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