fixes to prior commit

interface/patient_tracker/patient_tracker.php

@@ -39,7 +39,7 @@
 
 // mdsupport - user_settings prefix
 $uspfx = substr(__FILE__, strlen($webserver_root)) . '.';
-$setting_new_window = prevSetting($uspfx, 'setting_new_window', 'form_new_window', '1');
+$setting_new_window = prevSetting($uspfx, 'setting_new_window', 'form_new_window', ' ');
 
 #define variables, future enhancement allow changing the to_date and from_date 
 #to allow picking a date to review
@@ -153,6 +153,7 @@ function openNewTopWindow(newpid,newencounterid) {
  <div id= 'inanewwindow' class='inanewwindow'>
  <span style='float: right'>
  <a id='setting_cog'><i class="fa fa-cog fa-2x fa-fw">&nbsp;</i></a>
+ <?php // Note that are unable to html escape below $setting_new_window, or else will break the code, secondary to white space issues. ?>
  <input type='hidden' name='setting_new_window' id='setting_new_window' value='<?php echo $setting_new_window ?>' />
  <label id='settings'><input type='checkbox' name='form_new_window' id='form_new_window' value='1'<?php echo $setting_new_window ?> >
  <?php echo xlt('Open Patient in New Window'); ?></input></label>

library/user.inc

@@ -45,6 +45,8 @@ function getUserSetting($label, $user=NULL, $defaultUser=0) {
  */
 function checkUserSetting($label, $value, $user=NULL) {
 
+ $user = effectiveUser($user);
+
  $curval = getUserSetting ($label, $user);
  if (is_null($curval)) {
  return false;
@@ -59,9 +61,10 @@ function checkUserSetting($label, $value, $user=NULL) {
  * @param string $label - Setting key
  * @param string $value - Setting value
  * @param int $user - user id number from users table
- * @param boolean $createDefault - If no current global default value, create one. 
+ * @param boolean $createDefault - If no current global default value, create one.
+ * @param boolean $overwrite - If this is set to true, then overwrite the current setting
  */
-function setUserSetting($label, $value, $user=NULL, $createDefault=TRUE) {
+function setUserSetting($label, $value, $user=NULL, $createDefault=TRUE, $overwrite=TRUE) {
 
  $user = effectiveUser($user);
 
@@ -71,14 +74,15 @@ function setUserSetting($label, $value, $user=NULL, $createDefault=TRUE) {
  if (is_null($cur_value)) {
  sqlStatement("INSERT INTO user_settings(setting_user, setting_label, setting_value) " .
  "VALUES (?,?,?)", array($user, $label, $value) );
- } elseif ($cur_value !== $value) {
+ } elseif ( ($cur_value !== $value) && $overwrite ) {
  sqlStatement("UPDATE user_settings SET setting_value=? " .
  "WHERE setting_user=? AND setting_label=?", array($value, $user, $label) );
  }
 
- // Call self to create default value
+ // Call self to create default token
+ // (Note this is only done if a default token does not yet exist, thus set overwrite to FALSE))
  if ($createDefault) {
- setUserSetting($label, $value, 0, false);
+ setUserSetting($label, $value, 0, false, false);
  }
 }