Use SNAPPYMAIL_INCLUDE_AS_API and added SSO test

This commit is contained in:
the-djmaze 2022-01-10 16:10:56 +01:00
parent dd6779b1a8
commit 7f084dda53
4 changed files with 29 additions and 8 deletions

View file

@ -661,8 +661,8 @@ class ServiceActions
$sEmail = \trim($aData['Email']);
$sPassword = $aData['Password'];
$aAdditionalOptions = isset($aData['AdditionalOptions']) && \is_array($aData['AdditionalOptions']) &&
\count($aData['AdditionalOptions']) ? $aData['AdditionalOptions'] : null;
$aAdditionalOptions = (isset($aData['AdditionalOptions']) && \is_array($aData['AdditionalOptions']))
? $aData['AdditionalOptions'] : [];
try
{

View file

@ -158,7 +158,7 @@ if (!defined('RAINLOOP_APP_LIBRARIES_PATH')) {
if (class_exists('RainLoop\\Api')) {
RainLoop\Api::Handle();
// NextCloud/OwnCloud?
if (empty($_ENV['RAINLOOP_INCLUDE_AS_API'])) {
if (empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API'])) {
RainLoop\Service::Handle();
exit(0);
}