]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/admin-inc.php
More XHTML-fied and extended header added to templates
[mailer.git] / inc / modules / admin / admin-inc.php
index 288510d631cd95a701c338fb6a2a3765ebc7ea51..ab634e0ca872dfad7789785751e57988d764b735 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Fuer die Administration benoetigte Funktionen    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,11 +43,11 @@ if (!defined('__SECURITY')) {
 }
 
 // Register an administrator account
-function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
+function REGISTER_ADMIN ($user, $md5, $email) {
        // Login does already exist
        $ret = "already";
 
-       // Lookup the user
+       // Lookup the admin
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
                array($user), __FUNCTION__, __LINE__);
 
@@ -60,6 +65,7 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
        // Return result
        return $ret;
 }
+
 // Only be executed on login procedure!
 function CHECK_ADMIN_LOGIN ($admin_login, $password) {
        // By default no admin is found
@@ -86,7 +92,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                } // END - if
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Add extra data via filter now
-               $ADD = RUN_FILTER('sql_admin_extra_data');
+               $ADD = runFilterChain('sql_admin_extra_data');
 
                // Get password from DB
                $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
@@ -147,7 +153,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                }
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
 
                // Login has failed by default... ;-)
                $ret = "failed";
@@ -175,7 +181,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                        array($aid), __FUNCTION__, __LINE__);
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
        } // END - if
 
        // Return the result
@@ -192,7 +198,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
                        array($adminLogin), __FUNCTION__, __LINE__);
 
                // Rebuild cache
-               REBUILD_CACHE("admins", "admin");
+               rebuildCacheFiles("admins", "admin");
        } // END - if
 
        // Now set all session variables and return the result
@@ -294,8 +300,9 @@ LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__);
        // Tableset footer
        LOAD_TEMPLATE("admin_main_footer");
 }
+
 //
-function ADD_ADMIN_MENU($act, $wht, $return=false) {
+function ADD_ADMIN_MENU ($act, $wht, $return=false) {
        // Init variables
        $SUB = false;
        $OUT = "";
@@ -305,7 +312,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        $GLOBALS['menu']['title'] = array();
 
        // Is there a cache instance?
-       if ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) {
+       if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
                // Create cache name
                $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
@@ -320,7 +327,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                        $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0]));
 
                        // Return or output content?
-                       if ($return) {
+                       if ($return === true) {
                                return $OUT;
                        } else {
                                OUTPUT_HTML($OUT);
@@ -333,6 +340,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        if (SQL_NUMROWS($result_main) > 0) {
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
 <tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
+               // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
                        if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
                                $ACL = ADMINS_CHECK_ACL($menu, "");
@@ -349,25 +357,21 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                }
                                $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <NOBR>&nbsp;<strong>&middot;</strong>&nbsp;";
-                               if (($menu == $act) && (empty($wht)))
-                               {
+               <nobr>&nbsp;<strong>&middot;</strong>&nbsp;";
+                               if (($menu == $act) && (empty($wht))) {
                                        $OUT .= "<strong>";
-                               }
-                                else
-                               {
+                               } else {
                                        $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;action=".$menu."\">";
                                }
+
                                $OUT .= $title;
-                               if (($menu == $act) && (empty($wht)))
-                               {
+
+                               if (($menu == $act) && (empty($wht))) {
                                        $OUT .= "</strong>";
-                               }
-                                else
-                               {
+                               } else {
                                        $OUT .= "</a>]";
                                }
-                               $OUT .= "</NOBR></td>
+                               $OUT .= "</nobr></td>
 </tr>\n";
                                $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
                                        array($menu), __FUNCTION__, __LINE__);
@@ -379,55 +383,50 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        <td width=\"10\" class=\"seperator\">&nbsp;</td>
        <td class=\"admin_menu\">
                <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+                                       // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Filename
-                                               $INC = sprintf("%sinc/modules/admin/what-%s.php", constant('PATH'), $wht_sub);
+                                               $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub);
                                                if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
                                                        $ACL = ADMINS_CHECK_ACL("", $wht_sub);
                                                } else {
                                                        // ACL is "allow"... hmmm
                                                        $ACL = true;
                                                }
+
+                                               // Is the file readable?
                                                $readable = INCLUDE_READABLE($INC);
+
+                                               // Access allowed?
                                                if ($ACL === true) {
                                                        // Insert compiled title and description
                                                        $GLOBALS['menu']['title'][$wht_sub]      = $title_what;
                                                        $GLOBALS['menu']['description'][$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
-                                                       if ($readable === true)
-                                                       {
-                                                               if ($wht == $wht_sub)
-                                                               {
+               <nobr>&nbsp;<strong>--&gt;</strong>&nbsp;";
+                                                       if ($readable === true) {
+                                                               if ($wht == $wht_sub) {
                                                                        $OUT .= "<strong>";
-                                                               }
-                                                                else
-                                                               {
+                                                               } else {
                                                                        $OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht_sub."\">";
                                                                }
-                                                       }
-                                                        else
-                                                       {
+                                                       } else {
                                                                $OUT .= "<i class=\"admin_note\">";
                                                        }
+
                                                        $OUT .= $title_what;
-                                                       if ($readable === true)
-                                                       {
-                                                               if ($wht == $wht_sub)
-                                                               {
+
+                                                       if ($readable === true) {
+                                                               if ($wht == $wht_sub) {
                                                                        $OUT .= "</strong>";
-                                                               }
-                                                                else
-                                                               {
+                                                               } else {
                                                                        $OUT .= "</a>]";
                                                                }
-                                                       }
-                                                        else
-                                                       {
+                                                       } else {
                                                                $OUT .= "</em>";
                                                        }
-                                                       $OUT .= "</NOBR></td>
+                                                       $OUT .= "</nobr></td>
 </tr>\n";
                                                }
                                        }
@@ -447,14 +446,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                $OUT .= "</table>\n";
        }
 
-       // Compile and run the code here. This inserts all constants into the
-       // HTML output. Costs me some time to figure this out... *sigh* Quix0r
-       // @TODO Is this eval longer needed?
-       $eval = "\$OUT = \"".COMPILE_CODE(smartAddSlashes($OUT))."\";";
-       eval($eval);
-
        // Is there a cache instance again?
-       if ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) {
+       if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) {
                // Init cache
                $GLOBALS['cache_instance']->init($cacheName);
 
@@ -473,34 +466,37 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        } // END - if
 
        // Return or output content?
-       if ($return) {
+       if ($return === true) {
                return $OUT;
        } else {
                OUTPUT_HTML($OUT);
        }
 }
-//
-function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid")
-{
+
+// Create member selection box
+function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid") {
        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FUNCTION__, __LINE__);
+
+       // Default output
        $OUT = "";
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-       if ($add_all) $OUT = "      <option value=\"all\">".ALL_MEMBERS."</option>\n";
-        elseif ($none) $OUT = "      <option value=\"0\">".SELECT_NONE."</option>\n";
-       while (list($id, $sname, $fname) = SQL_FETCHROW($result))
-       {
-               $OUT .= "      <option value=\"".bigintval($id)."\"";
-               if ($def == $id) $OUT .= " selected=\"selected\"";
-               $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</option>\n";
-       }
+       if ($add_all === true)   $OUT = "      <option value=\"all\">{--ALL_MEMBERS--}</option>\n";
+        elseif ($none === true) $OUT = "      <option value=\"0\">{--SELECT_NONE--}</option>\n";
+
+       while ($content = SQL_FETCHARRAY($result)) {
+               $OUT .= "      <option value=\"".bigintval($content['userid'])."\"";
+               if ($def == $content['userid']) $OUT .= " selected=\"selected\"";
+               $OUT .= ">".$content['surname']." ".$content['family']." (".bigintval($content['userid']).")</option>\n";
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        if (!$return) {
                // Remeber options in constant
+               // @TODO Rewrite these both constants
                define('_MEMBER_SELECTION', $OUT);
 
                // Display selection box
@@ -513,18 +509,20 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
                return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
        }
 }
-//
-function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
+
+// Create a menu selection box for given menu system
+function ADMIN_MENU_SELECTION ($MODE, $default="", $defid="") {
        $wht = "`what` != ''";
        if ($MODE == "action") $wht = "(what='' OR `what` IS NULL) AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
-        array($MODE), __FUNCTION__, __LINE__);
+               array($MODE), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Load menu as selection
                $OUT = "<select name=\"".$MODE."_menu";
                if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
                $OUT .= "\" size=\"1\" class=\"admin_select\">
-       <option value=\"\">".SELECT_NONE."</option>\n";
+       <option value=\"\">{--SELECT_NONE--}</option>\n";
+               // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
                while (list($menu, $title) = SQL_FETCHROW($result)) {
                        $OUT .= "  <option value=\"".$menu."\"";
                        if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
@@ -607,7 +605,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
                $DATA_UPDATE = implode(", ", $DATA);
 
                // Generate SQL string
-               $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",
+               $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",
                        $tableName,
                        $DATA_UPDATE,
                        $whereStatement
@@ -626,7 +624,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
                $VALUEs = implode(", ", $VALUEs);
 
                // Generate SQL string
-               $SQL = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",
+               $sql = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",
                        $tableName,
                        $KEYs,
                        $VALUEs
@@ -637,10 +635,10 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
        SQL_FREERESULT($result);
 
        // Simply run generated SQL string
-       SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+       SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
        // Rebuild cache
-       REBUILD_CACHE("config", "config");
+       rebuildCacheFiles("config", "config");
 
        // Settings saved
        LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
@@ -652,7 +650,8 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
        $handle = opendir(sprintf("%sinc/modules/%s/", constant('PATH'), $menu)) or mxchange_die("Cannot load menu ".$menu."!");
 
        // Init the selection box
-       $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">\n <option value=\"\">{--IS_TOP_MENU--}</option>\n";
+       $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">
+       <option value=\"\">{--IS_TOP_MENU--}</option>\n";
 
        // Walk through all files
        while ($file = readdir($handle)) {
@@ -772,7 +771,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
                } // END - foreach
 
                // Output status
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_STATUS_CHANGED_1.$cnt.ADMIN_STATUS_CHANGED_2.count($IDs).ADMIN_STATUS_CHANGED_3);
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
        } else {
                // Nothing selected!
                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));
@@ -793,7 +792,7 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="")
        // Is the raw userid set?
        if (REQUEST_POST('uid_raw', $id) > 0) {
                // Generate subject
-               $subjectLine = constant('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+               $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
 
                // Load email template
                if (!empty($subjectPart)) {
@@ -807,7 +806,7 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="")
        } // END - if
 
        // Generate subject
-       $subjectLine = constant('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+       $subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
 
        // Send admin notification out
        if (!empty($subjectPart)) {
@@ -882,7 +881,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                // "Walk" through all entries
                foreach ($IDs as $id => $sel) {
                        // Construct SQL query
-                       $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET",
+                       $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET",
                                SQL_ESCAPE($table)
                        );
 
@@ -904,7 +903,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                                // Does the entry exist?
                                if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
                                        // Add these entries for update
-                                       $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+                                       $sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
 
                                        // Remember status
                                        if ($statusColumn == "unknown") {
@@ -926,10 +925,10 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                                        // Are there brackets () at the end?
                                        if (substr($entries[$id], -2, 2) == "()") {
                                                // Direct SQL command found
-                                               $SQL .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+                                               $sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
                                        } else {
                                                // Add regular entry
-                                               $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+                                               $sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
 
                                                // Add entry
                                                $content[$key] = $entries[$id];
@@ -938,7 +937,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                        } // END - foreach
 
                        // Finish SQL statement
-                       $SQL = substr($SQL, 0, -1) . sprintf(" WHERE %s=%s AND %s='%s' LIMIT 1",
+                       $sql = substr($sql, 0, -1) . sprintf(" WHERE %s=%s AND %s='%s' LIMIT 1",
                                $idColumn,
                                bigintval($id),
                                $statusColumn,
@@ -946,7 +945,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                        );
 
                        // Run the SQL
-                       SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+                       SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
                        // Do we have an URL?
                        if (isset($content['url'])) {
@@ -967,7 +966,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                // Shall we delete here or list for deletion?
                if ($deleteNow) {
                        // The base SQL command:
-                       $SQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";
+                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)";
 
                        // Delete them all
                        $idList = "";
@@ -993,7 +992,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                        } // END - foreach
 
                        // Run the query
-                       SQL_QUERY($SQL, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+                       SQL_QUERY($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
 
                        // Was this fine?
                        if (SQL_AFFECTEDROWS() == count($IDs)) {
@@ -1001,7 +1000,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
                                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
                        } else {
                                // Some are still there :(
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_DELETED, SQL_AFFECTEDROWS(), count($IDs)));
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
                        }
                } else {
                        // List for deletion confirmation
@@ -1023,7 +1022,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                                $content = array();
 
                                // Prepare SQL for this row
-                               $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET",
+                               $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET",
                                        SQL_ESCAPE($table)
                                );
                                foreach (REQUEST_POST_ARRAY() as $key => $entries) {
@@ -1045,7 +1044,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                                                } // END - if
 
                                                // Then add this value
-                                               $SQL .= sprintf(" %s='%s',",
+                                               $sql .= sprintf(" %s='%s',",
                                                        SQL_ESCAPE($key),
                                                        SQL_ESCAPE($entries[$id])
                                                );
@@ -1062,10 +1061,10 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                                } // END - foreach
 
                                // Finish SQL command
-                               $SQL = substr($SQL, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1";
+                               $sql = substr($sql, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1";
 
                                // Run this query
-                               SQL_QUERY($SQL, __FUNCTION__, __LINE__);
+                               SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
                                // Add affected rows
                                $affected += SQL_AFFECTEDROWS();
@@ -1091,7 +1090,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
                                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
                        } else {
                                // Some are still there :(
-                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_EDITED, $affected, count($IDs)));
+                               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
                        }
                } else {
                        // List for editing
@@ -1235,7 +1234,7 @@ function ADMIN_RESET_PASSWORD ($login, $password) {
                array($passHash, $login), __FUNCTION__, __LINE__);
 
        // Run filters
-       RUN_FILTER('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+       runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
 
        // Return output
        return ADMIN_PASSWORD_RESET_DONE;