From 1dbd9bda0ca7fafe1ccc0ec4e205b294372dc190 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 23 Feb 2023 09:04:44 +0100
Subject: [PATCH] Don't `exit;`

---
 snappymail/v/0.0.0/app/libraries/RainLoop/Service.php | 4 ++--
 snappymail/v/0.0.0/include.php                        | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 6a56a5c54..9087a547a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -40,7 +40,7 @@ abstract class Service
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
 		if ($oConfig->Get('security', 'force_https', false) && !$oHttp->IsSecure()) {
 			\header('Location: https://'.$oHttp->GetHost(false).$oHttp->GetUrl());
-			exit;
+			return true;
 		}
 
 		// See https://github.com/kjdev/php-ext-brotli
@@ -140,7 +140,7 @@ abstract class Service
 				$login = $oConfig->Get('labs', 'custom_login_link', '');
 				if ($login && !$oActions->getAccountFromToken(false)) {
 					\header("Location: {$login}");
-					exit;
+					return true;
 				}
 			}
 
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index a0eeec9cc..8e4d71db0 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -139,7 +139,6 @@ if (!empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-remote')) {
 	require __DIR__ . '/cpanel.php';
 }
 
-if (class_exists('RainLoop\\Api') && empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
+if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
 	RainLoop\Service::Handle();
-	exit;
 }