Browse Source

Link to searches on all the fields

pjc 5 years ago
parent
commit
62f85d2d77

+ 182
- 177
classes/torrents.class.php View File

83
             $NotFound = [];
83
             $NotFound = [];
84
             $QueryID = G::$DB->get_query_id();
84
             $QueryID = G::$DB->get_query_id();
85
             G::$DB->query("
85
             G::$DB->query("
86
-                SELECT
87
-                 ID, Name, NameRJ, NameJP, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
88
-                FROM torrents_group
89
-                WHERE ID IN ($IDs)");
86
+            SELECT
87
+              ID, Name, NameRJ, NameJP, Year, CatalogueNumber, Pages, Studio, Series, DLSiteID, TagList, WikiImage, CategoryID
88
+            FROM torrents_group
89
+              WHERE ID IN ($IDs)");
90
 
90
 
91
             while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) {
91
             while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) {
92
                 $NotFound[$Group['ID']] = $Group;
92
                 $NotFound[$Group['ID']] = $Group;
115
             if ($Torrents) {
115
             if ($Torrents) {
116
                 $QueryID = G::$DB->get_query_id();
116
                 $QueryID = G::$DB->get_query_id();
117
                 G::$DB->query("
117
                 G::$DB->query("
118
-                    SELECT
119
-                      ID, GroupID, Media, Container, Codec, Resolution, AudioFormat,
120
-                      Language, Subbing, Subber, Censored, Archive, FileCount, FreeTorrent,
121
-                      Size, Leechers, Seeders, Snatched, Time, f.ExpiryTime, ID AS HasFile,
122
-                      FreeLeechType, hex(info_hash) as info_hash
123
-                    FROM torrents
124
-                      LEFT JOIN shop_freeleeches AS f ON f.TorrentID=ID
125
-                    WHERE GroupID IN ($IDs)
126
-                    ORDER BY GroupID, Media, Container, Codec, ID");
118
+                SELECT
119
+                ID, GroupID, Media, Container, Codec, Resolution, AudioFormat,
120
+                  Language, Subbing, Subber, Censored, Archive, FileCount, FreeTorrent,
121
+                  Size, Leechers, Seeders, Snatched, Time, f.ExpiryTime, ID AS HasFile,
122
+                  FreeLeechType, hex(info_hash) as info_hash
123
+                FROM torrents
124
+                  LEFT JOIN shop_freeleeches AS f ON f.TorrentID=ID
125
+                  WHERE GroupID IN ($IDs)
126
+                ORDER BY GroupID, Media, Container, Codec, ID");
127
                 while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) {
127
                 while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) {
128
                     $NotFound[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
128
                     $NotFound[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
129
                 }
129
                 }
250
         $QueryID = G::$DB->get_query_id();
250
         $QueryID = G::$DB->get_query_id();
251
         G::$DB->query(
251
         G::$DB->query(
252
             "
252
             "
253
-      INSERT INTO group_log
254
-        (GroupID, TorrentID, UserID, Info, Time, Hidden)
255
-      VALUES
256
-        (?, ?, ?, ?, NOW(), ?)",
253
+        INSERT INTO group_log
254
+          (GroupID, TorrentID, UserID, Info, Time, Hidden)
255
+        VALUES
256
+          (?, ?, ?, ?, NOW(), ?)",
257
             $GroupID,
257
             $GroupID,
258
             $TorrentID,
258
             $TorrentID,
259
             $UserID,
259
             $UserID,
275
         $QueryID = G::$DB->get_query_id();
275
         $QueryID = G::$DB->get_query_id();
276
         if (!$GroupID) {
276
         if (!$GroupID) {
277
             G::$DB->query("
277
             G::$DB->query("
278
-        SELECT GroupID, UserID
279
-        FROM torrents
280
-        WHERE ID = '$ID'");
278
+            SELECT GroupID, UserID
279
+            FROM torrents
280
+              WHERE ID = '$ID'");
281
             list($GroupID, $UploaderID) = G::$DB->next_record();
281
             list($GroupID, $UploaderID) = G::$DB->next_record();
282
         }
282
         }
283
         if (empty($UserID)) {
283
         if (empty($UserID)) {
284
             G::$DB->query("
284
             G::$DB->query("
285
-        SELECT UserID
286
-        FROM torrents
287
-        WHERE ID = '$ID'");
285
+            SELECT UserID
286
+            FROM torrents
287
+              WHERE ID = '$ID'");
288
             list($UserID) = G::$DB->next_record();
288
             list($UserID) = G::$DB->next_record();
289
         }
289
         }
290
 
290
 
298
         }
298
         }
299
 
299
 
300
         G::$DB->query("
300
         G::$DB->query("
301
-      SELECT info_hash
302
-      FROM torrents
303
-      WHERE ID = $ID");
301
+        SELECT info_hash
302
+        FROM torrents
303
+          WHERE ID = $ID");
304
         list($InfoHash) = G::$DB->next_record(MYSQLI_BOTH, false);
304
         list($InfoHash) = G::$DB->next_record(MYSQLI_BOTH, false);
305
         G::$DB->query("
305
         G::$DB->query("
306
-      DELETE FROM torrents
307
-      WHERE ID = $ID");
306
+        DELETE FROM torrents
307
+          WHERE ID = $ID");
308
         Tracker::update_tracker('delete_torrent', array('info_hash' => rawurlencode($InfoHash), 'id' => $ID, 'reason' => $OcelotReason));
308
         Tracker::update_tracker('delete_torrent', array('info_hash' => rawurlencode($InfoHash), 'id' => $ID, 'reason' => $OcelotReason));
309
 
309
 
310
         G::$Cache->decrement('stats_torrent_count');
310
         G::$Cache->decrement('stats_torrent_count');
311
 
311
 
312
         G::$DB->query("
312
         G::$DB->query("
313
-      SELECT COUNT(ID)
314
-      FROM torrents
315
-      WHERE GroupID = '$GroupID'");
313
+        SELECT COUNT(ID)
314
+        FROM torrents
315
+          WHERE GroupID = '$GroupID'");
316
         list($Count) = G::$DB->next_record();
316
         list($Count) = G::$DB->next_record();
317
 
317
 
318
         if ($Count == 0) {
318
         if ($Count == 0) {
323
 
323
 
324
         // Torrent notifications
324
         // Torrent notifications
325
         G::$DB->query("
325
         G::$DB->query("
326
-      SELECT UserID
327
-      FROM users_notify_torrents
328
-      WHERE TorrentID = '$ID'");
326
+        SELECT UserID
327
+        FROM users_notify_torrents
328
+          WHERE TorrentID = '$ID'");
329
         while (list($UserID) = G::$DB->next_record()) {
329
         while (list($UserID) = G::$DB->next_record()) {
330
             G::$Cache->delete_value("notifications_new_$UserID");
330
             G::$Cache->delete_value("notifications_new_$UserID");
331
         }
331
         }
332
         G::$DB->query("
332
         G::$DB->query("
333
-      DELETE FROM users_notify_torrents
334
-      WHERE TorrentID = '$ID'");
333
+        DELETE FROM users_notify_torrents
334
+          WHERE TorrentID = '$ID'");
335
 
335
 
336
         G::$DB->query("
336
         G::$DB->query("
337
-      UPDATE reportsv2
338
-      SET
339
-        Status = 'Resolved',
340
-        LastChangeTime = NOW(),
341
-        ModComment = 'Report already dealt with (torrent deleted)'
342
-      WHERE TorrentID = ?
343
-        AND Status != 'Resolved'", $ID);
337
+        UPDATE reportsv2
338
+        SET
339
+          Status = 'Resolved',
340
+          LastChangeTime = NOW(),
341
+          ModComment = 'Report already dealt with (torrent deleted)'
342
+          WHERE TorrentID = ?
343
+          AND Status != 'Resolved'", $ID);
344
         $Reports = G::$DB->affected_rows();
344
         $Reports = G::$DB->affected_rows();
345
         if ($Reports) {
345
         if ($Reports) {
346
             G::$Cache->decrement('num_torrent_reportsv2', $Reports);
346
             G::$Cache->decrement('num_torrent_reportsv2', $Reports);
348
 
348
 
349
         unlink(TORRENT_STORE.$ID.'.torrent');
349
         unlink(TORRENT_STORE.$ID.'.torrent');
350
         G::$DB->query("
350
         G::$DB->query("
351
-      DELETE FROM torrents_bad_tags
352
-      WHERE TorrentID = ?", $ID);
351
+        DELETE FROM torrents_bad_tags
352
+          WHERE TorrentID = ?", $ID);
353
         G::$DB->query("
353
         G::$DB->query("
354
-      DELETE FROM torrents_bad_folders
355
-      WHERE TorrentID = ?", $ID);
354
+        DELETE FROM torrents_bad_folders
355
+          WHERE TorrentID = ?", $ID);
356
         G::$DB->query("
356
         G::$DB->query("
357
-      DELETE FROM torrents_bad_files
358
-      WHERE TorrentID = ?", $ID);
357
+        DELETE FROM torrents_bad_files
358
+          WHERE TorrentID = ?", $ID);
359
 
359
 
360
         G::$DB->query("
360
         G::$DB->query("
361
-      DELETE FROM shop_freeleeches
362
-      WHERE TorrentID = ?", $ID);
361
+        DELETE FROM shop_freeleeches
362
+          WHERE TorrentID = ?", $ID);
363
         $FLs = G::$DB->affected_rows();
363
         $FLs = G::$DB->affected_rows();
364
         if ($FLs) {
364
         if ($FLs) {
365
             G::$Cache->delete_value('shop_freeleech_list');
365
             G::$Cache->delete_value('shop_freeleech_list');
367
 
367
 
368
         // Tells Sphinx that the group is removed
368
         // Tells Sphinx that the group is removed
369
         G::$DB->query("
369
         G::$DB->query("
370
-      REPLACE INTO sphinx_delta (ID, Time)
371
-      VALUES (?, UNIX_TIMESTAMP())", $ID);
370
+        REPLACE INTO sphinx_delta (ID, Time)
371
+        VALUES (?, UNIX_TIMESTAMP())", $ID);
372
 
372
 
373
         G::$Cache->delete_value("torrent_download_$ID");
373
         G::$Cache->delete_value("torrent_download_$ID");
374
         G::$Cache->delete_value("torrent_group_$GroupID");
374
         G::$Cache->delete_value("torrent_group_$GroupID");
389
         Misc::write_log("Group $GroupID automatically deleted (No torrents have this group).");
389
         Misc::write_log("Group $GroupID automatically deleted (No torrents have this group).");
390
 
390
 
391
         G::$DB->query("
391
         G::$DB->query("
392
-      SELECT CategoryID
393
-      FROM torrents_group
394
-      WHERE ID = ?", $GroupID);
392
+        SELECT CategoryID
393
+        FROM torrents_group
394
+          WHERE ID = ?", $GroupID);
395
         list($Category) = G::$DB->next_record();
395
         list($Category) = G::$DB->next_record();
396
         if ($Category == 1) {
396
         if ($Category == 1) {
397
             G::$Cache->decrement('stats_album_count');
397
             G::$Cache->decrement('stats_album_count');
400
 
400
 
401
         // Collages
401
         // Collages
402
         G::$DB->query("
402
         G::$DB->query("
403
-      SELECT CollageID
404
-      FROM collages_torrents
405
-      WHERE GroupID = ?", $GroupID);
403
+        SELECT CollageID
404
+        FROM collages_torrents
405
+          WHERE GroupID = ?", $GroupID);
406
         if (G::$DB->has_results()) {
406
         if (G::$DB->has_results()) {
407
             $CollageIDs = G::$DB->collect('CollageID');
407
             $CollageIDs = G::$DB->collect('CollageID');
408
             G::$DB->query("
408
             G::$DB->query("
409
-        UPDATE collages
410
-        SET NumTorrents = NumTorrents - 1
411
-        WHERE ID IN (".implode(', ', $CollageIDs).')');
409
+            UPDATE collages
410
+            SET NumTorrents = NumTorrents - 1
411
+              WHERE ID IN (".implode(', ', $CollageIDs).')');
412
             G::$DB->query("
412
             G::$DB->query("
413
-        DELETE FROM collages_torrents
414
-        WHERE GroupID = ?", $GroupID);
413
+            DELETE FROM collages_torrents
414
+              WHERE GroupID = ?", $GroupID);
415
 
415
 
416
             foreach ($CollageIDs as $CollageID) {
416
             foreach ($CollageIDs as $CollageID) {
417
                 G::$Cache->delete_value("collage_$CollageID");
417
                 G::$Cache->delete_value("collage_$CollageID");
422
         // Artists
422
         // Artists
423
         // Collect the artist IDs and then wipe the torrents_artist entry
423
         // Collect the artist IDs and then wipe the torrents_artist entry
424
         G::$DB->query("
424
         G::$DB->query("
425
-      SELECT ArtistID
426
-      FROM torrents_artists
427
-      WHERE GroupID = ?", $GroupID);
425
+        SELECT ArtistID
426
+        FROM torrents_artists
427
+          WHERE GroupID = ?", $GroupID);
428
         $Artists = G::$DB->collect('ArtistID');
428
         $Artists = G::$DB->collect('ArtistID');
429
 
429
 
430
         G::$DB->query("
430
         G::$DB->query("
431
-      DELETE FROM torrents_artists
432
-      WHERE GroupID = ?", $GroupID);
431
+        DELETE FROM torrents_artists
432
+          WHERE GroupID = ?", $GroupID);
433
 
433
 
434
         foreach ($Artists as $ArtistID) {
434
         foreach ($Artists as $ArtistID) {
435
             if (empty($ArtistID)) {
435
             if (empty($ArtistID)) {
437
             }
437
             }
438
             // Get a count of how many groups or requests use the artist ID
438
             // Get a count of how many groups or requests use the artist ID
439
             G::$DB->query("
439
             G::$DB->query("
440
-        SELECT COUNT(ag.ArtistID)
441
-        FROM artists_group AS ag
442
-          LEFT JOIN requests_artists AS ra ON ag.ArtistID = ra.ArtistID
443
-        WHERE ra.ArtistID IS NOT NULL
444
-          AND ag.ArtistID = ?", $ArtistID);
440
+            SELECT COUNT(ag.ArtistID)
441
+            FROM artists_group AS ag
442
+              LEFT JOIN requests_artists AS ra ON ag.ArtistID = ra.ArtistID
443
+              WHERE ra.ArtistID IS NOT NULL
444
+              AND ag.ArtistID = ?", $ArtistID);
445
             list($ReqCount) = G::$DB->next_record();
445
             list($ReqCount) = G::$DB->next_record();
446
             G::$DB->query("
446
             G::$DB->query("
447
-        SELECT COUNT(ag.ArtistID)
448
-        FROM artists_group AS ag
449
-          LEFT JOIN torrents_artists AS ta ON ag.ArtistID = ta.ArtistID
450
-        WHERE ta.ArtistID IS NOT NULL
451
-          AND ag.ArtistID = ?", $ArtistID);
447
+            SELECT COUNT(ag.ArtistID)
448
+            FROM artists_group AS ag
449
+              LEFT JOIN torrents_artists AS ta ON ag.ArtistID = ta.ArtistID
450
+              WHERE ta.ArtistID IS NOT NULL
451
+              AND ag.ArtistID = ?", $ArtistID);
452
             list($GroupCount) = G::$DB->next_record();
452
             list($GroupCount) = G::$DB->next_record();
453
             if (($ReqCount + $GroupCount) == 0) {
453
             if (($ReqCount + $GroupCount) == 0) {
454
                 //The only group to use this artist
454
                 //The only group to use this artist
461
 
461
 
462
         // Requests
462
         // Requests
463
         G::$DB->query("
463
         G::$DB->query("
464
-      SELECT ID
465
-      FROM requests
466
-      WHERE GroupID = ?", $GroupID);
464
+        SELECT ID
465
+        FROM requests
466
+          WHERE GroupID = ?", $GroupID);
467
         $Requests = G::$DB->collect('ID');
467
         $Requests = G::$DB->collect('ID');
468
         G::$DB->query("
468
         G::$DB->query("
469
-      UPDATE requests
470
-      SET GroupID = NULL
471
-      WHERE GroupID = ?", $GroupID);
469
+        UPDATE requests
470
+        SET GroupID = NULL
471
+          WHERE GroupID = ?", $GroupID);
472
         foreach ($Requests as $RequestID) {
472
         foreach ($Requests as $RequestID) {
473
             G::$Cache->delete_value("request_$RequestID");
473
             G::$Cache->delete_value("request_$RequestID");
474
         }
474
         }
477
         Comments::delete_page('torrents', $GroupID);
477
         Comments::delete_page('torrents', $GroupID);
478
 
478
 
479
         G::$DB->query("
479
         G::$DB->query("
480
-      DELETE FROM torrents_group
481
-      WHERE ID = ?", $GroupID);
480
+        DELETE FROM torrents_group
481
+          WHERE ID = ?", $GroupID);
482
         G::$DB->query("
482
         G::$DB->query("
483
-      DELETE FROM torrents_tags
484
-      WHERE GroupID = ?", $GroupID);
483
+        DELETE FROM torrents_tags
484
+          WHERE GroupID = ?", $GroupID);
485
         G::$DB->query("
485
         G::$DB->query("
486
-      DELETE FROM bookmarks_torrents
487
-      WHERE GroupID = ?", $GroupID);
486
+        DELETE FROM bookmarks_torrents
487
+          WHERE GroupID = ?", $GroupID);
488
         G::$DB->query("
488
         G::$DB->query("
489
-      DELETE FROM wiki_torrents
490
-      WHERE PageID = ?", $GroupID);
489
+        DELETE FROM wiki_torrents
490
+          WHERE PageID = ?", $GroupID);
491
 
491
 
492
         G::$Cache->delete_value("torrents_details_$GroupID");
492
         G::$Cache->delete_value("torrents_details_$GroupID");
493
         G::$Cache->delete_value("torrent_group_$GroupID");
493
         G::$Cache->delete_value("torrent_group_$GroupID");
505
         $QueryID = G::$DB->get_query_id();
505
         $QueryID = G::$DB->get_query_id();
506
 
506
 
507
         G::$DB->query("
507
         G::$DB->query("
508
-      UPDATE torrents_group
509
-      SET TagList = (
508
+        UPDATE torrents_group
509
+        SET TagList = (
510
           SELECT REPLACE(GROUP_CONCAT(tags.Name SEPARATOR ' '), '.', '_')
510
           SELECT REPLACE(GROUP_CONCAT(tags.Name SEPARATOR ' '), '.', '_')
511
           FROM torrents_tags AS t
511
           FROM torrents_tags AS t
512
             INNER JOIN tags ON tags.ID = t.TagID
512
             INNER JOIN tags ON tags.ID = t.TagID
513
           WHERE t.GroupID = ?
513
           WHERE t.GroupID = ?
514
           GROUP BY t.GroupID
514
           GROUP BY t.GroupID
515
-          )
516
-      WHERE ID = ?", $GroupID, $GroupID);
515
+        )
516
+          WHERE ID = ?", $GroupID, $GroupID);
517
 
517
 
518
         // Fetch album artists
518
         // Fetch album artists
519
         G::$DB->query("
519
         G::$DB->query("
520
-      SELECT GROUP_CONCAT(ag.Name separator ' ')
521
-      FROM torrents_artists AS ta
522
-        JOIN artists_group AS ag ON ag.ArtistID = ta.ArtistID
523
-      WHERE ta.GroupID = ?
524
-      GROUP BY ta.GroupID", $GroupID);
520
+        SELECT GROUP_CONCAT(ag.Name separator ' ')
521
+        FROM torrents_artists AS ta
522
+          JOIN artists_group AS ag ON ag.ArtistID = ta.ArtistID
523
+          WHERE ta.GroupID = ?
524
+        GROUP BY ta.GroupID", $GroupID);
525
         if (G::$DB->has_results()) {
525
         if (G::$DB->has_results()) {
526
             list($ArtistName) = G::$DB->next_record(MYSQLI_NUM, false);
526
             list($ArtistName) = G::$DB->next_record(MYSQLI_NUM, false);
527
         } else {
527
         } else {
529
         }
529
         }
530
 
530
 
531
         G::$DB->query("
531
         G::$DB->query("
532
-      REPLACE INTO sphinx_delta
533
-        (ID, GroupID, GroupName, GroupNameRJ, GroupNameJP, TagList, Year, CatalogueNumber, CategoryID, Time,
534
-        Size, Snatched, Seeders, Leechers, Censored, Studio, Series, DLsiteID,
535
-        FreeTorrent, Media, Container, Codec, Resolution, AudioFormat, Subbing, Language, Description,
536
-        FileList, ArtistName)
537
-      SELECT
538
-        t.ID, g.ID, Name, NameRJ, NameJP, TagList, Year, CatalogueNumber, CategoryID, UNIX_TIMESTAMP(t.Time),
539
-        Size, Snatched, Seeders, Leechers, Censored, Studio, Series, DLsiteID,
540
-        CAST(FreeTorrent AS CHAR), Media, Container, Codec, Resolution, AudioFormat, Subbing, Language, Description,
541
-        REPLACE(REPLACE(FileList, '_', ' '), '/', ' ') AS FileList, ?
542
-      FROM torrents AS t
543
-        JOIN torrents_group AS g ON g.ID = t.GroupID
544
-      WHERE g.ID = ?", $ArtistName, $GroupID);
532
+        REPLACE INTO sphinx_delta
533
+          (ID, GroupID, GroupName, GroupNameRJ, GroupNameJP, TagList, Year, CatalogueNumber, CategoryID, Time,
534
+          Size, Snatched, Seeders, Leechers, Censored, Studio, Series, DLsiteID,
535
+          FreeTorrent, Media, Container, Codec, Resolution, AudioFormat, Subbing, Language, Description,
536
+          FileList, ArtistName)
537
+        SELECT
538
+          t.ID, g.ID, Name, NameRJ, NameJP, TagList, Year, CatalogueNumber, CategoryID, UNIX_TIMESTAMP(t.Time),
539
+          Size, Snatched, Seeders, Leechers, Censored, Studio, Series, DLsiteID,
540
+          CAST(FreeTorrent AS CHAR), Media, Container, Codec, Resolution, AudioFormat, Subbing, Language, Description,
541
+          REPLACE(REPLACE(FileList, '_', ' '), '/', ' ') AS FileList, ?
542
+        FROM torrents AS t
543
+          JOIN torrents_group AS g ON g.ID = t.GroupID
544
+          WHERE g.ID = ?", $ArtistName, $GroupID);
545
 
545
 
546
         G::$Cache->delete_value("torrents_details_$GroupID");
546
         G::$Cache->delete_value("torrents_details_$GroupID");
547
         G::$Cache->delete_value("torrent_group_$GroupID");
547
         G::$Cache->delete_value("torrent_group_$GroupID");
564
         $QueryID = G::$DB->get_query_id();
564
         $QueryID = G::$DB->get_query_id();
565
 
565
 
566
         G::$DB->query("
566
         G::$DB->query("
567
-      SELECT GroupID
568
-      FROM torrents
569
-      WHERE ID = ?", $TorrentID);
567
+        SELECT GroupID
568
+        FROM torrents
569
+          WHERE ID = ?", $TorrentID);
570
         if (G::$DB->has_results()) {
570
         if (G::$DB->has_results()) {
571
             list($GroupID) = G::$DB->next_record(MYSQLI_NUM, false);
571
             list($GroupID) = G::$DB->next_record(MYSQLI_NUM, false);
572
             $Contents = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
572
             $Contents = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
586
                 "
586
                 "
587
         UPDATE torrents
587
         UPDATE torrents
588
         SET Size = ?, FilePath = ?, FileList = ?
588
         SET Size = ?, FilePath = ?, FileList = ?
589
-        WHERE ID = ?",
589
+          WHERE ID = ?",
590
                 $TotalSize,
590
                 $TotalSize,
591
                 $FilePath,
591
                 $FilePath,
592
                 $FileString,
592
                 $FileString,
668
      */
668
      */
669
     public static function torrent_info($Data, $ShowMedia = true, $ShowEdition = false, $HTMLy = true)
669
     public static function torrent_info($Data, $ShowMedia = true, $ShowEdition = false, $HTMLy = true)
670
     {
670
     {
671
+        # Main torrent search results info!
671
         $Info = [];
672
         $Info = [];
672
 
673
 
673
         # Platform
674
         # Platform
674
         if ($ShowMedia && !empty($Data['Media'])) {
675
         if ($ShowMedia && !empty($Data['Media'])) {
675
-            $Info[] = display_str($Data['Media']);
676
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&media='.display_str($Data['Media']).'">'.display_str($Data['Media']).'</a>';
676
         }
677
         }
677
 
678
 
678
         # Format
679
         # Format
679
         if (!empty($Data['Container'])) {
680
         if (!empty($Data['Container'])) {
680
-            $Info[] = display_str($Data['Container']);
681
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&container='.display_str($Data['Container']).'">'.display_str($Data['Container']).'</a>';
681
         }
682
         }
682
 
683
 
683
         # Archive
684
         # Archive
684
         if (!empty($Data['Archive'])) {
685
         if (!empty($Data['Archive'])) {
686
+            # todo: Search on archives, lowest priority
685
             $Info[] = display_str($Data['Archive']);
687
             $Info[] = display_str($Data['Archive']);
686
         }
688
         }
687
 
689
 
688
         # Resolution
690
         # Resolution
689
         if (!empty($Data['Resolution'])) {
691
         if (!empty($Data['Resolution'])) {
690
-            $Info[] = display_str($Data['Resolution']);
692
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&resolution='.display_str($Data['Resolution']).'">'.display_str($Data['Resolution']).'</a>';
691
         }
693
         }
692
         
694
         
693
         # License
695
         # License
694
         if (!empty($Data['Codec'])) {
696
         if (!empty($Data['Codec'])) {
695
-            $Info[] = display_str($Data['Codec']);
697
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&codec='.display_str($Data['Codec']).'">'.display_str($Data['Codec']).'</a>';
696
         }
698
         }
697
 
699
 
698
         # Alignned/Annotated
700
         # Alignned/Annotated
699
         if ($Data['Censored'] === 1) {
701
         if ($Data['Censored'] === 1) {
700
-            $Info[] = 'Aligned';
702
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&censored=1">Aligned</a>';
701
         } else {
703
         } else {
702
-            $Info[] = 'Unaligned';
704
+            $Info[] = '<a class="search_link" href="torrents.php?action=advanced&censored=0">Not Aligned</a>';
703
         }
705
         }
704
 
706
 
705
         /*
707
         /*
749
                 $Info[] = $HTMLy ? Format::torrent_label('Freeleech!', 'important_text_alt') : 'Freeleech!';
751
                 $Info[] = $HTMLy ? Format::torrent_label('Freeleech!', 'important_text_alt') : 'Freeleech!';
750
             }
752
             }
751
         }
753
         }
754
+
752
         if ($Data['FreeTorrent'] == '2') {
755
         if ($Data['FreeTorrent'] == '2') {
753
             $Info[] = $HTMLy ? Format::torrent_label('Neutral Leech!', 'bold') : 'Neutral Leech!';
756
             $Info[] = $HTMLy ? Format::torrent_label('Neutral Leech!', 'bold') : 'Neutral Leech!';
754
         }
757
         }
758
+
755
         if ($Data['PersonalFL']) {
759
         if ($Data['PersonalFL']) {
756
             $Info[] = $HTMLy ? Format::torrent_label('Personal Freeleech!', 'important_text_alt') : 'Personal Freeleech!';
760
             $Info[] = $HTMLy ? Format::torrent_label('Personal Freeleech!', 'important_text_alt') : 'Personal Freeleech!';
757
         }
761
         }
762
+
758
         return implode(' / ', $Info);
763
         return implode(' / ', $Info);
759
     }
764
     }
760
 
765
 
773
 
778
 
774
         $QueryID = G::$DB->get_query_id();
779
         $QueryID = G::$DB->get_query_id();
775
         G::$DB->query("
780
         G::$DB->query("
776
-      UPDATE torrents
777
-      SET FreeTorrent = '$FreeNeutral', FreeLeechType = '$FreeLeechType'
778
-      WHERE ID IN (".implode(', ', $TorrentIDs).')');
781
+        UPDATE torrents
782
+        SET FreeTorrent = '$FreeNeutral', FreeLeechType = '$FreeLeechType'
783
+          WHERE ID IN (".implode(', ', $TorrentIDs).')');
779
 
784
 
780
         G::$DB->query('
785
         G::$DB->query('
781
-      SELECT ID, GroupID, info_hash
782
-      FROM torrents
783
-      WHERE ID IN ('.implode(', ', $TorrentIDs).')
784
-      ORDER BY GroupID ASC');
786
+        SELECT ID, GroupID, info_hash
787
+        FROM torrents
788
+          WHERE ID IN ('.implode(', ', $TorrentIDs).')
789
+        ORDER BY GroupID ASC');
785
         $Torrents = G::$DB->to_array(false, MYSQLI_NUM, false);
790
         $Torrents = G::$DB->to_array(false, MYSQLI_NUM, false);
786
         $GroupIDs = G::$DB->collect('GroupID');
791
         $GroupIDs = G::$DB->collect('GroupID');
787
         G::$DB->set_query_id($QueryID);
792
         G::$DB->set_query_id($QueryID);
818
         }
823
         }
819
 
824
 
820
         G::$DB->query('
825
         G::$DB->query('
821
-      SELECT ID
822
-      FROM torrents
823
-      WHERE GroupID IN ('.implode(', ', $GroupIDs).')');
826
+        SELECT ID
827
+        FROM torrents
828
+          WHERE GroupID IN ('.implode(', ', $GroupIDs).')');
824
         if (G::$DB->has_results()) {
829
         if (G::$DB->has_results()) {
825
             $TorrentIDs = G::$DB->collect('ID');
830
             $TorrentIDs = G::$DB->collect('ID');
826
             Torrents::freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
831
             Torrents::freeleech_torrents($TorrentIDs, $FreeNeutral, $FreeLeechType);
847
             if ($TokenTorrents === false) {
852
             if ($TokenTorrents === false) {
848
                 $QueryID = G::$DB->get_query_id();
853
                 $QueryID = G::$DB->get_query_id();
849
                 G::$DB->query("
854
                 G::$DB->query("
850
-          SELECT TorrentID
851
-          FROM users_freeleeches
852
-          WHERE UserID = ?
853
-            AND Expired = 0", $UserID);
855
+                SELECT TorrentID
856
+                FROM users_freeleeches
857
+                  WHERE UserID = ?
858
+                  AND Expired = 0", $UserID);
854
                 $TokenTorrents = array_fill_keys(G::$DB->collect('TorrentID', false), true);
859
                 $TokenTorrents = array_fill_keys(G::$DB->collect('TorrentID', false), true);
855
                 G::$DB->set_query_id($QueryID);
860
                 G::$DB->set_query_id($QueryID);
856
                 G::$Cache->cache_value("users_tokens_$UserID", $TokenTorrents);
861
                 G::$Cache->cache_value("users_tokens_$UserID", $TokenTorrents);
922
                     }
927
                     }
923
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
928
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
924
                     G::$DB->query("
929
                     G::$DB->query("
925
-            SELECT fid
926
-            FROM xbt_snatched
927
-            WHERE uid = ?", $UserID);
930
+                    SELECT fid
931
+                    FROM xbt_snatched
932
+                      WHERE uid = ?", $UserID);
928
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
933
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
929
                         $SnatchedTorrents[$ID & $LastBucket][(int)$ID] = true;
934
                         $SnatchedTorrents[$ID & $LastBucket][(int)$ID] = true;
930
                     }
935
                     }
935
                 } else {
940
                 } else {
936
                     // Old cache, check if torrent has been snatched recently
941
                     // Old cache, check if torrent has been snatched recently
937
                     G::$DB->query("
942
                     G::$DB->query("
938
-            SELECT fid
939
-            FROM xbt_snatched
940
-            WHERE uid = ?
941
-              AND tstamp >= ?", $UserID, $UpdateTime['last']);
943
+                    SELECT fid
944
+                    FROM xbt_snatched
945
+                      WHERE uid = ?
946
+                      AND tstamp >= ?", $UserID, $UpdateTime['last']);
942
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
947
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
943
                         $CurBucketID = $ID & $LastBucket;
948
                         $CurBucketID = $ID & $LastBucket;
944
                         if ($SnatchedTorrents[$CurBucketID] === false) {
949
                         if ($SnatchedTorrents[$CurBucketID] === false) {
1004
                     }
1009
                     }
1005
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
1010
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
1006
                     G::$DB->query("
1011
                     G::$DB->query("
1007
-            SELECT fid
1008
-            FROM xbt_files_users
1009
-            WHERE uid = ?
1010
-              AND active = 1
1011
-              AND Remaining = 0", $UserID);
1012
+                    SELECT fid
1013
+                    FROM xbt_files_users
1014
+                      WHERE uid = ?
1015
+                      AND active = 1
1016
+                      AND Remaining = 0", $UserID);
1012
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1017
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1013
                         $SeedingTorrents[$ID & $LastBucket][(int)$ID] = true;
1018
                         $SeedingTorrents[$ID & $LastBucket][(int)$ID] = true;
1014
                     }
1019
                     }
1019
                 } else {
1024
                 } else {
1020
                     // Old cache, check if torrent has been seeding recently
1025
                     // Old cache, check if torrent has been seeding recently
1021
                     G::$DB->query("
1026
                     G::$DB->query("
1022
-            SELECT fid
1023
-            FROM xbt_files_users
1024
-            WHERE uid = ?
1025
-              AND active = 1
1026
-              AND Remaining = 0
1027
-              AND mtime >= ?", $UserID, $UpdateTime['last']);
1027
+                    SELECT fid
1028
+                    FROM xbt_files_users
1029
+                      WHERE uid = ?
1030
+                      AND active = 1
1031
+                      AND Remaining = 0
1032
+                      AND mtime >= ?", $UserID, $UpdateTime['last']);
1028
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1033
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1029
                         $CurBucketID = $ID & $LastBucket;
1034
                         $CurBucketID = $ID & $LastBucket;
1030
                         if ($SeedingTorrents[$CurBucketID] === false) {
1035
                         if ($SeedingTorrents[$CurBucketID] === false) {
1090
                     }
1095
                     }
1091
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
1096
                     // Not found in cache. Since we don't have a suitable index, it's faster to update everything
1092
                     G::$DB->query("
1097
                     G::$DB->query("
1093
-            SELECT fid
1094
-            FROM xbt_files_users
1095
-            WHERE uid = ?
1096
-              AND active = 1
1097
-              AND Remaining > 0", $UserID);
1098
+                    SELECT fid
1099
+                    FROM xbt_files_users
1100
+                      WHERE uid = ?
1101
+                      AND active = 1
1102
+                      AND Remaining > 0", $UserID);
1098
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1103
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1099
                         $LeechingTorrents[$ID & $LastBucket][(int)$ID] = true;
1104
                         $LeechingTorrents[$ID & $LastBucket][(int)$ID] = true;
1100
                     }
1105
                     }
1105
                 } else {
1110
                 } else {
1106
                     // Old cache, check if torrent has been leeching recently
1111
                     // Old cache, check if torrent has been leeching recently
1107
                     G::$DB->query("
1112
                     G::$DB->query("
1108
-            SELECT fid
1109
-            FROM xbt_files_users
1110
-            WHERE uid = ?
1111
-              AND active = 1
1112
-              AND Remaining > 0
1113
-              AND mtime >= ?", $UserID, $UpdateTime['last']);
1113
+                    SELECT fid
1114
+                    FROM xbt_files_users
1115
+                      WHERE uid = ?
1116
+                      AND active = 1
1117
+                      AND Remaining > 0
1118
+                      AND mtime >= ?", $UserID, $UpdateTime['last']);
1114
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1119
                     while (list($ID) = G::$DB->next_record(MYSQLI_NUM, false)) {
1115
                         $CurBucketID = $ID & $LastBucket;
1120
                         $CurBucketID = $ID & $LastBucket;
1116
                         if ($LeechingTorrents[$CurBucketID] === false) {
1121
                         if ($LeechingTorrents[$CurBucketID] === false) {
1258
         if ($Reports === false) {
1263
         if ($Reports === false) {
1259
             $QueryID = G::$DB->get_query_id();
1264
             $QueryID = G::$DB->get_query_id();
1260
             G::$DB->query("
1265
             G::$DB->query("
1261
-        SELECT
1262
-          ID,
1263
-          ReporterID,
1264
-          Type,
1265
-          UserComment,
1266
-          ReportedTime
1267
-        FROM reportsv2
1268
-        WHERE TorrentID = ?
1269
-          AND Status != 'Resolved'", $TorrentID);
1266
+            SELECT
1267
+              ID,
1268
+              ReporterID,
1269
+              Type,
1270
+              UserComment,
1271
+              ReportedTime
1272
+            FROM reportsv2
1273
+              WHERE TorrentID = ?
1274
+              AND Status != 'Resolved'", $TorrentID);
1270
             $Reports = G::$DB->to_array(false, MYSQLI_ASSOC, false);
1275
             $Reports = G::$DB->to_array(false, MYSQLI_ASSOC, false);
1271
             G::$DB->set_query_id($QueryID);
1276
             G::$DB->set_query_id($QueryID);
1272
             G::$Cache->cache_value("reports_torrent_$TorrentID", $Reports, 0);
1277
             G::$Cache->cache_value("reports_torrent_$TorrentID", $Reports, 0);

+ 4
- 1
classes/torrentsdl.class.php View File

38
         {
38
         {
39
             return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann."/".G::$LoggedUser['torrent_pass']."/announce";
39
             return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann."/".G::$LoggedUser['torrent_pass']."/announce";
40
         }
40
         }
41
-        $this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS[0]);
41
+        # todo: Probably not working, but no need yet
42
+        $this->AnnounceList = (sizeof(ANNOUNCE_URLS[0]) === 1 && sizeof(ANNOUNCE_URLS[0][0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS[0]);
43
+        # Tracker tiers (pending)
42
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
44
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
45
+        # Original Oppaitime
43
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
46
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
44
         $this->Zip = new Zip(Misc::file_string($Title));
47
         $this->Zip = new Zip(Misc::file_string($Title));
45
     }
48
     }

+ 1
- 0
classes/torrentsearch.class.php View File

57
     'numbers' => 1, # Combined ↑
57
     'numbers' => 1, # Combined ↑
58
     'codec' => 1, # License
58
     'codec' => 1, # License
59
     'container' => 1, # Format
59
     'container' => 1, # Format
60
+    'archive' => 0, # todo
60
     'description' => 1, # Not group desc
61
     'description' => 1, # Not group desc
61
     'dlsiteid' => 1,
62
     'dlsiteid' => 1,
62
     'filelist' => 1,
63
     'filelist' => 1,

+ 11
- 7
sections/torrents/browse.php View File

355
                 <option value="">Alignment</option>
355
                 <option value="">Alignment</option>
356
                 <option value="1" <?Format::selected('censored', 1)?>>Aligned
356
                 <option value="1" <?Format::selected('censored', 1)?>>Aligned
357
                 </option>
357
                 </option>
358
-                <option value="0" <?Format::selected('censored', 0)?>>Unaligned
358
+                <option value="0" <?Format::selected('censored', 0)?>>Not Aligned
359
                 </option>
359
                 </option>
360
               </select>
360
               </select>
361
 
361
 
706
 
706
 
707
       $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
707
       $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
708
 
708
 
709
+      # Similar to the logic down the page, and on
710
+      # torrents.class.php and sections/artist/artist.php
711
+      # todo: Find out exactly whhere this displays (it's not the search results)
709
       if ($GroupResults && (count($Torrents) > 1 && isset($GroupedCategories[$CategoryID - 1]))) {
712
       if ($GroupResults && (count($Torrents) > 1 && isset($GroupedCategories[$CategoryID - 1]))) {
710
           // These torrents are in a group
713
           // These torrents are in a group
711
           $CoverArt = $GroupInfo['WikiImage'];
714
           $CoverArt = $GroupInfo['WikiImage'];
721
 
724
 
722
           # Year
725
           # Year
723
           if ($GroupYear) {
726
           if ($GroupYear) {
724
-              $DisplayName .= "<br />$GroupYear";
727
+              $DisplayName .= "<br /><a href='torrents.php?action=advanced&year=$GroupYear'>$GroupYear</a>";
725
           }
728
           }
726
         
729
         
727
           # Studio
730
           # Studio
728
           if ($GroupStudio) {
731
           if ($GroupStudio) {
729
-              $DisplayName .= " / $GroupStudio";
732
+              $DisplayName .= " &ndash; <a href='torrents.php?action=advanced&location=$GroupStudio'>$GroupStudio</a>";
730
           }
733
           }
731
 
734
 
732
           # Catalogue Number
735
           # Catalogue Number
733
           if ($GroupCatalogueNumber) {
736
           if ($GroupCatalogueNumber) {
734
-              $DisplayName .= " / $GroupCatalogueNumber";
737
+              $DisplayName .= " &ndash; <a href='torrents.php?action=advanced&numbers=$GroupCatalogueNumber'>$GroupCatalogueNumber</a>";
735
           }
738
           }
736
 
739
 
737
           /*
740
           /*
889
           }
892
           }
890
 
893
 
891
           # Main search result title link
894
           # Main search result title link
895
+          # These are the main torrent search results
892
           $Data['CategoryID'] = $CategoryID;
896
           $Data['CategoryID'] = $CategoryID;
893
           $CoverArt = $GroupInfo['WikiImage'];
897
           $CoverArt = $GroupInfo['WikiImage'];
894
           $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
898
           $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
904
               # Year
908
               # Year
905
               # Sh!t h4x; Year is mandatory
909
               # Sh!t h4x; Year is mandatory
906
               if ($GroupYear) {
910
               if ($GroupYear) {
907
-                  $DisplayName .= "<br /> $GroupYear";
911
+                  $DisplayName .= "<br /><a href='torrents.php?action=advanced&year=$GroupYear'>$GroupYear</a>";
908
               }
912
               }
909
 
913
 
910
               # Studio
914
               # Studio
911
               if ($GroupStudio) {
915
               if ($GroupStudio) {
912
-                  $DisplayName .= " &ndash; $GroupStudio";
916
+                  $DisplayName .= " &ndash; <a href='torrents.php?action=advanced&location=$GroupStudio'>$GroupStudio</a>";
913
               }
917
               }
914
 
918
 
915
               # Catalogue Number
919
               # Catalogue Number
916
               if ($GroupCatalogueNumber) {
920
               if ($GroupCatalogueNumber) {
917
-                  $DisplayName .= " &ndash; $GroupCatalogueNumber";
921
+                  $DisplayName .= " &ndash; <a href='torrents.php?action=advanced&numbers=$GroupCatalogueNumber'>$GroupCatalogueNumber</a>";
918
               }
922
               }
919
 
923
 
920
               /*
924
               /*

+ 1
- 1
sections/torrents/details.php View File

582
         $ExtraInfo .= $AddExtra.display_str('Aligned');
582
         $ExtraInfo .= $AddExtra.display_str('Aligned');
583
         $AddExtra=' / ';
583
         $AddExtra=' / ';
584
     } else {
584
     } else {
585
-        $ExtraInfo .= $AddExtra.display_str('Unaligned');
585
+        $ExtraInfo .= $AddExtra.display_str('Not Aligned');
586
         $AddExtra=' / ';
586
         $AddExtra=' / ';
587
     }
587
     }
588
 
588
 

+ 4
- 1
sections/torrents/download.php View File

188
     return (is_array($ann)) ? array_map("add_passkey", $ann) : $ann."/".$TorrentPass."/announce";
188
     return (is_array($ann)) ? array_map("add_passkey", $ann) : $ann."/".$TorrentPass."/announce";
189
 }
189
 }
190
 $UserAnnounceURL = ANNOUNCE_URLS[0][0]."/".$TorrentPass."/announce";
190
 $UserAnnounceURL = ANNOUNCE_URLS[0][0]."/".$TorrentPass."/announce";
191
-$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS[0]);
191
+# todo: Probably not working, but no need yet
192
+$UserAnnounceList = (sizeof(ANNOUNCE_URLS[0]) === 1 && sizeof(ANNOUNCE_URLS[0][0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS[0]);
193
+# Tracker tiers (pending)
192
 #$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
194
 #$UserAnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
195
+# Original Oppaitime
193
 #$UserAnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map("add_passkey", ANNOUNCE_URLS);
196
 #$UserAnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map("add_passkey", ANNOUNCE_URLS);
194
 
197
 
195
 echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);
198
 echo TorrentsDL::get_file($Contents, $UserAnnounceURL, $UserAnnounceList);

+ 1
- 1
sections/torrents/user.php View File

404
               <option value="3">Alignment</option>
404
               <option value="3">Alignment</option>
405
               <option value="1" <?Format::selected('censored', 1)?>>Aligned
405
               <option value="1" <?Format::selected('censored', 1)?>>Aligned
406
               </option>
406
               </option>
407
-              <option value="0" <?Format::selected('censored', 0)?>>Unaligned
407
+              <option value="0" <?Format::selected('censored', 0)?>>Not Aligned
408
               </option>
408
               </option>
409
             </select>
409
             </select>
410
           </td>
410
           </td>

+ 5
- 3
static/styles/matcha/style.css View File

531
 }
531
 }
532
 
532
 
533
 .tags {
533
 .tags {
534
-  padding: 0px 0px 0px 20px;
534
+  padding: 0 0 0 2em;
535
   font-style: italic;
535
   font-style: italic;
536
 }
536
 }
537
 
537
 
538
-.tags a {
538
+.tags a,
539
+a.search_link {
539
   color: black;
540
   color: black;
540
 }
541
 }
541
 
542
 
542
-.tags a:hover {
543
+.tags a:hover,
544
+a:hover.search_link {
543
   color: black;
545
   color: black;
544
   text-decoration: underline;
546
   text-decoration: underline;
545
 }
547
 }

Loading…
Cancel
Save