Admin login fixes

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 3cdabf7e3e09ff0c32816a90d0a133e6ad209b27..df26e508c0730adf8d2c8e126598453a39ce78e5 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1800,8 +1800,8 @@ function generateHash($plainText, $salt = "") {
 
        // Is the required extension "sql_patches" there?
        if ((GET_EXT_VERSION("sql_patches") < "0.3.6") || (GET_EXT_VERSION("sql_patches") == "")) {
-               // Extension sql_patches is missing/outdated so we return the plain text
-               return $plainText;
+               // Extension sql_patches is missing/outdated so we return only the regular SHA1 hash
+               return sha1($plainText);
        }
 
        // When the salt is empty build a new one, else use the first x configured characters as the salt
@@ -2051,6 +2051,7 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 // Unset/set session variables
 function set_session ($var, $value) {
        global $CSS;
+
        // Abort in CSS mode here
        if ($CSS == 1) return true;
 
@@ -2079,7 +2080,9 @@ function set_session ($var, $value) {
 // Taken from user comments in PHP documentation for function constant()
 function isBooleanConstantAndTrue($constname) { // : Boolean
        $res = false;
-       if (defined($constname)) $res = (constant($constname) === true);
+       if (defined($constname)) {
+               $res = (constant($constname) === true);
+       }
        return($res);
 }