X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=a5a92f5ecfbdefd42ee0cd601595e16afbe1a21c;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=f55c9a396a70d70b13db32e2ce2794b95f016a56;hpb=ed930d1133b51edc7ec2379d91286d64afd9bc4f;p=mailer.git diff --git a/inc/functions.php b/inc/functions.php index f55c9a396a..a5a92f5ecf 100644 --- 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));