Fix SQL error on edit handler and minor edits

classes/rules.class.php

@@ -53,7 +53,7 @@ class Rules
   <li>Tags should be comma-separated, and you should use a period to separate words inside a tag, e.g., <strong
       class="important_text_alt">gram.negative</strong>.</li>
 
-  <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.
+  <li>There is a list of official tags <?=($OnUpload ? 'to the left of the text box' : 'on the <a href="upload.php">upload page</a>')?>.
     Please use these tags instead of "unofficial" tags, e.g., use the official <strong
       class="important_text_alt">fungi</strong> tag instead of an unofficial <strong
       class="important_text">mushrooms</strong> tag.</li>
@@ -89,7 +89,7 @@ class Rules
   <li><strong>All uploads require a minimum of 5 tags.</strong> Please don't add unrelated tags just to meet the 5 tag
     requirement. If you can't think of 5 tags for your content, study it again until you can.</li>
 
-  <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong>
+  <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on the <a href="upload.php">upload page</a>')?>.</strong>
     If you doubt whether or not a tag is acceptable, please omit it for now and send a staff PM to request a new
     official tag or an approved alias.</li>
 </ul>
@@ -112,8 +112,8 @@ class Rules
     Thank you.</li>
 
   <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a
-    financial instrument. You'll be banned on the spot. The exceptions: cryptocurrencies that derive their value from
-    work performed on distributed science computation networks, i.e., Curecoin, FoldingCoin, and Gridcoin.</li>
+    financial instrument. You'll be banned on the spot. The exceptions: discussions about cryptocurrencies that derive their value from
+    work performed on distributed science networks, i.e., Curecoin, FoldingCoin, and Gridcoin.</li>
 
   <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the
     General board. Limit all discussion of trading biomaterials, including bulk giveaways, to the Marketplace forum
@@ -133,7 +133,7 @@ class Rules
     quoting more than 3 levels deep.</li>
 
   <li>Don't post potentially malicious links without sufficient warning, or post pictures > 2 MiB. Please only speak
-    English as stated in the Upload rules.</li>
+    English as stated in the upload rules.</li>
 </ul>
 <?php
     }

sections/collages/browse.php

@@ -319,7 +319,7 @@ foreach ($Collages as $Collage) {
       <a href="collages.php?action=search&amp;cats[<?=(int)$CategoryID?>]=1"><?=$CollageCats[(int)$CategoryID]?></a>
     </td>
     <td>
-      <a href="collages.php?id=<?=$ID?>"><?=$Name?></a>
+      <a id="collage_name" href="collages.php?id=<?=$ID?>"><?=$Name?></a>
 <?  if ($BookmarkView) { ?>
       <span class="float_right">
         <a href="#" onclick="Unbookmark('collage', <?=$ID?>, ''); return false;" class="brackets">Remove bookmark</a>

sections/requests/requests.php

@@ -522,7 +522,9 @@ View::show_header($Title, 'requests');
         <div title="<?=Format::pretty_category($Request['CategoryID'])?>" class="tooltip <?=Format::css_category($Request['CategoryID'])?>"></div>
       </td>
       <td>
+          <div id="request_name">
         <?=$FullName?>
+        </div>
         <div class="tags">
 <?php
     $TagList = [];

sections/torrents/takeedit.php

@@ -55,8 +55,8 @@ $Properties['Subber']= $_POST['subber'];
 $Properties['Censored'] = (isset($_POST['censored'])) ? '1' : '0';
 $Properties['Anonymous'] = (isset($_POST['anonymous'])) ? '1' : '0';
 
-$Properties['Container'] = (isset($_POST['container']) && $_POST['container'] !== '---') ? $_POST['container'] : '';
-$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== '---') ? $_POST['archive'] : '';
+$Properties['Container'] = (isset($_POST['container']) && $_POST['container'] !== 'Autofill') ? $_POST['container'] : '';
+$Properties['Archive'] = (isset($_POST['archive']) && $_POST['archive'] !== 'Autofill') ? $_POST['archive'] : '';
 
 if ($_POST['album_desc']) {
     $Properties['GroupDescription'] = $_POST['album_desc'];
@@ -183,6 +183,7 @@ switch ($Type) {
         'Remaster catalogue number must be between 2 and 80 characters',
         array('maxlength' => 80, 'minlength' => 2)
     );
+    */
 
     $Validate->SetFields(
         'format',
@@ -192,6 +193,7 @@ switch ($Type) {
         array('inarray' => $Formats)
     );
 
+    /*
     $Validate->SetFields(
         'bitrate',
         '1',
@@ -227,6 +229,7 @@ switch ($Type) {
             array('inarray' => $Bitrates)
         );
     }
+    */
 
     $Validate->SetFields(
         'media',
@@ -236,6 +239,7 @@ switch ($Type) {
         array('inarray' => $Media)
     );
 
+    /*
     $Validate->SetFields(
         'release_desc',
         '0',
@@ -252,6 +256,7 @@ switch ($Type) {
 
 $Err = $Validate->ValidateForm($_POST); // Validate the form
 
+/*
 if ($Properties['Remastered'] && !$Properties['RemasterYear']) {
     // Unknown Edit!
     if ($LoggedUser['ID'] === $UserID || check_perms('edit_unknowns')) {
@@ -260,6 +265,7 @@ if ($Properties['Remastered'] && !$Properties['RemasterYear']) {
         $Err = "You may not edit someone else's upload to unknown release";
     }
 }
+*/
 
 // Strip out Amazon's padding
 $AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
@@ -322,22 +328,20 @@ $DBTorVals = $DBTorVals[0];
 $LogDetails = '';
 foreach ($DBTorVals as $Key => $Value) {
     $Value = "'$Value'";
-    if ($Value != $T[$Key]) {
+    if ($Value !== $T[$Key]) {
         if (!isset($T[$Key])) {
             continue;
         }
-        if ((empty($Value) && empty($T[$Key])) || ($Value == "'0'" && $T[$Key] == "''")) {
+        if ((empty($Value) && empty($T[$Key])) || ($Value === "'0'" && $T[$Key] === "''")) {
             continue;
         }
-        if ($LogDetails == '') {
+        if ($LogDetails === '') {
             $LogDetails = "$Key: $Value -> ".$T[$Key];
         } else {
             $LogDetails = "$LogDetails, $Key: $Value -> ".$T[$Key];
         }
     }
 }
-$T['Censored'] = $Properties['Censored'];
-$T['Anonymous'] = $Properties['Anonymous'];
 
 // Update info for the torrent
 /*
@@ -359,14 +363,14 @@ $SQL = "
   UPDATE torrents
   SET
     Media = $T[Media],
-    Container = $T[Container],
+    Container = '$T[Container]',
     Codec = $T[Codec],
     Resolution = $T[Resolution],
     AudioFormat = $T[AudioFormat],
     Subbing = $T[Subbing],
     Language = $T[Language],
     Subber = $T[Subber],
-    Archive = $T[Archive],
+    Archive = '$T[Archive]',
     MediaInfo = $T[MediaInfo],
     Censored = $T[Censored],
     Anonymous = $T[Anonymous],";

static/styles/matcha/style.css

@@ -758,7 +758,12 @@ ul.poll li.graph {
 
 .torrent_table tr .center, #collage_table td {
   vertical-align: middle;
-  text-align: center;
+  /* text-align: center; */
+}
+
+#collage_name,
+#request_name {
+  font-weight: bold;
 }
 
 .group_torrent span {