浏览代码

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

andryyy 4 年之前
父节点
当前提交
fa979456a7
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      data/web/inc/functions.mailbox.inc.php

+ 6 - 1
data/web/inc/functions.mailbox.inc.php

@@ -1054,7 +1054,12 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               );
               return false;
             }
-            $password_hashed = hash_password($password);
+            // support pre hashed passwords
+            if(preg_match('/^{SSHA256}|{SHA512-CRYPT}|{SSHA512}|{MD5-CRYPT}|{PLAIN-MD5}/i', $password)) {
+              $password_hashed = $password;
+            } else {
+              $password_hashed = hash_password($password);
+            }
           }
           else {
             $_SESSION['return'][] = array(