From 88fbc6bf1675957ce40642fe62e56f4d2ce20529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Sat, 23 Feb 2019 22:26:41 +0100
Subject: [PATCH] Update sogo-auth.php

Consistency again. :)

I moved the prerequisites require_once to the top, ok?
---
 data/web/sogo-auth.php | 85 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/data/web/sogo-auth.php b/data/web/sogo-auth.php
index 15cbeab8..98cafac5 100644
--- a/data/web/sogo-auth.php
+++ b/data/web/sogo-auth.php
@@ -1,4 +1,5 @@
 <?php
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 
 /**
  * currently disabled: we could add auth_request to ningx sogo_eas.template
@@ -6,57 +7,57 @@
  */
 /*
 if (substr($_SERVER['HTTP_X_ORIGINAL_URI'], 0, 28) === "/Microsoft-Server-ActiveSync") {
-    require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
+  require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
 
-    $server=print_r($_SERVER, true);
-    $username = $_SERVER['PHP_AUTH_USER'];
-    $password = $_SERVER['PHP_AUTH_PW'];
-    $login_check = check_login($username, $password);
-    if ($login_check !== 'user') {
-        header('HTTP/1.0 401 Unauthorized');
-        echo 'Invalid login';
-        exit;
-    } else {
-        echo 'Login OK';
-        exit;
-    }
+  $server=print_r($_SERVER, true);
+  $username = $_SERVER['PHP_AUTH_USER'];
+  $password = $_SERVER['PHP_AUTH_PW'];
+  $login_check = check_login($username, $password);
+  if ($login_check !== 'user') {
+      header('HTTP/1.0 401 Unauthorized');
+      echo 'Invalid login';
+      exit;
+  } else {
+      echo 'Login OK';
+      exit;
+  }
 } else {
-    // other code
+  // other code
 }
 */
 
 $ALLOW_ADMIN_EMAIL_LOGIN = (preg_match(
-    "/^([yY][eE][sS]|[yY])+$/",
-    $_ENV["ALLOW_ADMIN_EMAIL_LOGIN"]
+  "/^([yY][eE][sS]|[yY])+$/",
+  $_ENV["ALLOW_ADMIN_EMAIL_LOGIN"]
 ));
 
 $session_variable = 'sogo-sso-user';
 
 if (!$ALLOW_ADMIN_EMAIL_LOGIN) {
-    header("Location: /");
-    exit;
-} else if (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)) {
-            if (!empty(mailbox('get', 'mailbox_details', $login))) {
-                $_SESSION[$session_variable] = $login;
-                header("Location: /SOGo/");
-                exit;
-            }
-        }
-    }
-    header("Location: /");
-    exit;
-} 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];
-    }
-    // if username is empty, SOGo will display the normal login form
-    header("X-Username: $username");
-    exit;
+  header("Location: /");
+  exit;
+}
+elseif (isset($_GET['login'])) {
+  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)) {
+      if (!empty(mailbox('get', 'mailbox_details', $login))) {
+        $_SESSION[$session_variable] = $login;
+        header("Location: /SOGo/");
+        exit;
+      }
+    }
+  }
+  header("Location: /");
+  exit;
+}
+else {
+  // this is an nginx auth_request call, we check for an existing sogo-sso-user session variable
+  $username = "";
+  if (isset($_SESSION[$session_variable]) && filter_var($_SESSION[$session_variable], FILTER_VALIDATE_EMAIL)) {
+    $username = $_SESSION[$session_variable];
+  }
+  // if username is empty, SOGo will display the normal login form
+  header("X-Username: $username");
+  exit;
 }