Upload files to 'classes'

classes/mysql.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 //-----------------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////
 /*//-- MySQL wrapper class ----------------------------------------------------------
@@ -116,333 +116,358 @@ set_query_id($ResultSet)
 *///---------------------------------------------------------------------------------
 
 if (!extension_loaded('mysqli')) {
-  die('Mysqli Extension not loaded.');
+    die('Mysqli Extension not loaded.');
 }
 
 //Handles escaping
-function db_string($String, $DisableWildcards = false) {
-  global $DB;
-  //Escape
-  $String = $DB->escape_str($String);
-  //Remove user input wildcards
-  if ($DisableWildcards) {
-    $String = str_replace(array('%','_'), array('\%','\_'), $String);
-  }
-  return $String;
+function db_string($String, $DisableWildcards = false)
+{
+    global $DB;
+    //Escape
+    $String = $DB->escape_str($String);
+    //Remove user input wildcards
+    if ($DisableWildcards) {
+        $String = str_replace(array('%','_'), array('\%','\_'), $String);
+    }
+    return $String;
 }
 
-function db_array($Array, $DontEscape = [], $Quote = false) {
-  foreach ($Array as $Key => $Val) {
-    if (!in_array($Key, $DontEscape)) {
-      if ($Quote) {
-        $Array[$Key] = '\''.db_string(trim($Val)).'\'';
-      } else {
-        $Array[$Key] = db_string(trim($Val));
-      }
+function db_array($Array, $DontEscape = [], $Quote = false)
+{
+    foreach ($Array as $Key => $Val) {
+        if (!in_array($Key, $DontEscape)) {
+            if ($Quote) {
+                $Array[$Key] = '\''.db_string(trim($Val)).'\'';
+            } else {
+                $Array[$Key] = db_string(trim($Val));
+            }
+        }
     }
-  }
-  return $Array;
+    return $Array;
 }
 
 //TODO: revisit access levels once Drone is replaced by ZeRobot
-class DB_MYSQL {
-  public $LinkID = false;
-  protected $QueryID = false;
-  protected $StatementID = false;
-  protected $PreparedQuery = false;
-  protected $Record = [];
-  protected $Row;
-  protected $Errno = 0;
-  protected $Error = '';
-
-  public $Queries = [];
-  public $Time = 0.0;
-
-  protected $Database = '';
-  protected $Server = '';
-  protected $User = '';
-  protected $Pass = '';
-  protected $Port = 0;
-  protected $Socket = '';
-
-  function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) {
-    $this->Database = $Database;
-    $this->Server = $Server;
-    $this->User = $User;
-    $this->Pass = $Pass;
-    $this->Port = $Port;
-    $this->Socket = $Socket;
-  }
-
-  function halt($Msg) {
-    global $Debug, $argv;
-    $DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
-    if ($this->Errno == 1194) {
-      send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error);
+class DB_MYSQL
+{
+    public $LinkID = false;
+    protected $QueryID = false;
+    protected $StatementID = false;
+    protected $PreparedQuery = false;
+    protected $Record = [];
+    protected $Row;
+    protected $Errno = 0;
+    protected $Error = '';
+
+    public $Queries = [];
+    public $Time = 0.0;
+
+    protected $Database = '';
+    protected $Server = '';
+    protected $User = '';
+    protected $Pass = '';
+    protected $Port = 0;
+    protected $Socket = '';
+
+    public function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK)
+    {
+        $this->Database = $Database;
+        $this->Server = $Server;
+        $this->User = $User;
+        $this->Pass = $Pass;
+        $this->Port = $Port;
+        $this->Socket = $Socket;
     }
-    $Debug->analysis('!dev DB Error', $DBError, 3600 * 24);
-    if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) {
-      echo '<pre>'.display_str($DBError).'</pre>';
-      if (DEBUG_MODE || check_perms('site_debug')) {
-        print_r($this->Queries);
-      }
-      die();
-    } else {
-      error('-1');
+
+    public function halt($Msg)
+    {
+        global $Debug, $argv;
+        $DBError = 'MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
+        if ($this->Errno == 1194) {
+            send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error);
+        }
+        $Debug->analysis('!dev DB Error', $DBError, 3600 * 24);
+        if (DEBUG_MODE || check_perms('site_debug') || isset($argv[1])) {
+            echo '<pre>'.display_str($DBError).'</pre>';
+            if (DEBUG_MODE || check_perms('site_debug')) {
+                print_r($this->Queries);
+            }
+            die();
+        } else {
+            error('-1');
+        }
     }
-  }
-
-  function connect() {
-    if (!$this->LinkID) {
-      $this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php
-      if (!$this->LinkID) {
-        $this->Errno = mysqli_connect_errno();
-        $this->Error = mysqli_connect_error();
-        $this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')');
-      }
+
+    public function connect()
+    {
+        if (!$this->LinkID) {
+            $this->LinkID = mysqli_connect($this->Server, $this->User, $this->Pass, $this->Database, $this->Port, $this->Socket); // defined in config.php
+            if (!$this->LinkID) {
+                $this->Errno = mysqli_connect_errno();
+                $this->Error = mysqli_connect_error();
+                $this->halt('Connection failed (host:'.$this->Server.':'.$this->Port.')');
+            }
+        }
+        mysqli_set_charset($this->LinkID, "utf8mb4");
     }
-    mysqli_set_charset($this->LinkID, "utf8mb4");
-  }
-
-  function prepare_query($Query, &...$BindVars) {
-    $this->connect();
-
-    $this->StatementID = mysqli_prepare($this->LinkID, $Query);
-    if (!empty($BindVars)) {
-      $Types = '';
-      $TypeMap = ['string'=>'s', 'double'=>'d', 'integer'=>'i', 'boolean'=>'i'];
-      foreach ($BindVars as $BindVar) {
-        $Types .= $TypeMap[gettype($BindVar)] ?? 'b';
-      }
-      mysqli_stmt_bind_param($this->StatementID, $Types, ...$BindVars);
+
+    public function prepare_query($Query, &...$BindVars)
+    {
+        $this->connect();
+
+        $this->StatementID = mysqli_prepare($this->LinkID, $Query);
+        if (!empty($BindVars)) {
+            $Types = '';
+            $TypeMap = ['string'=>'s', 'double'=>'d', 'integer'=>'i', 'boolean'=>'i'];
+            foreach ($BindVars as $BindVar) {
+                $Types .= $TypeMap[gettype($BindVar)] ?? 'b';
+            }
+            mysqli_stmt_bind_param($this->StatementID, $Types, ...$BindVars);
+        }
+        $this->PreparedQuery = $Query;
+        return $this->StatementID;
     }
-    $this->PreparedQuery = $Query;
-    return $this->StatementID;
-  }
-
-  function exec_prepared_query() {
-    $QueryStartTime = microtime(true);
-    mysqli_stmt_execute($this->StatementID);
-    $this->QueryID = mysqli_stmt_get_result($this->StatementID);
-    $QueryRunTime = (microtime(true) - $QueryStartTime) * 1000;
-    $this->Queries[] = [$this->PreppedQuery, $QueryRunTime, null];
-    $this->Time += $QueryRunTime;
-  }
-
-  function query($Query, &...$BindVars) {
-    global $Debug;
-    /*
-     * If there was a previous query, we store the warnings. We cannot do
-     * this immediately after mysqli_query because mysqli_insert_id will
-     * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS;
-     * query. When sending a query, however, we're sure that we won't call
-     * mysqli_insert_id (or any similar function, for that matter) later on,
-     * so we can safely get the warnings without breaking things.
-     * Note that this means that we have to call $this->warnings manually
-     * for the last query!
-     */
-    if ($this->QueryID) {
-      $this->warnings();
+
+    public function exec_prepared_query()
+    {
+        $QueryStartTime = microtime(true);
+        mysqli_stmt_execute($this->StatementID);
+        $this->QueryID = mysqli_stmt_get_result($this->StatementID);
+        $QueryRunTime = (microtime(true) - $QueryStartTime) * 1000;
+        $this->Queries[] = [$this->PreppedQuery, $QueryRunTime, null];
+        $this->Time += $QueryRunTime;
     }
-    $QueryStartTime = microtime(true);
-    $this->connect();
-
-    // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
-    for ($i = 1; $i < 6; $i++) {
-      $this->StatementID = mysqli_prepare($this->LinkID, $Query);
-      if (!empty($BindVars)) {
-        $Types = '';
-        $TypeMap = ['string'=>'s', 'double'=>'d', 'integer'=>'i', 'boolean'=>'i'];
-        foreach ($BindVars as $BindVar) {
-          $Types .= $TypeMap[gettype($BindVar)] ?? 'b';
+
+    public function query($Query, &...$BindVars)
+    {
+        global $Debug;
+        /*
+         * If there was a previous query, we store the warnings. We cannot do
+         * this immediately after mysqli_query because mysqli_insert_id will
+         * break otherwise due to mysqli_get_warnings sending a SHOW WARNINGS;
+         * query. When sending a query, however, we're sure that we won't call
+         * mysqli_insert_id (or any similar function, for that matter) later on,
+         * so we can safely get the warnings without breaking things.
+         * Note that this means that we have to call $this->warnings manually
+         * for the last query!
+         */
+        if ($this->QueryID) {
+            $this->warnings();
         }
-        mysqli_stmt_bind_param($this->StatementID, $Types, ...$BindVars);
-      }
-      mysqli_stmt_execute($this->StatementID);
-      $this->QueryID = mysqli_stmt_get_result($this->StatementID);
-
-      if (DEBUG_MODE) {
-        // in DEBUG_MODE, return the full trace on a SQL error (super useful
-        // for debugging). do not attempt to retry to query
-        if (!$this->QueryID) {
-          echo '<pre>' . mysqli_error($this->LinkID) . '<br><br>';
-          debug_print_backtrace();
-          echo '</pre>';
-          die();
+        $QueryStartTime = microtime(true);
+        $this->connect();
+
+        // In the event of a MySQL deadlock, we sleep allowing MySQL time to unlock, then attempt again for a maximum of 5 tries
+        for ($i = 1; $i < 6; $i++) {
+            $this->StatementID = mysqli_prepare($this->LinkID, $Query);
+            if (!empty($BindVars)) {
+                $Types = '';
+                $TypeMap = ['string'=>'s', 'double'=>'d', 'integer'=>'i', 'boolean'=>'i'];
+                foreach ($BindVars as $BindVar) {
+                    $Types .= $TypeMap[gettype($BindVar)] ?? 'b';
+                }
+                mysqli_stmt_bind_param($this->StatementID, $Types, ...$BindVars);
+            }
+            mysqli_stmt_execute($this->StatementID);
+            $this->QueryID = mysqli_stmt_get_result($this->StatementID);
+
+            if (DEBUG_MODE) {
+                // in DEBUG_MODE, return the full trace on a SQL error (super useful
+                // for debugging). do not attempt to retry to query
+                if (!$this->QueryID) {
+                    echo '<pre>' . mysqli_error($this->LinkID) . '<br><br>';
+                    debug_print_backtrace();
+                    echo '</pre>';
+                    die();
+                }
+            }
+
+            if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
+                break;
+            }
+            $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
+            trigger_error("Database deadlock, attempt $i");
+
+            sleep($i * rand(2, 5)); // Wait longer as attempts increase
         }
-      }
 
-      if (!in_array(mysqli_errno($this->LinkID), array(1213, 1205))) {
-        break;
-      }
-      $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
-      trigger_error("Database deadlock, attempt $i");
+        $QueryEndTime = microtime(true);
+        $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
+        $this->Time += ($QueryEndTime - $QueryStartTime) * 1000;
+
+        if (!$this->QueryID && !$this->StatementID) {
+            $this->Errno = mysqli_errno($this->LinkID);
+            $this->Error = mysqli_error($this->LinkID);
+            $this->halt("Invalid Query: $Query");
+        }
 
-      sleep($i * rand(2, 5)); // Wait longer as attempts increase
+        $this->Row = 0;
+        return $this->QueryID;
     }
 
-    $QueryEndTime = microtime(true);
-    $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
-    $this->Time += ($QueryEndTime - $QueryStartTime) * 1000;
+    public function query_unb($Query)
+    {
+        $this->connect();
+        mysqli_real_query($this->LinkID, $Query);
+    }
 
-    if (!$this->QueryID && !$this->StatementID) {
-      $this->Errno = mysqli_errno($this->LinkID);
-      $this->Error = mysqli_error($this->LinkID);
-      $this->halt("Invalid Query: $Query");
+    public function inserted_id()
+    {
+        if ($this->LinkID) {
+            return mysqli_insert_id($this->LinkID);
+        }
     }
 
-    $this->Row = 0;
-    return $this->QueryID;
-  }
+    public function next_record($Type = MYSQLI_BOTH, $Escape = true)
+    {
+        // $Escape can be true, false, or an array of keys to not escape
+        if ($this->LinkID) {
+            $this->Record = mysqli_fetch_array($this->QueryID, $Type);
+            $this->Row++;
+            if (!is_array($this->Record)) {
+                $this->QueryID = false;
+            } elseif ($Escape !== false) {
+                $this->Record = Misc::display_array($this->Record, $Escape);
+            }
+            return $this->Record;
+        }
+    }
 
-  function query_unb($Query) {
-    $this->connect();
-    mysqli_real_query($this->LinkID, $Query);
-  }
+    public function close()
+    {
+        if ($this->LinkID) {
+            if (!mysqli_close($this->LinkID)) {
+                $this->halt('Cannot close connection or connection did not open.');
+            }
+            $this->LinkID = false;
+        }
+    }
 
-  function inserted_id() {
-    if ($this->LinkID) {
-      return mysqli_insert_id($this->LinkID);
+    /*
+     * returns an integer with the number of rows found
+     * returns a string if the number of rows found exceeds MAXINT
+     */
+    public function record_count()
+    {
+        if ($this->QueryID) {
+            return mysqli_num_rows($this->QueryID);
+        }
     }
-  }
-
-  function next_record($Type = MYSQLI_BOTH, $Escape = true) { // $Escape can be true, false, or an array of keys to not escape
-    if ($this->LinkID) {
-      $this->Record = mysqli_fetch_array($this->QueryID, $Type);
-      $this->Row++;
-      if (!is_array($this->Record)) {
-        $this->QueryID = false;
-      } elseif ($Escape !== false) {
-        $this->Record = Misc::display_array($this->Record, $Escape);
-      }
-      return $this->Record;
+
+    /*
+     * returns true if the query exists and there were records found
+     * returns false if the query does not exist or if there were 0 records returned
+     */
+    public function has_results()
+    {
+        return ($this->QueryID && $this->record_count() !== 0);
     }
-  }
-
-  function close() {
-    if ($this->LinkID) {
-      if (!mysqli_close($this->LinkID)) {
-        $this->halt('Cannot close connection or connection did not open.');
-      }
-      $this->LinkID = false;
+
+    public function affected_rows()
+    {
+        if ($this->LinkID) {
+            return mysqli_affected_rows($this->LinkID);
+        }
+    }
+
+    public function info()
+    {
+        return mysqli_get_host_info($this->LinkID);
+    }
+
+    // You should use db_string() instead.
+    public function escape_str($Str)
+    {
+        $this->connect(0);
+        if (is_array($Str)) {
+            trigger_error('Attempted to escape array.');
+            return '';
+        }
+        return mysqli_real_escape_string($this->LinkID, $Str);
     }
-  }
-
-  /*
-   * returns an integer with the number of rows found
-   * returns a string if the number of rows found exceeds MAXINT
-   */
-  function record_count() {
-    if ($this->QueryID) {
-      return mysqli_num_rows($this->QueryID);
+
+    // Creates an array from a result set
+    // If $Key is set, use the $Key column in the result set as the array key
+    // Otherwise, use an integer
+    public function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true)
+    {
+        $Return = [];
+        while ($Row = mysqli_fetch_array($this->QueryID, $Type)) {
+            if ($Escape !== false) {
+                $Row = Misc::display_array($Row, $Escape);
+            }
+            if ($Key !== false) {
+                $Return[$Row[$Key]] = $Row;
+            } else {
+                $Return[] = $Row;
+            }
+        }
+        mysqli_data_seek($this->QueryID, 0);
+        return $Return;
     }
-  }
-
-  /*
-   * returns true if the query exists and there were records found
-   * returns false if the query does not exist or if there were 0 records returned
-   */
-  function has_results() {
-    return ($this->QueryID && $this->record_count() !== 0);
-  }
-
-  function affected_rows() {
-    if ($this->LinkID) {
-      return mysqli_affected_rows($this->LinkID);
+
+    //  Loops through the result set, collecting the $ValField column into an array with $KeyField as keys
+    public function to_pair($KeyField, $ValField, $Escape = true)
+    {
+        $Return = [];
+        while ($Row = mysqli_fetch_array($this->QueryID)) {
+            if ($Escape) {
+                $Key = display_str($Row[$KeyField]);
+                $Val = display_str($Row[$ValField]);
+            } else {
+                $Key = $Row[$KeyField];
+                $Val = $Row[$ValField];
+            }
+            $Return[$Key] = $Val;
+        }
+        mysqli_data_seek($this->QueryID, 0);
+        return $Return;
     }
-  }
-
-  function info() {
-    return mysqli_get_host_info($this->LinkID);
-  }
-
-  // You should use db_string() instead.
-  function escape_str($Str) {
-    $this->connect(0);
-    if (is_array($Str)) {
-      trigger_error('Attempted to escape array.');
-      return '';
+
+    //  Loops through the result set, collecting the $Key column into an array
+    public function collect($Key, $Escape = true)
+    {
+        $Return = [];
+        while ($Row = mysqli_fetch_array($this->QueryID)) {
+            $Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key];
+        }
+        mysqli_data_seek($this->QueryID, 0);
+        return $Return;
     }
-    return mysqli_real_escape_string($this->LinkID, $Str);
-  }
-
-  // Creates an array from a result set
-  // If $Key is set, use the $Key column in the result set as the array key
-  // Otherwise, use an integer
-  function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
-    $Return = [];
-    while ($Row = mysqli_fetch_array($this->QueryID, $Type)) {
-      if ($Escape !== false) {
-        $Row = Misc::display_array($Row, $Escape);
-      }
-      if ($Key !== false) {
-        $Return[$Row[$Key]] = $Row;
-      } else {
-        $Return[] = $Row;
-      }
+
+    public function set_query_id(&$ResultSet)
+    {
+        $this->QueryID = $ResultSet;
+        $this->Row = 0;
     }
-    mysqli_data_seek($this->QueryID, 0);
-    return $Return;
-  }
-
-  //  Loops through the result set, collecting the $ValField column into an array with $KeyField as keys
-  function to_pair($KeyField, $ValField, $Escape = true) {
-    $Return = [];
-    while ($Row = mysqli_fetch_array($this->QueryID)) {
-      if ($Escape) {
-        $Key = display_str($Row[$KeyField]);
-        $Val = display_str($Row[$ValField]);
-      } else {
-        $Key = $Row[$KeyField];
-        $Val = $Row[$ValField];
-      }
-      $Return[$Key] = $Val;
+
+    public function get_query_id()
+    {
+        return $this->QueryID;
     }
-    mysqli_data_seek($this->QueryID, 0);
-    return $Return;
-  }
-
-  //  Loops through the result set, collecting the $Key column into an array
-  function collect($Key, $Escape = true) {
-    $Return = [];
-    while ($Row = mysqli_fetch_array($this->QueryID)) {
-      $Return[] = $Escape ? display_str($Row[$Key]) : $Row[$Key];
+
+    public function beginning()
+    {
+        mysqli_data_seek($this->QueryID, 0);
+        $this->Row = 0;
     }
-    mysqli_data_seek($this->QueryID, 0);
-    return $Return;
-  }
-
-  function set_query_id(&$ResultSet) {
-    $this->QueryID = $ResultSet;
-    $this->Row = 0;
-  }
-
-  function get_query_id() {
-    return $this->QueryID;
-  }
-
-  function beginning() {
-    mysqli_data_seek($this->QueryID, 0);
-    $this->Row = 0;
-  }
-
-  /**
-   * This function determines whether the last query caused warning messages
-   * and stores them in $this->Queries.
-   */
-  function warnings() {
-    $Warnings = [];
-    if (!is_bool($this->LinkID) && mysqli_warning_count($this->LinkID)) {
-      $e = mysqli_get_warnings($this->LinkID);
-      do {
-        if ($e->errno == 1592) {
-          // 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.
-          continue;
+
+    /**
+     * This function determines whether the last query caused warning messages
+     * and stores them in $this->Queries.
+     */
+    public function warnings()
+    {
+        $Warnings = [];
+        if (!is_bool($this->LinkID) && mysqli_warning_count($this->LinkID)) {
+            $e = mysqli_get_warnings($this->LinkID);
+            do {
+                if ($e->errno == 1592) {
+                    // 1592: Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.
+                    continue;
+                }
+                $Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message);
+            } while ($e->next());
         }
-        $Warnings[] = 'Code ' . $e->errno . ': ' . display_str($e->message);
-      } while ($e->next());
+        $this->Queries[count($this->Queries) - 1][2] = $Warnings;
     }
-    $this->Queries[count($this->Queries) - 1][2] = $Warnings;
-  }
 }
-?>

classes/notificationsmanagerview.class.php

@@ -1,31 +1,32 @@
-<?
+<?php
 
-class NotificationsManagerView {
-  private static $Settings;
+class NotificationsManagerView
+{
+    private static $Settings;
 
-  public static function load_js() {
-    $JSIncludes = array(
-      'noty/noty.js',
-      'noty/layouts/bottomRight.js',
-      'noty/themes/default.js',
-      'user_notifications.js');
-    foreach ($JSIncludes as $JSInclude) {
-      $Path = STATIC_SERVER."functions/$JSInclude";
-?>
+    public static function load_js()
+    {
+        $JSIncludes = array(
+        'noty/noty.js',
+        'noty/layouts/bottomRight.js',
+        'noty/themes/default.js',
+        'user_notifications.js');
+        foreach ($JSIncludes as $JSInclude) {
+            $Path = STATIC_SERVER."functions/$JSInclude"; ?>
   <script src="<?=$Path?>?v=<?=filemtime(SERVER_ROOT."/$Path")?>" type="text/javascript"></script>
-<?
+            <?php
+        }
     }
-  }
 
-  public static function render_settings($Settings) {
-    self::$Settings = $Settings;
-?>
+    public static function render_settings($Settings)
+    {
+        self::$Settings = $Settings; ?>
     <tr>
       <td class="label">
         <strong>News announcements</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::NEWS); ?>
+        <?php        self::render_checkbox(NotificationsManager::NEWS); ?>
       </td>
     </tr>
     <tr>
@@ -33,7 +34,7 @@ class NotificationsManagerView {
         <strong>Blog announcements</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::BLOG); ?>
+        <?php        self::render_checkbox(NotificationsManager::BLOG); ?>
       </td>
     </tr>
     <tr>
@@ -41,7 +42,7 @@ class NotificationsManagerView {
         <strong>Inbox messages</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::INBOX, true); ?>
+        <?php        self::render_checkbox(NotificationsManager::INBOX, true); ?>
       </td>
     </tr>
     <tr>
@@ -49,7 +50,7 @@ class NotificationsManagerView {
         <strong>Staff messages</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
+        <?php        self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
       </td>
     </tr>
     <tr>
@@ -57,7 +58,7 @@ class NotificationsManagerView {
         <strong>Thread subscriptions</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
+        <?php        self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
       </td>
     </tr>
     <tr>
@@ -65,50 +66,50 @@ class NotificationsManagerView {
         <strong>Quote notifications</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::QUOTES); ?>
+        <?php        self::render_checkbox(NotificationsManager::QUOTES); ?>
       </td>
     </tr>
-<?    if (check_perms('site_torrents_notify')) { ?>
+        <?php    if (check_perms('site_torrents_notify')) { ?>
       <tr>
         <td class="label tooltip" title="Enabling this will give you a notification when the torrent notification filters you have established are triggered.">
           <strong>Torrent notifications</strong>
         </td>
         <td>
-<?          self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
+            <?php          self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
         </td>
       </tr>
-<?    } ?>
+        <?php    } ?>
 
     <tr>
       <td class="label tooltip" title="Enabling this will give you a notification when a torrent is added to a collage you are subscribed to.">
         <strong>Collage subscriptions</strong>
       </td>
       <td>
-<?        self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
+        <?php        self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
       </td>
     </tr>
-<?  }
-
-  private static function render_checkbox($Name, $Traditional = false) {
-    $Checked = self::$Settings[$Name];
-    $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || !isset($Checked) ? ' checked="checked"' : '';
-    $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL ? ' checked="checked"' : '';
+        <?php
+    }
 
-?>
+    private static function render_checkbox($Name, $Traditional = false)
+    {
+        $Checked = self::$Settings[$Name];
+        $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || !isset($Checked) ? ' checked="checked"' : '';
+        $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL ? ' checked="checked"' : ''; ?>
     <label>
       <input type="checkbox" name="notifications_<?=$Name?>_popup" id="notifications_<?=$Name?>_popup"<?=$PopupChecked?> />
       Pop-up
     </label>
-<?    if ($Traditional) { ?>
+        <?php    if ($Traditional) { ?>
     <label>
       <input type="checkbox" name="notifications_<?=$Name?>_traditional" id="notifications_<?=$Name?>_traditional"<?=$TraditionalChecked?> />
       Traditional
     </label>
-<?    }
-  }
-
-  public static function format_traditional($Contents) {
-    return "<a href=\"$Contents[url]\">$Contents[message]</a>";
-  }
+        <?php    }
+    }
 
+    public static function format_traditional($Contents)
+    {
+        return "<a href=\"$Contents[url]\">$Contents[message]</a>";
+    }
 }

classes/paranoia.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 // Note: at the time this file is loaded, check_perms is not defined. Don't
 // call check_paranoia in /classes/script_start.php without ensuring check_perms has been defined
@@ -45,59 +45,69 @@
 define("PARANOIA_ALLOWED", 1);
 define("PARANOIA_OVERRIDDEN", 2);
 
-function check_paranoia($Property, $Paranoia = false, $UserClass = false, $UserID = false) {
-  global $Classes;
-  if ($Property == false) {
-    return false;
-  }
-  if (!is_array($Paranoia)) {
-    $Paranoia = json_decode($Paranoia, true);
-  }
-  if (!is_array($Paranoia)) {
-    $Paranoia = [];
-  }
-  if (is_array($Property)) {
-    $all = true;
-    foreach ($Property as $P) {
-      $all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
+function check_paranoia($Property, $Paranoia = false, $UserClass = false, $UserID = false)
+{
+    global $Classes;
+    if ($Property == false) {
+        return false;
     }
-    return $all;
-  } else {
-    if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
-      return PARANOIA_ALLOWED;
+    if (!is_array($Paranoia)) {
+        $Paranoia = json_decode($Paranoia, true);
     }
+    if (!is_array($Paranoia)) {
+        $Paranoia = [];
+    }
+    if (is_array($Property)) {
+        $all = true;
+        foreach ($Property as $P) {
+            $all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
+        }
+        return $all;
+    } else {
+        if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
+            return PARANOIA_ALLOWED;
+        }
 
-    $May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
-    if ($May)
-      return PARANOIA_ALLOWED;
+        $May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
+        if ($May) {
+            return PARANOIA_ALLOWED;
+        }
 
-    if (check_perms('users_override_paranoia', $UserClass)) {
-      return PARANOIA_OVERRIDDEN;
-    }
-    $Override=false;
-    switch ($Property) {
-      case 'downloaded':
-      case 'ratio':
-      case 'uploaded':
-      case 'lastseen':
-        if (check_perms('users_mod', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'snatched': case 'snatched+':
-        if (check_perms('users_view_torrents_snatchlist', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'uploads': case 'uploads+':
-      case 'seeding': case 'seeding+':
-      case 'leeching': case 'leeching+':
-        if (check_perms('users_view_seedleech', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'invitedcount':
-        if (check_perms('users_view_invites', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
+        if (check_perms('users_override_paranoia', $UserClass)) {
+            return PARANOIA_OVERRIDDEN;
+        }
+        $Override=false;
+        switch ($Property) {
+            case 'downloaded':
+            case 'ratio':
+            case 'uploaded':
+            case 'lastseen':
+                if (check_perms('users_mod', $UserClass)) {
+                    return PARANOIA_OVERRIDDEN;
+                }
+                break;
+            case 'snatched':
+            case 'snatched+':
+                if (check_perms('users_view_torrents_snatchlist', $UserClass)) {
+                    return PARANOIA_OVERRIDDEN;
+                }
+                break;
+            case 'uploads':
+            case 'uploads+':
+            case 'seeding':
+            case 'seeding+':
+            case 'leeching':
+            case 'leeching+':
+                if (check_perms('users_view_seedleech', $UserClass)) {
+                    return PARANOIA_OVERRIDDEN;
+                }
+                break;
+            case 'invitedcount':
+                if (check_perms('users_view_invites', $UserClass)) {
+                    return PARANOIA_OVERRIDDEN;
+                }
+                break;
+        }
+        return false;
     }
-    return false;
-  }
 }

classes/permissions.class.php

@@ -1,97 +1,106 @@
-<?
-class Permissions {
-  /* Check to see if a user has the permission to perform an action
-   * This is called by check_perms in util.php, for convenience.
-   *
-   * @param string PermissionName
-   * @param string $MinClass Return false if the user's class level is below this.
-   */
-  public static function check_perms($PermissionName, $MinClass = 0) {
-    if (G::$LoggedUser['EffectiveClass'] >= 1000) return true; // Sysops can do anything
-    if (G::$LoggedUser['EffectiveClass'] < $MinClass) return false; // MinClass failure
-    return G::$LoggedUser['Permissions'][$PermissionName] ?? false; // Return actual permission
-  }
+<?php
+class Permissions
+{
+    /* Check to see if a user has the permission to perform an action
+     * This is called by check_perms in util.php, for convenience.
+     *
+     * @param string PermissionName
+     * @param string $MinClass Return false if the user's class level is below this.
+     */
+    public static function check_perms($PermissionName, $MinClass = 0)
+    {
+        if (G::$LoggedUser['EffectiveClass'] >= 1000) {
+            return true; // Sysops can do anything
+        }
+        if (G::$LoggedUser['EffectiveClass'] < $MinClass) {
+            return false; // MinClass failure
+        }
+        return G::$LoggedUser['Permissions'][$PermissionName] ?? false; // Return actual permission
+    }
 
-  /**
-   * Gets the permissions associated with a certain permissionid
-   *
-   * @param int $PermissionID the kind of permissions to fetch
-   * @return array permissions
-   */
-  public static function get_permissions($PermissionID) {
-    $Permission = G::$Cache->get_value("perm_$PermissionID");
-    if (empty($Permission)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Gets the permissions associated with a certain permissionid
+     *
+     * @param int $PermissionID the kind of permissions to fetch
+     * @return array permissions
+     */
+    public static function get_permissions($PermissionID)
+    {
+        $Permission = G::$Cache->get_value("perm_$PermissionID");
+        if (empty($Permission)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT Level AS Class, `Values` AS Permissions, Secondary, PermittedForums
         FROM permissions
         WHERE ID = '$PermissionID'");
-      $Permission = G::$DB->next_record(MYSQLI_ASSOC, ['Permissions']);
-      G::$DB->set_query_id($QueryID);
-      $Permission['Permissions'] = unserialize($Permission['Permissions']);
-      G::$Cache->cache_value("perm_$PermissionID", $Permission, 2592000);
+            $Permission = G::$DB->next_record(MYSQLI_ASSOC, ['Permissions']);
+            G::$DB->set_query_id($QueryID);
+            $Permission['Permissions'] = unserialize($Permission['Permissions']);
+            G::$Cache->cache_value("perm_$PermissionID", $Permission, 2592000);
+        }
+        return $Permission;
     }
-    return $Permission;
-  }
 
-  /**
-   * Get a user's permissions.
-   *
-   * @param $UserID
-   * @param array|false $CustomPermissions
-   *  Pass in the user's custom permissions if you already have them.
-   *  Leave false if you don't have their permissions. The function will fetch them.
-   * @return array Mapping of PermissionName=>bool/int
-   */
-  public static function get_permissions_for_user($UserID, $CustomPermissions = false) {
-    $UserInfo = Users::user_info($UserID);
+    /**
+     * Get a user's permissions.
+     *
+     * @param $UserID
+     * @param array|false $CustomPermissions
+     *  Pass in the user's custom permissions if you already have them.
+     *  Leave false if you don't have their permissions. The function will fetch them.
+     * @return array Mapping of PermissionName=>bool/int
+     */
+    public static function get_permissions_for_user($UserID, $CustomPermissions = false)
+    {
+        $UserInfo = Users::user_info($UserID);
 
-    // Fetch custom permissions if they weren't passed in.
-    if ($CustomPermissions === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query('
+        // Fetch custom permissions if they weren't passed in.
+        if ($CustomPermissions === false) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query('
         SELECT CustomPermissions
         FROM users_main
         WHERE ID = ' . (int)$UserID);
-      list($CustomPermissions) = G::$DB->next_record(MYSQLI_NUM, false);
-      G::$DB->set_query_id($QueryID);
-    }
+            list($CustomPermissions) = G::$DB->next_record(MYSQLI_NUM, false);
+            G::$DB->set_query_id($QueryID);
+        }
 
-    if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
-      $CustomPermissions = unserialize($CustomPermissions);
-    }
+        if (!empty($CustomPermissions) && !is_array($CustomPermissions)) {
+            $CustomPermissions = unserialize($CustomPermissions);
+        }
 
-    $Permissions = self::get_permissions($UserInfo['PermissionID']);
+        $Permissions = self::get_permissions($UserInfo['PermissionID']);
 
-    // Manage 'special' inherited permissions
-    $BonusPerms = [];
-    $BonusCollages = 0;
-    foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
-      $ClassPerms = self::get_permissions($PermID);
-      $BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
-      unset($ClassPerms['Permissions']['MaxCollages']);
-      $BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
-    }
+        // Manage 'special' inherited permissions
+        $BonusPerms = [];
+        $BonusCollages = 0;
+        foreach ($UserInfo['ExtraClasses'] as $PermID => $Value) {
+            $ClassPerms = self::get_permissions($PermID);
+            $BonusCollages += $ClassPerms['Permissions']['MaxCollages'];
+            unset($ClassPerms['Permissions']['MaxCollages']);
+            $BonusPerms = array_merge($BonusPerms, $ClassPerms['Permissions']);
+        }
 
-    if (empty($CustomPermissions)) {
-      $CustomPermissions = [];
-    }
+        if (empty($CustomPermissions)) {
+            $CustomPermissions = [];
+        }
 
-    $MaxCollages = ($Permissions['Permissions']['MaxCollages'] ?? 0) + $BonusCollages;
-    if (isset($CustomPermissions['MaxCollages'])) {
-      $MaxCollages += $CustomPermissions['MaxCollages'];
-      unset($CustomPermissions['MaxCollages']);
+        $MaxCollages = ($Permissions['Permissions']['MaxCollages'] ?? 0) + $BonusCollages;
+        if (isset($CustomPermissions['MaxCollages'])) {
+            $MaxCollages += $CustomPermissions['MaxCollages'];
+            unset($CustomPermissions['MaxCollages']);
+        }
+        $Permissions['Permissions']['MaxCollages'] = $MaxCollages;
+        // Combine the permissions
+        return array_merge(
+            $Permissions['Permissions'],
+            $BonusPerms,
+            $CustomPermissions
+        );
     }
-    $Permissions['Permissions']['MaxCollages'] = $MaxCollages;
-    // Combine the permissions
-    return array_merge(
-        $Permissions['Permissions'],
-        $BonusPerms,
-        $CustomPermissions);
-  }
 
-  public static function is_mod($UserID) {
-    return self::get_permissions_for_user($UserID)['users_mod'] ?? false;
-  }
+    public static function is_mod($UserID)
+    {
+        return self::get_permissions_for_user($UserID)['users_mod'] ?? false;
+    }
 }
-?>