X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=f1af163a8fc4899f4833b7ca4dc85fce765f3224;hp=d26f28da5f3393a184ac002726f458926e48aa86;hb=49ffe0a4fb551d0965e97db1ad4ff12f13f4b9ad;hpb=3b7577d3b3e6522d8898ed1799031b6de696accc diff --git a/inc/functions.php b/inc/functions.php index d26f28da5f..f1af163a8f 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -51,51 +51,16 @@ function IS_INC_WRITEABLE($inc) { $fp = @fopen($fqfn, 'a'); if ($inc == "dummy") { // Remove dummy file - @fclose($fp); - return @unlink($fqfn); + fclose($fp); + return unlink($fqfn); } else { // Close all other files - return @fclose($fp); - } -} - -// Open a table (you may want to add some header stuff here) -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; + return fclose($fp); } - $OUT = "
"; + 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 +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; @@ -1058,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 * @@ -1109,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 .= "