Upload files to 'classes'

classes/calendar.class.php

@@ -1,48 +1,50 @@
-<?
-class Calendar {
-  public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
-  public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
-  public static $Colors = array(
+<?php
+class Calendar
+{
+    public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
+    public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
+    public static $Colors = array(
                   "Critical" => "red",
                   "Important" => "yellow",
                   "Average" => "green",
                   "Meh" => "blue");
 
-  public static $Teams = array(
+    public static $Teams = array(
                   0 => "Everyone",
                   1 => "Staff"
 
                   );
 
-  public static function can_view() {
-    return check_perms('users_mod')
-
-      ;
-  }
-
-  private static function get_teams_query() {
-    $Teams = array(0);
-    $IsMod = check_perms("users_mod");
-    if ($IsMod) {
-      $Teams[] = 1;
+    public static function can_view()
+    {
+        return check_perms('users_mod');
     }
 
-    return "Team IN (" . implode(",", $Teams) . ") ";
-  }
+    private static function get_teams_query()
+    {
+        $Teams = array(0);
+        $IsMod = check_perms("users_mod");
+        if ($IsMod) {
+            $Teams[] = 1;
+        }
 
-  public static function get_events($Month, $Year) {
-    if (empty($Month) || empty($Year)) {
-      $Date = getdate();
-      $Month = $Date['mon'];
-      $Year = $Date['year'];
+        return "Team IN (" . implode(",", $Teams) . ") ";
     }
-    $Month = (int)$Month;
-    $Year = (int)$Year;
 
-    $TeamsSQL = self::get_teams_query();
+    public static function get_events($Month, $Year)
+    {
+        if (empty($Month) || empty($Year)) {
+            $Date = getdate();
+            $Month = $Date['mon'];
+            $Year = $Date['year'];
+        }
+        $Month = (int)$Month;
+        $Year = (int)$Year;
+
+        $TeamsSQL = self::get_teams_query();
 
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
             SELECT
               ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay
             FROM calendar
@@ -52,19 +54,20 @@ class Calendar {
               YEAR(StartDate) = '$Year'
             AND
               $TeamsSQL");
-    $Events = G::$DB->to_array();
-    G::$DB->set_query_id($QueryID);
-    return $Events;
-  }
-
-  public static function get_event($ID) {
-    $ID = (int)$ID;
-    if (empty($ID)) {
-      error("Invalid ID");
+        $Events = G::$DB->to_array();
+        G::$DB->set_query_id($QueryID);
+        return $Events;
     }
-    $TeamsSQL = self::get_teams_query();
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+
+    public static function get_event($ID)
+    {
+        $ID = (int)$ID;
+        if (empty($ID)) {
+            error("Invalid ID");
+        }
+        $TeamsSQL = self::get_teams_query();
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
             SELECT
               ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate
             FROM calendar
@@ -72,48 +75,50 @@ class Calendar {
               ID = '$ID'
             AND
               $TeamsSQL");
-    $Event = G::$DB->next_record(MYSQLI_ASSOC);
-    G::$DB->set_query_id($QueryID);
-    return $Event;
-  }
-
-  public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) {
-    if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
-      error("Error adding event");
+        $Event = G::$DB->next_record(MYSQLI_ASSOC);
+        G::$DB->set_query_id($QueryID);
+        return $Event;
     }
-    $Title = db_string($Title);
-    $Body = db_string($Body);
-    $Category = (int)$Category;
-    $Importance = (int)$Importance;
-    $UserID = (int)$UserID;
-    $Team = (int)$Team;
-    $StartDate = db_string($StartDate);
-    $EndDate = db_string($EndDate);
 
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null)
+    {
+        if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
+            error("Error adding event");
+        }
+        $Title = db_string($Title);
+        $Body = db_string($Body);
+        $Category = (int)$Category;
+        $Importance = (int)$Importance;
+        $UserID = (int)$UserID;
+        $Team = (int)$Team;
+        $StartDate = db_string($StartDate);
+        $EndDate = db_string($EndDate);
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
             INSERT INTO calendar
               (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy)
             VALUES
               ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')");
-    G::$DB->set_query_id($QueryID);
-    send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
-  }
-
-  public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) {
-    if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
-      error("Error updating event");
+        G::$DB->set_query_id($QueryID);
+        send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
     }
-    $ID = (int)$ID;
-    $Title = db_string($Title);
-    $Body = db_string($Body);
-    $Category = (int)$Category;
-    $Importance = (int)$Importance;
-    $Team = (int)$Team;
-    $StartDate = db_string($StartDate);
-    $EndDate = db_string($EndDate);
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+
+    public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null)
+    {
+        if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
+            error("Error updating event");
+        }
+        $ID = (int)$ID;
+        $Title = db_string($Title);
+        $Body = db_string($Body);
+        $Category = (int)$Category;
+        $Importance = (int)$Importance;
+        $Team = (int)$Team;
+        $StartDate = db_string($StartDate);
+        $EndDate = db_string($EndDate);
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
             UPDATE calendar
             SET
               Title = '$Title',
@@ -125,16 +130,16 @@ class Calendar {
               EndDate = '$EndDate'
             WHERE
               ID = '$ID'");
-    G::$DB->set_query_id($QueryID);
-  }
-
-  public static function remove_event($ID) {
-    $ID = (int)$ID;
-    if (!empty($ID)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
-      G::$DB->set_query_id($QueryID);
+        G::$DB->set_query_id($QueryID);
     }
-  }
 
+    public static function remove_event($ID)
+    {
+        $ID = (int)$ID;
+        if (!empty($ID)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
+            G::$DB->set_query_id($QueryID);
+        }
+    }
 }

classes/calendarview.class.php

@@ -1,119 +1,120 @@
-<?
+<?php
 
-class CalendarView {
-  private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
-  private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
-  private static $Events;
+class CalendarView
+{
+    private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
+    private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+    private static $Events;
 
-  public static function render_title($Month, $Year) {
-    if (!is_numeric($Month) || !is_numeric($Year)) {
-      error(404);
-    }
-    $NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
-    $PreviousMonth = $Month == 1 ? 12 : $Month - 1;
-    $NextYear = $Year;
-    if ($NextMonth == 1) {
-      $NextYear++;
-    }
-    $PreviousYear = $Year;
-    if ($PreviousMonth == 12) {
-      $PreviousYear--;
-    }
-?>
+    public static function render_title($Month, $Year)
+    {
+        if (!is_numeric($Month) || !is_numeric($Year)) {
+            error(404);
+        }
+        $NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
+        $PreviousMonth = $Month == 1 ? 12 : $Month - 1;
+        $NextYear = $Year;
+        if ($NextMonth == 1) {
+            $NextYear++;
+        }
+        $PreviousYear = $Year;
+        if ($PreviousMonth == 12) {
+            $PreviousYear--;
+        } ?>
     <h1 class="center">
       <a href="tools.php?action=calendar&amp;month=<?=$PreviousMonth?>&amp;year=<?=$PreviousYear?>">&lt;</a>
-      <?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
+        <?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
       <a href="tools.php?action=calendar&amp;month=<?=$NextMonth?>&amp;year=<?=$NextYear?>">&gt;</a>
     </h1>
     <input type="hidden" id="month" value="<?=$Month?>" />
     <input type="hidden" id="year" value="<?=$Year?>" />
-<?
-  }
+        <?php
+    }
 
-  private static function get_events_on($Day, $Events) {
-    // Linear search, Lol.
-    $Results = [];
-    foreach ($Events as $Event) {
-      if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
-        $Results[] = $Event;
-      }
+    private static function get_events_on($Day, $Events)
+    {
+        // Linear search, Lol.
+        $Results = [];
+        foreach ($Events as $Event) {
+            if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
+                $Results[] = $Event;
+            }
+        }
+        return $Results;
     }
-    return $Results;
-  }
 
 
-  private static function render_events_day($Day, $Events) {
-    $Events = self::get_events_on($Day, $Events);
-    foreach ($Events as $Event) {
-      $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
-      $Category = Calendar::$Categories[$Event['Category']];
-      $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']];
-?>
+    private static function render_events_day($Day, $Events)
+    {
+        $Events = self::get_events_on($Day, $Events);
+        foreach ($Events as $Event) {
+            $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
+            $Category = Calendar::$Categories[$Event['Category']];
+            $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']]; ?>
       <p><a href="#" class="event_day tooltip" title="<?=$Tooltip?>" data-gazelle-id="<?=$Event['ID']?>" style="color: <?=$Color?>;"><?=Format::cut_string($Event['Title'], 8, true)?></a></p>
-<?
+            <?php
+        }
     }
-  }
 
-  public static function render_calendar($Month, $Year, $Events) {
-    $RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
-    $DaysInMonth = date('t', mktime(0 ,0 ,0, $Month, 1, $Year));
-    $DaysThisWeek = 1;
-    $DayCounter = 0;
-    $DatesArray = [];
-?>
+    public static function render_calendar($Month, $Year, $Events)
+    {
+        $RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
+        $DaysInMonth = date('t', mktime(0, 0, 0, $Month, 1, $Year));
+        $DaysThisWeek = 1;
+        $DayCounter = 0;
+        $DatesArray = []; ?>
 
     <table class="calendar">
       <tr>
-<?    foreach (self::$Headings as $Heading) { ?>
+        <?php    foreach (self::$Headings as $Heading) { ?>
         <td class="calendar-row calendar-heading">
           <strong><?=$Heading?></strong>
         </td>
-<?    } ?>
+        <?php    } ?>
       </tr>
       <tr class="calendar-row">
 
-<?    for ($x = 0; $x < $RunningDay; $x++) { ?>
+        <?php    for ($x = 0; $x < $RunningDay; $x++) { ?>
         <td class="calendar-day-np"></td>
-<?
-      $DaysThisWeek++;
-    }
+            <?php
+              $DaysThisWeek++;
+        }
 
-    for ($i = 1; $i <= $DaysInMonth; $i++) {
-?>
+        for ($i = 1; $i <= $DaysInMonth; $i++) {
+            ?>
         <td class="calendar-day">
           <div class="day-events">
-<?            self::render_events_day($i, $Events); ?>
+            <?php            self::render_events_day($i, $Events); ?>
           </div>
           <div class="day-number">
             <?=$i?>
           </div>
         </td>
-<?      if ($RunningDay == 6) { ?>
+            <?php      if ($RunningDay == 6) { ?>
       </tr>
-<?        if (($DayCounter + 1) != $DaysInMonth) { ?>
+                <?php        if (($DayCounter + 1) != $DaysInMonth) { ?>
       <tr class="calendar-row">
-<?
+                    <?php
+                }
+                    $RunningDay = -1;
+                    $DaysThisWeek = 0;
+            }
+            $DaysThisWeek++;
+            $RunningDay++;
+            $DayCounter++;
         }
-        $RunningDay = -1;
-        $DaysThisWeek = 0;
-      }
-      $DaysThisWeek++;
-      $RunningDay++;
-      $DayCounter++;
-    }
 
-    if ($DaysThisWeek < 8) {
-      for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
-?>
+        if ($DaysThisWeek < 8) {
+            for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
+                ?>
         <td class="calendar-day-np"></td>
-<?
-      }
-    }
-?>
+                <?php
+            }
+        } ?>
       </tr>
 
     </table>
-<?
-    echo $Calendar;
-  }
+        <?php
+        echo $Calendar;
+    }
 }

classes/charts.class.php

@@ -1,193 +1,219 @@
-<?
-class GOOGLE_CHARTS {
-  protected $URL = 'https://chart.googleapis.com/chart';
-  protected $Labels = [];
-  protected $Data = [];
-  protected $Options = [];
-
-  public function __construct($Type, $Width, $Height, $Options) {
-    if ($Width * $Height > 300000 || $Height > 1000 || $Width > 1000) {
-      trigger_error('Tried to make chart too large.');
+<?php
+class GOOGLE_CHARTS
+{
+    protected $URL = 'https://chart.googleapis.com/chart';
+    protected $Labels = [];
+    protected $Data = [];
+    protected $Options = [];
+
+    public function __construct($Type, $Width, $Height, $Options)
+    {
+        if ($Width * $Height > 300000 || $Height > 1000 || $Width > 1000) {
+            trigger_error('Tried to make chart too large.');
+        }
+        $this->URL .= "?cht=$Type&amp;chs={$Width}x$Height";
+        $this->Options = $Options;
     }
-    $this->URL .= "?cht=$Type&amp;chs={$Width}x$Height";
-    $this->Options = $Options;
-  }
 
-  protected function encode($Number) {
-    if ($Number == -1) {
-      return '__';
+    protected function encode($Number)
+    {
+        if ($Number == -1) {
+            return '__';
+        }
+        $CharKey = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
+        return $CharKey[floor($Number / 64)].$CharKey[floor($Number % 64)];
     }
-    $CharKey = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
-    return $CharKey[floor($Number / 64)].$CharKey[floor($Number % 64)];
-  }
-
-  public function color($Colors) {
-    $this->URL .= '&amp;chco='.$Colors;
-  }
 
-  public function lines($Thickness, $Solid = 1, $Blank = 0) {
-    $this->URL .= "&amp;chls=$Thickness,$Solid,$Blank";
-  }
+    public function color($Colors)
+    {
+        $this->URL .= '&amp;chco='.$Colors;
+    }
 
-  public function title($Title, $Color = '', $Size = '') {
-    $this->URL .= '&amp;chtt='.str_replace(array(' ', "\n"), array('+', '|'), $Title);
-    if (!empty($Color)) {
-      $this->URL .= '&amp;chts='.$Color;
+    public function lines($Thickness, $Solid = 1, $Blank = 0)
+    {
+        $this->URL .= "&amp;chls=$Thickness,$Solid,$Blank";
     }
-    if (!empty($Size)) {
-      $this->URL .= ','.$Size;
+
+    public function title($Title, $Color = '', $Size = '')
+    {
+        $this->URL .= '&amp;chtt='.str_replace(array(' ', "\n"), array('+', '|'), $Title);
+        if (!empty($Color)) {
+            $this->URL .= '&amp;chts='.$Color;
+        }
+        if (!empty($Size)) {
+            $this->URL .= ','.$Size;
+        }
     }
-  }
 
-  public function legend($Items, $Placement = '') {
-    $this->URL .= '&amp;chdl='.str_replace(' ', '+', implode('|', $Items));
-    if (!empty($Placement)) {
-      if (!in_array($Placement, array('b', 't', 'r', 'l', 'bv', 'tv'))) {
-        trigger_error('Invalid legend placement.');
-      }
-      $this->URL .= '&amp;chdlp='.$Placement;
+    public function legend($Items, $Placement = '')
+    {
+        $this->URL .= '&amp;chdl='.str_replace(' ', '+', implode('|', $Items));
+        if (!empty($Placement)) {
+            if (!in_array($Placement, array('b', 't', 'r', 'l', 'bv', 'tv'))) {
+                trigger_error('Invalid legend placement.');
+            }
+            $this->URL .= '&amp;chdlp='.$Placement;
+        }
     }
-  }
 
-  public function add($Label, $Data) {
-    if ($Label !== false) {
-      $this->Labels[] = $Label;
+    public function add($Label, $Data)
+    {
+        if ($Label !== false) {
+            $this->Labels[] = $Label;
+        }
+        $this->Data[] = $Data;
     }
-    $this->Data[] = $Data;
-  }
 
-  public function grid_lines($SpacingX = 0, $SpacingY = -1, $Solid = 1, $Blank = 1) {
-    //Can take 2 more parameters for offset, but we're not bothering with that right now
-    $this->URL .= "&amp;chg=$SpacingX,$SpacingY,$Solid,$Blank";
-  }
+    public function grid_lines($SpacingX = 0, $SpacingY = -1, $Solid = 1, $Blank = 1)
+    {
+        //Can take 2 more parameters for offset, but we're not bothering with that right now
+        $this->URL .= "&amp;chg=$SpacingX,$SpacingY,$Solid,$Blank";
+    }
 
-  public function transparent() {
-    $this->URL .= '&amp;chf=bg,s,FFFFFF00';
-  }
+    public function transparent()
+    {
+        $this->URL .= '&amp;chf=bg,s,FFFFFF00';
+    }
 
 
-  public function url() {
-    return $this->URL;
-  }
+    public function url()
+    {
+        return $this->URL;
+    }
 }
 
-class AREA_GRAPH extends GOOGLE_CHARTS {
-  public function __construct ($Width, $Height, $Options = []) {
-    parent::__construct('lc', $Width, $Height, $Options);
-  }
+class AREA_GRAPH extends GOOGLE_CHARTS
+{
+    public function __construct($Width, $Height, $Options = [])
+    {
+        parent::__construct('lc', $Width, $Height, $Options);
+    }
 
-  public function color ($Color) {
-    $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
-  }
+    public function color($Color)
+    {
+        $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
+    }
 
-  public function generate() {
-    $Max = max($this->Data);
-    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-    $Data = [];
-    foreach ($this->Data as $Value) {
-      $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+    public function generate()
+    {
+        $Max = max($this->Data);
+        $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+        $Data = [];
+        foreach ($this->Data as $Value) {
+            $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+        }
+        $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max - $Min).'&amp;chd=e:'.implode('', $Data);
     }
-    $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max - $Min).'&amp;chd=e:'.implode('', $Data);
-  }
 }
 
-class PIE_CHART extends GOOGLE_CHARTS {
-  public function __construct ($Width, $Height, $Options = []) {
-    $Type = ((isset($this->Options['3D'])) ? 'p3' : 'p');
-    parent::__construct($Type, $Width, $Height, $Options);
-  }
-
-  public function generate() {
-    $Sum = array_sum($this->Data);
-    $Other = isset($this->Options['Other']);
-    $Sort = isset($this->Options['Sort']);
-    $LabelPercent = isset($this->Options['Percentage']);
-
-    if ($Sort && !empty($this->Labels)) {
-      array_multisort($this->Data, SORT_DESC, $this->Labels);
-    } elseif ($Sort) {
-      sort($this->Data);
-      $this->Data = array_reverse($this->Data);
-    }
-
-    $Data = [];
-    $Labels = $this->Labels;
-    $OtherPercentage = 0.00;
-    $OtherData = 0;
-
-    foreach ($this->Data as $Key => $Value) {
-      $ThisPercentage = number_format(($Value / $Sum) * 100, 2);
-      $ThisData = ($Value / $Sum) * 4095;
-      if ($Other && $ThisPercentage < 1) {
-        $OtherPercentage += $ThisPercentage;
-        $OtherData += $ThisData;
-        unset($Data[$Key]);
-        unset($Labels[$Key]);
-        continue;
-      }
-      if ($LabelPercent) {
-        $Labels[$Key] .= ' ('.$ThisPercentage.'%)';
-      }
-      $Data[] = $this->encode($ThisData);
-    }
-    if ($OtherPercentage > 0) {
-      $OtherLabel = 'Other';
-      if ($LabelPercent) {
-        $OtherLabel .= ' ('.$OtherPercentage.'%)';
-      }
-      $Labels[] = $OtherLabel;
-      $Data[] = $this->encode($OtherData);
-    }
-    $this->URL .= "&amp;chl=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
-  }
+class PIE_CHART extends GOOGLE_CHARTS
+{
+    public function __construct($Width, $Height, $Options = [])
+    {
+        $Type = ((isset($this->Options['3D'])) ? 'p3' : 'p');
+        parent::__construct($Type, $Width, $Height, $Options);
+    }
+
+    public function generate()
+    {
+        $Sum = array_sum($this->Data);
+        $Other = isset($this->Options['Other']);
+        $Sort = isset($this->Options['Sort']);
+        $LabelPercent = isset($this->Options['Percentage']);
+
+        if ($Sort && !empty($this->Labels)) {
+            array_multisort($this->Data, SORT_DESC, $this->Labels);
+        } elseif ($Sort) {
+            sort($this->Data);
+            $this->Data = array_reverse($this->Data);
+        }
+
+        $Data = [];
+        $Labels = $this->Labels;
+        $OtherPercentage = 0.00;
+        $OtherData = 0;
+
+        foreach ($this->Data as $Key => $Value) {
+            $ThisPercentage = number_format(($Value / $Sum) * 100, 2);
+            $ThisData = ($Value / $Sum) * 4095;
+            if ($Other && $ThisPercentage < 1) {
+                $OtherPercentage += $ThisPercentage;
+                $OtherData += $ThisData;
+                unset($Data[$Key]);
+                unset($Labels[$Key]);
+                continue;
+            }
+            if ($LabelPercent) {
+                $Labels[$Key] .= ' ('.$ThisPercentage.'%)';
+            }
+            $Data[] = $this->encode($ThisData);
+        }
+        if ($OtherPercentage > 0) {
+            $OtherLabel = 'Other';
+            if ($LabelPercent) {
+                $OtherLabel .= ' ('.$OtherPercentage.'%)';
+            }
+            $Labels[] = $OtherLabel;
+            $Data[] = $this->encode($OtherData);
+        }
+        $this->URL .= "&amp;chl=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
+    }
 }
 
 
-class LOG_BAR_GRAPH extends GOOGLE_CHARTS {
-  //TODO: Finish.
-  public function __construct ($Base, $Width, $Height, $Options = []) {
-    parent::__construct('lc', $Width, $Height, $Options);
-  }
+class LOG_BAR_GRAPH extends GOOGLE_CHARTS
+{
+    //TODO: Finish.
+    public function __construct($Base, $Width, $Height, $Options = [])
+    {
+        parent::__construct('lc', $Width, $Height, $Options);
+    }
 
-  public function color ($Color) {
-    $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
-  }
+    public function color($Color)
+    {
+        $this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
+    }
 
-  public function generate() {
-    $Max = max($this->Data);
-    $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
-    $Data = [];
-    foreach ($this->Data as $Value) {
-      $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+    public function generate()
+    {
+        $Max = max($this->Data);
+        $Min = ((isset($this->Options['Break'])) ? $Min = min($this->Data) : 0);
+        $Data = [];
+        foreach ($this->Data as $Value) {
+            $Data[] = $this->encode((($Value - $Min) / ($Max - $Min)) * 4095);
+        }
+        $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max-$Min).'&amp;chd=e:'.implode('', $Data);
     }
-    $this->URL .= "&amp;chxt=y,x&amp;chxs=0,h&amp;chxl=1:|".implode('|', $this->Labels).'&amp;chxr=0,'.$Min.','.($Max-$Min).'&amp;chd=e:'.implode('', $Data);
-  }
 }
 
-class POLL_GRAPH extends GOOGLE_CHARTS {
-  public function __construct () {
-    $this->URL .= '?cht=bhg';
-  }
-
-  public function add($Label, $Data) {
-    if ($Label !== false) {
-      $this->Labels[] = Format::cut_string($Label, 35);
-    }
-    $this->Data[] = $Data;
-  }
-
-  public function generate() {
-    $Count = count($this->Data);
-    $Height = (30 * $Count) + 20;
-    $Max = max($this->Data);
-    $Sum = array_sum($this->Data);
-    $Increment = ($Max / $Sum) * 25; // * 100% / 4divisions
-    $Data = [];
-    $Labels = [];
-    foreach ($this->Data as $Key => $Value) {
-      $Data[] = $this->encode(($Value / $Max) * 4095);
-      $Labels[] = '@t'.str_replace(array(' ', ','),array('+', '\,'), $this->Labels[$Key]).',000000,1,'.round((($Key + 1) / $Count) - (12 / $Height), 2).':0,12';
-    }
-    $this->URL .= "&amp;chbh=25,0,5&amp;chs=214x$Height&amp;chl=0%|".round($Increment, 1)."%|".round($Increment * 2, 1)."%|".round($Increment * 3, 1)."%|".round($Increment * 4, 1)."%&amp;chm=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
-  }
+class POLL_GRAPH extends GOOGLE_CHARTS
+{
+    public function __construct()
+    {
+        $this->URL .= '?cht=bhg';
+    }
+
+    public function add($Label, $Data)
+    {
+        if ($Label !== false) {
+            $this->Labels[] = Format::cut_string($Label, 35);
+        }
+        $this->Data[] = $Data;
+    }
+
+    public function generate()
+    {
+        $Count = count($this->Data);
+        $Height = (30 * $Count) + 20;
+        $Max = max($this->Data);
+        $Sum = array_sum($this->Data);
+        $Increment = ($Max / $Sum) * 25; // * 100% / 4divisions
+        $Data = [];
+        $Labels = [];
+        foreach ($this->Data as $Key => $Value) {
+            $Data[] = $this->encode(($Value / $Max) * 4095);
+            $Labels[] = '@t'.str_replace(array(' ', ','), array('+', '\,'), $this->Labels[$Key]).',000000,1,'.round((($Key + 1) / $Count) - (12 / $Height), 2).':0,12';
+        }
+        $this->URL .= "&amp;chbh=25,0,5&amp;chs=214x$Height&amp;chl=0%|".round($Increment, 1)."%|".round($Increment * 2, 1)."%|".round($Increment * 3, 1)."%|".round($Increment * 4, 1)."%&amp;chm=".implode('|', $Labels).'&amp;chd=e:'.implode('', $Data);
+    }
 }

classes/classloader.php

@@ -1,35 +1,35 @@
-<?
+<?php
 /**
  * Load classes automatically when they're needed
  *
  * @param string $ClassName class name
  */
 spl_autoload_register(function ($ClassName) {
-  $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
-  if (!file_exists($FilePath)) {
-    // TODO: Rename the following classes to conform with the code guidelines
-    switch ($ClassName) {
-      case 'MASS_USER_BOOKMARKS_EDITOR':
-        $FileName = 'mass_user_bookmarks_editor.class';
-        break;
-      case 'MASS_USER_TORRENTS_EDITOR':
-        $FileName = 'mass_user_torrents_editor.class';
-        break;
-      case 'MASS_USER_TORRENTS_TABLE_VIEW':
-        $FileName = 'mass_user_torrents_table_view.class';
-          break;
-      case 'TEXTAREA_PREVIEW':
-        $FileName = 'textarea_preview.class';
-        break;
-      case 'TORRENT':
-      case 'BENCODE_DICT':
-      case 'BENCODE_LIST':
-        $FileName = 'torrent.class';
-        break;
-      default:
-        die("Couldn't import class $ClassName");
+    $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
+    if (!file_exists($FilePath)) {
+        // TODO: Rename the following classes to conform with the code guidelines
+        switch ($ClassName) {
+            case 'MASS_USER_BOOKMARKS_EDITOR':
+                $FileName = 'mass_user_bookmarks_editor.class';
+                break;
+            case 'MASS_USER_TORRENTS_EDITOR':
+                $FileName = 'mass_user_torrents_editor.class';
+                break;
+            case 'MASS_USER_TORRENTS_TABLE_VIEW':
+                $FileName = 'mass_user_torrents_table_view.class';
+                break;
+            case 'TEXTAREA_PREVIEW':
+                $FileName = 'textarea_preview.class';
+                break;
+            case 'TORRENT':
+            case 'BENCODE_DICT':
+            case 'BENCODE_LIST':
+                $FileName = 'torrent.class';
+                break;
+            default:
+                die("Couldn't import class $ClassName");
+        }
+        $FilePath = SERVER_ROOT . "/classes/$FileName.php";
     }
-    $FilePath = SERVER_ROOT . "/classes/$FileName.php";
-  }
-  require_once($FilePath);
+    require_once($FilePath);
 });

classes/collages.class.php

@@ -1,48 +1,52 @@
-<?
-class Collages {
-  public static function increase_subscriptions($CollageID) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+<?php
+class Collages
+{
+    public static function increase_subscriptions($CollageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       UPDATE collages
       SET Subscribers = Subscribers + 1
       WHERE ID = '$CollageID'");
-    G::$DB->set_query_id($QueryID);
-  }
+        G::$DB->set_query_id($QueryID);
+    }
 
-  public static function decrease_subscriptions($CollageID) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function decrease_subscriptions($CollageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       UPDATE collages
       SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1)
       WHERE ID = '$CollageID'");
-    G::$DB->set_query_id($QueryID);
-  }
+        G::$DB->set_query_id($QueryID);
+    }
 
-  public static function create_personal_collage() {
-    G::$DB->query("
+    public static function create_personal_collage()
+    {
+        G::$DB->query("
       SELECT
         COUNT(ID)
       FROM collages
       WHERE UserID = '" . G::$LoggedUser['ID'] . "'
         AND CategoryID = '0'
         AND Deleted = '0'");
-    list($CollageCount) = G::$DB->next_record();
+        list($CollageCount) = G::$DB->next_record();
 
-    if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
-      // TODO: fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
-      list($CollageID) = G::$DB->next_record();
-      header('Location: collage.php?id='.$CollageID);
-      die();
-    }
-    $NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
-    $Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
-    G::$DB->query("
+        if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
+            // TODO: fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
+            list($CollageID) = G::$DB->next_record();
+            header('Location: collage.php?id='.$CollageID);
+            die();
+        }
+        $NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
+        $Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
+        G::$DB->query("
       INSERT INTO collages
         (Name, Description, CategoryID, UserID)
       VALUES
         ('$NameStr', '$Description', '0', " . G::$LoggedUser['ID'] . ")");
-    $CollageID = G::$DB->inserted_id();
-    header('Location: collage.php?id='.$CollageID);
-    die();
-  }
+        $CollageID = G::$DB->inserted_id();
+        header('Location: collage.php?id='.$CollageID);
+        die();
+    }
 }