A *lot* more code-cleanups, errors in CSS fixed (missing brackets) and frameset suppo...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 5c0d7da89b225f026349d799557127d31c281518..eb09c9b1198dac8f4deeee550c5574f2ef99b5a3 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -103,7 +103,7 @@ function CLOSE_TABLE($ADD="")
 // 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
-       global $OUTPUT, $FOOTER, $CSS;
+       global $OUTPUT, $footer, $CSS;
 
        // Do we have HTML-Code here?
        if (!empty($HTML)) {
@@ -144,7 +144,7 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
                        die ("<STRONG>".FATAL_ERROR.":</STRONG> ".LANG_NO_RENDER_DIRECT);
                        break;
                }
-       } elseif ((_OB_CACHING == "on") && ($FOOTER == 1)) {
+       } elseif ((_OB_CACHING == "on") && ($footer == 1)) {
                // Output cached HTML code
                $OUTPUT = ob_get_contents();
 
@@ -322,14 +322,14 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
         elseif ((IS_ADMIN()) || ((mxchange_installing) && (!mxchange_installed)))
        {
                // Only admins shall see this warning or when installation mode is active
-               $ret = "<BR><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><BR>
-(".basename($file).")<BR>
-<BR>
+               $ret = "<br /><SPAN class=\"guest_failed\">".TEMPLATE_404."</SPAN><br />
+(".basename($file).")<br />
+<br />
 ".TEMPLATE_CONTENT."
 <PRE>".print_r($content, true)."</PRE>
 ".TEMPLATE_DATA."
 <PRE>".print_r($DATA, true)."</PRE>
-<BR><BR>";
+<br /><br />";
        }
        if (!empty($ret))
        {
@@ -348,7 +348,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="")
         elseif (DEBUG_MODE)
        {
                // Warning, empty output!
-               return "E:".$template."<BR>\n";
+               return "E:".$template."<br />\n";
        }
 }
 
@@ -963,12 +963,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
         elseif (!empty($template))
        {
                // Template file not found!
-               $content = TEMPLATE_404.": ".$template."<BR>
+               $content = TEMPLATE_404.": ".$template."<br />
 ".TEMPLATE_CONTENT."
 <PRE>".print_r($content, true)."</PRE>
 ".TEMPLATE_DATA."
 <PRE>".print_r($DATA, true)."</PRE>
-<BR><BR>";
+<br /><br />";
 
                // Debug mode not active? Then remove the HTML tags
                if (!DEBUG_MODE) $content = strip_tags($content);
@@ -1005,7 +1005,7 @@ function LOAD_URL($URL, $addUrlData=true) {
                $URL = htmlentities(strip_tags($URL), ENT_QUOTES);
 
                // Output new location link as anchor
-               OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>\n");
+               OUTPUT_HTML("<A href=\"".$URL."\">".$URL."</A>");
        } elseif (!headers_sent()) {
                // Load URL when headers are not sent
                @header ("Location: ".str_replace("&amp;", "&", $URL));
@@ -1797,11 +1797,11 @@ function VALIDATE_EMAIL($email) {
 function VALIDATE_URL ($URL, $compile=true) {
        // Trim URL a little
        $URL = trim(urldecode($URL));
-       //* DEBUG: */ echo $URL."<BR>";
+       //* DEBUG: */ echo $URL."<br />";
 
        // Compile some chars out...
        if ($compile) $URL = COMPILE_CODE($URL, false, false, false);
-       //* DEBUG: */ echo $URL."<BR>";
+       //* DEBUG: */ echo $URL."<br />";
 
        // Check for the extension filter
        if (EXT_IS_ACTIVE("filter")) {
@@ -1911,7 +1911,7 @@ function generateHash($plainText, $salt = "") {
 
                // Generate the password salt string
                $salt = substr($sha1, 0, $CONFIG['salt_length']);
-               //* DEBUG: */ echo $salt." (".strlen($salt).")<BR>";
+               //* DEBUG: */ echo $salt." (".strlen($salt).")<br />";
        }
         else
        {
@@ -1941,7 +1941,7 @@ function scrambleString($str) {
        }
 
        // Scramble string here
-       //* DEBUG: */ echo "***Original=".$str."***<BR>";
+       //* DEBUG: */ echo "***Original=".$str."***<br />";
        for ($idx = 0; $idx < strlen($str); $idx++) {
                // Get char on scrambled position
                $char = substr($str, $scrambleNums[$idx], 1);
@@ -1951,7 +1951,7 @@ function scrambleString($str) {
        }
 
        // Return scrambled string
-       //* DEBUG: */ echo "***Scrambled=".$scrambled."***<BR>";
+       //* DEBUG: */ echo "***Scrambled=".$scrambled."***<br />";
        return $scrambled;
 }
 //
@@ -1969,7 +1969,7 @@ function descrambleString($str)
 
        // Begin descrambling
        $orig = str_repeat(" ", 40);
-       //* DEBUG: */ echo "+++Scrambled=".$str."+++<BR>";
+       //* DEBUG: */ echo "+++Scrambled=".$str."+++<br />";
        for ($idx = 0; $idx < 40; $idx++)
        {
                $char = substr($str, $idx, 1);
@@ -1977,7 +1977,7 @@ function descrambleString($str)
        }
 
        // Return scrambled string
-       //* DEBUG: */ echo "+++Original=".$orig."+++<BR>";
+       //* DEBUG: */ echo "+++Original=".$orig."+++<br />";
        return $orig;
 }
 //
@@ -2087,7 +2087,7 @@ function FIX_DELETED_COOKIES ($cookies) {
 }
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
-       global $FOOTER;
+       global $footer;
 
        // Load the message template
        LOAD_TEMPLATE("admin_settings_saved", false, $msg);