Empty commit

This commit is contained in:
Git 2013-09-11 08:00:55 +00:00
parent 84710552c5
commit b051b7a7c4
18 changed files with 47 additions and 40 deletions

View File

@ -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</li>\n<li>";
}
$UserClass = $Classes[$Class]['Level'];
?>
<strong><?=Users::format_username($ID, true, true, ($Enabled != 2 ? false : true), true)?></strong>
<?
@ -141,7 +142,7 @@ function make_tree() {
} else {
$ParanoidCount++;
?>
&nbsp;Paranoia: <strong><?=number_format($Paranoia) ?></strong>
&nbsp;Hidden
<?
}
?>

View File

@ -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);
}

View File

@ -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` (

View File

@ -688,10 +688,10 @@ function compare($X, $Y) {
<li>
<span title="<?=$Score?>"><a href="artist.php?id=<?=$Artist2ID?>" style="float: left; display: block;"><?=$Artist2Name?></a></span>
<div style="float: right; display: block; letter-spacing: -1px;">
<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" style="font-family: monospace;" class="tooltip" title="Vote down this similar artist. Use this when you feel that the two artists are not all that similar." class="brackets">&minus;</a>
<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" style="font-family: monospace;" class="tooltip" title="Vote up this similar artist. Use this when you feel that the two artists are quite similar." class="brackets">+</a>
<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=down" class="tooltip brackets" title="Vote down this similar artist. Use this when you feel that the two artists are not all that similar.">&minus;</a>
<a href="artist.php?action=vote_similar&amp;artistid=<?=$ArtistID?>&amp;similarid=<?=$SimilarID?>&amp;way=up" class="tooltip brackets" title="Vote up this similar artist. Use this when you feel that the two artists are quite similar.">+</a>
<? if (check_perms('site_delete_tag')) { ?>
<span class="remove remove_artist"><a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="tooltip" title="Remove this similar artist" class="brackets">X</a></span>
<span class="remove remove_artist"><a href="artist.php?action=delete_similar&amp;similarid=<?=$SimilarID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="tooltip brackets" title="Remove this similar artist">X</a></span>
<? } ?>
</div>
<br style="clear: both;" />
@ -778,7 +778,7 @@ function compare($X, $Y) {
<tr class="colhead_dark">
<td style="width: 48%;">
<a href="#">&uarr;</a>&nbsp;
<strong>Request name</strong>
<strong>Request Name</strong>
</td>
<td>
<strong>Vote</strong>
@ -940,7 +940,7 @@ function require(file, callback) {
<div class="box">
<div id="info" class="head">
<a href="#">&uarr;</a>&nbsp;
<strong>Artist info</strong>
<strong>Artist Information</strong>
<a href="#" class="brackets" onclick="$('#body').gtoggle(); return false;">Toggle</a>
</div>
<div id="body" class="body"><?=$Text->full_format($Body)?></div>

View File

@ -12,7 +12,7 @@
<table width="100%">
<tr class="colhead">
<td style="width: 150px;">Method</td>
<td style="width: 400px;">Additional information</td>
<td style="width: 400px;">Additional Information</td>
</tr>
<tr class="rowb">
<td class="nobr">

View File

@ -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 @@
<tr class="colhead">
<td style="width: 2%;"></td>
<td style="width: 25%;">Forum</td>
<td>Last post</td>
<td>Last Post</td>
<td style="width: 7%;">Topics</td>
<td style="width: 7%;">Posts</td>
</tr>

View File

@ -98,7 +98,7 @@
<input type="hidden" name="categoryid" value="<?=$CategoryID?>" />
</div>
<h3>Report information</h3>
<h3>Report Information</h3>
<div class="box pad">
<table class="layout">
<tr>

View File

@ -226,7 +226,7 @@
<table>
<tr class="colhead">
<td>Staff member</td>
<td>Current count</td>
<td>Current Count</td>
</tr>
<?
foreach ($Staff as $Array) { ?>
@ -255,7 +255,7 @@
<table>
<tr class="colhead">
<td>Type</td>
<td>Current count</td>
<td>Current Count</td>
</tr>
<?
foreach ($Current as $Array) {

View File

@ -523,7 +523,7 @@
<table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
<tr class="colhead_dark">
<td style="width: 38%;" class="nobr">
<strong>Request name</strong> / <a href="?order=year&amp;sort=<?=(($CurrentOrder === 'year') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Year</strong></a>
<strong>Request Name</strong> / <a href="?order=year&amp;sort=<?=(($CurrentOrder === 'year') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Year</strong></a>
</td>
<td class="nobr">
<a href="?order=votes&amp;sort=<?=(($CurrentOrder === 'votes') ? $NewSort : 'desc')?>&amp;<?=$CurrentURL ?>"><strong>Votes</strong></a>

View File

@ -389,7 +389,7 @@ foreach ($Categories as $CatKey => $CatName) {
<table id="request_table" class="request_table" cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
<tr class="colhead_dark">
<td style="width: 38%;">
<a href="requests.php?order=name&amp;sort=<?=(($CurrentOrder === 'name') ? $NewSort : 'asc')?>&amp;<?=$CurrentURL ?>"><strong>Request name</strong></a>
<a href="requests.php?order=name&amp;sort=<?=(($CurrentOrder === 'name') ? $NewSort : 'asc')?>&amp;<?=$CurrentURL ?>"><strong>Request Name</strong></a>
</td>
<td>
<strong><a href="requests.php?order=votes&amp;sort=<?=(($CurrentOrder === 'votes') ? $NewSort : 'asc')?>&amp;<?=$CurrentURL ?>">Vote (20MB)</a></strong></td>

View File

@ -4,7 +4,7 @@
<table width="100%">
<tr class="colhead">
<td style="width: 150px;">Category</td>
<td style="width: 400px;">Additional information</td>
<td style="width: 400px;">Additional Information</td>
</tr>
<tr class="rowb">
<td class="nobr">

View File

@ -86,7 +86,7 @@
<div class="head">
<?=((empty($_GET['action'])) ? 'Create a staff blog post' : 'Edit staff blog post')?>
<span style="float: right;">
<a href="#" onclick="$('#postform').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="bracket"><?=(($_REQUEST['action'] != 'editblog') ? 'Show' : 'Hide')?></a>
<a href="#" onclick="$('#postform').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets"><?=(($_REQUEST['action'] != 'editblog') ? 'Show' : 'Hide')?></a>
</span>
</div>
<form class="<?=((empty($_GET['action'])) ? 'create_form' : 'edit_form')?>" name="blog_post" action="staffblog.php" method="post">

View File

@ -637,7 +637,7 @@ function header_link($SortKey, $DefaultWay = 'desc') {
<span id="ft_basic_link" class="<?=$HideAdvanced?>"><a href="#" onclick="return toggleTorrentSearch('basic');">Basic</a> /</span>
<span id="ft_advanced_text" class="<?=$HideAdvanced?>">Advanced</span>
<span id="ft_advanced_link" class="<?=$HideBasic?>"><a href="#" onclick="return toggleTorrentSearch('advanced');">Advanced</a></span>
search
Search
</strong>
<span style="float: right;">
<a href="#" onclick="return toggleTorrentSearch(0);" id="ft_toggle" class="brackets"><?=$HideFilter ? 'Show' : 'Hide'?></a>

View File

@ -453,7 +453,7 @@ function compare($X, $Y) {
<input type="hidden" name="tagname" value="<?=$DeletedTag?>" />
<input type="hidden" name="undo" value="true" />
</form>
<a class="brackets" href="#" onclick="$('#undo_tag_delete_form').raw().submit(); return false;";>Undo delete</a>
<a class="brackets" href="#" onclick="$('#undo_tag_delete_form').raw().submit(); return false;">Undo delete</a>
<? } ?>
</div>
@ -467,9 +467,9 @@ function compare($X, $Y) {
<li>
<a href="torrents.php?taglist=<?=$Tag['name']?>" style="float: left; display: block;"><?=display_str($Tag['name'])?></a>
<div style="float: right; display: block; letter-spacing: -1px;" class="edit_tags_votes">
<a href="torrents.php?action=vote_tag&amp;way=down&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" style="font-family: monospace;" title="Vote this tag down" class="brackets tooltip vote_tag_down">&minus;</a>
<a href="torrents.php?action=vote_tag&amp;way=down&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Vote this tag down" class="brackets tooltip vote_tag_down">&minus;</a>
<?=$Tag['score']?>
<a href="torrents.php?action=vote_tag&amp;way=up&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" style="font-family: monospace;" title="Vote this tag up" class="brackets tooltip vote_tag_up">+</a>
<a href="torrents.php?action=vote_tag&amp;way=up&amp;groupid=<?=$GroupID?>&amp;tagid=<?=$Tag['id']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" title="Vote this tag up" class="brackets tooltip vote_tag_up">+</a>
<? if (check_perms('users_warn')) { ?>
<a href="user.php?id=<?=$Tag['userid']?>" title="View the profile of the user that added this tag" class="brackets tooltip view_tag_user">U</a>
<? } ?>

View File

@ -21,7 +21,7 @@
<a href="#" id="lastfm_expand" onclick="return false" class="brackets">Show more info</a>
<?
//Append the reload stats button only if allowed on the current user page.
$Response = $Cache->get_value('lastfm_clear_cache_' . $LoggedUser . '_' . $_GET['id']);
$Response = $Cache->get_value("lastfm_clear_cache_$UserID");
if (empty($Response)) {
?>
<span id="lastfm_reload_container">

View File

@ -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) {
<table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
<tr class="colhead_dark">
<td style="width: 48%;">
<strong>Request name</strong>
<strong>Request Name</strong>
</td>
<td>
<strong>Vote</strong>
@ -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) {
</tr>
<?
foreach ($StaffPMs as $StaffPM) {
list($ID, $Subject, $Status, $Level, $AssignedTo, $Date, $ResolverID) = $StaffPM;
list($ID, $Subject, $Status, $Level, $AssignedToUser, $Date, $ResolverID) = $StaffPM;
// Get assigned
if ($AssignedToUser == '') {
// Assigned to class

View File

@ -33,6 +33,7 @@ source torrents : torrents_base {
sql_query_pre = set group_concat_max_len = 101400
sql_query_pre = set @starttime = now()
sql_query_pre = replace into sphinx_index_last_id values ('torrents', unix_timestamp(@starttime))
sql_query_pre = truncate sphinx_tg
sql_query_pre = insert into sphinx_tg \
@ -87,7 +88,8 @@ source torrents : torrents_base {
sql_joined_field = artistname from query; \
select t.id, aname from sphinx_a join sphinx_t t using(gid) order by t.id asc;
sql_query_post_index = delete from sphinx_delta where time<=unix_timestamp(@starttime)
sql_query_post_index = delete from sphinx_delta where time <= \
(select id from sphinx_index_last_id where type='torrents')
}
index torrents {
@ -323,6 +325,7 @@ source requests : connect {
sql_query_pre = TRUNCATE TABLE sphinx_requests
sql_query_pre = SET group_concat_max_len = 10140
sql_query_pre = SET @StartTime = NOW()
sql_query_pre = REPLACE INTO sphinx_index_last_id VALUES ('requests', UNIX_TIMESTAMP(@StartTime))
sql_query_pre = INSERT INTO sphinx_requests ( \
ID, UserID, TimeAdded, LastVote, CategoryID, Title, \
@ -352,14 +355,15 @@ source requests : connect {
GROUP BY r.ID \
ON DUPLICATE KEY UPDATE ArtistList = values(ArtistList)
sql_query = SELECT ID, UserID, TimeAdded, LastVote, CategoryID, Title, \
sql_query = SELECT ID, UserID, TimeAdded, LastVote, CategoryID, Title, \
Year, ArtistList, ReleaseType, CatalogueNumber, \
BitrateList, FormatList, MediaList, LogCue, FillerID, \
TorrentID, TimeFilled, Visible, Votes, Bounty, \
Year AS YearFullText \
FROM sphinx_requests
sql_query_post = DELETE FROM sphinx_requests_delta WHERE TimeAdded<=UNIX_TIMESTAMP(@StartTime)
sql_query_post_index = DELETE FROM sphinx_requests_delta WHERE TimeAdded <= \
(SELECT id FROM sphinx_index_last_id WHERE type='requests')
sql_attr_multi = uint TagID from query; \
SELECT RequestID AS ID, TagID FROM requests_tags

View File

@ -817,6 +817,10 @@ ul .invitetree {
font-weight: bold;
}
.brackets {
font-weight: normal;
}
.brackets:before, .brackets:after {
color: #492802;
}