diff --git a/sections/error/index.php b/sections/error/index.php
index 60096a85..81694dd8 100644
--- a/sections/error/index.php
+++ b/sections/error/index.php
@@ -46,7 +46,7 @@ function notify ($Channel, $Message) {
$Description .= ' Search Log';
}
- if(empty($Ajax)) {
+ if(empty($Ajax) && $Error != -1) {
show_header($Title);
?>
diff --git a/sections/forums/take_new_thread.php b/sections/forums/take_new_thread.php
index 7edbf34b..9ced09aa 100644
--- a/sections/forums/take_new_thread.php
+++ b/sections/forums/take_new_thread.php
@@ -112,7 +112,7 @@
$Cache->cache_value('polls_'.$TopicID, array($Question,$Answers,$Votes,'0000-00-00 00:00:00','0'), 0);
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);
}
}
diff --git a/sections/requests/takenew_edit.php b/sections/requests/takenew_edit.php
index fe871bd7..b3e18032 100644
--- a/sections/requests/takenew_edit.php
+++ b/sections/requests/takenew_edit.php
@@ -208,11 +208,6 @@
} else {
$RecordLabel = "";
}
- if (!empty($_POST['oclc'])) {
- $OCLC = trim($_POST['oclc']);
- } else {
- $OCLC = "";
- }
}
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
if($CategoryName == "Music") {
$MainArtistCount = 0;
@@ -463,9 +466,9 @@
//These types require a year field.
if($NewRequest) {
$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
- (".$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();
} else {
@@ -474,15 +477,16 @@
Title = '".db_string($Title)."',
Year = ".$Year.",
Image = '".db_string($Image)."',
- Description = '".db_string($Description)."'
+ Description = '".db_string($Description)."',
+ OCLC = '".db_string($OCLC)."'
WHERE ID = ".$RequestID);
}
} else {
if($NewRequest) {
$DB->query("INSERT INTO requests (
- UserID, TimeAdded, LastVote, CategoryID, Title, Image, Description, Visible)
+ UserID, TimeAdded, LastVote, CategoryID, Title, Image, Description, Visible, OCLC)
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();
} else {
@@ -490,7 +494,8 @@
SET CategoryID = ".$CategoryID.",
Title = '".db_string($Title)."',
Image = '".db_string($Image)."',
- Description = '".db_string($Description)."'
+ Description = '".db_string($Description)."',
+ OCLC = '".db_string($OCLC)."'
WHERE ID = ".$RequestID);
}
}
diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php
index b3a0e3d7..9f3613a3 100644
--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@@ -23,7 +23,7 @@
Submit |
- Add To Email Blacklist |
+ Add To Email or Domain to Blacklist |