Fix all torrent editing except publications (needs DB surgery)

classes/artists.class.php

             FROM
               `requests`
             WHERE
-              `ID` = $RequestID
+              `ID` = '$RequestID'
             ");
 
             G::$DB->query("
             FROM
               `requests_votes`
             WHERE
-              `RequestID` = $RequestID
+              `RequestID` = '$RequestID'
             ");
 
             G::$DB->query("
             FROM
               `requests_tags`
             WHERE
-              `RequestID` = $RequestID
+              `RequestID` = '$RequestID'
             ");
 
             G::$DB->query("
             FROM
               `requests_artists`
             WHERE
-              `RequestID` = $RequestID
+              `RequestID` = '$RequestID'
             ");
         }
 
         FROM
           `artists_group`
         WHERE
-          `ArtistID` = $ArtistID
+          `ArtistID` = '$ArtistID'
         ");
         G::$Cache->decrement('stats_artist_count');
 
         FROM
           `wiki_artists`
         WHERE
-          `PageID` = $ArtistID
+          `PageID` = '$ArtistID'
         ");
 
         // Delete tags
         FROM
           `artists_tags`
         WHERE
-          `ArtistID` = $ ArtistID
+          `ArtistID` = '$ArtistID'
         ");
 
         // Delete artist comments, subscriptions and quote notifications

classes/security.class.php

 
 class Security
 {
+    /**
+     * ID check
+     *
+     * Makes sure a number ID is valid,
+     * e.g., a page ID requested by GET.
+     * Optionally call authorize().
+     */
+    public function idCheck($id, $auth)
+    {
+        if (!$id || !is_int($id)) {
+            error(400);
+        }
+        
+        if ($auth) {
+            authorize();
+        }
+    }
+
     /**
      * Setup pitfalls
      *

sections/torrents/details.php

         </td>
       </tr>';
         }
-        $ReportInfo .= "\n\t\t</table>";
+        $ReportInfo .= "</table>";
     }
 
     $CanEdit = (check_perms('torrents_edit') || (($UserID == $LoggedUser['ID'] && !$LoggedUser['DisableWiki']) && !($Remastered && !$RemasterYear)));
   </table>';
 
     $ExtraInfo = ''; // String that contains information on the torrent (e.g., format and encoding)
-    $AddExtra = '&thinsp;|&thinsp;'; // Separator between torrent properties
+    $AddExtra = '&Tab;|&Tab;'; // Separator between torrent properties
 
   // Similar to Torrents::torrent_info()
     if ($Media) {
-        $ExtraInfo .= display_str($Media);
+        $ExtraInfo .= '<x style="tooltip" title="Platform">'.display_str($Media).'</x>';
     }
 
     if ($Container) {
-        $ExtraInfo .= $AddExtra . display_str($Container);
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Format">'.display_str($Container).'</x>';
     }
 
     if ($Archive) {
-        $ExtraInfo .= $AddExtra . display_str($Archive);
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Archive">'.display_str($Archive).'</x>';
     }
 
     if ($Codec) {
-        $ExtraInfo .= $AddExtra . display_str($Codec);
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="License">'.display_str($Codec).'</x>';
     }
 
     if ($Resolution) {
-        $ExtraInfo .= $AddExtra . display_str($Resolution);
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Scope">'.display_str($Resolution).'</x>';
     }
 
     /*
     if ($AudioFormat) {
         $ExtraInfo.=$AddExtra.display_str($AudioFormat);
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Accession Number">'.display_str($AudioFormat).'</x>';
     }
     */
 
     if ($Censored) {
-        $ExtraInfo .= $AddExtra . display_str('Aligned');
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Aligned/Annotated">Yes</x>';
     } else {
-        $ExtraInfo .= $AddExtra . display_str('Not Aligned');
+        $ExtraInfo .= $AddExtra.'<x style="tooltip" title="Aligned/Annotated">No</x>';
     }
 
     if (!$ExtraInfo) {
     }
 
     if ($IsLeeching) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Leeching', 'important_text_semi');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Leeching', 'important_text_semi');
     } elseif ($IsSeeding) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Seeding', 'important_text_alt');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Seeding', 'important_text_alt');
     } elseif ($IsSnatched) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Snatched', 'bold');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Snatched', 'bold');
     }
 
     if ($FreeTorrent === '1') {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Freeleech', 'important_text_alt');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Freeleech', 'important_text_alt');
     }
 
     if ($FreeTorrent === '2') {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Neutral Leech', 'bold');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Neutral Leech', 'bold');
     }
 
     // Freleechizer
     }
 
     if ($PersonalFL) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Personal Freeleech', 'important_text_alt');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Personal Freeleech', 'important_text_alt');
     }
 
     if ($Reported) {
         $HtmlReportType = ucfirst($Reports[0]['Type']);
         $HtmlReportComment = htmlentities(htmlentities($Reports[0]['UserComment']));
-        $ExtraInfo .= $AddExtra . "<strong class='torrent_label tl_reported tooltip' title='Type: $HtmlReportType<br>Comment: $HtmlReportComment'>".Format::torrent_label('Reported', 'important_text')."</strong>";
+        $ExtraInfo .= $AddExtra."<strong class='torrent_label tl_reported tooltip' title='Type: $HtmlReportType<br>Comment: $HtmlReportComment'>".Format::torrent_label('Reported', 'important_text')."</strong>";
     }
 
     if (!empty($BadTags)) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Tags', 'important_text');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Bad Tags', 'important_text');
     }
 
     if (!empty($BadFolders)) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad Folders', 'important_text');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Bad Folders', 'important_text');
     }
 
     if (!empty($BadFiles)) {
-        $ExtraInfo .= $AddExtra . Format::torrent_label('Bad File Names', 'important_text');
+        $ExtraInfo .= $AddExtra.Format::torrent_label('Bad File Names', 'important_text');
     }
 
     $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];

sections/torrents/editgroup.php

 FROM
   `torrents_screenshots`
 WHERE
-  TorrentID = '".db_string($TorrentID)."'
+  `GroupID` = '$GroupID'
 ");
 
 if ($DB->has_results()) {
     'Edit torrent group',
     'upload,bbcode,vendor/easymde.min',
     'vendor/easymde.min'
-);
+); ?>
 
-// Start printing form
-?>
 <h2 class="header">
   Edit
   <a href="torrents.php?id=<?=$GroupID?>"><?=($Name ? $Name : ($Title2 ? $Title2 : $NameJP))?></a>
       Picture
     </h3>
 
-    <input type="text" name="image" size="92" value="<?=$Image?>" />
+    <input type="text" name="image" size="80" value="<?=$Image?>" />
     <br /><br />
 
     <h3>
       Edit Summary
     </h3>
 
-    <input type="text" name="summary" size="92" />
+    <input type="text" name="summary" size="80" />
     <br />
 
     <div class="center pad">
         </td>
 
         <td>
-          <input type="checkbox" id="unfreeleech" name="unfreeleech" /><label for="unfreeleech"> Reset</label>
-          <input type="checkbox" id="freeleech" name="freeleech" /><label for="freeleech"> Freeleech</label>
-          <input type="checkbox" id="neutralleech" name="neutralleech" /><label for="neutralleech"> Neutral
-            Leech</label>
+          <input type="checkbox" id="unfreeleech" name="unfreeleech" />
+          <label for="unfreeleech"> Reset</label>
+
+          <input type="checkbox" id="freeleech" name="freeleech" />
+          <label for="freeleech"> Freeleech</label>
+
+          <input type="checkbox" id="neutralleech" name="neutralleech" />
+          <label for="neutralleech"> Neutral Leech</label>
+
           because
+
           <select name="freeleechtype">
             <?php $FL = array('N/A', 'Staff Pick', 'Perma-FL', 'Freeleechizer', 'Site-Wide FL');
     foreach ($FL as $Key => $FLType) { ?>
     </table>
 
     <div class="center pad">
-    <input type="submit" value="Edit" />
+      <input type="submit" value="Edit" />
     </div>
   </form>
 </div>
     </div>
   </form>
 </div>
-<?php } ?>
-<?php View::show_footer();
+<?php
+}
+
+View::show_footer();

sections/torrents/functions.php

         FROM
           `torrents_mirrors`
         WHERE
-          TorrentID = '$TorrentID'
+          `GroupID` = '$GroupID'
         ");
   
         if ($DB->has_results()) {

sections/torrents/nonwikiedit.php

 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
-authorize();
+$GroupID = (int) $_POST['groupid'];
+Security::idCheck($GroupID, true);
 
-//Set by system
-if (!$_POST['groupid'] || !is_number($_POST['groupid'])) {
-    error(404);
-}
-$GroupID = $_POST['groupid'];
-
-//Usual perm checks
+// Usual perm checks
 if (!check_perms('torrents_edit')) {
     $DB->query("
-    SELECT UserID
-    FROM torrents
-    WHERE GroupID = $GroupID");
+    SELECT
+      `UserID`
+    FROM
+      `torrents`
+    WHERE
+      `GroupID` = '$GroupID'
+    ");
+
     if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
         error(403);
     }
 }
 
-
-if (check_perms('torrents_freeleech') && (isset($_POST['freeleech']) xor isset($_POST['neutralleech']) xor isset($_POST['unfreeleech']))) {
+if (check_perms('torrents_freeleech')
+  && (isset($_POST['freeleech'])
+  xor isset($_POST['neutralleech'])
+  xor isset($_POST['unfreeleech']))) {
     if (isset($_POST['freeleech'])) {
         $Free = 1;
     } elseif (isset($_POST['neutralleech'])) {
         $Free = 0;
     }
 
-    if (isset($_POST['freeleechtype']) && in_array($_POST['freeleechtype'], array(0, 1, 2, 3))) {
+    if (isset($_POST['freeleechtype']) && in_array($_POST['freeleechtype'], [0, 1, 2, 3])) {
         $FreeType = $_POST['freeleechtype'];
     } else {
         error(404);
 
 $Artists = $_POST['idols'];
 
-//Escape fields
+// Escape fields
 $Studio = db_string($_POST['studio']);
 $Series = db_string($_POST['series']);
 $Year = db_string((int)$_POST['year']);
 
 // Get some info for the group log
 $DB->query("
-  SELECT Year
-  FROM torrents_group
-  WHERE ID = $GroupID");
+SELECT
+  `Year`
+FROM
+  `torrents_group`
+WHERE
+  `ID` = '$GroupID'
+");
 list($OldYear) = $DB->next_record();
 
-
-
 $DB->query("
-  UPDATE torrents_group
-  SET
-    Year = '$Year',
-    CatalogueNumber = '".$CatalogueNumber."',
-    Studio = '$Studio',
-    Series = '$Series',
-  WHERE ID = $GroupID");
-
-if ($OldYear != $Year) {
+UPDATE
+  `torrents_group`
+SET
+  `Year` = '$Year',
+  `CatalogueNumber` = '$CatalogueNumber',
+  `Studio` = '$Studio',
+  `Series` = '$Series'
+WHERE
+  `ID` = '$GroupID'
+");
+
+if ($OldYear !== $Year) {
+    $Message = db_string("Year changed from $OldYear to $Year");
     $DB->query("
-    INSERT INTO group_log (GroupID, UserID, Time, Info)
-    VALUES ('$GroupID', ".$LoggedUser['ID'].", NOW(), '".db_string("Year changed from $OldYear to $Year")."')");
+    INSERT INTO `group_log`
+      (`GroupID`, `UserID`, `Time`, `Info`)
+    VALUES(
+      '$GroupID',
+      ".$LoggedUser['ID'].",
+      NOW(),
+      '$Message')
+    ");
 }
 
 $DB->query("
-  SELECT ag.Name
-  FROM artists_group AS ag
-    JOIN torrents_artists AS ta ON ag.ArtistID = ta.ArtistID
-  WHERE ta.GroupID = ".$GroupID);
+SELECT
+  ag.`Name`
+FROM
+  `artists_group` AS ag
+JOIN `torrents_artists` AS ta
+ON
+  ag.`ArtistID` = ta.`ArtistID`
+WHERE
+  ta.`GroupID` = '$GroupID'
+");
 
 while ($r = $DB->next_record(MYSQLI_ASSOC, true)) {
     $CurrArtists[] = $r['Name'];
 
 foreach ($Artists as $Artist) {
     if (!in_array($Artist, $CurrArtists)) {
+        $Artist = db_string($Artist);
         $DB->query("
-      SELECT ArtistID
-      FROM artists_group
-      WHERE Name = '".db_string($Artist)."'");
+        SELECT
+          `ArtistID`
+        FROM
+          `artists_group`
+        WHERE
+          `Name` = '$Artist'
+        ");
+
         if ($DB->has_results()) {
             list($ArtistID) = $DB->next_record();
         } else {
             $DB->query("
-        INSERT INTO artists_group
-        (Name)
-        VALUES
-        ('".db_string($Artist)."')");
+            INSERT INTO `artists_group`(`Name`)
+            VALUES('$Artist')
+            ");
             $ArtistID = $DB->inserted_id();
         }
-        $DB->query("
-      INSERT INTO torrents_artists
-      (GroupID, ArtistID, UserID)
-      VALUES
-      (".$GroupID.", ".$ArtistID.", ".$LoggedUser['ID'].")
-      ON DUPLICATE KEY UPDATE UserID=".$LoggedUser['ID']); // Why does this even happen
+
+        $DB->query(
+            "
+        INSERT INTO `torrents_artists`(`GroupID`, `ArtistID`, `UserID`)
+        VALUES(
+          '$GroupID',
+          '$ArtistID',
+          ".$LoggedUser['ID']."
+        )
+        ON DUPLICATE KEY
+        UPDATE
+          `UserID` = ".$LoggedUser['ID']
+        ); // Why does this even happen
         $Cache->delete_value('artist_groups_'.$ArtistID);
     }
 }
 
 foreach ($CurrArtists as $CurrArtist) {
     if (!in_array($CurrArtist, $Artists)) {
+        $CurrArtist = db_string($CurrArtist);
+
         $DB->query("
-      SELECT ArtistID
-      FROM artists_group
-      WHERE Name = '".db_string($CurrArtist)."'");
+        SELECT
+          `ArtistID`
+        FROM
+          `artists_group`
+        WHERE
+          `Name` = '$CurrArtist'
+        ");
+
         if ($DB->has_results()) {
             list($ArtistID) = $DB->next_record();
 
             $DB->query("
-        DELETE FROM torrents_artists
-        WHERE ArtistID = ".$ArtistID."
-          AND GroupID = ".$GroupID);
+            DELETE
+            FROM
+              `torrents_artists`
+            WHERE
+              `ArtistID` = '$ArtistID'
+              AND `GroupID` = '$GroupID'
+            ");
 
             $DB->query("
-        SELECT GroupID
-        FROM torrents_artists
-        WHERE ArtistID = ".$ArtistID);
+            SELECT
+              `GroupID`
+            FROM
+              `torrents_artists`
+            WHERE
+              `ArtistID` = '$ArtistID'
+            ");
 
             $Cache->delete_value('artist_groups_'.$ArtistID);
 
             if (!$DB->has_results()) {
                 $DB->query("
-          SELECT RequestID
-          FROM requests_artists
-          WHERE ArtistID = ".$ArtistID."
-            AND ArtistID != 0");
+                SELECT
+                  `RequestID`
+                FROM
+                  `requests_artists`
+                WHERE
+                  `ArtistID` = '$ArtistID'
+                  AND `ArtistID` != 0
+                ");
+
                 if (!$DB->has_results()) {
                     Artists::delete_artist($ArtistID);
                 }
 }
 
 $DB->query("
-  SELECT ID
-  FROM torrents
-  WHERE GroupID = '$GroupID'");
+SELECT
+  `ID`
+FROM
+  `torrents`
+WHERE
+  `GroupID` = '$GroupID'
+");
+
 while (list($TorrentID) = $DB->next_record()) {
     $Cache->delete_value("torrent_download_$TorrentID");
 }
+
 Torrents::update_hash($GroupID);
 $Cache->delete_value("torrents_details_$GroupID");
-
 header("Location: torrents.php?id=$GroupID");

sections/torrents/screenshotedit.php

-<?
+<?php
+declare(strict_types=1);
 
 authorize();
 
-if (!$_POST['groupid'] || !is_number($_POST['groupid'])) {
-  error(404);
-}
 $GroupID = $_POST['groupid'];
+if (!$GroupID || !is_number($GroupID)) {
+    error(404);
+}
 
 if (!check_perms('torrents_edit') && !check_perms('screenshots_add') && !check_perms('screenshots_delete')) {
-  $DB->query("
-    SELECT UserID
-    FROM torrents
-    WHERE GroupID = ?", $GroupID);
-  if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
-    error(403);
-  }
+    $DB->query("
+    SELECT
+      `UserID`
+    FROM
+      `torrents`
+    WHERE
+      `GroupID` = '$GroupID'
+    ")
+    ;
+    if (!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
+        error(403);
+    }
 }
 
 $Screenshots = $_POST['screenshots'] ?? [];
 $Screenshots = array_map("trim", $Screenshots);
-$Screenshots = array_filter($Screenshots, function($s) {
-  return preg_match('/^'.IMAGE_REGEX.'$/i', $s);
+$Screenshots = array_filter($Screenshots, function ($s) {
+    return preg_match('/^'.DOI_REGEX.'$/i', $s);
 });
 $Screenshots = array_unique($Screenshots);
 
 if (count($Screenshots) > 10) {
-  error("You cannot add more than 10 screenshots to a group");
+    error("You cannot add more than 10 publications to a group");
 }
 
 $DB->query("
-  SELECT UserID, Image
-  FROM torrents_screenshots
-  WHERE GroupID = ?", $GroupID);
+SELECT
+  `UserID`,
+  `URI`
+FROM
+  `torrents_screenshots`
+WHERE
+  `GroupID` = '$GroupID'
+");
 
 // $Old is an array of the form URL => UserID where UserID is the ID of the User who originally uploaded that image.
 $Old = [];
 if ($DB->has_results()) {
-  while($S = $DB->next_record(MYSQLI_ASSOC)) {
-    $Old[$S['Image']] = $S['UserID'];
-  }
+    while ($S = $DB->next_record(MYSQLI_ASSOC)) {
+        $Old[$S['Image']] = $S['UserID'];
+    }
 }
 
 if (!empty($Old)) {
-  $New = array_diff($Screenshots, array_keys($Old));
-  $Deleted = array_diff(array_keys($Old), $Screenshots);
+    $New = array_diff($Screenshots, array_keys($Old));
+    $Deleted = array_diff(array_keys($Old), $Screenshots);
 } else {
-  $New = $Screenshots;
+    $New = $Screenshots;
 }
 
 // Deletion
 if (!empty($Deleted)) {
-  if (check_perms('screenshots_delete') || check_perms('torrents_edit')) {
-    $DeleteList = $Deleted;
-  } else {
-    $DeleteList = [];
-    foreach ($Deleted as $S) {
-      // If the user who submitted this request uploaded the image, add the image to the list.
-      if ($Old[$S] == $LoggedUser['ID']) {
-        $DeleteList[] = $S;
-      } else {
-        error(403);
-      }
-    }
-  }
+    if (check_perms('screenshots_delete') || check_perms('torrents_edit')) {
+        $DeleteList = $Deleted;
+    } else {
+        $DeleteList = [];
+        foreach ($Deleted as $S) {
 
-  if (!empty($DeleteList)) {
-    $ScreenDel = '';
-    $DB->prepare_query("DELETE FROM torrents_screenshots WHERE Image = ?", $ScreenDel);
-    foreach ($DeleteList as $ScreenDel) {
-      $DB->exec_prepared_query();
+            // If the user who submitted this request uploaded the image, add the image to the list.
+            if ($Old[$S] === $LoggedUser['ID']) {
+                $DeleteList[] = $S;
+            } else {
+                error(403);
+            }
+        }
     }
 
-    Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Deleted screenshot(s) ".implode(' , ', $DeleteList), 0);
-    Misc::write_log("Screenshots ( ".implode(' , ', $DeleteList)." ) deleted from Torrent Group ".$GroupID." by ".$LoggedUser['Username']);
-  }
+    if (!empty($DeleteList)) {
+        $ScreenDel = '';
+        $DB->prepare_query("
+        DELETE
+        FROM
+          `torrents_screenshots`
+        WHERE
+          `URI` = '$ScreenDel'
+        ");
+
+        foreach ($DeleteList as $ScreenDel) {
+            $DB->exec_prepared_query();
+        }
+
+        Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Deleted screenshot(s) ".implode(' , ', $DeleteList), 0);
+        Misc::write_log("Screenshots ( ".implode(' , ', $DeleteList)." ) deleted from Torrent Group ".$GroupID." by ".$LoggedUser['Username']);
+    }
 }
 
 // New screenshots
 if (!empty($New)) {
-  $Screenshot = '';
-  $DB->prepare_query("
-    INSERT INTO torrents_screenshots
-      (GroupID, UserID, Time, Image)
+    $Screenshot = '';
+    $DB->prepare_query(
+        "
+    INSERT INTO `torrents_screenshots`
+      (`GroupID`, `UserID`, `Time`, `URI`)
     VALUES
       (?, ?, NOW(), ?)",
-    $GroupID, $LoggedUser['ID'], $Screenshot);
-  foreach ($New as $Screenshot) {
-    $DB->exec_prepared_query();
-  }
+        $GroupID,
+        $LoggedUser['ID'],
+        $Screenshot
+    );
 
-  Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Added screenshot(s) ".implode(' , ', $New), 0);
-  Misc::write_log("Screenshots ( ".implode(' , ', $New)." ) added to Torrent Group ".$GroupID." by ".$LoggedUser['Username']);
+    foreach ($New as $Screenshot) {
+        $DB->exec_prepared_query();
+    }
+
+    Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "Added screenshot(s) ".implode(' , ', $New), 0);
+    Misc::write_log("Screenshots ( ".implode(' , ', $New)." ) added to Torrent Group ".$GroupID." by ".$LoggedUser['Username']);
 }
 
 $Cache->delete_value("torrents_details_".$GroupID);
 header("Location: torrents.php?id=$GroupID");
-
-?>