Merge pull request rlerdorf#32 from rlerdorf/revert-29-master

rlerdorf · rlerdorf · commit ef3d86977caa · 2015-01-20T21:36:08.000-08:00
Revert "Update opcache.php"
diff --git a/opcache.php b/opcache.php
@@ -224,9 +224,9 @@ public function getWastedMemoryPercentage()
         return number_format($this->_status['memory_usage']['current_wasted_percentage'], 2);
     }
 
-    public function getD3ScriptsJson()
+    public function getD3Scripts()
     {
-        return json_encode($this->_d3Scripts);
+        return $this->_d3Scripts;
     }
 
     private function _processPartition($value, $name = null)
@@ -281,15 +281,15 @@ private function _arrayPset(&$array, $key, $value)
         $array[array_shift($keys)] = $value;
         return $array;
     }
-    
-    public static function printStats() 
-    {
-        $dataModel = new self();
-        return <<<HERE
-<!DOCTYPE html><meta charset="utf-8">
+
+}
+
+$dataModel = new OpCacheDataModel();
+?>
+<!DOCTYPE html>
+<meta charset="utf-8">
 <html>
-    <head>
-        <title>{$dataModel->getPageTitle()}</title>
+<head>
     <style>
         body {
             font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -458,10 +458,8 @@ public static function printStats()
             cursor: pointer;
         }
     </style>
-        
     <script src="//cdnjs.cloudflare.com/ajax/libs/d3/3.0.1/d3.v3.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    
     <script>
         var hidden = {};
         function toggleVisible(head, row) {
@@ -476,11 +474,12 @@ function toggleVisible(head, row) {
             }
         }
     </script>
-    
-    </head>
-    <body>
+    <title><?php echo $dataModel->getPageTitle(); ?></title>
+</head>
+
+<body>
     <div id="container">
-        <h1>{$dataModel->getPageTitle()}</h1>
+        <h1><?php echo $dataModel->getPageTitle(); ?></h1>
 
         <div class="tabs">
 
@@ -489,7 +488,7 @@ function toggleVisible(head, row) {
                 <label for="tab-status">Status</label>
                 <div class="content">
                     <table>
-                        {$dataModel->getStatusDataRows()}
+                        <?php echo $dataModel->getStatusDataRows(); ?>
                     </table>
                 </div>
             </div>
@@ -499,22 +498,22 @@ function toggleVisible(head, row) {
                 <label for="tab-config">Configuration</label>
                 <div class="content">
                     <table>
-                        {$dataModel->getConfigDataRows()}
+                        <?php echo $dataModel->getConfigDataRows(); ?>
                     </table>
                 </div>
             </div>
 
             <div class="tab">
                 <input type="radio" id="tab-scripts" name="tab-group-1">
-                <label for="tab-scripts">Scripts ({$dataModel->getScriptStatusCount()})</label>
+                <label for="tab-scripts">Scripts (<?php echo $dataModel->getScriptStatusCount(); ?>)</label>
                 <div class="content">
                     <table style="font-size:0.8em;">
                         <tr>
                             <th width="10%">Hits</th>
                             <th width="20%">Memory</th>
                             <th width="70%">Path</th>
                         </tr>
-                        {$dataModel->getScriptStatusRows()}
+                        <?php echo $dataModel->getScriptStatusRows(); ?>
                     </table>
                 </div>
             </div>
@@ -543,7 +542,7 @@ function toggleVisible(head, row) {
     <div id="partition"></div>
 
     <script>
-        var dataset = {$dataModel->getGraphDataSetJson()};
+        var dataset = <?php echo $dataModel->getGraphDataSetJson(); ?>
 
         var width = 400,
             height = 400,
@@ -577,10 +576,10 @@ function toggleVisible(head, row) {
         function set_text(t) {
             if (t === "memory") {
                 d3.select("#stats").html(
-                    "<table><tr><th style='background:#B41F1F;'>Used</th><td>{$dataModel->getHumanUsedMemory()}</td></tr>"+
-                    "<tr><th style='background:#1FB437;'>Free</th><td>{$dataModel->getHumanFreeMemory()}</td></tr>"+
-                    "<tr><th style='background:#ff7f0e;' rowspan=\"2\">Wasted</th><td>{$dataModel->getHumanWastedMemory()}</td></tr>"+
-                    "<tr><td>{$dataModel->getWastedMemoryPercentage()}%</td></tr></table>"
+                    "<table><tr><th style='background:#B41F1F;'>Used</th><td><?php echo $dataModel->getHumanUsedMemory()?></td></tr>"+
+                    "<tr><th style='background:#1FB437;'>Free</th><td><?php echo $dataModel->getHumanFreeMemory()?></td></tr>"+
+                    "<tr><th style='background:#ff7f0e;' rowspan=\"2\">Wasted</th><td><?php echo $dataModel->getHumanWastedMemory()?></td></tr>"+
+                    "<tr><td><?php echo $dataModel->getWastedMemoryPercentage()?>%</td></tr></table>"
                 );
             } else if (t === "keys") {
                 d3.select("#stats").html(
@@ -659,7 +658,7 @@ function format_value(value) {
         var partition = d3.layout.partition()
                 .value(function(d) { return d.size; });
 
-        root = {$dataModel->getD3ScriptsJson()};
+        root = JSON.parse('<?php echo json_encode($dataModel->getD3Scripts()); ?>');
 
         var g = vis.selectAll("g")
                    .data(partition.nodes(root))
@@ -741,8 +740,5 @@ function handleVisualisationToggle(close) {
 
         });
     </script>
-    </body>
+</body>
 </html>
-HERE;
-    }
-}
