From 5152e9a75e6e0ed4dc26358e4e608ce684147b32 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 26 Apr 2016 03:01:50 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/login/index.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 6d473f8..a1da652 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -209,7 +209,8 @@
$user = $app->db->toLower($user);
if ($loginAs) $oldSession = $_SESSION['s'];
- if (!$loginAs) session_regenerate_id(true);
+ // Session regenerate causes login problems on some systems, have to find a better way. see Issue #3827
+ //if (!$loginAs) session_regenerate_id(true);
$_SESSION = array();
if ($loginAs) $_SESSION['s_old'] = $oldSession; // keep the way back!
$_SESSION['s']['user'] = $user;
@@ -260,7 +261,7 @@
echo 'LOGIN_REDIRECT:'.$_SESSION['s']['module']['startpage'];
exit;
} else {
- header('Location: /index.php');
+ header('Location: ../index.php');
die();
}
}
@@ -341,7 +342,9 @@
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
// Title
-$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+if (!empty($sys_config['company_name'])) {
+ $app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
+}
// Custom Login
if ($sys_config['custom_login_text'] != '') {
--
Gitblit v1.9.1