]> git.mxchange.org Git - mailer.git/blobdiff - inc/functions.php
More HTML tags ported to XHTML (all lower-case), bug #33 resolved
[mailer.git] / inc / functions.php
index de39d07278994a3e38fc4bd79703fa06b081af24..6a87f258cce888a8cdc0a1836a5d528ac22922d8 100644 (file)
@@ -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 = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\"";
-
-       // Shall I add the classes to TABLE and TD or only to TD?
-       if (!$td_only) $OUT .= " class=\"".$CLASS."\"";
-
-       // Width is given
-       if (!empty($PERCENT)) $OUT .= " width=\"".$PERCENT."\"";
-
-       // Horizonal align
-       if (!empty($ALIGN)) $OUT .=" align=\"".$ALIGN."\"";
-
-       // Vertical align is given
-       if (!empty($VALIGN))  $OUT .= " valign=\"".$VALIGN."\"";
-       $OUT .= ">\n<TR>\n<TD";
-       if (!empty($ALIGN)) $OUT .=" align=\"".$ALIGN."\"";
-       $OUT .= " class=\"".$CLASS."\">";
-       OUTPUT_HTML($OUT);
-}
-
-// Close a table (you may want to add some footer stuff here)
-// @DEPRECATED
-function CLOSE_TABLE( $ADD="") {
-       OUTPUT_HTML("  </TD>\n</TR>");
-       if (!empty($ADD)) OUTPUT_HTML($ADD);
-       OUTPUT_HTML("</TABLE>");
-}
-
 // 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("<strong>".FATAL_ERROR.":</strong> ".LANG_NO_RENDER_DIRECT);
+                       mxchange_die("<strong>{!FATAL_ERROR!}:</strong> {!LANG_NO_RENDER_DIRECT!}");
                        break;
                }
        } elseif ((_OB_CACHING == "on") && ($footer == 1)) {
@@ -236,7 +199,7 @@ function addFatalMessage ($message, $extra="") {
 }
 
 // Getter for total fatal message count
-function getTotalFatalMessages () {
+function getTotalFatalErrors () {
        global $FATAL;
 
        // Init coun
@@ -987,9 +950,9 @@ function LOAD_URL($URL, $addUrlData=true) {
                header ("Location: ".str_replace("&amp;", "&", $URL));
        } else {
                // Output error message
-               include(PATH."inc/header.php");
+               require(PATH."inc/header.php");
                LOAD_TEMPLATE("redirect_url", false, str_replace("&amp;", "&", $URL));
-               include(PATH."inc/footer.php");
+               require(PATH."inc/footer.php");
        }
        exit();
 }
@@ -1002,7 +965,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
@@ -1454,133 +1417,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
        }
@@ -1699,7 +1662,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 = "";
@@ -2028,9 +1991,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") {
@@ -2276,13 +2239,14 @@ function FIX_DELETED_COOKIES ($cookies) {
 
 // Output error messages in a fasioned way and die...
 function mxchange_die ($msg) {
-       global $footer;
+       // Load header
+       require_once(PATH."inc/header.php");
 
        // Load the message template
        LOAD_TEMPLATE("admin_settings_saved", false, $msg);
 
        // Load footer
-       include(PATH."inc/footer.php");
+       require(PATH."inc/footer.php");
 
        // Exit explicitly
        exit;
@@ -2637,22 +2601,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
 
@@ -2901,7 +2865,7 @@ function getConfig ($entry) {
        return $value;
 }
 
-// @TODO Rewrite all language constants to the function getLanguage().
+// @TODO Rewrite all language constants to this function.
 // "Getter" for language strings
 function getMessage ($messageId) {
        // Default is not found!