Start fixing the requests feature

sections/requests/new_edit.php

@@ -97,71 +97,86 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
 ?>
 <div class="thin">
   <div class="header">
-    <h2><?=($NewRequest ? 'Create a request' : 'Edit a request')?></h2>
+    <h2><?=($NewRequest ? 'Create a request' : 'Edit a request')?>
+    </h2>
   </div>
 
   <div class="box pad">
     <form action="" method="post" id="request_form" onsubmit="Calculate();">
       <div>
-<?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')?>" />
+        <?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>
 
       <table class="layout">
         <tr>
-          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the request rules</a>!</td>
+          <td colspan="2" class="center">Please make sure your request follows <a href="rules.php?p=requests">the
+              request rules</a>!</td>
         </tr>
-<?php  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 class="label tooltip" title="What alphabet the sequence uses, n.b., plasmids fit in the Other category">
+            Type</td>
           <td>
-<?php if (!empty($Disabled)) { ?>
-            <input type="hidden" name="type" value="<?=$CategoryName?>" />
+            <?php if (!empty($Disabled)) { ?>
+            <input type="hidden" name="type"
+              value="<?=$CategoryName?>" />
             <select id="categories" name="type" onchange="Categories();" disabled="disabled">
-<?php } else { ?>
-            <select id="categories" name="type" onchange="Categories();">
-<?php } ?>
-<?php    foreach (Misc::display_array($Categories) as $Cat) { ?>
-              <option value="<?=$Cat?>"<?=(!empty($CategoryName) && ($CategoryName === $Cat) ? ' selected="selected"' : '')?>><?=$Cat?></option>
-<?php    } ?>
-            </select>
+              <?php } else { ?>
+              <select id="categories" name="type" onchange="Categories();">
+                <?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">Accession Number</td>
           <td>
-            <input type="text" id="catalogue" name="cataloguenumber" size="15" value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>" <?=$Disabled?>/>
-<?php if (empty($Disabled)) { ?>
-          <input type="button" autofill="jav" value="Autofill"></input>
-<?php } ?>
+            <input type="text" id="catalogue" name="cataloguenumber" size="15"
+              value="<?=(isset($CatalogueNumber)?$CatalogueNumber:'') ?>"
+              <?=$Disabled?>/>
+            <?php if (empty($Disabled)) { ?>
+            <input type="button" autofill="jav" value="Autofill"></input>
+            <?php } ?>
           </td>
         </tr>
         <tr id="artist_tr">
           <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
+            <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[]"<?php Users::has_autocomplete_enabled('other'); ?> size="45" value="<?=display_str($Artist['name']) ?>" <?=$Disabled?>/>
+            <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 }
+                if ($First) { ?><a class="add_artist_button brackets">+</a> <a
+              class="remove_artist_button brackets">&minus;</a><?php }
                 $First = false;
             } ?>
             <br />
-<?php
+            <?php
         }
     } else {
-        ?>            <input type="text" id="artist_0" name="artists[]"<?php Users::has_autocomplete_enabled('other'); ?> size="45" <?=$Disabled?>/>
-<?php 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
+            <?php } ?>
+            <?php
     }
 ?>
           </td>
@@ -169,34 +184,44 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
         <tr>
           <td class="label tooltip" title="FASTA definition line, e.g., Alcohol dehydrogenase ADH1">Sequence Name</td>
           <td>
-            <input type="text" id="title" name="title" size="45" value="<?=(!empty($Title) ? $Title : '')?>" <?=$Disabled?>/>
+            <input type="text" id="title" name="title" size="45"
+              value="<?=(!empty($Title) ? $Title : '')?>"
+              <?=$Disabled?>/>
           </td>
         </tr>
         <tr>
-          <td class="label tooltip" title="FASTA organism line binomial nomenclature, e.g., Saccharomyces cerevisiae">Organism</td>
+          <td class="label tooltip" title="FASTA organism line binomial nomenclature, e.g., Saccharomyces cerevisiae">
+            Organism</td>
           <td>
-            <input type="text" id="title_rj" name="title_rj" size="45" value="<?=(!empty($TitleRJ) ? $TitleRJ : '')?>" <?=$Disabled?>/>
+            <input type="text" id="title_rj" name="title_rj" size="45"
+              value="<?=(!empty($TitleRJ) ? $TitleRJ : '')?>"
+              <?=$Disabled?>/>
           </td>
         </tr>
         <tr>
           <td class="label tooltip" title="FASTA organism line if applicable, e.g., S288C">Strain/Variety</td>
           <td>
-            <input type="text" id="title_jp" name="title_jp" size="45" value="<?=!empty($TitleJP)?$TitleJP:''?>" <?=$Disabled?>/>
+            <input type="text" id="title_jp" name="title_jp" size="45"
+              value="<?=!empty($TitleJP)?$TitleJP:''?>"
+              <?=$Disabled?>/>
           </td>
         </tr>
-<?php  } ?>
-<?php  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?>/>
+            <input type="text" id="image" name="image" size="45"
+              value="<?=(!empty($Image) ? $Image : '')?>"
+              <?=$Disabled?>/>
           </td>
         </tr>
-<?php  } ?>
+        <?php  } ?>
         <tr>
-          <td class="label tooltip" title="Comma-seperated list of tags, n.b., use vanity.house for data you produced">Tags</td>
+          <td class="label tooltip" title="Comma-seperated list of tags, n.b., use vanity.house for data you produced">
+            Tags</td>
           <td>
-<?php
+            <?php
   $GenreTags = $Cache->get_value('genre_tags');
   if (!$GenreTags) {
       $DB->query('
@@ -211,68 +236,89 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
   if (!empty($Disabled)) {
       ?>
             <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" disabled="disabled">
-<?php
+              <?php
   } else { ?>
-            <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;" >
-<?php } ?>
-              <option>---</option>
-<?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) : '')?>"<?php Users::has_autocomplete_enabled('other'); ?> <?=$Disabled?>/>
+              <select id="genre_tags" name="genre_tags" onchange="add_tag(); return false;">
+                <?php } ?>
+                <option>---</option>
+                <?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) : '')?>"
+                <?php Users::has_autocomplete_enabled('other'); ?>
+              <?=$Disabled?>/>
           </td>
         </tr>
-<?php  if ($NewRequest || $CanEdit) { ?>
-<?php  } ?>
+        <?php  if ($NewRequest || $CanEdit) { ?>
+        <?php  } ?>
         <tr>
           <td class="label">Description</td>
           <td>
-<?php          new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
+            <?php          new TEXTAREA_PREVIEW('description', 'req_desc', $Request['Description']??''); ?>
           </td>
         </tr>
-<?php  if (check_perms('site_moderate_requests')) { ?>
+        <?php  if (check_perms('site_moderate_requests')) { ?>
         <tr>
           <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 <strong>already existing</strong> on the site, please indicate that here.
+            <?=site_url()?>torrents.php?id=<input type="text"
+              name="groupid"
+              value="<?=isset($GroupID)?$GroupID:''?>"
+              size="15" /><br />
+            If this request matches a torrent group <strong>already existing</strong> on the site, please indicate that
+            here.
           </td>
         </tr>
-<?php  } 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.
-<?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?>" />
+            This request <?=($NewRequest ? 'will be' : 'is')?>
+            associated with the above torrent group.
+            <?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  }
+        <?php  }
   if ($NewRequest) { ?>
         <tr id="voting">
           <td class="label tooltip" title="How much upload credit the fulfiller wins">Bounty</td>
           <td>
-            <input type="text" id="amount_box" size="8" value="<?=(!empty($Bounty) ? $Bounty : '100')?>" onchange="Calculate();" />
+            <input type="text" id="amount_box" size="8"
+              value="<?=(!empty($Bounty) ? $Bounty : '100')?>"
+              onchange="Calculate();" />
             <select id="unit" name="unit" onchange="Calculate();">
-              <option value="mb"<?=(!empty($_POST['unit']) && $_POST['unit'] === 'mb' ? ' selected="selected"' : '') ?>>MB</option>
-              <option value="gb"<?=(!empty($_POST['unit']) && $_POST['unit'] === 'gb' ? ' selected="selected"' : '') ?>>GB</option>
+              <option value="mb" <?=(!empty($_POST['unit']) && $_POST['unit'] === 'mb' ? ' selected="selected"' : '') ?>>MB
+              </option>
+              <option value="gb" <?=(!empty($_POST['unit']) && $_POST['unit'] === 'gb' ? ' selected="selected"' : '') ?>>GB
+              </option>
             </select>
             <input type="button" value="Preview" onclick="Calculate();" />
-            <strong><?=($RequestTax * 100)?>% of this is deducted as tax by the system.</strong>
+            <strong><?=($RequestTax * 100)?>% of this is deducted as
+              tax by the system.</strong>
           </td>
         </tr>
         <tr>
           <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']?>" />
-            <input type="hidden" id="current_downloaded" value="<?=$LoggedUser['BytesDownloaded']?>" />
+            <input type="hidden" id="amount" name="amount"
+              value="<?=(!empty($Bounty) ? $Bounty : '100')?>" />
+            <input type="hidden" id="current_uploaded"
+              value="<?=$LoggedUser['BytesUploaded']?>" />
+            <input type="hidden" id="current_downloaded"
+              value="<?=$LoggedUser['BytesDownloaded']?>" />
             Bounty after tax: <strong><span id="bounty_after_tax">90.00 MB</span></strong><br />
-            If you add the entered <strong><span id="new_bounty">100.00 MB</span></strong> of bounty, your new stats will be: <br />
+            If you add the entered <strong><span id="new_bounty">100.00 MB</span></strong> of bounty, your new stats
+            will be: <br />
             Uploaded: <span id="new_uploaded"><?=Format::get_size($LoggedUser['BytesUploaded'])?></span><br />
             Ratio: <span id="new_ratio"><?=Format::get_ratio_html($LoggedUser['BytesUploaded'], $LoggedUser['BytesDownloaded'])?></span>
           </td>
@@ -282,13 +328,13 @@ View::show_header(($NewRequest ? 'Create a request' : 'Edit a request'), 'bbcode
             <input type="submit" id="button" value="Create request" disabled="disabled" />
           </td>
         </tr>
-<?php  } else { ?>
+        <?php  } else { ?>
         <tr>
           <td colspan="2" class="center">
             <input type="submit" id="button" value="Edit request" />
           </td>
         </tr>
-<?php  } ?>
+        <?php  } ?>
       </table>
     </form>
   </div>

sections/requests/take_new_edit.php

@@ -4,7 +4,6 @@
 //----------------- Take request -----------------------------------------------//
 authorize();
 
-
 if ($_POST['action'] !== 'takenew' && $_POST['action'] !== 'takeedit') {
     error(0);
 }
@@ -113,6 +112,7 @@ if (empty($_POST['artists']) && $CategoryName !== 'Other') {
 }
 
 // Not required
+/*
 if (!empty($_POST['cataloguenumber']) && $CategoryName === 'Movies') {
     $CatalogueNumber = trim($_POST['cataloguenumber']);
 } else {
@@ -123,6 +123,7 @@ if (!empty($_POST['dlsiteid']) && $CategoryName === 'Games') {
 } else {
     $DLSiteID = '';
 }
+*/
 
 // GroupID
 if (!empty($_POST['groupid'])) {
@@ -324,7 +325,7 @@ if (isset($ArtistForm)) {
         ($RequestID, ".$Artist['id'].")");
         $Cache->delete_value('artists_requests_'.$Artist['id']);
     }
-    // End Music only
+    // End music only
 } else {
     // Not a music request anymore, delete music only fields.
     if (!$NewRequest) {
@@ -367,7 +368,7 @@ if (isset($ArtistForm)) {
     }
 }
 
-//Tags
+// Tags
 if (!$NewRequest) {
     $DB->query("
     DELETE FROM requests_tags