Repurpose site_options table for misc values

It's what we were using it for anyway

classes/siteoptions.class.php

@@ -1,25 +0,0 @@
-<?
-/*
- * Class to manage site options
- */
-class SiteOptions {
-
-  /*
-   * Get a site option
-   *
-   * @param string $Name The option name
-   * @param string $DefaultValue The value to default to if the name can't be found in the cache
-   */
-  public static function getSiteOption($Name, $DefaultValue) {
-    $Value = G::$Cache->get_value('site_option_' . $Name);
-
-    if ($Value === false) {
-      G::$DB->query("SELECT Value FROM site_options WHERE Name = '" . db_string($Name) . "'");
-      if (G::$DB->has_results()) {
-        list($Value) = G::$DB->next_record();
-        G::$Cache->cache_value('site_option_' . $Name, $Value);
-      }
-    }
-    return ($Value === false ? $DefaultValue : $Value);
-  }
-}

gazelle.sql

@@ -798,11 +798,11 @@ CREATE TABLE `site_history` (
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB CHARSET=utf8;
 
-CREATE TABLE `site_options` (
+CREATE TABLE `misc` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(64) NOT NULL,
-  `Value` tinytext NOT NULL,
-  `Comment` text NOT NULL,
+  `First` text NOT NULL,
+  `Second` text NOT NULL,
   PRIMARY KEY (`ID`),
   UNIQUE KEY `Name` (`Name`),
   KEY `name_index` (`Name`)

sections/contest/contest.php

@@ -2,9 +2,9 @@
 if (!($ContestSettings = $Cache->get_value("contest_settings"))) {
   $DB->query("
   SELECT
-    Value,
-    Comment
-  FROM site_options
+    First,
+    Second
+  FROM misc
   WHERE
     Name='ContestRules'
     OR Name='ContestTimes'

sections/schedule/every/shop_freeleech.php

@@ -24,9 +24,9 @@ if ($DB->has_results()) {
   $Cache->delete_value('shop_freeleech_list');
 }
 
-// Also clear site_options for expired freeleech
+// Also clear misc table for expired freeleech
 $DB->query("
-  DELETE FROM site_options
-  WHERE Comment = 'freeleech'
-    AND CAST(Value AS UNSIGNED INTEGER) < " . date('U'));
+  DELETE FROM misc
+  WHERE Second = 'freeleech'
+    AND CAST(First AS UNSIGNED INTEGER) < " . date('U'));
 ?>

sections/store/freeleechpool.php

@@ -24,15 +24,15 @@ if (isset($_POST['donation'])) {
         SET BonusPoints = BonusPoints - $Donation
         WHERE ID = $UserID");
       $DB->query("
-        UPDATE site_options
-        SET Value = Value + $Donation
+        UPDATE misc
+        SET First = First + $Donation
         WHERE Name = 'FreeleechPool'");
       $Cache->delete_value('user_info_heavy_'.$UserID);
 
       // Check to see if we're now over the target pool size
       $DB->query("
-        SELECT Value, Comment
-        FROM site_options
+        SELECT First, Second
+        FROM misc
         WHERE Name = 'FreeleechPool'");
       if ($DB->has_results()) {
         list($Pool, $Target) = $DB->next_record();
@@ -68,9 +68,9 @@ if (isset($_POST['donation'])) {
 
           $Target = rand(10000, 100000);
           $DB->query("
-            UPDATE site_options
-            SET Value = 0,
-                Comment = $Target
+            UPDATE misc
+            SET First = 0,
+                Second = $Target
             WHERE Name = 'FreeleechPool'");
         }
       }
@@ -96,8 +96,8 @@ if (isset($_POST['donation'])) {
 } else {
 
   $DB->query("
-    SELECT Value
-    FROM site_options
+    SELECT First
+    FROM misc
     WHERE Name = 'FreeleechPool'");
   if ($DB->has_results()) {
     list($Pool) = $DB->next_record();

sections/tools/development/site_options.php

@@ -1,152 +0,0 @@
-<?
-if (!check_perms('admin_manage_permissions') && !check_perms('users_mod')) {
-    error(403);
-}
-
-if (!check_perms('admin_manage_permissions')) {
-  View::show_header('Site Options');
-  $DB->query("SELECT Name, Value, Comment FROM site_options");
-?>
-  <div class="header">
-    <h1>Site Options</h1>
-  </div>
-  <table width="100%">
-    <tr class="colhead">
-      <td>Name</td>
-      <td>Value</td>
-      <td>Comment</td>
-    </tr>
-<?
-  while (list($Name, $Value, $Comment) = $DB->next_record()) {
-?>
-    <tr class="row">
-      <td><?=$Name?></td>
-      <td><?=$Value?></td>
-      <td><?=$Comment?></td>
-    </tr>
-<?
-  }
-?>
-  </table>
-<?
-  View::show_footer();
-  die();
-}
-
-if (isset($_POST['submit'])) {
-    authorize();
-
-    if ($_POST['submit'] == 'Delete') {
-  $Name = db_string($_POST['name']);
-        $DB->query("DELETE FROM site_options WHERE Name = '" . $Name . "'");
-        $Cache->delete_value('site_option_' . $Name);
-    } else {
-        $Val->SetFields('name', '1', 'regex', 'The name must be separated by underscores. No spaces are allowed.', array('regex' => '/^[a-z][_a-z0-9]{0,63}$/i'));
-        $Val->SetFields('value', '1', 'string', 'You must specify a value for the option.');
-        $Val->SetFields('comment', '1', 'string', 'You must specify a comment for the option.');
-
-        $Error = $Val->ValidateForm($_POST);
-        if ($Error) {
-            error($Error);
-        }
-
-        $Name = db_string($_POST['name']);
-        $Value = db_string($_POST['value']);
-        $Comment = db_string($_POST['comment']);
-
-        if ($_POST['submit'] == 'Edit') {
-            $DB->query("SELECT Name FROM site_options WHERE ID = '" . db_string($_POST['id']) . "'");
-            list($OldName) = $DB->next_record();
-            $DB->query("
-                UPDATE site_options
-                SET
-                    Name = '$Name',
-                    Value = '$Value',
-                    Comment = '$Comment'
-                WHERE ID = '" . db_string($_POST['id']) . "'
-            ");
-            $Cache->delete_value('site_option_' . $OldName);
-        } else {
-            $DB->query("
-                INSERT INTO site_options (Name, Value, Comment)
-                VALUES ('$Name', '$Value', '$Comment')
-            ");
-        }
-
-        $Cache->delete_value('site_option_' . $Name);
-    }
-}
-
-$DB->query("
-    SELECT
-        ID,
-        Name,
-        Value,
-        Comment
-    FROM site_options
-    ORDER BY LOWER(Name) DESC
-");
-
-View::show_header('Site Options');
-?>
-
-<div class="header">
-  <h2>Site Options</h2>
-</div>
-<div class="box slight_margin">
-  <table>
-    <tr class="colhead">
-      <td>
-        <span class="tooltip" title="Words must be separated by underscores">Name</span>
-      </td>
-      <td>Value</td>
-      <td>Comment</td>
-      <td>Submit</td>
-    </tr>
-    <tr>
-      <form class="create_form" name="site_option" action="" method="post">
-        <input type="hidden" name="action" value="site_options" />
-        <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-        <td>
-          <input type="text" size="40" name="name" />
-        </td>
-        <td>
-          <input type="text" size="20" name="value" />
-        </td>
-        <td>
-          <input type="text" size="75" name="comment" />
-        </td>
-        <td>
-          <input type="submit" name="submit" value="Create" />
-        </td>
-      </form>
-    </tr>
-<?
-while (list($ID, $Name, $Value, $Comment) = $DB->next_record()) {
-?>
-    <tr>
-      <form class="manage_form" name="site_option" action="" method="post">
-        <input type="hidden" name="id" value="<?=$ID?>" />
-        <input type="hidden" name="action" value="site_options" />
-        <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-        <td>
-          <input type="text" size="40" name="name" value="<?=$Name?>" />
-        </td>
-        <td>
-          <input type="text" size="20" name="value" value="<?=$Value?>" />
-        </td>
-        <td>
-          <input type="text" size="75" name="comment" value="<?=$Comment?>" />
-        </td>
-        <td>
-          <input type="submit" name="submit" value="Edit" />
-          <input type="submit" name="submit" value="Delete" />
-        </td>
-      </form>
-    </tr>
-<?
-}
-?>
-  </table>
-</div>
-<? View::show_footer(); ?>

sections/tools/index.php

@@ -434,8 +434,8 @@ switch ($_REQUEST['action']) {
     include(SERVER_ROOT.'/sections/tools/misc/manipulate_tree.php');
     break;
 
-  case 'site_options':
-    include(SERVER_ROOT.'/sections/tools/development/site_options.php');
+  case 'misc_values':
+    include(SERVER_ROOT.'/sections/tools/development/misc_values.php');
     break;
 
   case 'recommendations':

sections/tools/managers/sitewide_freeleech.php

@@ -32,8 +32,8 @@ if (isset($_POST['type'])) {
         $DB->query($Query);
 
         $DB->query("
-          INSERT INTO site_options
-            (Name, Value, Comment)
+          INSERT INTO misc
+            (Name, First, Second)
           VALUES
             ('" . $Tag . "', '" . (time() + (60 * 60 * $Duration)) . "', 'freeleech')
           ON DUPLICATE KEY UPDATE
@@ -65,8 +65,8 @@ if (isset($_POST['type'])) {
       $Query .= " ON DUPLICATE KEY UPDATE ExpiryTime = ExpiryTime + INTERVAL " . $Duration . " HOUR";
       $DB->query($Query);
       $DB->query("
-        INSERT INTO site_options
-          (Name, Value, Comment)
+        INSERT INTO misc
+          (Name, First, Second)
         VALUES
           ('global', '" . (time() + (60 * 60 * $Duration)) . "', 'freeleech')
         ON DUPLICATE KEY UPDATE

sections/tools/tools.php

@@ -223,7 +223,7 @@ View::show_header('Staff Tools');
   create_row("Rerender stylesheet gallery images", "tools.php?action=rerender_gallery", check_perms("site_debug") || check_perms("users_mod"));
   create_row("Schedule", "schedule.php?auth=$LoggedUser[AuthKey]", check_perms("site_debug"));
   create_row("Service stats", "tools.php?action=service_stats", check_perms("site_debug"));
-  create_row("Site options", "tools.php?action=site_options", check_perms('users_mod'));
+  create_row("Miscellaneous values", "tools.php?action=misc_values", check_perms('users_mod'));
   create_row("Tracker info", "tools.php?action=ocelot_info", check_perms("users_mod"));
   create_row("Update GeoIP", "tools.php?action=update_geoip", check_perms("admin_update_geoip"));
 

sections/upload/upload_handle.php

@@ -541,9 +541,9 @@ if (!$Properties['GroupID']) {
 
 // Use this section to control freeleeches
 $DB->query("
-  SELECT Name, Value
-  FROM site_options
-  WHERE Comment = 'freeleech'");
+  SELECT First, Second
+  FROM misc
+  WHERE Second = 'freeleech'");
 if ($DB->has_results()) {
   $FreeLeechTags = $DB->to_array('Name');
   foreach ($FreeLeechTags as $Tag => $Exp) {