From b051b7a7c4e7afa089b546006d57e45e9b6521b7 Mon Sep 17 00:00:00 2001 From: Git Date: Wed, 11 Sep 2013 08:00:55 +0000 Subject: [PATCH] Empty commit --- classes/invite_tree.class.php | 5 +++-- classes/lastfm.class.php | 10 +++++----- gazelle.sql | 5 ++++- sections/artist/artist.php | 10 +++++----- sections/better/better.php | 2 +- sections/forums/main.php | 4 ++-- sections/reportsv2/report.php | 2 +- sections/reportsv2/views.php | 4 ++-- sections/requests/requests.php | 2 +- sections/requests/requests.php.presphinx | 2 +- sections/rules/jump.php | 2 +- sections/staffblog/index.php | 2 +- sections/torrents/browse2.php | 2 +- sections/torrents/details.php | 6 +++--- sections/user/lastfm.php | 2 +- sections/user/user.php | 13 ++++--------- sphinx.conf | 10 +++++++--- static/styles/anorex/style.css | 4 ++++ 18 files changed, 47 insertions(+), 40 deletions(-) diff --git a/classes/invite_tree.class.php b/classes/invite_tree.class.php index 69f1bd8e..74fdf3f9 100644 --- a/classes/invite_tree.class.php +++ b/classes/invite_tree.class.php @@ -91,7 +91,7 @@ function make_tree() { // We store this in an output buffer, so we can show the summary at the top without having to loop through twice ob_start(); - while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record()) { + while (list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = G::$DB->next_record(MYSQLI_NUM, false)) { // Do stats $Count++; @@ -127,6 +127,7 @@ function make_tree() { } else { echo "\t\n
  • "; } + $UserClass = $Classes[$Class]['Level']; ?> -  Paranoia: +  Hidden diff --git a/classes/lastfm.class.php b/classes/lastfm.class.php index 40e67cf7..cada436c 100644 --- a/classes/lastfm.class.php +++ b/classes/lastfm.class.php @@ -125,11 +125,11 @@ public static function get_hyped_artists($Limit = 100) { - public static function clear_cache($Username, $Uid) { - $Response = G::$Cache->get_value('lastfm_clear_cache_' . G::$LoggedUser['ID'] . '_' . $_GET['id']); + public static function clear_cache($Username, $UserID) { + $Response = G::$Cache->get_value("lastfm_clear_cache_$UserID"); if (empty($Response)) { // Prevent clearing the cache on the same uid page for the next 10 minutes. - $Response = G::$Cache->cache_value('lastfm_clear_cache_' . G::$LoggedUser['ID'] . "_$Uid", $Username, 600); + G::$Cache->cache_value("lastfm_clear_cache_$UserID", 1, 600); G::$Cache->delete_value("lastfm_user_info_$Username"); G::$Cache->delete_value("lastfm_last_played_track_$Username"); G::$Cache->delete_value("lastfm_top_artists_$Username"); @@ -139,7 +139,7 @@ public static function clear_cache($Username, $Uid) { G::$DB->query(" SELECT username FROM lastfm_users - WHERE ID = '" . G::$LoggedUser['ID'] . "'"); + WHERE ID = " . G::$LoggedUser['ID']); if (G::$DB->has_results()) { list($Username2) = G::$DB->next_record(); //Make sure the usernames are in the correct order to avoid dupe cache keys. @@ -148,7 +148,7 @@ public static function clear_cache($Username, $Uid) { $Username = $Username2; $Username2 = $Temp; } - G::$Cache->delete_value("lastfm_compare_$Username" . "_$Username2"); + G::$Cache->delete_value("lastfm_compare_{$Username}_$Username2"); } G::$DB->set_query_id($QueryID); } diff --git a/gazelle.sql b/gazelle.sql index b50979fc..7dfac178 100644 --- a/gazelle.sql +++ b/gazelle.sql @@ -1439,7 +1439,10 @@ CREATE TABLE `users_donor_ranks` ( `TotalRank` int(10) NOT NULL DEFAULT '0', `SpecialRank` tinyint(2) DEFAULT '0', `InvitesRecievedRank` tinyint(4) DEFAULT '0', - PRIMARY KEY (`UserID`) + PRIMARY KEY (`UserID`), + KEY `DonationTime` (`DonationTime`), + KEY `SpecialRank` (`SpecialRank`), + KEY `Rank` (`Rank`) ) ENGINE=InnoDB CHARSET utf8; CREATE TABLE `users_downloads` ( diff --git a/sections/artist/artist.php b/sections/artist/artist.php index ec2ecb4d..b8ba4c70 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -688,10 +688,10 @@ function compare($X, $Y) {
  • - − - + + − + + - X + X

    @@ -778,7 +778,7 @@ function compare($X, $Y) { ↑  - Request name + Request Name Vote @@ -940,7 +940,7 @@ function require(file, callback) {
    ↑  - Artist info + Artist Information Toggle
    full_format($Body)?>
    diff --git a/sections/better/better.php b/sections/better/better.php index 726cc0fa..3a86bd43 100644 --- a/sections/better/better.php +++ b/sections/better/better.php @@ -12,7 +12,7 @@ - + - + diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php index afe38b6c..20b8dfa1 100644 --- a/sections/reportsv2/report.php +++ b/sections/reportsv2/report.php @@ -98,7 +98,7 @@ -

    Report information

    +

    Report Information

    MethodAdditional informationAdditional Information
    diff --git a/sections/forums/main.php b/sections/forums/main.php index 2cd48712..50b9cc89 100644 --- a/sections/forums/main.php +++ b/sections/forums/main.php @@ -18,7 +18,7 @@ if ($ForumID == DONOR_FORUM) { $ForumDescription = Donations::get_forum_description(); } - $Tooltip = $ForumID == DONOR_FORUM ? 'tooltip_gold' : 'tooltip'; + $Tooltip = $ForumID == DONOR_FORUM ? 'tooltip_gold' : 'tooltip'; $Row = $Row === 'a' ? 'b' : 'a'; $ForumDescription = display_str($ForumDescription); @@ -33,7 +33,7 @@
    ForumLast postLast Post Topics Posts
    diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php index 4dc84843..ffde7cc0 100644 --- a/sections/reportsv2/views.php +++ b/sections/reportsv2/views.php @@ -226,7 +226,7 @@
    - + @@ -255,7 +255,7 @@
    Staff memberCurrent countCurrent Count
    - +
    TypeCurrent countCurrent Count
    - Request name / Year + Request Name / Year Votes diff --git a/sections/requests/requests.php.presphinx b/sections/requests/requests.php.presphinx index f7639d14..3d03d957 100644 --- a/sections/requests/requests.php.presphinx +++ b/sections/requests/requests.php.presphinx @@ -389,7 +389,7 @@ foreach ($Categories as $CatKey => $CatName) { diff --git a/sections/rules/jump.php b/sections/rules/jump.php index 3d8b3b62..3c5cd940 100644 --- a/sections/rules/jump.php +++ b/sections/rules/jump.php @@ -4,7 +4,7 @@
    - Request name + Request Name Vote (20MB)
    - +
    CategoryAdditional informationAdditional Information
    diff --git a/sections/staffblog/index.php b/sections/staffblog/index.php index af025f3d..96c3bbbf 100644 --- a/sections/staffblog/index.php +++ b/sections/staffblog/index.php @@ -86,7 +86,7 @@
    - +
    diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index 4a562c19..44290046 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -637,7 +637,7 @@ function header_link($SortKey, $DefaultWay = 'desc') { Basic / Advanced Advanced - search + Search diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 08508009..1a4196c7 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -453,7 +453,7 @@ function compare($X, $Y) { - Undo delete + Undo delete @@ -467,9 +467,9 @@ function compare($X, $Y) {
  • - − + − - + + + U diff --git a/sections/user/lastfm.php b/sections/user/lastfm.php index 833a9061..88028b26 100644 --- a/sections/user/lastfm.php +++ b/sections/user/lastfm.php @@ -21,7 +21,7 @@ Show more info get_value('lastfm_clear_cache_' . $LoggedUser . '_' . $_GET['id']); + $Response = $Cache->get_value("lastfm_clear_cache_$UserID"); if (empty($Response)) { ?> diff --git a/sections/user/user.php b/sections/user/user.php index e541ff9f..c91bb9b4 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -3,13 +3,11 @@ include(SERVER_ROOT.'/classes/text.class.php'); // Text formatting class $Text = new TEXT; -include(SERVER_ROOT.'/sections/requests/functions.php'); - if (empty($_GET['id']) || !is_numeric($_GET['id']) || (!empty($_GET['preview']) && !is_numeric($_GET['preview']))) { error(404); } $UserID = $_GET['id']; -$Preview = $_GET['preview']; +$Preview = isset($_GET['preview']) ? $_GET['preview'] : 0; if ($UserID == $LoggedUser['ID']) { $OwnProfile = true; if ($Preview == 1) { @@ -182,9 +180,6 @@ function check_paranoia_here($Setting) { } } -$P = $UserInfo['Paranoia']; -$ShowDonorIcon = !in_array('hide_donor_heart', $P); - View::show_header($Username, "jquery.imagesloaded,jquery.wookmark,user,bbcode,requests,lastfm,comments,info_paster", "tiles"); ?> @@ -807,7 +802,7 @@ function check_paranoia_here($Setting) {
    - Request name + Request Name Vote @@ -882,7 +877,7 @@ function check_paranoia_here($Setting) { } } -$IsFLS = $LoggedUser['ExtraClasses'][41]; +$IsFLS = isset($LoggedUser['ExtraClasses'][FLS_TEAM]); if (check_perms('users_mod', $Class) || $IsFLS) { $UserLevel = $LoggedUser['EffectiveClass']; $DB->query(" @@ -915,7 +910,7 @@ function check_paranoia_here($Setting) {