the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 07:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Force Nextcloud personal language by default #1428

Browse source
This commit is contained in:
the-djmaze 2024-08-27 16:20:39 +02:00
parent 1ac4f05d91
commit 5e4520e10c
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
integrations/nextcloud/snappymail/lib/Controller/FetchController.php
View file

@ -61,11 +61,15 @@ class FetchController extends Controller {
]);
}
SnappyMailHelper::loadApp();
$oConfig = \RainLoop\Api::Config();
if (!empty($_POST['snappymail-app_path'])) {
$oConfig = \RainLoop\Api::Config();
$oConfig->Set('webmail', 'app_path', $_POST['snappymail-app_path']);
$oConfig->Save();
}
$oConfig->Set('webmail', 'allow_languages_on_settings', empty($_POST['snappymail-nc-lang']));
$oConfig->Set('login', 'allow_languages_on_login', empty($_POST['snappymail-nc-lang']));
$oConfig->Save();
if (!empty($_POST['import-rainloop'])) {
return new JSONResponse([
@ -74,7 +78,6 @@ class FetchController extends Controller {
]);
}
SnappyMailHelper::loadApp();
$debug = !empty($_POST['snappymail-debug']);
$oConfig = \RainLoop\Api::Config();
if ($debug != $oConfig->Get('debug', 'enable', false)) {
@ -133,7 +136,7 @@ class FetchController extends Controller {
// TODO: Handle both exceptions separately?
SnappyMailHelper::loadApp();
\RainLoop\Api::Actions()->DoLogout();
return new JSONResponse([
'status' => 'error',
'Message' => $e->getMessage()

2
integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
View file

@ -54,6 +54,8 @@ class InstallStep implements IRepairStep
if (!$oConfig->Get('webmail', 'app_path')) {
$output->info('Set config [webmail]app_path');
$oConfig->Set('webmail', 'app_path', \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/');
$oConfig->Set('webmail', 'allow_languages_on_settings', false);
$oConfig->Set('login', 'allow_languages_on_login', false);
$bSave = true;
}

1
integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
View file

@ -71,6 +71,7 @@ class AdminSettings implements ISettings
$oConfig->Save();
}
$parameters['snappymail-app_path'] = $oConfig->Get('webmail', 'app_path', false);
$parameters['snappymail-nc-lang'] = !$oConfig->Get('webmail', 'allow_languages_on_settings', true);
\OCP\Util::addScript('snappymail', 'snappymail');
return new TemplateResponse('snappymail', 'admin-local', $parameters);

7
integrations/nextcloud/snappymail/templates/admin-local.php
View file

@ -71,6 +71,13 @@
<br />
<?php } ?>
<p>
<input id="snappymail-nc-lang" name="snappymail-nc-lang" type="checkbox" class="checkbox" <?php if ($_['snappymail-nc-lang']) echo 'checked="checked"'; ?>>
<label for="snappymail-nc-lang">
<?php echo($l->t('Force Nextcloud personal language')); ?>
</label>
</p>
<br />
<p>
<label for="snappymail-app_path">
<?php echo($l->t('app_path')); ?>