+ print("
".htmlentities(trim($FROM))."
To : ".$TO."
Subject : ".$SUBJECT."
Message : ".$MSG."
-
\n";
-
- // Log the mail away
- if (defined('DEBUG_MAIL')) DEBUG_LOG(__FUNCTION__, __LINE__, "to={$TO},subject={$SUBJECT},msg={$MSG}");
+\n");
} elseif (($HTML == "Y") && (EXT_IS_ACTIVE("html_mail"))) {
// Send mail as HTML away
SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM);
@@ -470,7 +459,7 @@ Message : ".$MSG."
SEND_RAW_EMAIL($TO, $SUBJECT, $MSG, $FROM);
} elseif ($HTML == "N") {
// Problem found!
- SEND_RAW_EMAIL(WEBMASTER, "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
+ SEND_RAW_EMAIL(constant('WEBMASTER'), "[PROBLEM:]".$SUBJECT, $MSG, $FROM);
}
}
@@ -487,25 +476,25 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
// Shall we use PHPMailer class or legacy mode?
if (CHECK_PHPMAILER_USAGE()) {
// Use PHPMailer class with SMTP enabled
- require_once(PATH."inc/phpmailer/class.phpmailer.php");
- require_once(PATH."inc/phpmailer/class.smtp.php");
+ LOAD_INC_ONCE("inc/phpmailer/class.phpmailer.php");
+ LOAD_INC_ONCE("inc/phpmailer/class.smtp.php");
// get new instance
$mail = new PHPMailer();
- $mail->PluginDir = sprintf("%sinc/phpmailer/", PATH);
+ $mail->PluginDir = sprintf("%sinc/phpmailer/", constant('PATH'));
$mail->IsSMTP();
$mail->SMTPAuth = true;
- $mail->Host = SMTP_HOSTNAME;
+ $mail->Host = constant('SMTP_HOSTNAME');
$mail->Port = 25;
- $mail->Username = SMTP_USER;
- $mail->Password = SMTP_PASSWORD;
+ $mail->Username = constant('SMTP_USER');
+ $mail->Password = constant('SMTP_PASSWORD');
if (empty($from)) {
- $mail->From = WEBMASTER;
+ $mail->From = constant('WEBMASTER');
} else {
$mail->From = $from;
}
- $mail->FromName = MAIN_TITLE;
+ $mail->FromName = constant('MAIN_TITLE');
$mail->Subject = $subject;
if ((EXT_IS_ACTIVE("html_mail")) && (strip_tags($msg) != $msg)) {
$mail->Body = $msg;
@@ -516,9 +505,9 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
$mail->Body = html_entity_decode($msg);
}
$mail->AddAddress($to, "");
- $mail->AddReplyTo(WEBMASTER,MAIN_TITLE);
- $mail->AddCustomHeader("Errors-To:".WEBMASTER);
- $mail->AddCustomHeader("X-Loop:".WEBMASTER);
+ $mail->AddReplyTo(constant('WEBMASTER'), constant('MAIN_TITLE'));
+ $mail->AddCustomHeader("Errors-To:".constant('WEBMASTER'));
+ $mail->AddCustomHeader("X-Loop:".constant('WEBMASTER'));
$mail->Send();
} else {
// Use legacy mail() command
@@ -528,8 +517,8 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
//
// Generate a password in a specified length or use default password length
-function GEN_PASS($LEN = 0) {
- global $_CONFIG;
+function GEN_PASS ($LEN = 0) {
+ // Auto-fix invalid length of zero
if ($LEN == 0) $LEN = getConfig('pass_len');
// Initialize array with all allowed chars
@@ -638,7 +627,7 @@ function DEREFERER ($URL) {
// Don't de-refer our own links!
if (substr($URL, 0, strlen(URL)) != URL) {
// De-refer this link
- $URL = URL."/modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
+ $URL = "modules.php?module=loader&url=".urlencode(base64_encode(gzcompress($URL)));
} // END - if
// Return link
@@ -677,7 +666,7 @@ function SELECTION_COUNT($array) {
}
//
function IMG_CODE ($code, $type, $DATA, $uid) {
- return "";
+ debug_print_backtrace();
+ die("");
+ */
$OUTPUT = ob_get_contents();
// Clear it only if there is content
if (!empty($OUTPUT)) {
- ob_end_clean();
+ clearOutputBuffer();
} // END - if
// Add some data to URL if cookies are not accepted
if (((!defined('__COOKIES')) || (!__COOKIES)) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
// Probe for bot from search engine
- if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT())) || (eregi("spider", GET_USER_AGENT()))) {
+ if ((eregi("spider", GET_USER_AGENT())) || (eregi("bot", GET_USER_AGENT()))) {
// Search engine bot detected so let's rewrite many chars for the link
$URL = htmlentities(strip_tags($URL), ENT_QUOTES);
// Output new location link as anchor
- OUTPUT_HTML("".$URL."");
+ OUTPUT_HTML("".$URL."");
} elseif (!headers_sent()) {
// Load URL when headers are not sent
/*
@@ -957,15 +944,31 @@ function LOAD_URL($URL, $addUrlData=true) {
debug_print_backtrace();
die("URL={$URL}");
*/
- @header ("Location: ".str_replace("&", "&", $URL));
+ header ("Location: ".str_replace("&", "&", $URL));
} else {
// Output error message
- include(PATH."inc/header.php");
+ LOAD_INC("inc/header.php");
LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- include(PATH."inc/footer.php");
+ LOAD_INC("inc/footer.php");
}
exit();
}
+
+// Wrapper for LOAD_URL but URL comes from a configuration entry
+function LOAD_CONFIGURED_URL ($configEntry) {
+ // Get the URL
+ $URL = getConfig($configEntry);
+
+ // Is this URL set?
+ if (is_null($URL)) {
+ // Then abort here
+ trigger_error(sprintf("Configuration entry %s is not set!", $configEntry));
+ } // END - if
+
+ // Load the URL
+ LOAD_URL($URL);
+}
+
//
function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
global $SEC_CHARS, $URL_CHARS;
@@ -998,7 +1001,7 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
} // END - foreach
// But shall I keep simple quotes for later use?
- if ($simple) $code = str_replace("\'", '{QUOT}', $code);
+ if ($simple) $code = str_replace("'", '{QUOT}', $code);
// Find $content[bla][blub] entries
@preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
@@ -1058,7 +1061,7 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
* $array - Das 3-dimensionale Array, das paralell sortiert werden soll *
* $a_sort - Array, das die Sortiereihenfolge der ersten Elementeben *
* $primary_key - Prim.rschl.ssel aus $a_sort, nach dem sortiert wird *
- * $order - Sortiereihenfolge: -1 = A-Z, 0 = keine, 1 = Z-A *
+ * $order - Sortiereihenfolge: -1 = a-Z, 0 = keine, 1 = Z-a *
* $nums - true = Als Zahlen sortieren, false = Als Zeichen sortieren *
* *
* $a_sort muss Elemente enthalten, deren Wert Schluessel von $array *
@@ -1103,35 +1106,35 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
}
//
function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
- global $MONTH_DESCR, $_CONFIG;
+ global $MONTH_DESCR;
$OUT = "";
if ($type == "yn") {
// This is a yes/no selection only!
if ($id > 0) $prefix .= "[".$id."]";
- $OUT .= "