classes/autoenable.class.php

@@ -11,10 +11,10 @@ class AutoEnable {
     const CACHE_KEY_NAME = 'num_enable_requests';
 
     // The default request rejected message
-    const REJECTED_MESSAGE = "Your request to re-enable your account has been rejected.<br />This may be because a request is already pending for your username, or because a recent request was denied.<br /><br />You are encouraged to discuss this with staff by visiting %s on %s";
+    const REJECTED_MESSAGE = "Your request to re-enable your account has been rejected.<br>This may be because a request is already pending for your username, or because a recent request was denied.<br><br>You are encouraged to discuss this with staff by visiting %s on %s";
 
     // The default request received message
-    const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. You can expect a reply message in your email within 48 hours.<br />If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance.";
+    const RECEIVED_MESSAGE = "Your request to re-enable your account has been received. Most requests are responded to within minutes. Remember to check your spam.<br>If you do not receive an email after 48 hours have passed, please visit us on IRC for assistance.";
 
     /**
      * Handle a new enable request
@@ -31,7 +31,7 @@ class AutoEnable {
 
         // Get the user's ID
         G::$DB->query("
-                SELECT um.ID
+                SELECT um.ID, ui.BanReason
                 FROM users_main AS um
                 JOIN users_info ui ON ui.UserID = um.ID
                 WHERE um.Username = '$Username'
@@ -39,7 +39,7 @@ class AutoEnable {
 
         if (G::$DB->has_results()) {
             // Make sure the user can make another request
-            list($UserID) = G::$DB->next_record();
+            list($UserID, $BanReason) = G::$DB->next_record();
             G::$DB->query("
             SELECT 1 FROM users_enable_requests
             WHERE UserID = '$UserID'
@@ -51,9 +51,8 @@ class AutoEnable {
                     OR
                     (
                       Timestamp > NOW() - INTERVAL 2 MONTH
-                        AND
-                          (Outcome = '".self::DENIED."'
-                             OR Outcome = '".self::DISCARDED."')
+                      AND
+                      Outcome = '".self::DENIED."'
                     )
                   )");
         }
@@ -75,12 +74,16 @@ class AutoEnable {
                 (UserID, Email, IP, UserAgent, Timestamp)
                 VALUES (?, ?, ?, ?, NOW())",
                 $UserID, Crypto::encrypt($Email), Crypto::encrypt($IP), $UserAgent);
+            $RequestID = G::$DB->inserted_id();
 
             // Cache the number of requests for the modbar
             G::$Cache->increment_value(self::CACHE_KEY_NAME);
             setcookie('username', '', time() - 60 * 60, '/', '', false);
             $Output = self::RECEIVED_MESSAGE;
             Tools::update_user_notes($UserID, sqltime() . " - Enable request " . G::$DB->inserted_id() . " received from $IP\n\n");
+            if ($BanReason == 3) {
+              //self::handle_requests([$RequestID], self::APPROVED, "Automatically approved (inactivity)");
+            }
         }
 
         return $Output;
@@ -140,8 +143,8 @@ class AutoEnable {
                     $Token = db_string(Users::make_secret());
                     G::$DB->query("
                         UPDATE users_enable_requests
-                        SET Token = '$Token'
-                        WHERE ID = '$ID'");
+                        SET Token = ?
+                        WHERE ID = ?", $Token, $ID);
                     $TPL->set('TOKEN', $Token);
                 }
 
@@ -159,11 +162,17 @@ class AutoEnable {
         }
 
         // User notes stuff
+        $StaffID = G::$LoggedUser['ID'] ?? 0;
         G::$DB->query("
             SELECT Username
             FROM users_main
-            WHERE ID = '" . G::$LoggedUser['ID'] . "'");
-        list($StaffUser) = G::$DB->next_record();
+            WHERE ID = ?", $StaffID);
+        if (G::$DB->has_results()) {
+          list($StaffUser) = G::$DB->next_record();
+        } else {
+          $StaffUser = "System";
+          $StaffID = 0;
+        }
 
         foreach ($UserInfo as $User) {
             list($ID, $UserID) = $User;
@@ -176,9 +185,9 @@ class AutoEnable {
         G::$DB->query("
                 UPDATE users_enable_requests
                 SET HandledTimestamp = NOW(),
-                    CheckedBy = '".G::$LoggedUser['ID']."',
-                    Outcome = '$Status'
-                WHERE ID IN (".implode(',', $IDs).")");
+                    CheckedBy = ?,
+                    Outcome = ?
+                WHERE ID IN (".implode(',', $IDs).")", $StaffID, $Status);
         G::$Cache->decrement_value(self::CACHE_KEY_NAME, count($IDs));
     }
 

classes/irc.class.php

@@ -106,7 +106,7 @@ abstract class IRC_BOT {
 
   protected function get_word($Select = 1) {
     preg_match('/:.+ PRIVMSG [^:]+ :(.+)/', $this->Data, $Word);
-    $Word = split(' ', $Word[1]);
+    $Word = preg_split(' ', $Word[1]);
     return trim($Word[$Select]);
   }
 

classes/tools.class.php

@@ -296,7 +296,7 @@ class Tools {
   */
   public static function check_cidr_range($CheckIP, $Subnet) {
     $IP = ip2long($CheckIP);
-    $CIDR = split('/', $Subnet);
+    $CIDR = preg_split('/', $Subnet);
     $SubnetIP = ip2long($CIDR[0]);
     $SubnetMaskBits = 32 - $CIDR[1];
 

sections/user/edit.php

@@ -207,11 +207,11 @@ echo $Val->GenerateJS('userform');
         <td>
           <ul class="options_list nobullet">
             <li>
-              <input type="radio" name="searchtype" id="search_type_simple" value="0"<?=$SiteOptions['SearchType'] == 0 ? ' checked="checked"' : ''?> />
+              <input type="radio" name="searchtype" id="search_type_simple" value="0"<?=$SiteOptions  ?? 'SearchType' == 0 ? ' checked="checked"' : ''?> />
               <label for="search_type_simple">Simple</label>
             </li>
             <li>
-              <input type="radio" name="searchtype" id="search_type_advanced" value="1"<?=$SiteOptions['SearchType'] == 1 ? ' checked="checked"' : ''?> />
+              <input type="radio" name="searchtype" id="search_type_advanced" value="1"<?=$SiteOptions ?? 'SearchType' == 1 ? ' checked="checked"' : ''?> />
               <label for="search_type_advanced">Advanced</label>
             </li>
           </ul>
@@ -222,7 +222,7 @@ echo $Val->GenerateJS('userform');
         <td class="label tooltip" title="Enabling torrent grouping will place multiple formats of the same torrent group together beneath a common header."><strong>Torrent grouping</strong></td>
         <td>
           <div class="option_group">
-            <input type="checkbox" name="disablegrouping" id="disablegrouping"<?=$SiteOptions['DisableGrouping2'] == 0 ? ' checked="checked"' : ''?> />
+            <input type="checkbox" name="disablegrouping" id="disablegrouping"<?=$SiteOptions ?? 'DisableGrouping2' == 0 ? ' checked="checked"' : ''?> />
             <label for="disablegrouping">Enable torrent grouping</label>
           </div>
         </td>
@@ -233,11 +233,11 @@ echo $Val->GenerateJS('userform');
           <div class="option_group">
             <ul class="options_list nobullet">
               <li>
-                <input type="radio" name="torrentgrouping" id="torrent_grouping_open" value="0"<?=$SiteOptions['TorrentGrouping'] == 0 ? ' checked="checked"' : ''?> />
+                <input type="radio" name="torrentgrouping" id="torrent_grouping_open" value="0"<?=$SiteOptions ?? 'TorrentGrouping' == 0 ? ' checked="checked"' : ''?> />
                 <label for="torrent_grouping_open">Open</label>
               </li>
               <li>
-                <input type="radio" name="torrentgrouping" id="torrent_grouping_closed" value="1"<?=$SiteOptions['TorrentGrouping'] == 1 ? ' checked="checked"' : ''?> />
+                <input type="radio" name="torrentgrouping" id="torrent_grouping_closed" value="1"<?=$SiteOptions ?? 'TorrentGrouping' == 1 ? ' checked="checked"' : ''?> />
                 <label for="torrent_grouping_closed">Closed</label>
               </li>
             </ul>
@@ -247,14 +247,14 @@ echo $Val->GenerateJS('userform');
       <tr id="tor_snatched_tr">
         <td class="label tooltip" title="Enabling the snatched torrents indicator will display &quot;Snatched!&quot; next to torrents you've snatched."><strong>Snatched torrents indicator</strong></td>
         <td>
-          <input type="checkbox" name="showsnatched" id="showsnatched"<?=!empty($SiteOptions['ShowSnatched']) ? ' checked="checked"' : ''?> />
+          <input type="checkbox" name="showsnatched" id="showsnatched"<?=!empty($SiteOptions ?? 'ShowSnatched') ? ' checked="checked"' : ''?> />
           <label for="showsnatched">Enable snatched torrents indicator</label>
         </td>
       </tr>
       <tr id="tor_magnet_tr">
         <td class="label tooltip" title="Magnet links should only be used on clients with DHT disabled globally"><strong>Magnet links</strong></td>
         <td>
-          <input type="checkbox" name="showmagnets" id="showmagnets"<?=!empty($SiteOptions['ShowMagnets']) ? ' checked="checked"' : '' ?> />
+          <input type="checkbox" name="showmagnets" id="showmagnets"<?=!empty($SiteOptions ?? 'ShowMagnets') ? ' checked="checked"' : '' ?> />
           <label for="showmagnets">Show magnet links</label>
         </td>
       </tr>
@@ -275,11 +275,11 @@ echo $Val->GenerateJS('userform');
           <ul class="options_list nobullet">
             <li>
               <input type="hidden" name="coverart" value="" />
-              <input type="checkbox" name="coverart" id="coverart"<?=!isset($SiteOptions['CoverArt']) || $SiteOptions['CoverArt'] ? ' checked="checked"' : ''?> />
+              <input type="checkbox" name="coverart" id="coverart"<?=!isset($SiteOptions['CoverArt']) || $SiteOptions ?? 'CoverArt' ? ' checked="checked"' : ''?> />
               <label for="coverart">Enable cover artwork</label>
             </li>
             <li>
-              <input type="checkbox" name="show_extra_covers" id="show_extra_covers"<?=$SiteOptions['ShowExtraCovers'] ? ' checked="checked"' : ''?> />
+              <input type="checkbox" name="show_extra_covers" id="show_extra_covers"<?=$SiteOptions ?? 'ShowExtraCovers' ? ' checked="checked"' : ''?> />
               <label for="show_extra_covers">Enable additional cover artwork</label>
             </li>
           </ul>
@@ -289,12 +289,12 @@ echo $Val->GenerateJS('userform');
         <td class="label tooltip" title="This option allows you to change the number of album covers to display within a single collection page."><strong>Cover art (collections)</strong></td>
         <td>
           <select name="collagecovers" id="collagecovers">
-            <option value="10"<?=$SiteOptions['CollageCovers'] == 10 ? ' selected="selected"' : ''?>>10</option>
-            <option value="25"<?=($SiteOptions['CollageCovers'] == 25 || !isset($SiteOptions['CollageCovers'])) ? ' selected="selected"' : ''?>>25 (default)</option>
-            <option value="50"<?=$SiteOptions['CollageCovers'] == 50 ? ' selected="selected"' : ''?>>50</option>
-            <option value="100"<?=$SiteOptions['CollageCovers'] == 100 ? ' selected="selected"' : ''?>>100</option>
-            <option value="1000000"<?=$SiteOptions['CollageCovers'] == 1000000 ? ' selected="selected"' : ''?>>All</option>
-            <option value="0"<?=($SiteOptions['CollageCovers'] === 0 || (!isset($SiteOptions['CollageCovers']) && $SiteOptions['HideCollage'])) ? ' selected="selected"' : ''?>>None</option>
+            <option value="10"<?=$SiteOptions ?? 'CollageCovers' == 10 ? ' selected="selected"' : ''?>>10</option>
+            <option value="25"<?=($SiteOptions ?? 'CollageCovers' == 25 || !isset($SiteOptions['CollageCovers'])) ? ' selected="selected"' : ''?>>25 (default)</option>
+            <option value="50"<?=$SiteOptions ?? 'CollageCovers' == 50 ? ' selected="selected"' : ''?>>50</option>
+            <option value="100"<?=$SiteOptions ?? 'CollageCovers' == 100 ? ' selected="selected"' : ''?>>100</option>
+            <option value="1000000"<?=$SiteOptions ?? 'CollageCovers' == 1000000 ? ' selected="selected"' : ''?>>All</option>
+            <option value="0"<?=($SiteOptions ?? 'CollageCovers' === 0 || (!isset($SiteOptions['CollageCovers']) && $SiteOptions['HideCollage'])) ? ' selected="selected"' : ''?>>None</option>
           </select>
           covers per page
         </td>
@@ -318,9 +318,9 @@ echo $Val->GenerateJS('userform');
         <td class="label tooltip" title="Autocomplete will try to predict the word or phrase that you're typing. Selecting &quot;Everywhere&quot; will enable autocomplete on artist and tag fields across the site. Selecting &quot;Searches only&quot; will enable autocomplete in searches."><strong>Autocompletion</strong></td>
         <td>
           <select name="autocomplete">
-            <option value="0"<?=empty($SiteOptions['AutoComplete']) ? ' selected="selected"' : ''?>>Everywhere</option>
-            <option value="2"<?=$SiteOptions['AutoComplete'] === 2 ? ' selected="selected"' : ''?>>Searches only</option>
-            <option value="1"<?=$SiteOptions['AutoComplete'] === 1 ? ' selected="selected"' : ''?>>Disable</option>
+            <option value="0"<?=empty($SiteOptions ?? 'AutoComplete') ? ' selected="selected"' : ''?>>Everywhere</option>
+            <option value="2"<?=$SiteOptions ?? 'AutoComplete' === 2 ? ' selected="selected"' : ''?>>Searches only</option>
+            <option value="1"<?=$SiteOptions ?? 'AutoComplete' === 1 ? ' selected="selected"' : ''?>>Disable</option>
           </select>
         </td>
       </tr>
@@ -329,15 +329,15 @@ echo $Val->GenerateJS('userform');
         <td>
           <ul class="nobullet">
             <li>
-              <input type="checkbox" name="hide_lolicon" id="hide_lolicon"<?=($SiteOptions['HideLolicon']) ? ' checked="checked"' : ''?> />
+              <input type="checkbox" name="hide_lolicon" id="hide_lolicon"<?=($SiteOptions ?? 'HideLolicon') ? ' checked="checked"' : ''?> />
               <label for="hide_lolicon">Hide results with Lolicon, Shotacon, or Toddlercon</label>
             </li>
             <li>
-              <input type="checkbox" name="hide_scat" id="hide_scat"<?=($SiteOptions['HideScat']) ? ' checked="checked"' : ''?> />
+              <input type="checkbox" name="hide_scat" id="hide_scat"<?=($SiteOptions ?? 'HideScat') ? ' checked="checked"' : ''?> />
               <label for="hide_scat">Hide results with Scat</label>
             </li>
             <li>
-              <input type="checkbox" name="hide_snuff" id="hide_snuff"<?=($SiteOptions['HideSnuff']) ? ' checked="checked"' : ''?> />
+              <input type="checkbox" name="hide_snuff" id="hide_snuff"<?=($SiteOptions ?? 'HideSnuff') ? ' checked="checked"' : ''?> />
               <label for="hide_snuff">Hide results with Snuff</label>
             </li>
           </ul>
@@ -354,9 +354,9 @@ echo $Val->GenerateJS('userform');
         <td class="label tooltip" title="This option allows you to set the desired number of displayed posts per page within forum threads."><strong>Posts per page (forums)</strong></td>
         <td>
           <select name="postsperpage" id="postsperpage">
-            <option value="25"<?=$SiteOptions['PostsPerPage'] == 25 ? ' selected="selected"' : ''?>>25 (default)</option>
-            <option value="50"<?=$SiteOptions['PostsPerPage'] == 50 ? ' selected="selected"' : ''?>>50</option>
-            <option value="100"<?=$SiteOptions['PostsPerPage'] == 100 ? ' selected="selected"' : ''?>>100</option>
+            <option value="25"<?=$SiteOptions ?? 'PostsPerPage' == 25 ? ' selected="selected"' : ''?>>25 (default)</option>
+            <option value="50"<?=$SiteOptions ?? 'PostsPerPage' == 50 ? ' selected="selected"' : ''?>>50</option>
+            <option value="100"<?=$SiteOptions ?? 'PostsPerPage' == 100 ? ' selected="selected"' : ''?>>100</option>
           </select>
           posts per page
         </td>
@@ -371,7 +371,7 @@ echo $Val->GenerateJS('userform');
       <tr id="comm_emot_tr">
         <td class="label tooltip" title="Emoticons are small images which replace traditional text-based &quot;smileys&quot; like :) or :("><strong>Emoticons</strong></td>
         <td>
-          <input type="checkbox" name="disablesmileys" id="disablesmileys"<?=!empty($SiteOptions['DisableSmileys']) ? ' checked="checked"' : ''?> />
+          <input type="checkbox" name="disablesmileys" id="disablesmileys"<?=!empty($SiteOptions ?? 'DisableSmileys') ? ' checked="checked"' : ''?> />
           <label for="disablesmileys">Disable emoticons</label>
         </td>
       </tr>
@@ -379,8 +379,8 @@ echo $Val->GenerateJS('userform');
         <td class="label tooltip" title="This option allows you to disable all avatars or show all avatars with a placeholder for users without avatars." data-title-plain="This option allows you to disable all avatars or show all avatars with a placeholder for users without avatars."><strong>Avatar display (posts)</strong></td>
         <td>
           <select name="disableavatars" id="disableavatars">
-            <option value="1"<?=$SiteOptions['DisableAvatars'] == 1 ? ' selected="selected"' : ''?>>Disable avatars</option>
-            <option value="0"<?=$SiteOptions['DisableAvatars'] == 0 ? ' selected="selected"' : ''?>>Show avatars</option>
+            <option value="1"<?=$SiteOptions ?? 'DisableAvatars' == 1 ? ' selected="selected"' : ''?>>Disable avatars</option>
+            <option value="0"<?=$SiteOptions ?? 'DisableAvatars' == 0 ? ' selected="selected"' : ''?>>Show avatars</option>
           </select>
         </td>
       </tr>