Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2024-12-13 02:46:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2013-06-12 08:00:46 +00:00
parent 1da89b3c82
commit e47d02a276
45 changed files with 60 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/inbox.class.php
View File

@ -5,11 +5,14 @@ class Inbox {
* Get the link to a user's inbox. * Get the link to a user's inbox.
* This is what handles the ListUnreadPMsFirst setting * This is what handles the ListUnreadPMsFirst setting
* *
* @param boolean - the value of $LoggedUser['ListUnreadPMsFirst']
* @param string - whether the inbox or sentbox should be loaded * @param string - whether the inbox or sentbox should be loaded
* @return string - the URL to a user's inbox * @return string - the URL to a user's inbox
*/ */
public static function get_inbox_link($ListFirst = 0, $WhichBox = 'inbox') { public static function get_inbox_link($WhichBox = 'inbox') {
global $LoggedUser;
$ListFirst = $LoggedUser['ListUnreadPMsFirst'];
if ($WhichBox == 'inbox') { if ($WhichBox == 'inbox') {
if ($ListFirst) { if ($ListFirst) {
$InboxURL = 'inbox.php?sort=unread'; $InboxURL = 'inbox.php?sort=unread';

1
classes/invite_tree.class.php
View File

@ -215,7 +215,6 @@ function make_tree() {
echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload); echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. '; echo '; and the total ratio is '.Format::get_ratio_html($TopLevelUpload, $TopLevelDownload).'. ';
echo 'These numbers include the stats of paranoid users and will be factored into the invitation giving script.</p>'; echo 'These numbers include the stats of paranoid users and will be factored into the invitation giving script.</p>';
if ($ParanoidCount) { if ($ParanoidCount) {

2
classes/script_start.php
View File

@ -357,7 +357,6 @@
// IP changed // IP changed
if ($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) { if ($LoggedUser['IP'] != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) { if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
@ -426,7 +425,6 @@ function logout() {
setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false); setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
if ($SessionID) { if ($SessionID) {
$DB->query(" $DB->query("
DELETE FROM users_sessions DELETE FROM users_sessions
WHERE UserID='$LoggedUser[ID]' WHERE UserID='$LoggedUser[ID]'

1
classes/tools.class.php
View File

@ -187,7 +187,6 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
} }
$Cache->delete_value('users_sessions_'.$UserID); $Cache->delete_value('users_sessions_'.$UserID);
$DB->query(" $DB->query("
DELETE FROM users_sessions DELETE FROM users_sessions
WHERE UserID='$UserID'"); WHERE UserID='$UserID'");

1
classes/user_rank.class.php
View File

@ -86,7 +86,6 @@ function table_query($TableName) {
ORDER BY Posts;"; ORDER BY Posts;";
break; break;
case 'bounty': case 'bounty':
$Query = " $Query = "
SELECT SUM(rv.Bounty) AS Bounty SELECT SUM(rv.Bounty) AS Bounty
FROM users_main AS um FROM users_main AS um

2
classes/users.class.php
View File

@ -51,7 +51,6 @@ public static function user_info($UserID) {
if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) { if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
$OldQueryID = $DB->get_query_id(); $OldQueryID = $DB->get_query_id();
$DB->query(" $DB->query("
SELECT SELECT
m.ID, m.ID,
@ -122,7 +121,6 @@ public static function user_heavy_info($UserID) {
global $DB, $Cache; global $DB, $Cache;
$HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID); $HeavyInfo = $Cache->get_value('user_info_heavy_'.$UserID);
if (empty($HeavyInfo)) { if (empty($HeavyInfo)) {
$DB->query(" $DB->query("

6
design/privateheader.php
View File

@ -159,7 +159,7 @@
$Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0); $Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0);
} ?> } ?>
<ul id="userinfo_minor"<?=($NewSubscriptions ? ' class="highlite"' : '')?>> <ul id="userinfo_minor"<?=($NewSubscriptions ? ' class="highlite"' : '')?>>
<li id="nav_inbox"<?=Format::add_class($PageID, array('inbox'), 'active', true)?>><a onmousedown="Stats('inbox');" href="<?=Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst']); ?>">Inbox</a></li> <li id="nav_inbox"<?=Format::add_class($PageID, array('inbox'), 'active', true)?>><a onmousedown="Stats('inbox');" href="<?=Inbox::get_inbox_link(); ?>">Inbox</a></li>
<li id="nav_staffinbox"<?=Format::add_class($PageID, array('staffpm'), 'active', true)?>><a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a></li> <li id="nav_staffinbox"<?=Format::add_class($PageID, array('staffpm'), 'active', true)?>><a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a></li>
<li id="nav_uploaded"<?=Format::add_class($PageID, array('torrents',false,'uploaded'), 'active', true, 'userid')?>><a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a></li> <li id="nav_uploaded"<?=Format::add_class($PageID, array('torrents',false,'uploaded'), 'active', true, 'userid')?>><a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a></li>
<li id="nav_bookmarks"<?=Format::add_class($PageID, array('bookmarks'), 'active', true)?>><a onmousedown="Stats('bookmarks');" href="bookmarks.php?type=torrents">Bookmarks</a></li> <li id="nav_bookmarks"<?=Format::add_class($PageID, array('bookmarks'), 'active', true)?>><a onmousedown="Stats('bookmarks');" href="bookmarks.php?type=torrents">Bookmarks</a></li>
@ -328,7 +328,7 @@
} }
if ($NewMessages > 0) { if ($NewMessages > 0) {
$Alerts[] = '<a href="' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst']) . "\">You have $NewMessages".(($NewMessages > 1) ? ' new messages' : ' new message').'</a>'; $Alerts[] = '<a href="' . Inbox::get_inbox_link() . "\">You have $NewMessages".(($NewMessages > 1) ? ' new messages' : ' new message').'</a>';
} }
if ($LoggedUser['RatioWatch']) { if ($LoggedUser['RatioWatch']) {
@ -519,7 +519,7 @@
onblur="if (this.value == '') this.value='Artists';" onblur="if (this.value == '') this.value='Artists';"
value="Artists" type="text" name="artistname" size="17" value="Artists" type="text" name="artistname" size="17"
/> />
<ul id="artistcomplete" style="visibility: hidden;"><li/></ul> <ul id="artistcomplete" style="visibility: hidden;"><li /></ul>
</form> </form>
</li> </li>
<li id="searchbar_requests"> <li id="searchbar_requests">

1
sections/ajax/browse.php
View File

@ -671,6 +671,7 @@ function header_link($SortKey,$DefaultWay = 'desc') {
'groupId' => (int) $GroupID, 'groupId' => (int) $GroupID,
'groupName' => $GroupName, 'groupName' => $GroupName,
'artist' => $DisplayName, 'artist' => $DisplayName,
'cover' => $GroupInfo['WikiImage'],
'tags' => $TagList, 'tags' => $TagList,
'bookmarked' => in_array($GroupID, $Bookmarks), 'bookmarked' => in_array($GroupID, $Bookmarks),
'vanityHouse' => $GroupVanityHouse == '1', 'vanityHouse' => $GroupVanityHouse == '1',

8
sections/ajax/usersearch.php
View File

@ -23,7 +23,8 @@
Enabled, Enabled,
PermissionID, PermissionID,
Donor, Donor,
Warned Warned,
Avatar
FROM users_main AS um FROM users_main AS um
JOIN users_info AS ui ON ui.UserID=um.ID JOIN users_info AS ui ON ui.UserID=um.ID
WHERE Username LIKE '%".db_string($_GET['username'])."%' WHERE Username LIKE '%".db_string($_GET['username'])."%'
@ -37,7 +38,7 @@
$JsonUsers = array(); $JsonUsers = array();
foreach ($Results as $Result) { foreach ($Results as $Result) {
list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned) = $Result; list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned, $Avatar) = $Result;
$JsonUsers[] = array( $JsonUsers[] = array(
'userId' => (int) $UserID, 'userId' => (int) $UserID,
@ -45,7 +46,8 @@
'donor' => $Donor == 1, 'donor' => $Donor == 1,
'warned' => ($Warned != '0000-00-00 00:00:00'), 'warned' => ($Warned != '0000-00-00 00:00:00'),
'enabled' => ($Enabled == 2 ? false : true), 'enabled' => ($Enabled == 2 ? false : true),
'class' => Users::make_class_string($PermissionID) 'class' => Users::make_class_string($PermissionID),
'avatar' => $Avatar
); );
} }

8
sections/artist/artist.php
View File

@ -510,9 +510,9 @@ function compare($X, $Y) {
<? } ?> <? } ?>
<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>" class="brackets">View history</a> <a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>" class="brackets">View history</a>
<a href="artist.php?id=<?=$ArtistID?>#info" class="brackets">Info</a> <a href="artist.php?id=<?=$ArtistID?>#info" class="brackets">Info</a>
<!-- <strip>--> <? if (defined(LASTFM_API_KEY)) { ?>
<a href="artist.php?id=<?=$ArtistID?>#concerts" class="brackets">Concerts</a> <a href="artist.php?id=<?=$ArtistID?>#concerts" class="brackets">Concerts</a>
<!-- </strip>--> <? } ?>
<a href="artist.php?id=<?=$ArtistID?>#artistcomments" class="brackets">Comments</a> <a href="artist.php?id=<?=$ArtistID?>#artistcomments" class="brackets">Comments</a>
<? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?> <? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?>
<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Delete</a> <a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Delete</a>
@ -933,7 +933,9 @@ function require(file, callback) {
</div> </div>
<div id="body" class="body"><?=$Text->full_format($Body)?></div> <div id="body" class="body"><?=$Text->full_format($Body)?></div>
</div> </div>
<!----> <? if (defined(LASTFM_API_KEY)) {
include(SERVER_ROOT.'/sections/artist/concerts.php');
} ?>
<?php <?php
// --- Comments --- // --- Comments ---

2
sections/comments/torrentcomments.php
View File

@ -12,7 +12,7 @@
$MyTorrents = false; $MyTorrents = false;
} }
$OtherLink = '<a href="comments.php?action=artists" class="brackets">Artist comments</a> <a href="comments.php?action=collages" class="brackets">Collage comments</a> <a href="comments.php?action=requests" class="brackets">Request comments</a><br/>'; $OtherLink = '<a href="comments.php?action=artists" class="brackets">Artist comments</a> <a href="comments.php?action=collages" class="brackets">Collage comments</a> <a href="comments.php?action=requests" class="brackets">Request comments</a><br />';
if ($MyTorrents) { if ($MyTorrents) {
$Conditions = "WHERE t.UserID = $UserID AND tc.AuthorID != t.UserID AND tc.AddedTime > t.Time"; $Conditions = "WHERE t.UserID = $UserID AND tc.AuthorID != t.UserID AND tc.AddedTime > t.Time";

1
sections/donate/config.php
View File

@ -1,6 +1,5 @@
<? <?
define('PAYPAL_ADDRESS',''); define('PAYPAL_ADDRESS','');
define('PAYPAL_CURRENCY','EUR'); define('PAYPAL_CURRENCY','EUR');

1
sections/donate/donate.php
View File

@ -13,7 +13,6 @@
View::show_header('Donate'); View::show_header('Donate');
?> ?>
<!-- Donate --> <!-- Donate -->
<div class="thin"> <div class="thin">

1
sections/donate/donate_gpal.php
View File

@ -17,7 +17,6 @@
View::show_header('Donate'); View::show_header('Donate');
?> ?>
<!-- Donate --> <!-- Donate -->
<div class="thin"> <div class="thin">

1
sections/forums/mod_thread.php
View File

@ -36,7 +36,6 @@
$Page = (int)$_POST['page']; $Page = (int)$_POST['page'];
if ($Locked == 1) { if ($Locked == 1) {
$DB->query("DELETE FROM forums_last_read_topics WHERE TopicID='$TopicID'"); $DB->query("DELETE FROM forums_last_read_topics WHERE TopicID='$TopicID'");

1
sections/forums/newthread.php
View File

@ -98,7 +98,6 @@
</td> </td>
</tr> </tr>
<? <?
if (check_perms('forums_polls_create')) { if (check_perms('forums_polls_create')) {
?> ?>
<script type="text/javascript">//<![CDATA[ <script type="text/javascript">//<![CDATA[

5
sections/forums/thread.php
View File

@ -114,7 +114,6 @@
//Handle last read //Handle last read
if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) { if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
$DB->query(" $DB->query("
@ -290,7 +289,7 @@
<? } <? }
if ($Votes[0] > 0) { if ($Votes[0] > 0) {
?> ?>
<li>(Blank) (<?=number_format((float)($Votes[0] / $TotalVotes * 100), 2)?>%)</li> <li><?=($UserResponse == '0' ? '&raquo; ' : '')?>(Blank) (<?=number_format((float)($Votes[0] / $TotalVotes * 100), 2)?>%)</li>
<li class="graph"> <li class="graph">
<span class="left_poll"></span> <span class="left_poll"></span>
<span class="center_poll" style="width: <?=round(($Votes[0] / $MaxVotes) * 750)?>px;"></span> <span class="center_poll" style="width: <?=round(($Votes[0] / $MaxVotes) * 750)?>px;"></span>
@ -341,7 +340,7 @@
<a href="forums.php?action=delete_poll_option&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=<?=(int) $i?>" class="brackets">X</a> <a href="forums.php?action=delete_poll_option&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=<?=(int) $i?>" class="brackets">X</a>
</li> </li>
<? } ?> <? } ?>
<li><a href="forums.php?action=change_vote&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=0">Blank</a> - <?=$StaffVotes[0]?>&nbsp;(<?=number_format(((float) $Votes[0] / $TotalVotes) * 100, 2)?>%)</li> <li><a href="forums.php?action=change_vote&amp;threadid=<?=$ThreadID?>&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;vote=0"><?=($UserResponse == '0' ? '&raquo; ' : '')?>Blank</a> - <?=$StaffVotes[0]?>&nbsp;(<?=number_format(((float) $Votes[0] / $TotalVotes) * 100, 2)?>%)</li>
</ul> </ul>
<? <?
if ($ForumID == STAFF_FORUM) { if ($ForumID == STAFF_FORUM) {

2
sections/inbox/compose.php
View File

@ -4,7 +4,7 @@
$ToID = $_GET['to']; $ToID = $_GET['to'];
if ($ToID == $LoggedUser['ID']) { if ($ToID == $LoggedUser['ID']) {
error('You cannot start a conversation with yourself!'); error('You cannot start a conversation with yourself!');
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
} }
} }

14
sections/inbox/conversation.php
View File

@ -8,7 +8,6 @@
} }
$UserID = $LoggedUser['ID']; $UserID = $LoggedUser['ID'];
$DB->query(" $DB->query("
SELECT InInbox, InSentbox SELECT InInbox, InSentbox
@ -22,7 +21,6 @@
if (!$InInbox && !$InSentbox) { if (!$InInbox && !$InSentbox) {
error(404); error(404);
@ -57,7 +55,6 @@
$Users[0]['Username'] = 'System'; $Users[0]['Username'] = 'System';
if ($UnRead == '1') { if ($UnRead == '1') {
$DB->query(" $DB->query("
@ -81,15 +78,18 @@
<div class="thin"> <div class="thin">
<h2><?=$Subject.($ForwardedID > 0 ? ' (Forwarded to '.$ForwardedName.')' : '')?></h2> <h2><?=$Subject.($ForwardedID > 0 ? ' (Forwarded to '.$ForwardedName.')' : '')?></h2>
<div class="linkbox"> <div class="linkbox">
<a href="<?=Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst']); ?>" class="brackets">Back to inbox</a> <a href="<?=Inbox::get_inbox_link(); ?>" class="brackets">Back to inbox</a>
</div> </div>
<? <?
while (list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) { ?> while (list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) { ?>
<div class="box vertical_space"> <div class="box vertical_space">
<div class="head"> <div class="head" style="overflow: hidden;">
<strong><?=$Users[(int)$SenderID]['UserStr']?></strong> <?=time_diff($SentDate)?> - <a href="#quickpost" onclick="Quote('<?=$MessageID?>','<?=$Users[(int)$SenderID]['Username']?>');" class="brackets">Quote</a> <div style="float: left;">
</div> <strong><?=$Users[(int)$SenderID]['UserStr']?></strong> <?=time_diff($SentDate)?> - <a href="#quickpost" onclick="Quote('<?=$MessageID?>','<?=$Users[(int)$SenderID]['Username']?>');" class="brackets">Quote</a>
</div>
<div style="float: right;"><a href="#">&uarr;</a> <a href="#messageform">&darr;</a></div>
</div>
<div class="body" id="message<?=$MessageID?>"> <div class="body" id="message<?=$MessageID?>">
<?=$Text->full_format($Body)?> <?=$Text->full_format($Body)?>
</div> </div>

2
sections/inbox/forward.php
View File

@ -39,7 +39,7 @@
SET ForwardedTo='$ReceiverID' SET ForwardedTo='$ReceiverID'
WHERE ConvID='$ConvID' AND UserID='$UserID'"); WHERE ConvID='$ConvID' AND UserID='$UserID'");
$Cache->delete_value('inbox_new_'.$ReceiverID); $Cache->delete_value('inbox_new_'.$ReceiverID);
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
} else { } else {
error("$StaffIDs[$ReceiverID] already has this conversation in their inbox."); error("$StaffIDs[$ReceiverID] already has this conversation in their inbox.");
header('Location: inbox.php?action=viewconv&id='.$ConvID); header('Location: inbox.php?action=viewconv&id='.$ConvID);

20
sections/inbox/inbox.php
View File

@ -1,6 +1,5 @@
<?php <?php
$UserID = $LoggedUser['ID']; $UserID = $LoggedUser['ID'];
@ -21,11 +20,10 @@
<h2><?=(($Section == 'sentbox') ? 'Sentbox' : 'Inbox')?></h2> <h2><?=(($Section == 'sentbox') ? 'Sentbox' : 'Inbox')?></h2>
<div class="linkbox"> <div class="linkbox">
<? <?
if ($Section == 'inbox') { ?> if ($Section == 'inbox') { ?>
<a href="<?=Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'], 'sentbox'); ?>" class="brackets">Sentbox</a> <a href="<?=Inbox::get_inbox_link('sentbox'); ?>" class="brackets">Sentbox</a>
<? } elseif ($Section == 'sentbox') { ?> <? } elseif ($Section == 'sentbox') { ?>
<a href="<?=Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst']); ?>" class="brackets">Inbox</a> <a href="<?=Inbox::get_inbox_link(); ?>" class="brackets">Inbox</a>
<? } <? }
?> ?>
@ -94,6 +92,17 @@
<input type="radio" name="searchtype" value="user"<?=(empty($_GET['searchtype']) || $_GET['searchtype'] == 'user' ? ' checked="checked"' : '')?> /> User <input type="radio" name="searchtype" value="user"<?=(empty($_GET['searchtype']) || $_GET['searchtype'] == 'user' ? ' checked="checked"' : '')?> /> User
<input type="radio" name="searchtype" value="subject"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'subject' ? ' checked="checked"' : '')?> /> Subject <input type="radio" name="searchtype" value="subject"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'subject' ? ' checked="checked"' : '')?> /> Subject
<input type="radio" name="searchtype" value="message"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'message' ? ' checked="checked"' : '')?> /> Message <input type="radio" name="searchtype" value="message"<?=(!empty($_GET['searchtype']) && $_GET['searchtype'] == 'message' ? ' checked="checked"' : '')?> /> Message
<span style="float: right;">
<? // provide a temporary toggle for sorting PMs
$ToggleTitle = 'Temporary toggle switch for sorting PMs. To permanently change the sorting behavior, edit the setting in your profile.';
$BaseURL = 'inbox.php';
if ($_GET['sort'] == 'unread') { ?>
<a href="<?=$BaseURL?>" class="brackets" title="<?=$ToggleTitle?>">List latest first</a>
<? } else { ?>
<a href="<?=$BaseURL?>?sort=unread" class="brackets" title="<?=$ToggleTitle?>">List unread first</a>
<? } ?>
</span>
<br /> <br />
<input type="text" name="search" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : 'Search '.($Section == 'sentbox' ? 'Sentbox' : 'Inbox'))?>" style="width: 98%;" <input type="text" name="search" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : 'Search '.($Section == 'sentbox' ? 'Sentbox' : 'Inbox'))?>" style="width: 98%;"
onfocus="if (this.value == 'Search <?=(($Section == 'sentbox') ? 'Sentbox' : 'Inbox')?>') this.value='';" onfocus="if (this.value == 'Search <?=(($Section == 'sentbox') ? 'Sentbox' : 'Inbox')?>') this.value='';"
@ -136,7 +145,8 @@
<tr class="<?=$RowClass?>"> <tr class="<?=$RowClass?>">
<td class="center"><input type="checkbox" name="messages[]=" value="<?=$ConvID?>" /></td> <td class="center"><input type="checkbox" name="messages[]=" value="<?=$ConvID?>" /></td>
<td> <td>
<? echo "\t\t\t\t\t\t"; // for proper indentation of HTML <?
echo "\t\t\t\t\t\t"; // for proper indentation of HTML
if ($Unread) { if ($Unread) {
echo '<strong>'; echo '<strong>';
} }

4
sections/inbox/massdelete_handle.php
View File

@ -7,7 +7,7 @@
if (!isset($_POST['messages']) || !is_array($_POST['messages'])) { if (!isset($_POST['messages']) || !is_array($_POST['messages'])) {
error('You forgot to select messages to delete.'); error('You forgot to select messages to delete.');
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
die(); die();
} }
@ -52,5 +52,5 @@
} }
$Cache->delete_value('inbox_new_'.$UserID); $Cache->delete_value('inbox_new_'.$UserID);
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
?> ?>

2
sections/inbox/takecompose.php
View File

@ -55,5 +55,5 @@
$ConvID = Misc::send_pm($ToID, $LoggedUser['ID'], $Subject, $Body, $ConvID); $ConvID = Misc::send_pm($ToID, $LoggedUser['ID'], $Subject, $Body, $ConvID);
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
?> ?>

2
sections/inbox/takeedit.php
View File

@ -42,5 +42,5 @@
$Cache->increment('inbox_new_'.$UserID); $Cache->increment('inbox_new_'.$UserID);
} }
} }
header('Location: ' . Inbox::get_inbox_link($LoggedUser['ListUnreadPMsFirst'])); header('Location: ' . Inbox::get_inbox_link());
?> ?>

1
sections/index/feat_merch.php
View File

@ -1,6 +1,5 @@
<? <?
$FeaturedMerchURL = ''; $FeaturedMerchURL = '';
$FeaturedMerch = $Cache->get_value('featured_merch'); $FeaturedMerch = $Cache->get_value('featured_merch');

1
sections/register/index.php
View File

@ -103,7 +103,6 @@
$IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']); $IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
$DB->query(" $DB->query("
INSERT INTO users_main INSERT INTO users_main
(Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, Uploaded, ipcc) (Username, Email, PassHash, torrent_pass, IP, PermissionID, Enabled, Invites, Uploaded, ipcc)

3
sections/reportsv2/ajax_new_report.php
View File

@ -13,7 +13,6 @@
$Text = NEW TEXT; $Text = NEW TEXT;
$DB->query(" $DB->query("
SELECT SELECT
r.ID, r.ID,
@ -77,7 +76,6 @@
die(); die();
} }
list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime, list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, $ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = $DB->next_record(MYSQLI_BOTH, array("ModComment")); $RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = $DB->next_record(MYSQLI_BOTH, array("ModComment"));
@ -253,7 +251,6 @@
$First = true; $First = true;
$Extras = explode(' ', $ExtraIDs); $Extras = explode(' ', $ExtraIDs);
foreach ($Extras as $ExtraID) { foreach ($Extras as $ExtraID) {
$DB->query(" $DB->query("
SELECT SELECT
tg.Name, tg.Name,

3
sections/reportsv2/static.php
View File

@ -122,7 +122,6 @@
} }
$DB->query(" $DB->query("
SELECT SELECT
SQL_CALC_FOUND_ROWS SQL_CALC_FOUND_ROWS
@ -226,7 +225,6 @@
} else { } else {
foreach ($Reports as $Report) { foreach ($Reports as $Report) {
list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime, list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, $ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = Misc::display_array($Report, array("ModComment")); $RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = Misc::display_array($Report, array("ModComment"));
@ -412,7 +410,6 @@
$First = true; $First = true;
$Extras = explode(' ', $ExtraIDs); $Extras = explode(' ', $ExtraIDs);
foreach ($Extras as $ExtraID) { foreach ($Extras as $ExtraID) {
$DB->query(" $DB->query("
SELECT SELECT
tg.Name, tg.Name,

1
sections/reportsv2/views.php
View File

@ -210,7 +210,6 @@
</td> </td>
<td style="vertical-align: top;"> <td style="vertical-align: top;">
<? <?
$DB->query(" $DB->query("
SELECT SELECT
r.ResolverID, r.ResolverID,

2
sections/requests/takefill.php
View File

@ -47,7 +47,6 @@
WHERE t.ID = $TorrentID WHERE t.ID = $TorrentID
LIMIT 1"); LIMIT 1");
if ($DB->record_count() < 1) { if ($DB->record_count() < 1) {
error(404); error(404);
} }
@ -71,7 +70,6 @@
} }
$DB->query(" $DB->query("
SELECT SELECT
Title, Title,

2
sections/schedule/index.php
View File

@ -371,7 +371,6 @@ function next_hour() {
$AgoMins = time_minus(60 * 30); $AgoMins = time_minus(60 * 30);
$AgoDays = time_minus(3600 * 24 * 30); $AgoDays = time_minus(3600 * 24 * 30);
$SessionQuery = $DB->query(" $SessionQuery = $DB->query("
SELECT UserID, SessionID SELECT UserID, SessionID
FROM users_sessions FROM users_sessions
@ -1305,7 +1304,6 @@ function next_hour() {
if ($BiWeek == 8) { if ($BiWeek == 8) {
$DB->query('TRUNCATE TABLE top_snatchers;'); $DB->query('TRUNCATE TABLE top_snatchers;');
$DB->query(" $DB->query("
INSERT INTO top_snatchers (UserID) INSERT INTO top_snatchers (UserID)
SELECT uid SELECT uid

2
sections/stats/users.php
View File

@ -60,7 +60,6 @@
if (!$PlatformDistribution = $Cache->get_value('platform_distribution')) { if (!$PlatformDistribution = $Cache->get_value('platform_distribution')) {
include_once(SERVER_ROOT.'/classes/charts.class.php'); include_once(SERVER_ROOT.'/classes/charts.class.php');
$DB->query(" $DB->query("
SELECT OperatingSystem, COUNT(UserID) AS Users SELECT OperatingSystem, COUNT(UserID) AS Users
FROM users_sessions FROM users_sessions
@ -83,7 +82,6 @@
if (!$BrowserDistribution = $Cache->get_value('browser_distribution')) { if (!$BrowserDistribution = $Cache->get_value('browser_distribution')) {
include_once(SERVER_ROOT.'/classes/charts.class.php'); include_once(SERVER_ROOT.'/classes/charts.class.php');
$DB->query(" $DB->query("
SELECT Browser, COUNT(UserID) AS Users SELECT Browser, COUNT(UserID) AS Users
FROM users_sessions FROM users_sessions

1
sections/tools/data/economic_stats.php
View File

@ -52,7 +52,6 @@
FROM torrents"); FROM torrents");
list($TotalSnatches, $TotalTorrents) = $DB->next_record(); // This is the total number of snatches for torrents that still exist list($TotalSnatches, $TotalTorrents) = $DB->next_record(); // This is the total number of snatches for torrents that still exist
$DB->query("SELECT COUNT(uid) FROM xbt_snatched"); $DB->query("SELECT COUNT(uid) FROM xbt_snatched");
list($TotalOverallSnatches) = $DB->next_record(); list($TotalOverallSnatches) = $DB->next_record();

2
sections/tools/managers/tag_aliases.php
View File

@ -51,7 +51,7 @@
<td>Submit</td> <td>Submit</td>
<? } ?> <? } ?>
</tr> </tr>
<tr/> <tr />
<tr> <tr>
<form class="add_form" name="aliases" method="post" action=""> <form class="add_form" name="aliases" method="post" action="">
<input type="hidden" name="newalias" value="1" /> <input type="hidden" name="newalias" value="1" />

2
sections/tools/misc/render_base.html
View File

@ -87,7 +87,7 @@ <h4 class="hidden">Site Menu</h4>
<form class="search_form" name="artists" action="" method="get"> <form class="search_form" name="artists" action="" method="get">
<script type="text/javascript" src="static/functions/autocomplete.js?v=1362029969"></script> <script type="text/javascript" src="static/functions/autocomplete.js?v=1362029969"></script>
<input id="artistsearch" value="Artists" type="text" name="artistname" size="17"/> <input id="artistsearch" value="Artists" type="text" name="artistname" size="17"/>
<ul id="artistcomplete" style="visibility: hidden;"><li/></ul> <ul id="artistcomplete" style="visibility: hidden;"><li /></ul>
</form> </form>
</li> </li>
<li id="searchbar_requests"> <li id="searchbar_requests">

2
sections/torrents/delete.php
View File

@ -5,7 +5,6 @@
} }
$DB->query(" $DB->query("
SELECT SELECT
t.UserID, t.UserID,
@ -21,7 +20,6 @@
} }
list($UserID, $Time, $Snatches) = $DB->next_record(); list($UserID, $Time, $Snatches) = $DB->next_record();

1
sections/torrents/edit.php
View File

@ -71,7 +71,6 @@
error(403); error(403);
} }
View::show_header('Edit torrent', 'upload'); View::show_header('Edit torrent', 'upload');

1
sections/torrents/notify.php
View File

@ -151,7 +151,6 @@ function header_link($SortKey, $DefaultWay = 'desc') {
$Cache->delete_value('notifications_new_'.$LoggedUser['ID']); $Cache->delete_value('notifications_new_'.$LoggedUser['ID']);
} }
} }
View::show_header('My notifications', 'notifications'); View::show_header('My notifications', 'notifications');
?> ?>

3
sections/user/edit.php
View File

@ -6,7 +6,6 @@
global $Cache; global $Cache;
$DB->query(" $DB->query("
SELECT SELECT
m.Username, m.Username,
@ -550,7 +549,7 @@ function checked($Checked) {
</td> </td>
</tr> </tr>
<tr> <tr>
<td/> <td />
<td> <td>
<p class="min_padding">A strong password is between 8 and 40 characters long</p> <p class="min_padding">A strong password is between 8 and 40 characters long</p>
<p class="min_padding">Contains at least 1 lowercase and uppercase letter</p> <p class="min_padding">Contains at least 1 lowercase and uppercase letter</p>

1
sections/user/sessions.php
View File

@ -1,6 +1,5 @@
<? <?
//TODO: restrict to viewing bellow class, username in h2 //TODO: restrict to viewing bellow class, username in h2
if (isset($_GET['userid']) && check_perms('users_view_ips') && check_perms('users_logout')) { if (isset($_GET['userid']) && check_perms('users_view_ips') && check_perms('users_logout')) {
if (!is_number($_GET['userid'])) { if (!is_number($_GET['userid'])) {

4
sections/user/takemoderate.php
View File

@ -92,8 +92,6 @@
// Get user info from the database // Get user info from the database
$DB->query(" $DB->query("
SELECT SELECT
m.Username, m.Username,
@ -242,7 +240,6 @@
} }
$Cache->delete_value('users_sessions_'.$UserID); $Cache->delete_value('users_sessions_'.$UserID);
$DB->query(" $DB->query("
DELETE FROM users_sessions DELETE FROM users_sessions
WHERE UserID='$UserID'"); WHERE UserID='$UserID'");
@ -703,7 +700,6 @@
} }
$Cache->delete_value('users_sessions_'.$UserID); $Cache->delete_value('users_sessions_'.$UserID);
$DB->query(" $DB->query("
DELETE FROM users_sessions DELETE FROM users_sessions
WHERE UserID = '$UserID'"); WHERE UserID = '$UserID'");

1
sections/user/user.php
View File

@ -171,7 +171,6 @@ function check_paranoia_here($Setting) {
$Badges = (($Donor) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" /></a>' : ''); $Badges = (($Donor) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" /></a>' : '');
$Badges.=(($Warned!='0000-00-00 00:00:00') ? '<img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" />' : ''); $Badges.=(($Warned!='0000-00-00 00:00:00') ? '<img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" />' : '');
$Badges.=(($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '' : '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />'); $Badges.=(($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '' : '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />');

1
sections/userhistory/subscriptions.php
View File

@ -51,7 +51,6 @@
$sql .= ')'; $sql .= ')';
if ($ShowUnread) { if ($ShowUnread) {
$sql .= ' $sql .= '
AND IF(l.PostID IS NULL OR (t.IsLocked = \'1\' && t.IsSticky = \'0\'), t.LastPostID, l.PostID) < t.LastPostID'; AND IF(l.PostID IS NULL OR (t.IsLocked = \'1\' && t.IsSticky = \'0\'), t.LastPostID, l.PostID) < t.LastPostID';
$sql .= ' OR (t.AuthorID != '.$LoggedUser['ID'].' AND l.PostID IS NULL)'; $sql .= ' OR (t.AuthorID != '.$LoggedUser['ID'].' AND l.PostID IS NULL)';

1
sections/wiki/index.php
View File

@ -5,7 +5,6 @@
$Alias = new ALIAS; $Alias = new ALIAS;
define('INDEX_ARTICLE', '1'); define('INDEX_ARTICLE', '1');

14
static/functions/musicbrainz.js
View File

@ -120,7 +120,7 @@ function showReleaseGroups(xml) {
var $score = $(this).attr("ext:score"); var $score = $(this).attr("ext:score");
var $releaseId = $(this).attr("id"); var $releaseId = $(this).attr("id");
var $result = $artist + " - " + $title + " [Type: " + $type + ", Score: " + $score + "]" var $result = $artist + " - " + $title + " [Type: " + $type + ", Score: " + $score + "]"
$("<a href='#null'>" + $result + "<p/>").attr("id", $releaseId).appendTo("#results1"); $("<a href='#null'>" + $result + "<p />").attr("id", $releaseId).appendTo("#results1");
}); });
} }
@ -133,9 +133,9 @@ function showReleases(xml) {
$year_original = $date_release_group.substring(0,4); $year_original = $date_release_group.substring(0,4);
$release_type = $(xml).find("release-group").attr("type"); $release_type = $(xml).find("release-group").attr("type");
$release_group_id = $(xml).find("release-group").attr("id"); $release_group_id = $(xml).find("release-group").attr("id");
jQuery('#popup_title').html("Choose Release " + "<a href='https://musicbrainz.org/release-group/" jQuery('#popup_title').html("Choose Release " + '<a href="https://musicbrainz.org/release-group/'
+ $release_group_id + "' target='_new' class='brackets'>View on MusicBrainz</a>"); + $release_group_id + '" target="_new" class="brackets">View on MusicBrainz</a>');
jQuery('#popup_back').html("<a href='#null' id='back' class='brackets'>Go back</a>"); jQuery('#popup_back').html('<a href="#null" id="back" class="brackets">Go back</a>');
$(xml).find("release").each(function() { $(xml).find("release").each(function() {
var $release_id = $(this).attr("id"); var $release_id = $(this).attr("id");
@ -154,9 +154,9 @@ function showReleases(xml) {
}); });
}); });
var $result = $title + " [Year: " + $year + ", Format: " + $format + ", Tracks: " + $tracks + ", Country: " + $country + "]"; var $result = $title + " [Year: " + $year + ", Format: " + $format + ", Tracks: " + $tracks + ", Country: " + $country + "]";
$("<a href='#null'>" + $result + "</a>").attr("id", $release_id).appendTo("#results2"); $('<a href="#null">' + $result + "</a>").attr("id", $release_id).appendTo("#results2");
$("<a href='https://musicbrainz.org/release/" + $release_id +"' target='_new' class='brackets'>View on MusicBrainz</a>" + "<p/>").attr("id", "mb").appendTo("#results2"); $('<a href="https://musicbrainz.org/release/' + $release_id +'" target="_new" class="brackets">View on MusicBrainz</a>' + "<p />").attr("id", "mb").appendTo("#results2");
}); });
parseTags(xml); parseTags(xml);
@ -236,7 +236,7 @@ function populateForm(xml) {
$country_text + $country_text +
$barcode_text + $barcode_text +
"Tracks: " + $track_count + "\n" + "\n" + "Tracks: " + $track_count + "\n" + "\n" +
"Track List:" + "\n"; "Track list:" + "\n";
for (var i = 0; i < $track_titles.length; i++) { for (var i = 0; i < $track_titles.length; i++) {
$description = $description + "[#]" + $track_titles[i] + "\n"; $description = $description + "[#]" + $track_titles[i] + "\n";
}; };