gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-15 22:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync with 5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-04-07 08:30:25 +02:00
parent 2c14ec295a
commit 17fc1d7dd4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/inc.Authentication.php
View File

@ -61,10 +61,17 @@ if (!is_object($user)) {
if($user->isAdmin()) { if($user->isAdmin()) {
if($resArr["su"]) { if($resArr["su"]) {
$user = $dms->getUser($resArr["su"]); $user = $dms->getUser($resArr["su"]);
} else {
$session->resetSu();
} }
} }
$theme = $resArr["theme"];
$lang = $resArr["language"];
$dms->setUser($user); $dms->setUser($user);
$notifier = new SeedDMS_NotificationService(); $notifier = new SeedDMS_NotificationService();
if($settings->_enableEmail) { if($settings->_enableEmail) {
$notifier->addService(new SeedDMS_EmailNotify($dms)); $notifier->addService(new SeedDMS_EmailNotify($dms));
} }
@ -82,9 +89,8 @@ if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang
} }
*/ */
$theme = $resArr["theme"]; if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc")) {
if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc")) { include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
include $settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc";
} }
/* Check if password needs to be changed because it expired. If it needs /* Check if password needs to be changed because it expired. If it needs