Upload files to 'classes'

classes/imagetools.class.php

@@ -4,7 +4,8 @@
  * ImageTools Class
  * Thumbnail aide, mostly
  */
-class ImageTools {
+class ImageTools
+{
 
   /**
    * Determine the image URL. This takes care of the image proxy and thumbnailing.
@@ -12,31 +13,37 @@ class ImageTools {
    * @param string $Thumb image proxy scale profile to use
    * @return string
    */
-  public static function process($Url = '', $Thumb = false) {
-    if (!$Url) return '';
-    if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.IMAGE_DOMAIN.')\//', $Url) || $Url[0]=='/') {
-      if (strpos($Url, '?') === false) $Url .= '?';
-      return $Url;
-    } else {
-      return 'https://'.IMAGE_DOMAIN.($Thumb?"/$Thumb/":'/').'?h='.rawurlencode(base64_encode(hash_hmac('sha256', $Url, IMAGE_PSK, true))).'&i='.urlencode($Url);
+    public static function process($Url = '', $Thumb = false)
+    {
+        if (!$Url) {
+            return '';
+        }
+        if (preg_match('/^https:\/\/('.SITE_DOMAIN.'|'.IMAGE_DOMAIN.')\//', $Url) || $Url[0]=='/') {
+            if (strpos($Url, '?') === false) {
+                $Url .= '?';
+            }
+            return $Url;
+        } else {
+            return 'https://'.IMAGE_DOMAIN.($Thumb?"/$Thumb/":'/').'?h='.rawurlencode(base64_encode(hash_hmac('sha256', $Url, IMAGE_PSK, true))).'&i='.urlencode($Url);
+        }
     }
-  }
 
-  /**
-   * Checks if a link's host is (not) good, otherwise displays an error.
-   * @param string $Url Link to an image
-   * @return boolean
-   */
-  public static function blacklisted($Url, $ShowError = true) {
-    $Blacklist = ['tinypic.com'];
-    foreach ($Blacklist as $Value) {
-      if (stripos($Url, $Value) !== false) {
-        if ($ShowError) {
-          error($Value . ' is not an allowed image host. Please use a different host.');
+    /**
+     * Checks if a link's host is (not) good, otherwise displays an error.
+     * @param string $Url Link to an image
+     * @return boolean
+     */
+    public static function blacklisted($Url, $ShowError = true)
+    {
+        $Blacklist = ['tinypic.com'];
+        foreach ($Blacklist as $Value) {
+            if (stripos($Url, $Value) !== false) {
+                if ($ShowError) {
+                    error($Value . ' is not an allowed image host. Please use a different host.');
+                }
+                return true;
+            }
         }
-        return true;
-      }
+        return false;
     }
-    return false;
-  }
 }

classes/inbox.class.php

@@ -1,31 +1,31 @@
 <?php
 
-class Inbox {
-  /*
-   * Get the link to a user's inbox.
-   * This is what handles the ListUnreadPMsFirst setting
-   *
-   * @param string - whether the inbox or sentbox should be loaded
-   * @return string - the URL to a user's inbox
-   */
-  public static function get_inbox_link($WhichBox = 'inbox') {
+class Inbox
+{
+    /*
+     * Get the link to a user's inbox.
+     * This is what handles the ListUnreadPMsFirst setting
+     *
+     * @param string - whether the inbox or sentbox should be loaded
+     * @return string - the URL to a user's inbox
+     */
+    public static function get_inbox_link($WhichBox = 'inbox')
+    {
+        $ListFirst = isset(G::$LoggedUser['ListUnreadPMsFirst']) ? G::$LoggedUser['ListUnreadPMsFirst'] : false;
 
-    $ListFirst = isset(G::$LoggedUser['ListUnreadPMsFirst']) ? G::$LoggedUser['ListUnreadPMsFirst'] : false;
-
-    if ($WhichBox == 'inbox') {
-      if ($ListFirst) {
-        $InboxURL = 'inbox.php?sort=unread';
-      } else {
-        $InboxURL = 'inbox.php';
-      }
-    } else {
-      if ($ListFirst) {
-        $InboxURL = 'inbox.php?action=sentbox&amp;sort=unread';
-      } else {
-        $InboxURL = 'inbox.php?action=sentbox';
-      }
+        if ($WhichBox == 'inbox') {
+            if ($ListFirst) {
+                $InboxURL = 'inbox.php?sort=unread';
+            } else {
+                $InboxURL = 'inbox.php';
+            }
+        } else {
+            if ($ListFirst) {
+                $InboxURL = 'inbox.php?action=sentbox&amp;sort=unread';
+            } else {
+                $InboxURL = 'inbox.php?action=sentbox';
+            }
+        }
+        return $InboxURL;
     }
-    return $InboxURL;
-  }
 }
-?>

classes/invite_tree.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 /**************************************************************************/
 /*-- Invite tree class -----------------------------------------------------
 
@@ -6,35 +6,37 @@
 
 ***************************************************************************/
 
-class INVITE_TREE {
-  var $UserID = 0;
-  var $Visible = true;
-
-  // Set things up
-  function INVITE_TREE($UserID, $Options = []) {
-    $this->UserID = $UserID;
-    if ($Options['visible'] === false) {
-      $this->Visible = false;
+class INVITE_TREE
+{
+    public $UserID = 0;
+    public $Visible = true;
+
+    // Set things up
+    public function INVITE_TREE($UserID, $Options = [])
+    {
+        $this->UserID = $UserID;
+        if ($Options['visible'] === false) {
+            $this->Visible = false;
+        }
     }
-  }
 
-  function make_tree() {
-    $QueryID = G::$DB->get_query_id();
+    public function make_tree()
+    {
+        $QueryID = G::$DB->get_query_id();
 
-    $UserID = $this->UserID;
-?>
+        $UserID = $this->UserID; ?>
     <div class="invitetree pad">
-<?
-    G::$DB->query("
+        <?php
+        G::$DB->query("
       SELECT TreePosition, TreeID, TreeLevel
       FROM invite_tree
       WHERE UserID = $UserID");
-    list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
+        list($TreePosition, $TreeID, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false);
 
-    if (!$TreeID) {
-      return;
-    }
-    G::$DB->query("
+        if (!$TreeID) {
+            return;
+        }
+        G::$DB->query("
       SELECT TreePosition
       FROM invite_tree
       WHERE TreeID = $TreeID
@@ -42,12 +44,12 @@ class INVITE_TREE {
         AND TreePosition > $TreePosition
       ORDER BY TreePosition ASC
       LIMIT 1");
-    if (G::$DB->has_results()) {
-      list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
-    } else {
-      $MaxPosition = false;
-    }
-    $TreeQuery = G::$DB->query("
+        if (G::$DB->has_results()) {
+            list($MaxPosition) = G::$DB->next_record(MYSQLI_NUM, false);
+        } else {
+            $MaxPosition = false;
+        }
+        $TreeQuery = G::$DB->query("
       SELECT
         it.UserID,
         Enabled,
@@ -67,182 +69,175 @@ class INVITE_TREE {
         AND TreeLevel > $TreeLevel
       ORDER BY TreePosition");
 
-    $PreviousTreeLevel = $TreeLevel;
-
-    // Stats for the summary
-    $MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
-    $OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
-    $BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
-    $Count = 0;
-    $Branches = 0;
-    $DisabledCount = 0;
-    $DonorCount = 0;
-    $ParanoidCount = 0;
-    $TotalUpload = 0;
-    $TotalDownload = 0;
-    $TopLevelUpload = 0;
-    $TopLevelDownload = 0;
-
-    $ClassSummary = [];
-    global $Classes;
-    foreach ($Classes as $ClassID => $Val) {
-      $ClassSummary[$ClassID] = 0;
-    }
-
-    // We store this in an output buffer, so we can show the summary at the top without having to loop through twice
-    ob_start();
-    while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
-
-      // Do stats
-      $Count++;
-
-      if ($TreeLevel > $MaxTreeLevel) {
-        $MaxTreeLevel = $TreeLevel;
-      }
-
-      if ($TreeLevel == $BaseTreeLevel) {
-        $Branches++;
-        $TopLevelUpload += $Uploaded;
-        $TopLevelDownload += $Downloaded;
-      }
-
-      $ClassSummary[$Class]++;
-      if ($Enabled == 2) {
-        $DisabledCount++;
-      }
-      if ($Donor) {
-        $DonorCount++;
-      }
-
-      // Manage tree depth
-      if ($TreeLevel > $PreviousTreeLevel) {
-        for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
-          echo "\n\n<ul class=\"invitetree\">\n\t<li>\n";
-        }
-      } elseif ($TreeLevel < $PreviousTreeLevel) {
-        for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) {
-          echo "\t</li>\n</ul>\n";
+        $PreviousTreeLevel = $TreeLevel;
+
+        // Stats for the summary
+        $MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
+        $OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
+        $BaseTreeLevel = $TreeLevel + 1; // The level of users invited by our user
+        $Count = 0;
+        $Branches = 0;
+        $DisabledCount = 0;
+        $DonorCount = 0;
+        $ParanoidCount = 0;
+        $TotalUpload = 0;
+        $TotalDownload = 0;
+        $TopLevelUpload = 0;
+        $TopLevelDownload = 0;
+
+        $ClassSummary = [];
+        global $Classes;
+        foreach ($Classes as $ClassID => $Val) {
+            $ClassSummary[$ClassID] = 0;
         }
-        echo "\t</li>\n\t<li>\n";
-      } else {
-        echo "\t</li>\n\t<li>\n";
-      }
-      $UserClass = $Classes[$Class]['Level'];
-?>
+
+        // We store this in an output buffer, so we can show the summary at the top without having to loop through twice
+        ob_start();
+        while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) {
+            // Do stats
+            $Count++;
+
+            if ($TreeLevel > $MaxTreeLevel) {
+                $MaxTreeLevel = $TreeLevel;
+            }
+
+            if ($TreeLevel == $BaseTreeLevel) {
+                $Branches++;
+                $TopLevelUpload += $Uploaded;
+                $TopLevelDownload += $Downloaded;
+            }
+
+            $ClassSummary[$Class]++;
+            if ($Enabled == 2) {
+                $DisabledCount++;
+            }
+            if ($Donor) {
+                $DonorCount++;
+            }
+
+            // Manage tree depth
+            if ($TreeLevel > $PreviousTreeLevel) {
+                for ($i = 0; $i < $TreeLevel - $PreviousTreeLevel; $i++) {
+                    echo "\n\n<ul class=\"invitetree\">\n\t<li>\n";
+                }
+            } elseif ($TreeLevel < $PreviousTreeLevel) {
+                for ($i = 0; $i < $PreviousTreeLevel - $TreeLevel; $i++) {
+                    echo "\t</li>\n</ul>\n";
+                }
+                echo "\t</li>\n\t<li>\n";
+            } else {
+                echo "\t</li>\n\t<li>\n";
+            }
+            $UserClass = $Classes[$Class]['Level']; ?>
     <strong><?=Users::format_username($ID, true, true, ($Enabled != 2 ? false : true), true)?></strong>
-<?
-      if (check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
-        $TotalUpload += $Uploaded;
-        $TotalDownload += $Downloaded;
-?>
+            <?php
+            if (check_paranoia(array('uploaded', 'downloaded'), $Paranoia, $UserClass)) {
+                $TotalUpload += $Uploaded;
+                $TotalDownload += $Downloaded; ?>
     &nbsp;Uploaded: <strong><?=Format::get_size($Uploaded)?></strong>
     &nbsp;Downloaded: <strong><?=Format::get_size($Downloaded)?></strong>
     &nbsp;Ratio: <strong><?=Format::get_ratio_html($Uploaded, $Downloaded)?></strong>
-<?
-      } else {
-        $ParanoidCount++;
-?>
+                <?php
+            } else {
+                $ParanoidCount++; ?>
     &nbsp;Hidden
-<?
-      }
-?>
-
-<?
-      $PreviousTreeLevel = $TreeLevel;
-      G::$DB->set_query_id($TreeQuery);
-    }
+                <?php
+            } ?>
 
-    $Tree = ob_get_clean();
-    for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
-      $Tree .= "\t</li>\n</ul>\n";
-    }
+            <?php
+              $PreviousTreeLevel = $TreeLevel;
+            G::$DB->set_query_id($TreeQuery);
+        }
 
-    if ($Count) {
+        $Tree = ob_get_clean();
+        for ($i = 0; $i < $PreviousTreeLevel - $OriginalTreeLevel; $i++) {
+            $Tree .= "\t</li>\n</ul>\n";
+        }
 
-?>
+        if ($Count) {
+            ?>
     <p style="font-weight: bold;">
       This tree has <?=number_format($Count)?> entries, <?=number_format($Branches)?> branches, and a depth of <?=number_format($MaxTreeLevel - $OriginalTreeLevel)?>.
       It has
-<?
-      $ClassStrings = [];
-      foreach ($ClassSummary as $ClassID => $ClassCount) {
-        if ($ClassCount == 0) {
-          continue;
-        }
-        $LastClass = Users::make_class_string($ClassID);
-        if ($ClassCount > 1) {
-          if ($LastClass == 'Torrent Celebrity') {
-             $LastClass = 'Torrent Celebrities';
-          } else {
-            // Prevent duplicate letterss
-            if (substr($LastClass, -1) != 's') {
-              $LastClass.='s';
+            <?php
+              $ClassStrings = [];
+            foreach ($ClassSummary as $ClassID => $ClassCount) {
+                if ($ClassCount == 0) {
+                    continue;
+                }
+                $LastClass = Users::make_class_string($ClassID);
+                if ($ClassCount > 1) {
+                    if ($LastClass == 'Torrent Celebrity') {
+                        $LastClass = 'Torrent Celebrities';
+                    } else {
+                        // Prevent duplicate letterss
+                        if (substr($LastClass, -1) != 's') {
+                            $LastClass.='s';
+                        }
+                    }
+                }
+                $LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)';
+
+                $ClassStrings[] = $LastClass;
             }
-          }
-        }
-        $LastClass = "$ClassCount $LastClass (" . number_format(($ClassCount / $Count) * 100) . '%)';
-
-        $ClassStrings[] = $LastClass;
-      }
-      if (count($ClassStrings) > 1) {
-        array_pop($ClassStrings);
-        echo implode(', ', $ClassStrings);
-        echo ' and '.$LastClass;
-      } else {
-        echo $LastClass;
-      }
-      echo '. ';
-      echo $DisabledCount;
-      echo ($DisabledCount == 1) ? ' user is' : ' users are';
-      echo ' disabled (';
-      if ($DisabledCount == 0) {
-        echo '0%)';
-      } else {
-        echo number_format(($DisabledCount / $Count) * 100) . '%)';
-      }
-      echo ', and ';
-      echo $DonorCount;
-      echo ($DonorCount == 1) ? ' user has' : ' users have';
-      echo ' donated (';
-      if ($DonorCount == 0) {
-        echo '0%)';
-      } else {
-        echo number_format(($DonorCount / $Count) * 100) . '%)';
-      }
-      echo '. </p>';
-
-      echo '<p style="font-weight: bold;">';
-      echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
-      echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
-      echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
-      echo '</p>';
-
-      echo '<p style="font-weight: bold;">';
-      echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
-      echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
-      echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
-
-      echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t</p>\n";
-
-      if ($ParanoidCount) {
-        echo '<p style="font-weight: bold;">';
-        echo $ParanoidCount;
-        echo ($ParanoidCount == 1) ? ' user (' : ' users (';
-        echo number_format(($ParanoidCount / $Count) * 100);
-        echo '%) ';
-        echo ($ParanoidCount == 1) ? ' is' : ' are';
-        echo ' too paranoid to have their stats shown here, and ';
-        echo ($ParanoidCount == 1) ? ' was' : ' were';
-        echo ' not factored into the stats for the total tree.';
-        echo '</p>';
-      }
-    }
-?>
+            if (count($ClassStrings) > 1) {
+                array_pop($ClassStrings);
+                echo implode(', ', $ClassStrings);
+                echo ' and '.$LastClass;
+            } else {
+                echo $LastClass;
+            }
+            echo '. ';
+            echo $DisabledCount;
+            echo ($DisabledCount == 1) ? ' user is' : ' users are';
+            echo ' disabled (';
+            if ($DisabledCount == 0) {
+                echo '0%)';
+            } else {
+                echo number_format(($DisabledCount / $Count) * 100) . '%)';
+            }
+            echo ', and ';
+            echo $DonorCount;
+            echo ($DonorCount == 1) ? ' user has' : ' users have';
+            echo ' donated (';
+            if ($DonorCount == 0) {
+                echo '0%)';
+            } else {
+                echo number_format(($DonorCount / $Count) * 100) . '%)';
+            }
+            echo '. </p>';
+
+            echo '<p style="font-weight: bold;">';
+            echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
+            echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
+            echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
+            echo '</p>';
+
+            echo '<p style="font-weight: bold;">';
+            echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
+            echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
+            echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
+
+            echo "These numbers include the stats of paranoid users and will be factored into the invitation giving script.\n\t\t</p>\n";
+
+            if ($ParanoidCount) {
+                echo '<p style="font-weight: bold;">';
+                echo $ParanoidCount;
+                echo ($ParanoidCount == 1) ? ' user (' : ' users (';
+                echo number_format(($ParanoidCount / $Count) * 100);
+                echo '%) ';
+                echo ($ParanoidCount == 1) ? ' is' : ' are';
+                echo ' too paranoid to have their stats shown here, and ';
+                echo ($ParanoidCount == 1) ? ' was' : ' were';
+                echo ' not factored into the stats for the total tree.';
+                echo '</p>';
+            }
+        } ?>
       <br />
-<?=     $Tree?>
+        <?=     $Tree?>
     </div>
-<?
-    G::$DB->set_query_id($QueryID);
-  }
+        <?php
+        G::$DB->set_query_id($QueryID);
+    }
 }
 ?>

classes/irc.class.php

@@ -1,183 +1,201 @@
-<?
-class IRC_DB extends DB_MYSQL {
-  function halt($Msg) {
-    global $Bot;
-    $Bot->send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
-  }
+<?php
+class IRC_DB extends DB_MYSQL
+{
+    public function halt($Msg)
+    {
+        global $Bot;
+        $Bot->send_to($Bot->get_channel(), 'The database is currently unavailable; try again later.');
+    }
 }
 
-abstract class IRC_BOT {
-  abstract protected function connect_events();
-  abstract protected function channel_events();
-  abstract protected function query_events();
-  abstract protected function irc_events();
-  abstract protected function listener_events();
-
-  protected $Debug = false;
-  protected $Socket = false;
-  protected $Data = false;
-  protected $Whois = false;
-  protected $Identified = [];
-  protected $Channels = [];
-  protected $Messages = [];
-  protected $LastChan = false;
-  protected $ListenSocket = false;
-  protected $Listened = false;
-  protected $Connecting = false;
-  protected $State = 1; // Drone is live
-  public $Restart = 0; // Die by default
-
-  public function __construct() {
-    if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
-      chdir($_SERVER['HOME']);
-    }
-    ob_end_clean();
-    restore_error_handler(); //Avoid PHP error logging
-    set_time_limit(0);
-  }
-
-  public function connect() {
-    $this->connect_irc();
-    $this->connect_listener();
-    $this->post_connect();
-  }
-
-  private function connect_irc($Reconnect = false) {
-    $this->Connecting = true;
-    //Open a socket to the IRC server
-    if (defined('BOT_PORT_SSL')) {
-      $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
-    } else {
-      $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
-    }
-    while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
-      sleep(15);
-    }
-    stream_set_blocking($this->Socket, 0);
-    $this->Connecting = false;
-    if ($Reconnect) {
-      $this->post_connect();
-    }
-  }
-
-  private function connect_listener() {
-    //create a socket to listen on
-    $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
-    if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
-      die("Cannot create listen socket: $ErrStr");
-    }
-    stream_set_blocking($this->ListenSocket, false);
-  }
-
-  private function post_connect() {
-    fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
-    fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
-    $this->listen();
-  }
-
-  public function disconnect() {
-    fclose($this->ListenSocket);
-    $this->State = 0; //Drones dead
-  }
-
-  public function get_channel() {
-    preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
-    if (preg_match('/#.+/', $Channel[1])) {
-      return $Channel[1];
-    } else {
-      return false;
-    }
-  }
-
-  public function get_nick() {
-    preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
-    return $Nick[1];
-  }
-
-  protected function get_message() {
-    preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
-    return trim($Msg[1]);
-  }
-
-  protected function get_irc_host() {
-    preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
-    return trim($Host[1]);
-  }
-
-  protected function get_word($Select = 1) {
-    preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
-    $Word = preg_split(' ', $Word[1]);
-    return trim($Word[$Select]);
-  }
-
-  protected function get_action() {
-    preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
-    return strtoupper($Action[1]);
-  }
-
-  protected function send_raw($Text) {
-    if (!feof($this->Socket)) {
-      fwrite($this->Socket, "$Text\n");
-    } elseif (!$this->Connecting) {
-      $this->Connecting = true;
-      sleep(120);
-      $this->connect_irc(true);
-    }
-  }
-
-  public function send_to($Channel, $Text) {
-    // split the message up into <= 460 character strings and send each individually
-    // this is used to prevent messages from getting truncated
-    $Text = wordwrap($Text, 460, "\n", true);
-    $TextArray = explode("\n", $Text);
-    foreach ($TextArray as $Text) {
-      $this->send_raw("PRIVMSG $Channel :$Text");
-    }
-  }
-
-  protected function whois($Nick) {
-    $this->Whois = $Nick;
-    $this->send_raw("WHOIS $Nick");
-  }
-
-  /*
-  This function uses blacklisted_ip, which is no longer in RC2.
-  You can probably find it in old RC1 code kicking aronud if you need it.
-  protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
-    if (blacklisted_ip($IP)) {
-      $this->send_to($Channel, 'TOR IP Detected: '.$IP);
-      if ($Gline) {
-        $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
-      }
+abstract class IRC_BOT
+{
+    abstract protected function connect_events();
+    abstract protected function channel_events();
+    abstract protected function query_events();
+    abstract protected function irc_events();
+    abstract protected function listener_events();
+
+    protected $Debug = false;
+    protected $Socket = false;
+    protected $Data = false;
+    protected $Whois = false;
+    protected $Identified = [];
+    protected $Channels = [];
+    protected $Messages = [];
+    protected $LastChan = false;
+    protected $ListenSocket = false;
+    protected $Listened = false;
+    protected $Connecting = false;
+    protected $State = 1; // Drone is live
+    public $Restart = 0; // Die by default
+
+    public function __construct()
+    {
+        if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() != $_SERVER['HOME']) {
+            chdir($_SERVER['HOME']);
+        }
+        ob_end_clean();
+        restore_error_handler(); //Avoid PHP error logging
+        set_time_limit(0);
     }
-    if (Tools::site_ban_ip($IP)) {
-      $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
-      if ($Gline) {
-        $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
-      }
+
+    public function connect()
+    {
+        $this->connect_irc();
+        $this->connect_listener();
+        $this->post_connect();
     }
-  }*/
 
-  protected function listen() {
-    G::$Cache->InternalCache = false;
-    stream_set_timeout($this->Socket, 10000000000);
-    while ($this->State == 1) {
-      $NullSock = null;
-      $Sockets = array($this->Socket, $this->ListenSocket);
-      if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
-        die();
-      }
-      foreach ($Sockets as $Socket) {
-        if ($Socket === $this->Socket) {
-          $this->irc_events();
+    private function connect_irc($Reconnect = false)
+    {
+        $this->Connecting = true;
+        //Open a socket to the IRC server
+        if (defined('BOT_PORT_SSL')) {
+            $IrcAddress = 'tls://' . BOT_SERVER . ':' . BOT_PORT_SSL;
+        } else {
+            $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
+        }
+        while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
+            sleep(15);
+        }
+        stream_set_blocking($this->Socket, 0);
+        $this->Connecting = false;
+        if ($Reconnect) {
+            $this->post_connect();
+        }
+    }
+
+    private function connect_listener()
+    {
+        //create a socket to listen on
+        $ListenAddress = 'tcp://' . SOCKET_LISTEN_ADDRESS . ':' . SOCKET_LISTEN_PORT;
+        if (!$this->ListenSocket = stream_socket_server($ListenAddress, $ErrNr, $ErrStr)) {
+            die("Cannot create listen socket: $ErrStr");
+        }
+        stream_set_blocking($this->ListenSocket, false);
+    }
+
+    private function post_connect()
+    {
+        fwrite($this->Socket, "NICK ".BOT_NICK."Init\n");
+        fwrite($this->Socket, "USER ".BOT_NICK." * * :IRC Bot\n");
+        $this->listen();
+    }
+
+    public function disconnect()
+    {
+        fclose($this->ListenSocket);
+        $this->State = 0; //Drones dead
+    }
+
+    public function get_channel()
+    {
+        preg_match('/.+ PRIVMSG ([^:]+) :.+/', $this->Data, $Channel);
+        if (preg_match('/#.+/', $Channel[1])) {
+            return $Channel[1];
         } else {
-          $this->Listened = stream_socket_accept($Socket);
-          $this->listener_events();
+            return false;
+        }
+    }
+
+    public function get_nick()
+    {
+        preg_match('/:([^!:]+)!.+@[^\s]+ PRIVMSG [^:]+ :.+/', $this->Data, $Nick);
+        return $Nick[1];
+    }
+
+    protected function get_message()
+    {
+        preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Msg);
+        return trim($Msg[1]);
+    }
+
+    protected function get_irc_host()
+    {
+        preg_match('/:[^!:]+!.+@([^\s]+) PRIVMSG [^:]+ :.+/', $this->Data, $Host);
+        return trim($Host[1]);
+    }
+
+    protected function get_word($Select = 1)
+    {
+        preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
+        $Word = preg_split(' ', $Word[1]);
+        return trim($Word[$Select]);
+    }
+
+    protected function get_action()
+    {
+        preg_match('/:.+ PRIVMSG [^:]+ :!(\S+)/', $this->Data, $Action);
+        return strtoupper($Action[1]);
+    }
+
+    protected function send_raw($Text)
+    {
+        if (!feof($this->Socket)) {
+            fwrite($this->Socket, "$Text\n");
+        } elseif (!$this->Connecting) {
+            $this->Connecting = true;
+            sleep(120);
+            $this->connect_irc(true);
+        }
+    }
+
+    public function send_to($Channel, $Text)
+    {
+        // split the message up into <= 460 character strings and send each individually
+        // this is used to prevent messages from getting truncated
+        $Text = wordwrap($Text, 460, "\n", true);
+        $TextArray = explode("\n", $Text);
+        foreach ($TextArray as $Text) {
+            $this->send_raw("PRIVMSG $Channel :$Text");
+        }
+    }
+
+    protected function whois($Nick)
+    {
+        $this->Whois = $Nick;
+        $this->send_raw("WHOIS $Nick");
+    }
+
+    /*
+    This function uses blacklisted_ip, which is no longer in RC2.
+    You can probably find it in old RC1 code kicking aronud if you need it.
+    protected function ip_check($IP, $Gline = false, $Channel = BOT_REPORT_CHAN) {
+      if (blacklisted_ip($IP)) {
+        $this->send_to($Channel, 'TOR IP Detected: '.$IP);
+        if ($Gline) {
+          $this->send_raw('GLINE *@'.$IP.' 90d :DNSBL Proxy');
         }
       }
-      G::$DB->LinkID = false;
-      G::$DB->Queries = [];
+      if (Tools::site_ban_ip($IP)) {
+        $this->send_to($Channel, 'Site IP Ban Detected: '.$IP);
+        if ($Gline) {
+          $this->send_raw('GLINE *@'.$IP.' 90d :IP Ban');
+        }
+      }
+    }*/
+
+    protected function listen()
+    {
+        G::$Cache->InternalCache = false;
+        stream_set_timeout($this->Socket, 10000000000);
+        while ($this->State == 1) {
+            $NullSock = null;
+            $Sockets = array($this->Socket, $this->ListenSocket);
+            if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
+                die();
+            }
+            foreach ($Sockets as $Socket) {
+                if ($Socket === $this->Socket) {
+                    $this->irc_events();
+                } else {
+                    $this->Listened = stream_socket_accept($Socket);
+                    $this->listener_events();
+                }
+            }
+            G::$DB->LinkID = false;
+            G::$DB->Queries = [];
+        }
     }
-  }
 }
-?>

classes/lockedaccounts.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class to manage locked accounts
@@ -17,7 +17,6 @@ class LockedAccounts
      */
     public static function lock_account($UserID, $Type, $Message, $Reason, $LockedByUserID)
     {
-
         if ($LockedByUserID == 0) {
             $Username = "System";
         } else {