public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

Merge remote-tracking branch 'origin/staging' into fix/6469

5b89e253

FreddleSpl0it <[email protected]> 1 year, 2 months ago

data/conf/dovecot/auth/mailcowauth.php   |  4 +++-
 data/conf/dovecot/auth/passwd-verify.lua | 18 ++++++++++++++----
 data/conf/sogo/sogo.conf                 |  5 ++++-
 data/web/inc/triggers.user.inc.php       |  2 ++
 data/web/index.php                       |  2 +-
 data/web/lang/lang.zh-cn.json            |  5 +++--
 6 files changed, 27 insertions(+), 9 deletions(-)

Diff

diff --cc data/web/inc/triggers.user.inc.php
index 30bf0fe6,07dc0372..4dee75a3
--- a/data/web/inc/triggers.user.inc.php
+++ b/data/web/inc/triggers.user.inc.php
@@@ -76,9 -76,7 +76,10 @@@ if (isset($_POST["verify_tfa_login"])) 
  
          $user_details = mailbox("get", "mailbox_details", $_SESSION['mailcow_cc_username']);
          $is_dual = (!empty($_SESSION["dual-login"]["username"])) ? true : false;
 -        if (intval($user_details['attributes']['sogo_access']) == 1 && !$is_dual && getenv('SKIP_SOGO') != "y") {
 +        if (intval($user_details['attributes']['sogo_access']) == 1 &&
 +            intval($user_details['attributes']['force_pw_update']) != 1 &&
++            getenv('SKIP_SOGO') != "y" &&
 +            !$is_dual) {
            header("Location: /SOGo/so/{$_SESSION['mailcow_cc_username']}");
            die();
          } else {
@@@ -141,9 -139,7 +142,10 @@@ if (isset($_POST["login_user"]) && isse
  
      $user_details = mailbox("get", "mailbox_details", $login_user);
      $is_dual = (!empty($_SESSION["dual-login"]["username"])) ? true : false;
 -    if (intval($user_details['attributes']['sogo_access']) == 1 && !$is_dual && getenv('SKIP_SOGO') != "y") {
 +    if (intval($user_details['attributes']['sogo_access']) == 1 &&
 +        intval($user_details['attributes']['force_pw_update']) != 1 &&
++        getenv('SKIP_SOGO') != "y" &&
 +        !$is_dual) {
        header("Location: /SOGo/so/{$login_user}");
        die();
      } else {