Use feature flags for manipulating tracker settings (rather than DEBUG_MODE).

classes/config.template

@@ -76,7 +76,11 @@ define('BLOCK_OPERA_MINI',  false); //Set to true to block Opera Mini proxy
 define('DONOR_INVITES',     2);
 
 // Features
-define('FEATURE_EMAIL_REENABLE', true);
+define('FEATURE_EMAIL_REENABLE',     true);
+define('FEATURE_SEND_EMAIL',         true);  //Attempt to send email from the site
+define('FEATURE_IRC',                true);  //Attempt to send messages to IRC
+define('FEATURE_ENFORCE_LOCATIONS',  true);  //Require users to verify login from unknown devices
+define('FEATURE_SET_ENC_KEY_PUBLIC', false); //Allow the site encryption key to be set without an account
 
 // User class IDs needed for automatic promotions. Found in the 'permissions' table
 // Name of class  Class ID (NOT level)

classes/misc.class.php

@@ -17,8 +17,8 @@ class Misc {
     $Headers .= 'X-Mailer: Project Gazelle'."\r\n";
     $Headers .= 'Message-Id: <'.Users::make_secret().'@'.SITE_DOMAIN.">\r\n";
     $Headers .= 'X-Priority: 3'."\r\n";
-    // do not attempt to send email when DEBUG_MODE is enabled
-    if (!DEBUG_MODE) {
+    // check if email is enabled
+    if (FEATURE_SEND_EMAIL) {
       mail($To, $Subject, $Body, $Headers, "-f $From@".SITE_DOMAIN);
     }
   }

classes/mysql.class.php

@@ -222,32 +222,17 @@ class DB_MYSQL {
     }
     $QueryStartTime = microtime(true);
     $this->connect();
-
-    if (DEBUG_MODE) {
+    // 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->QueryID = mysqli_query($this->LinkID, $Query);
-
-      // 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;
       }
-    } else {
-      // 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->QueryID = mysqli_query($this->LinkID, $Query);
-        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");
+      $Debug->analysis('Non-Fatal Deadlock:', $Query, 3600 * 24);
+      trigger_error("Database deadlock, attempt $i");
 
-        sleep($i * rand(2, 5)); // Wait longer as attempts increase
-      }
+      sleep($i * rand(2, 5)); // Wait longer as attempts increase
     }
-
     $QueryEndTime = microtime(true);
     $this->Queries[] = array($Query, ($QueryEndTime - $QueryStartTime) * 1000, null);
     $this->Time += ($QueryEndTime - $QueryStartTime) * 1000;

classes/tracker.class.php

@@ -23,11 +23,6 @@ class Tracker {
     }
 
     $MaxAttempts = 3;
-    // don't wait around if we're debugging
-    if (DEBUG_MODE) {
-      $MaxAttempts = 1;
-    }
-
     $Err = false;
     if (self::send_request($Get, $MaxAttempts, $Err) === false) {
       send_irc("PRIVMSG #tracker :$MaxAttempts $Err $Get");
@@ -135,11 +130,7 @@ class Tracker {
       if ($Sleep) {
         sleep($Sleep);
       }
-
-      // spend some time retrying if we're not in DEBUG_MODE
-      if (!DEBUG_MODE) {
-        $Sleep = 6;
-      }
+      $Sleep = 6;
 
       // Send request
       $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);

classes/util.php

@@ -133,8 +133,8 @@ function display_str($Str) {
  * @param string $Raw An IRC protocol snippet to send.
  */
 function send_irc($Raw) {
-  // don't bother talking to IRC in DEBUG_MODE
-  if (DEBUG_MODE) {
+  // check if IRC is enabled
+  if (!FEATURE_IRC) {
     return;
   }
 

sections/login/index.php

@@ -275,7 +275,7 @@ else {
                   list($CurrentASN) = $DB->next_record();
 
                   // if we are in DEBUG_MODE, no need to enforce location restriction
-                  if (!in_array($CurrentASN, $PastASNs) && !DEBUG_MODE) {
+                  if (!in_array($CurrentASN, $PastASNs) && FEATURE_ENFORCE_LOCATIONS) {
                     // Never logged in from this location before
                     if ($Cache->get_value('new_location_'.$UserID.'_'.$CurrentASN) !== true) {
                       $DB->query("
@@ -295,14 +295,8 @@ else {
 
               $SessionID = Users::make_secret(64);
               $KeepLogged = ($_POST['keeplogged'] ?? false) ? 1 : 0;
-              if (DEBUG_MODE) {
-                // allow HTTP (non secure) cookies if running in DEBUG_MODE
-                setcookie('session', $SessionID, (time()+60*60*24*365)*$KeepLogged, '/', '', false, true);
-                setcookie('userid', $UserID, (time()+60*60*24*365)*$KeepLogged, '/', '', false, true);
-              } else {
-                setcookie('session', $SessionID, (time()+60*60*24*365)*$KeepLogged, '/', '', true, true);
-                setcookie('userid', $UserID, (time()+60*60*24*365)*$KeepLogged, '/', '', true, true);
-              }
+              setcookie('session', $SessionID, (time()+60*60*24*365)*$KeepLogged, '/', '', true, true);
+              setcookie('userid', $UserID, (time()+60*60*24*365)*$KeepLogged, '/', '', true, true);
 
               // Because we <3 our staff
               $Permissions = Permissions::get_permissions($PermissionID);

sections/tools/index.php

@@ -10,8 +10,8 @@ if (isset($argv[1])) {
   $_REQUEST['action'] = $argv[1];
 } else {
   if (empty($_REQUEST['action']) || ($_REQUEST['action'] != 'public_sandbox' && $_REQUEST['action'] != 'ocelot')) {
-    // do not enforce in debug mode so we can set the encryption key w/o an account
-    if (!DEBUG_MODE) {
+    // if set, do not enforce login so we can set the encryption key w/o an account
+    if (!FEATURE_SET_ENC_KEY_PUBLIC) {
       enforce_login();
     }
   }

sections/tools/misc/database_key.php

@@ -1,14 +1,14 @@
 <?
-// do not enforce in debug mode so we can set the encryption key w/o an account
-if (!DEBUG_MODE) {
+// if set, do not enforce login so we can set the encryption key w/o an account
+if (!FEATURE_SET_ENC_KEY_PUBLIC) {
   if (!check_perms('site_debug')) {
       error(403);
   }
 }
 
 if (isset($_POST['dbkey'])) {
-  // do not enforce in debug mode so we can set the encryption key w/o an account
-  if (!DEBUG_MODE) {
+  // if set, do not enforce login so we can set the encryption key w/o an account
+  if (!FEATURE_SET_ENC_KEY_PUBLIC) {
     authorize();
   }
   apc_store('DBKEY', hash('sha512', $_POST['dbkey']));