Empty commit

This commit is contained in:
Git 2013-02-08 08:00:46 +00:00
parent df129a5ba5
commit 9740f89a3b
6 changed files with 28 additions and 3 deletions

View File

@ -116,5 +116,6 @@ public static function get_requests($RequestIDs, $Return = true) {
return $Matches;
}
}
}
?>

View File

@ -33,6 +33,7 @@
WHERE c.ID='$ConvID' AND UserID='$UserID'");
list($Subject, $Sticky, $UnRead, $ForwardedID) = $DB->next_record();
$DB->query("SELECT um.ID, Username
FROM pm_messages AS pm
JOIN users_main AS um ON um.ID=pm.SenderID

View File

@ -197,7 +197,7 @@ function log_attempt($UserID) {
}
} else {
//No ban
$DB->query("INSERT INTO ip_bans
$DB->query("INSERT IGNORE INTO ip_bans
(FromIP, ToIP, Reason) VALUES
('$IP','$IP', 'Automated ban per >60 failed login attempts')");
$A = substr($_SERVER['REMOTE_ADDR'], 0, strcspn($_SERVER['REMOTE_ADDR'], '.'));

View File

@ -456,11 +456,31 @@
</td>
</tr>
<? } ?>
<?
//<strip>
if(check_perms("users_mod")) {
$RequestLog = Requests::get_request_log($RequestID);
if($RequestLog) {
?>
<tr>
<td colspan="2" class="center"><strong><a href="#" onclick="$('#request_log').toggle(); return false;">Request Log</a></strong></td>
</tr>
<tr>
<td colspan="2">
<div id="request_log" class="hidden padding">
<?=$Text->full_format($RequestLog)?>
</div>
</td>
</tr>
<? }
}
//<strip>
?>
<tr>
<td colspan="2" class="center"><strong>Description</strong></td>
</tr>
<tr>
<td colspan="2"><?=$Text->full_format($Description)?></td>
<td colspan="2"><?=$Text->full_format($Description);?></td>
</tr>
</table>
<?

View File

@ -340,6 +340,7 @@
'".db_string($CatalogueNumber)."', ".$ReleaseType.", '".$BitrateList."','".$FormatList."', '".$MediaList."', '".$LogCue."', '1', '$GroupID', '".db_string($OCLC)."')");
$RequestID = $DB->inserted_id();
} else {
$DB->query("UPDATE requests
SET CategoryID = ".$CategoryID.",
@ -469,6 +470,7 @@
(".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', ".$Year.", '".db_string($Image)."', '".db_string($Description)."', '1', '".db_string($OCLC)."')");
$RequestID = $DB->inserted_id();
} else {
$DB->query("UPDATE requests
SET CategoryID = ".$CategoryID.",
@ -487,6 +489,7 @@
(".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', '".db_string($Image)."', '".db_string($Description)."', '1', '".db_string($OCLC)."')");
$RequestID = $DB->inserted_id();
} else {
$DB->query("UPDATE requests
SET CategoryID = ".$CategoryID.",