Some fixes for password scrambling.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/functions.php b/inc/functions.php
index f55c9a396a70d70b13db32e2ce2794b95f016a56..a5a92f5ecfbdefd42ee0cd601595e16afbe1a21c 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -832,14 +832,17 @@ function scrambleString ($str) {
        if (strlen($str) > 40) {
                // The string is to long
                return $str;
-       } elseif (strlen($str) == 40) {
+       } elseif ((strlen($str) == 40) && (getPassScramble() != '')) {
                // From database
-               $scrambleNums = explode(':', getPassScramble());
+               $scramble = getPassScramble();
        } else {
                // Generate new numbers
-               $scrambleNums = explode(':', genScrambleString(strlen($str)));
+               $scramble = genScrambleString(strlen($str));
        }
 
+       // Convert it into an array
+       $scrambleNums = explode(':', $scramble);
+
        // Assert on both lengths
        assert(strlen($str) == count($scrambleNums));