Bring up to date with Oppaitime's repo

classes/torrent_form.class.php

@@ -414,8 +414,14 @@ Source: <input type="text" value="<?=Users::get_upload_sources()[0]?>" size="20"
 <?php new TEXTAREA_PREVIEW('release_desc', 'release_desc', display_str($Torrent['TorrentDescription']??''), 60, 8); ?>
         </td>
       </tr>
+      <tr id="censored_tr">
+        <td class="label">Aligned Sequence?</td>
+        <td>
+          <input type="checkbox" name="censored" value="1" <?=(($Torrent['Censored'] ?? 0) ? 'checked ' : '')?>/>
+        </td>
+      </tr>
       <tr id="anon_tr">
-        <td class="label tooltip" title="Checking this will hide your username from other users on the torrent details page. Stats will still be attributed to you.">Upload Anonymously</td>
+        <td class="label tooltip" title="Checking this will hide your username from other users on the torrent details page. Stats will still be attributed to you.">Upload Anonymously?</td>
         <td><input type="checkbox" name="anonymous" value="1" <?=(($Torrent['Anonymous'] ?? false) ? 'checked ' : '')?>/></td>
       </tr>
     </table>

classes/torrents.class.php

@@ -675,11 +675,9 @@ class Torrents {
     if (!empty($Data['Archive'])) {
       $Info[] = $Data['Archive'];
     }
-    /*
     if (isset($Data['Censored']) && !$Data['Censored']) {
-      $Info[] = $HTMLy ? Format::torrent_label('Uncensored') : 'Uncensored';
+      $Info[] = $HTMLy ? Format::torrent_label('Unaligned') : 'Unaligned';
     }
-    */
     if ($Data['IsLeeching']) {
       $Info[] = $HTMLy ? Format::torrent_label('Leeching') : 'Leeching';
     } else if ($Data['IsSeeding']) {

gazelle.sql

@@ -1078,7 +1078,7 @@ CREATE TABLE `torrents` (
   `Language` varchar(20) DEFAULT NULL,
   `Censored` tinyint(1) NOT NULL DEFAULT '1',
   `Anonymous` tinyint(1) NOT NULL DEFAULT '0',
-  `info_hash` blob NOT NULL DEFAULT NULL,
+  `info_hash` blob NOT NULL,
   `FileCount` int(6) NOT NULL DEFAULT NULL,
   `FileList` mediumtext,
   `FilePath` varchar(255) NOT NULL DEFAULT '',

sections/torrents/browse.php

@@ -254,9 +254,9 @@ View::show_header('Browse Torrents', 'browse');
               <option value="0"<?Format::selected('freetorrent', 0)?>>Normal</option>
             </select>
             <select name="censored" class="ft_censored fti_advanced">
-              <option value="">Original?</option>
-              <option value="1"<?Format::selected('censored', 1)?>>Original</option>
-              <option value="0"<?Format::selected('censored', 0)?>>Not Original</option>
+              <option value="">Aligned Sequence?</option>
+              <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
+              <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
             </select>
           </td>
         </tr>

sections/torrents/details.php

@@ -497,7 +497,7 @@ foreach ($TorrentList as $Torrent) {
     $ExtraInfo.=$AddExtra.'<strong class="torrent_label tl_reported tooltip" title="Type: '.ucfirst($Reports[0]['Type']).'<br>Comment: '.htmlentities(htmlentities($Reports[0]['UserComment'])).'">Reported</strong>';
     $AddExtra=' / ';
   }
-  #if (!$Censored) { $ExtraInfo .= $AddExtra.Format::torrent_label('Uncensored'); $AddExtra=' / '; }
+  if (!$Censored) { $ExtraInfo .= $AddExtra.Format::torrent_label('Unaligned'); $AddExtra=' / '; }
   if (!empty($BadTags)) { $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Tags'); $AddExtra=' / '; }
   if (!empty($BadFolders)) { $ExtraInfo.=$AddExtra. Format::torrent_label('Bad Folders'); $AddExtra=' / '; }
   if (!empty($BadFiles)) { $ExtraInfo.=$AddExtra. Format::torrent_label('Bad File Names'); $AddExtra=' / '; }

sections/torrents/user.php

@@ -383,9 +383,9 @@ $Pages = Format::get_pages($Page, $TorrentCount, TORRENTS_PER_PAGE);
           <td class="label"><strong>Misc:</strong></td>
           <td class="nobr" colspan="3">
             <select name="censored" class="ft_censored">
-              <option value="3">Original?</option>
-              <option value="1"<?Format::selected('censored', 1)?>>Original</option>
-              <option value="0"<?Format::selected('censored', 0)?>>Not Original</option>
+              <option value="3">Aligned Sequence?</option>
+              <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
+              <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
             </select>
           </td>
         </tr>

sections/upload/upload_handle.php

@@ -74,6 +74,7 @@ if (isset($_POST['release'])) {
 
 $Properties['GroupDescription'] = trim($_POST['album_desc']);
 $Properties['TorrentDescription'] = $_POST['release_desc'];
+$Properties['MediaInfo'] = '';
 #$Properties['MediaInfo'] = $_POST['mediainfo'];
 $Properties['Screenshots'] = isset($_POST['screenshots']) ? $_POST['screenshots'] : "";
 
@@ -81,6 +82,7 @@ if ($_POST['album_desc']) {
   $Properties['GroupDescription'] = trim($_POST['album_desc']);
 } elseif ($_POST['desc']) {
   $Properties['GroupDescription'] = trim($_POST['desc']);
+  $Properties['MediaInfo'] = '';
   #$Properties['MediaInfo'] = $_POST['mediainfo'];
 }
 
@@ -150,7 +152,7 @@ switch ($Type) {
 
     $Validate->SetFields('release_desc',
       '0','string','The release description has a minimum length of 10 characters.', array('maxlength'=>1000000, 'minlength'=>10));
-    */
+  */
 
   default:
     if (!isset($_POST['groupid']) || !$_POST['groupid']) {
@@ -375,20 +377,6 @@ if ((!isset($GroupID) || !$GroupID)) {
 if (!isset($GroupID) || !$GroupID) {
   // Create torrent group
   $DB->query("
-    INSERT INTO torrents_group
-      (CategoryID, Name, NameRJ, NameJP, Year,
-      Series, Studio, CatalogueNumber, Pages, Time,
-      WikiBody, WikiImage)
-    VALUES
-      ( ?, ?, ?, ?, ?,
-        ?, ?, ?, ?, NOW(),
-        ?, ? )",
-    $TypeID, $T['Title'], $T['TitleRJ'], $T['TitleJP'], $T['Year'],
-    $T['Series'], $T['Studio'], $T['CatalogueNumber'], $T['Pages'],
-    $Body, $T['Image']);
-
-    /* Original DB query
-      $DB->query("
     INSERT INTO torrents_group
       (CategoryID, Name, NameRJ, NameJP, Year,
       Series, Studio, CatalogueNumber, Pages, Time,
@@ -400,8 +388,6 @@ if (!isset($GroupID) || !$GroupID) {
     $TypeID, $T['Title'], $T['TitleRJ'], $T['TitleJP'], $T['Year'],
     $T['Series'], $T['Studio'], $T['CatalogueNumber'], $T['Pages'],
     $Body, $T['Image'], $T['DLsiteID']);
-    */
-
   $GroupID = $DB->inserted_id();
   foreach ($ArtistForm as $Num => $Artist) {
     $DB->query("
@@ -512,20 +498,6 @@ if (($Type == 'Movies' || $Type == 'Anime') && ($T['Container'] == 'ISO' || $T['
 
 // Torrent
 $DB->query("
-  INSERT INTO torrents
-    (GroupID, UserID, Media, Container, Codec, Resolution,
-    Anonymous, Archive, info_hash, FileCount, FileList, FilePath, Size, Time,
-    Description, FreeTorrent, FreeLeechType)
-  VALUES
-    ( ?, ?, ?, ?, ?, ?,
-      ?, ?, ?, ?, ?, ?, ?, NOW(),
-      ?, ?, ? )",
-  $GroupID, $LoggedUser['ID'], $T['Media'], $T['Container'], $T['Codec'], $T['Resolution'],
-  $T['Anonymous'], $T['Archive'], $InfoHash, $NumFiles, $FileString, $FilePath, $TotalSize,
-  $T['TorrentDescription'], $T['FreeTorrent'], $T['FreeLeechType']);
-
-  /* Original DB query
-  $DB->query("
   INSERT INTO torrents
     (GroupID, UserID, Media, Container, Codec, Resolution,
     AudioFormat, Subbing, Language, Subber, Censored,
@@ -540,28 +512,17 @@ $DB->query("
   $T['AudioFormat'], $T['Subbing'], $T['Language'], $T['Subber'], $T['Censored'],
   $T['Anonymous'], $T['Archive'], $InfoHash, $NumFiles, $FileString, $FilePath, $TotalSize,
   $T['TorrentDescription'], $T['MediaInfo'], $T['FreeTorrent'], $T['FreeLeechType']);
-  */
 
 $Cache->increment('stats_torrent_count');
 $TorrentID = $DB->inserted_id();
 $Tor->Dec['comment'] = 'https://'.SITE_DOMAIN.'/torrents.php?torrentid='.$TorrentID;
 
-# Mitigate $TorrentID = 0 bug on some uploads
-# @todo Investigate this further and properly fix
-if ($TorrentID !== 0) {
-  Tracker::update_tracker('add_torrent', [
-    'id'          => $TorrentID,
-    'info_hash'   => rawurlencode($InfoHash),
-    'freetorrent' => $T['FreeTorrent']
-  ]);
-  $Debug->set_flag('upload: ocelot updated');
-} else {
-  $TorrentID_debug = $DB->query("
-    SELECT MAX(ID) FROM torrents
-  ");
-  var_dump($TorrentID_debug);
-  error(0);
-}
+Tracker::update_tracker('add_torrent', [
+  'id'          => $TorrentID,
+  'info_hash'   => rawurlencode($InfoHash),
+  'freetorrent' => $T['FreeTorrent']
+]);
+$Debug->set_flag('upload: ocelot updated');
 
 // Prevent deletion of this torrent until the rest of the upload process is done
 // (expire the key after 10 minutes to prevent locking it for too long in case there's a fatal error below)

static/styles/beluga/style.css

@@ -55,20 +55,6 @@
   letter-spacing: -2px;
 }
 .group .cats_other { background-color: #4DC593; }
-/* Unused categories
-.cats_audio:after {
-  content: "AUD";
-  color: #77C5D4;
-  font-size: 18px;
-}
-.group .cats_audio { background-color: #77C5D4; }
-.cats_other:after {
-  content: "OTH";
-  color: #0D5968;
-  font-size: 19px;
-}
-.group .cats_other { background-color: #0D5968; }
-*/
 
 body {
   width: 100%;

static/styles/kuro/style.css

@@ -5,14 +5,8 @@
 .cats_rna { width: 36px; height: 36px; background: url('/static/common/caticons/rna.png') no-repeat center center; }
 .cats_protein { width: 36px; height: 36px; background: url('/static/common/caticons/protein.png') no-repeat center center; }
 .cats_other { width: 36px; height: 36px; background: url('/static/common/caticons/other.png') no-repeat center center; }
-/* Unused categories
-.cats_ebooks { width: 28px; height: 28px; background: url('images/ebook.png') no-repeat center center; }
-.cats_elearningvideos { width: 28px; height: 28px; background: url('images/elearning.png') no-repeat center center; }
-.cats_music { width: 28px; height: 28px; background: url('images/music.png') no-repeat center center; }
-*/
 
 /* Global */
-
 * {
   padding: 0em;
   margin: 0em;

static/styles/oppai/style.css

@@ -9,11 +9,6 @@
 .cats_rna { width: 36px; height: 36px; background: url('/static/common/caticons/rna.png') no-repeat center center; }
 .cats_protein { width: 36px; height: 36px; background: url('/static/common/caticons/protein.png') no-repeat center center; }
 .cats_other { width: 36px; height: 36px; background: url('/static/common/caticons/other.png') no-repeat center center; }
-/* Unused categories
-.cats_ebooks { width: 28px; height: 28px; background: url('images/ebook.png') no-repeat center center; }
-.cats_elearningvideos { width: 28px; height: 28px; background: url('images/elearning.png') no-repeat center center; }
-.cats_music { width: 28px; height: 28px; background: url('images/music.png') no-repeat center center; }
-*/
 
 /* Global */
 * {