X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=6a87f258cce888a8cdc0a1836a5d528ac22922d8;hb=bfbf712685680761babfd9ea059a224a4aa244bf;hp=0562cceee69afa2bb287f694d6b68315ed3cbc1f;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0;p=mailer.git
diff --git a/inc/functions.php b/inc/functions.php
index 0562cceee6..6a87f258cc 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -59,43 +59,6 @@ function IS_INC_WRITEABLE($inc) {
}
}
-// Open a table (you may want to add some header stuff here)
-// @DEPRECATED
-function OPEN_TABLE ($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_only=false) {
- global $table_cnt;
-
- // Count tables so we can generate CSS classes for every table... :-)
- if (empty($CLASS)) {
- // Class is empty so count one up and create a class
- $table_cnt++; $CLASS = "class".$table_cnt;
- }
- $OUT = "
";
- OUTPUT_HTML($OUT);
-}
-
-// Close a table (you may want to add some footer stuff here)
-// @DEPRECATED
-function CLOSE_TABLE( $ADD="") {
- OUTPUT_HTML(" \n");
- if (!empty($ADD)) OUTPUT_HTML($ADD);
- OUTPUT_HTML("
");
-}
-
// Output HTML code directly or "render" it. You addionally switch the new-line character off
function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
// Some global variables
@@ -135,7 +98,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
default:
// Huh, something goes wrong or maybe you have edited config.php ???
DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", OUTPUT_MODE));
- MXCHANGE_DIE("".FATAL_ERROR.": ".LANG_NO_RENDER_DIRECT);
+ mxchange_die("{!FATAL_ERROR!}: {!LANG_NO_RENDER_DIRECT!}");
break;
}
} elseif ((_OB_CACHING == "on") && ($footer == 1)) {
@@ -144,18 +107,15 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
// Log this error
DEBUG_LOG(__FUNCTION__, __LINE__, "Headers already sent! We need debug backtrace here.");
- // Output debug trace
- print("Headers are already sent! \n");
- print("Please report this error at bugs.mxchange.org:
");
- debug_print_backtrace();
- die("
Thank you for your help finding bugs.");
+ // Trigger an user error
+ trigger_error("Headers are already sent!");
} // END - if
// Output cached HTML code
$OUTPUT = ob_get_contents();
// Clear output buffer for later output
- ob_end_clean();
+ clearOutputBuffer();
// Send HTTP header
header("HTTP/1.1 200");
@@ -171,7 +131,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
header("Connection: Close");
// Extension "rewrite" installed?
- if ((EXT_IS_ACTIVE("rewrite")) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
+ if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
$OUTPUT = REWRITE_LINKS($OUTPUT);
} // END - if
@@ -194,7 +154,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
OUTPUT_RAW($OUTPUT);
} elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
// Rewrite links when rewrite extension is active
- if ((EXT_IS_ACTIVE("rewrite")) && (function_exists('REWRITE_LINKS')) && ($CSS != "1") && ($CSS != "-1")) {
+ if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
$OUTPUT = REWRITE_LINKS($OUTPUT);
} // END - if
@@ -239,7 +199,7 @@ function addFatalMessage ($message, $extra="") {
}
// Getter for total fatal message count
-function getTotalFatalMessages () {
+function getTotalFatalErrors () {
global $FATAL;
// Init coun
@@ -386,7 +346,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
$ret = "\n".$ret."\n";
} elseif ((IS_ADMIN()) || ((isBooleanConstantAndTrue('mxchange_installing')) && (!isBooleanConstantAndTrue('mxchange_installed')))) {
// Only admins shall see this warning or when installation mode is active
- $ret = " ".TEMPLATE_404."
+ $ret = " ".TEMPLATE_404."
(".basename($file).")
".TEMPLATE_CONTENT."
@@ -817,12 +777,9 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
if (getConfig('auto_purge') == 0) {
// Will never expire!
$EXPIRATION = MAIL_WILL_NEVER_EXPIRE;
- } elseif (function_exists('CREATE_FANCY_TIME')) {
+ } else {
// Create nice date string
$EXPIRATION = CREATE_FANCY_TIME(getConfig('auto_purge'));
- } else {
- // Display days only
- $EXPIRATION = round(getConfig('auto_purge')/60/60/24)." "._DAYS;
}
// Is content an array?
@@ -926,6 +883,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
if (empty($newContent)) {
// Compiling failed
$newContent = "Compiler error for template {$template}!\nUncompiled content:\n".$tmpl_file;
+ // Add last error if the required function exists
if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
} // END - if
@@ -969,7 +927,7 @@ function LOAD_URL($URL, $addUrlData=true) {
// 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
@@ -981,7 +939,7 @@ function LOAD_URL($URL, $addUrlData=true) {
$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
/*
@@ -989,15 +947,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");
+ require(PATH."inc/header.php");
LOAD_TEMPLATE("redirect_url", false, str_replace("&", "&", $URL));
- include(PATH."inc/footer.php");
+ require(PATH."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;
@@ -1090,7 +1064,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 *
@@ -1141,29 +1115,29 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
if ($type == "yn") {
// This is a yes/no selection only!
if ($id > 0) $prefix .= "[".$id."]";
- $OUT .= "