- Login failtures now counted and displayed after login in admin/member area

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 6f5abbff722993c6df4441b34c4b1128446a96d9..4733b66422ba70a677c7b9a6eeb43bbb011604d6 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -899,7 +899,7 @@ function LOAD_URL($URL, $addUrlData=true) {
                print("<pre>");
                debug_print_backtrace();
                die("</pre>URL={$URL}");
-               */
+               /**/
                @header ("Location: ".str_replace("&amp;", "&", $URL));
        } else {
                // Output error message
@@ -1940,11 +1940,11 @@ function generateHash ($plainText, $salt = "") {
 
                // Generate SHA1 sum from modula of number and the prime number
                $sha1 = sha1(($a % _PRIME).$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a);
-               //* DEBUG: */ echo "SHA1=".$sha1." (".strlen($sha1).")<br>";
+               //* DEBUG: */ echo "SHA1=".$sha1." (".strlen($sha1).")<br />";
                $sha1 = scrambleString($sha1);
-               //* DEBUG: */ echo "Scrambled=".$sha1." (".strlen($sha1).")<br>";
+               //* DEBUG: */ echo "Scrambled=".$sha1." (".strlen($sha1).")<br />";
                //* DEBUG: */ $sha1b = descrambleString($sha1);
-               //* DEBUG: */ echo "Descrambled=".$sha1b." (".strlen($sha1b).")<br>";
+               //* DEBUG: */ echo "Descrambled=".$sha1b." (".strlen($sha1b).")<br />";
 
                // Generate the password salt string
                $salt = substr($sha1, 0, $_CONFIG['salt_length']);
@@ -2097,12 +2097,12 @@ function generatePassString($passHash) {
                        }
                        $mod = substr(round($mod), 0, 4);
                        $mod = str_repeat('0', 4-strlen($mod)).$mod;
-                       //* DEBUG: */ echo "*".$start."=".$mod."*<br>";
+                       //* DEBUG: */ echo "*".$start."=".$mod."*<br />";
                        $start += 4;
                        $newHash .= $mod;
                } // END - for
 
-               //* DEBUG: */ print($passHash."<br>".$newHash." (".strlen($newHash).")");
+               //* DEBUG: */ print($passHash."<br />".$newHash." (".strlen($newHash).")");
                $ret = generateHash($newHash, $_CONFIG['master_salt']);
                //* DEBUG: */ print($ret."<br />\n");
        } else {
@@ -2196,28 +2196,43 @@ function set_session ($var, $value) {
                return session_register($var);
        } elseif (!empty($value)) {
                // Update session
+               //* DEBUG: */ echo "UPDATE:".$var."=".$value."<br />\n";
                $_SESSION[$var] = $value;
-       } else {
-               // Something bad happens!
-               return false; // Hope this doesn't make so much trouble???
+               return true;
        }
 
-       // Return always true if the session variable is already set.
-       // Keept me busy for a longer while...
+       // Ignored (but valid)
        //* DEBUG: */ echo "IGNORED:".$var."=".$value."<br />\n";
        return true;
 }
 
 // Check wether a boolean constant is set
 // Taken from user comments in PHP documentation for function constant()
-function isBooleanConstantAndTrue($constname) { // : Boolean
+function isBooleanConstantAndTrue($constName) { // : Boolean
+       global $constCache;
+
+       // Failed by default
        $res = false;
-       if (defined($constname)) $res = (constant($constname) === true);
-       return($res);
+
+       // In cache?
+       if (isset($constCache[$constName])) {
+               // Use cache
+               $res = $constCache[$constName];
+       } else {
+               // Check constant
+               if (defined($constName)) $res = (constant($constName) === true);
+
+               // Set cache
+               $constCache[$constName] = $res;
+       }
+
+       // Return value
+       return $res;
 }
 
 // Check wether a session variable is set
 function isSessionVariableSet($var) {
+       //* DEBUG: */ echo __FUNCTION__.":var={$var}<br />\n";
        return (isset($_SESSION[$var]));
 }
 // Returns wether the value of the session variable or NULL if not set
@@ -2446,6 +2461,53 @@ function REVERT_COMMA ($str) {
        // Return float
        return $float;
 }
+// Handle menu-depending failed logins and return the rendered content
+function HANDLE_LOGIN_FAILTURES ($accessLevel) {
+       // Default output is empty ;-)
+       $OUT = "";
+
+       // Is the session data set?
+       if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failtures')) && (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
+                       //* DEBUG: */ echo __FUNCTION__.":accessLevel={$accessLevel}<br />\n";
+                       $content = array(
+                               'login_failtures' => get_session('mxchange_'.$accessLevel.'_failtures'),
+                               'last_failture'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
+                       );
+
+                       // Load template
+                       $OUT = LOAD_TEMPLATE("login_failtures", true, $content);
+               } // END - if
+
+               // Reset session data
+               set_session('mxchange_'.$accessLevel.'_failtures', "");
+               set_session('mxchange_'.$accessLevel.'_last_fail', "");
+       } // END - if
+
+       // Return rendered content
+       return $OUT;
+}
+// Rebuild cache
+function REBUILD_CACHE ($cache, $inc="") {
+       global $cacheInstance;
+
+       // Shall I remove the cache file?
+       if ((EXT_IS_ACTIVE("cache")) && (is_object($cacheInstance))) {
+               // Rebuild cache
+               if ($cacheInstance->cache_file("admins", true)) {
+                       // Destroy it
+                       $cacheInstance->cache_destroy();
+
+                       // Include file given?
+                       if (!empty($inc)) {
+                               // And rebuild it from scratch
+                               require_once(PATH."inc/loader/load_cache-".$inc.".php");
+                       } // END - if
+               } // END - if
+       } // END - if
+}
 //
 //////////////////////////////////////////////////
 //                                              //