From 6aef7ce6a33ebd91111030713cd328c9872b6876 Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Wed, 9 Jan 2013 03:22:24 -0800
Subject: [PATCH] minor bug fixes for previous commit

---
 interface/forms/aftercare_plan/new.php    |  2 +-
 interface/forms/aftercare_plan/save.php   |  2 +-
 interface/forms/transfer_summary/new.php  |  4 ++--
 interface/forms/transfer_summary/save.php |  2 +-
 interface/forms/treatment_plan/new.php    | 14 +++++++-------
 interface/forms/treatment_plan/save.php   |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interface/forms/aftercare_plan/new.php b/interface/forms/aftercare_plan/new.php
index 960af034c..1a954df98 100644
--- a/interface/forms/aftercare_plan/new.php
+++ b/interface/forms/aftercare_plan/new.php
@@ -98,7 +98,7 @@ echo "<form method='post' name='my_form' " .
 
 	
 	
-		<td align="left" class="forms"><?php echo xl('Discharged'); ?>:</td>
+		<td align="left" class="forms"><?php echo xlt('Discharged'); ?>:</td>
 		<td class="forms">
 			   <input type='text' size='10' name='discharged' id='discharge_date' <?php echo attr($disabled); ?>;
       value='<?php echo attr($obj{"discharged"}); ?>'
diff --git a/interface/forms/aftercare_plan/save.php b/interface/forms/aftercare_plan/save.php
index b513009d4..3e3aa73bc 100644
--- a/interface/forms/aftercare_plan/save.php
+++ b/interface/forms/aftercare_plan/save.php
@@ -61,7 +61,7 @@ else {
   sqlStatement("UPDATE form_aftercare_plan SET $sets WHERE id = '". add_escape_custom("$id"). "'");
 }
 
-$_SESSION["encounter"] = htmlspecialchars($encounter);
+$_SESSION["encounter"] = $encounter;
 formHeader("Redirecting....");
 formJump();
 formFooter();
diff --git a/interface/forms/transfer_summary/new.php b/interface/forms/transfer_summary/new.php
index c1003541a..20ca2ad61 100644
--- a/interface/forms/transfer_summary/new.php
+++ b/interface/forms/transfer_summary/new.php
@@ -63,7 +63,7 @@ echo "<form method='post' name='my_form' " .
 			<label class="forms-data"> <?php if (is_numeric($pid)) {
     
     $result = getPatientData($pid, "fname,lname,squad");
-   echo htmlspecialchars(xl('','','','').text($result['fname'])." ".text($result['lname']));}
+   echo text($result['fname'])." ".text($result['lname']);}
    $patient_name=($result['fname'])." ".($result['lname']);
    ?>
    </label>
@@ -74,7 +74,7 @@ echo "<form method='post' name='my_form' " .
 		<label class="forms-data"> <?php if (is_numeric($pid)) {
     
     $result = getPatientData($pid, "*");
-   echo htmlspecialchars(($result['DOB']));}
+   echo text($result['DOB']);}
    $dob=($result['DOB']);
    ?>
    </label>
diff --git a/interface/forms/transfer_summary/save.php b/interface/forms/transfer_summary/save.php
index 4d18420f4..d78dd8ffc 100644
--- a/interface/forms/transfer_summary/save.php
+++ b/interface/forms/transfer_summary/save.php
@@ -58,7 +58,7 @@ else {
   sqlStatement("UPDATE form_transfer_summary SET $sets WHERE id = '". add_escape_custom("$id"). "'");
 }
 
-$_SESSION["encounter"] = htmlspecialchars($encounter);
+$_SESSION["encounter"] = $encounter;
 formHeader("Redirecting....");
 formJump();
 formFooter();
diff --git a/interface/forms/treatment_plan/new.php b/interface/forms/treatment_plan/new.php
index 53a376355..71c6bab4b 100644
--- a/interface/forms/treatment_plan/new.php
+++ b/interface/forms/treatment_plan/new.php
@@ -67,7 +67,7 @@ echo "<form method='post' name='my_form' " .
 			<label class="forms-data"> <?php if (is_numeric($pid)) {
     
     $result = getPatientData($pid, "fname,lname,squad");
-   echo htmlspecialchars(text($result['fname'])." ".text($result['lname']));}
+   echo text($result['fname'])." ".text($result['lname']);}
    $patient_name=($result['fname'])." ".($result['lname']);
    ?>
    </label>
@@ -78,7 +78,7 @@ echo "<form method='post' name='my_form' " .
 		<label class="forms-data"> <?php if (is_numeric($pid)) {
     
     $result = getPatientData($pid, "*");
-   echo htmlspecialchars( $result['DOB']);}
+   echo text($result['DOB']);}
    $dob=($result['DOB']);
    ?>
    </label>
@@ -94,11 +94,11 @@ echo "<form method='post' name='my_form' " .
 			<label class="forms-data" > <?php if (is_numeric($pid)) {
     
     $result = getPatientData($pid, "*");
-   echo htmlspecialchars(xl('','','','').$result['pid']);}
+   echo text($result['pid']);}
    $patient_id=$result['pid'];
    ?>
    </label>
-    <input type="hidden" name="client_number" value="<?php echo $patient_id;?>">
+    <input type="hidden" name="client_number" value="<?php echo attr($patient_id);?>">
 		</td>
 
 
@@ -121,10 +121,10 @@ echo "<form method='post' name='my_form' " .
 
     echo "<select name='provider' style='width:60%' />";
     while ($urow = sqlFetchArray($ures)) {
-      echo "    <option value='" . $urow['lname'] . "'";
+      echo "    <option value='" . attr($urow['lname']) . "'";
       if ($urow['lname'] == attr($obj{"provider"})) echo " selected";
-      echo ">" . $urow['lname'];
-      if ($urow['fname']) echo ", " . $urow['fname'];
+      echo ">" . text($urow['lname']);
+      if ($urow['fname']) echo ", " . text($urow['fname']);
       echo "</option>\n";
     }
     echo "</select>";
diff --git a/interface/forms/treatment_plan/save.php b/interface/forms/treatment_plan/save.php
index f615743c9..ccf1e531e 100644
--- a/interface/forms/treatment_plan/save.php
+++ b/interface/forms/treatment_plan/save.php
@@ -61,7 +61,7 @@ else {
   sqlStatement("UPDATE form_treatment_plan SET $sets WHERE id = '". add_escape_custom("$id"). "'");
 }
 
-$_SESSION["encounter"] = htmlspecialchars($encounter);
+$_SESSION["encounter"] = $encounter;
 formHeader("Redirecting....");
 formJump();
 formFooter();
-- 
2.11.4.GIT