Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 08:57:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #602

Browse source
This commit is contained in:
the-djmaze 2022-11-01 21:56:36 +01:00
parent 9f41f18d43
commit e3ffad8552
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
integrations/nextcloud/snappymail/lib/Controller/PageController.php
View file

@ -18,8 +18,18 @@ class PageController extends Controller
{ {
$config = \OC::$server->getConfig(); $config = \OC::$server->getConfig();
if ($config->getAppValue('snappymail', 'snappymail-embed')) { $bAdmin = false;
return static::index_embed(); if (!empty($_SERVER['QUERY_STRING'])) {
SnappyMailHelper::loadApp();
$bAdmin = \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin') == $_SERVER['QUERY_STRING'];
if (!$bAdmin) {
SnappyMailHelper::startApp(true);
return;
}
}
if ($bAdmin || $config->getAppValue('snappymail', 'snappymail-embed')) {
return static::index_embed($bAdmin);
} }
\OC::$server->getNavigationManager()->setActiveEntry('snappymail'); \OC::$server->getNavigationManager()->setActiveEntry('snappymail');
@ -72,18 +82,8 @@ class PageController extends Controller
/** /**
* Draft code to run without using an iframe * Draft code to run without using an iframe
*/ */
private static function index_embed() private static function index_embed(bool $bAdmin)
{ {
/*
$oConfig = \RainLoop\Api::Config();
$bAdmin = empty($_SERVER['QUERY_STRING']) || $oConfig->Get('security', 'admin_panel_key', 'admin') != $_SERVER['QUERY_STRING'];
*/
$bAdmin = !empty($_SERVER['QUERY_STRING']) && 'admin' == $_SERVER['QUERY_STRING'];
if (!$bAdmin && !empty($_SERVER['QUERY_STRING'])) {
SnappyMailHelper::startApp(true);
}
\OC::$server->getNavigationManager()->setActiveEntry('snappymail'); \OC::$server->getNavigationManager()->setActiveEntry('snappymail');
\OCP\Util::addStyle('snappymail', 'embed'); \OCP\Util::addStyle('snappymail', 'embed');

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

@ -17,6 +17,8 @@ class AdminSettings implements ISettings
public function getForm() public function getForm()
{ {
\OCA\SnappyMail\Util\SnappyMailHelper::loadApp();
$keys = [ $keys = [
'snappymail-autologin', 'snappymail-autologin',
'snappymail-autologin-with-email', 'snappymail-autologin-with-email',
@ -30,11 +32,12 @@ class AdminSettings implements ISettings
$uid = \OC::$server->getUserSession()->getUser()->getUID(); $uid = \OC::$server->getUserSession()->getUser()->getUID();
if (\OC_User::isAdminUser($uid)) { if (\OC_User::isAdminUser($uid)) {
// $parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin'; // $parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin';
SnappyMailHelper::loadApp();
$parameters['snappymail-admin-panel-link'] = $parameters['snappymail-admin-panel-link'] =
\OC::$server->getURLGenerator()->linkToRoute('snappymail.page.index').'?admin'; \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.index')
. '?' . \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin');
} }
\OCA\SnappyMail\Util\SnappyMailHelper::loadApp();
$oConfig = \RainLoop\Api::Config(); $oConfig = \RainLoop\Api::Config();
$passfile = APP_PRIVATE_DATA . 'admin_password.txt'; $passfile = APP_PRIVATE_DATA . 'admin_password.txt';
$sPassword = ''; $sPassword = '';