Start DOI and Sci-Hub integration

classes/regex.php

@@ -14,4 +14,4 @@ define('SITELINK_REGEX', RESOURCE_REGEX.'(www.)?'.preg_quote(SITE_DOMAIN, '/'));
 define('TORRENT_REGEX', SITELINK_REGEX.'\/torrents\.php\?(.*&)?torrentid=(\d+)'); // torrentid = group 4
 define('TORRENT_GROUP_REGEX', SITELINK_REGEX.'\/torrents\.php\?(.*&)?id=(\d+)'); // id = group 4
 define('ARTIST_REGEX', SITELINK_REGEX.'\/artist\.php\?(.*&)?id=(\d+)'); // id = group 4
-define('DOI_REGEX', '/^10.\d{4,9}/[-._;()/:A-Z0-9]+$/i'); # https://www.crossref.org/blog/dois-and-matching-regular-expressions/
+define('DOI_REGEX', '10.\d{4,9}\/[-._;()\/:A-Z0-9]+'); # https://www.crossref.org/blog/dois-and-matching-regular-expressions/

classes/torrent_form.class.php

@@ -334,7 +334,7 @@ class TorrentForm
       <input type="text" id="idols_<?= $Num ?>" name="idols[]"
         size="45" value="<?= display_str($Artist['name']) ?>"
         <?= $this->Disabled ?>/>
-      <?php if ($Num == 0) { ?>
+      <?php if ($Num === 0) { ?>
       <a class="add_artist_button brackets">+</a>
       <a class="remove_artist_button brackets">&minus;</a>
       <?php
@@ -584,7 +584,7 @@ class TorrentForm
     </tr>
   <?php } ?>
 
-  <!-- Artist description -->
+  <!-- Album description -->
   <tr id="group_desc_tr">
     <td class="label">Torrent Group Description</td>
     <td>

classes/validate.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /*-- TODO ---------------------------//
 Writeup how to use the VALIDATE class, add in support for form id checks
 Complete the number and date validation
@@ -14,6 +15,7 @@ class VALIDATE
         $this->Fields[$FieldName]['Type'] = strtolower($FieldType);
         $this->Fields[$FieldName]['Required'] = $Required;
         $this->Fields[$FieldName]['ErrorMessage'] = $ErrorMessage;
+
         if (!empty($Options['maxlength'])) {
             $this->Fields[$FieldName]['MaxLength'] = $Options['maxlength'];
         }

sections/upload/upload_handle.php

@@ -10,7 +10,10 @@
 // Maximum allowed size for uploaded files
 // https://php.net/upload-max-filesize
 ini_set('upload_max_filesize', 2097152); // 2 MiB
-ini_set('max_file_uploads', 100);
+
+# Allow many uncompressed files,
+# e.g., http://academictorrents.com/details/5a447ff50062194bd58dd11c0fedead59e6d873c/tech
+ini_set('max_file_uploads', 65535);
 define('MAX_FILENAME_LENGTH', 180);
 
 include(SERVER_ROOT.'/classes/validate.class.php');
@@ -82,7 +85,7 @@ if (isset($_POST['release'])) {
 $Properties['GroupDescription'] = trim($_POST['album_desc']);
 $Properties['TorrentDescription'] = $_POST['release_desc'];
 $Properties['MediaInfo'] = 'nil';
-$Properties['Screenshots'] = isset($_POST['screenshots']) ? $_POST['screenshots'] : "";
+$Properties['Screenshots'] = isset($_POST['screenshots']) ? $_POST['screenshots'] : '';
 
 if ($_POST['album_desc']) {
     $Properties['GroupDescription'] = trim($_POST['album_desc']);
@@ -168,7 +171,7 @@ switch ($Type) {
             'title',
             '0',
             'string',
-            'Sequence Name must be between 1 and 300 characters.', # `torrents_group` limits
+            'Torrent Title must be between 1 and 300 characters.', # `torrents_group` limits
             array('maxlength'=>300, 'minlength'=>1)
         );
         $Validate->SetFields(
@@ -382,7 +385,7 @@ if (!isset($GroupID) || !$GroupID) {
 // Needs to be here as it isn't set for add format until now
 $LogName .= $T['Title'];
 
-// For notifications---take note now whether it's a new group
+// For notifications. Take note now whether it's a new group
 $IsNewGroup = !isset($GroupID) || !$GroupID;
 
 //----- Start inserts
@@ -447,10 +450,13 @@ if (!isset($GroupID) || !$GroupID) {
 
     // Add screenshots
     $Screenshots = explode("\n", $T['Screenshots']);
-    $Screenshots = array_map("trim", $Screenshots);
+    $Screenshots = array_map('trim', $Screenshots);
+
     $Screenshots = array_filter($Screenshots, function ($s) {
-        return preg_match('/^'.IMAGE_REGEX.'$/i', $s);
+        return preg_match('/^'.DOI_REGEX.'$/i', $s);
+        #return preg_match('/^'.IMAGE_REGEX.'$/i', $s);
     });
+
     $Screenshots = array_unique($Screenshots);
     $Screenshots = array_slice($Screenshots, 0, 10);
 
@@ -535,9 +541,9 @@ if ($DB->has_results()) {
     }
 }
 
-// Torrents over 100 GiB are neutral leech
+// Torrents over a size in bytes are neutral leech
 // Download doesn't count, upload does
-if (($TotalSize > 107374182400)) { # 100 GiB
+if (($TotalSize > 53687091200)) { # 50 GiB
   $T['FreeTorrent'] = '2';
   $T['FreeLeechType'] = '2';
 }
@@ -595,6 +601,7 @@ $Debug->set_flag('upload: ocelot updated');
 $Cache->cache_value("torrent_{$TorrentID}_lock", true, 600);
 
 // Give BP if necessary
+// @todo Repurpose this
 if (($Type === "Movies" || $Type === "Anime") && ($T['Container'] === 'ISO' || $T['Container'] === 'M2TS' || $T['Container'] === 'VOB IFO')) {
     $BPAmt = (int) 2*($TotalSize / (1024*1024*1024))*1000;
 
@@ -682,17 +689,21 @@ if (trim($T['Image']) !== '') {
 if ($PublicTorrent) {
     View::show_header('Warning'); ?>
 <h1>Warning</h1>
-<p><strong>Your torrent has been uploaded - but you must re-download your torrent file from <a
-      href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>">here</a>
-    because the site modified it to make it private.</strong></p>
+<p>
+  <strong>Your torrent has been uploaded but you must re-download your torrent file from
+  <a href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>">here</a>
+  because the site modified it to make it private.</strong>
+</p>
 <?php
   View::show_footer();
 } elseif ($UnsourcedTorrent) {
     View::show_header('Warning'); ?>
 <h1>Warning</h1>
-<p><strong>Your torrent has been uploaded - but you must re-download your torrent file from <a
-      href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>">here</a>
-    because the site modified it to add a source flag.</strong></p>
+<p>
+  <strong>Your torrent has been uploaded but you must re-download your torrent file from
+  <a href="torrents.php?id=<?=$GroupID?>&torrentid=<?=$TorrentID?>">here</a>
+  because the site modified it to add a source flag.</strong>
+</p>
 <?php
   View::show_footer();
 } elseif ($RequestID) {