mirror of
https://github.com/WhatCD/Gazelle.git
synced 2024-12-13 02:46:30 +00:00
Empty commit
This commit is contained in:
parent
6482c1e4d9
commit
1f04f38d5a
@ -688,7 +688,7 @@ private function to_html ($Array) {
|
||||
$Exploded = explode("|", $this->to_html($Block['Attr']));
|
||||
if(isset($Exploded[1]) && is_numeric($Exploded[1])) {
|
||||
$PostID = trim($Exploded[1]);
|
||||
$Str.= '<a href="#" onclick="QuoteJump('.$PostID.'); return false;"><strong class="quoteheader">'.$Exploded[0].'</strong> wrote: </a>';
|
||||
$Str.= '<a href="#" onclick="QuoteJump(event, '.$PostID.'); return false;"><strong class="quoteheader">'.$Exploded[0].'</strong> wrote: </a>';
|
||||
}
|
||||
else {
|
||||
$Str.= '<strong class="quoteheader">'.$Exploded[0].'</strong> wrote: ';
|
||||
|
@ -26,12 +26,17 @@
|
||||
WHERE m.Username IN " . "('" . implode("', '", $Usernames)
|
||||
. "')
|
||||
AND i.NotifyOnQuote = '1' AND i.UserID != $LoggedUser[ID]");
|
||||
while (list($UserID, $PushService) = $DB->next_record()) {
|
||||
|
||||
$Results = $DB->to_array();
|
||||
foreach($Results as $Result) {
|
||||
$UserID = $Result['ID'];
|
||||
$PushService = $Result['PushService'];
|
||||
$QuoterID = db_string($LoggedUser['ID']);
|
||||
$UserID = db_string($UserID);
|
||||
$ForumID = db_string($ForumID);
|
||||
$TopicID = db_string($TopicID);
|
||||
$PostID = db_string($PostID);
|
||||
|
||||
$DB->query("INSERT IGNORE INTO users_notify_quoted (UserID, QuoterID, ForumID, TopicID, PostID, Date)
|
||||
VALUES ('$UserID', '$QuoterID', '$ForumID', '$TopicID', '$PostID', '" . sqltime() . "')");
|
||||
$Cache->delete_value('forums_quotes_' . $UserID);
|
||||
|
@ -657,7 +657,9 @@ function next_hour() {
|
||||
t.last_action,
|
||||
t.Format,
|
||||
t.Encoding,
|
||||
t.UserID
|
||||
t.UserID,
|
||||
t.Media,
|
||||
t.info_hash
|
||||
FROM torrents AS t
|
||||
JOIN torrents_group AS tg ON tg.ID = t.GroupID
|
||||
LEFT JOIN artists_group AS ag ON ag.ArtistID = tg.ArtistID
|
||||
@ -675,7 +677,7 @@ function next_hour() {
|
||||
|
||||
);
|
||||
foreach ($TorrentIDs as $TorrentID) {
|
||||
list($ID, $GroupID, $Name, $ArtistName, $LastAction, $Format, $Encoding, $UserID, $Media) = $TorrentID;
|
||||
list($ID, $GroupID, $Name, $ArtistName, $LastAction, $Format, $Encoding, $UserID, $Media, $InfoHash) = $TorrentID;
|
||||
if (array_key_exists($UserID, $InactivityExceptionsMade) && (time() < $InactivityExceptionsMade[$UserID])) {
|
||||
// don't delete the torrent!
|
||||
continue;
|
||||
@ -687,7 +689,8 @@ function next_hour() {
|
||||
$Name.=' ['.(empty($Media)?'':"$Media / ").$Format.' / '.$Encoding.']';
|
||||
}
|
||||
Torrents::delete_torrent($ID, $GroupID);
|
||||
$LogEntries[] = "Torrent ".$ID." (".$Name.") was deleted for inactivity (unseeded)";
|
||||
$InfoHash = unpack("H*", $InfoHash);
|
||||
$LogEntries[] = "Torrent ".$ID." (".$Name.") (".strtoupper($InfoHash[1]).") was deleted for inactivity (unseeded)";
|
||||
|
||||
if (!array_key_exists($UserID, $DeleteNotes))
|
||||
$DeleteNotes[$UserID] = array('Count' => 0, 'Msg' => '');
|
||||
|
@ -1,13 +1,18 @@
|
||||
var username;
|
||||
var postid;
|
||||
|
||||
function QuoteJump(post) {
|
||||
function QuoteJump(event, post) {
|
||||
var button = event.button;
|
||||
var hash = "#post" + post;
|
||||
if($(hash).raw() != null) {
|
||||
window.location.hash = hash;
|
||||
}
|
||||
else {
|
||||
window.open("forums.php?action=viewthread&postid="+post, '_self');
|
||||
if(button == 0) {
|
||||
if($(hash).raw() != null) {
|
||||
window.location.hash = hash;
|
||||
}
|
||||
else {
|
||||
window.open("forums.php?action=viewthread&postid="+post, '_self');
|
||||
}
|
||||
} else if(button == 1) {
|
||||
window.open("forums.php?action=viewthread&postid="+post, '_window');
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,7 +44,12 @@ function Edit_Form(post,key) {
|
||||
} else {
|
||||
boxWidth="80";
|
||||
}
|
||||
postuserid = $('#post' + postid + ' strong a').raw().getAttribute('href').split('=')[1]
|
||||
/* jQuery isnt enabled on comments, artist comments, or basically anywhere but thread.php
|
||||
Re-enable this clause as soon as hateradio's "bye sizzle" changes go into effect, changing
|
||||
the jQuery object to $ (which will, then, be jQuery rather than sizzle)
|
||||
postuserid = jQuery('#post' + postid + ' strong a').attr('href').split('=')[1];
|
||||
*/
|
||||
if (postuserid != userid) {
|
||||
pmbox = '<span id="pmbox'+postid+'">PM user on edit? <input type="checkbox" name="pm" value="1" /></span>';
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user