January 2013 report. also line separators may have changed....

www/mcstats.org/cron/generators/auth-mode.php

@@ -35,7 +35,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('Auth Mode', false, 0, GraphType::Pie, TRUE, 9011);
+    $graph = $plugin->getOrCreateGraph('Auth Mode', false, 1, GraphType::Pie, TRUE, 9011);
     insertGraphDataScratch($graph, $pluginId, $fullName, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/game-version.php

@@ -27,7 +27,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('Game Version', false, 1, GraphType::Pie, TRUE, 9001);
+    $graph = $plugin->getOrCreateGraph('Game Version', false, 1, GraphType::Pie, TRUE, 9001, TRUE);
     insertGraphDataScratch($graph, $pluginId, $version, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/java-version.php

@@ -35,7 +35,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('Java Version', false, 0, GraphType::Donut, TRUE, 9013);
+    $graph = $plugin->getOrCreateGraph('Java Version', false, 1, GraphType::Donut, TRUE, 9013, TRUE);
     insertGraphDataScratch($graph, $pluginId, $fullName, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/operating-system.php

@@ -35,7 +35,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('Operating System', false, 0, GraphType::Donut, TRUE, 9010);
+    $graph = $plugin->getOrCreateGraph('Operating System', false, 1, GraphType::Donut, TRUE, 9010, TRUE);
     insertGraphDataScratch($graph, $pluginId, $fullName, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/server-software.php

@@ -27,7 +27,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('Server Software', false, 1, GraphType::Pie, TRUE, 9002);
+    $graph = $plugin->getOrCreateGraph('Server Software', false, 1, GraphType::Pie, TRUE, 9002, TRUE);
     insertGraphDataScratch($graph, $pluginId, $software, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/system-arch.php

@@ -34,7 +34,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('System Arch', false, 0, GraphType::Pie, TRUE, 9011);
+    $graph = $plugin->getOrCreateGraph('System Arch', false, 1, GraphType::Pie, TRUE, 9011, TRUE);
     insertGraphDataScratch($graph, $pluginId, $fullName, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/cron/generators/system-cores.php

@@ -30,7 +30,7 @@ function doGeneration($pluginId, $data)
         return;
     }
 
-    $graph = $plugin->getOrCreateGraph('System Cores', false, 0, GraphType::Pie, TRUE, 9012);
+    $graph = $plugin->getOrCreateGraph('System Cores', false, 1, GraphType::Pie, TRUE, 9012, TRUE);
     insertGraphDataScratch($graph, $pluginId, $fullName, $baseEpoch, $sum, $count, $avg, $max, $min, $variance, $stddev);
 }
 

www/mcstats.org/private_html/assets/template/header.php

@@ -114,8 +114,9 @@
                     </ul>
                 </li>
                 <li class="submenu<?php if ($fileName == 'reports') echo ' active open'; ?>">
-                    <a href="#"><i class="icon icon-book"></i> <span>Reports</span> <span class="label">1</span></a>
+                    <a href="#"><i class="icon icon-book"></i> <span>Reports</span> <span class="label">2</span></a>
                     <ul>
+                        <li<?php if (isset($_GET['period']) && $_GET['period'] == 'december-2012') echo ' class="active"'; ?>><a href="/reports/january-2013/">January 2013</a></li>
                         <li<?php if (isset($_GET['period']) && $_GET['period'] == 'december-2012') echo ' class="active"'; ?>><a href="/reports/december-2012/">December 2012</a></li>
                     </ul>
                 </li>

www/mcstats.org/private_html/includes/DataGenerator.class.php

@@ -97,10 +97,10 @@ public static function generateCustomChartData($graph, $columnID = -1, $hours =
 
                 if (is_numeric($columnName) || is_double($columnName))
                 {
-                    $columnName = "\0" . $columnName;
+                    // $columnName = "\0" . $columnName;
                 }
 
-                $generatedData[] = array($columnName, $percent);
+                $generatedData[] = array($columnName . ' (' . $dataPoint . ')', $percent);
             }
 
             if (count($generatedData) == 0) {
@@ -165,13 +165,13 @@ public static function generateCustomChartData($graph, $columnID = -1, $hours =
 
                 if (is_numeric($columnName) || is_double($columnName))
                 {
-                    $columnName = "\0" . $columnName;
+                    // $columnName = "\0" . $columnName;
                 }
 
                 // explode the string on the delimiter
                 $expl = explode('~=~', $columnName);
 
-                $generatedData[$expl[0]][] = array("name" => $expl[1], "y" => $percent);
+                $generatedData[$expl[0]][] = array("name" => $expl[1] . ' (' . $dataPoint . ')', "y" => $percent);
             }
         }
 

www/mcstats.org/private_html/includes/Graph.class.php

@@ -151,6 +151,12 @@ class Graph
      */
     private $scale;
 
+    /**
+     * If the graph is halfwidth or not
+     * @var bool
+     */
+    private $halfwidth;
+
     /**
      * The columns present in this graph
      * @var array
@@ -169,7 +175,7 @@ class Graph
      */
     private $feedURL = '';
 
-    public function __construct($id = -1, $plugin = NULL, $type = GraphType::Line, $name = '', $displayName = '', $active = 0, $readonly = FALSE, $position = 1, $scale = 'linear')
+    public function __construct($id = -1, $plugin = NULL, $type = GraphType::Line, $name = '', $displayName = '', $active = 0, $readonly = FALSE, $position = 1, $scale = 'linear', $halfwidth = FALSE)
     {
         $this->id = $id;
         $this->plugin = $plugin;
@@ -180,6 +186,7 @@ public function __construct($id = -1, $plugin = NULL, $type = GraphType::Line, $
         $this->position = $position;
         $this->active = $active;
         $this->scale = $scale;
+        $this->halfwidth = $halfwidth;
 
         // If the display name is blank, use the internal name
         if ($displayName == '')
@@ -201,8 +208,8 @@ public function save()
     {
         global $master_db_handle;
 
-        $statement = $master_db_handle->prepare('UPDATE Graph SET DisplayName = ?, Type = ?, Active = ?, Readonly = ?, Position = ?, Scale = ? WHERE ID = ?');
-        $statement->execute(array($this->displayName, $this->type, $this->active, $this->readonly ? 1 : 0, $this->position, $this->scale, $this->id)); // TODO
+        $statement = $master_db_handle->prepare('UPDATE Graph SET DisplayName = ?, Type = ?, Active = ?, Readonly = ?, Position = ?, Scale = ?, Halfwidth = ? WHERE ID = ?');
+        $statement->execute(array($this->displayName, $this->type, $this->active, $this->readonly ? 1 : 0, $this->position, $this->scale, $this->halfwidth ? 1 : 0, $this->id)); // TODO
     }
 
     /**
@@ -734,6 +741,23 @@ public function getScale()
         return $this->scale;
     }
 
+    /**
+     * @return bool
+     */
+    public function isHalfwidth()
+    {
+        return $this->halfwidth;
+    }
+
+    /**
+     * Set the halfwidth value for this graph
+     * @param $halfwidth
+     */
+    public function setHalfwidth($halfwidth)
+    {
+        $this->halfwidth = $halfwidth;
+    }
+
     /**
      * @return int
      */

www/mcstats.org/private_html/includes/Plugin.class.php

@@ -133,33 +133,34 @@ private function cacheKey()
      * @param $name
      * @return Graph
      */
-    public function getOrCreateGraph($name, $attemptedToCreate = false, $active = 0, $type = GraphType::Line, $readonly = FALSE, $position = 2)
+    public function getOrCreateGraph($name, $attemptedToCreate = false, $active = 0, $type = GraphType::Line, $readonly = FALSE, $position = 2, $halfwidth = FALSE)
     {
         global $master_db_handle;
 
         // Try to get it from the database
-        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Position FROM Graph WHERE Plugin = ? AND Name = ?');
+        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Halfwidth, Position FROM Graph WHERE Plugin = ? AND Name = ?');
         $statement->execute(array($this->id, $name));
 
         if ($row = $statement->fetch())
         {
-            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale']);
+            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale'], $row['Halfwidth'] == 1);
         }
 
         if ($attemptedToCreate)
         {
             error_fquit('Failed to create graph for "' . $name . '"');
         }
 
-        $statement = $master_db_handle->prepare('INSERT INTO Graph (Plugin, Type, Name, DisplayName, Active, Readonly, Position)
-                                                            VALUES(:Plugin, :Type, :Name, :DisplayName, :Active, :Readonly, :Position)');
+        $statement = $master_db_handle->prepare('INSERT INTO Graph (Plugin, Type, Name, DisplayName, Active, Readonly, Halfwidth, Position)
+                                                            VALUES(:Plugin, :Type, :Name, :DisplayName, :Active, :Readonly, :Halfwidth, :Position)');
         $statement->execute(array(
             ':Plugin' => $this->id,
             ':Type' => $type,
             ':Name' => $name,
             ':DisplayName' => $name,
             ':Active' => $active,
             ':Readonly' => $readonly ? 1 : 0,
+            ':Halfwidth' => $halfwidth ? 1 : 0,
             ':Position' => $position
         ));
 
@@ -178,12 +179,12 @@ public function getGraphByName($name)
         global $master_db_handle;
 
         // Try to get it from the database
-        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Position FROM Graph WHERE Plugin = ? AND Name = ?');
+        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Halfwidth, Position FROM Graph WHERE Plugin = ? AND Name = ?');
         $statement->execute(array($this->id, $name));
 
         if ($row = $statement->fetch())
         {
-            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale']);
+            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale'], $row['Halfwidth'] == 1);
         }
 
         return NULL;
@@ -198,12 +199,12 @@ public function getGraph($id)
     {
         global $master_db_handle;
 
-        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Position FROM Graph WHERE ID = ?');
+        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Halfwidth, Position FROM Graph WHERE ID = ?');
         $statement->execute(array($id));
 
         if ($row = $statement->fetch())
         {
-            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale']);
+            return new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale'], $row['Halfwidth'] == 1);
         }
 
         return NULL;
@@ -220,12 +221,12 @@ public function getActiveGraphs()
         // The graphs to return
         $graphs = array();
 
-        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Position FROM Graph WHERE Plugin = ? AND Active = 1 ORDER BY Position ASC');
+        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active, Readonly, Name, DisplayName, Scale, Halfwidth, Position FROM Graph WHERE Plugin = ? AND Active = 1 ORDER BY Position ASC');
         $statement->execute(array($this->id));
 
         while ($row = $statement->fetch())
         {
-            $graphs[] = new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale']);
+            $graphs[] = new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale'], $row['Halfwidth'] == 1);
         }
 
         return $graphs;
@@ -242,12 +243,12 @@ public function getAllGraphs()
         // The graphs to return
         $graphs = array();
 
-        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active,Readonly,  Name, DisplayName, Scale, Position FROM Graph WHERE Plugin = ? ORDER BY Active DESC, Position ASC');
+        $statement = $master_db_handle->prepare('SELECT ID, Plugin, Type, Active,Readonly,  Name, DisplayName, Scale, Halfwidth, Position FROM Graph WHERE Plugin = ? ORDER BY Active DESC, Position ASC');
         $statement->execute(array($this->id));
 
         while ($row = $statement->fetch())
         {
-            $graphs[] = new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale']);
+            $graphs[] = new Graph($row['ID'], $this, $row['Type'], $row['Name'], $row['DisplayName'], $row['Active'], $row['Readonly'], $row['Position'], $row['Scale'], $row['Halfwidth'] == 1);
         }
 
         return $graphs;

www/mcstats.org/private_html/includes/func.php

@@ -113,14 +113,6 @@ function outputGraphs($plugin)
     /// Load all of the custom graphs for the plugin
     $activeGraphs = $plugin->getActiveGraphs();
 
-    // the 3 graphs to combine on the same row
-    // these graphs are expected to be together in similar order even if they are mixed up
-    $combineGraphs = array(
-        'Java Version', 'Operating System',
-        'System Arch', 'System Cores',
-        'Game Version', 'Server Software'
-    );
-
     /// Output a div for each one
     $index = 1;
     $floated = FALSE;
@@ -139,7 +131,7 @@ function outputGraphs($plugin)
         }
 
         $jsLoader = 'retrieveGraphData(CustomChart' . $index . 'Options, ' . ($activeGraph->getHighstocksClassName() == 'highcharts' ? 'HIGHCHARTS' : 'HIGHSTOCKS') . ', "' . $activeGraph->getFeedURL() . '");';
-        if (in_array($activeGraph->getName(), $combineGraphs))
+        if ($activeGraph->isHalfwidth())
         {
             $reset = FALSE;
             if (!$floated)

www/mcstats.org/public_html/admin/updateplugin.php

@@ -64,6 +64,7 @@
         $active = isset($_POST['active'][$graphID]) ? $_POST['active'][$graphID] : 0;
         $scale = $_POST['scale'][$graphID];
         $position = $_POST['position'][$graphID];
+        $halfwidth = isset($_POST['halfwidth'][$graphID]) ? $_POST['halfwidth'][$graphID] : 0;
 
         // Validate active
         if ($active != 0 && $active != 1)
@@ -91,6 +92,7 @@
         $graph->setType($type);
         $graph->setActive($active);
         $graph->setScale($scale);
+        $graph->setHalfwidth($halfwidth);
 
         // Save the graph
         $graph->save();

www/mcstats.org/public_html/admin/viewplugin.php

@@ -31,7 +31,7 @@
     $pluginName = htmlentities($plugin->getName());
     $encodedName = urlencode($pluginName);
 
-    $breadcrumbs = '<a href="/admin/">Administration</a> <a href="/admin/plugin/' . $encodedName . '/view" class="current">Edit Plugin: ' . $pluginName . '</a>';
+    $breadcrumbs = '<a href="/admin/">Administration</a> <a href="/plugin/' . $encodedName . '">Plugin: ' . $pluginName . '</a> <a href="/admin/plugin/' . $encodedName . '/view" class="current">Edit Plugin</a>';
 
     // If not........
     if (!$ajax)
@@ -156,6 +156,16 @@
                                 </div>
                             </div>
 
+                            <div class="control-group">
+                                <label class="control-label" for="' . $id . '-halfwidth">Half-width</label>
+
+                                <div class="controls">
+                                    <label class="checkbox">
+                                        <input type="checkbox" name="halfwidth[' . $id . ']" id="' . $id . '-halfwidth" value="1"' . ($graph->isHalfwidth() ? ' CHECKED' : '') . ($disabled ? ' disabled' : '') . '>
+                                    </label>
+                                </div>
+                            </div>
+
                             <div class="control-group">
                                 <label class="control-label" for="' . $id . '-scale">Scale</label>
 

www/mcstats.org/public_html/maintenance.php

@@ -30,7 +30,7 @@
 
 <div class="row-fluid">
     <div class="alert alert-info span6 offset3 center" style="text-align: center;">
-        MySQL is currently doing things it shouldn't. Stay tuned!
+        Some misc overnight maintenance is being done. Apologies for the inconvenience, this should only be a one-time thing.
     </div>
 </div>
 

www/mcstats.org/public_html/plugin.php

@@ -41,13 +41,20 @@
 $pluginName = htmlentities($plugin->getName());
 $encodedName = urlencode($pluginName); // encoded name, for use in signature url
 
+$more = '';
+
+if (is_loggedin() && in_array($plugin, get_accessible_plugins(false))) {
+    $more = '<li><a href="/admin/plugin/' . $encodedName . '/view">Edit in Admin Panel</a>';
+}
+
 /// Template hook
 $page_title = 'MCStats :: ' . $pluginName;
 $breadcrumbs = '<a href="/plugin/' . $encodedName . '" class="current">Plugin: ' . $pluginName . '</a>';
 $sidebar_more = '
                 <li class="submenu active open">
                     <a href="#"><i class="icon icon-star"></i> <span>Plugin: <strong>' . $pluginName . '</strong></span></a>
                     <ul>
+                        ' . $more . '
                         <li><a>Added on: <strong>' . date('F d, Y', $plugin->getCreated()) . '</strong></a></li>
                         <li><a>Rank held for: <strong>' . epochToHumanString(time() - $plugin->getLastRankChange(), FALSE) . '</strong></a></li>
                         <li><a>Global starts: <strong>' . number_format($plugin->getGlobalHits()) . '</strong></a></li>
@@ -116,7 +123,7 @@
     $statement = get_slave_db_handle()->prepare('select ColumnID, Sum from GraphData where Plugin = ? AND (ColumnID = ? OR ColumnID = ?) AND Epoch >= ? order by Epoch DESC limit 10');
 
     //
-    $statement->execute(array($plugin->getID(), $servers_column, $players_column, time() - SECONDS_IN_DAY));
+    $statement->execute(array($plugin->getID(), $servers_column, $players_column, time() - SECONDS_IN_DAY * 5));
     while ($row = $statement->fetch()) {
         if ($servers_column == $row['ColumnID']) {
             $servers_graph[] = $row['Sum'];

www/mcstats.org/public_html/reports.php

@@ -25,6 +25,11 @@
             $file = 'december_2012.php';
             $page_title = 'MCStats :: December 2012 Report';
             break;
+        case 'january-2013':
+            $name = 'January 2013';
+            $file = 'january_2013.php';
+            $page_title = 'MCStats :: January 2013 Report';
+            break;
     }
 
     if ($file == NULL) {