From 5e62b46697c562792375274741b2ecb1dfee8116 Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 10 Apr 2012 08:00:20 +0000 Subject: [PATCH] Empty commit --- classes/class_torrent_form.php | 6 ------ classes/script_start.php | 4 +++- design/privateheader.php | 2 +- sections/requests/request.php | 1 + static/functions/requests.js | 11 +++++++++++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index c96e7591..3cf4bdc5 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -625,12 +625,6 @@ function show() {

Contains background information such as album history and maybe a review.

- - Library Contest Image Location - -   Multi-disc Upload - - Release Description (optional) diff --git a/classes/script_start.php b/classes/script_start.php index 903ad36a..4c4da687 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -267,7 +267,7 @@ function user_info($UserID) { global $DB, $Cache, $Classes; $UserInfo = $Cache->get_value('user_info_'.$UserID); // the !isset($UserInfo['Paranoia']) can be removed after a transition period - if(empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia'])) { + if(empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) { $OldQueryID = $DB->get_query_id(); @@ -301,6 +301,8 @@ function user_info($UserID) { } } + $UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level']; + if (!empty($UserInfo['Levels'])) { $UserInfo['ExtraClasses'] = array_fill_keys(explode(',', $UserInfo['Levels']), 1); } else { diff --git a/design/privateheader.php b/design/privateheader.php index 2a8d2443..a847e84d 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -137,7 +137,7 @@ JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID JOIN forums_topics AS t ON l.TopicID = t.ID JOIN forums AS f ON t.ForumID = f.ID - WHERE (f.MinClassRead <= ".$LoggedUser['EffectiveClass']." OR f.ID IN ('$PermittedForums')) + WHERE (f.MinClassRead <= ".$LoggedUser['Class']." OR f.ID IN ('$PermittedForums')) AND l.PostID < t.LastPostID AND s.UserID = ".$LoggedUser['ID']. (!empty($RestrictedForums) ? " diff --git a/sections/requests/request.php b/sections/requests/request.php index 594d8ba9..3da88901 100644 --- a/sections/requests/request.php +++ b/sections/requests/request.php @@ -352,6 +352,7 @@ + If you add the entered 0.00 MB of bounty, your new stats will be:
Uploaded: diff --git a/static/functions/requests.js b/static/functions/requests.js index ec7d1826..6e06f85f 100644 --- a/static/functions/requests.js +++ b/static/functions/requests.js @@ -19,6 +19,17 @@ function Vote(amount, requestid) { index = true; } + if (amount > 20*1024*1024) { + upload = $('#current_uploaded').raw().value; + download = $('#current_downloaded').raw().value; + rr = $('#current_rr').raw().value; + if (amount > .3*(upload - rr * download)) { + if(!confirm('This vote is more than 30% of your buffer. Please confirm that you wish to place this large a vote.')) { + return false; + } + } + } + ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + $('#auth').raw().value + '&amount=' + amount, function (response) { if(response == 'bankrupt') { error_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request");