From b3a0504e7ab2c85c08245887f1ee08499e1450c0 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sat, 29 Jun 2013 19:43:29 -0700
Subject: [PATCH] More session fixes

---
 custom/chart_tracker.php                           |  2 +-
 interface/batchcom/batchcom.php                    | 21 +++++++++++++-
 interface/main/authorizations/authorizations.php   | 28 +++++++++++++++----
 .../main/authorizations/authorizations_full.php    | 22 +++++++++++++--
 interface/main/finder/patient_select.php           | 27 ++++++++++++++----
 interface/main/onotes/office_comments.php          |  4 +--
 interface/main/onotes/office_comments_full.php     | 22 +++++++--------
 interface/reports/patient_edu_web_lookup.php       | 32 ++++++++++++++++------
 interface/usergroup/addrbook_list.php              |  2 +-
 9 files changed, 122 insertions(+), 38 deletions(-)

diff --git a/custom/chart_tracker.php b/custom/chart_tracker.php
index cf8149165..7fe1e5ac2 100644
--- a/custom/chart_tracker.php
+++ b/custom/chart_tracker.php
@@ -75,7 +75,7 @@ echo "<span class='title'>" . xlt('Chart Tracker') . "</span>\n";
 
 <center>
 &nbsp;<br />
-<form method='post' action='chart_tracker.php'>
+<form method='post' action='chart_tracker.php' onsubmit='return top.restoreSession()'>
 
 <?php
 // This is the place for status messages.
diff --git a/interface/batchcom/batchcom.php b/interface/batchcom/batchcom.php
index 450d09add..3c548b18c 100644
--- a/interface/batchcom/batchcom.php
+++ b/interface/batchcom/batchcom.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * Batchcom script.
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Brady Miller <brady@sparmy.com>
+ * @link    http://www.open-emr.org
+ */
+
 //INCLUDES, DO ANY ACTIONS, THEN GET OUR DATA
 include_once("../globals.php");
 include_once("$srcdir/registry.inc");
@@ -167,7 +186,7 @@ if ($_POST['form_action']=='Process') {
 
 <!-- for the popup date selector -->
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
-<FORM name="select_form" METHOD=POST ACTION="">
+<FORM name="select_form" METHOD=POST ACTION="" onsubmit='return top.restoreSession()'>
 <div class="text">
 <div class="main_box">
     <table class="table" ><tr><td >
diff --git a/interface/main/authorizations/authorizations.php b/interface/main/authorizations/authorizations.php
index 56b846246..bf87ed044 100644
--- a/interface/main/authorizations/authorizations.php
+++ b/interface/main/authorizations/authorizations.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * Authorizations script.
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Brady Miller <brady@sparmy.com>
+ * @link    http://www.open-emr.org
+ */
 
 //SANITIZE ALL ESCAPES
 $sanitize_all_escapes=true;
@@ -73,7 +91,7 @@ if (isset($_GET["mode"]) && $_GET["mode"] == "authorize" && $imauthorized) {
 <?php if ($imauthorized) { ?>
 <span class='title'>
 <?php if ($GLOBALS['concurrent_layout']) { ?>
-<a href='authorizations_full.php'>
+<a href='authorizations_full.php' onclick='top.restoreSession()'>
 <?php } else { ?>
 <a href='authorizations_full.php' target='Main'>
 <?php } ?>
@@ -181,7 +199,7 @@ if ($authorize) {
     if ($count >= $N) {
       print "<tr><td colspan='5' align='center'><a" .
         ($GLOBALS['concurrent_layout'] ? "" : " target='Main'") .
-        " href='authorizations_full.php?active=1' class='alert'>" .
+        " href='authorizations_full.php?active=1' class='alert' onclick='top.restoreSession()'>" .
         htmlspecialchars(xl('Some authorizations were not displayed. Click here to view all'),ENT_NOQUOTES) .
         "</a></td></tr>\n";
       break;
@@ -193,16 +211,16 @@ if ($authorize) {
       // as demographics.php takes care of loading the bottom frame.
 
         echo "<a href='$rootdir/patient_file/summary/demographics.php?set_pid=" .
-	  htmlspecialchars($ppid,ENT_QUOTES) . "' target='RTop'>";
+	  htmlspecialchars($ppid,ENT_QUOTES) . "' target='RTop' onclick='top.restoreSession()'>";
 
     } else {
       echo "<a href='$rootdir/patient_file/patient_file.php?set_pid=" .
-	htmlspecialchars($ppid,ENT_QUOTES) . "' target='_top'>";
+	htmlspecialchars($ppid,ENT_QUOTES) . "' target='_top' onclick='top.restoreSession()'>";
     }
     echo "<span class='bold'>" . htmlspecialchars($name{"fname"},ENT_NOQUOTES) . " " .
       htmlspecialchars($name{"lname"},ENT_NOQUOTES) . "</span></a><br>" .
       "<a class=link_submit href='authorizations.php?mode=authorize" .
-      "&pid=" . htmlspecialchars($ppid,ENT_QUOTES) . "'>" .
+      "&pid=" . htmlspecialchars($ppid,ENT_QUOTES) . "' onclick='top.restoreSession()'>" .
       htmlspecialchars(xl('Authorize'),ENT_NOQUOTES) . "</a></td>\n";
 
     /****
diff --git a/interface/main/authorizations/authorizations_full.php b/interface/main/authorizations/authorizations_full.php
index b61c5c097..f80e25a45 100644
--- a/interface/main/authorizations/authorizations_full.php
+++ b/interface/main/authorizations/authorizations_full.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * Authorizations full script.
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Brady Miller <brady@sparmy.com>
+ * @link    http://www.open-emr.org
+ */
 
 //SANITIZE ALL ESCAPES
 $sanitize_all_escapes=true;
@@ -28,7 +46,7 @@ sqlStatement("update transactions set authorized=1 where pid=?", array($_GET["pi
 <body class="body_top">
 
 <?php if ($GLOBALS['concurrent_layout']) { ?>
-<a href="authorizations.php">
+<a href="authorizations.php" onclick='top.restoreSession()'>
 <?php } else { ?>
 <a href="../main.php" target=Main>
 <?php } ?>
@@ -124,7 +142,7 @@ while(list($ppid,$patient) = each($authorize)){
 	
 	echo "<tr><td valign=top><span class=bold>". htmlspecialchars($name{"fname"} . " " . $name{"lname"},ENT_NOQUOTES) .
              "</span><br><a class=link_submit href='authorizations_full.php?mode=authorize&pid=" .
-             htmlspecialchars($ppid,ENT_QUOTES) . "'>" . htmlspecialchars(xl('Authorize'),ENT_NOQUOTES) . "</a></td>\n";
+             htmlspecialchars($ppid,ENT_QUOTES) . "' onclick='top.restoreSession()'>" . htmlspecialchars(xl('Authorize'),ENT_NOQUOTES) . "</a></td>\n";
 	echo "<td valign=top><span class=bold>".htmlspecialchars(xl('Billing'),ENT_NOQUOTES).
              ":</span><span class=text><br>" . $patient{"billing"} . "</td>\n";
 	echo "<td valign=top><span class=bold>".htmlspecialchars(xl('Transactions'),ENT_NOQUOTES).
diff --git a/interface/main/finder/patient_select.php b/interface/main/finder/patient_select.php
index eb01e9c9b..34499e5a5 100644
--- a/interface/main/finder/patient_select.php
+++ b/interface/main/finder/patient_select.php
@@ -1,8 +1,22 @@
 <?php
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+/**
+ * Patient selector screen.
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Brady Miller <brady@sparmy.com>
+ * @link    http://www.open-emr.org
+ */
 
 //SANITIZE ALL ESCAPES
 $sanitize_all_escapes=true;
@@ -100,6 +114,7 @@ function submitList(offset) {
  var i = parseInt(f.fstart.value) + offset;
  if (i < 0) i = 0;
  f.fstart.value = i;
+ top.restoreSession();
  f.submit();
 }
 
@@ -108,7 +123,7 @@ function submitList(offset) {
 </head>
 <body class="body_top">
 
-<form method='post' action='patient_select.php' name='theform'>
+<form method='post' action='patient_select.php' name='theform' onsubmit='return top.restoreSession()'>
 <input type='hidden' name='fstart'  value='<?php echo htmlspecialchars( $fstart, ENT_QUOTES); ?>' />
 
 <?php
@@ -208,7 +223,7 @@ else {
 <table border='0' cellpadding='5' cellspacing='0' width='100%'>
  <tr>
   <td class='text'>
-   <a href="./patient_select_help.php" target=_new>[<?php echo htmlspecialchars( xl('Help'), ENT_NOQUOTES); ?>]&nbsp</a>
+   <a href="./patient_select_help.php" target=_new onclick='top.restoreSession()'>[<?php echo htmlspecialchars( xl('Help'), ENT_NOQUOTES); ?>]&nbsp</a>
   </td>
   <td class='text' align='center'>
 <?php if ($message) echo "<font color='red'><b>".htmlspecialchars( $message, ENT_NOQUOTES)."</b></font>\n"; ?>
diff --git a/interface/main/onotes/office_comments.php b/interface/main/onotes/office_comments.php
index b9a4ed8d0..96db39526 100644
--- a/interface/main/onotes/office_comments.php
+++ b/interface/main/onotes/office_comments.php
@@ -34,7 +34,7 @@ $N = 10;
 <body class="body_top">
 
 <div id="officenotes_list">
-<a href="office_comments_full.php" <?php if (!$GLOBALS['concurrent_layout']) echo 'target="Main"'; ?>>
+<a href="office_comments_full.php" onclick='top.restoreSession()' <?php if (!$GLOBALS['concurrent_layout']) echo 'target="Main"'; ?>>
 <font class="title"><?php echo xlt('Office Notes'); ?></font>
 <font class="more"><?php echo text($tmore);?></font></a>
 
@@ -51,7 +51,7 @@ $notes_count = 0;//number of notes so far displayed
 foreach ($result as $iter) {
     if ($notes_count >= $N) {
         //we have more active notes to print, but we've reached our display maximum (defined at top of this file)
-        print "<tr><td colspan=3 align=center><a target=Main href='office_comments_full.php?active=1' class='alert'>".xlt("Some office notes were not displayed. Click here to view all.")."</a></td></tr>\n";
+        print "<tr><td colspan=3 align=center><a target=Main href='office_comments_full.php?active=1' class='alert' onclick='top.restoreSession()'>".xlt("Some office notes were not displayed. Click here to view all.")."</a></td></tr>\n";
         break;
     }
     
diff --git a/interface/main/onotes/office_comments_full.php b/interface/main/onotes/office_comments_full.php
index f802f1299..133d58644 100644
--- a/interface/main/onotes/office_comments_full.php
+++ b/interface/main/onotes/office_comments_full.php
@@ -54,7 +54,7 @@ if (isset($_POST['mode'])) {
 
 <div id="officenotes_edit">
 
-<form method="post" name="new_note" action="office_comments_full.php">
+<form method="post" name="new_note" action="office_comments_full.php" onsubmit='return top.restoreSession()'>
 
 <?php
 /* BACK should go to the main Office Notes screen */
@@ -63,7 +63,7 @@ else { $backurl="../main_info.php"; }
 ?>
 
 <?php if ($GLOBALS['concurrent_layout']) { ?>
-<a href="office_comments.php">
+<a href="office_comments.php" onclick='top.restoreSession()'>
 <?php } else { ?>
 <a href="<?php echo $backurl; ?>" target="Main">
 <?php } ?>
@@ -78,12 +78,12 @@ else { $backurl="../main_info.php"; }
 
 <textarea name="note" rows="6" cols="40" wrap="virtual"></textarea>
 <br>
-<a href="javascript:document.new_note.submit();" class="link_submit">[<?php echo xlt('Add New Note'); ?>]</a>
+<a href="javascript:top.restoreSession();document.new_note.submit();" class="link_submit">[<?php echo xlt('Add New Note'); ?>]</a>
 </form>
 
 <br/>
 
-<form method="post" name="update_activity" action="office_comments_full.php">
+<form method="post" name="update_activity" action="office_comments_full.php" onsubmit='return top.restoreSession()'>
 
 <?php //change the view on the current mode, whether all, active, or inactive
 $all_class="link"; $active_class="link"; $inactive_class="link";
@@ -93,15 +93,15 @@ elseif ($active==0) { $inactive_class="link_selected"; }
 ?>
 
 <span class="text"><?php echo xlt('View:'); ?> </span> 
-<a href="office_comments_full.php?offset=0&active=all" class="<?php echo attr($all_class);?>">[<?php echo xlt('All'); ?>]</a>
-<a href="office_comments_full.php?offset=0&active=1" class="<?php echo attr($active_class);?>">[<?php echo xlt('Only Active'); ?>]</a>
-<a href="office_comments_full.php?offset=0&active=0" class="<?php echo attr($inactive_class);?>">[<?php echo xlt('Only Inactive'); ?>]</a>
+<a href="office_comments_full.php?offset=0&active=all" class="<?php echo attr($all_class);?>" onclick='top.restoreSession()'>[<?php echo xlt('All'); ?>]</a>
+<a href="office_comments_full.php?offset=0&active=1" class="<?php echo attr($active_class);?>" onclick='top.restoreSession()'>[<?php echo xlt('Only Active'); ?>]</a>
+<a href="office_comments_full.php?offset=0&active=0" class="<?php echo attr($inactive_class);?>" onclick='top.restoreSession()'>[<?php echo xlt('Only Inactive'); ?>]</a>
 
 <input type="hidden" name="mode" value="update">
 <input type="hidden" name="offset" value="<?php echo attr($offset);?>">
 <input type="hidden" name="active" value="<?php echo attr($active);?>">
 <br/>
-<a href="javascript:document.update_activity.submit();" class="link_submit">[<?php echo xlt('Change Activity'); ?>]</a>
+<a href="javascript:top.restoreSession();document.update_activity.submit();" class="link_submit">[<?php echo xlt('Change Activity'); ?>]</a>
 
 <table border="0" class="existingnotes">
 <?php
@@ -139,7 +139,7 @@ print "<tr><td></td><td></td><td></td></tr>\n";
 ?>
 </table>
 
-<a href="javascript:document.update_activity.submit();" class="link_submit">[<?php echo xlt('Change Activity'); ?>]</a>
+<a href="javascript:top.restoreSession();document.update_activity.submit();" class="link_submit">[<?php echo xlt('Change Activity'); ?>]</a>
 </form>
 
 <hr>
@@ -147,13 +147,13 @@ print "<tr><td></td><td></td><td></td></tr>\n";
 <tr><td>
 <?php
 if ($offset>($N-1)) {
-echo "<a class='link' href=office_comments_full.php?active=".attr($active)."&offset=".attr($offset-$N).">[".xlt('Previous')."]</a>";
+echo "<a class='link' href=office_comments_full.php?active=".attr($active)."&offset=".attr($offset-$N)." onclick='top.restoreSession()'>[".xlt('Previous')."]</a>";
 }
 ?>
 </td><td align=right>
 <?php
 if ($result_count == $N) {
-echo "<a class='link' href=office_comments_full.php?active=".attr($active)."&offset=".attr($offset+$N).">[".xlt('Next')."]</a>";
+echo "<a class='link' href=office_comments_full.php?active=".attr($active)."&offset=".attr($offset+$N)." onclick='top.restoreSession()'>[".xlt('Next')."]</a>";
 }
 ?>
 </td></tr>
diff --git a/interface/reports/patient_edu_web_lookup.php b/interface/reports/patient_edu_web_lookup.php
index a66938fff..9bb80b772 100644
--- a/interface/reports/patient_edu_web_lookup.php
+++ b/interface/reports/patient_edu_web_lookup.php
@@ -1,13 +1,27 @@
 <?php
-// Copyright (C) 2011 Tony McCormick <tony@mi-squared.com>
-//                    Brady Miller   <brady@sparmy.com>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+/**
+ * Open websearch for patient education materials
+ *
+ * Copyright (C) 2011 Tony McCormick <tony@mi-squared.com>
+ * Copyright (C) 2011 Brady Miller   <brady@sparmy.com>
+ *
+ * LICENSE: This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @package OpenEMR
+ * @author  Tony McCormick <tony@mi-squared.com>
+ * @author  Brady Miller <brady@sparmy.com>
+ * @link    http://www.open-emr.org
+ */
 
-// Open websearch for patient education materials
 
 //SANITIZE ALL ESCAPES
 $sanitize_all_escapes=true;
@@ -92,7 +106,7 @@ $form_diagnosis = (isset($_POST['form_diagnosis'])) ? $_POST['form_diagnosis'] :
 		<tr>
 			<td>
 				<div style='margin-left:15px'>
-					<a href='#' class='css_button' onclick='$("#theform").submit();'>
+					<a href='#' class='css_button' onclick='top.restoreSession(); $("#theform").submit();'>
 					<span>
 						<?php echo htmlspecialchars( xl('Submit'), ENT_NOQUOTES); ?>
 					</span>
diff --git a/interface/usergroup/addrbook_list.php b/interface/usergroup/addrbook_list.php
index 8d1127efb..cd0b2fcd6 100644
--- a/interface/usergroup/addrbook_list.php
+++ b/interface/usergroup/addrbook_list.php
@@ -93,7 +93,7 @@ $res = sqlStatement($query,$sqlBindArray);
 <body class="body_top">
 
 <div id="addressbook_list">
-<form method='post' action='addrbook_list.php'>
+<form method='post' action='addrbook_list.php' onsubmit='return top.restoreSession()'>
 
 <table>
  <tr class='search'> <!-- bgcolor='#ddddff' -->
-- 
2.11.4.GIT