diff --git a/classes/permissions_form.php b/classes/permissions_form.php index 6d0420da..757a83f9 100644 --- a/classes/permissions_form.php +++ b/classes/permissions_form.php @@ -80,6 +80,7 @@ 'torrents_delete_fast' => 'Can delete more than 3 torrents at a time.', 'torrents_freeleech' => 'Can make torrents freeleech.', 'torrents_search_fast' => 'Rapid search (for scripts).', + 'torrents_hide_dnu' => 'Hide the Do Not Upload list by default.', 'admin_manage_news' => 'Can manage news.', 'admin_manage_blog' => 'Can manage blog.', 'admin_manage_polls' => 'Can manage polls.', @@ -139,6 +140,8 @@ function permissions_form(){ ?> display_perm('site_send_unlimited_invites', 'Can send unlimited invites.'); ?> display_perm('site_moderate_requests', 'Can moderate any request.'); ?> display_perm('site_delete_artist', 'Can delete artists (must be able to delete torrents+requests).'); ?> + display_perm('forums_polls_create','Can create polls in the forums.') ?> + display_perm('forums_polls_moderate','Can feature and close polls.') ?> display_perm('site_moderate_forums', 'Can moderate the forums.'); ?> display_perm('site_admin_forums', 'Can administrate the forums.'); ?> display_perm('site_view_flow', 'Can view site stats and data pools.'); ?> @@ -208,9 +211,7 @@ function permissions_form(){ ?>
- | ↑ =$DisplayName?> (View) | +↑ =$DisplayName?> (View) | Size | @@ -300,7 +302,7 @@ function compare($X, $Y){ $RemasterName .= $AddExtra.display_str($Torrent['Media']); ?> - | |
− =$RemasterName?> | |||||
− =$MasterName?> | |||||
[=$Torrent['HasFile'] ? 'DL' : 'Missing'?>]
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index fe5ff90f..47c87898 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -165,10 +165,8 @@ function compare($X, $Y){
if($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear ||
$Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) {
+ $EditionID++;
if($Torrent['Remastered'] && $Torrent['RemasterYear'] != 0) {
-
- $EditionID++;
-
$RemasterName = $Torrent['RemasterYear'];
$AddExtra = " - ";
if($Torrent['RemasterRecordLabel']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterRecordLabel']); $AddExtra=' / '; }
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index 356fb17c..1b12cc57 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -81,9 +81,13 @@
$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
}
?>
-
+ Do not upload-The following releases are currently forbidden from being uploaded from the site. Do not upload them unless your torrent meets a condition specified in the comment. +The following releases are currently forbidden from being uploaded from the site. Do not upload them unless your torrent meets a condition specified in the comment. + if (check_perms('torrents_hide_dnu')) { ?> + (Show) + } ?> + $DB->query("SELECT d.Name, @@ -91,7 +95,7 @@ FROM do_not_upload as d ORDER BY d.Time"); ?> -
':'')?> $TorrentForm->head(); switch ($UploadForm) { diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php index 716c8cc1..135cb714 100644 --- a/sections/user/takemoderate.php +++ b/sections/user/takemoderate.php @@ -502,6 +502,7 @@ $CanLeech = 1; $UpdateSet[]="m.can_leech='1'"; $UpdateSet[]="i.RatioWatchDownload='0'"; + update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass'])); } else { $EnableStr .= ' (Ratio: '.number_format($Cur['Uploaded']/$Cur['Downloaded'],2).', RR: '.number_format($Cur['RequiredRatio'],2).')'; if ($Cur['RatioWatchEnds'] != '0000-00-00 00:00:00') { @@ -510,7 +511,6 @@ } $UpdateSet[]="Enabled='1'"; $LightUpdates['Enabled'] = 1; - update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass'])); } $EditSummary[]=$EnableStr; $Cache->replace_value('enabled_'.$UserID, $EnableUser, 0); diff --git a/static/functions/script_start.js b/static/functions/script_start.js index 9481e328..689ea5b9 100644 --- a/static/functions/script_start.js +++ b/static/functions/script_start.js @@ -176,13 +176,13 @@ util.fn = util.prototype = { show: function () { return this.remove_class('hidden'); }, - hide: function () { - return this.add_class('hidden'); + hide: function (force) { + return this.add_class('hidden', force); }, - toggle: function () { + toggle: function (force) { //Should we interate and invert all entries, or just go by the first? if (!in_array('hidden', this.objects[0].className.split(' '))) { - this.add_class('hidden'); + this.add_class('hidden', force); } else { this.remove_class('hidden'); } @@ -206,12 +206,12 @@ util.fn = util.prototype = { } return this; }, - add_class: function (class_name) { + add_class: function (class_name, force) { for (var i=0,il=this.objects.length;i |