Empty commit

This commit is contained in:
Git 2012-08-24 08:00:15 +00:00
parent d0e6987329
commit b862d42486
4 changed files with 19 additions and 14 deletions

View File

@ -46,7 +46,7 @@ function notify ($Channel, $Message) {
$Description .= ' <a href="log.php?search='.$Log.'">Search Log</a>'; $Description .= ' <a href="log.php?search='.$Log.'">Search Log</a>';
} }
if(empty($Ajax)) { if(empty($Ajax) && $Error != -1) {
show_header($Title); show_header($Title);
?> ?>
<div class="thin"> <div class="thin">

View File

@ -112,7 +112,7 @@
$Cache->cache_value('polls_'.$TopicID, array($Question,$Answers,$Votes,'0000-00-00 00:00:00','0'), 0); $Cache->cache_value('polls_'.$TopicID, array($Question,$Answers,$Votes,'0000-00-00 00:00:00','0'), 0);
if($ForumID == STAFF_FORUM) { if($ForumID == STAFF_FORUM) {
send_irc("PRIVMSG ".ADMIN_CHAN." :!mod Poll created by ".$LoggedUser['Username'].": '".$Question."' http://".NONSSL_SITE_URL."/forums.php?action=viewthread&threadid=".$TopicID); send_irc("PRIVMSG ".ADMIN_CHAN." :!mod Poll created by ".$LoggedUser['Username'].": '".$Question."' https://".SSL_SITE_URL."/forums.php?action=viewthread&threadid=".$TopicID);
} }
} }

View File

@ -208,11 +208,6 @@
} else { } else {
$RecordLabel = ""; $RecordLabel = "";
} }
if (!empty($_POST['oclc'])) {
$OCLC = trim($_POST['oclc']);
} else {
$OCLC = "";
}
} }
if($CategoryName == "Music" || $CategoryName == "Audiobooks" || $CategoryName == "Comedy") { if($CategoryName == "Music" || $CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
@ -226,6 +221,14 @@
} }
} }
//Apply OCLC to all types
if (!empty($_POST['oclc'])) {
$OCLC = trim($_POST['oclc']);
} else {
$OCLC = "";
}
//For refilling on error //For refilling on error
if($CategoryName == "Music") { if($CategoryName == "Music") {
$MainArtistCount = 0; $MainArtistCount = 0;
@ -463,9 +466,9 @@
//These types require a year field. //These types require a year field.
if($NewRequest) { if($NewRequest) {
$DB->query("INSERT INTO requests ( $DB->query("INSERT INTO requests (
UserID, TimeAdded, LastVote, CategoryID, Title, Year, Image, Description, Visible) UserID, TimeAdded, LastVote, CategoryID, Title, Year, Image, Description, Visible, OCLC)
VALUES VALUES
(".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', ".$Year.", '".db_string($Image)."', '".db_string($Description)."', '1')"); (".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', ".$Year.", '".db_string($Image)."', '".db_string($Description)."', '1', '".db_string($OCLC)."')");
$RequestID = $DB->inserted_id(); $RequestID = $DB->inserted_id();
} else { } else {
@ -474,15 +477,16 @@
Title = '".db_string($Title)."', Title = '".db_string($Title)."',
Year = ".$Year.", Year = ".$Year.",
Image = '".db_string($Image)."', Image = '".db_string($Image)."',
Description = '".db_string($Description)."' Description = '".db_string($Description)."',
OCLC = '".db_string($OCLC)."'
WHERE ID = ".$RequestID); WHERE ID = ".$RequestID);
} }
} else { } else {
if($NewRequest) { if($NewRequest) {
$DB->query("INSERT INTO requests ( $DB->query("INSERT INTO requests (
UserID, TimeAdded, LastVote, CategoryID, Title, Image, Description, Visible) UserID, TimeAdded, LastVote, CategoryID, Title, Image, Description, Visible, OCLC)
VALUES VALUES
(".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', '".db_string($Image)."', '".db_string($Description)."', '1')"); (".$LoggedUser['ID'].", '".sqltime()."', '".sqltime()."', ".$CategoryID.", '".db_string($Title)."', '".db_string($Image)."', '".db_string($Description)."', '1', '".db_string($OCLC)."')");
$RequestID = $DB->inserted_id(); $RequestID = $DB->inserted_id();
} else { } else {
@ -490,7 +494,8 @@
SET CategoryID = ".$CategoryID.", SET CategoryID = ".$CategoryID.",
Title = '".db_string($Title)."', Title = '".db_string($Title)."',
Image = '".db_string($Image)."', Image = '".db_string($Image)."',
Description = '".db_string($Description)."' Description = '".db_string($Description)."',
OCLC = '".db_string($OCLC)."'
WHERE ID = ".$RequestID); WHERE ID = ".$RequestID);
} }
} }

View File

@ -23,7 +23,7 @@
<td>Submit</td> <td>Submit</td>
</tr> </tr>
<tr> <tr>
<td colspan="4" class="colhead">Add To Email Blacklist</td> <td colspan="4" class="colhead">Add To Email or Domain to Blacklist</td>
</tr> </tr>
<tr class="rowa"> <tr class="rowa">
<form action="tools.php" method="post"> <form action="tools.php" method="post">