Empty commit

This commit is contained in:
Git 2012-09-27 08:00:20 +00:00
parent 69ae9639ca
commit f7a082a4a6
4 changed files with 6 additions and 22 deletions

View File

@ -25,18 +25,12 @@
$PrivateMessage = "You have received a $Length week warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
$WarnTime = time_plus($Time);
$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $URL - $Reason\n\n";
$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']." for $URL \nReason: $Reason\n\n";
} else {
$Subject = "You have received a verbal warning";
$PrivateMessage = "You have received a verbal warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
$AdminComment = date("Y-m-d") . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL \nReason: $Reason\n\n";
$DB -> query('UPDATE users_info SET
Warned=\'' . db_string($WarnTime) . '\',
WarnedTimes=WarnedTimes+1,
AdminComment=CONCAT(\'' . db_string($AdminComment) . '\',AdminComment)
WHERE UserID=\'' . db_string($UserID) . '\'');
}
$DB -> query("INSERT INTO users_warnings_forums (UserID, Comment) VALUES('$UserID', '" . db_string($AdminComment) . "')

View File

@ -7,8 +7,7 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0) {
$TorrentCache=$Cache->get_value('torrents_details_'.$GroupID);
}
//TODO: Remove LogInDB at a much later date.
if($RevisionID || !is_array($TorrentCache) || !isset($TorrentCache[1][0]['LogInDB']) || !isset($TorrentCache[1][0]['VanityHouse'])) {
if($RevisionID || !is_array($TorrentCache)) {
// Fetch the group details
$SQL = "SELECT ";
@ -106,7 +105,8 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0) {
$TorrentList = $DB->to_array();
if(count($TorrentList) == 0) {
error(404, false, 'torrent+'.$GroupID);
header("Location: log.php?search=Torrent+$GroupID");
die();
}
if(in_array(0, $DB->collect('Seeders'))) {
$CacheTime = 600;

View File

@ -415,11 +415,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
if($GroupID) {
header("Location: torrents.php?id=".$GroupID."&torrentid=".$_GET['torrentid']."#torrent".$_GET['torrentid']);
} else {
if(check_perms('users_mod')) {
error(404, false, 'torrent+'.$_GET['torrentid']);
} else {
error(404);
}
header("Location: log.php?search=Torrent+$_GET[torrentid]");
}
} elseif(!empty($_GET['type'])) {
include(SERVER_ROOT.'/sections/torrents/user.php');

View File

@ -23,17 +23,11 @@
$Subject = "You have received a warning";
$PrivateMessage = "You have received a $Length week warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
$WarnTime = time_plus($Time);
$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $URL - $Reason\n\n";
$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']." for $URL \nReason: $Reason\n\n";
} else {
$Subject = "You have received a verbal warning";
$PrivateMessage = "You have received a verbal warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
$AdminComment = date("Y-m-d") . ' - Verbally warned by ' . $LoggedUser['Username'] . " for $URL \nReason: $Reason\n\n";
$DB -> query('UPDATE users_info SET
Warned=\'' . db_string($WarnTime) . '\',
WarnedTimes=WarnedTimes+1,
AdminComment=CONCAT(\'' . db_string($AdminComment) . '\',AdminComment)
WHERE UserID=\'' . db_string($UserID) . '\'');
}
$DB -> query("INSERT INTO users_warnings_forums (UserID, Comment) VALUES('$UserID', '" . db_string($AdminComment) . "')
ON DUPLICATE KEY UPDATE Comment = CONCAT('" . db_string($AdminComment) . "', Comment)");