diff --git a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php index ee8122357..af0dcd8fd 100644 --- a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php +++ b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php @@ -61,6 +61,12 @@ class FetchController extends Controller { ]); } + if (!empty($_POST['snappymail-app_path'])) { + $oConfig = \RainLoop\Api::Config(); + $oConfig->Set('webmail', 'app_path', $_POST['snappymail-app_path']); + $oConfig->Save(); + } + if (!empty($_POST['import-rainloop'])) { return new JSONResponse([ 'status' => 'success', diff --git a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php index 052d5e877..82264bfba 100644 --- a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php +++ b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php @@ -62,6 +62,16 @@ class AdminSettings implements ISettings } } + // Prevent "Failed loading /nextcloud/snappymail/v/2.N.N/static/js/min/libs.min.js" + $app_path = $oConfig->Get('webmail', 'app_path'); + if (!$app_path) { + $app_path = \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/'; + $oConfig->Set('webmail', 'app_path', $app_path); + $oConfig->Set('webmail', 'theme', 'NextcloudV25+'); + $oConfig->Save(); + } + $parameters['snappymail-app_path'] = $oConfig->Get('webmail', 'app_path', false); + \OCP\Util::addScript('snappymail', 'snappymail'); return new TemplateResponse('snappymail', 'admin-local', $parameters); } diff --git a/integrations/nextcloud/snappymail/templates/admin-local.php b/integrations/nextcloud/snappymail/templates/admin-local.php index 8fd72a4ac..abbc7f7d0 100644 --- a/integrations/nextcloud/snappymail/templates/admin-local.php +++ b/integrations/nextcloud/snappymail/templates/admin-local.php @@ -70,6 +70,15 @@


+ +

+ + style="width:20em"> +

+
+