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

Update sogo-auth.php

4482aee7

André Peters <[email protected]> 7 years ago

data/web/sogo-auth.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Diff

diff --git a/data/web/sogo-auth.php b/data/web/sogo-auth.php
index 98cafac5..77c73590 100644
--- a/data/web/sogo-auth.php
+++ b/data/web/sogo-auth.php
@@ -1,10 +1,9 @@
 <?php
-require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 
 /**
- * currently disabled: we could add auth_request to ningx sogo_eas.template
- * but this seems to be not required with the postfix allow_real_nets option
- */
+* currently disabled: we could add auth_request to ningx sogo_eas.template
+* but this seems to be not required with the postfix allow_real_nets option
+*/
 /*
 if (substr($_SERVER['HTTP_X_ORIGINAL_URI'], 0, 28) === "/Microsoft-Server-ActiveSync") {
   require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
@@ -38,6 +37,7 @@ if (!$ALLOW_ADMIN_EMAIL_LOGIN) {
   exit;
 }
 elseif (isset($_GET['login'])) {
+  require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
   if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['acl']['login_as'] == "1") {
     $login = html_entity_decode(rawurldecode($_GET["login"]));
     if (filter_var($login, FILTER_VALIDATE_EMAIL)) {
@@ -53,9 +53,10 @@ elseif (isset($_GET['login'])) {
 }
 else {
   // this is an nginx auth_request call, we check for an existing sogo-sso-user session variable
+  session_start();
   $username = "";
   if (isset($_SESSION[$session_variable]) && filter_var($_SESSION[$session_variable], FILTER_VALIDATE_EMAIL)) {
-    $username = $_SESSION[$session_variable];
+      $username = $_SESSION[$session_variable];
   }
   // if username is empty, SOGo will display the normal login form
   header("X-Username: $username");