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

Added allow_universal_login setting (login in to admin panel using main login form)

Browse source
This commit is contained in:
RainLoop Team 2014-10-03 00:22:06 +04:00
parent 81d3d40369
commit 79ad7ccd0b
5 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/App/Abstract.js
View file

@ -125,10 +125,17 @@
sTitle = ((Utils.isNormal(sTitle) && 0 < sTitle.length) ? sTitle + ' - ' : '') +
Settings.settingsGet('Title') || '';
window.document.title = '';
window.document.title = sTitle + ' ...';
window.document.title = sTitle;
};
AbstractApp.prototype.redirectToAdminPanel = function ()
{
_.delay(function () {
window.location.href = './?/Admin/';
}, 100);
};
/**
* @param {boolean=} bLogout = false
* @param {boolean=} bClose = false
@ -149,7 +156,8 @@
window.close();
}
if (bLogout && '' !== sCustomLogoutLink && window.location.href !== sCustomLogoutLink)
sCustomLogoutLink = sCustomLogoutLink || './';
if (bLogout && window.location.href !== sCustomLogoutLink)
{
_.delay(function () {
if (bInIframe && window.parent)

2
dev/View/Admin/Settings/Pane.js
View file

@ -37,7 +37,7 @@
PaneSettingsAdminView.prototype.logoutClick = function ()
{
Remote.adminLogout(function () {
require('App/Admin').loginAndLogoutReload();
require('App/Admin').loginAndLogoutReload(true);
});
};

4
dev/View/App/Login.js
View file

@ -128,6 +128,10 @@
this.submitRequest(false);
}
else if (oData.Admin)
{
require('App/App').redirectToAdminPanel();
}
else
{
require('App/App').loginAndLogoutReload();