Start to pretend that requests work

classes/requests.class.php

@@ -1,22 +1,24 @@
-<?
-class Requests {
-  /**
-   * Update the sphinx requests delta table for a request.
-   *
-   * @param $RequestID
-   */
-  public static function update_sphinx_requests($RequestID) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
+<?php
+class Requests
+{
+    /**
+     * Update the sphinx requests delta table for a request.
+     *
+     * @param $RequestID
+     */
+    public static function update_sphinx_requests($RequestID)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
       SELECT REPLACE(t.Name, '.', '_')
       FROM tags AS t
         JOIN requests_tags AS rt ON t.ID = rt.TagID
       WHERE rt.RequestID = $RequestID");
-    $TagList = G::$DB->collect(0, false);
-    $TagList = db_string(implode(' ', $TagList));
+        $TagList = G::$DB->collect(0, false);
+        $TagList = db_string(implode(' ', $TagList));
 
-    G::$DB->query("
+        G::$DB->query("
       REPLACE INTO sphinx_requests_delta (
         ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
         CatalogueNumber, DLSiteID, FillerID, TorrentID,
@@ -31,7 +33,7 @@ class Requests {
         LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
       WHERE ID = $RequestID
       GROUP BY r.ID");
-    G::$DB->query("
+        G::$DB->query("
       UPDATE sphinx_requests_delta
       SET ArtistList = (
           SELECT GROUP_CONCAT(ag.Name SEPARATOR ' ')
@@ -41,52 +43,50 @@ class Requests {
           GROUP BY NULL
           )
       WHERE ID = $RequestID");
-    G::$DB->set_query_id($QueryID);
-
-    G::$Cache->delete_value("request_$RequestID");
-  }
-
-
-
-  /**
-   * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
-   *
-   * @param array $RequestIDs
-   * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
-   * @return The array of requests.
-   * Format: array(RequestID => Associative array)
-   * To see what's exactly inside each associate array, peek inside the function. It won't bite.
-   */
-  //
-  //In places where the output from this is merged with sphinx filters, it will be in a different order.
-  public static function get_requests($RequestIDs, $Return = true) {
-    $Found = $NotFound = array_fill_keys($RequestIDs, false);
-    // Try to fetch the requests from the cache first.
-    foreach ($RequestIDs as $i => $RequestID) {
-      if (!is_number($RequestID)) {
-        unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
-        continue;
-      }
-      $Data = G::$Cache->get_value("request_$RequestID");
-      if (!empty($Data)) {
-        unset($NotFound[$RequestID]);
-        $Found[$RequestID] = $Data;
-      }
-    }
-    // Make sure there's something in $RequestIDs, otherwise the SQL will break
-    if (count($RequestIDs) === 0) {
-      return [];
+        G::$DB->set_query_id($QueryID);
+
+        G::$Cache->delete_value("request_$RequestID");
     }
-    $IDs = implode(',', array_keys($NotFound));
 
-    /*
-      Don't change without ensuring you change everything else that uses get_requests()
-    */
+    /**
+     * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
+     *
+     * @param array $RequestIDs
+     * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
+     * @return The array of requests.
+     * Format: array(RequestID => Associative array)
+     * To see what's exactly inside each associate array, peek inside the function. It won't bite.
+     */
+    // In places where the output from this is merged with sphinx filters, it will be in a different order.
+    public static function get_requests($RequestIDs, $Return = true)
+    {
+        $Found = $NotFound = array_fill_keys($RequestIDs, false);
+        // Try to fetch the requests from the cache first.
+        foreach ($RequestIDs as $i => $RequestID) {
+            if (!is_number($RequestID)) {
+                unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
+                continue;
+            }
+            $Data = G::$Cache->get_value("request_$RequestID");
+            if (!empty($Data)) {
+                unset($NotFound[$RequestID]);
+                $Found[$RequestID] = $Data;
+            }
+        }
+        // Make sure there's something in $RequestIDs, otherwise the SQL will break
+        if (count($RequestIDs) === 0) {
+            return [];
+        }
+        $IDs = implode(',', array_keys($NotFound));
+
+        /*
+          Don't change without ensuring you change everything else that uses get_requests()
+        */
 
-    if (count($NotFound) > 0) {
-      $QueryID = G::$DB->get_query_id();
+        if (count($NotFound) > 0) {
+            $QueryID = G::$DB->get_query_id();
 
-      G::$DB->query("
+            G::$DB->query("
         SELECT
           ID,
           UserID,
@@ -107,60 +107,64 @@ class Requests {
         FROM requests
         WHERE ID IN ($IDs)
         ORDER BY ID");
-      $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
-      $Tags = self::get_tags(G::$DB->collect('ID', false));
-      foreach ($Requests as $Request) {
-        $Request['AnonymousFill'] = false;
-        if ($Request['FillerID']) {
-          G::$DB->query("
+            $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
+            $Tags = self::get_tags(G::$DB->collect('ID', false));
+            foreach ($Requests as $Request) {
+                $Request['AnonymousFill'] = false;
+                if ($Request['FillerID']) {
+                    G::$DB->query("
             SELECT Anonymous
             FROM torrents
             WHERE ID = ".$Request['TorrentID']);
-          list($Anonymous) = G::$DB->next_record();
-          if ($Anonymous) $Request['AnonymousFill'] = true;
+                    list($Anonymous) = G::$DB->next_record();
+                    if ($Anonymous) {
+                        $Request['AnonymousFill'] = true;
+                    }
+                }
+                unset($NotFound[$Request['ID']]);
+                $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : [];
+                $Found[$Request['ID']] = $Request;
+                G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
+            }
+            G::$DB->set_query_id($QueryID);
+
+            // Orphan requests. There shouldn't ever be any
+            if (count($NotFound) > 0) {
+                foreach (array_keys($NotFound) as $GroupID) {
+                    unset($Found[$GroupID]);
+                }
+            }
         }
-        unset($NotFound[$Request['ID']]);
-        $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : [];
-        $Found[$Request['ID']] = $Request;
-        G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
-      }
-      G::$DB->set_query_id($QueryID);
-
-      // Orphan requests. There shouldn't ever be any
-      if (count($NotFound) > 0) {
-        foreach (array_keys($NotFound) as $GroupID) {
-          unset($Found[$GroupID]);
+
+        if ($Return) { // If we're interested in the data, and not just caching it
+            return $Found;
         }
-      }
     }
 
-    if ($Return) { // If we're interested in the data, and not just caching it
-      return $Found;
-    }
-  }
-
-  /**
-   * Return a single request. Wrapper for get_requests
-   *
-   * @param int $RequestID
-   * @return request array or false if request doesn't exist. See get_requests for a description of the format
-   */
-  public static function get_request($RequestID) {
-    $Request = self::get_requests(array($RequestID));
-    if (isset($Request[$RequestID])) {
-      return $Request[$RequestID];
+    /**
+     * Return a single request. Wrapper for get_requests
+     *
+     * @param int $RequestID
+     * @return request array or false if request doesn't exist. See get_requests for a description of the format
+     */
+    public static function get_request($RequestID)
+    {
+        $Request = self::get_requests(array($RequestID));
+        if (isset($Request[$RequestID])) {
+            return $Request[$RequestID];
+        }
+        return false;
     }
-    return false;
-  }
-
-  public static function get_artists($RequestID) {
-    $Artists = G::$Cache->get_value("request_artists_$RequestID");
-    if (is_array($Artists)) {
-      $Results = $Artists;
-    } else {
-      $Results = [];
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+
+    public static function get_artists($RequestID)
+    {
+        $Artists = G::$Cache->get_value("request_artists_$RequestID");
+        if (is_array($Artists)) {
+            $Results = $Artists;
+        } else {
+            $Results = [];
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           ra.ArtistID,
           ag.Name
@@ -168,26 +172,27 @@ class Requests {
           JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
         WHERE ra.RequestID = $RequestID
         ORDER BY ag.Name ASC;");
-      $ArtistRaw = G::$DB->to_array();
-      G::$DB->set_query_id($QueryID);
-      foreach ($ArtistRaw as $ArtistRow) {
-        list($ArtistID, $ArtistName) = $ArtistRow;
-        $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
-      }
-      G::$Cache->cache_value("request_artists_$RequestID", $Results);
+            $ArtistRaw = G::$DB->to_array();
+            G::$DB->set_query_id($QueryID);
+            foreach ($ArtistRaw as $ArtistRow) {
+                list($ArtistID, $ArtistName) = $ArtistRow;
+                $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
+            }
+            G::$Cache->cache_value("request_artists_$RequestID", $Results);
+        }
+        return $Results;
     }
-    return $Results;
-  }
 
-  public static function get_tags($RequestIDs) {
-    if (empty($RequestIDs)) {
-      return [];
-    }
-    if (is_array($RequestIDs)) {
-      $RequestIDs = implode(',', $RequestIDs);
-    }
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function get_tags($RequestIDs)
+    {
+        if (empty($RequestIDs)) {
+            return [];
+        }
+        if (is_array($RequestIDs)) {
+            $RequestIDs = implode(',', $RequestIDs);
+        }
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       SELECT
         rt.RequestID,
         rt.TagID,
@@ -196,21 +201,22 @@ class Requests {
         JOIN tags AS t ON rt.TagID = t.ID
       WHERE rt.RequestID IN ($RequestIDs)
       ORDER BY rt.TagID ASC");
-    $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
-    G::$DB->set_query_id($QueryID);
-    $Results = [];
-    foreach ($Tags as $TagsRow) {
-      list($RequestID, $TagID, $TagName) = $TagsRow;
-      $Results[$RequestID][$TagID] = $TagName;
+        $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
+        G::$DB->set_query_id($QueryID);
+        $Results = [];
+        foreach ($Tags as $TagsRow) {
+            list($RequestID, $TagID, $TagName) = $TagsRow;
+            $Results[$RequestID][$TagID] = $TagName;
+        }
+        return $Results;
     }
-    return $Results;
-  }
-
-  public static function get_votes_array($RequestID) {
-    $RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
-    if (!is_array($RequestVotes)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+
+    public static function get_votes_array($RequestID)
+    {
+        $RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
+        if (!is_array($RequestVotes)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           rv.UserID,
           rv.Bounty,
@@ -219,27 +225,26 @@ class Requests {
           LEFT JOIN users_main AS u ON u.ID = rv.UserID
         WHERE rv.RequestID = $RequestID
         ORDER BY rv.Bounty DESC");
-      if (!G::$DB->has_results()) {
-        return array(
+            if (!G::$DB->has_results()) {
+                return array(
           'TotalBounty' => 0,
           'Voters' => []);
-      }
-      $Votes = G::$DB->to_array();
+            }
+            $Votes = G::$DB->to_array();
 
-      $RequestVotes = [];
-      $RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
+            $RequestVotes = [];
+            $RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
 
-      foreach ($Votes as $Vote) {
-        list($UserID, $Bounty, $Username) = $Vote;
-        $VoteArray = [];
-        $VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
-      }
+            foreach ($Votes as $Vote) {
+                list($UserID, $Bounty, $Username) = $Vote;
+                $VoteArray = [];
+                $VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
+            }
 
-      $RequestVotes['Voters'] = $VotesArray;
-      G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
-      G::$DB->set_query_id($QueryID);
+            $RequestVotes['Voters'] = $VotesArray;
+            G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
+            G::$DB->set_query_id($QueryID);
+        }
+        return $RequestVotes;
     }
-    return $RequestVotes;
-  }
-
 }

sections/requests/new_edit.php

@@ -6,72 +6,70 @@
  * maintaining 2 copies of almost identical files.
  */
 
-
 $NewRequest = $_GET['action'] === 'new';
 
 if (!$NewRequest) {
-  $RequestID = $_GET['id'];
-  if (!is_number($RequestID)) {
-    error(404);
-  }
+    $RequestID = $_GET['id'];
+    if (!is_number($RequestID)) {
+        error(404);
+    }
 }
 
 $Disabled = "";
 
 if ($NewRequest && ($LoggedUser['BytesUploaded'] < 250 * 1024 * 1024 || !check_perms('site_submit_requests'))) {
-  error('You do not have enough uploaded to make a request.');
+    error('You do not have enough uploaded to make a request.');
 }
 
 if (!$NewRequest) {
-  if (empty($ReturnEdit)) {
-
-    $Request = Requests::get_request($RequestID);
-    if ($Request === false) {
-      error(404);
-    }
+    if (empty($ReturnEdit)) {
+        $Request = Requests::get_request($RequestID);
+        if ($Request === false) {
+            error(404);
+        }
 
-    // Define these variables to simplify _GET['groupid'] requests later on
-    $CategoryID = $Request['CategoryID'];
-    $Title = $Request['Title'];
-    $TitleRJ = $Request['TitleRJ'];
-    $TitleJP = $Request['TitleJP'];
-    $CatalogueNumber = $Request['CatalogueNumber'];
-    $DLsiteID = $Request['DLsiteID'];
-    $Image = $Request['Image'];
-    $GroupID = $Request['GroupID'];
+        // Define these variables to simplify _GET['groupid'] requests later on
+        $CategoryID = $Request['CategoryID'];
+        $Title = $Request['Title'];
+        $TitleRJ = $Request['TitleRJ'];
+        $TitleJP = $Request['TitleJP'];
+        $CatalogueNumber = $Request['CatalogueNumber'];
+        $DLsiteID = $Request['DLsiteID'];
+        $Image = $Request['Image'];
+        $GroupID = $Request['GroupID'];
 
-    $VoteArray = Requests::get_votes_array($RequestID);
-    $VoteCount = count($VoteArray['Voters']);
+        $VoteArray = Requests::get_votes_array($RequestID);
+        $VoteCount = count($VoteArray['Voters']);
 
-    $IsFilled = !empty($Request['TorrentID']);
-    $CategoryName = $Categories[$CategoryID - 1];
+        $IsFilled = !empty($Request['TorrentID']);
+        $CategoryName = $Categories[$CategoryID - 1];
 
-    $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && $CategoryID === '0');
-    $CanEdit = ((!$IsFilled && $LoggedUser['ID'] === $Request['UserID'] && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests'));
+        $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && $CategoryID === '0');
+        $CanEdit = ((!$IsFilled && $LoggedUser['ID'] === $Request['UserID'] && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests'));
 
-    if (!$CanEdit) {
-      error(403);
-    }
+        if (!$CanEdit) {
+            error(403);
+        }
 
-    $ArtistForm = Requests::get_artists($RequestID);
+        $ArtistForm = Requests::get_artists($RequestID);
 
-    $Tags = implode(', ', $Request['Tags']);
-  }
+        $Tags = implode(', ', $Request['Tags']);
+    }
 }
 
 if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
-  $DB->query("
+    $DB->query("
     SELECT Name
     FROM artists_group
     WHERE artistid = ".$_GET['artistid']."
     LIMIT 1");
-  list($ArtistName) = $DB->next_record();
-  $ArtistForm = array(
+    list($ArtistName) = $DB->next_record();
+    $ArtistForm = array(
     1 => array(array('name' => trim($ArtistName))),
   );
 } elseif ($NewRequest && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-  $ArtistForm = Artists::get_artist($_GET['groupid']);
-  $DB->query("
+    $ArtistForm = Artists::get_artist($_GET['groupid']);
+    $DB->query("
     SELECT
       tg.Name,
       tg.NameRJ,
@@ -88,11 +86,11 @@ if ($NewRequest && !empty($_GET['artistid']) && is_number($_GET['artistid'])) {
       JOIN torrents_tags AS tt ON tt.GroupID = tg.ID
       JOIN tags AS t ON t.ID = tt.TagID
     WHERE tg.ID = ".$_GET['groupid']);
-  if (list($Title, $TitleRJ, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
-    $GroupID = trim($_REQUEST['groupid']);
-    $CategoryName = $Categories[$CategoryID - 1];
-    $Disabled = 'readonly="readonly"';
-  }
+    if (list($Title, $TitleRJ, $TitleJP, $Year, $Studio, $Series, $CatalogueNumber, $DLsiteID, $Image, $Tags, $CategoryID) = $DB->next_record()) {
+        $GroupID = trim($_REQUEST['groupid']);
+        $CategoryName = $Categories[$CategoryID - 1];
+        $Disabled = 'readonly="readonly"';
+    }
 }
 
 View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode,requests,form_validate');
@@ -105,9 +103,9 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
   <div class="box pad">
     <form action="" method="post" id="request_form" onsubmit="Calculate();">
       <div>
-<?  if (!$NewRequest) { ?>
+<?php  if (!$NewRequest) { ?>
         <input type="hidden" name="requestid" value="<?=$RequestID?>" />
-<?  } ?>
+<?php  } ?>
         <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
         <input type="hidden" name="action" value="<?=($NewRequest ? 'takenew' : 'takeedit')?>" />
       </div>
@@ -116,51 +114,54 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
         <tr>
           <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the request rules</a>!</td>
         </tr>
-<?  if ($NewRequest || $CanEdit) { ?>
+<?php  if ($NewRequest || $CanEdit) { ?>
         <tr>
           <td class="label tooltip" title="What alphabet the sequence uses, n.b., plasmids fit in the Other category">Type</td>
           <td>
-<? if (!empty($Disabled)) { ?>
+<?php if (!empty($Disabled)) { ?>
             <input type="hidden" name="type" value="<?=$CategoryName?>" />
             <select id="categories" name="type" onchange="Categories();" disabled="disabled">
-<? } else { ?>
+<?php } else { ?>
             <select id="categories" name="type" onchange="Categories();">
-<? } ?>
-<?    foreach (Misc::display_array($Categories) as $Cat) { ?>
+<?php } ?>
+<?php    foreach (Misc::display_array($Categories) as $Cat) { ?>
               <option value="<?=$Cat?>"<?=(!empty($CategoryName) && ($CategoryName === $Cat) ? ' selected="selected"' : '')?>><?=$Cat?></option>
-<?    } ?>
+<?php    } ?>
             </select>
           </td>
         </tr>
         <tr id="cataloguenumber_tr">
-          <td class="label">Catalogue Number</td>
+          <td class="label">Accession Number</td>
           <td>
             <input type="text" id="catalogue" name="cataloguenumber" size="15" value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>" <?=$Disabled?>/>
-<? if (empty($Disabled)) { ?>
-            ( <input type="button" autofill="jav" value="Autofill" style="font-size:0.8em;"></input> )
-<? } ?>
+<?php if (empty($Disabled)) { ?>
+          <input type="button" autofill="jav" value="Autofill"></input>
+<?php } ?>
           </td>
         </tr>
         <tr id="artist_tr">
-          <td class="label">Artist(s)</td>
+          <td class="label">Collaborator(s)</td>
           <td id="artistfields">
             <p id="vawarning" class="hidden">Please use the multiple artists feature rather than adding "Various Artists" as an artist; read <a href="wiki.php?action=article&amp;id=369">this</a> for more information.</p>
-<?
+<?php
     if (!empty($ArtistForm)) {
-      $First = true;
-      foreach ($ArtistForm as $Artist) {
-?>
-            <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
-            <? if (empty($Disabled)) { if ($First) { ?><a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a><? } $First = false; } ?>
+        $First = true;
+        foreach ($ArtistForm as $Artist) {
+            ?>
+            <input type="text" id="artist_0" name="artists[]"<?php Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
+            <?php if (empty($Disabled)) {
+                if ($First) { ?><a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a><?php }
+                $First = false;
+            } ?>
             <br />
-<?
-      }
+<?php
+        }
     } else {
-?>            <input type="text" id="artist_0" name="artists[]"<? Users::has_autocomplete_enabled('other'); ?> size="45" <?=$Disabled?>/>
-<? if (empty($Disabled)) { ?>
+        ?>            <input type="text" id="artist_0" name="artists[]"<?php Users::has_autocomplete_enabled('other'); ?> size="45" <?=$Disabled?>/>
+<?php if (empty($Disabled)) { ?>
             <a class="add_artist_button brackets">+</a> <a class="remove_artist_button brackets">&minus;</a>
-<? } ?>
-<?
+<?php } ?>
+<?php
     }
 ?>
           </td>
@@ -183,73 +184,74 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
             <input type="text" id="title_jp" name="title_jp" size="45" value="<?=!empty($TitleJP)?$TitleJP:''?>" <?=$Disabled?>/>
           </td>
         </tr>
-<?  } ?>
-<?  if ($NewRequest || $CanEdit) { ?>
+<?php  } ?>
+<?php  if ($NewRequest || $CanEdit) { ?>
         <tr id="image_tr">
           <td class="label tooltip" title="A meaningful picture, e.g., of the specimen">Picture</td>
           <td>
             <input type="text" id="image" name="image" size="45" value="<?=(!empty($Image) ? $Image : '')?>" <?=$Disabled?>/>
           </td>
         </tr>
-<?  } ?>
+<?php  } ?>
         <tr>
           <td class="label tooltip" title="Comma-seperated list of tags, n.b., use vanity.house for data you produced">Tags</td>
           <td>
-<?
+<?php
   $GenreTags = $Cache->get_value('genre_tags');
   if (!$GenreTags) {
-    $DB->query('
+      $DB->query('
       SELECT Name
       FROM tags
       WHERE TagType = \'genre\'
       ORDER BY Name');
-    $GenreTags = $DB->collect('Name');
-    $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
+      $GenreTags = $DB->collect('Name');
+      $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
   }
 
   if (!empty($Disabled)) {
-?>
+      ?>
             <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" disabled="disabled">
-<? } else { ?>
+<?php
+  } else { ?>
             <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" >
-<? } ?>
+<?php } ?>
               <option>---</option>
-<?  foreach (Misc::display_array($GenreTags) as $Genre) { ?>
+<?php  foreach (Misc::display_array($GenreTags) as $Genre) { ?>
               <option value="<?=$Genre?>"><?=$Genre?></option>
-<?  } ?>
+<?php  } ?>
             </select>
-            <input type="text" id="tags" name="tags" size="45" value="<?=(!empty($Tags) ? display_str($Tags) : '')?>"<? Users::has_autocomplete_enabled('other'); ?> <?=$Disabled?>/>
+            <input type="text" id="tags" name="tags" size="45" value="<?=(!empty($Tags) ? display_str($Tags) : '')?>"<?php Users::has_autocomplete_enabled('other'); ?> <?=$Disabled?>/>
           </td>
         </tr>
-<?  if ($NewRequest || $CanEdit) { ?>
-<?  } ?>
+<?php  if ($NewRequest || $CanEdit) { ?>
+<?php  } ?>
         <tr>
           <td class="label">Description</td>
           <td>
-<?          new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
+<?php          new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
           </td>
         </tr>
-<?  if (check_perms('site_moderate_requests')) { ?>
+<?php  if (check_perms('site_moderate_requests')) { ?>
         <tr>
-          <td class="label">Torrent group</td>
+          <td class="label">Torrent Group</td>
           <td>
             <?=site_url()?>torrents.php?id=<input type="text" name="groupid" value="<?=isset($GroupID)?$GroupID:''?>" size="15"/><br />
-            If this request matches a torrent group <span style="font-weight: bold;">already existing</span> on the site, please indicate that here.
+            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that here.
           </td>
         </tr>
-<?  } elseif (!empty($GroupID) && ($CategoryID != 5) && ($CategoryID != 0)) { ?>
+<?php  } elseif (!empty($GroupID) && ($CategoryID !== 5) && ($CategoryID !== 0)) { ?>
         <tr>
           <td class="label">Torrent Group</td>
           <td>
             <a href="torrents.php?id=<?=$GroupID?>"><?=site_url()?>torrents.php?id=<?=$GroupID?></a><br />
             This request <?=($NewRequest ? 'will be' : 'is')?> associated with the above torrent group.
-<?    if (!$NewRequest) { ?>
+<?php    if (!$NewRequest) { ?>
             If this is incorrect, please <a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">report this request</a> so that staff can fix it.
-<?    } ?>
+<?php    } ?>
             <input type="hidden" name="groupid" value="<?=$GroupID?>" />
           </td>
         </tr>
-<?  }
+<?php  }
   if ($NewRequest) { ?>
         <tr id="voting">
           <td class="label tooltip" title="How much upload credit the fulfiller wins">Bounty</td>
@@ -264,7 +266,7 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
           </td>
         </tr>
         <tr>
-          <td class="label">Post request information</td>
+          <td class="label">Post-Request Information</td>
           <td>
             <input type="hidden" id="amount" name="amount" value="<?=(!empty($Bounty) ? $Bounty : '100')?>" />
             <input type="hidden" id="current_uploaded" value="<?=$LoggedUser['BytesUploaded']?>" />
@@ -280,17 +282,16 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
             <input type="submit" id="button" value="Create request" disabled="disabled" />
           </td>
         </tr>
-<?  } else { ?>
+<?php  } else { ?>
         <tr>
           <td colspan="2" class="center">
             <input type="submit" id="button" value="Edit request" />
           </td>
         </tr>
-<?  } ?>
+<?php  } ?>
       </table>
     </form>
   </div>
 </div>
-<?
+<?php
 View::show_footer();
-?>

sections/requests/take_new_edit.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 //******************************************************************************//
 //----------------- Take request -----------------------------------------------//
@@ -6,171 +6,172 @@ authorize();
 
 
 if ($_POST['action'] !== 'takenew' && $_POST['action'] !== 'takeedit') {
-  error(0);
+    error(0);
 }
 
 $NewRequest = ($_POST['action'] === 'takenew');
 
 if (!$NewRequest) {
-  $ReturnEdit = true;
+    $ReturnEdit = true;
 }
 
 if ($NewRequest) {
-  if (!check_perms('site_submit_requests') || $LoggedUser['BytesUploaded'] < 250 * 1024 * 1024) {
-    error(403);
-  }
+    if (!check_perms('site_submit_requests') || $LoggedUser['BytesUploaded'] < 250 * 1024 * 1024) {
+        error(403);
+    }
 } else {
-  $RequestID = $_POST['requestid'];
-  if (!is_number($RequestID)) {
-    error(0);
-  }
+    $RequestID = $_POST['requestid'];
+    if (!is_number($RequestID)) {
+        error(0);
+    }
 
-  $Request = Requests::get_request($RequestID);
-  if ($Request === false) {
-    error(404);
-  }
-  $VoteArray = Requests::get_votes_array($RequestID);
-  $VoteCount = count($VoteArray['Voters']);
-  $IsFilled = !empty($Request['TorrentID']);
-  $CategoryName = $Categories[$Request['CategoryID'] - 1];
-  $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && ($Request['CategoryID'] === '0' || ($CategoryName === 'Music' && $Year === '0')));
-  $CanEdit = ((!$IsFilled && $LoggedUser['ID'] === $Request['UserID'] && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests'));
-
-  if (!$CanEdit) {
-    error(403);
-  }
+    $Request = Requests::get_request($RequestID);
+    if ($Request === false) {
+        error(404);
+    }
+    $VoteArray = Requests::get_votes_array($RequestID);
+    $VoteCount = count($VoteArray['Voters']);
+    $IsFilled = !empty($Request['TorrentID']);
+    $CategoryName = $Categories[$Request['CategoryID'] - 1];
+    $ProjectCanEdit = (check_perms('project_team') && !$IsFilled && ($Request['CategoryID'] === '0' || ($CategoryName === 'Music' && $Year === '0')));
+    $CanEdit = ((!$IsFilled && $LoggedUser['ID'] === $Request['UserID'] && $VoteCount < 2) || $ProjectCanEdit || check_perms('site_moderate_requests'));
+
+    if (!$CanEdit) {
+        error(403);
+    }
 }
 
 // Validate
 if (empty($_POST['type'])) {
-  error(0);
+    error(0);
 }
 
 $CategoryName = $_POST['type'];
 $CategoryID = (array_search($CategoryName, $Categories) + 1);
 
 if (empty($CategoryID)) {
-  error(0);
+    error(0);
 }
 
 if (empty($_POST['title']) && empty($_POST['title_rj']) && empty($_POST['title_jp'])) {
-  $Err = 'You must enter at least one title!';
+    $Err = 'You must enter at least one title!';
 }
 
 if (!empty($_POST['title'])) {
-  $Title = trim($_POST['title']);
+    $Title = trim($_POST['title']);
 }
 
 if (!empty($_POST['title_rj'])) {
-  $TitleRJ = trim($_POST['title_rj']);
+    $TitleRJ = trim($_POST['title_rj']);
 }
 
 if (!empty($_POST['title_jp'])) {
-  $TitleJP = trim($_POST['title_jp']);
+    $TitleJP = trim($_POST['title_jp']);
 }
 
 if (empty($_POST['tags'])) {
-  $Err = 'You forgot to enter any tags!';
+    $Err = 'You forgot to enter any tags!';
 } else {
-  $Tags = trim($_POST['tags']);
+    $Tags = trim($_POST['tags']);
 }
 
 if ($NewRequest) {
-  if (empty($_POST['amount'])) {
-    $Err = 'You forgot to enter any bounty!';
-  } else {
-    $Bounty = trim($_POST['amount']);
-    if (!is_number($Bounty)) {
-      $Err = 'Your entered bounty is not a number';
-    } elseif ($Bounty < 100 * 1024 * 1024) {
-      $Err = 'Minimum bounty is 100 MB.';
+    if (empty($_POST['amount'])) {
+        $Err = 'You forgot to enter any bounty!';
+    } else {
+        $Bounty = trim($_POST['amount']);
+        if (!is_number($Bounty)) {
+            $Err = 'Your entered bounty is not a number';
+        } elseif ($Bounty < 100 * 1024 * 1024) {
+            $Err = 'Minimum bounty is 100 MB.';
+        }
+        $Bytes = $Bounty; // From MB to B
     }
-    $Bytes = $Bounty; //From MB to B
-  }
 }
 
 if (empty($_POST['image'])) {
-  $Image = '';
+    $Image = '';
 } else {
-  ImageTools::blacklisted($_POST['image']);
-  if (preg_match('/'.IMAGE_REGEX.'/', trim($_POST['image'])) > 0) {
-      $Image = trim($_POST['image']);
-  } else {
-    $Err = display_str($_POST['image']).' does not appear to be a valid link to an image.';
-  }
+    ImageTools::blacklisted($_POST['image']);
+    if (preg_match('/'.IMAGE_REGEX.'/', trim($_POST['image'])) > 0) {
+        $Image = trim($_POST['image']);
+    } else {
+        $Err = display_str($_POST['image']).' does not appear to be a valid link to an image.';
+    }
 }
 
 if (empty($_POST['description'])) {
-  $Err = 'You forgot to enter a description.';
+    $Err = 'You forgot to enter a description.';
 } else {
-  $Description = trim($_POST['description']);
+    $Description = trim($_POST['description']);
 }
 
-if (empty($_POST['artists']) && $CategoryName != 'Other') {
-  $Err = 'You did not enter any artists.';
+if (empty($_POST['artists']) && $CategoryName !== 'Other') {
+    $Err = 'You did not enter any artists.';
 } else {
-  $Artists = $_POST['artists'];
+    $Artists = $_POST['artists'];
 }
 
-//Not required
-if (!empty($_POST['cataloguenumber']) && $CategoryName == 'Movies') {
-  $CatalogueNumber = trim($_POST['cataloguenumber']);
+// Not required
+if (!empty($_POST['cataloguenumber']) && $CategoryName === 'Movies') {
+    $CatalogueNumber = trim($_POST['cataloguenumber']);
 } else {
-  $CatalogueNumber = '';
+    $CatalogueNumber = '';
 }
-if (!empty($_POST['dlsiteid']) && $CategoryName == 'Games') {
-  $DLSiteID = trim($_POST['dlsiteid']);
+if (!empty($_POST['dlsiteid']) && $CategoryName === 'Games') {
+    $DLSiteID = trim($_POST['dlsiteid']);
 } else {
-  $DLSiteID = '';
+    $DLSiteID = '';
 }
 
 // GroupID
 if (!empty($_POST['groupid'])) {
-  $GroupID = $_POST['groupid'];
-  if (is_number($GroupID)) {
-    $DB->query("
+    $GroupID = $_POST['groupid'];
+    if (is_number($GroupID)) {
+        $DB->query("
       SELECT CategoryID
       FROM torrents_group
       WHERE ID = '$GroupID'");
-    if (!$DB->has_results()) {
-      $Err = 'The torrent group, if entered, must correspond to a torrent group on the site.';
+        if (!$DB->has_results()) {
+            $Err = 'The torrent group, if entered, must correspond to a torrent group on the site.';
+        } else {
+            if ($CategoryID !== $DB->to_array()[0]['CategoryID']) {
+                $Err = 'The category of the specified torrent group does not match the category of your request.';
+            }
+        }
     } else {
-      if ($CategoryID != $DB->to_array()[0]['CategoryID']) {
-        $Err = 'The category of the specified torrent group does not match the category of your request.';
-      }
+        $Err = 'The torrent group, if entered, must correspond to a torrent group on the site.';
     }
-  } else {
-    $Err = 'The torrent group, if entered, must correspond to a torrent group on the site.';
-  }
 } elseif (isset($_POST['groupid']) && $_POST['groupid'] === '0') {
-  $GroupID = 0;
+    $GroupID = 0;
 }
 
-//For refilling on error
+// For refilling on error
 $ArtistNames = [];
 $ArtistForm = [];
 for ($i = 0; $i < count($Artists); $i++) {
-  if (trim($Artists[$i]) !== '') {
-    if (!in_array($Artists[$i], $ArtistNames)) {
-      $ArtistForm[] = array('name' => trim($Artists[$i]));
-      $ArtistNames[] = trim($Artists[$i]);
+    if (trim($Artists[$i]) !== '') {
+        if (!in_array($Artists[$i], $ArtistNames)) {
+            $ArtistForm[] = array('name' => trim($Artists[$i]));
+            $ArtistNames[] = trim($Artists[$i]);
+        }
     }
-  }
 }
 if (!isset($ArtistNames[0])) {
-  unset($ArtistForm);
+    unset($ArtistForm);
 }
 
 if (!empty($Err)) {
-  error($Err);
-  $Div = $_POST['unit'] === 'mb' ? 1024 * 1024 : 1024 * 1024 * 1024;
-  $Bounty /= $Div;
-  include(SERVER_ROOT.'/sections/requests/new_edit.php');
-  die();
+    error($Err);
+    $Div = $_POST['unit'] === 'mb' ? 1024 * 1024 : 1024 * 1024 * 1024;
+    $Bounty /= $Div;
+    include(SERVER_ROOT.'/sections/requests/new_edit.php');
+    die();
 }
 
-//Databasify the input
-/*if ($CategoryName === 'Music') {
+// Databasify the input
+/*
+if ($CategoryName === 'Music') {
   if (empty($AllBitrates)) {
     foreach ($BitrateArray as $Index => $MasterIndex) {
       if (array_key_exists($Index, $Bitrates)) {
@@ -231,13 +232,16 @@ if (!empty($Err)) {
       $LogCue = 'Cue';
     }
   }
-}*/
+}
+*/
 
-if (!isset($GroupID)) $GroupID = '';
+if (!isset($GroupID)) {
+    $GroupID = '';
+}
 
-//Query time!
+// Query time!
 if ($NewRequest) {
-  $DB->query('
+    $DB->query('
     INSERT INTO requests (
       UserID, TimeAdded, LastVote, CategoryID, Title, TitleRJ, TitleJP, Image, Description,
       CatalogueNumber, DLSiteID, Visible, GroupID)
@@ -245,10 +249,9 @@ if ($NewRequest) {
       ('.$LoggedUser['ID'].", NOW(), NOW(), $CategoryID, '".db_string($Title)."', '".db_string($TitleRJ)."', '".db_string($TitleJP)."', '".db_string($Image)."', '".db_string($Description)."',
           '".db_string($CatalogueNumber)."', '".db_string($DLSiteID)."', '1', '$GroupID')");
 
-  $RequestID = $DB->inserted_id();
-
+    $RequestID = $DB->inserted_id();
 } else {
-  $DB->query("
+    $DB->query("
     UPDATE requests
     SET CategoryID = $CategoryID,
       Title = '".db_string($Title)."',
@@ -260,125 +263,123 @@ if ($NewRequest) {
       DLSiteID = '".db_string($DLSiteID)."'
     WHERE ID = $RequestID");
 
-  // We need to be able to delete artists / tags
-  $DB->query("
+    // We need to be able to delete artists/tags
+    $DB->query("
     SELECT ArtistID
     FROM requests_artists
     WHERE RequestID = $RequestID");
-  $RequestArtists = $DB->to_array();
-  foreach ($RequestArtists as $RequestArtist) {
-    $Cache->delete_value("artists_requests_".$RequestArtist['ArtistID']);
-  }
-  $DB->query("
+    $RequestArtists = $DB->to_array();
+    foreach ($RequestArtists as $RequestArtist) {
+        $Cache->delete_value("artists_requests_".$RequestArtist['ArtistID']);
+    }
+    $DB->query("
     DELETE FROM requests_artists
     WHERE RequestID = $RequestID");
-  $Cache->delete_value("request_artists_$RequestID");
+    $Cache->delete_value("request_artists_$RequestID");
 }
 
 if ($GroupID) {
-  $Cache->delete_value("requests_group_$GroupID");
+    $Cache->delete_value("requests_group_$GroupID");
 }
 
 /*
  * Multiple Artists!
  * For the multiple artists system, we have 3 steps:
- * 1. See if each artist given already exists and if it does, grab the ID.
- * 2. For each artist that didn't exist, create an artist.
- * 3. Create a row in the requests_artists table for each artist, based on the ID.
+ *   1. See if each artist given already exists and if it does, grab the ID.
+ *   2. For each artist that didn't exist, create an artist.
+ *   3. Create a row in the requests_artists table for each artist, based on the ID.
  */
 if (isset($ArtistForm)) {
-  foreach ($ArtistForm as $Num => $Artist) {
-    //1. See if each artist given already exists and if it does, grab the ID.
-    $DB->query("
+    foreach ($ArtistForm as $Num => $Artist) {
+        // 1. See if each artist given already exists and if it does, grab the ID.
+        $DB->query("
       SELECT
         ArtistID,
         Name
       FROM artists_group
       WHERE Name = '".db_string($Artist['name'])."'");
 
-    list($ArtistID, $ArtistName) = $DB->next_record(MYSQLI_NUM, false);
-    $ArtistForm[$Num] = array('name' => $ArtistName, 'id' => $ArtistID);
+        list($ArtistID, $ArtistName) = $DB->next_record(MYSQLI_NUM, false);
+        $ArtistForm[$Num] = array('name' => $ArtistName, 'id' => $ArtistID);
 
-    if (!$ArtistID) {
-      //2. For each artist that didn't exist, create an artist.
-      $DB->query("
+        if (!$ArtistID) {
+            // 2. For each artist that didn't exist, create an artist.
+            $DB->query("
         INSERT INTO artists_group (Name)
         VALUES ('".db_string($Artist['name'])."')");
-      $ArtistID = $DB->inserted_id();
+            $ArtistID = $DB->inserted_id();
 
-      $Cache->increment('stats_artist_count');
+            $Cache->increment('stats_artist_count');
 
-      $ArtistForm[$Num] = array('id' => $ArtistID, 'name' => $Artist['name']);
+            $ArtistForm[$Num] = array('id' => $ArtistID, 'name' => $Artist['name']);
+        }
     }
-  }
 
-
-  //3. Create a row in the requests_artists table for each artist, based on the ID.
-  foreach ($ArtistForm as $Num => $Artist) {
-    $DB->query("
+    // 3. Create a row in the requests_artists table for each artist, based on the ID.
+    foreach ($ArtistForm as $Num => $Artist) {
+        $DB->query("
       INSERT IGNORE INTO requests_artists
         (RequestID, ArtistID)
       VALUES
         ($RequestID, ".$Artist['id'].")");
-    $Cache->delete_value('artists_requests_'.$Artist['id']);
-  }
-  //End Music only
-
+        $Cache->delete_value('artists_requests_'.$Artist['id']);
+    }
+    // End Music only
 } else {
-  //Not a music request anymore, delete music only fields.
-  if (!$NewRequest) {
-    $DB->query("
+    // Not a music request anymore, delete music only fields.
+    if (!$NewRequest) {
+        $DB->query("
       SELECT ArtistID
       FROM requests_artists
       WHERE RequestID = $RequestID");
-    $OldArtists = $DB->collect('ArtistID');
-    foreach ($OldArtists as $ArtistID) {
-      if (empty($ArtistID)) {
-        continue;
-      }
-      //Get a count of how many groups or requests use the artist ID
-      $DB->query("
+        $OldArtists = $DB->collect('ArtistID');
+        foreach ($OldArtists as $ArtistID) {
+            if (empty($ArtistID)) {
+                continue;
+            }
+            // Get a count of how many groups or requests use the artist ID
+            $DB->query("
         SELECT COUNT(ag.ArtistID)
         FROM artists_group AS ag
           LEFT JOIN requests_artists AS ra ON ag.ArtistID = ra.ArtistID
         WHERE ra.ArtistID IS NOT NULL
           AND ag.ArtistID = '$ArtistID'");
-      list($ReqCount) = $DB->next_record();
-      $DB->query("
+            list($ReqCount) = $DB->next_record();
+            $DB->query("
         SELECT COUNT(ag.ArtistID)
         FROM artists_group AS ag
           LEFT JOIN torrents_artists AS ta ON ag.ArtistID = ta.ArtistID
         WHERE ta.ArtistID IS NOT NULL
           AND ag.ArtistID = '$ArtistID'");
-      list($GroupCount) = $DB->next_record();
-      if (($ReqCount + $GroupCount) == 0) {
-        //The only group to use this artist
-        Artists::delete_artist($ArtistID);
-      } else {
-        //Not the only group, still need to clear cache
-        $Cache->delete_value("artists_requests_$ArtistID");
-      }
-    }
-    $DB->query("
+            list($GroupCount) = $DB->next_record();
+            if (($ReqCount + $GroupCount) === 0) {
+                // The only group to use this artist
+                Artists::delete_artist($ArtistID);
+            } else {
+                // Not the only group, still need to clear cache
+                $Cache->delete_value("artists_requests_$ArtistID");
+            }
+        }
+        $DB->query("
       DELETE FROM requests_artists
       WHERE RequestID = $RequestID");
-    $Cache->delete_value("request_artists_$RequestID");
-  }
+        $Cache->delete_value("request_artists_$RequestID");
+    }
 }
 
 //Tags
 if (!$NewRequest) {
-  $DB->query("
+    $DB->query("
     DELETE FROM requests_tags
     WHERE RequestID = $RequestID");
 }
 
 $Tags = array_unique(explode(',', $Tags));
 foreach ($Tags as $Index => $Tag) {
-  $Tag = Misc::sanitize_tag($Tag);
-  $Tag = Misc::get_alias_tag($Tag);
-  $Tags[$Index] = $Tag; //For announce
-  $DB->query("
+    $Tag = Misc::sanitize_tag($Tag);
+    $Tag = Misc::get_alias_tag($Tag);
+    $Tags[$Index] = $Tag; // For announce
+    $DB->query("
     INSERT INTO tags
       (Name, UserID)
     VALUES
@@ -386,9 +387,9 @@ foreach ($Tags as $Index => $Tag) {
     ON DUPLICATE KEY UPDATE
       Uses = Uses + 1");
 
-  $TagID = $DB->inserted_id();
+    $TagID = $DB->inserted_id();
 
-  $DB->query("
+    $DB->query("
     INSERT IGNORE INTO requests_tags
       (TagID, RequestID)
     VALUES
@@ -396,30 +397,28 @@ foreach ($Tags as $Index => $Tag) {
 }
 
 if ($NewRequest) {
-  //Remove the bounty and create the vote
-  $DB->query("
+    // Remove the bounty and create the vote
+    $DB->query("
     INSERT INTO requests_votes
       (RequestID, UserID, Bounty)
     VALUES
       ($RequestID, ".$LoggedUser['ID'].', '.($Bytes * (1 - $RequestTax)).')');
 
-  $DB->query("
+    $DB->query("
     UPDATE users_main
     SET Uploaded = (Uploaded - $Bytes)
     WHERE ID = ".$LoggedUser['ID']);
-  $Cache->delete_value('user_stats_'.$LoggedUser['ID']);
-
-  $AnnounceTitle = empty($Title) ? (empty($TitleRJ) ? $TitleJP : $TitleRJ) : $Title;
+    $Cache->delete_value('user_stats_'.$LoggedUser['ID']);
 
-  $Announce = "\"$AnnounceTitle\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
-  send_irc('PRIVMSG '.BOT_REQUEST_CHAN.' '.$Announce);
+    $AnnounceTitle = empty($Title) ? (empty($TitleRJ) ? $TitleJP : $TitleRJ) : $Title;
 
+    $Announce = "\"$AnnounceTitle\"".(isset($ArtistForm)?(' - '.Artists::display_artists($ArtistForm, false, false)):'').' '.site_url()."requests.php?action=view&id=$RequestID - ".implode(' ', $Tags);
+    send_irc('PRIVMSG '.BOT_REQUEST_CHAN.' '.$Announce);
 } else {
-  $Cache->delete_value("request_$RequestID");
-  $Cache->delete_value("request_artists_$RequestID");
+    $Cache->delete_value("request_$RequestID");
+    $Cache->delete_value("request_artists_$RequestID");
 }
 
 Requests::update_sphinx_requests($RequestID);
 
 header("Location: requests.php?action=view&id=$RequestID");
-?>

static/functions/requests.js

@@ -3,7 +3,7 @@ function Vote(amount, requestid) {
     amount = parseInt($('#amount').raw().value);
   }
   if (amount == 0) {
-     amount = 20 * 1024 * 1024;
+    amount = 20 * 1024 * 1024;
   }
 
   var index;
@@ -30,33 +30,33 @@ function Vote(amount, requestid) {
   }
 
   ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + authkey + '&amount=' + amount, function (response) {
-      if (response == 'bankrupt') {
-        save_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request", true);
-        return;
-      } else if (response == 'dupesuccess') {
-        //No increment
-      } else if (response == 'success') {
-        votecount.innerHTML = (parseInt(votecount.innerHTML)) + 1;
-      }
+    if (response == 'bankrupt') {
+      save_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request", true);
+      return;
+    } else if (response == 'dupesuccess') {
+      //No increment
+    } else if (response == 'success') {
+      votecount.innerHTML = (parseInt(votecount.innerHTML)) + 1;
+    }
 
-      if ($('#total_bounty').length > 0) {
-        totalBounty = parseInt($('#total_bounty').raw().value);
-        totalBounty += (amount * (1 - $('#request_tax').raw().value));
-        $('#total_bounty').raw().value = totalBounty;
-        $('#formatted_bounty').raw().innerHTML = get_size(totalBounty);
+    if ($('#total_bounty').length > 0) {
+      totalBounty = parseInt($('#total_bounty').raw().value);
+      totalBounty += (amount * (1 - $('#request_tax').raw().value));
+      $('#total_bounty').raw().value = totalBounty;
+      $('#formatted_bounty').raw().innerHTML = get_size(totalBounty);
 
-        save_message("Your vote of " + get_size(amount) + ", adding a " + get_size(amount * (1 - $('#request_tax').raw().value)) + " bounty, has been added");
-        $('#button').raw().disabled = true;
-      } else {
-        save_message("Your vote of " + get_size(amount) + " has been added");
-      }
+      save_message("Your vote of " + get_size(amount) + ", adding a " + get_size(amount * (1 - $('#request_tax').raw().value)) + " bounty, has been added");
+      $('#button').raw().disabled = true;
+    } else {
+      save_message("Your vote of " + get_size(amount) + " has been added");
     }
+  }
   );
 }
 
 function Calculate() {
   if (!$('#unit').raw()) { return; }
-  var mul = (($('#unit').raw().options[$('#unit').raw().selectedIndex].value == 'mb') ? (1024*1024) : (1024*1024*1024));
+  var mul = (($('#unit').raw().options[$('#unit').raw().selectedIndex].value == 'mb') ? (1024 * 1024) : (1024 * 1024 * 1024));
   var amt = Math.floor($('#amount_box').raw().value * mul);
   if (amt > $('#current_uploaded').raw().value) {
     $('#new_uploaded').raw().innerHTML = "You can't afford that request!";
@@ -64,8 +64,8 @@ function Calculate() {
     $('#bounty_after_tax').raw().innerHTML = "0.00 MB";
     $('#button').raw().disabled = true;
   } else if (isNaN($('#amount_box').raw().value)
-      || (window.location.search.indexOf('action=new') != -1 && $('#amount_box').raw().value * mul < 100 * 1024 * 1024)
-      || (window.location.search.indexOf('action=view') != -1 && $('#amount_box').raw().value * mul < 20 * 1024 * 1024)) {
+    || (window.location.search.indexOf('action=new') != -1 && $('#amount_box').raw().value * mul < 100 * 1024 * 1024)
+    || (window.location.search.indexOf('action=view') != -1 && $('#amount_box').raw().value * mul < 20 * 1024 * 1024)) {
     $('#new_uploaded').raw().innerHTML = get_size(($('#current_uploaded').raw().value));
     $('#new_bounty').raw().innerHTML = "0.00 MB";
     $('#bounty_after_tax').raw().innerHTML = "0.00 MB";
@@ -81,47 +81,48 @@ function Calculate() {
 }
 
 function AddArtistField() {
-    var ArtistCount = document.getElementsByName("artists[]").length;
-    if (ArtistCount >= 200) {
-      return;
-    }
-    var ArtistField = document.createElement("input");
-    ArtistField.type = "text";
-    ArtistField.id = "artist_" + ArtistCount;
-    ArtistField.name = "artists[]";
-    ArtistField.size = 45;
-
-    var x = $('#artistfields').raw();
-    x.appendChild(document.createElement("br"));
-    x.appendChild(ArtistField);
-
-    if ($("#artist").data("gazelle-autocomplete")) {
-      $(ArtistField).live('focus', function() {
-        $(ArtistField).autocomplete({
-          serviceUrl : 'artist.php?action=autocomplete'
-        });
+  var ArtistCount = document.getElementsByName("artists[]").length;
+  if (ArtistCount >= 200) {
+    return;
+  }
+  var ArtistField = document.createElement("input");
+  ArtistField.type = "text";
+  ArtistField.id = "artist_" + ArtistCount;
+  ArtistField.name = "artists[]";
+  ArtistField.size = 45;
+
+  var x = $('#artistfields').raw();
+  x.appendChild(document.createElement("br"));
+  x.appendChild(ArtistField);
+
+  if ($("#artist").data("gazelle-autocomplete")) {
+    $(ArtistField).live('focus', function () {
+      $(ArtistField).autocomplete({
+        serviceUrl: 'artist.php?action=autocomplete'
       });
-    }
+    });
+  }
 
-    ArtistCount++;
+  ArtistCount++;
 }
 
 function RemoveArtistField() {
-    var ArtistCount = document.getElementsByName("artists[]").length;
-    if (ArtistCount == 1) {
-      return;
-    }
-    var x = $('#artistfields').raw();
+  var ArtistCount = document.getElementsByName("artists[]").length;
+  if (ArtistCount == 1) {
+    return;
+  }
+  var x = $('#artistfields').raw();
 
-    while (x.lastChild.tagName != "INPUT") {
-      x.removeChild(x.lastChild);
-    }
+  while (x.lastChild.tagName != "INPUT") {
     x.removeChild(x.lastChild);
-    x.removeChild(x.lastChild); //Remove trailing new line.
-    ArtistCount--;
+  }
+  x.removeChild(x.lastChild);
+  x.removeChild(x.lastChild); // Remove trailing new line.
+  ArtistCount--;
 }
 
 function Categories() {
+  /*
   var cat = $('#categories').raw() ? $('#categories').raw().options[$('#categories').raw().selectedIndex].value : '';
   if (cat == "Movies") {
     $('#artist_tr').gshow();
@@ -148,6 +149,7 @@ function Categories() {
     $('#cataloguenumber_tr').ghide();
     $('#dlsiteid_tr').ghide();
   }
+  */
 }
 
 function add_tag() {
@@ -199,15 +201,17 @@ function ToggleLogScore() {
 }
 
 function JavAutofill() {
-   var map = { cn: 'javdb',
-                idols: 'artist',
-               title: 'title',
-               title_jp: 'title_jp',
-               image: 'image',
-               tags: 'tags',
-               description: 'req_desc' }
+  var map = {
+    cn: 'javdb',
+    idols: 'artist',
+    title: 'title',
+    title_jp: 'title_jp',
+    image: 'image',
+    tags: 'tags',
+    description: 'req_desc'
+  }
   var cn = $('#catalogue').raw().value.toUpperCase()
-  $.getJSON('/ajax.php?action=javfill&cn='+cn, function(data) {
+  $.getJSON('/ajax.php?action=javfill&cn=' + cn, function (data) {
     if (data.status != "success") {
       $('#catalogue').raw().value = 'Failed'
       return
@@ -218,29 +222,29 @@ function JavAutofill() {
       if (Array.isArray(data.response[i])) {
         for (j in data.response[i]) {
           if (i == 'idols') {
-            if (!($('#'+map[i]+'_'+j).raw())) {
+            if (!($('#' + map[i] + '_' + j).raw())) {
               AddArtistField()
             }
-            $('#'+map[i]+'_'+j).raw().value = data.response[i][j]
+            $('#' + map[i] + '_' + j).raw().value = data.response[i][j]
           }
-          if (map[i] == 'tags' && !($('#'+map[i]).raw().value)) {
-            $('#'+map[i]).raw().value = data.response[i].join(', ')
+          if (map[i] == 'tags' && !($('#' + map[i]).raw().value)) {
+            $('#' + map[i]).raw().value = data.response[i].join(', ')
           }
         }
       }
-      if (map[i] && $('#'+map[i]).raw() && !($('#'+map[i]).raw().value)) {
-        $('#'+map[i]).raw().value = data.response[i]
+      if (map[i] && $('#' + map[i]).raw() && !($('#' + map[i]).raw().value)) {
+        $('#' + map[i]).raw().value = data.response[i]
       }
     }
   })
 }
 
-$(function() {
+$(function () {
   Categories()
   Calculate()
-  document.querySelectorAll('[autofill]').forEach(function(el) {
-    el.addEventListener('click', function(event) {
-      ({'jav':JavAutofill})[el.attributes['autofill'].value]()
+  document.querySelectorAll('[autofill]').forEach(function (el) {
+    el.addEventListener('click', function (event) {
+      ({ 'jav': JavAutofill })[el.attributes['autofill'].value]()
     })
   })
   $(document).on('click', '.add_artist_button', AddArtistField);