Even more constants/language strings rewritten, merge_array() now logs debug messages
[mailer.git] / inc / functions.php
index 4f55bb8a07e03f4c2e8b2d4c762af5f86b846332..6f668fc188a1775352b19ec101e1b93074eb1597 100644 (file)
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 // Check if our config file is writeable or not
 function IS_INC_WRITEABLE($inc) {
        // Generate FQFN
-       $fqfn = sprintf("%sinc/%s.php", PATH, $inc);
+       $fqfn = sprintf("%sinc/%s.php", constant('PATH'), $inc);
 
        // Abort by simple test
        if ((FILE_READABLE($fqfn)) && (!is_writeable($fqfn))) {
@@ -67,7 +67,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
        // Do we have HTML-Code here?
        if (!empty($HTML)) {
                // Yes, so we handle it as you have configured
-               switch (OUTPUT_MODE)
+               switch (constant('OUTPUT_MODE'))
                {
                case "render":
                        // That's why you don't need any \n at the end of your HTML code... :-)
@@ -97,7 +97,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));
+                       DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE')));
                        mxchange_die("<strong>{!FATAL_ERROR!}:</strong> {!LANG_NO_RENDER_DIRECT!}");
                        break;
                }
@@ -152,7 +152,7 @@ function OUTPUT_HTML ($HTML, $NEW_LINE = true) {
 
                // Output code here, DO NOT REMOVE! ;-)
                OUTPUT_RAW($OUTPUT);
-       } elseif ((OUTPUT_MODE == "render") && (!empty($OUTPUT))) {
+       } elseif ((constant('OUTPUT_MODE') == "render") && (!empty($OUTPUT))) {
                // Rewrite links when rewrite extension is active
                if ((EXT_IS_ACTIVE("rewrite")) && ($CSS != "1") && ($CSS != "-1")) {
                        $OUTPUT = REWRITE_LINKS($OUTPUT);
@@ -199,7 +199,7 @@ function addFatalMessage ($message, $extra="") {
 }
 
 // Getter for total fatal message count
-function getTotalFatalMessages () {
+function getTotalFatalErrors () {
        global $FATAL;
 
        // Init coun
@@ -238,7 +238,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
        // @DEPRECATED Try to rewrite the if() condition
        if ($template == "member_support_form") {
                // Support request of a member
-               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                        array($GLOBALS['userid']), __FILE__, __LINE__);
 
                // Is content an array?
@@ -265,7 +265,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
        $date_time = MAKE_DATETIME(time(), "1");
 
        // Base directory
-       $BASE = sprintf("%stemplates/%s/html/", PATH, GET_LANGUAGE());
+       $BASE = sprintf("%stemplates/%s/html/", constant('PATH'), GET_LANGUAGE());
        $MODE = "";
 
        // Check for admin/guest/member templates
@@ -392,7 +392,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                        return;
                } else {
                        // Load email address
-                       $result_email = SQL_QUERY_ESC("SELECT email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
+                       $result_email = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />\n";
 
                        // Does the user exist?
@@ -401,7 +401,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                                list($TO) = SQL_FETCHROW($result_email);
                        } else {
                                // Set webmaster
-                               $TO = WEBMASTER;
+                               $TO = constant('WEBMASTER');
                        }
 
                        // Free result
@@ -409,7 +409,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
                }
        } elseif ("$TO" == "0") {
                // Is the webmaster!
-               $TO = WEBMASTER;
+               $TO = constant('WEBMASTER');
        }
        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$TO}<br />\n";
 
@@ -459,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);
        }
 }
 
@@ -476,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;
@@ -505,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
@@ -666,7 +666,7 @@ function SELECTION_COUNT($array) {
 }
 //
 function IMG_CODE ($code, $type, $DATA, $uid) {
-       return "<IMG border=\"0\" alt=\"Code\" src=\"".URL."/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";
+       return "<IMG border=\"0\" alt=\"Code\" src=\"{!URL!}/mailid_top.php?uid=".$uid."&amp;".$type."=".$DATA."&amp;mode=img&amp;code=".$code."\">";
 }
 //
 function TRANSLATE_STATUS($status) {
@@ -701,7 +701,7 @@ function GET_LANGUAGE() {
        global $cacheArray;
 
        // Set default return value to default language from config
-       $ret = DEFAULT_LANG;
+       $ret = constant('DEFAULT_LANG');
 
        // Init variable
        $lang = "";
@@ -724,7 +724,7 @@ function GET_LANGUAGE() {
                $ret = get_session('mx_lang');
 
                // Fixes a warning before the session has the mx_lang constant
-               if (empty($ret)) $ret = DEFAULT_LANG;
+               if (empty($ret)) $ret = constant('DEFAULT_LANG');
        }
 
        // Cache entry
@@ -751,15 +751,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        // Default "nickname" if extension is not installed
        $nick = "---";
 
-       // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
-       // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
-
        // Prepare IP number and User Agent
        $REMOTE_ADDR     = GET_REMOTE_ADDR();
        $HTTP_USER_AGENT = GET_USER_AGENT();
 
        // Default admin
-       $ADMIN = MAIN_TITLE;
+       $ADMIN = constant('MAIN_TITLE');
 
        // Is the admin logged in?
        if (IS_ADMIN()) {
@@ -771,7 +768,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        } // END - if
 
        // Neutral email address is default
-       $email = WEBMASTER;
+       $email = constant('WEBMASTER');
 
        // Expiration in a nice output format
        if (getConfig('auto_purge') == 0) {
@@ -795,12 +792,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
                if (EXT_IS_ACTIVE("nickname")) {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />\n";
                        // Load nickname
-                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);
                } else {
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />\n";
                        /// Load normal data
-                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                array(bigintval($UID)), __FILE__, __LINE__);
                }
 
@@ -823,7 +820,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        $DATA['email'] = $email;
 
        // Base directory
-       $BASE = sprintf("%stemplates/%s/emails/", PATH, GET_LANGUAGE());
+       $BASE = sprintf("%stemplates/%s/emails/", constant('PATH'), GET_LANGUAGE());
 
        // Check for admin/guest/member templates
        if (strpos($template, "admin_") > -1) {
@@ -950,9 +947,9 @@ function LOAD_URL($URL, $addUrlData=true) {
                header ("Location: ".str_replace("&amp;", "&", $URL));
        } else {
                // Output error message
-               require(PATH."inc/header.php");
+               LOAD_INC("inc/header.php");
                LOAD_TEMPLATE("redirect_url", false, str_replace("&amp;", "&", $URL));
-               require(PATH."inc/footer.php");
+               LOAD_INC("inc/footer.php");
        }
        exit();
 }
@@ -965,7 +962,7 @@ function LOAD_CONFIGURED_URL ($configEntry) {
        // Is this URL set?
        if (is_null($URL)) {
                // Then abort here
-               trigger_error(sprintf("Configuration entry %s is not set!", $configEntry);
+               trigger_error(sprintf("Configuration entry %s is not set!", $configEntry));
        } // END - if
 
        // Load the URL
@@ -1213,9 +1210,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
        case "yn":
                $OUT .= "<option value=\"Y\"";
                if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-               $OUT .= ">".YES."</option>\n<option value=\"N\"";
+               $OUT .= ">{!YES!}</option>\n<option value=\"N\"";
                if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
-               $OUT .= ">".NO."</option>\n";
+               $OUT .= ">{!NO!}</option>\n";
                break;
        }
        $OUT .= "    </select>\n";
@@ -1315,11 +1312,11 @@ function GENERATE_IMAGE($img_code, $header=true) {
                return;
        } elseif (!$header) {
                // Return in an HTML code code
-               return "<IMG src=\"".URL."/img.php?code=".$img_code."\">\n";
+               return "<IMG src=\"{!URL!}/img.php?code=".$img_code."\">\n";
        }
 
        // Load image
-       $img = sprintf("%s/theme/%s/images/code_bg.%s", PATH, GET_CURR_THEME(), getConfig('img_type'));
+       $img = sprintf("%s/theme/%s/images/code_bg.%s", constant('PATH'), GET_CURR_THEME(), getConfig('img_type'));
        if (FILE_READABLE($img)) {
                // Switch image type
                switch (getConfig('img_type'))
@@ -1417,133 +1414,133 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
        } else {
                // Generate table
                $OUT  = "<div align=\"".$align."\">\n";
-               $OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
-               $OUT .= "<TR>\n";
+               $OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
+               $OUT .= "<tr>\n";
 
                if (ereg('Y', $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._YEARS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._YEARS."</strong></td>\n";
                }
 
                if (ereg("M", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MONTHS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MONTHS."</strong></td>\n";
                }
 
                if (ereg("W", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._WEEKS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._WEEKS."</strong></td>\n";
                }
 
                if (ereg("D", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._DAYS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._DAYS."</strong></td>\n";
                }
 
                if (ereg("h", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._HOURS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._HOURS."</strong></td>\n";
                }
 
                if (ereg("m", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MINUTES."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MINUTES."</strong></td>\n";
                }
 
                if (ereg("s", $display) || (empty($display))) {
-                       $OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._SECONDS."</strong></TD>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._SECONDS."</strong></td>\n";
                }
 
-               $OUT .= "</TR>\n";
-               $OUT .= "<TR>\n";
+               $OUT .= "</tr>\n";
+               $OUT .= "<tr>\n";
 
                if (ereg('Y', $display) || (empty($display))) {
                        // Generate year selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 10; $idx++) {
                                $OUT .= "    <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $Y) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\" />\n";
                }
 
                if (ereg("M", $display) || (empty($display))) {
                        // Generate month selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 11; $idx++)
                        {
                                        $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $M) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\" />\n";
                }
 
                if (ereg("W", $display) || (empty($display))) {
                        // Generate week selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 4; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $W) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\" />\n";
                }
 
                if (ereg("D", $display) || (empty($display))) {
                        // Generate day selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 31; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $D) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
                }
 
                if (ereg("h", $display) || (empty($display))) {
                        // Generate hour selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 23; $idx++)      {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $h) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
                }
 
                if (ereg("m", $display) || (empty($display))) {
                        // Generate minute selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 59; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $m) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
                }
 
                if (ereg("s", $display) || (empty($display))) {
                        // Generate second selection
-                       $OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
+                       $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 59; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
                                if ($idx == $s) $OUT .= " selected default";
                                $OUT .= ">".$idx."</option>\n";
                        }
-                       $OUT .= "  </select></TD>\n";
+                       $OUT .= "  </select></td>\n";
                } else {
                        $OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
                }
-               $OUT .= "</TR>\n";
-               $OUT .= "</TABLE>\n";
+               $OUT .= "</tr>\n";
+               $OUT .= "</table>\n";
                $OUT .= "</div>\n";
                // Return generated HTML code
        }
@@ -1592,16 +1589,16 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
        } // END - if
 
        // Check which admin shall receive this mail
-       $result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM "._MYSQL_PREFIX."_admins_mails WHERE mail_template='%s' ORDER BY admin_id",
+       $result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
                array($template), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Create new entry (to all admins)
-               SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_mails (admin_id, mail_template) VALUES (0, '%s')",
+               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
                        array($template), __FILE__, __LINE__);
        } else {
                // Load admin IDs...
                $aids = array();
-               while(list($aid) = SQL_FETCHROW($result)) {
+               while (list($aid) = SQL_FETCHROW($result)) {
                        $aids[] = $aid;
                }
 
@@ -1616,10 +1613,10 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
                        return;
                } elseif ($aid == "0") {
                        // Select all email adresses
-                       $result = SQL_QUERY("SELECT email FROM "._MYSQL_PREFIX."_admins ORDER BY id", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`", __FILE__, __LINE__);
                } else {
                        // If Admin-ID is not "to-all" select
-                       $result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id IN (%s) ORDER BY id", array($aid), __FILE__, __LINE__);
+                       $result = SQL_QUERY_ESC("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY `id`", array($aid), __FILE__, __LINE__);
                }
        }
 
@@ -1662,7 +1659,7 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
        $SEP = ""; $TOP = "";
        if (!$show_form) {
                $TOP = " top2";
-               $SEP = "<TR><TD colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</TD></TR>";
+               $SEP = "<tr><td colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</td></tr>";
        }
 
        $NAV = "";
@@ -1673,7 +1670,7 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
                        $NAV .= "<strong>-";
                } else {
                        // Open anchor tag and add base URL
-                       $NAV .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
+                       $NAV .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what']."&amp;page=".$page."&amp;offset=".$offset;
 
                        // Add userid when we shall show all mails from a single member
                        if ((isset($_GET['u_id'])) && (bigintval($_GET['u_id']) > 0)) $NAV .= "&amp;u_id=".bigintval($_GET['u_id']);
@@ -1955,7 +1952,7 @@ function VALIDATE_URL ($URL, $compile=true) {
        return (((substr($URL, 0, 7) == "http://") || (substr($URL, 0, 8) == "https://")) && (strlen($URL) >= 12));
 }
 //
-function MEMBER_ACTION_LINKS($uid, $status="") {
+function MEMBER_ACTION_LINKS ($uid, $status = "") {
        // Define all main targets
        $TARGETS = array("del_user", "edit_user", "lock_user", "add_points", "sub_points");
 
@@ -1963,7 +1960,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
        $eval = "\$OUT = \"[&nbsp;";
 
        foreach ($TARGETS as $tar) {
-               $eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"".URL."/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"\".ADMIN_LINK_";
+               $eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"{!URL!}/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"{!ADMIN_LINK_";
                //* DEBUG: */ echo "*".$tar."/".$status."*<br />\n";
                if (($tar == "lock_user") && ($status == "LOCKED")) {
                        // Locked accounts shall be unlocked
@@ -1972,7 +1969,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
                        // All other status is fine
                        $eval .= strtoupper($tar);
                }
-               $eval .= "_TITLE.\"\\\">\".ADMIN_";
+               $eval .= "_TITLE!}\\\">{!ADMIN_";
                if (($tar == "lock_user") && ($status == "LOCKED")) {
                        // Locked accounts shall be unlocked
                        $eval .= "UNLOCK_USER";
@@ -1980,7 +1977,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
                        // All other status is fine
                        $eval .= strtoupper($tar);
                }
-               $eval .= ".\"</a></span>&nbsp;|&nbsp;";
+               $eval .= "!}</a></span>&nbsp;|&nbsp;";
        }
 
        // Finish navigation link
@@ -1991,9 +1988,9 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
        return $OUT;
 }
 // Function for backward-compatiblity
-function ADD_CATEGORY_TABLE ($MODE, $return=false) {
+function ADD_CATEGORY_table ($MODE, $return=false) {
        // Load it from the register extension
-       return REGISTER_ADD_CATEGORY_TABLE ($MODE, $return);
+       return REGISTER_ADD_CATEGORY_table ($MODE, $return);
 }
 // Generate an email link
 function CREATE_EMAIL_LINK ($email, $table = "admins") {
@@ -2240,13 +2237,13 @@ function FIX_DELETED_COOKIES ($cookies) {
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
        // Load header
-       require_once(PATH."inc/header.php");
+       LOAD_INC_ONCE("inc/header.php");
 
        // Load the message template
        LOAD_TEMPLATE("admin_settings_saved", false, $msg);
 
        // Load footer
-       require(PATH."inc/footer.php");
+       LOAD_INC("inc/footer.php");
 
        // Exit explicitly
        exit;
@@ -2400,10 +2397,15 @@ function merge_array ($array1, $array2) {
                return array_merge($array1, $array2);
        } elseif (is_array($array1)) {
                // Return left array
+               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
                return $array1;
+       } elseif (is_array($array2)) {
+               // Return right array
+               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
+               return $array2;
        }
 
-       // Something wired happened here...
+       // Both are not arrays
        print(__FUNCTION__.":<pre>");
        debug_print_backtrace();
        die("</pre>");
@@ -2601,22 +2603,22 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
        $OUT = "";
 
        // Is the session data set?
-       if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failtures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
+       if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
                // Ignore zero values
-               if (get_session('mxchange_'.$accessLevel.'_failtures') > 0) {
-                       // Non-guest has login failtures found, get both data and prepare it for template
+               if (get_session('mxchange_'.$accessLevel.'_failures') > 0) {
+                       // Non-guest has login failures found, get both data and prepare it for template
                        //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):accessLevel={$accessLevel}<br />\n";
                        $content = array(
-                               'login_failtures' => get_session('mxchange_'.$accessLevel.'_failtures'),
-                               'last_failture'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
+                               'login_failures' => get_session('mxchange_'.$accessLevel.'_failures'),
+                               'last_failure'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
                        );
 
                        // Load template
-                       $OUT = LOAD_TEMPLATE("login_failtures", true, $content);
+                       $OUT = LOAD_TEMPLATE("login_failures", true, $content);
                } // END - if
 
                // Reset session data
-               set_session('mxchange_'.$accessLevel.'_failtures', "");
+               set_session('mxchange_'.$accessLevel.'_failures', "");
                set_session('mxchange_'.$accessLevel.'_last_fail', "");
        } // END - if
 
@@ -2639,13 +2641,13 @@ function REBUILD_CACHE ($cache, $inc="") {
                // Include file given?
                if (!empty($inc)) {
                        // Construct FQFN
-                       $fqfn = sprintf("%sinc/loader/load_cache-%s.php", PATH, $inc);
+                       $INC = sprintf("inc/loader/load_cache-%s.php", $inc);
 
                        // Is the include there?
-                       if (FILE_READABLE($fqfn)) {
+                       if (FILE_READABLE($INC)) {
                                // And rebuild it from scratch
                                //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): inc={$inc} - LOADED!<br />\n";
-                               require($fqfn);
+                               LOAD_INC($INC);
                        } else {
                                // Include not found!
                                DEBUG_LOG(__FUNCTION__, __LINE__, "Include {$inc} not found. cache={$cache}");
@@ -2775,10 +2777,10 @@ function ADD_NEW_BONUS_MAIL ($data, $mode="", $output=true) {
                );
 
                // Mail inserted into bonus pool
-               if ($output) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND);
+               if ($output) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_SEND'));
        } elseif ($output) {
                // More entered than can be reached!
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_MORE_SELECTED'));
        } else {
                // Debug log
                DEBUG_LOG(__FUNCTION__, __LINE__, " cat={$data['cat']},receiver={$data['receiver']},data=".base64_encode(serialize($data))." More selected, than available!");
@@ -2872,10 +2874,13 @@ function getMessage ($messageId) {
        $return = "!".$messageId."!";
 
        // Is the language string found?
-       if (isset($GLOBALS['msg'][$messageId])) {
-               // Language array element found
+       if (isset($GLOBALS['msg'][strtolower($messageId)])) {
+               // Language array element found in small_letters
+               $return = $GLOBALS['msg'][$messageId];
+       } elseif (isset($GLOBALS['msg'][strtoupper($messageId)])) {
+               // @DEPRECATED Language array element found in BIG_LETTERS
                $return = $GLOBALS['msg'][$messageId];
-       } elseif (defined($messageId)) {
+       } elseif (defined(strtoupper($messageId))) {
                // @DEPRECATED Deprecated constant found
                $return = constant($messageId);
        } else {
@@ -2912,13 +2917,13 @@ function GET_CURR_THEME() {
                } // END - if
        } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) && ((isBooleanConstantAndTrue('mxchange_installing')) || ($CSS == true)) && ((!empty($_GET['theme'])) || (!empty($_POST['theme'])))) {
                // Prepare FQFN for checking
-               $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_GET['theme']));
+               $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($_GET['theme']));
 
                // Installation mode active
                if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) {
                        // Set cookie from URL data
                        set_session('mxchange_theme', SQL_ESCAPE($_GET['theme']));
-               } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($_POST['theme'])))) {
+               } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($_POST['theme'])))) {
                        // Set cookie from posted data
                        set_session('mxchange_theme', SQL_ESCAPE($_POST['theme']));
                }
@@ -2931,7 +2936,7 @@ function GET_CURR_THEME() {
        }
 
        // Add (maybe) found theme.php file to inclusion list
-       $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret));
+       $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE($ret));
 
        // Try to load the requested include file
        if (FILE_READABLE($theme)) $INC_POOL[] = $theme;
@@ -2962,7 +2967,7 @@ function THEME_GET_ID ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
                // Check if current theme is already imported or not
-               $result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_themes` WHERE theme_path='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
                        array($name), __FILE__, __LINE__);
 
                // Entry found?
@@ -3013,6 +3018,23 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
        return $content;
 }
 
+// Writes content to a file
+function WRITE_FILE ($FQFN, $content) {
+       // Is the function there?
+       if (function_exists('file_put_contents')) {
+               // Write it directly
+               file_put_contents($FQFN, $content);
+       } else {
+               // Write it with fopen
+               $fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+               fwrite($fp, $content);
+               fclose($fp);
+
+               // Set CHMOD rights
+               chmod($FQFN, 0644);
+       }
+}
+
 // Generates an error code from given account status
 function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
        // Default error code if unknown account status
@@ -3043,6 +3065,90 @@ function clearOutputBuffer () {
        } // END - if
 }
 
+// "Getter" for revision/version data
+function getActualVersion ($type = 0) {
+       // By default nothing is new... ;-)
+       $new = false;
+
+       // FQFN of revision file
+       $FQFN = sprintf("%sinc/cache/.revision", constant('PATH'));
+
+       // Check for revision file
+       if (!FILE_READABLE($FQFN)) {
+               // Not found, so we need to create it
+               $new = true;
+       } else {
+               // Revision file found
+               $ins_vers = explode("\n", READ_FILE($FQFN));
+
+               // Is the content valid?
+               if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$type])) || ($ins_vers[0]) == "new") {
+                       // File needs update!
+                       $new = true;
+               } else {
+                       // Revision-File has valid Data and isn't 'new' so return the Rev-Number
+                       return trim($ins_vers[$type]);
+               }
+       }
+
+       if ($new)  {
+               // no Revision-File or has no valid Data so read the Revision from the Server.
+               $version = GET_URL("check-updates3.php");
+
+               // Prepare content
+               $akt_vers[] = trim($version[10]);
+               $akt_vers[] = trim($version[9]);
+               $akt_vers[] = trim($version[8]);
+
+               // Write file
+               WRITE_FILE($FQFN, implode("\n", $akt_vers));
+
+               // Return requested content
+               return trim($akt_vers[$type]);
+       }
+}
+
+// Loads an include file and logs any missing files for debug purposes
+function LOAD_INC ($INC) {
+       // Get constant path
+       $PATH = constant('PATH');
+
+       // Use the include file name directly
+       // @TODO Try to find all locations where an FQFN is given to these two
+       // @TODO functions and avoid it.
+       $FQFN = $INC;
+
+       // Check if PATH is in $INC
+       if (substr($INC, 0, $PATH) != $PATH) {
+               // Add it. This is why we need a trailing slash in config.php
+               $FQFN = $PATH . $INC;
+       } // END - if
+
+       // Is the include file there?
+       if (!FILE_READABLE($FQFN)) {
+               // Not there so log it
+               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Include file %s not found.", basename($INC)));
+               return false;
+       } // END - if
+
+       // Try to load it
+       require($FQFN);
+}
+
+// Loads an include file once
+function LOAD_INC_ONCE ($INC) {
+       global $cacheArray;
+
+       // Is it not loaded?
+       if (!isset($cacheArray['load_once'][$INC])) {
+               // Then try to load it
+               LOAD_INC($INC);
+
+               // And mark it as loaded
+               $cacheArray['load_once'][$INC] = true;
+       } // END - if
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////