Home Explore Help
Register Sign In
biotorrents
/
Gazelle
forked from Oppaitime/Gazelle
Watch 2
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Wiki Activity
Browse Source

Remove DNU

biotorrents 4 years ago
parent
e4475e3e2a
commit
a6bebdf233
11 changed files with 53 additions and 314 deletions
Split View Show Diff Stats
  1. 0
    4
      classes/permissions_form.php
  2. 2
    2
      classes/torrent_form.class.php
  3. 0
    1
      design/privatefooter.php
  4. 2
    13
      gazelle.sql
  5. 48
    54
      sections/reportsv2/array.php
  6. 0
    8
      sections/tools/index.php
  7. 0
    59
      sections/tools/managers/dnu_alter.php
  8. 0
    74
      sections/tools/managers/dnu_list.php
  9. 0
    1
      sections/tools/tools.php
  10. 1
    73
      sections/upload/upload.php
  11. 0
    25
      static/functions/dnu_list.js

+ 0
- 4
classes/permissions_form.php View File 

@@ -79,7 +79,6 @@ $PermissionsArray = array(
79 79 
   'torrents_delete_fast' => 'Can delete more than 3 torrents at a time.',
80 80 
   'torrents_freeleech' => 'Can make torrents freeleech.',
81 81 
   'torrents_search_fast' => 'Rapid search (for scripts).',
82 
-  'torrents_hide_dnu' => 'Hide the Do Not Upload list by default.',
83 82 
   'torrents_fix_ghosts' => 'Can fix "ghost" groups on artist pages.',
84 83 
   'screenshots_add' => 'Can add screenshots to any torrent and delete their own screenshots.',
85 84 
   'screenshots_delete' => 'Can delete any screenshot from any torrent.',
 
@@ -93,7 +92,6 @@ $PermissionsArray = array(
93 92 
   'admin_create_users' => 'Can create users through an administrative form.',
94 93 
   'admin_donor_log' => 'Can view the donor log.',
95 94 
   'admin_manage_ipbans' => 'Can manage IP bans.',
96 
-  'admin_dnu' => 'Can manage do not upload list.',
97 95 
   'admin_clear_cache' => 'Can clear cached.',
98 96 
   'admin_whitelist' => 'Can manage the list of allowed clients.',
99 97 
   'admin_manage_permissions' => 'Can edit permission classes/user permissions.',
 
@@ -232,7 +230,6 @@ function permissions_form()
232 230 
     display_perm('edit_unknowns', 'Can edit unknown release information.');
233 231 
     display_perm('torrents_edit_vanityhouse', 'Can mark groups as part of Vanity House.');
234 232 
     display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
235 
-    display_perm('torrents_hide_dnu', 'Hide the Do Not Upload list by default.');
236 233 
     display_perm('torrents_fix_ghosts', 'Can fix ghost groups on artist pages.');
237 234 
     display_perm('screenshots_add', 'Can add screenshots to any torrent and delete their own screenshots.');
238 235 
     display_perm('screenshots_delete', 'Can delete any screenshot from any torrent.'); ?>
 
@@ -259,7 +256,6 @@ function permissions_form()
259 256 
     display_perm('admin_create_users', 'Can create users through an administrative form');
260 257 
     display_perm('admin_donor_log', 'Can view the donor log');
261 258 
     display_perm('admin_manage_ipbans', 'Can manage IP bans');
262 
-    display_perm('admin_dnu', 'Can manage do not upload list');
263 259 
     display_perm('admin_clear_cache', 'Can clear cached pages');
264 260 
     display_perm('admin_whitelist', 'Can manage the list of allowed clients.');
265 261 
     display_perm('admin_manage_permissions', 'Can edit permission classes/user permissions.');

+ 2
- 2
classes/torrent_form.class.php View File 

@@ -1212,7 +1212,7 @@ HTML;
1212 1212
1213 1213 
             $GenreTags = G::$Cache->get_value('genre_tags');
1214 1214 
             if (!$GenreTags) {
1215 
-                $DB->query("
1215 
+                G::$DB->query("
1216 1216 
                 SELECT
1217 1217 
                   `Name`
1218 1218 
                 FROM
 
@@ -1223,7 +1223,7 @@ HTML;
1223 1223 
                   `Name`
1224 1224 
                 ");
1225 1225
1226 
-                $GenreTags = $DB->collect('Name');
1226 
+                $GenreTags = G::$DB->collect('Name');
1227 1227 
                 G::$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
1228 1228 
             }
1229 1229

+ 0
- 1
design/privatefooter.php View File 

@@ -60,7 +60,6 @@ $Load = sys_getloadavg();
60 60
61 61 
 echo $HTML = <<<HTML
62 62 
 <p>
63 
-  Site and design
64 63 
   &copy;
65 64 
   $Year
66 65 
   $ENV->SITE_NAME

+ 2
- 13
gazelle.sql View File 

@@ -331,18 +331,6 @@ CREATE TABLE `donor_rewards` (
331 331 
   PRIMARY KEY (`UserID`)
332 332 
 ) ENGINE=InnoDB CHARSET=utf8mb4;
333 333
334 
-CREATE TABLE `do_not_upload` (
335 
-  `ID` int NOT NULL AUTO_INCREMENT,
336 
-  `Name` varchar(255) NOT NULL,
337 
-  `Comment` varchar(255) NOT NULL,
338 
-  `UserID` int NOT NULL,
339 
-  `Time` datetime,
340 
-  `Sequence` mediumint NOT NULL,
341 
-  PRIMARY KEY (`ID`),
342 
-  KEY `Time` (`Time`)
343 
-) ENGINE=InnoDB CHARSET=utf8mb4;
344 
-
345 334 
 -- 2020-03-09
346 335 
 CREATE TABLE `dupe_groups` (
347 336 
   `ID` int unsigned NOT NULL AUTO_INCREMENT,
 
@@ -1799,8 +1787,8 @@ CREATE TABLE `xbt_snatched` (
1799 1787 
 SET FOREIGN_KEY_CHECKS = 1;
1800 1788
1801 1789 
 INSERT INTO permissions (ID, Level, Name, `Values`, DisplayStaff) VALUES
1802 
-  (15, 1000, 'Sysop', 'a:100:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:20:\"site_collages_delete\";i:1;s:23:\"site_collages_subscribe\";i:1;s:22:\"site_collages_personal\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:22:\"site_can_invite_always\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:22:\"site_moderate_requests\";i:1;s:18:\"site_delete_artist\";i:1;s:20:\"site_moderate_forums\";i:1;s:17:\"site_admin_forums\";i:1;s:23:\"site_forums_double_post\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:18:\"site_recommend_own\";i:1;s:27:\"site_manage_recommendations\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"zip_downloader\";i:1;s:10:\"site_debug\";i:1;s:17:\"site_proxy_images\";i:1;s:16:\"site_search_many\";i:1;s:20:\"users_edit_usernames\";i:1;s:16:\"users_edit_ratio\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:17:\"users_edit_titles\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:22:\"users_edit_watch_hours\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:19:\"users_edit_profiles\";i:1;s:18:\"users_view_friends\";i:1;s:20:\"users_reset_own_keys\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_promote_below\";i:1;s:16:\"users_promote_to\";i:1;s:16:\"users_give_donor\";i:1;s:10:\"users_warn\";i:1;s:19:\"users_disable_users\";i:1;s:19:\"users_disable_posts\";i:1;s:17:\"users_disable_any\";i:1;s:18:\"users_delete_users\";i:1;s:18:\"users_view_invites\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:15:\"users_view_keys\";i:1;s:14:\"users_view_ips\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_invite_notes\";i:1;s:23:\"users_override_paranoia\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:13:\"torrents_edit\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:18:\"torrents_freeleech\";i:1;s:20:\"torrents_search_fast\";i:1;s:17:\"torrents_hide_dnu\";i:1;s:19:\"torrents_fix_ghosts\";i:1;s:17:\"admin_manage_news\";i:1;s:17:\"admin_manage_blog\";i:1;s:18:\"admin_manage_polls\";i:1;s:19:\"admin_manage_forums\";i:1;s:16:\"admin_manage_fls\";i:1;s:13:\"admin_reports\";i:1;s:26:\"admin_advanced_user_search\";i:1;s:18:\"admin_create_users\";i:1;s:15:\"admin_donor_log\";i:1;s:19:\"admin_manage_ipbans\";i:1;s:9:\"admin_dnu\";i:1;s:17:\"admin_clear_cache\";i:1;s:15:\"admin_whitelist\";i:1;s:24:\"admin_manage_permissions\";i:1;s:14:\"admin_schedule\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_wiki\";i:1;s:18:\"admin_update_geoip\";i:1;s:21:\"site_collages_recover\";i:1;s:19:\"torrents_add_artist\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:21:\"site_tag_aliases_read\";i:1;}', '1'),
1803 
-  (11, 800, 'Moderator', 'a:89:{s:26:\"admin_advanced_user_search\";i:1;s:17:\"admin_clear_cache\";i:1;s:18:\"admin_create_users\";i:1;s:9:\"admin_dnu\";i:1;s:15:\"admin_donor_log\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_blog\";i:1;s:19:\"admin_manage_ipbans\";i:1;s:17:\"admin_manage_news\";i:1;s:18:\"admin_manage_polls\";i:1;s:17:\"admin_manage_wiki\";i:1;s:13:\"admin_reports\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:17:\"site_admin_forums\";i:1;s:20:\"site_advanced_search\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:22:\"site_can_invite_always\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_delete\";i:1;s:20:\"site_collages_manage\";i:1;s:22:\"site_collages_personal\";i:1;s:21:\"site_collages_recover\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:23:\"site_collages_subscribe\";i:1;s:18:\"site_delete_artist\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"site_edit_wiki\";i:1;s:23:\"site_forums_double_post\";i:1;s:10:\"site_leech\";i:1;s:19:\"site_make_bookmarks\";i:1;s:27:\"site_manage_recommendations\";i:1;s:20:\"site_moderate_forums\";i:1;s:22:\"site_moderate_requests\";i:1;s:17:\"site_proxy_images\";i:1;s:18:\"site_recommend_own\";i:1;s:16:\"site_search_many\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:20:\"site_submit_requests\";i:1;s:21:\"site_tag_aliases_read\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:11:\"site_upload\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:9:\"site_vote\";i:1;s:19:\"torrents_add_artist\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:13:\"torrents_edit\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:19:\"torrents_fix_ghosts\";i:1;s:18:\"torrents_freeleech\";i:1;s:17:\"torrents_hide_dnu\";i:1;s:20:\"torrents_search_fast\";i:1;s:18:\"users_delete_users\";i:1;s:17:\"users_disable_any\";i:1;s:19:\"users_disable_posts\";i:1;s:19:\"users_disable_users\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_edit_profiles\";i:1;s:16:\"users_edit_ratio\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:17:\"users_edit_titles\";i:1;s:16:\"users_give_donor\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:23:\"users_override_paranoia\";i:1;s:19:\"users_promote_below\";i:1;s:20:\"users_reset_own_keys\";i:1;s:10:\"users_warn\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_view_friends\";i:1;s:18:\"users_view_invites\";i:1;s:14:\"users_view_ips\";i:1;s:15:\"users_view_keys\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:14:\"zip_downloader\";i:1;}', '1'),
1790 
+  (15, 1000, 'Sysop', 'a:100:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:20:\"site_collages_delete\";i:1;s:23:\"site_collages_subscribe\";i:1;s:22:\"site_collages_personal\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:22:\"site_can_invite_always\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:22:\"site_moderate_requests\";i:1;s:18:\"site_delete_artist\";i:1;s:20:\"site_moderate_forums\";i:1;s:17:\"site_admin_forums\";i:1;s:23:\"site_forums_double_post\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:18:\"site_recommend_own\";i:1;s:27:\"site_manage_recommendations\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"zip_downloader\";i:1;s:10:\"site_debug\";i:1;s:17:\"site_proxy_images\";i:1;s:16:\"site_search_many\";i:1;s:20:\"users_edit_usernames\";i:1;s:16:\"users_edit_ratio\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:17:\"users_edit_titles\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:22:\"users_edit_watch_hours\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:19:\"users_edit_profiles\";i:1;s:18:\"users_view_friends\";i:1;s:20:\"users_reset_own_keys\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_promote_below\";i:1;s:16:\"users_promote_to\";i:1;s:16:\"users_give_donor\";i:1;s:10:\"users_warn\";i:1;s:19:\"users_disable_users\";i:1;s:19:\"users_disable_posts\";i:1;s:17:\"users_disable_any\";i:1;s:18:\"users_delete_users\";i:1;s:18:\"users_view_invites\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:15:\"users_view_keys\";i:1;s:14:\"users_view_ips\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_invite_notes\";i:1;s:23:\"users_override_paranoia\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:13:\"torrents_edit\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:18:\"torrents_freeleech\";i:1;s:20:\"torrents_search_fast\";i:1;i:1;s:19:\"torrents_fix_ghosts\";i:1;s:17:\"admin_manage_news\";i:1;s:17:\"admin_manage_blog\";i:1;s:18:\"admin_manage_polls\";i:1;s:19:\"admin_manage_forums\";i:1;s:16:\"admin_manage_fls\";i:1;s:13:\"admin_reports\";i:1;s:26:\"admin_advanced_user_search\";i:1;s:18:\"admin_create_users\";i:1;s:15:\"admin_donor_log\";i:1;s:19:\"admin_manage_ipbans\";i:1;i:1;s:17:\"admin_clear_cache\";i:1;s:15:\"admin_whitelist\";i:1;s:24:\"admin_manage_permissions\";i:1;s:14:\"admin_schedule\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_wiki\";i:1;s:18:\"admin_update_geoip\";i:1;s:21:\"site_collages_recover\";i:1;s:19:\"torrents_add_artist\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:21:\"site_tag_aliases_read\";i:1;}', '1'),
1791 
+  (11, 800, 'Moderator', 'a:89:{s:26:\"admin_advanced_user_search\";i:1;s:17:\"admin_clear_cache\";i:1;s:18:\"admin_create_users\";i:1;i:1;s:15:\"admin_donor_log\";i:1;s:17:\"admin_login_watch\";i:1;s:17:\"admin_manage_blog\";i:1;s:19:\"admin_manage_ipbans\";i:1;s:17:\"admin_manage_news\";i:1;s:18:\"admin_manage_polls\";i:1;s:17:\"admin_manage_wiki\";i:1;s:13:\"admin_reports\";i:1;s:23:\"artist_edit_vanityhouse\";i:1;s:13:\"edit_unknowns\";i:1;s:19:\"forums_polls_create\";i:1;s:21:\"forums_polls_moderate\";i:1;s:12:\"project_team\";i:1;s:17:\"site_admin_forums\";i:1;s:20:\"site_advanced_search\";i:1;s:19:\"site_advanced_top10\";i:1;s:16:\"site_album_votes\";i:1;s:22:\"site_can_invite_always\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_delete\";i:1;s:20:\"site_collages_manage\";i:1;s:22:\"site_collages_personal\";i:1;s:21:\"site_collages_recover\";i:1;s:28:\"site_collages_renamepersonal\";i:1;s:23:\"site_collages_subscribe\";i:1;s:18:\"site_delete_artist\";i:1;s:15:\"site_delete_tag\";i:1;s:23:\"site_disable_ip_history\";i:1;s:14:\"site_edit_wiki\";i:1;s:23:\"site_forums_double_post\";i:1;s:10:\"site_leech\";i:1;s:19:\"site_make_bookmarks\";i:1;s:27:\"site_manage_recommendations\";i:1;s:20:\"site_moderate_forums\";i:1;s:22:\"site_moderate_requests\";i:1;s:17:\"site_proxy_images\";i:1;s:18:\"site_recommend_own\";i:1;s:16:\"site_search_many\";i:1;s:27:\"site_send_unlimited_invites\";i:1;s:20:\"site_submit_requests\";i:1;s:21:\"site_tag_aliases_read\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:11:\"site_upload\";i:1;s:14:\"site_view_flow\";i:1;s:18:\"site_view_full_log\";i:1;s:28:\"site_view_torrent_snatchlist\";i:1;s:9:\"site_vote\";i:1;s:19:\"torrents_add_artist\";i:1;s:15:\"torrents_delete\";i:1;s:20:\"torrents_delete_fast\";i:1;s:13:\"torrents_edit\";i:1;s:25:\"torrents_edit_vanityhouse\";i:1;s:19:\"torrents_fix_ghosts\";i:1;s:18:\"torrents_freeleech\";i:1;i:1;s:20:\"torrents_search_fast\";i:1;s:18:\"users_delete_users\";i:1;s:17:\"users_disable_any\";i:1;s:19:\"users_disable_posts\";i:1;s:19:\"users_disable_users\";i:1;s:18:\"users_edit_avatars\";i:1;s:18:\"users_edit_invites\";i:1;s:20:\"users_edit_own_ratio\";i:1;s:19:\"users_edit_password\";i:1;s:19:\"users_edit_profiles\";i:1;s:16:\"users_edit_ratio\";i:1;s:21:\"users_edit_reset_keys\";i:1;s:17:\"users_edit_titles\";i:1;s:16:\"users_give_donor\";i:1;s:12:\"users_logout\";i:1;s:20:\"users_make_invisible\";i:1;s:9:\"users_mod\";i:1;s:23:\"users_override_paranoia\";i:1;s:19:\"users_promote_below\";i:1;s:20:\"users_reset_own_keys\";i:1;s:10:\"users_warn\";i:1;s:16:\"users_view_email\";i:1;s:18:\"users_view_friends\";i:1;s:18:\"users_view_invites\";i:1;s:14:\"users_view_ips\";i:1;s:15:\"users_view_keys\";i:1;s:20:\"users_view_seedleech\";i:1;s:19:\"users_view_uploaded\";i:1;s:14:\"zip_downloader\";i:1;}', '1'),
1804 1792 
   (2, 100, 'User', 'a:7:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:14:\"site_edit_wiki\";i:1;s:19:\"torrents_add_artist\";i:1;}', '0'),
1805 1793 
   (3, 150, 'Member', 'a:10:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_collages_manage\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:19:\"torrents_add_artist\";i:1;}', '0'),
1806 1794 
   (4, 200, 'Power User', 'a:14:{s:10:\"site_leech\";i:1;s:11:\"site_upload\";i:1;s:9:\"site_vote\";i:1;s:20:\"site_submit_requests\";i:1;s:20:\"site_advanced_search\";i:1;s:10:\"site_top10\";i:1;s:20:\"site_torrents_notify\";i:1;s:20:\"site_collages_create\";i:1;s:20:\"site_collages_manage\";i:1;s:19:\"site_make_bookmarks\";i:1;s:14:\"site_edit_wiki\";i:1;s:14:\"zip_downloader\";i:1;s:19:\"forums_polls_create\";i:1;s:19:\"torrents_add_artist\";i:1;} ', '0'),

+ 48
- 54
sections/reportsv2/array.php View File 

@@ -1,5 +1,7 @@
1 
-<?
2 
-/*
1 
+<?php
2 
+declare(strict_types=1);
3 
+
4 
+/**
3 5 
  * The $Types array is the backbone of the reports system and is stored here so it can
4 6 
  * be included on the pages that need it without clogging up the pages that don't.
5 7 
  * Important thing to note about the array:
 
@@ -18,6 +20,8 @@
18 20
19 21 
 $Types = array(
20 22 
   'master' => array(
23 
+
24 
+    # dupe
21 25 
     'dupe' => array(
22 26 
       'priority' => '10',
23 27 
       'reason' => '0',
 
@@ -25,34 +29,43 @@ $Types = array(
25 29 
       'report_messages' => array(
26 30 
         'Please specify a link to the original torrent.'
27 31 
       ),
32 
+
28 33 
       'report_fields' => array(
29 34 
         'sitelink' => '1'
30 35 
       ),
36 
+
31 37 
       'resolve_options' => array(
32 38 
         'upload' => '0',
33 39 
         'warn' => '0',
34 40 
         'delete' => '1',
35 41 
         'pm' => '[rule]r1.1.4[/rule]. Your torrent was reported because it was a duplicate of another torrent.'
36 
-      )
42 
+      ),
37 43 
     ),
44 
+
45 
+    # banned
38 46 
     'banned' => array(
39 47 
       'priority' => '230',
40 48 
       'reason' => '14',
41 49 
       'title' => 'Specifically Banned',
42 50 
       'report_messages' => array(
43 51 
         'Note that this report form is for content that is banned by name, not content that breaks a general uploading rule.',
44 
-        'Please specify exactly which entry on the Do Not Upload list this is violating.'
52 
+        'Please specify exactly which entry on the Specifically Banned list this is violating.'
45 53 
       ),
54 
+
46 55 
       'report_fields' => array(
47 56 
       ),
57 
+
48 58 
       'resolve_options' => array(
49 59 
         'upload' =>' 0',
50 60 
         'warn' => '4',
51 61 
         'delete' => '1',
52 
-        'pm' => '[rule]h1.3[/rule]. You have uploaded material that is currently forbidden. Items on the Do Not Upload (DNU) list (at the top of the [url='.site_url().'upload.php]upload page[/url]) and in the [url='.site_url().'rules.php?p=upload#h1.3]Specifically Banned[/url] portion of the uploading rules cannot be uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comments of the DNU list.
53 
-Your torrent was reported because it contained material from the DNU list or from the Specifically Banned section of the rules.'
54 
-      )
62 
+        'pm' => '[rule]h1.3[/rule]. You have uploaded material that is currently forbidden.
63 
+        Items on the [url='.site_url().'rules.php?p=upload#h1.3]Specifically Banned[/url] portion of the uploading rules cannot be uploaded to the site.
64 
+        Your torrent was reported because it contained material from the Specifically Banned section of the rules.'
65 
+      ),
55 66 
     ),
67 
+
68 
+    # urgent
56 69 
     'urgent' => array(
57 70 
       'priority' => '280',
58 71 
       'reason' => '-1',
 
@@ -62,18 +75,22 @@ Your torrent was reported because it contained material from the DNU list or fro
62 75 
         'Abusing the "Urgent" report type could result in a warning or worse.',
63 76 
         'As this report type gives the staff absolutely no information about the problem, please be as clear as possible in your comments about what the problem is.'
64 77 
       ),
78 
+
65 79 
       'report_fields' => array(
66 80 
         'sitelink' => '0',
67 81 
         'link' => '0',
68 82 
         'image' => '0',
69 83 
       ),
84 
+
70 85 
       'resolve_options' => array(
71 86 
         'upload' => '0',
72 87 
         'warn' => '0',
73 88 
         'delete' => '0',
74 89 
         'pm' => ''
75 
-      )
90 
+      ),
76 91 
     ),
92 
+
93 
+    # trump
77 94 
     'trump' => array(
78 95 
       'priority' => '20',
79 96 
       'reason' => '1',
 
@@ -82,16 +99,20 @@ Your torrent was reported because it contained material from the DNU list or fro
82 99 
         'Please list the specific reason(s) the newer torrent trumps the older one.',
83 100 
         'Please make sure you are reporting the torrent <strong class="important_text">which has been trumped</strong> and should be deleted, not the torrent that you think should remain on site.'
84 101 
       ),
102 
+
85 103 
       'report_fields' => array(
86 104 
         'sitelink' => '1'
87 105 
       ),
106 
+
88 107 
       'resolve_options' => array(
89 108 
         'upload' => '0',
90 109 
         'warn' => '0',
91 110 
         'delete' => '1',
92 111 
         'pm' => 'Your torrent was reported because it was trumped by another torrent.'
93 
-      )
112 
+      ),
94 113 
     ),
114 
+
115 
+    # notporn
95 116 
     'notporn' => array(
96 117 
       'priority' => '100',
97 118 
       'reason' => '-1',
 
@@ -99,15 +120,19 @@ Your torrent was reported because it contained material from the DNU list or fro
99 120 
       'report_messages' => array(
100 121 
         'This report type is for reporting torrents that are not pornographic.'
101 122 
       ),
123 
+
102 124 
       'report_fields' => array(
103 125 
       ),
126 
+
104 127 
       'resolve_options' => array(
105 128 
         'upload' => '0',
106 129 
         'warn' => '0',
107 130 
         'delete' => '1',
108 131 
         'pm' => '[rule]r1.1.2[/rule]. Your torrent was reported beacuse it was not pornographic. All torrents on '.site_url().' must be pornographic.'
109 
-      )
132 
+      ),
110 133 
     ),
134 
+
135 
+    # lang
111 136 
     'lang' => array(
112 137 
       'priority' => '100',
113 138 
       'reason' => '-1',
 
@@ -115,15 +140,19 @@ Your torrent was reported because it contained material from the DNU list or fro
115 140 
       'report_messages' => array(
116 141 
         'This report type is for reporting torrent that contain no Japanese or English language content.'
117 142 
       ),
143 
+
118 144 
       'report_fields' => array(
119 145 
       ),
146 
+
120 147 
       'resolve_options' => array(
121 148 
         'upload' => '0',
122 149 
         'warn' => '0',
123 150 
         'delete' => '1',
124 151 
         'pm' => '[rule]r1.1.7[/rule]. Your torrent was reported because it contained neither Japanese nor English text/audio.'
125 
-      )
152 
+      ),
126 153 
     ),
154 
+
155 
+    # metadata
127 156 
     'metadata' => array(
128 157 
       'priority' => '100',
129 158 
       'reason' => '-1',
 
@@ -132,15 +161,19 @@ Your torrent was reported because it contained material from the DNU list or fro
132 161 
         'This report type is for reporting improperly/incorrectly tagged torrents.',
133 162 
         'Please describe what changes need to be made to the metadata.'
134 163 
       ),
164 
+
135 165 
       'report_fields' => array(
136 166 
       ),
167 
+
137 168 
       'resolve_options' => array(
138 169 
         'upload' => '0',
139 170 
         'warn' => '0',
140 171 
         'delete' => '0',
141 172 
         'pm' => 'Your torrent was reported for having incorrect metadata.'
142 
-      )
173 
+      ),
143 174 
     ),
175 
+
176 
+    # other
144 177 
     'other' => array(
145 178 
       'priority' => '200',
146 179 
       'reason' => '-1',
 
@@ -148,55 +181,16 @@ Your torrent was reported because it contained material from the DNU list or fro
148 181 
       'report_messages' => array(
149 182 
         'Please include as much information as possible to verify the report.'
150 183 
       ),
184 
+
151 185 
       'report_fields' => array(
152 186 
       ),
187 
+
153 188 
       'resolve_options' => array(
154 189 
         'upload' => '0',
155 190 
         'warn' => '0',
156 191 
         'delete' => '0',
157 192 
         'pm' => ''
158 
-      )
159 
-    )
160 
-  ),
161 
-  '1' => array(
162 
-  ),
163 
-  '2' => array(
164 
-  ),
165 
-  '3' => array(
166 
-  ),
167 
-  '4' => array(
168 
-    'install' => array(
169 
-      'priority' => '100',
170 
-      'reason' => '-1',
171 
-      'title' => 'Unclear Installation Process',
172 
-      'report_messages' => array(
173 
-        'This report type is for reporting game torrents with vague or unclear installation or usage instructions.',
174 
-        'Please describe the issue in detail.'
175 193 
       ),
176 
-      'report_fields' => array(
177 
-      ),
178 
-      'resolve_options' => array(
179 
-        'upload' => '0',
180 
-        'warn' => '0',
181 
-        'delete' => '0',
182 
-        'pm' => '[rule]4.1.5[/rule]. Your torrent was reported because the usage or installation instructions were vague or unclear.'
183 
-      )
184 194 
     ),
185 
-    'nocrack' => array(
186 
-      'priority' => '100',
187 
-      'reason' => '-1',
188 
-      'title' => 'DRM Without Crack',
189 
-      'report_messages' => array(
190 
-        'This report type is for reporting game torrents that contain DRM, but do not include a crack.'
191 
-      ),
192 
-      'report_fields' => array(
193 
-      ),
194 
-      'resolve_options' => array(
195 
-        'upload' => '0',
196 
-        'warn' => '1',
197 
-        'delete' => '1',
198 
-        'pm' => '[rule]r4.1.3[/rule]. Your torrent was reported because it contained DRM, but did not include a crack.'
199 
-      )
200 
-    )
201 
-  )
195 
+  ),
202 196 
 );

+ 0
- 8
sections/tools/index.php View File 

@@ -116,14 +116,6 @@ switch ($_REQUEST['action']) {
116 116 
     include SERVER_ROOT.'/sections/tools/managers/email_blacklist_search.php';
117 117 
     break;
118 118
119 
-  case 'dnu':
120 
-    include SERVER_ROOT.'/sections/tools/managers/dnu_list.php';
121 
-    break;
122 
-
123 
-  case 'dnu_alter':
124 
-    include SERVER_ROOT.'/sections/tools/managers/dnu_alter.php';
125 
-    break;
126 
-
127 119 
   case 'editnews':
128 120 
   case 'news':
129 121 
     include SERVER_ROOT.'/sections/tools/managers/news.php';

+ 0
- 59
sections/tools/managers/dnu_alter.php View File 

@@ -1,59 +0,0 @@
1 
-<?
2 
-if (!check_perms('admin_dnu')) {
3 
-  error(403);
4 
-}
5 
-
6 
-authorize();
7 
-
8 
-if ($_POST['submit'] == 'Reorder') { // Reorder
9 
-  foreach ($_POST['item'] as $Position => $Item) {
10 
-    $Position = db_string($Position);
11 
-    $Item = db_string($Item);
12 
-    $DB->query("
13 
-      UPDATE `do_not_upload`
14 
-      SET `Sequence` = '" . $Position . "'
15 
-      WHERE `id` = '". $Item . "'");
16 
-  }
17 
-
18 
-} elseif ($_POST['submit'] == 'Delete') { //Delete
19 
-  if (!is_number($_POST['id']) || $_POST['id'] == '') {
20 
-    error(0);
21 
-  }
22 
-  $DB->query('
23 
-    DELETE FROM do_not_upload
24 
-    WHERE ID = '.$_POST['id']);
25 
-} else { //Edit & Create, Shared Validation
26 
-  $Val->SetFields('name', '1', 'string', 'The name must be set, have a maximum length of 100 characters, and have a minimum length of 5 characters.', array('maxlength' => 100, 'minlength' => 5));
27 
-  $Val->SetFields('comment', '0', 'string', 'The description has a maximum length of 255 characters.', array('maxlength' => 255));
28 
-  $Err = $Val->ValidateForm($_POST); // Validate the form
29 
-  if ($Err) {
30 
-    error($Err);
31 
-  }
32 
-
33 
-  $P = [];
34 
-  $P = db_array($_POST); // Sanitize the form
35 
-
36 
-  if ($_POST['submit'] == 'Edit') { //Edit
37 
-    if (!is_number($_POST['id']) || $_POST['id'] == '') {
38 
-      error(0);
39 
-    }
40 
-    $DB->query("
41 
-      UPDATE do_not_upload
42 
-      SET
43 
-        Name = '$P[name]',
44 
-        Comment = '$P[comment]',
45 
-        UserID = '$LoggedUser[ID]',
46 
-        Time = NOW()
47 
-      WHERE ID = '$P[id]'");
48 
-  } else { //Create
49 
-    $DB->query("
50 
-      INSERT INTO do_not_upload
51 
-        (Name, Comment, UserID, Time, Sequence)
52 
-      VALUES
53 
-        ('$P[name]','$P[comment]','$LoggedUser[ID]', NOW(), 9999)");
54 
-  }
55 
-}
56 
-
57 
-// Go back
58 
-header('Location: tools.php?action=dnu')
59 
-?>

+ 0
- 74
sections/tools/managers/dnu_list.php View File 

@@ -1,74 +0,0 @@
1 
-<?
2 
-if (!check_perms('admin_dnu')) {
3 
-  error(403);
4 
-}
5 
-$Title = 'Manage the "Do Not Upload" list';
6 
-
7 
-View::show_header($Title, 'jquery-ui,dnu_list');
8 
-$DB->query("
9 
-  SELECT
10 
-    d.ID,
11 
-    d.Name,
12 
-    d.Comment,
13 
-    d.UserID,
14 
-    d.Time
15 
-  FROM do_not_upload AS d
16 
-    LEFT JOIN users_main AS um ON um.ID = d.UserID
17 
-  ORDER BY d.Sequence");
18 
-  ?>
19 
-  <div class="header">
20 
-    <h2><?=($Title)?></h2>
21 
-    <center><p>Drag and drop table rows to reorder.</p></center>
22 
-  </div>
23 
-  <table id="dnu">
24 
-    <tr class="colhead">
25 
-      <td colspan="4">Add an entry to the "Do Not Upload" list</td>
26 
-    </tr>
27 
-    <tr class="row">
28 
-      <form class="add_form" name="dnu" action="tools.php" method="post">
29 
-        <input type="hidden" name="action" value="dnu_alter" />
30 
-        <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
31 
-        <td>
32 
-          <input type="text" name="name" size="40" />
33 
-        </td>
34 
-        <td colspan="2">
35 
-          <input type="text" name="comment" size="60" />
36 
-        </td>
37 
-        <td>
38 
-          <input type="submit" value="Create" />
39 
-        </td>
40 
-      </form>
41 
-    </tr>
42 
-    <tr class="colhead">
43 
-      <td>Name</td>
44 
-      <td>Comment</td>
45 
-      <td>Added</td>
46 
-      <td>Submit</td>
47 
-    </tr>
48 
-    <tbody>
49 
-<?php while (list($ID, $Name, $Comment, $UserID, $DNUTime) = $DB->next_record()) { ?>
50 
-      <tr id="item_<?=$ID?>">
51 
-        <form class="manage_form dnu" action="tools.php" method="post">
52 
-          <td>
53 
-            <input type="hidden" name="action" value="dnu_alter" />
54 
-            <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
55 
-            <input type="hidden" name="id" value="<?=$ID?>" />
56 
-            <input type="text" name="name" value="<?=display_str($Name)?>" size="40" />
57 
-          </td>
58 
-          <td>
59 
-            <input type="text" name="comment" value="<?=display_str($Comment)?>" size="60" />
60 
-          </td>
61 
-          <td>
62 
-            <?=Users::format_username($UserID, false, false, false)?><br />
63 
-            <?= time_diff($DNUTime, 1) . "\n"; ?>
64 
-          </td>
65 
-          <td>
66 
-            <input type="submit" name="submit" value="Edit" />
67 
-            <input type="submit" name="submit" value="Delete" />
68 
-          </td>
69 
-        </form>
70 
-      </tr>
71 
-<?php } ?>
72 
-    </tbody>
73 
-  </table>
74 
-<? View::show_footer(); ?>

+ 0
- 1
sections/tools/tools.php View File 

@@ -216,7 +216,6 @@ View::show_header('Staff Tools');
216 216 
   // begin Torrents category
217 217 
   $ToolsHTML = "";
218 218 
   create_row("Collage recovery", "collages.php?action=recover", check_perms("site_collages_recover"));
219 
-  create_row("\"Do Not Upload\" list", "tools.php?action=dnu", check_perms("admin_dnu"));
220 219 
   create_row("Manage freeleech tokens", "tools.php?action=tokens", check_perms("users_mod"));
221 220 
   create_row("Multiple freeleech", "tools.php?action=multiple_freeleech", check_perms("users_mod"));
222 221 
   create_row("Label aliases", "tools.php?action=label_aliases", check_perms("users_mod"));

+ 1
- 73
sections/upload/upload.php View File 

@@ -102,79 +102,7 @@ if (!$GenreTags) {
102 102 
     $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
103 103 
 }
104 104
105 
-/**
106 
- * Do Not Upload
107 
- */
108 
-$DB->query('
109 
-  SELECT
110 
-    Name,
111 
-    Comment,
112 
-    Time
113 
-  FROM do_not_upload
114 
-    ORDER BY Sequence');
115 
-
116 
-$DNU = $DB->to_array();
117 
-$DB->query('SELECT MAX(Time) FROM do_not_upload');
118 
-list($Updated) = $DB->next_record();
119 
-
120 
-$DB->query("
121 
-  SELECT IF(MAX(Time) IS NULL OR MAX(Time) < '$Updated', 1, 0)
122 
-  FROM torrents
123 
-  WHERE UserID = ".$LoggedUser['ID']);
124 
-
125 
-list($NewDNU) = $DB->next_record();
126 
-$HideDNU = check_perms('torrents_hide_dnu') && !$NewDNU; ?>
127 
-<div
128 
-  class="<?=(check_perms('torrents_hide_dnu') ? 'box pad' : '')?>"
129 
-  style="margin: 0px auto; width: 700px;">
130 
-
131 
-  <h3 id="dnu_header">Do Not Upload List</h3>
132 
-  <p>
133 
-    <?=$NewDNU ? '<strong class="important_text">' : '' ?>
134 
-    Last updated:
135 
-    <?=time_diff($Updated)?><?=$NewDNU ? '</strong>' : '' ?>
136 
-  </p>
137 
-
138 
-  <p>
139 
-    The following releases are currently forbidden from being uploaded to the site.
140 
-    Do not upload them unless your torrent meets a condition specified in the comment.
141 
-    <?php if ($HideDNU) { ?>
142 
-    <span id="showdnu">
143 
-      <a data-toggle-target="#dnulist" data-toggle-replace="Hide" class="brackets">Show</a>
144 
-    </span>
145 
-    <?php } ?>
146 
-  </p>
147 
-
148 
-  <table id="dnulist"
149 
-    class="<?=($HideDNU ? 'hidden' : '')?>">
150 
-
151 
-    <tr class="colhead">
152 
-      <td width="50%"><strong>Name</strong></td>
153 
-      <td><strong>Comment</strong></td>
154 
-    </tr>
155 
-
156 
-    <?php $TimeDiff = strtotime('-1 month', strtotime('now'));
157 
-  foreach ($DNU as $BadUpload) {
158 
-      list($Name, $Comment, $Updated) = $BadUpload; ?>
159 
-    <tr>
160 
-      <td>
161 
-        <?=display_str($Name) . "\n" ?>
162 
-        <?php if ($TimeDiff < strtotime($Updated)) { ?>
163 
-        <strong class="important_text">(New!)</strong>
164 
-        <?php } ?>
165 
-      </td>
166 
-      <td>
167 
-        <?=Text::full_format($Comment)?>
168 
-      </td>
169 
-    </tr>
170 
-    <?php
171 
-  } ?>
172 
-  </table>
173 
-</div>
174 
-<?=($HideDNU ? '<br />' : '')?>
175 
-
176 
-<?php
177 
-# Page contents (DNU should be a TorrentForm function)
105 
+# Page contents
178 106 
 echo $TorrentForm->uploadNotice();
179 107 
 echo $TorrentForm->announceSource();
180 108 
 echo $TorrentForm->error();

+ 0
- 25
static/functions/dnu_list.js View File 

@@ -1,25 +0,0 @@
1 
-jQuery(document).ready(function ($) {
2 
-  // Helper function to preserve table cell dimentions
3 
-  var fixDimentions = function (unused, elements) {
4 
-    // Iterate through each table cell and correct width
5 
-    elements.children().each(function () {
6 
-      $(this).width($(this).width());
7 
-    });
8 
-    return elements;
9 
-  };
10 
-  // Make table sortable
11 
-  $('#dnu tbody').sortable({
12 
-    helper: fixDimentions,
13 
-    cancel: 'input, .colhead, .highlight',
14 
-    update: function (event, ui) {
15 
-      var post = $(this).sortable('serialize');
16 
-      request = $.ajax({
17 
-        url: 'tools.php',
18 
-        type: "post",
19 
-        data: 'action=dnu_alter&auth=' + authkey + '&' + post + '&submit=Reorder'
20 
-      });
21 
-      request.done(function (response, textStatus, jqXHR) {
22 
-      });
23 
-    }
24 
-  });
25 
-});

Write Preview
Loading…
Cancel
Save