]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/admin-inc.php
projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixes in changing URLs in surfbar extension. Resolves #40/#41
[mailer.git] / inc / modules / admin / admin-inc.php
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 95e56d6bd083f22aca29255c7a28f8a10ad9d3d1..e95bbe7e9e455496cf41e6c68af06da05276f488 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -83,8 +83,8 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                // Include more admins data?
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here
-                       $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$aid];
-                       $data['last_failture']   = $cacheArray['admins']['last_failture'][$aid];
+                       $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid];
+                       $data['last_failure']   = $cacheArray['admins']['last_failure'][$aid];
                } // END - if
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Add extra data via filter now
@@ -133,14 +133,14 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                $data['password'] = generateHash($password);
 
                // Do we have 0.7.0 of admins or later?
-               // Remmeber login failtures if available
-               if (GET_EXT_VERSION("admins") >= "0.7.0") {
+               // Remmeber login failures if available
+               if (GET_EXT_VERSION("admins") >= "0.7.2") {
                        // Store it in session
-                       set_session('mxchange_admin_failtures', $data['login_failtures']);
-                       set_session('mxchange_admin_last_fail', $data['last_failture']);
+                       set_session('mxchange_admin_failures', $data['login_failures']);
+                       set_session('mxchange_admin_last_fail', $data['last_failure']);
 
-                       // Update password and reset login failtures
-                       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
+                       // Update password and reset login failures
+                       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
                                array($data['password'], $aid), __FILE__, __LINE__);
                } else {
                        // Update password
@@ -170,10 +170,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                } // END - if
        }
 
-       // Count login failture if admins extension version is 0.7.0+
+       // Count login failure if admins extension version is 0.7.0+
        if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
                // Update counter
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=login_failtures+1,last_failture=NOW() WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
                        array($aid), __FILE__, __LINE__);
 
                // Rebuild cache
@@ -189,10 +189,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 function LOGIN_ADMIN ($adminLogin, $passHash) {
        global $cacheInstance;
 
-       // Reset failture counter on matching admins version
+       // Reset failure counter on matching admins version
        if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
                // Reset counter on out-dated sql_patches version
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
+               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
                        array($adminLogin), __FILE__, __LINE__);
 
                // Rebuild cache
@@ -352,7 +352,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
                if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
-                       include($INC);
+                       require($INC);
                } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
@@ -414,8 +414,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        $result_main = SQL_QUERY("SELECT action, title, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);
        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";
+               $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
+<tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
                {
                        if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
@@ -435,8 +435,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                        $menuTitle[$menu]      = $title;
                                        $menuDesription[$menu] = $descr;
                                }
-                               $OUT .= "<TR>
-       <TD class=\"admin_menu\" colspan=\"2\">
+                               $OUT .= "<tr>
+       <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>&middot;</strong>&nbsp;";
                                if (($menu == $act) && (empty($wht)))
                                {
@@ -455,18 +455,18 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                {
                                        $OUT .= "</a>]";
                                }
-                               $OUT .= "</NOBR></TD>
-</TR>\n";
+                               $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), __FILE__, __LINE__);
                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
                                        $menuDesription = array();
                                        $menuTitle = array(); $SUB = true;
-                                       $OUT .= "<TR>
-       <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
-       <TD class=\"admin_menu\">
-               <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+                                       $OUT .= "<tr>
+       <td width=\"10\" class=\"seperator\">&nbsp;</td>
+       <td class=\"admin_menu\">
+               <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
                                        while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
                                                // Filename
                                                $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub);
@@ -481,8 +481,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        // Insert compiled title and description
                                                        $menuTitle[$wht_sub]      = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
-                                                       $OUT .= "<TR>
-       <TD class=\"admin_menu\" colspan=\"2\">
+                                                       $OUT .= "<tr>
+       <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
                                                        if ($readable)
                                                        {
@@ -515,24 +515,24 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        {
                                                                $OUT .= "</em>";
                                                        }
-                                                       $OUT .= "</NOBR></TD>
-</TR>\n";
+                                                       $OUT .= "</NOBR></td>
+</tr>\n";
                                                }
                                        }
 
                                        // Free memory
                                        SQL_FREERESULT($result_what);
-                                       $OUT .= "    </TABLE>
-       </TD>
-</TR>\n";
+                                       $OUT .= "    </table>
+       </td>
+</tr>\n";
                                }
-                               $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
+                               $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
                        }
                }
 
                // Free memory
                SQL_FREERESULT($result_main);
-               $OUT .= "</TABLE>\n";
+               $OUT .= "</table>\n";
        }
 
        // Compile and run the code here. This inserts all constants into the
Mailer-Project repository