X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=b326dab09832063588ebb76fd1a328c91088a55e;hp=1133a3b1cbd646cb346d202173a33292edb26f40;hb=62b16291efe168636f5eda2c8644f6770382fb1e;hpb=2e68ea39a430a7217e58747b877acaa3e92ea997 diff --git a/inc/functions.php b/inc/functions.php index 1133a3b1cb..b326dab098 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("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"); @@ -169,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 @@ -192,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 @@ -220,7 +182,7 @@ function OUTPUT_RAW ($HTML) { } // Add a fatal error message to the queue array -function ADD_FATAL ($message, $extra="") { +function addFatalMessage ($message, $extra="") { global $FATAL; if (empty($extra)) { @@ -236,8 +198,25 @@ function ADD_FATAL ($message, $extra="") { DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}"); } +// Getter for total fatal message count +function getTotalFatalErrors () { + global $FATAL; + + // Init coun + $count = 0; + + // Do we have at least the first entry? + if (!empty($FATAL[0])) { + // Get total count + $count = count($FATAL); + } // END - if + + // Return value + return $count; +} + // Load a template file and return it's content (only it's name; do not use ' or ") -function LOAD_TEMPLATE($template, $return=false, $content=array()) { +function LOAD_TEMPLATE ($template, $return=false, $content=array()) { // Add more variables which you want to use in your template files global $DATA, $_CONFIG, $username; @@ -367,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 = "