From 864fac0de510267e10400567b693f9bc272b60f5 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sun, 30 Jun 2013 19:25:29 -0700
Subject: [PATCH] Some improvements to the 'Fix for the Open in New Window in
 Patient/Client->Patients search gui' Fix at commit ed9c51d

---
 interface/login/login.php      | 2 ++
 interface/main/main_screen.php | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/interface/login/login.php b/interface/login/login.php
index fdc25ad2c..1f00326eb 100644
--- a/interface/login/login.php
+++ b/interface/login/login.php
@@ -65,6 +65,8 @@ function imsubmitted() {
  action="../main/main_screen.php?auth=login&site=<?php echo attr($_SESSION['site_id']); ?>"
  target="_top" name="login_form" onsubmit="return imsubmitted();">
 
+<input type='hidden' name='new_login_session_management' value='1' />
+
 <?php
 // collect groups
 $res = sqlStatement("select distinct name from groups");
diff --git a/interface/main/main_screen.php b/interface/main/main_screen.php
index 982b1322a..41ce17e2b 100644
--- a/interface/main/main_screen.php
+++ b/interface/main/main_screen.php
@@ -32,7 +32,14 @@ require_once("$srcdir/formdata.inc.php");
 // session cookie for this specific OpenEMR instance that is then maintained
 // within the OpenEMR instance by calling top.restoreSession() whenever
 // refreshing or starting a new script.
-session_regenerate_id();
+if (isset($_POST['new_login_session_management'])) {
+  // This is a new login, so create a new session id and remove the old session
+  session_regenerate_id(true);
+}
+else {
+  // This is not a new login, so create a new session id and do NOT remove the old session
+  session_regenerate_id(false);
+}
 
 $_SESSION["encounter"] = '';
 
-- 
2.11.4.GIT