From 430f8148428bee40dd4fdd546f542c965f81899d Mon Sep 17 00:00:00 2001
From: drbowen <drbowen>
Date: Thu, 23 Jun 2005 05:32:44 +0000
Subject: [PATCH] Initial import.

---
 interface/billing/billing_process.php              |    8 +-
 interface/billing/billing_report.php               |   42 +-
 interface/billing/sl_eob_help.php                  |   47 +
 interface/billing/sl_eob_invoice.php               |  788 ++++++++++++++
 interface/billing/sl_eob_patient_note.php          |   67 ++
 interface/billing/sl_eob_search.php                |  472 +++++++++
 interface/billing/sl_receipts_report.php           |  249 +++++
 interface/login/filler.php                         |   10 +-
 interface/login/login.php                          |    2 +-
 interface/main/authorizations/authorizations.php   |    2 +-
 interface/main/calendar/find_patient.php           |    4 +-
 .../pntemplates/default/views/day/default.html     |  527 +++++++---
 .../pntemplates/default/views/week/default.html    |  525 +++++++---
 .../calendar/modules/PostCalendar/pnuserapi.php    |   13 +-
 interface/main/finder/finder_navigation.php        |    2 +-
 interface/main/finder/patient_select.php           |    4 +-
 interface/main/main_navigation.php                 |   23 +-
 interface/main/myadmin/config.inc.php              |   11 +-
 interface/patient_file/encounter/coding.php        |   18 +-
 .../patient_file/encounter/encounter_title.php     |   24 +-
 interface/patient_file/encounter/forms.php         |   14 +-
 .../patient_file/encounter/patient_encounter.php   |   15 +-
 interface/patient_file/encounter/search_code.php   |   97 ++
 .../patient_file/encounter/superbill_codes.php     |  236 ++---
 .../encounter/superbill_custom_full.php            |   77 +-
 interface/patient_file/history/encounters.php      |   92 +-
 interface/patient_file/history/encounters_full.php |  199 ++--
 interface/patient_file/history/history.php         |    2 +-
 interface/patient_file/navigation.php              |   42 +-
 interface/patient_file/problem_encounter.php       |  298 ++++++
 interface/patient_file/report/custom_report.php    |   11 +-
 interface/patient_file/report/full_report.php      |   15 +-
 interface/patient_file/report/patient_report.php   |    2 +
 .../patient_file/report/print_custom_report.php    |   12 +-
 interface/patient_file/summary/add_edit_issue.php  |  274 +++++
 interface/patient_file/summary/demographics.php    |  730 ++++++-------
 .../patient_file/summary/demographics_full.php     | 1095 ++++++++++----------
 .../patient_file/summary/demographics_save.php     |  350 ++++---
 interface/patient_file/summary/immunizations.php   |  366 ++++---
 interface/patient_file/summary/patient_summary.php |   17 +-
 interface/patient_file/summary/pnotes.php          |   65 +-
 interface/patient_file/summary/shot_record.php     |   57 +
 interface/patient_file/summary/stats.php           |   87 +-
 interface/patient_file/summary/stats_full.php      |  158 ++-
 interface/pic/logo.gif                             |  Bin 3220 -> 34408 bytes
 interface/pic/show_calendar.gif                    |  Bin 0 -> 200 bytes
 interface/reports/appt_encounter_report.php        |  218 ++++
 interface/reports/players_report.php               |  148 +++
 interface/themes/style_sky_blue.css                |    4 +-
 interface/usergroup/facility_admin.php             |   35 +-
 interface/usergroup/user_admin.php                 |   12 +-
 interface/usergroup/usergroup.php                  |   19 +-
 interface/usergroup/usergroup_admin.php            |   18 +-
 interface/usergroup/usergroup_navigation.php       |   13 +
 templates/report/general_default.html              |   27 +-
 55 files changed, 5506 insertions(+), 2137 deletions(-)
 create mode 100644 interface/billing/sl_eob_help.php
 create mode 100644 interface/billing/sl_eob_invoice.php
 create mode 100644 interface/billing/sl_eob_patient_note.php
 create mode 100644 interface/billing/sl_eob_search.php
 create mode 100644 interface/billing/sl_receipts_report.php
 rewrite interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html (92%)
 rewrite interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html (92%)
 create mode 100644 interface/patient_file/encounter/search_code.php
 rewrite interface/patient_file/encounter/superbill_codes.php (64%)
 rewrite interface/patient_file/history/encounters_full.php (76%)
 create mode 100644 interface/patient_file/problem_encounter.php
 create mode 100644 interface/patient_file/summary/add_edit_issue.php
 rewrite interface/patient_file/summary/demographics.php (72%)
 rewrite interface/patient_file/summary/demographics_full.php (93%)
 rewrite interface/patient_file/summary/demographics_save.php (92%)
 rewrite interface/patient_file/summary/immunizations.php (98%)
 create mode 100644 interface/patient_file/summary/shot_record.php
 rewrite interface/patient_file/summary/stats_full.php (97%)
 rewrite interface/pic/logo.gif (100%)
 create mode 100644 interface/pic/show_calendar.gif
 create mode 100644 interface/reports/appt_encounter_report.php
 create mode 100644 interface/reports/players_report.php

diff --git a/interface/billing/billing_process.php b/interface/billing/billing_process.php
index 320b147f3..d1e72ba5b 100644
--- a/interface/billing/billing_process.php
+++ b/interface/billing/billing_process.php
@@ -56,7 +56,8 @@ if (isset($_POST['bn_electronic_file']) && !empty($_POST['claims'])) {
 				$pid = $tmpvars[0];
 				$encounter = $tmpvars[1];
 				if (!empty($encounter) && !empty($pid)) {
-					$sql = "UPDATE billing set billed = 1 where encounter = '" . $encounter . "' and pid = '" . $pid . "'";
+					$sql = "UPDATE billing set billed = 1 where encounter = '" . $encounter .
+						"' and pid = '" . $pid . "' and activity != 0";
 					$result = $db->execute($sql);
 					if(!$result) {
 						$error = true;
@@ -71,10 +72,7 @@ if (isset($_POST['bn_electronic_file']) && !empty($_POST['claims'])) {
 			}
 		}
 		if (!$error) {
-
-
-
-	 		header("Pragma: public");
+			header("Pragma: public");
 			header("Expires: 0");
 			header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 			header("Content-Type: application/force-download");
diff --git a/interface/billing/billing_report.php b/interface/billing/billing_report.php
index 355e565b0..5f8e4526f 100644
--- a/interface/billing/billing_report.php
+++ b/interface/billing/billing_report.php
@@ -1,5 +1,7 @@
 <?
 include_once("../globals.php");
+include_once("../../library/acl.inc");
+include_once("../../custom/code_types.inc.php");
 
 include_once("$srcdir/patient.inc");
 include_once("$srcdir/billrep.inc");
@@ -12,10 +14,13 @@ if ($_POST['mode'] == 'export') {
 	$sdate = $_POST['from_date'];
 	$edate = $_POST['to_date'];
 
-	$sql = "SELECT billing.*, concat(pd.fname,' ', pd.lname) as name from billing join patient_data as pd on pd.pid = billing.pid where billed = '1' and"
-	. "(process_date > '" . mysql_real_escape_string($sdate) . "' or DATE_FORMAT( process_date, '%Y-%m-%d' ) = '" . mysql_real_escape_string($sdate) ."') "
-	. "and (process_date < '" . mysql_real_escape_string($edate) . "'or DATE_FORMAT( process_date, '%Y-%m-%d' ) = '" . mysql_real_escape_string($edate) ."') "
-	. " order by pid,encounter";
+	$sql = "SELECT billing.*, concat(pd.fname, ' ', pd.lname) as name from billing "
+	. "join patient_data as pd on pd.pid = billing.pid where billed = '1' and "
+	. "(process_date > '" . mysql_real_escape_string($sdate)
+	. "' or DATE_FORMAT( process_date, '%Y-%m-%d' ) = '" . mysql_real_escape_string($sdate) ."') "
+	. "and (process_date < '" . mysql_real_escape_string($edate)
+	. "'or DATE_FORMAT( process_date, '%Y-%m-%d' ) = '" . mysql_real_escape_string($edate) ."') "
+	. "order by pid,encounter";
 	$db = get_db();
 	$results = $db->Execute($sql);
 	$billings = array();
@@ -171,7 +176,13 @@ if ($userauthorized) {
 	print '&nbsp;';
 	$acct_config = $GLOBALS['oer_config']['ws_accounting'];
 	if($acct_config['enabled'] == true) {
-		print '<span class=text><a href="javascript:void window.open(\''.$acct_config['url_path'].'\')">[Accounting System]</a></span>';
+		print '<span class=text><a href="javascript:void window.open(\''.$acct_config['url_path'].'\')">[SQL-Ledger]</a></span>';
+		if (acl_check('acct', 'rep')) {
+			print '<span class=text> &nbsp; <a href="javascript:void window.open(\'sl_receipts_report.php\')">[Reports]</a></span>';
+		}
+		if (acl_check('acct', 'eob')) {
+			print '<span class=text> &nbsp; <a href="javascript:void window.open(\'sl_eob_search.php\')">[EOBs]</a></span>';
+		}
 	}
 ?>
 		</td>
@@ -292,7 +303,6 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 	$skipping = FALSE;
 
 	foreach ($ret as $iter) {
-		$name = getPatientData($iter['pid']);
 		$this_encounter_id = $iter['pid'] . "-" . $iter['encounter'];
 
 		if ($last_encounter_id != $this_encounter_id) {
@@ -325,6 +335,19 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 				}
 			}
 
+			$name = getPatientData($iter['pid'], "fname, mname, lname");
+
+			# Check if patient has primary insurance and a subscriber exists for it.
+			# If not we will highlight their name in red.
+			# TBD: more checking here.
+			#
+			$res = sqlQuery("select count(*) as count from insurance_data where " .
+				"pid = " . $iter['pid'] . " and " .
+				"type='primary' and " .
+				"subscriber_lname is not null and " .
+				"subscriber_lname != '' limit 1");
+			$namecolor = ($res['count'] > 0) ? "black" : "#ff7777";
+
 			++$encount;
 			$bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
 			echo "<tr bgcolor='$bgcolor'><td colspan='8' height='5'></td></tr>\n";
@@ -332,7 +355,7 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 			$rcount = 0;
 			$oldcode = "";
 
-			$lhtml .= "&nbsp;<span class=bold>". $name['fname'] . "&nbsp;" . $name['lname'] . "</span><span class=small>&nbsp;(" . $iter['pid'] . "-" . $iter['encounter'] . ")</span>";
+			$lhtml .= "&nbsp;<span class=bold><font color='$namecolor'>". $name['fname'] . "&nbsp;" . $name['lname'] . "</font></span><span class=small>&nbsp;(" . $iter['pid'] . "-" . $iter['encounter'] . ")</span>";
 			$lhtml .= "&nbsp;&nbsp;&nbsp;<a class=\"link_submit\" href=\"" . $GLOBALS['webroot'] ."/interface/patient_file/encounter/patient_encounter.php?set_encounter=" . $iter['encounter'] . "&pid=" . $iter['pid'] . "\">[To&nbsp;Encounter]</a>";
 			$lhtml .= "&nbsp;&nbsp;&nbsp;<a class=\"link_submit\" href=\"" . $GLOBALS['webroot'] ."/interface/patient_file/summary/demographics_full.php?&pid=" . $iter['pid'] . "\">[To&nbsp;Demographics]</a>";
 			$lhtml .= "<br />\n";
@@ -342,7 +365,7 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 
 			$result = sqlStatement($query);
 			$count = 0;
-			$default_x12_partner = $iter['x12_partner_id'];
+			$default_x12_partner = $iter['ic_x12id'];
 
 			while ($row = mysql_fetch_array($result)) {
 				if (strlen($row['provider']) > 0) {
@@ -409,7 +432,8 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 		$oldcode = $iter['code_type'];
 		$rhtml .= "</td>\n";
 		$justify = "";
-		if ($iter['code_type'] == "CPT4" || $iter['code_type'] == "HCPCS") {
+//	if ($iter['code_type'] == "CPT4" || $iter['code_type'] == "HCPCS") {
+		if ($code_types[$iter['code_type']]['just']) {
 			$js = split(":",$iter['justify']);
 			$counter = 0;
 			foreach ($js as $j) {
diff --git a/interface/billing/sl_eob_help.php b/interface/billing/sl_eob_help.php
new file mode 100644
index 000000000..7eec0ddbd
--- /dev/null
+++ b/interface/billing/sl_eob_help.php
@@ -0,0 +1,47 @@
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>EOB Posting - Instructions</title>
+</head>
+<body>
+<center><h2>EOB Data Entry</h2></center>
+
+<p>This module consists of two windows (not including this help page)
+and promotes efficient entry of EOB data.
+
+<p>The first window is the invoice search page.  At the top you should
+enter a check number, pay date and check amount.  The reason for the check
+number and pay date is so that you don't have to enter them over and over
+again for each claim.  The amount that you enter will be decreased for each
+invoice that is given part of the payment, and hopefully will end at zero
+when you are done.
+
+<p>Just below the check information is a blue area where you put in your
+search parameters.  You can search by patient name, chart number, encounter
+number or date of service, or any combination of these.  The "Closed" checkbox,
+if checked, will include closed invoices in the search.  Click the Search
+button to perform the search.
+
+<p>Upon searching you are presented with a list of invoices.  Click on one
+of the invoice numbers to open the second window, which is the data entry
+page.
+
+<p>In the data entry page you can change the due date and notes for the invoice.
+More importantly, for each billing code for which an amount was charged, you
+can enter payment and adjustment information.
+
+<p>The Source and Date columns are copied from the first page, so normally
+you will not need to touch those.  You can put a payment amount in the Pay
+column, an adjustment amount in the Adjust column, or both.  You can also click
+the "W" on the right to automatically compute an adjustment value that
+writes off the remainder of the charge for that line item.
+
+<p>Pay attention to the due date.  This is the date when we will start asking
+the patient to pay the remaining balance.  If there is a balance
+that the patient should pay, then set the due date to the current date.  If
+you will be submitting a secondary claim then set the due date about 40 days
+into the future, or as otherwise prescribed by your site's policies.
+
+<p>After the information is correctly entered, click the Save button.
+</body>
+</html>
diff --git a/interface/billing/sl_eob_invoice.php b/interface/billing/sl_eob_invoice.php
new file mode 100644
index 000000000..2306829af
--- /dev/null
+++ b/interface/billing/sl_eob_invoice.php
@@ -0,0 +1,788 @@
+<?
+  // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+  // This is the second of two pages to support posting of EOBs.
+  // The first is sl_eob_search.php.
+
+  include_once("../globals.php");
+  include_once("../../library/patient.inc");
+  include_once("../../library/forms.inc");
+  include_once("../../library/sql-ledger.inc");
+  include_once("../../library/invoice_summary.inc.php");
+  include_once("../../custom/code_types.inc.php");
+
+  $debug = 0; // set to 1 for debugging mode
+
+  $reasons = array(
+    "Ins adjust",
+    "Coll w/o",
+    "Pt released",
+    "Sm debt w/o",
+    "To ded'ble",
+    "To copay",
+    "Bad debt",
+    "Discount",
+    "Hardship w/o",
+    "Ins refund",
+    "Pt refund",
+    "Ins overpaid",
+    "Pt overpaid"
+  );
+
+  $info_msg = "";
+
+  // Format money for display.
+  //
+  function bucks($amount) {
+    if ($amount)
+      printf("%.2f", $amount);
+  }
+
+  // Insert a row into the acc_trans table.
+  //
+  function addTransaction($invid, $chartid, $amount, $date, $source, $memo, $insplan) {
+    global $sl_err, $debug;
+    $date = fixDate($date);
+    $query = "INSERT INTO acc_trans ( " .
+      "trans_id, "     .
+      "chart_id, "     .
+      "amount, "       .
+      "transdate, "    .
+      "source, "       .
+      "project_id, "   .
+      "memo "          .
+      ") VALUES ( "    .
+      "$invid, "       . // trans_id
+      "$chartid, "     . // chart_id
+      "$amount, "      . // amount
+      "'$date', "      . // transdate
+      "'$source', "    . // source
+      "$insplan, "     . // project_id
+      "'$memo' "       . // memo
+      ")";
+    if ($debug) {
+      echo $query . "<br>\n";
+    } else {
+      SLQuery($query);
+      if ($sl_err) die($sl_err);
+    }
+  }
+
+  // Insert a row into the invoice table.
+  //
+  function addLineItem($invid, $serialnumber, $amount, $adjdate, $insplan, $reason) {
+    global $sl_err, $services_id, $debug;
+    $adjdate = fixDate($adjdate);
+    $description = "Adjustment $adjdate $reason";
+    $query = "INSERT INTO invoice ( " .
+      "trans_id, "          .
+      "parts_id, "          .
+      "description, "       .
+      "qty, "               .
+      "allocated, "         .
+      "sellprice, "         .
+      "fxsellprice, "       .
+      "discount, "          .
+      "unit, "              .
+      "project_id, "        .
+      "serialnumber "       .
+      ") VALUES ( "         .
+      "$invid, "            . // trans_id
+      "$services_id, "      . // parts_id
+      "'$description', "    . // description
+      "1, "                 . // qty
+      "0, "                 . // allocated
+      "$amount, "           . // sellprice
+      "$amount, "           . // fxsellprice
+      "0, "                 . // discount
+      "'', "                . // unit
+      "$insplan, "          . // project_id
+      "'$serialnumber'"     . // serialnumber
+      ")";
+    if ($debug) {
+      echo $query . "<br>\n";
+    } else {
+      SLQuery($query);
+      if ($sl_err) die($sl_err);
+    }
+  }
+
+  // Update totals and payment date in the invoice header.  Dollar amounts are
+  // stored as double precision floats so we have to be careful about rounding.
+  //
+  function updateAR($invid, $amount, $paid = 0, $paydate = "") {
+    global $sl_err, $debug;
+    $paydate = fixDate($paydate);
+    $query = "UPDATE ar SET amount = round(CAST (amount AS numeric) + $amount, 2), " .
+      "netamount = round(CAST (netamount AS numeric) + $amount, 2)";
+    if ($paid) $query .= ", paid = round(CAST (paid AS numeric) + $paid, 2), datepaid = '$paydate'";
+    $query .= " WHERE id = $invid";
+    if ($debug) {
+      echo $query . "<br>\n";
+    } else {
+      SLQuery($query);
+      if ($sl_err) die($sl_err);
+    }
+  }
+
+  // Do whatever is necessary to make this invoice re-billable.
+  //
+  function setupSecondary($invid) {
+    global $sl_err, $debug, $info_msg, $GLOBALS;
+
+    // Get some needed items from the SQL-Ledger invoice.
+    $arres = SLQuery("select invnumber, transdate, customer_id, employee_id " .
+      "from ar where ar.id = $invid");
+    if ($sl_err) die($sl_err);
+    $arrow = SLGetRow($arres, 0);
+    if (! $arrow) die("There is no match for invoice id = $trans_id.");
+    $customer_id = $arrow['customer_id'];
+    list($trash, $encounter) = explode(".", $arrow['invnumber']);
+
+    // Get the OpenEMR PID corresponding to the customer.
+    $pdrow = sqlQuery("SELECT patient_data.pid " .
+      "FROM integration_mapping, patient_data WHERE " .
+      "integration_mapping.foreign_id = $customer_id AND " .
+      "integration_mapping.foreign_table = 'customer' AND " .
+      "patient_data.id = integration_mapping.local_id");
+    $pid = $pdrow['pid'];
+    if (! $pid) die("Cannot find patient from SQL-Ledger customer id = $customer_id.");
+
+    // Find out if the encounter exists.
+    $ferow = sqlQuery("SELECT pid FROM form_encounter WHERE " .
+      "encounter = $encounter");
+    $encounter_pid = $ferow['pid'];
+
+    // If it exists, just update the billing items.
+    if ($encounter_pid) {
+      if ($encounter_pid != $pid)
+        die("Expected form_encounter.pid to be $pid, but was $encounter_pid");
+      $query = "UPDATE billing SET billed = 0, bill_process = 0, payer_id = -1, " .
+        "bill_date = NULL, process_date = NULL, process_file = NULL " .
+        "WHERE encounter = $encounter AND pid = $pid AND activity = 1";
+      if ($debug) {
+        echo $query . "<br>\n";
+      } else {
+        sqlQuery($query);
+      }
+      $info_msg = "Encounter $encounter is ready for re-billing.";
+      return;
+    }
+
+    // It does not exist then it better be a date.
+    if (! preg_match("/^20\d\d\d\d\d\d$/", $encounter))
+      die("Internal error: encounter '$encounter' should exist but does not.");
+
+    $employee_id = $arrow['employee_id'];
+
+    // Get the OpenEMR provider info corresponding to the SQL-Ledger salesman.
+    $drrow = sqlQuery("SELECT users.id, users.username, users.facility " .
+      "FROM integration_mapping, users WHERE " .
+      "integration_mapping.foreign_id = $employee_id AND " .
+      "integration_mapping.foreign_table = 'salesman' AND " .
+      "users.id = integration_mapping.local_id");
+    $provider_id = $drrow['id'];
+    if (! $provider_id) die("Cannot find provider from SQL-Ledger employee = $employee_id.");
+
+    $date_of_service = $arrow['transdate'];
+    if (! $date_of_service) die("Invoice has no date!");
+
+    // Generate a new encounter number.
+    $conn = $GLOBALS['adodb']['db'];
+    $new_encounter = $conn->GenID("sequences");
+
+    // Create the "new encounter".
+    $encounter_id = 0;
+    $query = "INSERT INTO form_encounter ( " .
+      "date, reason, facility, pid, encounter, onset_date " .
+      ") VALUES ( " .
+      "'$date_of_service', " .
+      "'Imported from Accounting', " .
+      "'" . addslashes($drrow['facility']) . "', " .
+      "$pid, " .
+      "$new_encounter, " .
+      "'$date_of_service' " .
+      ")";
+    if ($debug) {
+      echo $query . "<br>\n";
+      echo "Call to addForm() goes here.<br>\n";
+    } else {
+      $encounter_id = idSqlStatement($query);
+      if (! $encounter_id) die("Insert failed: $query");
+      addForm($new_encounter, "New Patient Encounter", $encounter_id,
+        "newpatient", $pid, 1, $date_of_service);
+      $info_msg = "Encounter $new_encounter has been created. ";
+    }
+
+    // For each invoice line item with a billing code we will insert
+    // a billing row with payer_id set to -1.  Order the line items
+    // chronologically so that each procedure code will be followed by
+    // its associated icd9 code.
+
+    $inres = SLQuery("SELECT * FROM invoice WHERE trans_id = $invid " .
+      "ORDER BY id");
+    if ($sl_err) die($sl_err);
+
+    // When nonzero, this will be the ID of a billing row that needs to
+    // have its justify field set.
+    $proc_ins_id = 0;
+
+    for ($irow = 0; $irow < SLRowCount($inres); ++$irow) {
+      $row = SLGetRow($inres, $irow);
+      $amount   = $row['sellprice'];
+
+      // Extract the billing code.
+      $code = "Unknown";
+      if (preg_match("/([A-Za-z0-9]\d\d\S*)/", $row['serialnumber'], $matches)) {
+        $code = strtoupper($matches[1]);
+      }
+      else if (preg_match("/([A-Za-z0-9]\d\d\S*)/", $row['description'], $matches)) {
+        $code = strtoupper($matches[1]);
+      }
+
+      list($code, $modifier) = explode("-", $code);
+
+      // Set the billing code type and description.
+      $code_type = "";
+      $code_text = "";
+
+      /****
+      if (preg_match("/CPT/", $row['serialnumber'])) {
+        $code_type = "CPT4";
+        $code_text = "Procedure $code";
+      }
+      else if (preg_match("/HCPCS/", $row['serialnumber'])) {
+        $code_type = "HCPCS";
+        $code_text = "Procedure $code";
+      }
+      else if (preg_match("/ICD/", $row['serialnumber'])) {
+        $code_type = "ICD9";
+        $code_text = "Diagnosis $code";
+        if ($proc_ins_id) {
+          $query = "UPDATE billing SET justify = '$code' WHERE id = $proc_ins_id";
+          if ($debug) {
+            echo $query . "<br>\n";
+          } else {
+            sqlQuery($query);
+          }
+          $proc_ins_id = 0;
+        }
+      }
+      ****/
+
+      foreach ($code_types as $key => $value) {
+        if (preg_match("/$key/", $row['serialnumber'])) {
+          $code_type = $key;
+          if ($value['fee']) {
+            $code_text = "Procedure $code";
+          } else {
+            $code_text = "Diagnosis $code";
+            if ($proc_ins_id) {
+              $query = "UPDATE billing SET justify = '$code' WHERE id = $proc_ins_id";
+              if ($debug) {
+                echo $query . "<br>\n";
+              } else {
+                sqlQuery($query);
+              }
+              $proc_ins_id = 0;
+            }
+          }
+          break;
+        }
+      }
+
+      // Skip adjustments.
+      if (! $code_type) continue;
+
+      // Insert the billing item.  If this for a procedure code then save
+      // the row ID so that we can update the "justify" field with the ICD9
+      // code, which should come next in the loop.
+      //
+      $query = "INSERT INTO billing ( " .
+        "date, code_type, code, pid, provider_id, user, groupname, authorized, " .
+        "encounter, code_text, activity, payer_id, billed, bill_process, " .
+        "modifier, units, fee, justify " .
+        ") VALUES ( " .
+        "NOW(), " .
+        "'$code_type', " .
+        "'$code', " .
+        "$pid, " .
+        "$provider_id, " .
+        "'" . $_SESSION['authId'] . "', " .
+        "'" . $_SESSION['authProvider'] . "', " .
+        "1, " .
+        "$new_encounter, " .
+        "'$code_text', " .
+        "1, " .
+        "-1, " .
+        "0, " .
+        "0, " .
+        "'$modifier', " .
+        "0, " .
+        "$amount, " .
+        "'' " .
+        ")";
+      if ($debug) {
+        echo $query . "<br>\n";
+      } else {
+        $proc_ins_id = idSqlStatement($query);
+        if ($code_type != "CPT4" && $code_type != "HCPCS")
+          $proc_ins_id = 0;
+      }
+    }
+
+    // Finally, change this invoice number to contain the new encounter number.
+    //
+    $new_invnumber = "$pid.$new_encounter";
+    $query = "UPDATE ar SET invnumber = '$new_invnumber' WHERE id = $invid";
+    if ($debug) {
+      echo $query . "<br>\n";
+    } else {
+      SLQuery($query);
+      if ($sl_err) die($sl_err);
+      $info_msg .= "This invoice number has been changed to $new_invnumber.";
+    }
+  }
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>EOB Posting - Invoice</title>
+<script language="JavaScript">
+
+// An insurance radio button is selected.
+function setins(istr) {
+ var f = document.forms[0];
+ for (var i = 0; i < f.elements.length; ++i) {
+  var ename = f.elements[i].name;
+  if (ename.indexOf('[src]') < 0) continue;
+  var evalue = f.elements[i].value;
+  var tmp = evalue.substring(0, 4).toLowerCase();
+  if (tmp >= 'ins1' && tmp <= 'ins3')
+   evalue = evalue.substring(4);
+  else if (evalue.substring(0, 2).toLowerCase() == 'pt')
+   evalue = evalue.substring(2);
+  while (evalue.substring(0, 1) == '/')
+   evalue = evalue.substring(1);
+  f.elements[i].value = istr + '/' + evalue;
+ }
+ return true;
+}
+
+// Compute an adjustment that writes off the balance:
+function writeoff(code) {
+ var f = document.forms[0];
+ var tmp =
+  f['form_line[' + code + '][bal]'].value -
+  f['form_line[' + code + '][pay]'].value;
+ f['form_line[' + code + '][adj]'].value = Number(tmp).toFixed(2);
+ return false;
+}
+
+// Onsubmit handler.  A good excuse to write some JavaScript.
+function validate(f) {
+ for (var i = 0; i < f.elements.length; ++i) {
+  var ename = f.elements[i].name;
+  var pfxlen = ename.indexOf('[pay]');
+  if (pfxlen < 0) continue;
+  var pfx = ename.substring(0, pfxlen);
+  var code = pfx.substring(pfx.indexOf('[')+1, pfxlen-1);
+  if (f[pfx+'[pay]'].value || f[pfx+'[adj]'].value) {
+   var srcobj = f[pfx+'[src]'];
+   while (srcobj.value.length) {
+    var tmp = srcobj.value.substring(srcobj.value.length - 1);
+    if (tmp > ' ' && tmp != '/') break;
+    srcobj.value = srcobj.value.substring(0, srcobj.value.length - 1);
+   }
+   var svalue = srcobj.value;
+   if (! svalue) {
+    alert('Source is missing for code ' + code);
+    return false;
+   } else {
+    var tmp = svalue.substring(0, 4).toLowerCase();
+    if (tmp >= 'ins1' && tmp <= 'ins3') {
+     svalue = svalue.substring(4);
+    } else if (svalue.substring(0, 2).toLowerCase() == 'pt') {
+     svalue = svalue.substring(2);
+    } else {
+     alert('Invalid or missing payer in source for code ' + code);
+     return false;
+    }
+    if (svalue) {
+     if (svalue.substring(0, 1) != '/') {
+      alert('Missing slash after payer in source for code ' + code);
+      return false;
+     }
+     tmp = svalue.substring(1, 3).toLowerCase();
+     if (tmp != 'nm' && tmp != 'ci' && tmp != 'cp' && tmp != 'ne' &&
+         tmp != 'it' && tmp != 'pf' && tmp != 'pp' && tmp != 'ok')
+     {
+      alert('Invalid source designation "' + tmp + '" for code ' + code);
+      return false;
+     }
+    }
+   }
+   if (! f[pfx+'[date]'].value) {
+    alert('Date is missing for code ' + code);
+    return false;
+   }
+  }
+  if (f[pfx+'[pay]'].value && isNaN(parseFloat(f[pfx+'[pay]'].value))) {
+   alert('Payment value for code ' + code + ' is not a number');
+   return false;
+  }
+  if (f[pfx+'[adj]'].value && isNaN(parseFloat(f[pfx+'[adj]'].value))) {
+   alert('Adjustment value for code ' + code + ' is not a number');
+   return false;
+  }
+  // TBD: validate the date format
+ }
+ return true;
+}
+
+</script>
+</head>
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0'>
+<?
+  $trans_id = $_GET['id'];
+  if (! $trans_id) die("You cannot access this page directly.");
+
+  SLConnect();
+
+  $chart_id_cash = SLQueryValue("select id from chart where accno = '$sl_cash_acc'");
+  if ($sl_err) die($sl_err);
+  if (! $chart_id_cash) die("There is no COA entry for cash account '$sl_cash_acc'");
+
+  $chart_id_ar = SLQueryValue("select id from chart where accno = '$sl_ar_acc'");
+  if ($sl_err) die($sl_err);
+  if (! $chart_id_ar) die("There is no COA entry for AR account '$sl_ar_acc'");
+
+  $chart_id_income = SLQueryValue("select id from chart where accno = '$sl_income_acc'");
+  if ($sl_err) die($sl_err);
+  if (! $chart_id_income) die("There is no COA entry for income account '$sl_income_acc'");
+
+  $services_id = SLQueryValue("select id from parts where partnumber = '$sl_services_id'");
+  if ($sl_err) die($sl_err);
+  if (! $services_id) die("There is no parts entry for services ID '$sl_services_id'");
+
+  if ($_POST['form_save'] || $_POST['form_cancel']) {
+    if ($_POST['form_save']) {
+      if ($debug) {
+        echo "<p><b>This module is in test mode. The database will not be changed.</b><p>\n";
+      }
+      $paytotal = 0;
+      foreach ($_POST['form_line'] as $code => $cdata) {
+        $thissrc  = trim($cdata['src']);
+        $thisdate = trim($cdata['date']);
+        $thispay  = trim($cdata['pay']);
+        $thisadj  = trim($cdata['adj']);
+        $thisins  = trim($cdata['ins']);
+        $reason   = trim($cdata['reason']);
+        if (strpos(strtolower($reason), 'ins') !== false)
+          $reason .= ' ' . $_POST['form_insurance'];
+        if (! $thisins) $thisins = 0;
+        if ($thispay) {
+          // Post a payment: add to ar, subtract from cash.
+          addTransaction($trans_id, $chart_id_ar, $thispay, $thisdate, $thissrc, $code, $thisins);
+          addTransaction($trans_id, $chart_id_cash, 0 - $thispay, $thisdate, $thissrc, $code, $thisins);
+          updateAR($trans_id, 0, $thispay, $thisdate);
+          $paytotal += $thispay;
+        }
+        if ($thisadj) {
+          // Post an adjustment: add negative invoice item, add to ar, subtract from income
+          addLineItem($trans_id, $code, 0 - $thisadj, $thisdate, $thisins, $reason);
+          addTransaction($trans_id, $chart_id_ar, $thisadj, $thisdate, "InvAdj $thissrc", $code, $thisins);
+          addTransaction($trans_id, $chart_id_income, 0 - $thisadj, $thisdate, "InvAdj $thissrc", $code, $thisins);
+          updateAR($trans_id, 0 - $thisadj);
+        }
+      }
+      $form_duedate = fixDate($_POST['form_duedate']);
+      $form_notes = trim($_POST['form_notes']);
+
+      // Maintain the list of insurances whose EOBs we have posted.
+      // We use the "Ship Via" field of the invoice to hold these.
+      //
+      $form_eobs = trim($_POST['form_eobs']);
+      $form_insurance = trim($_POST['form_insurance']);
+      if (strpos($form_eobs, $form_insurance) === false) {
+        if ($form_eobs) $form_eobs .= ","; else $form_eobs = "EOBs: ";
+        $form_eobs .= $form_insurance;
+      }
+
+      $query = "UPDATE ar SET duedate = '$form_duedate', notes = '$form_notes', " .
+        "shipvia = '$form_eobs' WHERE id = $trans_id";
+
+      if ($debug) {
+        echo $query . "<br>\n";
+      } else {
+        SLQuery($query);
+        if ($sl_err) die($sl_err);
+      }
+      if ($_POST['form_secondary']) {
+        setupSecondary($trans_id);
+      }
+      echo "<script language='JavaScript'>\n";
+      echo " var tmp = opener.document.forms[0].form_amount.value - $paytotal;\n";
+      echo " opener.document.forms[0].form_amount.value = Number(tmp).toFixed(2);\n";
+    } else {
+      echo "<script language='JavaScript'>\n";
+    }
+    if ($info_msg) echo " alert('$info_msg');\n";
+    if (! $debug) echo " window.close();\n";
+    echo "</script></body></html>\n";
+    SLClose();
+    exit();
+  }
+
+  // Get invoice data into $arrow.
+  $arres = SLQuery("select ar.*, customer.name, employee.name as doctor " .
+    "from ar, customer, employee where ar.id = $trans_id and " .
+    "customer.id = ar.customer_id and employee.id = ar.employee_id");
+  if ($sl_err) die($sl_err);
+  $arrow = SLGetRow($arres, 0);
+  if (! $arrow) die("There is no match for invoice id = $trans_id.");
+
+  // Determine the date of service.  An 8-digit encounter number is
+  // presumed to be a date of service imported during conversion.
+  // Otherwise look it up in the form_encounter table.
+  //
+  $svcdate = "";
+  list($trash, $encounter) = explode(".", $arrow['invnumber']);
+  if (strlen($encounter) == 8) {
+    $svcdate = substr($encounter, 0, 4) . "-" . substr($encounter, 4, 2) .
+      "-" . substr($encounter, 6, 2);
+  }
+  else if ($encounter) {
+    $tmp = sqlQuery("SELECT date FROM form_encounter WHERE " .
+      "encounter = $encounter");
+    $svcdate = substr($tmp['date'], 0, 10);
+  }
+
+  // Get invoice charge details.
+  $codes = get_invoice_summary($trans_id, true);
+?>
+<center>
+
+<form method='post' action='sl_eob_invoice.php?id=<? echo $trans_id ?>'
+ onsubmit='return validate(this)'>
+
+<table border='0' cellpadding='3'>
+ <tr>
+  <td>
+   Patient:
+  </td>
+  <td>
+   <?echo $arrow['name'] ?>
+  </td>
+  <td colspan="2" rowspan="3">
+   <textarea name="form_notes" cols="50" style="height:100%"><?echo $arrow['notes'] ?></textarea>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   Provider:
+  </td>
+  <td>
+   <?echo $arrow['doctor'] ?>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   Invoice:
+  </td>
+  <td>
+   <?echo $arrow['invnumber'] ?>
+  </td>
+ </tr>
+
+ <tr>
+  <td>
+   Svc Date:
+  </td>
+  <td>
+   <?echo $svcdate ?>
+  </td>
+  <td colspan="2">
+   Already posted:&nbsp;
+   <?echo $arrow['shipvia'] ?>
+  </td>
+ </tr>
+
+ <tr>
+  <td>
+   Bill Date:
+  </td>
+  <td>
+   <?echo $arrow['transdate'] ?>
+  </td>
+  <td colspan="2">
+   Now posting for:&nbsp;
+   <input type='radio' name='form_insurance' value='Ins1' onclick='setins("Ins1")' checked />Ins1&nbsp;
+   <input type='radio' name='form_insurance' value='Ins2' onclick='setins("Ins2")' />Ins2&nbsp;
+   <input type='radio' name='form_insurance' value='Ins3' onclick='setins("Ins3")' />Ins3&nbsp;
+   <input type='radio' name='form_insurance' value='Pt'   onclick='setins("Pt")'   />Patient
+   <input type='hidden' name='form_eobs' value='<?echo addslashes($arrow['shipvia']) ?>' />
+  </td>
+ </tr>
+ <tr>
+  <td>
+   Due Date:
+  </td>
+  <td>
+   <input type='text' name='form_duedate' size='10' value='<?echo $arrow['duedate'] ?>'
+    title='Due date mm/dd/yyyy or yyyy-mm-dd'>
+  </td>
+  <td colspan="2">
+   <input type="checkbox" name="form_secondary" value="1"> Needs secondary billing
+   &nbsp;&nbsp;
+   <input type='submit' name='form_save' value='Save'>
+   &nbsp;
+   <input type='button' value='Cancel' onclick='window.close()'>
+  </td>
+ </tr>
+ <tr>
+  <td height="1">
+  </td>
+ </tr>
+</table>
+
+<table border='0' cellpadding='2' cellspacing='0' width='98%'>
+
+ <tr bgcolor="#cccccc">
+  <td class="dehead">
+   Code
+  </td>
+  <td class="dehead" align="right">
+   Charge
+  </td>
+  <td class="dehead" align="right">
+   Balance&nbsp;
+  </td>
+  <td class="dehead">
+   Source
+  </td>
+  <td class="dehead">
+   Date
+  </td>
+  <td class="dehead">
+   Pay
+  </td>
+  <td class="dehead">
+   Adjust
+  </td>
+  <td class="dehead">
+   Reason
+  </td>
+ </tr>
+<?
+  $encount = 0;
+  foreach ($codes as $code => $cdata) {
+   ++$encount;
+   $bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
+   $dispcode = $code;
+   // this sorts the details more or less chronologically:
+   ksort($cdata['dtl']);
+   foreach ($cdata['dtl'] as $dkey => $ddata) {
+    $ddate = substr($dkey, 0, 10);
+    if (preg_match('/^(\d\d\d\d)(\d\d)(\d\d)\s*$/', $ddate, $matches)) {
+     $ddate = $matches[1] . '-' . $matches[2] . '-' . $matches[3];
+    }
+    $tmpchg = "";
+    $tmpadj = "";
+    if ($ddata['chg'] > 0)
+     $tmpchg = $ddata['chg'];
+    else if ($ddata['chg'] < 0)
+     $tmpadj = 0 - $ddata['chg'];
+?>
+ <tr bgcolor='<? echo $bgcolor ?>'>
+  <td class="detail">
+   <? echo $dispcode; $dispcode = "" ?>
+  </td>
+  <td class="detail" align="right">
+   <? bucks($tmpchg) ?>
+  </td>
+  <td class="detail" align="right">
+   &nbsp;
+  </td>
+  <td class="detail">
+   <? echo $ddata['src'] ?>
+  </td>
+  <td class="detail">
+   <? echo $ddate ?>
+  </td>
+  <td class="detail">
+   <? bucks($ddata['pmt']) ?>
+  </td>
+  <td class="detail">
+   <? bucks($tmpadj) ?>
+  </td>
+  <td class="detail">
+   <? echo $ddata['rsn'] ?>
+  </td>
+ </tr>
+<?
+   } // end of prior detail line
+?>
+ <tr bgcolor='<? echo $bgcolor ?>'>
+  <td class="detail">
+   <? echo $dispcode; $dispcode = "" ?>
+  </td>
+  <td class="detail" align="right">
+   &nbsp;
+  </td>
+  <td class="detail" align="right">
+   <input type="hidden" name="form_line[<? echo $code ?>][bal]" value="<? bucks($cdata['bal']) ?>">
+   <input type="hidden" name="form_line[<? echo $code ?>][ins]" value="<? echo $cdata['ins'] ?>">
+   <? printf("%.2f", $cdata['bal']) ?>&nbsp;
+  </td>
+  <td class="detail">
+   <input type="text" name="form_line[<? echo $code ?>][src]" size="10"
+    style="background-color:<? echo $bgcolor ?>"
+    title="NM=notmet, CI=coins, CP=copay, NE=notelig, IT=insterm, PF=ptfull, PP=ptpart" />
+  </td>
+  <td class="detail">
+   <input type="text" name="form_line[<? echo $code ?>][date]" size="10" style="background-color:<? echo $bgcolor ?>" />
+  </td>
+  <td class="detail">
+   <input type="text" name="form_line[<? echo $code ?>][pay]" size="10" style="background-color:<? echo $bgcolor ?>" />
+  </td>
+  <td class="detail">
+   <input type="text" name="form_line[<? echo $code ?>][adj]" size="10" style="background-color:<? echo $bgcolor ?>" />
+   &nbsp; <a href="" onclick="return writeoff('<? echo $code ?>')">W</a>
+  </td>
+  <td class="detail">
+   <select name="form_line[<? echo $code ?>][reason]" style="background-color:<? echo $bgcolor ?>">
+<?
+ foreach ($reasons as $value) {
+  echo "    <option value=\"$value\">$value</option>\n";
+ }
+?>
+   </select>
+  </td>
+ </tr>
+<?
+  } // end of code
+  SLClose();
+?>
+
+</table>
+</form>
+</center>
+<script language="JavaScript">
+ var f1 = opener.document.forms[0];
+ var f2 = document.forms[0];
+<?
+  foreach ($codes as $code => $cdata) {
+    echo " f2['form_line[$code][src]'].value  = f1.form_source.value;\n";
+    echo " f2['form_line[$code][date]'].value = f1.form_paydate.value;\n";
+  }
+?>
+ setins("Ins1");
+</script>
+</body>
+</html>
diff --git a/interface/billing/sl_eob_patient_note.php b/interface/billing/sl_eob_patient_note.php
new file mode 100644
index 000000000..611df4c57
--- /dev/null
+++ b/interface/billing/sl_eob_patient_note.php
@@ -0,0 +1,67 @@
+<?
+  // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+  // This allows entry and editing of a "billing note" for the patient.
+
+  include_once("../globals.php");
+  include_once("../../library/patient.inc");
+  include_once("../../library/forms.inc");
+
+  $info_msg = "";
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>EOB Posting - Patient Note</title>
+</head>
+<body>
+<?
+  $patient_id = $_GET['patient_id'];
+  if (! $patient_id) die("You cannot access this page directly.");
+
+  if ($_POST['form_save']) {
+    $thevalue = trim($_POST['form_note']);
+    $thename = $thevalue ? "Billing" : "";
+
+    sqlStatement("UPDATE patient_data SET " .
+      "genericname2 = '$thename', " .
+      "genericval2 = '$thevalue' " .
+      "WHERE pid = '$patient_id'");
+
+    echo "<script language='JavaScript'>\n";
+    if ($info_msg) echo " alert('$info_msg');\n";
+    echo " window.close();\n";
+    echo "</script></body></html>\n";
+    exit();
+  }
+
+  $row = sqlQuery("select fname, lname, genericname2, genericval2 " .
+    "from patient_data where pid = '$patient_id' limit 1");
+?>
+<center>
+
+<h2>Billing Note for <? echo $row['fname'] . " " . $row['lname'] ?></h2>
+<p>&nbsp;</p>
+
+<form method='post' action='sl_eob_patient_note.php?patient_id=<? echo $patient_id ?>'>
+
+<p>
+<input type='text' name='form_note' size='60' maxlength='255'
+ value='<? echo addslashes($row['genericval2']) ?>' />
+</p>
+
+<p>&nbsp;</p>
+<input type='submit' name='form_save' value='Save'>
+&nbsp;
+<input type='button' value='Cancel' onclick='window.close()'>
+
+</form>
+</center>
+
+</body>
+</html>
diff --git a/interface/billing/sl_eob_search.php b/interface/billing/sl_eob_search.php
new file mode 100644
index 000000000..f9bdf5d9d
--- /dev/null
+++ b/interface/billing/sl_eob_search.php
@@ -0,0 +1,472 @@
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ // This is the first of two pages to support posting of EOBs.
+ // The second is sl_eob_invoice.php.
+
+ include_once("../globals.php");
+ include_once("../../library/patient.inc");
+ include_once("../../library/sql-ledger.inc");
+ include_once("../../library/invoice_summary.inc.php");
+ include_once("../../custom/statement.inc.php");
+
+ $DEBUG = 0; // set to 0 for production, 1 to test
+
+ $alertmsg = '';
+
+ function bucks($amount) {
+  if ($amount)
+   printf("%.2f", $amount);
+ }
+
+ $today = date("Y-m-d");
+
+ SLConnect();
+
+ // Print statements if requested.
+ //
+ if ($_POST['form_print'] && $_POST['form_cb']) {
+
+  $fhprint = fopen($STMT_TEMP_FILE, 'w');
+
+  $where = "";
+  foreach ($_POST['form_cb'] as $key => $value) $where .= " OR ar.id = $key";
+  $where = substr($where, 4);
+
+  // Sort by patient so that multiple invoices can be
+  // represented on a single statement.
+  $res = SLQuery("SELECT ar.*, customer.name, " .
+   "customer.address1, customer.address2, " .
+   "customer.city, customer.state, customer.zipcode " .
+   "FROM ar, customer WHERE ( $where ) AND " .
+   "customer.id = ar.customer_id " .
+   "ORDER BY ar.customer_id, ar.transdate");
+  if ($sl_err) die($sl_err);
+
+  $stmt = array();
+
+  for ($irow = 0; $irow < SLRowCount($res); ++$irow) {
+   $row = SLGetRow($res, $irow);
+
+   // Determine the date of service.  An 8-digit encounter number is
+   // presumed to be a date of service imported during conversion.
+   // Otherwise look it up in the form_encounter table.
+   //
+   $svcdate = "";
+   list($pid, $encounter) = explode(".", $row['invnumber']);
+   if (strlen($encounter) == 8) {
+    $svcdate = substr($encounter, 0, 4) . "-" . substr($encounter, 4, 2) .
+      "-" . substr($encounter, 6, 2);
+   } else if ($encounter) {
+    $tmp = sqlQuery("SELECT date FROM form_encounter WHERE " .
+     "encounter = $encounter");
+    $svcdate = substr($tmp['date'], 0, 10);
+   }
+
+   // How many times have we dunned them for this invoice?
+   $intnotes = trim($row['intnotes']);
+   $duncount = substr_count(strtolower($intnotes), "statement sent");
+
+   // If this is a new patient then print the pending statement
+   // and start a new one.  This is an associative array:
+   //
+   //  pid     = patient ID
+   //  patient = patient name
+   //  amount  = total amount due
+   //  duedate = due date of the oldest included invoice
+   //  age     = number of days from duedate to today
+   //  to      = array of addressee name/address lines
+   //  lines   = array of:
+   //    dos     = date of service "yyyy-mm-dd"
+   //    desc    = description
+   //    amount  = charge less adjustments
+   //    paid    = amount paid
+   //    notice  = 1 for first notice, 2 for second, etc.
+   //
+   if ($stmt['pid'] != $row['customer_id']) {
+    fwrite($fhprint, create_statement($stmt));
+    $stmt['pid'] = $row['customer_id'];
+    $stmt['patient'] = $row['name'];
+    $stmt['to'] = array($row['name']);
+    if ($row['address1']) $stmt['to'][] = $row['address1'];
+    if ($row['address2']) $stmt['to'][] = $row['address2'];
+    $stmt['to'][] = $row['city'] . ", " . $row['state'] . " " . $row['zipcode'];
+    $stmt['lines'] = array();
+    $stmt['amount'] = '0.00';
+    $stmt['today'] = $today;
+    $stmt['duedate'] = $row['duedate'];
+   } else {
+    // Report the oldest due date.
+    if ($row['duedate'] < $stmt['duedate']) {
+     $stmt['duedate'] = $row['duedate'];
+    }
+   }
+
+   $stmt['age'] = round((strtotime($today) - strtotime($stmt['duedate'])) /
+    (24 * 60 * 60));
+
+   $invlines = get_invoice_summary($row['id']);
+   foreach ($invlines as $key => $value) {
+    $line = array();
+    $line['dos']     = $svcdate;
+    $line['desc']    = "Procedure $key";
+    $line['amount']  = sprintf("%.2f", $value['chg']);
+    $line['paid']    = sprintf("%.2f", $value['chg'] - $value['bal']);
+    $line['notice']  = $duncount + 1;
+    $stmt['lines'][] = $line;
+    $stmt['amount']  = sprintf("%.2f", $stmt['amount'] + $value['bal']);
+   }
+
+   // Record something in ar.intnotes about this statement run.
+   if ($intnotes) $intnotes .= "\n";
+   $intnotes = addslashes($intnotes . "Statement sent $today");
+   if (! $DEBUG && ! $_POST['form_without']) {
+    SLQuery("UPDATE ar SET intnotes = '$intnotes' WHERE id = " . $row['id']);
+    if ($sl_err) die($sl_err);
+   }
+  }
+
+  fwrite($fhprint, create_statement($stmt));
+
+  if ($DEBUG) {
+   $alertmsg = "Printing skipped; see test output in $STMT_TEMP_FILE";
+  } else {
+   exec("$STMT_PRINT_CMD $STMT_TEMP_FILE");
+   if ($_POST['form_without']) {
+    $alertmsg = "Now printing statements; invoices will not be updated.";
+   } else {
+    $alertmsg = "Now printing statements and updating invoices.";
+   }
+  }
+ }
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>EOB Posting - Search</title>
+
+<script language="JavaScript">
+
+function checkAll(checked) {
+ var f = document.forms[0];
+ for (var i = 0; i < f.elements.length; ++i) {
+  var ename = f.elements[i].name;
+  if (ename.indexOf('form_cb[') == 0)
+   f.elements[i].checked = checked;
+ }
+}
+
+function npopup(pid) {
+ window.open('sl_eob_patient_note.php?patient_id=' + pid, '_blank', 'width=500,height=250,resizable=1');
+ return false;
+}
+
+</script>
+
+</head>
+
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0'>
+<center>
+
+<form method='post' action='sl_eob_search.php'>
+
+<table border='0' cellpadding='5' cellspacing='0'>
+
+ <tr>
+  <td height="1" colspan="10">
+  </td>
+ </tr>
+
+ <tr>
+  <td colspan='2'>
+   &nbsp;
+  </td>
+  <td>
+   Source:
+  </td>
+  <td>
+   <input type='text' name='form_source' size='10' value='<? echo $_POST['form_source']; ?>'
+    title='A check number or claim number to identify the payment'>
+  </td>
+  <td>
+   Pay Date:
+  </td>
+  <td>
+   <input type='text' name='form_paydate' size='10' value='<? echo $_POST['form_paydate']; ?>'
+    title='Date of payment mm/dd/yyyy'>
+  </td>
+  <td>
+   Amount:
+  </td>
+  <td>
+   <input type='text' name='form_amount' size='10' value='<? echo $_POST['form_amount']; ?>'
+    title='Paid amount that you will allocate'>
+  </td>
+  <td colspan='2' align='right'>
+   <a href='sl_eob_help.php' target='_blank'>Help</a>
+  </td>
+ </tr>
+
+ <tr>
+  <td height="1" colspan="10">
+  </td>
+ </tr>
+
+ <tr bgcolor='#ddddff'>
+  <td>
+   Name:
+  </td>
+  <td>
+   <input type='text' name='form_name' size='10' value='<? echo $_POST['form_name']; ?>'
+    title='Any part of the patient name'>
+  </td>
+  <td>
+   Chart ID:
+  </td>
+  <td>
+   <input type='text' name='form_pid' size='10' value='<? echo $_POST['form_pid']; ?>'
+    title='Patient chart ID'>
+  </td>
+  <td>
+   Encounter:
+  </td>
+  <td>
+   <input type='text' name='form_encounter' size='10' value='<? echo $_POST['form_encounter']; ?>'
+    title='Encounter number'>
+  </td>
+  <td>
+   Svc Date:
+  </td>
+  <td>
+   <input type='text' name='form_date' size='10' value='<? echo $_POST['form_date']; ?>'
+    title='Date of service mm/dd/yyyy'>
+  </td>
+  <td>
+   <select name='form_category'>
+<?
+ foreach (array('Open', 'All', 'Due') as $value) {
+  echo "    <option value='$value'";
+  if ($_POST['form_category'] == $value) echo " selected";
+  echo ">$value</option>\n";
+ }
+?>
+   </select>
+  </td>
+  <td>
+   <input type='submit' name='form_search' value='Search'>
+  </td>
+ </tr>
+
+ <tr>
+  <td height="1" colspan="10">
+  </td>
+ </tr>
+
+</table>
+
+<table border='0' cellpadding='1' cellspacing='2' width='98%'>
+
+ <tr bgcolor="#dddddd">
+  <td class="dehead">
+   &nbsp;Patient
+  </td>
+  <td class="dehead">
+   &nbsp;Invoice
+  </td>
+  <td class="dehead">
+   &nbsp;Svc Date
+  </td>
+  <td class="dehead">
+   &nbsp;Due Date
+  </td>
+  <td class="dehead" align="right">
+   Amount&nbsp;
+  </td>
+  <td class="dehead" align="right">
+   Paid&nbsp;
+  </td>
+  <td class="dehead" align="right">
+   Balance&nbsp;
+  </td>
+  <td class="dehead" align="center">
+   Prv
+  </td>
+  <td class="dehead" align="center">
+   Sel
+  </td>
+ </tr>
+<?
+  if ($_POST['form_search'] || $_POST['form_print']) {
+    $form_name      = trim($_POST['form_name']);
+    $form_pid       = trim($_POST['form_pid']);
+    $form_encounter = trim($_POST['form_encounter']);
+    $form_date      = fixDate($_POST['form_date'], "");
+
+    $where = "";
+
+    if ($form_name) {
+      // Allow the last name to be followed by a comma and some part of a first name.
+      if (preg_match('/^(.*\S)\s*,\s*(.*)/', $form_name, $matches)) {
+        $form_name = $matches[2] . '% ' . $matches[1] . '%';
+      } else {
+        $form_name = "%$form_name%";
+      }
+      if ($where) $where .= " AND ";
+      $where .= "customer.name ILIKE '$form_name'";
+    }
+
+    if ($form_pid && $form_encounter) {
+      if ($where) $where .= " AND ";
+      $where .= "ar.invnumber = '$form_pid.$form_encounter'";
+    }
+    else if ($form_pid) {
+      if ($where) $where .= " AND ";
+      $where .= "ar.invnumber LIKE '$form_pid.%'";
+    }
+    else if ($form_encounter) {
+      if ($where) $where .= " AND ";
+      $where .= "ar.invnumber like '%.$form_encounter'";
+    }
+
+    if ($form_date) {
+      if ($where) $where .= " AND ";
+      $where .= "(ar.invnumber LIKE '%." . substr($form_date, 0, 4) . substr($form_date, 5, 2) .
+        substr($form_date, 8, 2) . "'";
+      $rez = sqlStatement("SELECT pid, encounter FROM form_encounter WHERE date = '$form_date'");
+      while ($row = sqlFetchArray($rez)) {
+        $where .= " OR ar.invnumber = '" . $row['pid'] . "." . $row['encounter'] . "'";
+      }
+      $where .= ")";
+    }
+
+    if (! $where) {
+      if ($_POST['form_category'] == 'Due') {
+        $where = "1 = 1";
+      } else {
+        die("At least one search parameter is required or you must select Due.");
+      }
+    }
+
+    $query = "SELECT ar.id, ar.invnumber, ar.duedate, ar.amount, ar.paid, " .
+      "ar.intnotes, ar.notes, ar.shipvia, customer.name " .
+      "FROM ar, customer WHERE $where AND customer.id = ar.customer_id ";
+    if ($_POST['form_category'] != 'All') {
+      $query .= "AND ar.amount != ar.paid ";
+      if ($_POST['form_category'] == 'Due') {
+        $query .= "AND ar.duedate <= CURRENT_DATE ";
+      }
+    }
+    $query .= "ORDER BY customer.name, ar.invnumber";
+
+    // echo "<!-- $query -->\n"; // debugging
+
+    $t_res = SLQuery($query);
+    if ($sl_err) die($sl_err);
+
+    for ($irow = 0; $irow < SLRowCount($t_res); ++$irow) {
+      $row = SLGetRow($t_res, $irow);
+
+      $bgcolor = (($irow & 1) ? "#ffdddd" : "#ddddff");
+
+      // Determine the date of service.  If this was a search parameter
+      // then we already know it.  Or an 8-digit encounter number is
+      // presumed to be a date of service imported during conversion.
+      // Otherwise look it up in the form_encounter table.
+      //
+      $svcdate = "";
+      list($pid, $encounter) = explode(".", $row['invnumber']);
+      if ($form_date) {
+        $svcdate = $form_date;
+      }
+      else if (strlen($encounter) == 8) {
+        $svcdate = substr($encounter, 0, 4) . "-" . substr($encounter, 4, 2) .
+          "-" . substr($encounter, 6, 2);
+      }
+      else if ($encounter) {
+        $tmp = sqlQuery("SELECT date FROM form_encounter WHERE " .
+          "encounter = $encounter");
+        $svcdate = substr($tmp['date'], 0, 10);
+      }
+
+      // $duncount was originally supposed to be the number of times that
+      // the patient was sent a statement for this invoice.
+      //
+      $duncount = substr_count(strtolower($row['intnotes']), "statement sent");
+
+      // But if we have not yet billed the patient, then compute $duncount as a
+      // negative count of the number of insurance plans for which we have not
+      // yet posted an EOB.
+      //
+      if (! $duncount) {
+        $insgot = strtolower($row['notes']);
+        $inseobs = strtolower($row['shipvia']);
+        foreach (array('ins1', 'ins2', 'ins3') as $value) {
+          if (strpos($insgot, $value) !== false &&
+              strpos($inseobs, $value) === false)
+            --$duncount;
+        }
+      }
+
+      $isdue = ($row['duedate'] <= $today && $row['amount'] > $row['paid']) ? " checked" : "";
+?>
+ <tr bgcolor='<? echo $bgcolor ?>'>
+  <td class="detail">
+   &nbsp;<a href="" onclick="return npopup(<? echo $pid ?>)"><? echo $row['name'] ?></a>
+  </td>
+  <td class="detail">
+   &nbsp;<a href="sl_eob_invoice.php?id=<? echo $row['id'] ?>"
+    target="_blank"><? echo $row['invnumber'] ?></a>
+  </td>
+  <td class="detail">
+   &nbsp;<? echo $svcdate ?>
+  </td>
+  <td class="detail">
+   &nbsp;<? echo $row['duedate'] ?>
+  </td>
+  <td class="detail" align="right">
+   <? bucks($row['amount']) ?>&nbsp;
+  </td>
+  <td class="detail" align="right">
+   <? bucks($row['paid']) ?>&nbsp;
+  </td>
+  <td class="detail" align="right">
+   <? bucks($row['amount'] - $row['paid']) ?>&nbsp;
+  </td>
+  <td class="detail" align="center">
+   <? echo $duncount ? $duncount : "&nbsp;" ?>
+  </td>
+  <td class="detail" align="center">
+   <input type='checkbox' name='form_cb[<? echo($row['id']) ?>]'<? echo $isdue ?> />
+  </td>
+ </tr>
+<?
+    }
+  }
+  SLClose();
+?>
+
+</table>
+
+<p>
+<input type='button' value='Select All' onclick='checkAll(true)' /> &nbsp;
+<input type='button' value='Clear All' onclick='checkAll(false)' /> &nbsp;
+<input type='submit' name='form_print' value='Print Selected Statements' /> &nbsp;
+<input type='checkbox' name='form_without' value='1' /> Without Update
+</p>
+
+</form>
+</center>
+<script>
+<?
+	if ($alertmsg) {
+		echo "alert('$alertmsg');\n";
+	}
+?>
+</script>
+</body>
+</html>
diff --git a/interface/billing/sl_receipts_report.php b/interface/billing/sl_receipts_report.php
new file mode 100644
index 000000000..4b9ef65be
--- /dev/null
+++ b/interface/billing/sl_receipts_report.php
@@ -0,0 +1,249 @@
+<?
+  // This module was written for one of my clients to report on cash
+  // receipts by practitioner.  It is not as complete as it should be
+  // but I wanted to make the code available to the project because
+  // many other practices have this same need. - rod@sunsetsystems.com
+
+  include_once("../globals.php");
+  include_once("../../library/patient.inc");
+  include_once("../../library/sql-ledger.inc");
+  include_once("../../library/acl.inc");
+
+  // This determines if a particular procedure code corresponds to receipts
+  // for the "Clinic" column as opposed to receipts for the practitioner.  Each
+  // practice will have its own policies in this regard, so you'll probably
+  // have to customize this function.  If you use the "fee sheet" encounter
+  // form then the code below may work for you.
+  //
+  include_once("../forms/fee_sheet/codes.php");
+  function is_clinic($code) {
+    global $cpt, $hcpcs;
+    return ($cpt['Lab'][$code] || $cpt['Immunizations'][$code] ||
+      $hcpcs['Therapeutic Injections'][$code]);
+  }
+
+  function bucks($amount) {
+    if ($amount)
+      printf("%.2f", $amount);
+  }
+
+  if (! acl_check('acct', 'rep')) die("Unauthorized access.");
+
+  SLConnect();
+?>
+<html>
+<head>
+<title>Receipts for Medical Services</title>
+</head>
+
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0'>
+<center>
+
+<h2>Cash Receipts</h2>
+
+<form method='post' action='sl_receipts_report.php'>
+
+<table border='0' cellpadding='3'>
+
+ <tr>
+  <td>
+<?
+	if (acl_check('acct', 'rep_a')) {
+		// Build a drop-down list of providers.
+		//
+		$query = "select id, lname, fname from users where " .
+			"authorized = 1 order by lname, fname";
+		$res = sqlStatement($query);
+		echo "   <select name='form_doctor'>\n";
+		echo "    <option value=''>All Providers\n";
+		while ($row = sqlFetchArray($res)) {
+			$provid = $row['id'];
+			echo "    <option value='$provid'";
+			if ($provid == $_POST['form_doctor']) echo " selected";
+			echo ">" . $row['lname'] . ", " . $row['fname'] . "\n";
+		}
+		echo "   </select>\n";
+	} else {
+		echo "<input type='hidden' name='form_doctor' value='" . $_SESSION['authUserID'] . "'>";
+	}
+?>
+   &nbsp;From:
+   <input type='text' name='form_from_date' size='10' value='<? echo $_POST['form_from_date']; ?>' title='MM/DD/YYYY'>
+   &nbsp;To:
+   <input type='text' name='form_to_date' size='10' value='<? echo $_POST['form_to_date']; ?>' title='MM/DD/YYYY'>
+   &nbsp;
+   <input type='checkbox' name='form_details' value='1'<? if ($_POST['form_details']) echo " checked"; ?>>Details
+   &nbsp;
+   <input type='submit' name='form_refresh' value='Refresh'>
+  </td>
+ </tr>
+
+ <tr>
+  <td height="1">
+  </td>
+ </tr>
+
+</table>
+
+<table border='0' cellpadding='1' cellspacing='2' width='98%'>
+
+ <tr bgcolor="#dddddd">
+  <td class="dehead">
+   Practitioner
+  </td>
+  <td class="dehead">
+   Date
+  </td>
+  <td class="dehead">
+   Invoice
+  </td>
+  <td class="dehead">
+   Procedure
+  </td>
+  <td class="dehead" align="right">
+   Prof.
+  </td>
+  <td class="dehead" align="right">
+   Clinic
+  </td>
+ </tr>
+<?
+  $chart_id_cash = SLQueryValue("select id from chart where accno = '$sl_cash_acc'");
+  if ($sl_err) die($sl_err);
+
+  if ($_POST['form_refresh']) {
+    $form_doctor = $_POST['form_doctor'];
+    $from_date = fixDate($_POST['form_from_date']);
+    $to_date   = fixDate($_POST['form_to_date']);
+
+    $query = "select acc_trans.amount, acc_trans.transdate, acc_trans.memo, " .
+      "ar.invnumber, ar.employee_id from acc_trans, ar where " .
+      "acc_trans.chart_id = $chart_id_cash and " .
+      "acc_trans.transdate >= '$from_date' and " .
+      "acc_trans.transdate <= '$to_date' and " .
+      "ar.id = acc_trans.trans_id";
+
+    if ($form_doctor) {
+      $tmp = sqlQuery("select foreign_id from integration_mapping where " .
+        "foreign_table = 'salesman' and local_id = $form_doctor");
+      // $emplid = SLQueryValue("select id from employee where employeenumber = " .
+      //   $tmp['foreign_id']);
+      $emplid = $tmp['foreign_id'];
+      $query .= " and ar.employee_id = $emplid";
+    }
+
+    $query .= " order by ar.employee_id, acc_trans.transdate, ar.invnumber, acc_trans.memo";
+
+    echo "<!-- $query -->\n";
+
+    $t_res = SLQuery($query);
+    if ($sl_err) die($sl_err);
+
+    $docname     = "";
+    $docnameleft = "";
+    $docid       = 0;
+    $doctotal1   = 0;
+    $grandtotal1 = 0;
+    $doctotal2   = 0;
+    $grandtotal2 = 0;
+
+    for ($irow = 0; $irow < SLRowCount($t_res); ++$irow) {
+      $row = SLGetRow($t_res, $irow);
+      $amount1 = 0;
+      $amount2 = 0;
+      if (is_clinic($row['memo']))
+        $amount2 -= $row['amount'];
+      else
+        $amount1 -= $row['amount'];
+
+      if ($docid != $row['employee_id']) {
+        if ($docid) {
+          // Print doc totals.
+?>
+
+ <tr bgcolor="#ddddff">
+  <td class="detail" colspan="4">
+   Totals for <? echo $docname ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($doctotal1) ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($doctotal2) ?>
+  </td>
+ </tr>
+<?
+        }
+        $doctotal1 = 0;
+        $doctotal2 = 0;
+        $docid = $row['employee_id'];
+        $docname = SLQueryValue("select name from employee where id = $docid");
+        $docnameleft = $docname;
+      }
+
+      if ($_POST['form_details']) {
+?>
+
+ <tr>
+  <td class="detail">
+   <? echo $docnameleft; $docnameleft = "&nbsp;" ?>
+  </td>
+  <td class="dehead">
+   <? echo $row['transdate'] ?>
+  </td>
+  <td class="detail">
+   <? echo $row['invnumber'] ?>
+  </td>
+  <td class="dehead">
+   <? echo $row['memo'] ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($amount1) ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($amount2) ?>
+  </td>
+ </tr>
+<?
+      }
+      $doctotal1   += $amount1;
+      $doctotal2   += $amount2;
+      $grandtotal1 += $amount1;
+      $grandtotal2 += $amount2;
+    }
+?>
+
+ <tr bgcolor="#ddddff">
+  <td class="detail" colspan="4">
+   Totals for <? echo $docname ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($doctotal1) ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($doctotal2) ?>
+  </td>
+ </tr>
+
+ <tr bgcolor="#ffdddd">
+  <td class="detail" colspan="4">
+   Grand Totals
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($grandtotal1) ?>
+  </td>
+  <td class="dehead" align="right">
+   <? bucks($grandtotal2) ?>
+  </td>
+ </tr>
+
+<?
+  }
+  SLClose();
+?>
+
+</table>
+</form>
+</center>
+</body>
+</html>
diff --git a/interface/login/filler.php b/interface/login/filler.php
index 72386f67a..ba8470ae4 100644
--- a/interface/login/filler.php
+++ b/interface/login/filler.php
@@ -1,20 +1,14 @@
 <?
 $ignoreAuth=true;
 include_once("../globals.php");
-
 ?>
-
-
 <html>
 <head>
 <title>Navigation</title>
-
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-
 </head>
-<body  topmargin=0 rightmargin=0 leftmargin=5 marginheight=0 bottommargin=0 link=#000000 vlink=#000000 alink=#000000>
+<body  topmargin='0' rightmargin='0' leftmargin='5' marginheight='0' bottommargin='0'
+ link='#000000' vlink='#000000' alink='#000000' bgcolor='#24262c'>
 <img style="position:absolute;top:0;left:0;"src=" <?=$GLOBALS['webroot']?>/interface/pic/logo.gif" />
-
 </body>
 </html>
diff --git a/interface/login/login.php b/interface/login/login.php
index acaf616ff..60a818a38 100644
--- a/interface/login/login.php
+++ b/interface/login/login.php
@@ -83,7 +83,7 @@ if (count($result) != 1) {
 </form>
 
 <address>
-<a href="copyright_notice.html" target="main">Copyright Notice:</a><br />
+<a href="copyright_notice.html" target="main">Copyright Notice</a><br />
 </address>
 
 </center>
diff --git a/interface/main/authorizations/authorizations.php b/interface/main/authorizations/authorizations.php
index 9682bf2ad..d7af0afb2 100644
--- a/interface/main/authorizations/authorizations.php
+++ b/interface/main/authorizations/authorizations.php
@@ -53,7 +53,7 @@ sqlStatement("update transactions set authorized=1 where pid='".$_GET["pid"]."'"
 														      
 
 //fetch billing information:
-if ($res = sqlStatement("select *, concat(u.fname,' ', u.lname) as user from billing LEFT JOIN users as u on billing.user = u.id where billing.authorized=0 and groupname='$groupname'")) {
+if ($res = sqlStatement("select *, concat(u.fname,' ', u.lname) as user from billing LEFT JOIN users as u on billing.user = u.id where billing.authorized = 0 and billing.activity = 1 and groupname='$groupname'")) {
 for ($iter = 0;$row = sqlFetchArray($res);$iter++)
 		$result[$iter] = $row;
 
diff --git a/interface/main/calendar/find_patient.php b/interface/main/calendar/find_patient.php
index 212ef1afd..d72714a00 100644
--- a/interface/main/calendar/find_patient.php
+++ b/interface/main/calendar/find_patient.php
@@ -8,7 +8,7 @@ if ($_GET['show_pnote_link'] == true || $_POST['show_pnote_link'] == true) {
   $pnote_link = "&show_pnote_link=1";
 }
 //the maximum number of patient records to display:
-$M = 100;
+$M = 2000;
 
 /*if ($_GET['new'] == 1) {
 	echo "new is 1";
@@ -116,7 +116,7 @@ else {
 <input name=lastname size=15 value="<?echo $_SESSION["lastname"];?>" onfocus="javascript:document.findpatientform.lastname.value='';"><br>
 <select name="findBy" size=1>
 	<option value="ID">ID</option>
-	<option value="Last" selected>Last Name</option>
+	<option value="Last" selected>Name</option>
 	<option value="SSN">SSN</option>
 	<option value="DOB">DOB</option>
 </select><br>
diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
dissimilarity index 92%
index dddb4a205..b12cdaf3d 100644
--- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
+++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/default.html
@@ -1,156 +1,371 @@
-[-*Smarty*-]
-[-config_load file="default.conf"-]
-[-*Load the Language Definitions*-]
-[-config_load file="lang.$USER_LANG"-]
-[-include file="$TPL_NAME/views/header.html"-]
-[-* we want to include out stylesheet for this view*-]
-[-fetch file="$TPL_STYLE_PATH/day.css" assign="css"-]
-[-eval var=$css-]
-
-[-if $PRINT_VIEW != 1-]
-[-*Main Navigation*-]
-[-include file="$TPL_NAME/views/global/navigation.html"-]
-[-/if-]
-
-[-assign var="dayname" value=$DATE|date_format:"%w"-]
-[-assign var="day" value=$DATE|date_format:"%d"|string_format:"%1d"-]
-[-assign var="month" value=$DATE|date_format:"%m"|string_format:"%1d"-]
-[-assign var="year" value=$DATE|date_format:"%Y"|string_format:"%4d"-]
-
-<table width="100%" border="0" cellpadding="5" cellspacing="0" class="dayheader">
-    <tr>
-        <td nowrap width="%100" align="center" valign="middle" class="dayheader">
-			<a href="[-$PREV_DAY_URL-]">&lt;&lt;</a>
-        	[-if $USE_INT_DATES eq true-]
-				[-pc_date_format date=$DATE format=#_PC_DATE_FORMAT_INT#-]
-			[-else-]
-				[-pc_date_format date=$DATE format=#_PC_DATE_FORMAT_STD#-]
-			[-/if-]
-			<a href="[-$NEXT_DAY_URL-]">&gt;&gt;</a>
-		</td>
-		[-if $PRINT_VIEW != 1-]
-		<td nowrap align="right" valign="top" class="dayheader">
-		</td>
-		[-/if-]
-	</tr>
-</table>
-
-<table width='%100' border="0" cellpadding="0" cellspacing="0" >
-	<tr>
-		[-foreach item=provider from=$providers-]
-		<td valign='top'>
-		<table width='%100' height='%100' border="1" cellpadding="0" cellspacing="0" valign='top'>
- 		<tr><td >[-$provider.fname[0]-][-$provider.lname-]</td>
-		</tr>
-		<tr>
-		[-foreach name=dates item=events key=date from=$A_EVENTS-]
-		<td>
-		<table    cellpadding="0" cellspacing="0" class="eventsentry">
-								    	[-assign var="dayname" value=$date|date_format:"%w"-]
-								    	[-assign var="day" value=$date|date_format:"%d"|string_format:"%1d"-]
-								    	[-assign var="month" value=$date|date_format:"%m"|string_format:"%1d"-]
-								    	[-assign var="year" value=$date|date_format:"%Y"|string_format:"%4d"-]
-								    	[-assign var="eventdate" value=$date|date_format:"%Y%m%d"-]
-										[-pc_sort_events var="S_EVENTS" sort="time" order="asc" value=$A_EVENTS-]
-
-[-php-]
-	$arr_events = (array)$this->_tpl_vars['S_EVENTS'][$this->_tpl_vars['date']];
-	list($this->_tpl_vars['eventkey'], $this->_tpl_vars['event']) = each($arr_events);
-[-/php-]
-
-					[-foreach name=times item=time from=$times-]
-						<tr>
-						<td  valign='top' class="eventslist" width ='90'>
-						[-if $time.mer == "pm" -]
-								[-assign var="event_startampm" value=2-]
-							[-if $time.hour > 12 -]
-								[-math equation="x-12" x=$time.hour-]:[-$time.minute-]
-							[-else-]
-								[-$time.hour-]:[-$time.minute-]
-							[-/if-]
-						[-else-]
-							[-assign var="event_startampm" value=1-]
-							[-$time.hour-]:[-$time.minute-]
-						[-/if-]
-						[-$time.mer-] <a href="index.php?module=PostCalendar&func=submit&event_startampm=[-$event_startampm-]&event_starttimeh=[-$time.hour-]&event_starttimem=[-$time.minute-]&Date=[-$eventdate-]&event_userid=[-$provider.id-]">
-						<img align="middle" src="[-$TPL_IMAGE_PATH-]/new.gif" border="0" vspace="0" hspace="0"/></a>
-						</td>
-						[-assign var="eventsbydate" value=$S_EVENTS.$date-]
-
-						[-* foreach name=events key=eventkey item=event from=$S_EVENTS.$date *-]
-
-[-php-]
-	for (; isset($this->_tpl_vars['eventkey']);
-		list($this->_tpl_vars['eventkey'], $this->_tpl_vars['event']) = each($arr_events))
-	{
-[-/php-]
-
-							[-assign var="starth" value=$event.startTime|date_format:"%H"-]
-							[-assign var="displaystarth" value=$event.startTime|date_format:"%I:%M %p" -]
-							[-assign var="startm" value=$event.startTime|date_format:"%M"-]
-							[-assign var="mykey" value=$eventkey-]
-
-							[-* if $time.hour == $starth && $startm >= $time.minute && $startm < ($time.minute + $interval) && $event.aid == $provider.id *-]
-
-[-php-]
-		if ($this->_tpl_vars['event']['aid'] != $this->_tpl_vars['provider']['id'])
-			continue;
-		if ($this->_tpl_vars['starth'] < $this->_tpl_vars['time']['hour'])
-			continue;
-		if ($this->_tpl_vars['starth'] > $this->_tpl_vars['time']['hour'])
-			break;
-		if ($this->_tpl_vars['startm'] < $this->_tpl_vars['time']['minute'])
-			continue;
-		if ($this->_tpl_vars['startm'] >= ($this->_tpl_vars['time']['minute'] + $this->_tpl_vars['interval']))
-			break;
-[-/php-]
-
-								[-assign var="flagfound" value=true-]
-								[-assign var="eid" value=$event.eid-]
-								<td   class="eventsentry" width="[-math equation="$day_td_width * 10"-]" rowspan=[-$event.intervals-] style="{background-color: [-$event.catcolor-]}">
-								<a href="[-pc_url action=detail eid=$event.eid date=$date-]" [-pc_popup delay="500"  bgcolor=$event.catcolor caption=$event.title text=$event.hometext-]>
-								[-assign var=short_event_title value=$event.title|strip_tags -]
-								[-$short_event_title|truncate::"$day_td_width":""-]
-									</a><br/>
-								[-$displaystarth-]([-$event.duration_hours-]:[-$event.duration_minutes-])<br />
-								[-include file="$TPL_NAME/user/patient_line.html" event=$event show_icons=true show_provider=false show_patient=true -]&nbsp;
-								</td>
-
-							[-* /if *-]
-						[-* /foreach *-]
-
-[-php-]
-	} // end for
-[-/php-]
-
-						[-assign var="flagfound" value=false -]
-						</tr>
-					[-/foreach-]
-				</table>
-				</td>
-			[-/foreach-]
-
-			</tr>
-
-			</table>
-			</td>
-		[-/foreach-]
-	</tr>
-</table>
-
-[-if $PRINT_VIEW != 1-]
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td align="right">
-            <a href="[-pc_url action="day" print="true"-]">[-#_PC_THEME_PRINT#-]</a>
-        	</td>
-    		</tr>
-		</table>
-
-	</td>
-</tr>
-</table>
-[-/if-]
-[-*footer*-]
-[-include file="$TPL_NAME/views/global/footer.html"-]
-[-include file="$TPL_NAME/views/footer.html"-]
+[-*Smarty*-]
+[-*****************************************************************************-]
+[-* This is the source code for both day/default.html and week/default.html.  *-]
+[-* They should always be identical.  If you change one, copy to the other!   *-]
+[-*****************************************************************************-]
+[-* Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com> and others           *-]
+[-*                                                                           *-]
+[-* 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.                    *-]
+[-*****************************************************************************-]
+[-config_load file="default.conf"-]
+[-*Load the Language Definitions*-]
+[-config_load file="lang.$USER_LANG"-]
+[-include file="$TPL_NAME/views/header.html"-]
+[-* we want to include out stylesheet for this view*-]
+[-fetch file="$TPL_STYLE_PATH/day.css" assign="css"-]
+[-eval var=$css-]
+
+<style>
+a       { text-decoration:none; }
+.tacell { font-size:10pt; background-color:#ddffdd; text-align:right; }
+.tucell { font-size:10pt; background-color:#ffbbbb; text-align:right; }
+.eacell { font-size:10pt; background-color:#ffffff; }
+.eucell { font-size:10pt; background-color:#ffbbbb; }
+.nobot  { border-bottom-width:0px; }
+.notop  { border-top-width:0px; }
+</style>
+
+<script language='JavaScript'>
+function newEvt(startampm, starttimeh, starttimem, eventdate, providerid) {
+ location = 'index.php?module=PostCalendar&func=submit' +
+  '&event_startampm=' + startampm +
+  '&event_starttimeh=' + starttimeh +
+  '&event_starttimem=' + starttimem +
+  '&Date=' + eventdate +
+  '&event_userid=' + providerid;
+}
+function oldEvt(eventdate, eventid) {
+ location = 'index.php?module=PostCalendar&func=view&viewtype=details' +
+  '&Date=' + eventdate +
+  '&eid=' + eventid;
+}
+function goPid(pid) {
+ top.location = '../../patient_file/patient_file.php' +
+  '?set_pid=' + pid + '&pid=' + pid;
+}
+</script>
+
+[-php-]
+
+ // [-if $PRINT_VIEW != 1-]
+ // [-*Main Navigation*-]
+ // [-include file="$TPL_NAME/views/global/navigation.html"-]
+ // [-/if-]
+
+ $A_EVENTS  =& $this->_tpl_vars['A_EVENTS'];
+ $S_EVENTS  =& $this->_tpl_vars['S_EVENTS'];
+ $providers =& $this->_tpl_vars['providers'];
+ $times     =& $this->_tpl_vars['times'];
+ $interval  =  $this->_tpl_vars['interval'];
+ $viewtype  =  $this->_tpl_vars['VIEW_TYPE'];
+ $PREV_WEEK_URL = $this->_tpl_vars['PREV_WEEK_URL'];
+ $NEXT_WEEK_URL = $this->_tpl_vars['NEXT_WEEK_URL'];
+ $PREV_DAY_URL  = $this->_tpl_vars['PREV_DAY_URL'];
+ $NEXT_DAY_URL  = $this->_tpl_vars['NEXT_DAY_URL'];
+
+ $Date =  postcalendar_getDate();
+ if (!isset($y)) $y = substr($Date, 0, 4);
+ if (!isset($m)) $m = substr($Date, 4, 2);
+ if (!isset($d)) $d = substr($Date, 6, 2);
+
+ // echo "<!-- There are " . count($A_EVENTS) . " A_EVENTS days -->\n";
+
+ $MULTIDAY = count($A_EVENTS) > 1;
+
+ $provinfo = getProviderInfo();
+
+ echo "<form action='index.php?module=PostCalendar&func=view' method='post'>\n";
+ echo "<center>\n";
+ echo "<table border='0' cellpadding='0' cellspacing='0' width='99%'>\n";
+ echo " <tr><td colspan='3' height='5'></td></tr>\n";
+ echo " <tr>\n";
+
+ // Build the scrolling selection list of providers.
+ echo "  <td rowspan='2' align='left' valign='top' width='33%' nowrap>\n";
+ echo "   <select multiple size='3' name='pc_username[]'>\n";
+ echo "    <option value='__PC_ALL__'>All Users</option>\n";
+ foreach ($provinfo as $doc) {
+  $username = $doc['username'];
+  echo "    <option value='$username'";
+  foreach ($providers as $provider)
+   if ($provider['username'] == $username) echo " selected";
+  echo ">" . $doc['fname'] . " " . $doc['lname'] . "</option>\n";
+ }
+ echo "   </select>\n";
+ echo "  </td>\n";
+
+ // Build the date and view type selectors and the Go button.
+ echo "  <td align='center' valign='top' width='34%' nowrap>\n";
+ echo "   <select name='jumpmonth'>\n";
+ foreach (array('01' => 'Jan', '02' => 'Feb', '03' => 'Mar', '04' => 'Apr',
+                '05' => 'May', '06' => 'Jun', '07' => 'Jul', '08' => 'Aug',
+                '09' => 'Sep', '10' => 'Oct', '11' => 'Nov', '12' => 'Dec')
+          as $key => $value) {
+  echo "    <option value='$key'";
+  if ($key == $m) echo " selected";
+  echo ">$value</option>\n";
+ }
+ echo "   </select>";
+ echo "<select name='jumpday'>\n";
+ for ($i = 1; $i <= 31; ++$i) {
+  echo "    <option value='$i'";
+  if ($i == $d) echo " selected";
+  echo ">$i</option>\n";
+ }
+ echo "   </select>";
+ echo "<select name='jumpyear'>\n";
+ for ($i = 2005; $i <= 2015; ++$i) {
+  echo "    <option value='$i'";
+  if ($i == $y) echo " selected";
+  echo ">$i</option>\n";
+ }
+ echo "   </select>\n";
+ echo "   <select name='viewtype'>\n";
+ foreach (array('day' => 'Day', 'week' => 'Week', 'month' => 'Month', 'year' => 'Year')
+          as $key => $value) {
+  echo "    <option value='$key'";
+  if ($key == $viewtype) echo " selected";
+  echo ">$value</option>\n";
+ }
+ echo "   </select>\n";
+ echo "   &nbsp;<input type='submit' name='submit' value='Go' />\n";
+ echo "  </td>\n";
+
+ // Show the Add and Search buttons.
+ echo "  <td align='right' valign='top' width='33%' nowrap>\n";
+ echo "   <input type='button' value='Add' onclick='location=\"index.php?module=PostCalendar&func=submit&Date=$Date&event_starttimeh=23&event_startampm=2\"' />\n";
+ echo "   <input type='button' value='Search' onclick='location=\"index.php?module=PostCalendar&func=search\"' />\n";
+ echo "  </td>\n";
+ echo " </tr>\n";
+
+ // Show the date/range and its previous- and next-day/week selectors.
+ echo " <tr>\n";
+ echo "  <td align='center' width='34%' nowrap>\n";
+ $atmp = array_keys($A_EVENTS);
+ if ($MULTIDAY) {
+  echo "<a href='$PREV_WEEK_URL'>&lt;&lt;</a>&nbsp;\n";
+  echo date("F j Y", strtotime($atmp[0]));
+  echo " - ";
+  echo date("F j Y", strtotime($atmp[count($atmp)-1]));
+  echo "&nbsp;<a href='$NEXT_WEEK_URL'>&gt;&gt;</a>\n";
+ } else {
+  echo "<a href='$PREV_DAY_URL'>&lt;&lt;</a>&nbsp;\n";
+  echo date("l, F j, Y", strtotime($atmp[0]));
+  echo "&nbsp;<a href='$NEXT_DAY_URL'>&gt;&gt;</a>\n";
+ }
+ echo "  </td>\n";
+ echo "  <td align='right' width='33%' nowrap>\n";
+ echo "   &nbsp;\n";
+ echo "  </td>\n";
+
+ echo " </tr>\n";
+ echo "</table>\n";
+ echo "</center>\n";
+ echo "</form>\n";
+
+[-/php-]
+
+[-assign var="dayname" value=$DATE|date_format:"%w"-]
+[-assign var="day"     value=$DATE|date_format:"%d"|string_format:"%1d"-]
+[-assign var="month"   value=$DATE|date_format:"%m"|string_format:"%1d"-]
+[-assign var="year"    value=$DATE|date_format:"%Y"|string_format:"%4d"-]
+
+[-pc_sort_events var="S_EVENTS" sort="time" order="asc" value=$A_EVENTS-]
+
+[-php-]
+
+ echo "<table width='100%' border='1' cellpadding='1' cellspacing='0' >\n";
+
+ // For each day...
+ foreach ($A_EVENTS as $date => $events) {
+  $need_headers = true;
+  $eventdate = substr($date, 0, 4) . substr($date, 5, 2) . substr($date, 8, 2);
+
+  // If multiple days then show a date header for each.
+  if ($MULTIDAY) {
+   echo " <tr>\n";
+   echo "  <td colspan='" . (count($providers) * 2) . "' align='center'>" .
+        date("l, F j, Y", strtotime($date)) . "</td>";
+   echo " </tr>\n";
+  }
+
+  $arr_events = $S_EVENTS[$date];
+  list($slotkey, $slotevent) = each($arr_events);
+
+  // This is an array of provider status information for this day,
+  // used to properly assign table cell attributes.
+  $provstat = array();
+
+  $slotindex = 0;
+  $lastslotindex = count($times) - 1;
+
+  // For each time slot...
+  foreach ($times as $slottime) {
+   $startampm = ($slottime['mer']) == "pm" ? 2 : 1;
+   $starttimeh = $slottime['hour'];
+   $starttimem = $slottime['minute'];
+
+   // Repeat doc names at 1PM.  This is a kludge; omit it for released code.
+   // if ($starttimeh == 13 && $starttimem == 0) $need_headers = true;
+
+   // Get all events just for this time slot now, because we can pick up where
+   // we left off and because we don't want to re-scan all events for the day
+   // for each table cell.
+   //
+   $arr_slot = array();
+   for (; isset($slotkey); list($slotkey, $slotevent) = each($arr_events)) {
+    $starth = substr($slotevent['startTime'], 0, 2);
+    $startm = substr($slotevent['startTime'], 3, 2);
+
+    if ($starth > $starttimeh) break;
+    if ($startm >= ($starttimem + $interval)) break;
+    $arr_slot[$slotkey] = $slotevent;
+
+    $catid = $slotevent['catid'];
+    $providerid = $slotevent['aid'];
+    $durminutes = ceil($slotevent['duration'] / 60);
+    $durslots = ceil($durminutes / $interval);
+
+    // While we're here, collect information for setting cell colors.
+    if ($catid == 2) { // in office
+     $provstat[$providerid]['in'] = true;
+    }
+    else if ($catid == 3) { // out of office
+     $provstat[$providerid]['in'] = false;
+    }
+    else if ($catid == 4 || $catid == 8 || $catid == 11) { // unavailable types
+     $endindex = $slotindex + $durslots;
+     for ($i = $slotindex; $i < $endindex; ++$i) {
+      $provstat[$providerid][$i]['res'] = true;
+     }
+    }
+    // if duration > slot size then mark slots for border control.
+    if ($durslots > 1) {
+     $endindex = $slotindex + $durslots - 1;
+     for ($i = $slotindex; $i < $endindex; ++$i) {
+      $provstat[$providerid][$i]['ext'] = true;
+     }
+    }
+   }
+
+   // Write a header row with the provider names if appropriate.
+   if ($need_headers) {
+    $need_headers = false;
+    echo " <tr>\n";
+    foreach ($providers as $provider) {
+     echo "  <td colspan='2' align='center'>";
+     echo $provider['fname'][0] . " " . $provider['lname'];
+     echo "</td>\n";
+    }
+    echo " </tr>\n";
+   }
+
+   echo " <tr>\n";
+
+   // We are now ready to write the table row for the current time slot.
+   // This loops once for each provider to be displayed.
+   //
+   foreach ($providers as $provider) {
+    $providerid = $provider['id'];
+
+    $content = ""; // this will be the event cell content
+
+    $clsuffix = "acell";
+    if ($provstat[$providerid][$slotindex]['res'] || ! $provstat[$providerid]['in']) {
+      $clsuffix = "ucell";
+    }
+
+    // Remove top and/or bottom table cell borders using CSS when events span
+    // time slots or when the practitioner is not in-office.  Using "rowspan"
+    // would be a difficult and inferior solution to this problem.
+    //
+    $tdstyle="";
+    if ($slotindex < $lastslotindex &&
+        ($provstat[$providerid][$slotindex]['ext'] || !$provstat[$providerid]['in'])) {
+     $tdstyle .= " nobot";
+    }
+    if ($slotindex > 0 && ($provstat[$providerid][$slotindex-1]['ext'] ||
+        !($provstat[$providerid]['in'] || $provstat[$providerid]['wasin']))) {
+     $tdstyle .= " notop";
+    }
+
+    $disptimeh = ($starttimeh > 12) ? ($starttimeh - 12) : $starttimeh;
+
+    echo "  <td class='t$clsuffix'";
+    if ($slotindex == 0) echo " width='1%'";
+    echo ">";
+    echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid)'>";
+    echo "$disptimeh:$starttimem";
+    echo "</a></td>\n";
+
+    echo "  <td class='e$clsuffix$tdstyle'>";
+
+    // Scan all events for this time slot and generate the associated HTML for
+    // this doc.  JavaScript is used in hrefs to reduce the volume of output.
+    //
+    reset($arr_slot);
+    while (list($eventkey, $event) = each($arr_slot)) {
+     if ($event['aid'] != $providerid) continue;
+     if ($content) $content .= " ";
+     $starth = substr($event['startTime'], 0, 2);
+     $startm = substr($event['startTime'], 3, 2);
+     $eventid = $event['eid'];
+     $patientid = $event['pid'];
+     $commapos = strpos($event['patient_name'], ",");
+     $lname = addslashes(ucfirst(strtolower(substr($event['patient_name'], 0, $commapos))));
+     $fname = addslashes(ucfirst(strtolower(substr($event['patient_name'], $commapos + 2))));
+     $patient_dob = $event['patient_dob'];
+     $patient_age = $event['patient_age'];
+     $catid = $event['catid'];
+     $catname = $event['catname'];
+     $title = "$fname, age $patient_age ($patient_dob) " . addslashes($event['hometext']);
+     if ($catid == 2 || $catid == 3 || $catid == 4 || $catid == 8 || $catid == 11) {
+      if      ($catid ==  2) $catname = "IN";
+      else if ($catid ==  3) $catname = "OUT";
+      else if ($catid ==  4) $catname = "VACATION";
+      else if ($catid ==  8) $catname = "LUNCH";
+      else if ($catid == 11) $catname = "RESERVED";
+      // Omit lunch, vacation, etc. if the doc is not in-office.
+      if ($provstat[$providerid]['in'] || $catid < 4) {
+       $content .= "<a href='javascript:oldEvt($eventdate,$eventid)'>";
+       $content .= $catname . "</a>";
+      }
+     }
+     else { // some sort of patient appointment
+      $content .= "<a href='javascript:oldEvt($eventdate,$eventid)' title='$catname'>";
+      $content .= $startm . "</a>";
+      $content .= "<a href='javascript:goPid($patientid)' title='$title'>-";
+      if ($catid == 1) $content .= "<strike>";
+      $content .= $lname;
+      if ($catid == 1) $content .= "</strike>";
+      $content .= "</a>";
+     }
+    } // end while
+
+    if (! $content) $content = "&nbsp;";
+    echo $content . "</td>\n";
+
+    // Keep track of whether the doc was in during the previous time slot.
+    $provstat[$providerid]['wasin'] = $provstat[$providerid]['in'];
+
+   } // end provider
+
+   echo " </tr>\n";
+
+   ++$slotindex;
+  } // end time slot
+ } // end day
+
+ echo "</table>\n";
+
+ // [-*footer*-]
+ // [-include file="$TPL_NAME/views/global/footer.html"-]
+ // [-include file="$TPL_NAME/views/footer.html"-]
+
+[-/php-]
+
+</body>
+</html>
diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
dissimilarity index 92%
index 4243f7869..b12cdaf3d 100644
--- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
+++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/week/default.html
@@ -1,154 +1,371 @@
-[-*Smarty*-]
-[-config_load file="default.conf"-]
-[-*Load the Language Definitions*-]
-[-config_load file="lang.$USER_LANG"-]
-[-include file="$TPL_NAME/views/header.html"-]
-[-* we want to include out stylesheet for this view*-]
-[-fetch file="$TPL_STYLE_PATH/day.css" assign="css"-]
-[-eval var=$css-]
-
-[-if $PRINT_VIEW != 1-]
-[-*Main Navigation*-]
-[-include file="$TPL_NAME/views/global/navigation.html"-]
-[-/if-]
-[-assign var="dayname" value=$DATE|date_format:"%w"-]
-[-assign var="day" value=$DATE|date_format:"%d"|string_format:"%1d"-]
-[-assign var="month" value=$DATE|date_format:"%m"|string_format:"%1d"-]
-[-assign var="year" value=$DATE|date_format:"%Y"|string_format:"%4d"-]
-
-<table width="100%" border="0" cellpadding="5" cellspacing="0" class="weekheader">
-    <tr>
-        <td nowrap width="100%" align="center" valign="middle" class="weekheader">
-			<a href="[-$PREV_WEEK_URL-]">&lt;&lt;</a>
-        	[-pc_week_range date=$DATE sep=" - " format=#_PC_DATE_FORMAT_MDY#-]
-			<a href="[-$NEXT_WEEK_URL-]">&gt;&gt;</a>
-		[-if $PRINT_VIEW != 1-]
-		<td nowrap align="right" valign="top" class="weekheader">
-		</td>
-		[-/if-]
-	</tr>
-</table>
-
-<table width='%100' border="0" cellpadding="0" cellspacing="0" >
-	<tr>
-		[-foreach item=provider from=$providers-]
-		<td valign='top'>
-		<table width='%100' height='%100' border="1" cellpadding="0" cellspacing="0" valign='top'>
- 		<tr><td >[-$provider.fname[0]-][-$provider.lname-]</td>
-		</tr>
-
-		[-foreach name=dates item=events key=date from=$A_EVENTS-]
-
-		<tr>
-		<td>
-		<table    cellpadding="0" cellspacing="0" class="eventsentry">
-								    	[-assign var="dayname" value=$date|date_format:"%w"-]
-								    	[-assign var="day" value=$date|date_format:"%d"|string_format:"%1d"-]
-								    	[-assign var="month" value=$date|date_format:"%m"|string_format:"%1d"-]
-								    	[-assign var="year" value=$date|date_format:"%Y"|string_format:"%4d"-]
-								    	[-assign var="eventdate" value=$date|date_format:"%Y%m%d"-]
-										[-pc_sort_events var="S_EVENTS" sort="time" order="asc" value=$A_EVENTS-]
-							[-pc_date_format date=$date format=#_PC_DATE_FORMAT_STD#-]
-
-[-php-]
-	$arr_events = (array)$this->_tpl_vars['S_EVENTS'][$this->_tpl_vars['date']];
-	list($this->_tpl_vars['eventkey'], $this->_tpl_vars['event']) = each($arr_events);
-[-/php-]
-
-					[-foreach name=times item=time from=$times-]
-						<tr>
-						<td  valign='top' class="eventslist" width ='90'>
-						[-if $time.mer == "pm" -]
-								[-assign var="event_startampm" value=2-]
-							[-if $time.hour > 12 -]
-								[-math equation="x-12" x=$time.hour-]:[-$time.minute-]
-							[-else-]
-								[-$time.hour-]:[-$time.minute-]
-							[-/if-]
-						[-else-]
-							[-assign var="event_startampm" value=1-]
-							[-$time.hour-]:[-$time.minute-]
-						[-/if-]
-						[-$time.mer-] <a href="index.php?module=PostCalendar&func=submit&event_startampm=[-$event_startampm-]&event_starttimeh=[-$time.hour-]&event_starttimem=[-$time.minute-]&Date=[-$eventdate-]&event_userid=[-$provider.id-]">
-						<img align="middle" src="[-$TPL_IMAGE_PATH-]/new.gif" border="0" vspace="0" hspace="0"/></a>
-						</td>
-						[-assign var="eventsbydate" value=$S_EVENTS.$date-]
-
-						[-* foreach name=events key=eventkey item=event from=$S_EVENTS.$date *-]
-
-[-php-]
-	for (; isset($this->_tpl_vars['eventkey']);
-		list($this->_tpl_vars['eventkey'], $this->_tpl_vars['event']) = each($arr_events))
-	{
-[-/php-]
-
-							[-assign var="starth" value=$event.startTime|date_format:"%H"-]
-							[-assign var="displaystarth" value=$event.startTime|date_format:"%I:%M %p" -]
-							[-assign var="startm" value=$event.startTime|date_format:"%M"-]
-							[-assign var="mykey" value=$eventkey-]
-
-							[-* if $time.hour == $starth && $startm >= $time.minute && $startm < ($time.minute + $interval) && $event.aid == $provider.id *-]
-
-[-php-]
-		if ($this->_tpl_vars['event']['aid'] != $this->_tpl_vars['provider']['id'])
-			continue;
-		if ($this->_tpl_vars['starth'] < $this->_tpl_vars['time']['hour'])
-			continue;
-		if ($this->_tpl_vars['starth'] > $this->_tpl_vars['time']['hour'])
-			break;
-		if ($this->_tpl_vars['startm'] < $this->_tpl_vars['time']['minute'])
-			continue;
-		if ($this->_tpl_vars['startm'] >= ($this->_tpl_vars['time']['minute'] + $this->_tpl_vars['interval']))
-			break;
-[-/php-]
-
-								[-assign var="flagfound" value=true-]
-								[-assign var="eid" value=$event.eid-]
-								<td   class="eventsentry" width="[-math equation="$day_td_width * 10"-]" rowspan=[-$event.intervals-] style="{background-color: [-$event.catcolor-]}">
-								<a href="[-pc_url action=detail eid=$event.eid date=$date-]" [-pc_popup delay="500"  bgcolor=$event.catcolor caption=$event.title text=$event.hometext-]>
-								[-assign var=short_event_title value=$event.title|strip_tags -]
-								[-$short_event_title|truncate::"$day_td_width":""-]
-									</a><br/>
-								[-$displaystarth-]([-$event.duration_hours-]:[-$event.duration_minutes-])<br />
-								[-include file="$TPL_NAME/user/patient_line.html" event=$event show_icons=true show_provider=false show_patient=true -]&nbsp;
-								</td>
-
-							[-* /if *-]
-						[-* /foreach *-]
-
-[-php-]
-	} // end for
-[-/php-]
-
-						[-assign var="flagfound" value=false -]
-						</tr>
-					[-/foreach-]
-
-				</table>
-				</td>
-			[-/foreach-]
-
-			</tr>
-
-			</table>
-			</td>
-		[-/foreach-]
-	</tr>
-</table>
-
-[-if $PRINT_VIEW != 1-]
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td align="right">
-            <a href="[-pc_url action="day" print="true"-]">[-#_PC_THEME_PRINT#-]</a>
-        	</td>
-    		</tr>
-		</table>
-
-	</td>
-</tr>
-</table>
-[-/if-]
-[-*footer*-]
-[-include file="$TPL_NAME/views/global/footer.html"-]
-[-include file="$TPL_NAME/views/footer.html"-]
+[-*Smarty*-]
+[-*****************************************************************************-]
+[-* This is the source code for both day/default.html and week/default.html.  *-]
+[-* They should always be identical.  If you change one, copy to the other!   *-]
+[-*****************************************************************************-]
+[-* Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com> and others           *-]
+[-*                                                                           *-]
+[-* 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.                    *-]
+[-*****************************************************************************-]
+[-config_load file="default.conf"-]
+[-*Load the Language Definitions*-]
+[-config_load file="lang.$USER_LANG"-]
+[-include file="$TPL_NAME/views/header.html"-]
+[-* we want to include out stylesheet for this view*-]
+[-fetch file="$TPL_STYLE_PATH/day.css" assign="css"-]
+[-eval var=$css-]
+
+<style>
+a       { text-decoration:none; }
+.tacell { font-size:10pt; background-color:#ddffdd; text-align:right; }
+.tucell { font-size:10pt; background-color:#ffbbbb; text-align:right; }
+.eacell { font-size:10pt; background-color:#ffffff; }
+.eucell { font-size:10pt; background-color:#ffbbbb; }
+.nobot  { border-bottom-width:0px; }
+.notop  { border-top-width:0px; }
+</style>
+
+<script language='JavaScript'>
+function newEvt(startampm, starttimeh, starttimem, eventdate, providerid) {
+ location = 'index.php?module=PostCalendar&func=submit' +
+  '&event_startampm=' + startampm +
+  '&event_starttimeh=' + starttimeh +
+  '&event_starttimem=' + starttimem +
+  '&Date=' + eventdate +
+  '&event_userid=' + providerid;
+}
+function oldEvt(eventdate, eventid) {
+ location = 'index.php?module=PostCalendar&func=view&viewtype=details' +
+  '&Date=' + eventdate +
+  '&eid=' + eventid;
+}
+function goPid(pid) {
+ top.location = '../../patient_file/patient_file.php' +
+  '?set_pid=' + pid + '&pid=' + pid;
+}
+</script>
+
+[-php-]
+
+ // [-if $PRINT_VIEW != 1-]
+ // [-*Main Navigation*-]
+ // [-include file="$TPL_NAME/views/global/navigation.html"-]
+ // [-/if-]
+
+ $A_EVENTS  =& $this->_tpl_vars['A_EVENTS'];
+ $S_EVENTS  =& $this->_tpl_vars['S_EVENTS'];
+ $providers =& $this->_tpl_vars['providers'];
+ $times     =& $this->_tpl_vars['times'];
+ $interval  =  $this->_tpl_vars['interval'];
+ $viewtype  =  $this->_tpl_vars['VIEW_TYPE'];
+ $PREV_WEEK_URL = $this->_tpl_vars['PREV_WEEK_URL'];
+ $NEXT_WEEK_URL = $this->_tpl_vars['NEXT_WEEK_URL'];
+ $PREV_DAY_URL  = $this->_tpl_vars['PREV_DAY_URL'];
+ $NEXT_DAY_URL  = $this->_tpl_vars['NEXT_DAY_URL'];
+
+ $Date =  postcalendar_getDate();
+ if (!isset($y)) $y = substr($Date, 0, 4);
+ if (!isset($m)) $m = substr($Date, 4, 2);
+ if (!isset($d)) $d = substr($Date, 6, 2);
+
+ // echo "<!-- There are " . count($A_EVENTS) . " A_EVENTS days -->\n";
+
+ $MULTIDAY = count($A_EVENTS) > 1;
+
+ $provinfo = getProviderInfo();
+
+ echo "<form action='index.php?module=PostCalendar&func=view' method='post'>\n";
+ echo "<center>\n";
+ echo "<table border='0' cellpadding='0' cellspacing='0' width='99%'>\n";
+ echo " <tr><td colspan='3' height='5'></td></tr>\n";
+ echo " <tr>\n";
+
+ // Build the scrolling selection list of providers.
+ echo "  <td rowspan='2' align='left' valign='top' width='33%' nowrap>\n";
+ echo "   <select multiple size='3' name='pc_username[]'>\n";
+ echo "    <option value='__PC_ALL__'>All Users</option>\n";
+ foreach ($provinfo as $doc) {
+  $username = $doc['username'];
+  echo "    <option value='$username'";
+  foreach ($providers as $provider)
+   if ($provider['username'] == $username) echo " selected";
+  echo ">" . $doc['fname'] . " " . $doc['lname'] . "</option>\n";
+ }
+ echo "   </select>\n";
+ echo "  </td>\n";
+
+ // Build the date and view type selectors and the Go button.
+ echo "  <td align='center' valign='top' width='34%' nowrap>\n";
+ echo "   <select name='jumpmonth'>\n";
+ foreach (array('01' => 'Jan', '02' => 'Feb', '03' => 'Mar', '04' => 'Apr',
+                '05' => 'May', '06' => 'Jun', '07' => 'Jul', '08' => 'Aug',
+                '09' => 'Sep', '10' => 'Oct', '11' => 'Nov', '12' => 'Dec')
+          as $key => $value) {
+  echo "    <option value='$key'";
+  if ($key == $m) echo " selected";
+  echo ">$value</option>\n";
+ }
+ echo "   </select>";
+ echo "<select name='jumpday'>\n";
+ for ($i = 1; $i <= 31; ++$i) {
+  echo "    <option value='$i'";
+  if ($i == $d) echo " selected";
+  echo ">$i</option>\n";
+ }
+ echo "   </select>";
+ echo "<select name='jumpyear'>\n";
+ for ($i = 2005; $i <= 2015; ++$i) {
+  echo "    <option value='$i'";
+  if ($i == $y) echo " selected";
+  echo ">$i</option>\n";
+ }
+ echo "   </select>\n";
+ echo "   <select name='viewtype'>\n";
+ foreach (array('day' => 'Day', 'week' => 'Week', 'month' => 'Month', 'year' => 'Year')
+          as $key => $value) {
+  echo "    <option value='$key'";
+  if ($key == $viewtype) echo " selected";
+  echo ">$value</option>\n";
+ }
+ echo "   </select>\n";
+ echo "   &nbsp;<input type='submit' name='submit' value='Go' />\n";
+ echo "  </td>\n";
+
+ // Show the Add and Search buttons.
+ echo "  <td align='right' valign='top' width='33%' nowrap>\n";
+ echo "   <input type='button' value='Add' onclick='location=\"index.php?module=PostCalendar&func=submit&Date=$Date&event_starttimeh=23&event_startampm=2\"' />\n";
+ echo "   <input type='button' value='Search' onclick='location=\"index.php?module=PostCalendar&func=search\"' />\n";
+ echo "  </td>\n";
+ echo " </tr>\n";
+
+ // Show the date/range and its previous- and next-day/week selectors.
+ echo " <tr>\n";
+ echo "  <td align='center' width='34%' nowrap>\n";
+ $atmp = array_keys($A_EVENTS);
+ if ($MULTIDAY) {
+  echo "<a href='$PREV_WEEK_URL'>&lt;&lt;</a>&nbsp;\n";
+  echo date("F j Y", strtotime($atmp[0]));
+  echo " - ";
+  echo date("F j Y", strtotime($atmp[count($atmp)-1]));
+  echo "&nbsp;<a href='$NEXT_WEEK_URL'>&gt;&gt;</a>\n";
+ } else {
+  echo "<a href='$PREV_DAY_URL'>&lt;&lt;</a>&nbsp;\n";
+  echo date("l, F j, Y", strtotime($atmp[0]));
+  echo "&nbsp;<a href='$NEXT_DAY_URL'>&gt;&gt;</a>\n";
+ }
+ echo "  </td>\n";
+ echo "  <td align='right' width='33%' nowrap>\n";
+ echo "   &nbsp;\n";
+ echo "  </td>\n";
+
+ echo " </tr>\n";
+ echo "</table>\n";
+ echo "</center>\n";
+ echo "</form>\n";
+
+[-/php-]
+
+[-assign var="dayname" value=$DATE|date_format:"%w"-]
+[-assign var="day"     value=$DATE|date_format:"%d"|string_format:"%1d"-]
+[-assign var="month"   value=$DATE|date_format:"%m"|string_format:"%1d"-]
+[-assign var="year"    value=$DATE|date_format:"%Y"|string_format:"%4d"-]
+
+[-pc_sort_events var="S_EVENTS" sort="time" order="asc" value=$A_EVENTS-]
+
+[-php-]
+
+ echo "<table width='100%' border='1' cellpadding='1' cellspacing='0' >\n";
+
+ // For each day...
+ foreach ($A_EVENTS as $date => $events) {
+  $need_headers = true;
+  $eventdate = substr($date, 0, 4) . substr($date, 5, 2) . substr($date, 8, 2);
+
+  // If multiple days then show a date header for each.
+  if ($MULTIDAY) {
+   echo " <tr>\n";
+   echo "  <td colspan='" . (count($providers) * 2) . "' align='center'>" .
+        date("l, F j, Y", strtotime($date)) . "</td>";
+   echo " </tr>\n";
+  }
+
+  $arr_events = $S_EVENTS[$date];
+  list($slotkey, $slotevent) = each($arr_events);
+
+  // This is an array of provider status information for this day,
+  // used to properly assign table cell attributes.
+  $provstat = array();
+
+  $slotindex = 0;
+  $lastslotindex = count($times) - 1;
+
+  // For each time slot...
+  foreach ($times as $slottime) {
+   $startampm = ($slottime['mer']) == "pm" ? 2 : 1;
+   $starttimeh = $slottime['hour'];
+   $starttimem = $slottime['minute'];
+
+   // Repeat doc names at 1PM.  This is a kludge; omit it for released code.
+   // if ($starttimeh == 13 && $starttimem == 0) $need_headers = true;
+
+   // Get all events just for this time slot now, because we can pick up where
+   // we left off and because we don't want to re-scan all events for the day
+   // for each table cell.
+   //
+   $arr_slot = array();
+   for (; isset($slotkey); list($slotkey, $slotevent) = each($arr_events)) {
+    $starth = substr($slotevent['startTime'], 0, 2);
+    $startm = substr($slotevent['startTime'], 3, 2);
+
+    if ($starth > $starttimeh) break;
+    if ($startm >= ($starttimem + $interval)) break;
+    $arr_slot[$slotkey] = $slotevent;
+
+    $catid = $slotevent['catid'];
+    $providerid = $slotevent['aid'];
+    $durminutes = ceil($slotevent['duration'] / 60);
+    $durslots = ceil($durminutes / $interval);
+
+    // While we're here, collect information for setting cell colors.
+    if ($catid == 2) { // in office
+     $provstat[$providerid]['in'] = true;
+    }
+    else if ($catid == 3) { // out of office
+     $provstat[$providerid]['in'] = false;
+    }
+    else if ($catid == 4 || $catid == 8 || $catid == 11) { // unavailable types
+     $endindex = $slotindex + $durslots;
+     for ($i = $slotindex; $i < $endindex; ++$i) {
+      $provstat[$providerid][$i]['res'] = true;
+     }
+    }
+    // if duration > slot size then mark slots for border control.
+    if ($durslots > 1) {
+     $endindex = $slotindex + $durslots - 1;
+     for ($i = $slotindex; $i < $endindex; ++$i) {
+      $provstat[$providerid][$i]['ext'] = true;
+     }
+    }
+   }
+
+   // Write a header row with the provider names if appropriate.
+   if ($need_headers) {
+    $need_headers = false;
+    echo " <tr>\n";
+    foreach ($providers as $provider) {
+     echo "  <td colspan='2' align='center'>";
+     echo $provider['fname'][0] . " " . $provider['lname'];
+     echo "</td>\n";
+    }
+    echo " </tr>\n";
+   }
+
+   echo " <tr>\n";
+
+   // We are now ready to write the table row for the current time slot.
+   // This loops once for each provider to be displayed.
+   //
+   foreach ($providers as $provider) {
+    $providerid = $provider['id'];
+
+    $content = ""; // this will be the event cell content
+
+    $clsuffix = "acell";
+    if ($provstat[$providerid][$slotindex]['res'] || ! $provstat[$providerid]['in']) {
+      $clsuffix = "ucell";
+    }
+
+    // Remove top and/or bottom table cell borders using CSS when events span
+    // time slots or when the practitioner is not in-office.  Using "rowspan"
+    // would be a difficult and inferior solution to this problem.
+    //
+    $tdstyle="";
+    if ($slotindex < $lastslotindex &&
+        ($provstat[$providerid][$slotindex]['ext'] || !$provstat[$providerid]['in'])) {
+     $tdstyle .= " nobot";
+    }
+    if ($slotindex > 0 && ($provstat[$providerid][$slotindex-1]['ext'] ||
+        !($provstat[$providerid]['in'] || $provstat[$providerid]['wasin']))) {
+     $tdstyle .= " notop";
+    }
+
+    $disptimeh = ($starttimeh > 12) ? ($starttimeh - 12) : $starttimeh;
+
+    echo "  <td class='t$clsuffix'";
+    if ($slotindex == 0) echo " width='1%'";
+    echo ">";
+    echo "<a href='javascript:newEvt($startampm,$starttimeh,$starttimem,$eventdate,$providerid)'>";
+    echo "$disptimeh:$starttimem";
+    echo "</a></td>\n";
+
+    echo "  <td class='e$clsuffix$tdstyle'>";
+
+    // Scan all events for this time slot and generate the associated HTML for
+    // this doc.  JavaScript is used in hrefs to reduce the volume of output.
+    //
+    reset($arr_slot);
+    while (list($eventkey, $event) = each($arr_slot)) {
+     if ($event['aid'] != $providerid) continue;
+     if ($content) $content .= " ";
+     $starth = substr($event['startTime'], 0, 2);
+     $startm = substr($event['startTime'], 3, 2);
+     $eventid = $event['eid'];
+     $patientid = $event['pid'];
+     $commapos = strpos($event['patient_name'], ",");
+     $lname = addslashes(ucfirst(strtolower(substr($event['patient_name'], 0, $commapos))));
+     $fname = addslashes(ucfirst(strtolower(substr($event['patient_name'], $commapos + 2))));
+     $patient_dob = $event['patient_dob'];
+     $patient_age = $event['patient_age'];
+     $catid = $event['catid'];
+     $catname = $event['catname'];
+     $title = "$fname, age $patient_age ($patient_dob) " . addslashes($event['hometext']);
+     if ($catid == 2 || $catid == 3 || $catid == 4 || $catid == 8 || $catid == 11) {
+      if      ($catid ==  2) $catname = "IN";
+      else if ($catid ==  3) $catname = "OUT";
+      else if ($catid ==  4) $catname = "VACATION";
+      else if ($catid ==  8) $catname = "LUNCH";
+      else if ($catid == 11) $catname = "RESERVED";
+      // Omit lunch, vacation, etc. if the doc is not in-office.
+      if ($provstat[$providerid]['in'] || $catid < 4) {
+       $content .= "<a href='javascript:oldEvt($eventdate,$eventid)'>";
+       $content .= $catname . "</a>";
+      }
+     }
+     else { // some sort of patient appointment
+      $content .= "<a href='javascript:oldEvt($eventdate,$eventid)' title='$catname'>";
+      $content .= $startm . "</a>";
+      $content .= "<a href='javascript:goPid($patientid)' title='$title'>-";
+      if ($catid == 1) $content .= "<strike>";
+      $content .= $lname;
+      if ($catid == 1) $content .= "</strike>";
+      $content .= "</a>";
+     }
+    } // end while
+
+    if (! $content) $content = "&nbsp;";
+    echo $content . "</td>\n";
+
+    // Keep track of whether the doc was in during the previous time slot.
+    $provstat[$providerid]['wasin'] = $provstat[$providerid]['in'];
+
+   } // end provider
+
+   echo " </tr>\n";
+
+   ++$slotindex;
+  } // end time slot
+ } // end day
+
+ echo "</table>\n";
+
+ // [-*footer*-]
+ // [-include file="$TPL_NAME/views/global/footer.html"-]
+ // [-include file="$TPL_NAME/views/footer.html"-]
+
+[-/php-]
+
+</body>
+</html>
diff --git a/interface/main/calendar/modules/PostCalendar/pnuserapi.php b/interface/main/calendar/modules/PostCalendar/pnuserapi.php
index 63595ca69..7f0e6e0e0 100644
--- a/interface/main/calendar/modules/PostCalendar/pnuserapi.php
+++ b/interface/main/calendar/modules/PostCalendar/pnuserapi.php
@@ -960,9 +960,13 @@ function &postcalendar_userapi_pcQueryEvents($args)
 			LEFT JOIN users as u2 ON a.pc_aid = u2.id
 			LEFT JOIN patient_data as pd ON a.pc_pid=pd.pid
 			WHERE  b.pc_catid = a.pc_catid
-					AND a.pc_eventstatus = $eventstatus
-					AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00')
-					AND a.pc_eventDate <= '$end' ";
+				AND a.pc_eventstatus = $eventstatus
+				AND ((a.pc_endDate >= '$start' AND a.pc_eventDate <= '$end') OR
+				(a.pc_endDate = '0000-00-00' AND a.pc_eventDate >= '$start' AND a.pc_eventDate <= '$end')) ";
+
+	// The above two lines replace these:
+	//   AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00')
+	//   AND a.pc_eventDate <= '$end' ";
 
 	if(!empty($providerID))
 	{
@@ -1001,6 +1005,9 @@ function &postcalendar_userapi_pcQueryEvents($args)
 	//	END SEARCH FUNCTIONALITY
 	//======================================================================
 	//echo "sq: $sql<br />";
+
+	// echo "<!-- " . $sql . " -->\n"; // debugging
+
 	$result = $dbconn->Execute($sql);
 	if($dbconn->ErrorNo() != 0) die ($dbconn->ErrorMsg());
 
diff --git a/interface/main/finder/finder_navigation.php b/interface/main/finder/finder_navigation.php
index e3e5d409e..e2bbd07af 100644
--- a/interface/main/finder/finder_navigation.php
+++ b/interface/main/finder/finder_navigation.php
@@ -20,7 +20,7 @@ include_once("../../globals.php");
 <?//<a href="javascript:document.find_patient.action='finder/patient_finder_keyboard.php';document.find_patient.submit();" class=link>Find Patient:</a>?>
 <input type=entry size=10 name=patient> <select name="findBy" size=1> 
 	<option value="ID">ID</option>
-	<option value="Last" selected>Last Name</option>
+	<option value="Last" selected>Name</option>
 	<option value="SSN">SSN</option>
 	<option value="DOB">DOB</option>
 </select>
diff --git a/interface/main/finder/patient_select.php b/interface/main/finder/patient_select.php
index f00fc68d6..4389b6d5d 100644
--- a/interface/main/finder/patient_select.php
+++ b/interface/main/finder/patient_select.php
@@ -2,9 +2,9 @@
 include_once("../../globals.php");
 include_once("$srcdir/patient.inc");
 
-
 //the maximum number of patient records to display:
-$M = 100;
+$M = 2000;
+
 // this is a quick fix so it doesn't go to thousands records. 
 // the searching functions on patient.inc need improvement.
 if ($patient=='') $patient='Please enter some information'; 
diff --git a/interface/main/main_navigation.php b/interface/main/main_navigation.php
index aca024dd4..1aba935f3 100644
--- a/interface/main/main_navigation.php
+++ b/interface/main/main_navigation.php
@@ -1,5 +1,6 @@
 <?
 include_once("../globals.php");
+include_once("../../library/acl.inc");
 ?>
 
 <html>
@@ -18,10 +19,10 @@ include_once("../globals.php");
 <tr>
 <td width="10%" nowrap>
 <?//<a href="javascript:document.find_patient.action='finder/patient_finder_keyboard.php';document.find_patient.submit();" class=link>Find Patient:</a>?>
-  <input type="entry" size="10" name="patient" />
-    <select name="findBy" size=1>
+	<input type="entry" size="10" name="patient" />
+	<select name="findBy" size=1>
 	<option value="ID">ID</option>
-	<option value="Last" selected>Last Name</option>
+	<option value="Last" selected>Name</option>
 	<option value="SSN">SSN</option>
 	<option value="DOB">DOB</option>
 </select>
@@ -39,14 +40,14 @@ include_once("../globals.php");
 &nbsp;<a href="../usergroup/user_info.php" target="Main" class="menu">Change&nbsp;Password</a>&nbsp;
 </td>
 
+<? if (acl_check('admin', 'calendar') || acl_check('admin', 'database') ||
+       acl_check('admin', 'forms')    || acl_check('admin', 'practice') ||
+       acl_check('admin', 'users')) { ?>
 <td align="center" nowrap>
-<? if ($userauthorized) {
-?>
 &nbsp;<a class=menu target=_top href="../usergroup/usergroup.php">Administration</a>&nbsp;
-<?
-}
-?>
 </td>
+<? } ?>
+
 <td align="center" nowrap>
 &nbsp;<a href="../reports/index.php" target="Main" class="menu">Reports</a>&nbsp;
 </td>
@@ -55,16 +56,20 @@ include_once("../globals.php");
 &nbsp;<a href="onotes/office_comments.php" target="Main" class="menu">Notes</a>&nbsp;
 </td>
 
+<? if (acl_check('acct', 'rep') || acl_check('acct', 'eob') || acl_check('acct', 'bill')) { ?>
 <td align="center" nowrap>
 &nbsp;<a href="../billing/billing_report.php" target="Main" class="menu">Billing</a>&nbsp;
 </td>
-<td nowrap>
+<? } ?>
 
+<td align="center" nowrap>
 &nbsp;<a href="main.php" target="Main" class="menu">Home</a>&nbsp;
 </td>
+
 <td align="center" nowrap>
 &nbsp;<a href="../logout.php?auth=logout" target="_top" class="menu">Logout</a>&nbsp;&nbsp;
 </td>
+
 </tr>
 </table>
 
diff --git a/interface/main/myadmin/config.inc.php b/interface/main/myadmin/config.inc.php
index 5d3f368ed..cf60a0a0f 100644
--- a/interface/main/myadmin/config.inc.php
+++ b/interface/main/myadmin/config.inc.php
@@ -5,10 +5,13 @@ ini_set("magic_quotes","0");
 include_once ("../../../library/sqlconf.php");
 include_once("../../globals.php");
 include_once("$srcdir/auth.inc");
-if($_SESSION['userauthorized'] != 1){
-        echo "You do not have access to this resource<br>";
-	        exit;
-		}
+include_once("../../../library/acl.inc");
+
+// if($_SESSION['userauthorized'] != 1){
+if (! acl_check('admin', 'database')) {
+  echo "You do not have access to this resource<br>";
+  exit;
+}
 
 
 global $sqlconf;
diff --git a/interface/patient_file/encounter/coding.php b/interface/patient_file/encounter/coding.php
index 545d9357a..f0928d5fd 100644
--- a/interface/patient_file/encounter/coding.php
+++ b/interface/patient_file/encounter/coding.php
@@ -1,25 +1,21 @@
 <?
 include_once("../../globals.php");
-
+include_once("../../../custom/code_types.inc.php");
 ?>
-
 <html>
 <head>
-
-
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
 </head>
 <body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <dl>
 <dt><span href="coding.php" class="title">Coding/Billing</span></dt>
 <dd><a class="text" href="superbill_codes.php" target="Main">Superbill</a></dd>
-<!--<dd><a class="text" href="icd9cm_codes_custom.php" target="Codes">ICD-9-CM Custom</a></dd>-->
-<dd><a class="text" href="icd9cm_codes.php" target="Codes">ICD-9-CM Search</a></dd>
-<!--<dd><a class="text" href="cpt_codes_custom.php" target="Codes">CPT Custom</a></dd>-->
-<dd><a class="text" href="cptcm_codes.php" target="Codes">CPT Search</a></dd>
-<dd><a class="text" href="hcpcs_codes.php" target="Codes">HCPCS Search</a></dd>
+
+<? foreach ($code_types as $key => $value) { ?>
+<dd><a class="text" href="search_code.php?type=<? echo $key ?>" target="Codes"><? echo $key ?> Search</a></dd>
+<? } ?>
+
 <dd><a class="text" href="copay.php" target="Codes">Copay</a></dd>
 <dd><a class="text" href="other.php" target="Codes">Other</a></dd><br />
 <dt><span href="coding.php" class="title">Prescriptions</span></dt>
@@ -27,7 +23,5 @@ include_once("../../globals.php");
 <dd><a class="text" href="<?=$GLOBALS['webroot']?>/controller.php?prescription&edit&id=&pid=<?=$pid?>" target="Codes">Add Prescription</a></dd>
 </dl>
 
-
-
 </body>
 </html>
diff --git a/interface/patient_file/encounter/encounter_title.php b/interface/patient_file/encounter/encounter_title.php
index ea3df0879..8ce54a743 100644
--- a/interface/patient_file/encounter/encounter_title.php
+++ b/interface/patient_file/encounter/encounter_title.php
@@ -14,30 +14,20 @@ include_once("$srcdir/patient.inc");
 <body <?echo $title_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <?
-
 $result = getPatientData($pid, "fname,lname");
 
-//$subresult = getFormByEncounter($pid, $encounter , "*");
-//$encounter_date = date( "D F jS Y" ,strtotime($subresult[0]{"date"}));
-
-/*
 if (!empty($_GET["set_encounter"])) {
-	//get the date:
-	$subresult = getFormByEncounter($pid, $_GET["set_encounter"] , "*");
-	$encounter_date = date( "D F jS Y" ,strtotime($subresult[0]{"date"}));
-} else {
-	$encounter_date = "(Today) " . date( "D F jS Y" ); //otherwise, set today's date
+  setencounter($_GET["set_encounter"]);
 }
-*/
-if( !empty( $encounter ) ){
-	$subresult = getFormByEncounter($pid, $_GET["set_encounter"] , "*");
-	$encounter_date = date( "D F jS Y" ,strtotime($subresult[0]{"date"}));
+
+if(!empty($encounter)){
+  $subresult = getFormByEncounter($pid, $encounter , "*");
+  $encounter_date = date( "D F jS Y" ,strtotime($subresult[0]{"date"}));
 } else {
-	
-	$encounter_date = "(Today) " . date( "D F jS Y" ); //otherwise, set today's date
+  $encounter_date = "(Today) " . date( "D F jS Y" ); //otherwise, set today's date
 }
 
-$provider_results = sqlQuery("select * from users where username='".$_SESSION{"authUser"}."'");
+$provider_results = sqlQuery("select * from users where username='" . $_SESSION{"authUser"} . "'");
 ?>
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%">
diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php
index e0f21896d..073c87ed4 100644
--- a/interface/patient_file/encounter/forms.php
+++ b/interface/patient_file/encounter/forms.php
@@ -31,15 +31,15 @@ if (is_numeric($pid)) {
 if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name,formdir,user")) {
 	echo "<table>";
 	foreach ($result as $iter) {
-		//print "<a target=Main href='$rootdir/forms/".$iter{"formdir"}."/view.php?id=".$iter{"form_id"}."' class=text>" . $iter{"form_name"} . "</a><br>\n";
-		
 		$form_info = getFormInfoById($iter['id']);
 		echo '<tr valign="top">';
 		$user = $iter['user'];
 		$user = getNameFromUsername($user);
-		
+
+		$form_name = ($iter['formdir'] == 'newpatient') ? "Patient Encounter" : $iter['form_name'];
+
 		echo '<td class="text"><span style="font-weight:bold;">' . $user['fname'] . " " . $user['lname'] .'</span></td>';
-		echo "<td valign=\"top\"><a target=Main href='$rootdir/patient_file/encounter/view_form.php?formname=".$iter{"formdir"}."&id=".$iter{"form_id"}."' class=text>" . $iter{"form_name"} . "</a></td><td width=\"25\"></td><td valign=\"top\">";
+		echo "<td valign=\"top\"><a target=Main href='$rootdir/patient_file/encounter/view_form.php?formname=".$iter{"formdir"}."&id=".$iter{"form_id"}."' class=text>$form_name</a></td><td width=\"25\"></td><td valign=\"top\">";
 		echo "<table valign=\"top\" cellspacing=\"0\" cellpadding=\"0\"><tr>\n";
 		
 		$counter = 0;
@@ -73,13 +73,7 @@ if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name
 	}
 	echo "</table>";
 }
-
-
 ?>
 
-
-
-
-
 </body>
 </html>
diff --git a/interface/patient_file/encounter/patient_encounter.php b/interface/patient_file/encounter/patient_encounter.php
index f1adb72c7..52d25e1b3 100644
--- a/interface/patient_file/encounter/patient_encounter.php
+++ b/interface/patient_file/encounter/patient_encounter.php
@@ -13,6 +13,17 @@ if (!isset($_GET["codefrom"]) ) {
 ?>
 <?
 include_once("../../globals.php");
+
+// Session pid must be right.
+//
+include_once("$srcdir/pid.inc");
+if ($_GET["set_pid"] && $_GET["set_pid"] != $_SESSION["pid"]) {
+	setpid($_GET["set_pid"]);
+}
+else if ($_GET["pid"] && $_GET["pid"] != $_SESSION["pid"]) {
+	setpid($_GET["pid"]);
+}
+
 include_once("$srcdir/encounter.inc");
 
 
@@ -34,8 +45,8 @@ Patient Encounters
 	<frame src="forms.php" name="Forms" scrolling="auto">
 	<frame src="new_form.php" name="New Form" scrolling="auto">
   </frameset>
-  
-  <frameset rows="*" cols="200,400,*"> 
+
+  <frameset rows="*" cols="200,400,*">
 	<frame src="coding.php" name="Codesets" scrolling="auto">
 	<frame src="blank.php" name="Codes" scrolling="auto">
 	<frame src="diagnosis.php" name="Diagnosis" scrolling="auto">
diff --git a/interface/patient_file/encounter/search_code.php b/interface/patient_file/encounter/search_code.php
new file mode 100644
index 000000000..30458c3f2
--- /dev/null
+++ b/interface/patient_file/encounter/search_code.php
@@ -0,0 +1,97 @@
+<?
+
+////////////////////////////////////////////////////////////////////////////////
+// THIS MODULE REPLACES cptcm_codes.php, hcpcs_codes.php AND icd9cm_codes.php.
+////////////////////////////////////////////////////////////////////////////////
+
+include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
+include_once("$srcdir/sql.inc");
+
+//the maximum number of records to pull out with the search:
+$M = 30;
+
+//the number of records to display before starting a second column:
+$N = 15;
+
+$code_type = $_GET['type'];
+?>
+
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<table border=0 cellspacing=0 cellpadding=0 height=100%>
+<tr>
+<td background="<?echo $linepic;?>" width=7 height=100%>
+&nbsp;
+</td>
+<td valign=top>
+
+<form name='search_form' method='post' action='search_code.php?type=<? echo $code_type ?>'>
+<input type=hidden name=mode value="search">
+
+<span class="title" href="search_code.php"><? echo $code_type ?> Codes</span><br>
+
+<input type=entry size=15 name=text><a href="javascript:document.search_form.submit();" class="text">Search</a>
+</form>
+
+<?
+if (isset($_POST["mode"]) && $_POST["mode"] == "search") {
+	$sql = "select * from codes where (code_text like '%" . $_POST["text"] .
+		"%' or code like '%" . $_POST["text"] . "%') and code_type = '" .
+		$code_types[$code_type]['id'] . "' order by code limit " . ($M + 1);
+
+	if ($res = sqlStatement($sql) ) {
+		for($iter=0; $row=sqlFetchArray($res); $iter++)
+		{
+			$result[$iter] = $row;
+		}
+?>
+
+<table><tr><td valign=top>
+<?
+		$count = 0;
+		$total = 0;
+
+		if ($result) {
+			foreach ($result as $iter) {
+				if ($count == $N) {
+					echo "</td><td valign=top>\n";
+					$count = 0;
+				}
+
+				echo "<a target='Diagnosis' class='text' href='diagnosis.php?mode=add" .
+					"&type="     . urlencode($code_type) .
+					"&code="     . urlencode($iter{"code"}) .
+					"&modifier=" . urlencode($iter{"modifier"}) .
+					"&units="    . urlencode($iter{"units"}) .
+					"&fee="      . urlencode($iter{"fee"}) .
+					"&text="     . urlencode($iter{"code_text"}) .
+					"'>" .
+					ucwords("<b>" . strtoupper($iter{"code"}) . "&nbsp;" . $iter['modifier'] .
+					"</b>" . " " . strtolower($iter{"code_text"}))."</a><br>\n";
+		
+				$count++;
+				$total++;
+				if ($total == $M) {
+					echo "</span><span class=alert>Some codes were not displayed.\n";
+					break;
+				}
+			}
+		}
+?>
+</td></tr></table>
+<?
+	}
+}
+?>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/interface/patient_file/encounter/superbill_codes.php b/interface/patient_file/encounter/superbill_codes.php
dissimilarity index 64%
index 65b95a1cb..f64713232 100644
--- a/interface/patient_file/encounter/superbill_codes.php
+++ b/interface/patient_file/encounter/superbill_codes.php
@@ -1,139 +1,97 @@
-<?
-include_once("../../globals.php");
-include_once("$srcdir/billing.inc");
-include_once("$srcdir/sql.inc");
-
-define("CODE_TYPE_CPT4",1);
-define("CODE_TYPE_ICD9",2);
-define("CODE_TYPE_HCPCS",3);
-
-$code_type_array = array("","CPT4","ICD9","HCPCS");
-
-//the number of rows to display before resetting and starting a new column:
-$N=10;
-$mode = $_GET['mode'];
-if (isset($mode)) {
-	if ($mode == "add") {
-		if (strtolower($type) == "copay") {
-			addBilling($encounter, $type, sprintf("%01.2f", $code), $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", 0 - $code));
-		}
-		elseif (strtolower($type) == "other") {
-			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", $fee));
-		}
-		else {
-			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,$fee);
-		}
-	}
-}
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-</head>
-<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-
-<table border=0 cellspacing=0 cellpadding=0 >
-<tr>
-<!--<td background="<?echo $linepic;?>" width=7 height=100%>
-&nbsp;
-</td>-->
-<td valign=top>
-
-<dl>
-
-<dt><a href="superbill_custom_full.php" ><span class=title>Superbill</span><font class=more><?echo $tmore;?></font></a>
-<a href="patient_encounter.php?codefrom=superbill" ><font class=more><?echo $tback;?></font></a></dt>
-</td></tr>
-</table>
-
-<table border=0 width=100% cellpadding=0 cellspacing=1>
-<?
-$res = sqlStatement("select * from codes where superbill = 1 order by code_type,code,code_text");
-$cpt_count = 0;
-$icd9_count = 0;
-$hcpcs_count = 0;
-for ($iter = 0;$row = sqlFetchArray($res);$iter++){
-	//$all[$iter] = $row;
-	switch($row["code_type"]){
-		case CODE_TYPE_CPT4:
-			$cpts[$cpt_count++] = $row;
-			break;
-		case CODE_TYPE_ICD9:
-			$icd9s[$icd9_count++] = $row;
-			break;
-		case CODE_TYPE_HCPCS:
-			$hcpcs[$hcpcs_count++] = $row;
-			break;
-	}
-}
-$count=0;
-$index=0;
-if ($cpt_count > 0 || $icd9_count > 0 || $hcpcs_count > 0) {
-	print "<tr><th align=left>CPT Codes</th><th align=left>ICD9 Codes</th><th align=left>HCPCS Codes</th><tr>";
-	
-	while( $count < $iter ){
-		print "<tr><td valign=top>";
-		if( !empty( $cpts[$index] ) ){
-			$code = $cpts[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td><td valign=top>";
-		if( !empty( $icd9s[$index] ) ){
-			$code = $icd9s[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td><td valign=top>";
-		if( !empty( $hcpcs[$index] ) ){
-			$code = $hcpcs[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td></tr>";
-		++$index;
-	}
-	/*foreach($all as $iter) {
-		$count++;
-		print "<dd><a class=text target=Diagnosis href='diagnosis.php?mode=add&type=".urlencode($code_type_array[$iter{"code_type"}])."&modifier=".urlencode($iter{"modifier"})."&units=".urlencode($iter{"units"})."&fee=".urlencode($iter{"fee"})."&code=".urlencode($iter{"code"})."&text=".urlencode($iter{"code_text"})."'>";
-		echo "<b>" . $iter['code'] . "</b>" . "&nbsp;" . $iter['code_text'] ;
-		echo "</a></dd>\n";
-		if ($count == $N) {
-			print "</td><td valign=top>\n";
-			$count = 0;
-		}
-	}
-	*/
-}
-
-?>
-
-
-
-</table>
-
-
-
-</dl>
-
-
-<!--</td>
-</tr>-->
-<!--</table>-->
-
-
-
-
-</body>
-</html>
+<?
+include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
+include_once("$srcdir/billing.inc");
+include_once("$srcdir/sql.inc");
+
+//the number of rows to display before resetting and starting a new column:
+$N=10;
+$mode = $_GET['mode'];
+if (isset($mode)) {
+	if ($mode == "add") {
+		if (strtolower($type) == "copay") {
+			addBilling($encounter, $type, sprintf("%01.2f", $code), $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", 0 - $code));
+		}
+		elseif (strtolower($type) == "other") {
+			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", $fee));
+		}
+		else {
+			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,$fee);
+		}
+	}
+}
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<table border=0 cellspacing=0 cellpadding=0 >
+<tr>
+<td valign=top>
+
+<dl>
+
+<dt><a href="superbill_custom_full.php" ><span class=title>Superbill</span><font class=more><?echo $tmore;?></font></a>
+<a href="patient_encounter.php?codefrom=superbill" ><font class=more><?echo $tback;?></font></a></dt>
+</td></tr>
+</table>
+
+<table border=0 width=100% cellpadding=0 cellspacing=1>
+<?
+$res = sqlStatement("select * from codes where superbill = 1 order by code_type, code, code_text");
+
+$codes = array();
+echo " <tr>\n";
+foreach ($code_types as $key => $value) {
+	$codes[$key] = array();
+	echo "  <th align='left'>$key Codes</th>\n";
+}
+echo " </tr>\n";
+
+for ($iter = 0; $row = sqlFetchArray($res); $iter++){
+	foreach ($code_types as $key => $value) {
+		if ($value['id'] == $row['code_type']) {
+			$codes[$key][] = $row;
+			break;
+		}
+	}
+}
+
+$index=0;
+
+$numlines = 0;
+foreach ($codes as $value)
+	$numlines = max($numlines, count($value));
+
+while ($index < $numlines) {
+	echo " <tr>\n";
+	foreach ($codes as $key => $value) {
+		echo "  <td valign='top'>\n";
+		if(!empty($value[$index])) {
+			$code = $value[$index];
+			echo "   <dd><a class='text' target='Main' href='superbill_codes.php?back=1&mode=add" .
+				"&type="     . urlencode($key) .
+				"&modifier=" . urlencode($code{"modifier"}) .
+				"&units="    . urlencode($code{"units"}) .
+				"&fee="      . urlencode($code{"fee"}) .
+				"&code="     . urlencode($code{"code"}) .
+				"&text="     . urlencode($code{"code_text"}) . "'>";
+			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
+			echo "</a></dd>\n";
+		}
+		echo "  </td>\n";
+	}
+	echo " </tr>\n";
+	++$index;
+}
+
+?>
+
+</table>
+
+</dl>
+
+</body>
+</html>
diff --git a/interface/patient_file/encounter/superbill_custom_full.php b/interface/patient_file/encounter/superbill_custom_full.php
index 13fc4cdd4..f20cbf048 100644
--- a/interface/patient_file/encounter/superbill_custom_full.php
+++ b/interface/patient_file/encounter/superbill_custom_full.php
@@ -1,15 +1,12 @@
 <?
 include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
 include_once("$srcdir/sql.inc");
 
-define("CODE_TYPE_CPT4",1);
-define("CODE_TYPE_ICD9",2);
-define("CODE_TYPE_HCPCS",3);
+if (isset($mode)) {
 
-$code_type_array = array("","CPT4","ICD9","HCPCS");
+	// ERROR!  $id and other variables here are not set!
 
-if (isset($mode)) {
-	
 	if ($mode == "delete" ) {
 		sqlStatement("delete from codes where id='$id'");
 	} elseif ($mode == "add" ) {
@@ -68,9 +65,9 @@ $N = 12;
 	<td width="5" rowspan="7"></td>
 	<td>
 		<select name="code_type">
-			<option value="<?=CODE_TYPE_ICD9?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_ICD9) echo "selected"?> >ICD9-CM</option>
-			<option value="<?=CODE_TYPE_CPT4?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_CPT4) echo "selected"?>>CPT</option>
-			<option value="<?=CODE_TYPE_HCPCS?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_HCPCS) echo "selected"?>>HCPCS</option>
+<? foreach ($code_types as $key => $value) { ?>
+			<option value="<? echo $value['id'] ?>"<?if ($GLOBALS['code_type'] == $value['id']) echo " selected" ?>><? echo $key ?></option>
+<? } ?>
 		</select>
 	</td>
 </tr>
@@ -111,7 +108,6 @@ elseif (!is_numeric($fstart)) {
 
 $fend = $fstart + 100;
 
-
 ?>
 
 </form>
@@ -132,15 +128,13 @@ $fend = $fstart + 100;
 <td>
 <a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=">ALL</a>&nbsp;&nbsp;
 </td>
+
+<? foreach ($code_types as $key => $value) { ?>
 <td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=1">CPT</a>&nbsp;&nbsp;
-</td>
-<td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=2">ICD9</a>&nbsp;&nbsp;
-</td>
-<td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=3">HCPCS</a>&nbsp;&nbsp; <br>
+<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=<? echo $value['id'] ?>"><? echo $key ?></a>&nbsp;&nbsp;
 </td>
+<? } ?>
+
 <td>
 <input type="text" name="search" size="5">&nbsp;<input type="submit" name="go" value="search">
 </td>
@@ -160,63 +154,64 @@ $search = $_GET['search'];
 
 $sql = "select * from codes ";
 if (!is_numeric($filter) && empty($search)) {
-	$filter = "";	
+	$filter = "";
 }
 elseif (!empty($search)) {
-	$sql .= " where code like '%" . mysql_real_escape_string($search) . "%'" ;	
+	$sql .= " where code like '%" . mysql_real_escape_string($search) . "%'";
 }
 else {
 	$sql .= " where code_type = $filter ";	
 }
-$sql .= " order by code_type,code,units,code_text limit $fstart, $fend";
+$sql .= " order by code_type, code, units, code_text limit $fstart, $fend";
 
 $res = sqlStatement($sql);
 for ($iter = 0;$row = sqlFetchArray($res);$iter++)
 	$all[$iter] = $row;
 
-
 if ($all) {
 	$count =0;
 	foreach($all as $iter) {
 		$count++;
-		
-		//if ($count == $N) {
-		//	print "</td></tr></table></td><td valign=top><table border=0 cellpadding=5 cellspacing=0><th><td></td><td><span class=bold>Code</span></td><td><span class=bold>Type</span></td><td><span class=bold>Text</span></td><td><span class=bold>Modifier</span></td><td><span class=bold>Units</span></td><td><span class=bold>Fee</span></td><td></td></th>\n";
-		//}
-		
-		print "<tr><td></td><td><span class=text target=Diagnosis href='diagnosis.php?mode=add&type=".urlencode($iter{"code_type"})."&code=".urlencode($iter{"code"})."&text=".urlencode($iter{"code_text"})."'>";
-		print "</td><td><span class=text>" . $iter["code"] . "</span></td><td><span class=text" . $iter["modifier"] . "</span></td><td><span class=text>" . $code_type_array[$iter["code_type"]] . "</span></td><td><span class=text>" . $iter{"code_text"};
+
+		$has_fees = false;
+		foreach ($code_types as $key => $value) {
+			if ($value['id'] == $iter['code_type']) {
+				$has_fees = $value['fee'];
+				break;
+			}
+		}
+
+		print "<tr><td></td><td><span class=text target=Diagnosis href='diagnosis.php?mode=add" .
+			"&type=" . urlencode($iter{"code_type"}) .
+			"&code=" . urlencode($iter{"code"}) .
+			"&text=" . urlencode($iter{"code_text"})."'>";
+		print "</td><td><span class=text>" . $iter["code"] .
+			"</span></td><td><span class=text" .
+			$iter["modifier"] . "</span></td><td><span class=text>" .
+			$key .
+			"</span></td><td><span class=text>" . $iter{"code_text"};
 		print "</span></td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>" . $iter['modifier'] . "</span>";
 		}
 		echo "</td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>" . $iter['units'] . "</span>";
 		}
 		echo "</td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>$" . sprintf("%01.2f", $iter['fee']) . "</span>";
 		}
 		echo "</td><td><a class=link href='superbill_custom_full.php?mode=delete&id=".$iter{"id"}."'>[Delete]</a></td>\n";
 		echo "<td><a class=link href='superbill_custom_full.php?mode=edit&id=".$iter{"id"}."'>[Edit]</a></td></tr>\n";
-		
+
 	}
-	
 }
 
-
-
 ?>
 
 </td></tr></table>
 </table>
 
-
-
-
-
-
-
 </body>
 </html>
diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php
index a21e3fb47..4bc43ec0f 100644
--- a/interface/patient_file/history/encounters.php
+++ b/interface/patient_file/history/encounters.php
@@ -7,36 +7,26 @@ include_once("$srcdir/pnotes.inc");
 include_once("$srcdir/patient.inc");
 
 //maximum number of encounter entries to display on this page:
-$N = 5;
+$N = 10;
 
 ?>
-
 <html>
 <head>
 
-
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
 
-
 </head>
 <body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-
-
-
-
-
 <a href="encounters_full.php" target="Main"><font class="title">Past Encounters</font><font class=more><?echo $tmore;?></font></a><br>
 
-
-<table>
-<th>
+<table width="100%">
+<tr>
 <td><span class=bold>Date</span></td>
 <td><span class=bold>Reason</span></td>
-<td><span class=bold>Patient Notes</span></td>
 <td><span class=bold>Billing</span></td>
 <td><span class=bold>Insurance</span></td>
-</th>
+</tr>
 
 <?
 $count = 0;
@@ -45,29 +35,30 @@ if ($result = getEncounters($pid)) {
 		$count++;
 		if ($count >= $N) {
 			//we have more encounters to print, but we've reached our display maximum
-			print "<tr><td colspan=5 align=center><a target=Main href='encounters_full.php' class=alert>Some encounters were not displayed. Click here to view all.</a></td></tr>\n";
+			print "<tr><td colspan='4' align='center'><a target='Main' href='encounters_full.php' class='alert'>Some encounters were not displayed. Click here to view all.</a></td></tr>\n";
 			break;
 		}
-		//print_r($iter);print "<br/>";
+
+/****
 		$subresult = getFormByEncounter($pid, $iter{"encounter"}, "*", "New Patient Encounter");
-		
 		$raw_encounter_date = date( "Y-m-d" ,strtotime($subresult[0]{"date"}));
 		$encounter_date = date( "D F jS" ,strtotime($subresult[0]{"date"}));
-		
 		print "<tr><td></td>";
-		
 		print "<td valign=top width=100><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $encounter_date . "</a></td>";
-		
-		///////////
+****/
+
 		$reason_string = "";
-		if ($result4 = sqlQuery("select * from form_encounter where encounter='".$iter{"encounter"}."' and pid='$pid'")) {
-			
+		if ($result4 = sqlQuery("select * from form_encounter where encounter='" . $iter{"encounter"} . "' and pid='$pid'")) {
+			$raw_encounter_date = date("Y-m-d", strtotime($result4{"date"}));
+			$encounter_date = date("D F jS", strtotime($result4{"date"}));
 			$reason_string .= $result4{"reason"} . "<br>\n";
-			
 		}
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $reason_string . "</a></td>";
-		
+
+		print "<tr>\n";
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $encounter_date . "</a></td>\n";
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $reason_string . "</a></td>\n";
+
+/****
 		///////////
 		$comments = "";
 		if ($subresult3 = getPnotesByDate(date( "Y-m-d" ,strtotime($subresult[0]{"date"})), "all", "*", $pid, 5, 0)){
@@ -82,48 +73,43 @@ if ($result = getEncounters($pid)) {
 		}
 		
 		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $comments . "</a></td>";
-		
-		
-		///////////
+****/
+
 		$coded = "";
 		if ($subresult2 = getBillingByEncounter($pid,$iter{"encounter"})) {
 			//this is where we print out the text of the billing that occurred on this encounter
 			foreach ($subresult2 as $iter2) {
-				$coded .= $iter2{"code_text"} . ", ";
-				
-				
+				$coded .= "<span title='" . addslashes($iter2{"code_text"}) . "'>";
+				$coded .= $iter2{"code"} . "</span>, ";
 			}
-			$coded = substr($coded,0,strlen($coded)-2);
+			$coded = substr($coded, 0, strlen($coded) - 2);
 		}
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $coded . "</a></td>";
-		
-		///////////
+
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $coded . "</a></td>\n";
+
 		$insured = "$raw_encounter_date";
-		if ($subresult5 = getInsuranceDataByDate( $pid, $raw_encounter_date, "primary")) {
-			$insured = "<span class=text>Primary: ".$subresult5{"provider_name"}."</span><br>\n";
+		$subresult5 = getInsuranceDataByDate($pid, $raw_encounter_date, "primary");
+		if ($subresult5 && $subresult5{"provider_name"}) {
+			$insured = "<span class='text'>Primary: " . $subresult5{"provider_name"} . "</span><br>\n";
 		}
-		if ($subresult6 = getInsuranceDataByDate( $pid, $raw_encounter_date, "secondary")) {
-			$insured .= "<span class=text>Secondary: ".$subresult6{"provider_name"}."</span><br>\n";
+		$subresult6 = getInsuranceDataByDate($pid, $raw_encounter_date, "secondary");
+		if ($subresult6 && $subresult6{"provider_name"}) {
+			$insured .= "<span class='text'>Secondary: ".$subresult6{"provider_name"}."</span><br>\n";
 		}
-		if ($subresult7 = getInsuranceDataByDate( $pid, $raw_encounter_date, "tertiary")) {
-			$insured .= "<span class=text>Tertiary: ".$subresult7{"provider_name"}."</span><br>\n";
+		$subresult7 = getInsuranceDataByDate($pid, $raw_encounter_date, "tertiary");
+		if ($subresult6 && $subresult7{"provider_name"}) {
+			$insured .= "<span class='text'>Tertiary: ".$subresult7{"provider_name"}."</span><br>\n";
 		}
-		
-		
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../report/report_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../report/patient_report.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $insured . "</a></td>";
-		
+
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../report/report_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../report/patient_report.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $insured . "</a></td>\n";
+
 		print "</tr>\n";
-		
 	}
 }
 
 ?>
 
-
 </table>
 
-
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/interface/patient_file/history/encounters_full.php b/interface/patient_file/history/encounters_full.php
dissimilarity index 76%
index e77fe4460..30ec631e9 100644
--- a/interface/patient_file/history/encounters_full.php
+++ b/interface/patient_file/history/encounters_full.php
@@ -1,119 +1,80 @@
-<?
-include_once("../../globals.php");
-
-include_once("$srcdir/forms.inc");
-include_once("$srcdir/billing.inc");
-include_once("$srcdir/pnotes.inc");
-include_once("$srcdir/patient.inc");
-
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-
-</head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-
-
-
-
-<a href="patient_history.php" target="Main"><font class="title">Past Encounters</font><font class=back><?echo $tback;?></font></a><br>
-
-
-<table>
-<th>
-<td><span class=bold>Date</span></td>
-<td><span class=bold>Reason</span></td>
-<td><span class=bold>Comments</span></td>
-<td><span class=bold>Billing</span></td>
-<td><span class=bold>Insurance</span></td>
-</th>
-
-<?
-$count = 0;
-if ($result = getEncounters($pid)) {
-	foreach ($result as $iter ) {
-		$count++;
-		
-		$subresult = getFormByEncounter($pid, $iter{"encounter"}, "*");
-		$raw_encounter_date = date( "Y-m-d" ,strtotime($subresult[0]{"date"}));
-		$encounter_date = date( "D F jS" ,strtotime($subresult[0]{"date"}));
-		
-		print "<tr><td></td>";
-		
-		print "<td valign=top width=100><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $encounter_date . "</a></td>";
-		
-		///////////
-		$reason_string = "";
-		if ($result4 = sqlQuery("select * from form_encounter where encounter='".$iter{"encounter"}."' and pid='$pid'")) {
-			
-			$reason_string .= $result4{"reason"} . "<br>\n";
-			
-		}
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $reason_string . "</a></td>";
-		
-		///////////
-		$comments = "";
-		if ($subresult3 = getPnotesByDate(date( "Y-m-d" ,strtotime($subresult[0]{"date"})), "all", "*", $pid, 5, 0)){
-			//this is where we print out short headers for comments enterred into the patient file on the same date
-			
-			
-			foreach ($subresult3 as $iter3) {
-				$comments .= stripslashes(strterm($iter3{"body"},100)) . "<br>";
-				
-			}
-			$comments = substr($comments,0,strlen($comments)-4);
-		}
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $comments . "</a></td>";
-		
-		
-		///////////
-		$coded = "";
-		if ($subresult2 = getBillingByEncounter($pid,$iter{"encounter"})) {
-			//this is where we print out the text of the billing that occurred on this encounter
-			foreach ($subresult2 as $iter2) {
-				$coded .= $iter2{"code_text"} . ", ";
-				
-				
-			}
-			$coded = substr($coded,0,strlen($coded)-2);
-		}
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $coded . "</a></td>";
-		
-		///////////
-		$insured = "$raw_encounter_date";
-		if ($subresult5 = getInsuranceDataByDate( $pid, $raw_encounter_date, "primary")) {
-			$insured = "<span class=text>Primary: ".$subresult5{"provider"}."</span><br>\n";
-		}
-		if ($subresult6 = getInsuranceDataByDate( $pid, $raw_encounter_date, "secondary")) {
-			$insured .= "<span class=text>Secondary: ".$subresult6{"provider"}."</span><br>\n";
-		}
-		if ($subresult7 = getInsuranceDataByDate( $pid, $raw_encounter_date, "tertiary")) {
-			$insured .= "<span class=text>Tertiary: ".$subresult7{"provider"}."</span><br>\n";
-		}
-		
-		
-		
-		print "<td valign=top width=23%><a target=Main href=\"javascript:parent.Title.location.href='../report/report_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../report/patient_report.php?set_encounter=".$iter{"encounter"}."'\" class=text>" . $insured . "</a></td>";
-		
-		print "</tr>\n";
-		
-	}
-}
-
-?>
-
-
-</table>
-
-
-</body>
-</html>
\ No newline at end of file
+<?
+include_once("../../globals.php");
+
+include_once("$srcdir/forms.inc");
+include_once("$srcdir/billing.inc");
+include_once("$srcdir/pnotes.inc");
+include_once("$srcdir/patient.inc");
+
+?>
+<html>
+<head>
+
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+
+</head>
+<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<a href="patient_history.php" target="Main"><font class="title">Past Encounters</font><font class=back><?echo $tback;?></font></a><br>
+
+<table width='100%'>
+<tr>
+<td><span class='bold'>Date</span></td>
+<td><span class='bold'>Reason</span></td>
+<td><span class='bold'>Billing</span></td>
+<td><span class='bold'>Insurance</span></td>
+</tr>
+
+<?
+if ($result = getEncounters($pid)) {
+	foreach ($result as $iter ) {
+
+		$reason_string = "";
+		if ($result4 = sqlQuery("select * from form_encounter where encounter='" . $iter{"encounter"} . "' and pid='$pid'")) {
+			$raw_encounter_date = date("Y-m-d", strtotime($result4{"date"}));
+			$encounter_date = date("D F jS", strtotime($result4{"date"}));
+			$reason_string .= $result4{"reason"} . "<br>\n";
+		}
+
+		print "<tr>\n";
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $encounter_date . "</a></td>\n";
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $reason_string . "</a></td>\n";
+
+		$coded = "";
+		if ($subresult2 = getBillingByEncounter($pid, $iter{"encounter"})) {
+			//this is where we print out the text of the billing that occurred on this encounter
+			foreach ($subresult2 as $iter2) {
+				$coded .= "<span title='" . addslashes($iter2{"code_text"}) . "'>";
+				$coded .= $iter2{"code"} . "</span>, ";
+			}
+			$coded = substr($coded, 0, strlen($coded) - 2);
+		}
+
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../encounter/encounter_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../encounter/patient_encounter.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $coded . "</a></td>\n";
+
+		$insured = "$raw_encounter_date";
+		$subresult5 = getInsuranceDataByDate($pid, $raw_encounter_date, "primary");
+		if ($subresult5 && $subresult5{"provider_name"}) {
+			$insured = "<span class='text'>Primary: " . $subresult5{"provider_name"} . "</span><br>\n";
+		}
+		$subresult6 = getInsuranceDataByDate($pid, $raw_encounter_date, "secondary");
+		if ($subresult6 && $subresult6{"provider_name"}) {
+			$insured .= "<span class='text'>Secondary: ".$subresult6{"provider_name"}."</span><br>\n";
+		}
+		$subresult7 = getInsuranceDataByDate($pid, $raw_encounter_date, "tertiary");
+		if ($subresult6 && $subresult7{"provider_name"}) {
+			$insured .= "<span class='text'>Tertiary: ".$subresult7{"provider_name"}."</span><br>\n";
+		}
+
+		print "<td valign='top'><a target='Main' href=\"javascript:parent.Title.location.href='../report/report_title.php?set_encounter=".$iter{"encounter"}."';parent.Main.location.href='../report/patient_report.php?set_encounter=".$iter{"encounter"}."'\" class='text'>" . $insured . "</a></td>\n";
+
+		print "</tr>\n";
+	}
+}
+
+?>
+
+</table>
+
+</body>
+</html>
diff --git a/interface/patient_file/history/history.php b/interface/patient_file/history/history.php
index 002c4b7ec..685aeae95 100644
--- a/interface/patient_file/history/history.php
+++ b/interface/patient_file/history/history.php
@@ -40,7 +40,7 @@ if (!is_array($result)) {
 </td>
 
 <td valign=top>
-<span class=bold>Patient Had:</span><br>
+<span class=bold>Surgeries:</span><br>
 <?if ($result{"cataract_surgery"} != "0000-00-00 00:00:00") {?><span class=text>Cataract Surgery: </span><span class=text><?echo date("n/j/Y",strtotime($result{"cataract_surgery"}));?></span><br><?}?>
 <?if ($result{"tonsillectomy"} != "0000-00-00 00:00:00") {?><span class=text>Tonsillectomy: </span><span class=text><?echo date("n/j/Y",strtotime($result{"tonsillectomy"}));?></span><br><?}?>
 <?if ($result{"appendectomy"} != "0000-00-00 00:00:00") {?><span class=text>Appendectomy: </span><span class=text><?echo date("n/j/Y",strtotime($result{"appendectomy"}));?></span><br><?}?>
diff --git a/interface/patient_file/navigation.php b/interface/patient_file/navigation.php
index 7dbc4b291..d4d484a63 100644
--- a/interface/patient_file/navigation.php
+++ b/interface/patient_file/navigation.php
@@ -8,32 +8,60 @@ include_once("../globals.php");
 
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
 
+<script language="JavaScript">
+// This is invoked to pop up some window when a popup item is selected.
+function selpopup(selobj) {
+ var i = selobj.selectedIndex;
+ if (i > 0) {
+  var parms = (i == 1) ?
+   'menubar=1,resizable=1' : (i == 2) ?
+   'width=400,height=300,resizable=1' :
+   'width=750,height=550,resizable=1';
+  window.open(selobj.options[i].value, '_blank', parms);
+ }
+ selobj.selectedIndex = 0;
+}
+</script>
+
 </head>
 <body <?echo $nav_bg_line;?> topmargin=0 rightmargin=0 leftmargin=5 marginheight=0 bottommargin=0 link=#000000 vlink=#000000 alink=#000000>
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%">
 <tr>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="javascript:parent.Title.location.href='<?echo $rootdir;?>/patient_file/summary/summary_title.php';parent.Main.location.href='<?echo $rootdir;?>/patient_file/summary/patient_summary.php'" target="Main" class="menu">Summary</a>
 </td>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="javascript:parent.Title.location.href='<?echo $rootdir;?>/patient_file/history/history_title.php';parent.Main.location.href='<?echo $rootdir;?>/patient_file/history/patient_history.php'" target="Main" class="menu">History</a>
 </td>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="javascript:parent.Title.location.href='<?echo $rootdir;?>/patient_file/encounter/encounter_title.php';parent.Main.location.href='<?echo $rootdir;?>/patient_file/encounter/patient_encounter.php?mode=new'" target="Main" class="menu">Encounter</a>
 </td>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="javascript:parent.Title.location.href='<?echo $rootdir;?>/patient_file/transaction/transaction_title.php';parent.Main.location.href='<?echo $rootdir;?>/patient_file/transaction/patient_transaction.php'" target="Main" class="menu">Transaction</a>
 </td>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="<?echo $GLOBALS['web_root'];?>/controller.php?document&list&patient_id=<?=$pid?>" target="Main" class="menu">Documents</a>
 </td>
-<td valign="middle">
+<td align="center" valign="middle">
 <a href="javascript:parent.Title.location.href='<?echo $rootdir;?>/patient_file/report/report_title.php';parent.Main.location.href='<?echo $rootdir;?>/patient_file/report/patient_report.php'" target="Main" class="menu">Report</a>
 </td>
-<td align="right" valign="middle">
+<td align="center" align="right" valign="middle">
 <a href="../main/main_screen.php" target="_top" class="logout">Close</a>&nbsp;&nbsp;
 </td>
+<td align="right" valign="middle">
+ <form>
+  <select onchange='selpopup(this)' style='background-color:transparent'>
+   <option value=''>Popups</option>
+   <option value='problem_encounter.php'>Issues</option>
+   <option value='../../custom/export_demographics.php'>Export</option>
+<? if ($GLOBALS['athletic_team']) { ?>
+   <option value='../reports/players_report.php'>Roster</option>
+<? } ?>
+  </select>
+ </form>
+ <!-- <a href="<?echo $rootdir;?>/patient_file/problem_encounter.php" target="_blank" class="menu">Issues</a> -->
+</td>
 </tr>
 </table>
 
diff --git a/interface/patient_file/problem_encounter.php b/interface/patient_file/problem_encounter.php
new file mode 100644
index 000000000..3cfa6ad9b
--- /dev/null
+++ b/interface/patient_file/problem_encounter.php
@@ -0,0 +1,298 @@
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ include_once("../globals.php");
+ include_once("../../library/patient.inc");
+
+ $patdata = getPatientData($pid, "fname,lname");
+
+ $alertmsg = ""; // anything here pops up in an alert box
+ $endjs = "";    // holds javascript to write at the end
+
+ // If the Save button was clicked...
+ if ($_POST['form_save']) {
+  $form_pid = $_POST['form_pid'];
+  $form_pelist = $_POST['form_pelist'];
+  $pattern = '|/(\d+),(\d+),([YN])|';
+
+  preg_match_all($pattern, $form_pelist, $matches);
+  $numsets = count($matches[1]);
+
+  sqlQuery("DELETE FROM issue_encounter WHERE pid = '$form_pid'");
+
+  for ($i = 0; $i < $numsets; ++$i) {
+   $list_id   = $matches[1][$i];
+   $encounter = $matches[2][$i];
+   $resolved = ($matches[3][$i] == 'Y') ? 1 : 0;
+   $query = "INSERT INTO issue_encounter ( " .
+    "pid, list_id, encounter, resolved " .
+    ") VALUES ( " .
+    "$form_pid, $list_id, $encounter, $resolved " .
+    ")";
+   sqlQuery($query);
+  }
+
+  // All done.
+  echo "<html><body><script language='JavaScript'>\n";
+  if ($alertmsg) echo " alert('$alertmsg');\n";
+  echo " window.close();\n";
+  echo "</script></body></html>\n";
+  exit();
+ }
+
+ // get problems
+ $pres = sqlStatement("SELECT * FROM lists WHERE pid = $pid " .
+  "ORDER BY type, date");
+
+ // get encounters
+ $eres = sqlStatement("SELECT * FROM form_encounter WHERE pid = $pid " .
+  "ORDER BY date DESC");
+
+ // get problem/encounter relations
+ $peres = sqlStatement("SELECT * FROM issue_encounter WHERE pid = $pid");
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>Issues and Encounters</title>
+
+<style>
+tr.head   { font-size:10pt; background-color:#cccccc; text-align:center; }
+tr.detail { font-size:10pt; background-color:#eeeeee; }
+</style>
+
+<script language="JavaScript">
+
+// These are the possible colors for table rows.
+var trcolors = new Object();
+// Colors for:            Foreground Background
+trcolors['U'] = new Array('#000000', '#eeeeee'); // unselected
+trcolors['K'] = new Array('#000000', '#eeee00'); // selected key
+trcolors['Y'] = new Array('#000000', '#99ff99'); // selected value resolved=Y
+trcolors['N'] = new Array('#000000', '#ff9999'); // selected value resolved=N
+
+var pselected = new Object();
+var eselected = new Object();
+var keyid = null; // id of currently hilited key, if any
+
+// Determine if a given problem/encounter pair is currently linked.
+// If yes, return the "resolved" character (Y or N), else an empty string.
+function isPair(problem, encounter) {
+ var pelist = document.forms[0].form_pelist;
+ var frag = '/' + problem + ',' + encounter + ',';
+ var i = pelist.value.indexOf(frag);
+ if (i < 0) return '';
+ return pelist.value.charAt(i + frag.length);
+}
+
+// Unlink a problem/encounter pair.
+function removePair(problem, encounter) {
+ var pelist = document.forms[0].form_pelist;
+ var frag = '/' + problem + ',' + encounter + ',';
+ var i = pelist.value.indexOf(frag);
+ if (i >= 0) {
+  pelist.value = pelist.value.substring(0, i) + pelist.value.substring(i + frag.length + 1);
+  document.forms[0].form_save.disabled = false;
+ }
+}
+
+// Link a new or modified problem/encounter pair.
+function addPair(problem, encounter, resolved) {
+ removePair(problem, encounter);
+ var pelist = document.forms[0].form_pelist;
+ pelist.value += '' + problem + ',' + encounter + ',' + resolved + '/';
+ document.forms[0].form_save.disabled = false;
+}
+
+// Clear displayed highlights.
+function doclearall(pfx) {
+ var thisarr = (pfx == 'p') ? pselected : eselected;
+ for (var id in thisarr) {
+  var thistr = document.getElementById(pfx + '_' + id);
+  if (thisarr[id]) {
+   thisarr[id] = '';
+   thistr.style.color = trcolors['U'][0];
+   thistr.style.backgroundColor = trcolors['U'][1];
+  }
+ }
+}
+
+function clearall() {
+ doclearall('p');
+ doclearall('e');
+ keyid = null;
+}
+
+// Process clicks on table rows.
+function doclick(pfx, id) {
+ var thisstyle = document.getElementById(pfx + '_' + id).style;
+ var thisarr = (pfx == 'p') ? pselected : eselected;
+ var piskey = document.forms[0].form_key[0].checked;
+ var thisiskey = (pfx == 'p') ? piskey : !piskey;
+ var wasset = thisarr[id];
+ if (thisiskey) { // they clicked in the key table
+  clearall();
+  if (!wasset) { // this item is not already hilited
+   keyid = id;
+   thisarr[id] = 'K';
+   thisstyle.color = trcolors['K'][0];
+   thisstyle.backgroundColor = trcolors['K'][1];
+   // Now hilite the related value table entries:
+   if (pfx == 'p') { // key is problems, values are encounters
+    for (key in eselected) {
+     var resolved = isPair(id, key);
+     if (resolved.length > 0) {
+      eselected[key] = resolved;
+      var valstyle = document.getElementById('e_' + key).style;
+      valstyle.color = trcolors[resolved][0];
+      valstyle.backgroundColor = trcolors[resolved][1];
+     }
+    }
+   } else { // key is encounters, values are problems
+    for (key in pselected) {
+     var resolved = isPair(key, id);
+     if (resolved.length > 0) {
+      pselected[key] = resolved;
+      var valstyle = document.getElementById('p_' + key).style;
+      valstyle.color = trcolors[resolved][0];
+      valstyle.backgroundColor = trcolors[resolved][1];
+     }
+    }
+   }
+  }
+ } else { // they clicked in the value table
+  if (keyid) {
+   var resolved = thisarr[id];
+   if (resolved == 'Y') { // it was hilited and resolved, change to unresolved
+    thisarr[id] = 'N';
+    thisstyle.color = trcolors['N'][0];
+    thisstyle.backgroundColor = trcolors['N'][1];
+    if (pfx == 'p') addPair(id, keyid, 'N'); else addPair(keyid, id, 'N');
+   } else if (resolved == 'N') { // it was hilited and unresolved, remove it
+    thisarr[id] = '';
+    thisstyle.color = trcolors['U'][0];
+    thisstyle.backgroundColor = trcolors['U'][1];
+    if (pfx == 'p') removePair(id, keyid); else removePair(keyid, id);
+   } else { // not hilited, change to hilited and resolved
+    thisarr[id] = 'Y';
+    thisstyle.color = trcolors['Y'][0];
+    thisstyle.backgroundColor = trcolors['Y'][1];
+    if (pfx == 'p') addPair(id, keyid, 'Y'); else addPair(keyid, id, 'Y');
+   }
+  } else {
+   alert('You must first select an item in the section whose radio button is checked.');
+  }
+ }
+}
+
+</script>
+
+</head>
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0' bgcolor='#ffffff'>
+<form method='post' action='problem_encounter.php'>
+<?
+ echo "<input type='hidden' name='form_pid' value='$pid' />\n";
+ // pelist looks like /problem,encounter,Y/problem,encounter,N/[...].
+ echo "<input type='hidden' name='form_pelist' value='/";
+ while ($row = sqlFetchArray($peres)) {
+  echo $row['list_id'] . "," . $row['encounter'] . "," .
+   ($row['resolved'] ? "Y" : "N") . "/";
+ }
+ echo "' />\n";
+?>
+
+<table border='0' cellpadding='5' cellspacing='0' width='100%'>
+
+ <tr>
+  <td colspan='2' align='center'>
+   <b>Issues and Encounters for <? echo $patdata['fname'] . " " . $patdata['lname'] . " ($pid)</b>\n"; ?>
+  </td>
+ </tr>
+
+ <tr>
+  <td align='center' valign='top'>
+   <table width='100%' cellpadding='1' cellspacing='2'>
+    <tr class='head'>
+     <td colspan='3' align='center'>
+      <input type='radio' name='form_key' value='p' onclick='clearall()' checked />
+      <b>Issues Section</b>
+     </td>
+    </tr>
+    <tr class='head'>
+     <td>Type</td>
+     <td>Title</td>
+     <td>Description</td>
+    </tr>
+<?
+ while ($row = sqlFetchArray($pres)) {
+  $rowid = $row['id'];
+  echo "    <tr class='detail' id='p_$rowid' onclick='doclick(\"p\", $rowid)'>\n";
+  echo "     <td valign='top'>" . $row['type'] . "</td>\n";
+  echo "     <td valign='top'>" . $row['title'] . "</td>\n";
+  echo "     <td valign='top'>" . $row['comments'] . "</td>\n";
+  echo "    </tr>\n";
+  $endjs .= "pselected['$rowid'] = '';\n";
+ }
+?>
+   </table>
+  </td>
+  <td align='center' valign='top'>
+   <table width='100%' cellpadding='1' cellspacing='2'>
+    <tr class='head'>
+     <td colspan='2' align='center'>
+      <input type='radio' name='form_key' value='e' onclick='clearall()' />
+      <b>Encounters Section</b>
+     </td>
+    </tr>
+    <tr class='head'>
+     <td>Date</td>
+     <td>Presenting Complaint</td>
+    </tr>
+<?
+ while ($row = sqlFetchArray($eres)) {
+  $rowid = $row['encounter'];
+  echo "    <tr class='detail' id='e_$rowid' onclick='doclick(\"e\", $rowid)'>\n";
+  echo "     <td valign='top'>" . substr($row['date'], 0, 10) . "</td>\n";
+  echo "     <td valign='top'>" . $row['reason'] . "</td>\n";
+  echo "    </tr>\n";
+  $endjs .= "eselected['$rowid'] = '';\n";
+ }
+?>
+   </table>
+  </td>
+ </tr>
+
+ <tr>
+  <td colspan='2' align='center'>
+   <input type='submit' name='form_save' value='Save' disabled /> &nbsp;
+   <input type='button' value='Cancel' onclick='window.close()' />
+  </td>
+ </tr>
+
+</table>
+
+</form>
+
+<p><b>Instructions:</b> Choose a section and click an item within it; then in
+the other section you will see the related items highlighted, and you can click
+in that section to create, remove and change the relationships.  Note that the
+highlight color (green = resolved, red = unresolved) is an attribute of the
+<i>relationship</i>, not of the item itself.
+</p>
+
+<script>
+<?
+ echo $endjs;
+ if ($_REQUEST['issue']) {
+  echo "doclick('p', " . $_REQUEST['issue'] . ");\n";
+ }
+ if ($alertmsg) echo "alert('$alertmsg');\n";
+?>
+</script>
+</body>
+</html>
diff --git a/interface/patient_file/report/custom_report.php b/interface/patient_file/report/custom_report.php
index 3d5d3625f..594395ff3 100644
--- a/interface/patient_file/report/custom_report.php
+++ b/interface/patient_file/report/custom_report.php
@@ -135,9 +135,18 @@ if (stristr($key,"include_")) {
 		} elseif ($val == "medications") {
 			print "<font class=bold>Patient Medications:</font><br>";
 			printListData($pid, "medication", "1");
+		} elseif ($val == "medical_problems") {
+				print "<font class=bold>Patient Medical Problems:</font><br>";
+				printListData($pid, "medical_problem", "1");
 		} elseif ($val == "immunizations") {
 				print "<font class=bold>Patient Immunization:</font><br>";
-				printListData($pid, "immunization", "1");
+				$sql = "select if(i1.administered_date,concat(i1.administered_date,' - ',i2.name) ,substring(i1.note,1,20) ) as immunization_data from immunizations i1 left join immunization i2 on i1.immunization_id = i2.id where i1.patient_id = $pid order by administered_date desc";
+
+				$result = sqlStatement($sql);
+
+				while ($row=sqlFetchArray($result)){
+					echo "<span class=text> " . $row{'immunization_data'} . "</span><br>\n";
+				}
 		} elseif ($val == "notes") {
 				print "<font class=bold>Patient Notes:</font><br>";
 				printPatientNotes($pid);
diff --git a/interface/patient_file/report/full_report.php b/interface/patient_file/report/full_report.php
index 860d607e4..9f7c98397 100644
--- a/interface/patient_file/report/full_report.php
+++ b/interface/patient_file/report/full_report.php
@@ -79,9 +79,20 @@ printListData($pid, "allergy", "1")
 printListData($pid, "medication", "1")
 ?></td></tr></table>
 
+<font class=bold>Medical Problems:</font><br>
+<table><tr><td><?
+printListData($pid, "medical_problem", "1")
+?></td></tr></table>
+
 <font class=bold>Immunizations:</font><br>
 <table><tr><td><?
-printListData($pid, "immunization", "1")
+$sql = "select if(i1.administered_date,concat(i1.administered_date,' - ',i2.name) ,substring(i1.note,1,20) ) as immunization_data from immunizations i1 left join immunization i2 on i1.immunization_id = i2.id where i1.patient_id = $pid order by administered_date desc";
+
+$result = sqlStatement($sql);
+
+while ($row=sqlFetchArray($result)){
+	echo "<span class=text> " . $row{'immunization_data'} . "</span><br>\n";
+}
 ?></td></tr></table>
 <hr>
 
@@ -125,4 +136,4 @@ printPatientForms($pid, $N);
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/interface/patient_file/report/patient_report.php b/interface/patient_file/report/patient_report.php
index 2ee88951a..145d5b3b6 100644
--- a/interface/patient_file/report/patient_report.php
+++ b/interface/patient_file/report/patient_report.php
@@ -26,10 +26,12 @@ include_once("../../globals.php");
 <input type=checkbox name=include_employer value="employer"><span class=text>Employer</span><br>
 <input type=checkbox name=include_insurance value="insurance"><span class=text>Insurance</span><br>
 <input type=checkbox name=include_billing value="billing" checked><span class=text>Billing</span><br>
+<br>
 </td><td>
 <input type=checkbox name=include_allergies value="allergies"><span class=text>Allergies</span><br>
 <input type=checkbox name=include_medications value="medications"><span class=text>Medications</span><br>
 <input type=checkbox name=include_immunizations value="immunizations"><span class=text>Immunizations</span><br>
+<input type=checkbox name=include_medical_problems value="medical_problems"><span class=text>Medical Problems</span><br>
 <input type=checkbox name=include_notes value="notes"><span class=text>Patient Notes</span><br>
 <input type=checkbox name=include_transactions value="transactions"><span class=text>Transactions</span><br>
 </td></tr></table>
diff --git a/interface/patient_file/report/print_custom_report.php b/interface/patient_file/report/print_custom_report.php
index f21cd033b..5e39cc0c7 100644
--- a/interface/patient_file/report/print_custom_report.php
+++ b/interface/patient_file/report/print_custom_report.php
@@ -163,9 +163,19 @@ if (stristr($key,"include_")) {
 		} elseif ($val == "medications") {
 			print "<font class=bold>Patient Medications:</font><br>";
 			printListData($pid, "medication", "1");
+		} elseif ($val == "medical_problems") {
+				print "<font class=bold>Patient Medical Problems:</font><br>";
+				printListData($pid, "medical_problem", "1");
 		} elseif ($val == "immunizations") {
 				print "<font class=bold>Patient Immunization:</font><br>";
-				printListData($pid, "immunization", "1");
+                                $sql = "select if(i1.administered_date,concat(i1.administered_date,' - ',i2.name) ,substring(i1.note,1,20) ) as immunization_data from immunizations i1 left join immunization i2 on i1.immunization_id = i2.id where i1.patient_id = $pid order by administered_date desc";
+
+                                $result = sqlStatement($sql);
+
+                                while ($row=sqlFetchArray($result)){
+                                        echo "<span class=text> " . $row{'immunization_data'} . "</span>
+<br>\n";
+                                }
 		} elseif ($val == "notes") {
 				print "<font class=bold>Patient Notes:</font><br>";
 				printPatientNotes($pid);
diff --git a/interface/patient_file/summary/add_edit_issue.php b/interface/patient_file/summary/add_edit_issue.php
new file mode 100644
index 000000000..0144fa696
--- /dev/null
+++ b/interface/patient_file/summary/add_edit_issue.php
@@ -0,0 +1,274 @@
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ include_once("../../globals.php");
+ include_once("$srcdir/lists.inc");
+ include_once("$srcdir/patient.inc");
+ // include_once("$srcdir/overlib_mini.js");
+ // include_once("$srcdir/calendar.js");
+
+ $issue = $_REQUEST['issue'];
+ $info_msg = "";
+
+ $arrtype = array(
+  'medical_problem' => 'Problem',
+  'allergy'         => 'Allergy',
+  'medication'      => 'Medication',
+  'surgery'         => 'Surgery'
+ );
+
+ $arroccur = array(
+  0   => 'Unknown or N/A',
+  1   => 'First',
+  2   => 'Second',
+  3   => 'Third',
+  4   => 'Chronic/Recurrent',
+  5   => 'Acute on Chronic'
+ );
+
+ function QuotedOrNull($fld) {
+  if ($fld) return "'$fld'";
+  return "NULL";
+ }
+
+?>
+<html>
+<head>
+<title><? echo $issue ? "Edit" : "Add New" ?> Issue</title>
+<link rel=stylesheet href='<? echo $css_header ?>' type='text/css'>
+
+<style>
+td { font-size:10pt; }
+</style>
+
+<script type="text/javascript" src="../../../library/overlib_mini.js"></script>
+<script type="text/javascript" src="../../../library/calendar.js"></script>
+
+<script language="JavaScript">
+
+ var aopts = new Array();
+<?
+ // "Clickoptions" is a feature by Mark Leeds that provides for one-click
+ // access to preselected lists of issues in each category.  Here we get
+ // the issue titles from the user-customizable file and write JavaScript
+ // statements that will build an array of arrays of Option objects.
+ //
+ $clickoptions = array();
+ if (is_file("../../../custom/clickoptions.txt"))
+  $clickoptions = file("../../../custom/clickoptions.txt");
+ $i = 0;
+ foreach ($arrtype as $key => $value) {
+  echo " aopts[$i] = new Array();\n";
+  foreach($clickoptions as $line) {
+   $line = trim($line);
+   if (substr($line, 0, 1) != "#") {
+    if (strpos($line, $key) !== false) {
+     $text = addslashes(substr($line, strpos($line, "::") + 2));
+     echo " aopts[$i][aopts[$i].length] = new Option('$text', '$text', false, false);\n";
+    }
+   }
+  }
+  ++$i;
+ }
+?>
+
+ // React to selection of an issue type.  This loads the associated
+ // shortcuts into the selection list of titles.
+ function newtype(index) {
+  var theopts = document.forms[0].form_titles.options;
+  theopts.length = 0;
+  for (i = 0; i < aopts[index].length; ++i) {
+   theopts[i] = aopts[index][i];
+  }
+ }
+
+ // If a clickoption title is selected, copy it to the title field.
+ function set_text() {
+  var f = document.forms[0];
+  f.form_title.value = f.form_titles.options[f.form_titles.selectedIndex].text;
+  f.form_titles.selectedIndex = -1;
+ }
+
+</script>
+
+</head>
+
+<body <?echo $top_bg_line;?>>
+<?
+ // If we are saving, then save and close the window.
+ //
+ if ($_POST['form_save']) {
+
+  $i = 0;
+  $text_type = "unknown";
+  foreach ($arrtype as $key => $value) {
+   if ($i++ == $_POST['form_type']) $text_type = $key;
+  }
+
+  if ($issue) {
+   sqlStatement("UPDATE lists SET " .
+    "type = '" . $text_type . "', " .
+    "title = '" . $_POST['form_title'] . "', " .
+    "comments = '" . $_POST['form_comments'] . "', " .
+    "begdate = " . QuotedOrNull(fixDate($_POST['form_begin'], '')) . ", " .
+    "enddate = " . QuotedOrNull(fixDate($_POST['form_end'], '')) . ", " .
+    "occurrence = '" . $_POST['form_occur'] . "', " .
+    "referredby = '" . $_POST['form_referredby'] . "', " .
+    "extrainfo = '" . $_POST['form_missed'] . "' " .
+    "WHERE id = '$issue'");
+  } else {
+   sqlInsert("INSERT INTO lists ( " .
+    "date, pid, type, title, activity, comments, begdate, enddate, " .
+    "occurrence, referredby, extrainfo, user, groupname " .
+    ") VALUES ( " .
+    "NOW(), " .
+    "'$pid', " .
+    "'" . $text_type                 . "', " .
+    "'" . $_POST['form_title']       . "', " .
+    "1, "                            .
+    "'" . $_POST['form_comments']    . "', " .
+    QuotedOrNull(fixDate($_POST['form_begin'], '')) . ", " .
+    QuotedOrNull(fixDate($_POST['form_end'], '')) . ", " .
+    "'" . $_POST['form_occur']       . "', " .
+    "'" . $_POST['form_referredby']  . "', " .
+    "'" . $_POST['form_missed']      . "', " .
+    "'" . $$_SESSION['authUser']     . "', " .
+    "'" . $$_SESSION['authProvider'] . "' )");
+  }
+
+  // Close this window and redisplay the updated list of issues.
+  //
+  echo "<script language='JavaScript'>\n";
+  if ($info_msg) echo " alert('$info_msg');\n";
+  echo " window.close();\n";
+  echo " opener.location.reload();\n";
+  echo "</script></body></html>\n";
+  exit();
+ }
+
+ $irow = array();
+ $type_index = 0;
+ if ($issue) {
+  $irow = sqlQuery("SELECT * FROM lists WHERE id = $issue");
+  foreach ($arrtype as $key => $value) {
+   if ($key == $irow['type']) break;
+   ++$type_index;
+  }
+ }
+?>
+<!-- Required for the popup date selectors -->
+<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+
+<form method='post' name='theform' action='add_edit_issue.php?issue=<? echo $issue ?>'>
+<center>
+
+<table border='0' width='100%'>
+
+ <tr>
+  <td valign='top' width='1%' nowrap><b>Type:</b></td>
+  <td>
+<?
+ $index = 0;
+ foreach ($arrtype as $value) {
+  echo "   <input type='radio' name='form_type' value='$index' onclick='newtype($index)'";
+  if ($index == $type_index) echo " checked";
+  echo " />$value&nbsp;\n";
+  ++$index;
+ }
+?>
+  </td>
+ </tr>
+
+ <tr>
+  <td valign='top' nowrap><b>Title:</b></td>
+  <td>
+   <select name='form_titles' size='4' onchange='set_text()' style='width:100%'>
+   </select><br>
+   <input type='text' size='40' name='form_title' value='<? echo $irow['title'] ?>' style='width:100%' />
+  </td>
+ </tr>
+
+ <tr>
+  <td valign='top' nowrap><b>Begin Date:</b></td>
+  <td>
+   <input type='text' size='10' name='form_begin' value='<? echo $irow['begdate'] ?>'
+    title='yyyy-mm-dd date of onset, surgery or start of medication' />
+   <a href="javascript:show_calendar('theform.form_begin')"
+    title="Click here to choose a date"
+    ><img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22' border='0'></a>
+  </td>
+ </tr>
+
+ <tr>
+  <td valign='top' nowrap><b>End Date:</b></td>
+  <td>
+   <input type='text' size='10' name='form_end' value='<? echo $irow['enddate'] ?>'
+    title='yyyy-mm-dd date of recovery or end of medication' />
+   <a href="javascript:show_calendar('theform.form_end')"
+    title="Click here to choose a date"
+    ><img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22' border='0'></a>
+    &nbsp;(leave blank if still active)
+  </td>
+ </tr>
+
+ <tr>
+  <td valign='top' nowrap><b>Occurrence:</b></td>
+  <td>
+   <select name='form_occur'>
+<?
+ foreach ($arroccur as $key => $value) {
+  echo "   <option value='$key'";
+  if ($key == $irow['occurrence']) echo " selected";
+  echo ">$value\n";
+ }
+?>
+   </select>
+  </td>
+ </tr>
+
+<? if ($GLOBALS['athletic_team']) { ?>
+ <tr>
+  <td valign='top' nowrap><b>Missed:</b></td>
+  <td>
+   <input type='text' size='3' name='form_missed' value='<? echo $irow['extrainfo'] ?>'
+    title='Number of games or events missed, if any' />
+   &nbsp;games/events
+  </td>
+ </tr>
+<? } else { ?>
+ <tr>
+  <td valign='top' nowrap><b>Referred by:</b></td>
+  <td>
+   <input type='text' size='40' name='form_referredby' value='<? echo $irow['referredby'] ?>'
+    style='width:100%' title='Referring physician and practice' />
+  </td>
+ </tr>
+<? } ?>
+
+ <tr>
+  <td valign='top' nowrap><b>Comments:</b></td>
+  <td>
+   <textarea name='form_comments' rows='4' cols='40' wrap='virtual' style='width:100%'><? echo $irow['comments'] ?></textarea>
+  </td>
+ </tr>
+
+</table>
+
+<p>
+<input type='submit' name='form_save' value='Save' />
+&nbsp;
+<input type='button' value='Cancel' onclick='window.close()' />
+</p>
+
+</center>
+</form>
+<script language='JavaScript'>
+ newtype(<? echo $type_index ?>);
+</script>
+</body>
+</html>
diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php
dissimilarity index 72%
index 51e496efa..5fde23491 100644
--- a/interface/patient_file/summary/demographics.php
+++ b/interface/patient_file/summary/demographics.php
@@ -1,359 +1,371 @@
-<?
-include_once("../../globals.php");
-
-include_once("$srcdir/patient.inc");
-
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-
-</head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-<a href="demographics_full.php" target=Main><font class=title>Demographics</font><font class=more><?echo $tmore;?></font></a>
-<table border="0" width="100%">
-<tr>
-<td align="left" valign="top">
-
-
-<table border=0 cellpadding=0>
-
-<?
-$result = getPatientData($pid);
-$result2 = getEmployerData($pid);
-?>
-
-<tr>
-<td valign=top><span class=bold>Name: </span><span class=text><?echo $result{"title"}?> <?echo $result{"fname"}?> <?echo $result{"mname"}?> <?echo $result{"lname"}?></span><br>
-<span class=bold>Number: </span><span class=text><?echo $result{"pubpid"}?></span>
-</td>
-<td valign=top>
-<?
-	if ($result{"DOB"} != "0000-00-00") {
-?>
-<span class=bold>DOB: </span>
-<span class=text>
-<?
-echo $result{"DOB_TS"};
-	}
-?>
-</span></td>
-<td valign=top><? if ($result{"sex"} != ""){?><span class=bold>Sex: </span><?}?><span class=text><?echo $result{"sex"}?></span></td>
-<td valign=top><? if ($result{"ss"} != "") {?><span class=bold>S.S.: </span><?}?><span class=text><?echo $result{"ss"}?></span></td>
-</tr>
-
-<tr>
-<td valign=top>
-<? if (($result{"street"} != "") || ($result{"city"} != "") || ($result{"state"} != "") || ($result{"country_code"} != "") || ($result{"postal_code"} != "")) {?>
-<span class=bold>Address: </span>
-<?}?>
-<br><span class=text><?echo $result{"street"}?><br><?echo $result{"city"}?><?if($result{"city"} != ""){echo ", ";}?><?echo $result{"state"};?>
-<? if($result{"country_code"} != ""){ echo ", "; }?><?echo $result{"country_code"}?>
-<?echo " ";
-echo $result{"postal_code"}?>
-</span></td>
-<td valign=top>
-<?
-	if (	($result{"contact_relationship"} != "") ||
-		($result{"phone_contact"} != "") ||
-		($result{"phone_home"} != "") ||
-		($result{"phone_biz"} != "") ||
-		($result{"email"} != "")  ||
-		($result{"phone_cell"} != "")    ){
-?>
-<span class=bold>Emergency Contact: </span><?}?><span class=text><?echo $result{"contact_relationship"}?><?echo " "?>
-
-<?
-	if ($result{"phone_contact"} != "") {
-		echo " " . $result{"phone_contact"};
-	}
-	if ($result{"phone_home"} != "") {
-		echo "<br>Home: ";
-		echo $result{"phone_home"};
-	}
-	if ($result{"phone_biz"} != "") {
-		echo "<br>Work: ";
-		echo $result{"phone_biz"};
-	}
-	if ($result{"phone_cell"} != "") {
-		echo "<br>Mobile: ";
-		echo $result{"phone_cell"};
-	}
-	if ($result{"email"} != "") {
-		echo "<br>Email: </span>";
-		echo '<a class=link_submit href="mailto:' . $result{"email"} . '">' . $result{"email"} . '</a>';
-	}
-?>
-
-
-</td>
-<td valign=top>
-<?
-	if ($result{"status"} != "") {
-		echo "<span class=bold>Marital Status: </span>";
-		echo "<span class=text>" .  $result{"status"} . "</span>";
-	}
-?>
-</td>
-<td valign=top></td>
-</tr>
-
-
-<tr>
-<td valign=top>
-<? if ($result{"occupation"} != "") {?><span class=bold>Occupation: </span><span class=text><?echo $result{"occupation"}?></span><br><?}?>
-<? if ($result2{"name"} != "") {?><span class=bold>Employer: </span><span class=text><?echo $result2{"name"}?></span><?}?>
-</td>
-<td valign=top>
-<? if (($result2{"street"} != "") || ($result2{"city"} != "") || ($result2{"state"} != "") || ($result2{"country"} != "") || ($result2{"postal_code"} != "")) {?>
-<span class=bold>Employer Address:</span>
-<?
-}
-?>
-<br>
-<span class=text>
-<?echo $result2{"street"}?><br><?echo $result2{"city"}?><?if($result2{"city"} != ""){echo ", ";}?><?echo $result2{"state"}?>
-<?if($result2{"country"} != ""){echo ", ";}?><?echo $result2{"country"}?>
-<?if($result2{"postal_code"} != ""){echo " ";}?>
-<?echo $result2{"postal_code"}?>
-</span>
-</td>
-<td valign=top></td>
-</tr>
-
-
-<tr>
-<td valign=top>
-<? if ($result{"ethnoracial"} != "") {?><span class=bold>Race/Ethnicity: </span><span class=text><?echo $result{"ethnoracial"};?></span><br><?}?>
-<? if ($result{"language"} != "") {?><span class=bold>Language: </span><span class=text><?echo ucfirst($result{"language"});?></span><br><?}?>
-<? if ($result{"interpretter"} != "") {?><span class=bold>Interpretter: </span><span class=text><?echo $result{"interpretter"};?></span><br><?}?>
-<? if ($result{"family_size"} != "") {?><span class=bold>Family Size: </span><span class=text><?echo $result{"family_size"};?></span><br><?}?>
-
-
-</td>
-<td valign=top>
-<?
-function print_as_money($money) {
-preg_match("/(\d*)\.?(\d*)/",$money,$moneymatches);
-$tmp = wordwrap(strrev($moneymatches[1]),3,",",1);
-$ccheck = strrev($tmp);
-if ($ccheck[0] == ",") {
-	$tmp = substr($ccheck,1,strlen($ccheck)-1);
-}
-if ($moneymatches[2] != "") {
-	return "$ " . strrev($tmp) . "." . $moneymatches[2];
-} else {
-	return "$ " . strrev($tmp);
-}
-}
-?>
-<? if ($result{"financial_review"} != "0000-00-00 00:00:00") {?><span class=bold>Financial Review Date: </span><span class=text><?echo date("n/j/Y",strtotime($result{"financial_review"}));?></span><br><?}?>
-<? if ($result{"monthly_income"} != "") {?><span class=bold>Monthly Income: </span><span class=text><?echo print_as_money($result{"monthly_income"});?></span><br><?}?>
-<? if ($result{"migrantseasonal"} != "") {?><span class=bold>Migrant/Seasonal: </span><span class=text><?echo $result{"migrantseasonal"};?></span><br><?}?>
-<? if ($result{"homeless"} != "") {?><span class=bold>Homeless, etc.: </span><span class=text><?echo $result{"homeless"};?></span><br><?}?>
-</td>
-<td valign=top>
-<table>
-  <tr>
-    <td><? if ($result{"genericname1"} != "") {?><span class=bold><?=$result{"genericname1"}?></span>:<?}?> </td>
-	<td><? if ($result{"genericval1"} != "") {?><span class=text><?=$result{"genericval1"}?></span><?}?></td>
-  </tr>
-  <tr>
-    <td><? if ($result{"genericname2"} != "") {?><span class=bold><?=$result{"genericname2"}?></span>:<?}?> </td>
-	<td><? if ($result{"genericval2"} != "") {?><span class=text><?=$result{"genericval2"}?></span><?}?></td>
-  </tr>
-
-</table>
-
-</td>
-</tr>
-
-
-<?php
-//////////////////////////////////REFERRAL SECTION
-if ($result{"referrer"} != "" || $result{"referrerID"} != "")
-{
-?>
-<tr>
-<td valign=top>
-<span class=bold>Primary Provider: </span><span class=text><?=getProviderName($result['providerID'])?></span><br>
-<!--<span class=bold>Primary Provider ID: </span><span class=text><?=$result{"referrerID"}?></span>-->
-</td>
-</tr>
-<?php
-}
-
-/////////////////////////////////INSURANCE SECTION
-$result3 = getInsuranceData($pid, "primary");
-if ($result3{"provider"}) {
-?>
-<tr>
-<td valign=top>
-<span class=bold>Primary Insurance Provider:</span><br><span class=text><?echo $result3{"provider_name"}?></span><br>
-<span class=text>Policy Number: <?echo $result3{"policy_number"}?><br>
-Plan Name: <?=$result3{"plan_name"}?><br>
-Group Number: <?echo $result3{"group_number"}?></span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber: </span><br><span class=text><?=$result3{"subscriber_fname"}?> <?=$result3{"subscriber_mname"}?> <?=$result3{"subscriber_lname"}?> <?if ($result3{"subscriber_relationship"} != "") {echo "(".$result3{"subscriber_relationship"}.")";}?><br>
-S.S.: <?echo $result3{"subscriber_ss"}?> D.O.B.: <?if ($result3{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result3{"subscriber_DOB"};}?><br>
-Phone: <? echo $result3{"subscriber_phone"}?>
-</span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Address: </span><br><span class=text><?echo $result3{"subscriber_street"}?><br><?echo $result3{"subscriber_city"}?><?if($result3{"subscriber_state"} != ""){echo ", ";}?><?echo $result3{"subscriber_state"}?><?if($result3{"subscriber_country"} != ""){echo ", ";}?><?echo $result3{"subscriber_country"}?> <?echo " ".$result3{"subscriber_postal_code"}?></span>
-
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Employer: </span><br><span class=text><?echo $result3{"subscriber_employer"}?><br><?echo $result3{"subscriber_employer_street"}?><br><?echo $result3{"subscriber_employer_city"}?><?if($result3{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result3{"subscriber_employer_state"}?><?if($result3{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result3{"subscriber_employer_country"}?> <?echo " ".$result3{"subscriber_employer_postal_code"}?></span>
-
-</td>
-
-</tr>
-<tr><td><? if ($result3{"copay"} != "") {?><span class=bold>CoPay: </span><span class=text><?=$result3{"copay"}?></span><?}?></td></tr>
-<?
-}
-?>
-
-
-
-<?
-$result4 = getInsuranceData($pid, "secondary");
-if ($result4{"provider"} != "") {
-?>
-<tr>
-<td valign=top>
-<span class=bold>Secondary Insurance Provider:</span><br><span class=text><?echo $result4{"provider_name"}?></span><br>
-<span class=text>Policy Number: <?echo $result4{"policy_number"}?><br>
-Plan Name: <?=$result4{"plan_name"}?><br>
-Group Number: <?echo $result4{"group_number"}?></span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber: </span><br><span class=text><?=$result4{"subscriber_fname"}?> <?=$result4{"subscriber_mname"}?> <?=$result4{"subscriber_lname"}?> <?if ($result4{"subscriber_relationship"} != "") {echo "(".$result4{"subscriber_relationship"}.")";}?><br>
-S.S.: <?echo $result4{"subscriber_ss"}?> D.O.B.: <?if ($result4{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result4{"subscriber_DOB"};}?><br>
-Phone: <? echo $result4{"subscriber_phone"}?>
-</span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Address: </span><br><span class=text><?echo $result4{"subscriber_street"}?><br><?echo $result4{"subscriber_city"}?><?if($result4{"subscriber_state"} != ""){echo ", ";}?><?echo $result4{"subscriber_state"}?><?if($result4{"subscriber_country"} != ""){echo ", ";}?><?echo $result4{"subscriber_country"}?> <?echo " ".$result4{"subscriber_postal_code"}?></span>
-
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Employer: </span><br><span class=text><?echo $result4{"subscriber_employer"}?><br><?echo $result4{"subscriber_employer_street"}?><br><?echo $result4{"subscriber_employer_city"}?><?if($result4{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result4{"subscriber_employer_state"}?><?if($result4{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result4{"subscriber_employer_country"}?> <?echo " ".$result4{"subscriber_employer_postal_code"}?></span>
-
-</td>
-
-</tr>
-<tr><td><? if ($result4{"copay"} != "") {?><span class=bold>CoPay: </span><span class=text><?=$result4{"copay"}?></span><?}?></td></tr>
-<?
-}
-?>
-
-
-
-
-<?
-$result5 = getInsuranceData($pid, "tertiary");
-if ($result5{"provider"}) {
-?>
-<tr>
-<td valign=top>
-<span class=bold>Tertiary Insurance Provider:</span><br><span class=text><?echo $result5{"provider_name"}?></span><br>
-<span class=text>Policy Number: <?echo $result5{"policy_number"}?><br>
-Plan Name: <?=$result5{"plan_name"}?><br>
-Group Number: <?echo $result5{"group_number"}?></span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber: </span><br><span class=text><?=$result5{"subscriber_fname"}?> <?=$result5{"subscriber_mname"}?> <?=$result5{"subscriber_lname"}?> <?if ($result5{"subscriber_relationship"} != "") {echo "(".$result5{"subscriber_relationship"}.")";}?><br>
-S.S.: <?echo $result5{"subscriber_ss"}?> D.O.B.: <?if ($result5{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result5{"subscriber_DOB"};}?><br>
-Phone: <? echo $result5{"subscriber_phone"}?>
-</span>
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Address: </span><br><span class=text><?echo $result5{"subscriber_street"}?><br><?echo $result5{"subscriber_city"}?><?if($result5{"subscriber_state"} != ""){echo ", ";}?><?echo $result5{"subscriber_state"}?><?if($result5{"subscriber_country"} != ""){echo ", ";}?><?echo $result5{"subscriber_country"}?> <?echo " ".$result5{"subscriber_postal_code"}?></span>
-
-</td>
-
-<td valign=top>
-<span class=bold>Subscriber Employer: </span><br><span class=text><?echo $result5{"subscriber_employer"}?><br><?echo $result5{"subscriber_employer_street"}?><br><?echo $result5{"subscriber_employer_city"}?><?if($result5{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result5{"subscriber_employer_state"}?><?if($result5{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result5{"subscriber_employer_country"}?> <?echo " ".$result5{"subscriber_employer_postal_code"}?></span>
-
-</td>
-
-</tr>
-<tr><td><? if ($result5{"copay"} != "") {?><span class=bold>CoPay: </span><span class=text><?=$result5{"copay"}?></span><?}?></td></tr>
-<?
-}
-?>
-
-
-
-
-
-</table>
-
-</td>
-
-
-<td align="right" valign="top">
-<?php
-if (isset($pid)) {
-//postnuke doesn't make it easy to set globals/get/post
-//didn't want to use an ifram here so I had to fake a page
-//load environment by setting the things that would have
-//been passed in the querystring
-
-include_once("$srcdir/calendar.inc");
-
-unset($func);
-unset($module);
-unset($Date);
-$_GET['module'] = "PostCalendar";
-$_GET['func']	= "search";
-$_GET['Date']	= pc_getDate();
-$_GET['no_nav'] = 2;
-$_GET['patient_id'] = intval($pid);
-$_GET['submit'] = "listapps";
-global $func,$Date,$module;
-$module = "PostCalendar";
-$func = "search";
-$Date = $_GET['Date'];
-$submit = "listapps";
-$no_nav = 2;
-$patient_id = $_GET['patient_id'];
-
-//now that the environment is set, include the page, it will
-//behave as though it was loaded in an iframe with the querystring
-//variables set
-chdir("../../main/calendar");
-include("index.php");
-}
-
-?>
-
-
-</td>
-
-</tr></table>
-
-
-<br><br>
-
-
-
-<br><br>
-
-</body>
-</html>
+<?
+include_once("../../globals.php");
+include_once("$srcdir/patient.inc");
+?>
+<html>
+
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+
+<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<p><a href="demographics_full.php" target=Main><font class=title>Demographics</font><font class=more><?echo $tmore;?></font></a></p>
+
+<table border="0" width="100%">
+ <tr>
+  <td align="left" valign="top">
+   <table border='0' cellpadding='0' width='100%'>
+<?
+$result = getPatientData($pid);
+$result2 = getEmployerData($pid);
+?>
+    <tr>
+     <td valign='top'>
+      <span class='bold'>Name: </span><span class='text'><?echo $result{"title"}?> <?echo $result{"fname"}?> <?echo $result{"mname"}?> <?echo $result{"lname"}?></span><br>
+      <span class='bold'>Number: </span><span class='text'><?echo $result{"pubpid"}?></span>
+     </td>
+     <td valign='top'>
+<?
+ if ($result{"DOB"} && $result{"DOB"} != "0000-00-00") {
+?>
+      <span class='bold'>DOB: </span>
+      <span class='text'>
+<?
+  echo $result{"DOB"};
+ }
+?>
+      </span>
+     </td>
+     <td valign='top'><? if ($result{"sex"} != ""){?><span class='bold'>Sex: </span><?}?><span class='text'><?echo $result{"sex"}?></span></td>
+     <td valign='top'><? if ($result{"ss"} != "") {?><span class='bold'>S.S.: </span><?}?><span class='text'><?echo $result{"ss"}?></span></td>
+    </tr>
+    <tr>
+     <td valign='top'>
+<? if (($result{"street"} != "") || ($result{"city"} != "") || ($result{"state"} != "") || ($result{"country_code"} != "") || ($result{"postal_code"} != "")) {?>
+      <span class='bold'>Address: </span>
+<?}?>
+      <br><span class='text'><?echo $result{"street"}?><br><?echo $result{"city"}?><?if($result{"city"} != ""){echo ", ";}?><?echo $result{"state"};?>
+<? if($result{"country_code"} != ""){ echo ", "; }?><?echo $result{"country_code"}?>
+<?echo " ";
+echo $result{"postal_code"}?>
+      </span>
+     </td>
+     <td valign='top'>
+<?
+	if (	($result{"contact_relationship"} != "") ||
+		($result{"phone_contact"} != "") ||
+		($result{"phone_home"} != "") ||
+		($result{"phone_biz"} != "") ||
+		($result{"email"} != "")  ||
+		($result{"phone_cell"} != "")    ){
+?>
+      <span class='bold'>Emergency Contact: </span><?}?><span class='text'><?echo $result{"contact_relationship"}?><?echo " "?>
+<?
+	if ($result{"phone_contact"} != "") {
+		echo " " . $result{"phone_contact"};
+	}
+	if ($result{"phone_home"} != "") {
+		echo "<br>Home: ";
+		echo $result{"phone_home"};
+	}
+	if ($result{"phone_biz"} != "") {
+		echo "<br>Work: ";
+		echo $result{"phone_biz"};
+	}
+	if ($result{"phone_cell"} != "") {
+		echo "<br>Mobile: ";
+		echo $result{"phone_cell"};
+	}
+	if ($result{"email"} != "") {
+		echo "<br>Email: </span>";
+		echo '<a class=link_submit href="mailto:' . $result{"email"} . '">' . $result{"email"} . '</a>';
+	}
+?>
+     </td>
+     <td valign='top'>
+<?
+	if ($result{"status"} != "") {
+		echo "<span class='bold'>Marital Status: </span>";
+		echo "<span class='text'>" .  $result{"status"} . "</span>";
+	}
+?>
+     </td>
+     <td valign='top'></td>
+    </tr>
+
+<? if (! $GLOBALS['athletic_team']) { ?>
+    <tr>
+     <td colspan='4' valign='top'>
+	<? 
+		$result{"hipaa_mail"}=='NO' ? $opt_out='DOES NOT ALLOW' : $opt_out='ALLOWS' ;
+		echo "<span class='text'>Patient $opt_out Mailed Information </span>";
+	?>
+     </td>
+    </tr>
+    <tr>
+     <td colspan='4' valign='top'>
+	<? 
+		$result{"hipaa_voice"}=='NO' ? $opt_out='DOES NOT ALLOW' : $opt_out='ALLOWS' ;
+		echo "<span class='text'>Patient $opt_out Voice Messages </span>";
+	?>
+     </td>
+    </tr>
+<? } else { ?>
+    <tr>
+     <td colspan='4' valign='top'>
+      &nbsp;
+     </td>
+    </tr>
+<? } ?>
+
+    <tr>
+     <td valign='top'>
+<? if ($result{"occupation"} != "") {?><span class='bold'>Occupation: </span><span class='text'><?echo $result{"occupation"}?></span><br><?}?>
+<? if ($result2{"name"} != "") {?><span class='bold'>Employer: </span><span class='text'><?echo $result2{"name"}?></span><?}?>
+     </td>
+     <td valign='top'>
+<? if (($result2{"street"} != "") || ($result2{"city"} != "") || ($result2{"state"} != "") || ($result2{"country"} != "") || ($result2{"postal_code"} != "")) {?>
+      <span class='bold'>Employer Address:</span>
+<? } ?>
+      <br>
+      <span class='text'>
+<?echo $result2{"street"}?><br><?echo $result2{"city"}?><?if($result2{"city"} != ""){echo ", ";}?><?echo $result2{"state"}?>
+<?if($result2{"country"} != ""){echo ", ";}?><?echo $result2{"country"}?>
+<?if($result2{"postal_code"} != ""){echo " ";}?>
+<?echo $result2{"postal_code"}?>
+      </span>
+     </td>
+     <td valign='top'>
+<?
+ // This stuff only applies to athletic team use of OpenEMR:
+ if ($GLOBALS['athletic_team']) {
+  $fitcolors = array('#00ff00', '#ffff00', '#ff8800', '#ff3333');
+  $fitcolor = $fitcolors[0];
+  $fitness = $_POST['form_fitness'];
+  if ($fitness) {
+   sqlStatement("UPDATE patient_data SET fitness = '$fitness' WHERE pid = '$pid'");
+  } else {
+   $fitness = $result['fitness'];
+   if (! $fitness) $fitness = 1;
+  }
+  $fitcolor = $fitcolors[$fitness - 1];
+?>
+      <form method='post' action='demographics.php'>
+      <span class='bold'>Fitness to Play:</span><br>
+      <select name='form_fitness' onchange='document.forms[0].submit()' style='background-color:<? echo $fitcolor ?>'>
+       <option value='1'<? if ($fitness == 1) echo ' selected' ?>>Full Play</option>
+       <option value='2'<? if ($fitness == 2) echo ' selected' ?>>Full Training</option>
+       <option value='3'<? if ($fitness == 3) echo ' selected' ?>>Restricted Training</option>
+       <option value='4'<? if ($fitness == 4) echo ' selected' ?>>Injured Out</option>
+      </select>
+      </form>
+<? } ?>
+     </td>
+     <td valign='top'></td>
+    </tr>
+    <tr>
+     <td valign='top'>
+<? if ($result{"ethnoracial"} != "") {?><span class='bold'>Race/Ethnicity: </span><span class='text'><?echo $result{"ethnoracial"};?></span><br><?}?>
+<? if ($result{"language"} != "") {?><span class='bold'>Language: </span><span class='text'><?echo ucfirst($result{"language"});?></span><br><?}?>
+<? if ($result{"interpretter"} != "") {?><span class='bold'>Interpretter: </span><span class='text'><?echo $result{"interpretter"};?></span><br><?}?>
+<? if ($result{"family_size"} != "") {?><span class='bold'>Family Size: </span><span class='text'><?echo $result{"family_size"};?></span><br><?}?>
+     </td>
+     <td valign='top'>
+<?
+function print_as_money($money) {
+preg_match("/(\d*)\.?(\d*)/",$money,$moneymatches);
+$tmp = wordwrap(strrev($moneymatches[1]),3,",",1);
+$ccheck = strrev($tmp);
+if ($ccheck[0] == ",") {
+	$tmp = substr($ccheck,1,strlen($ccheck)-1);
+}
+if ($moneymatches[2] != "") {
+	return "$ " . strrev($tmp) . "." . $moneymatches[2];
+} else {
+	return "$ " . strrev($tmp);
+}
+}
+?>
+<? if ($result{"financial_review"} != "0000-00-00 00:00:00") {?><span class='bold'>Financial Review Date: </span><span class='text'><?echo date("n/j/Y",strtotime($result{"financial_review"}));?></span><br><?}?>
+<? if ($result{"monthly_income"} != "") {?><span class='bold'>Monthly Income: </span><span class='text'><?echo print_as_money($result{"monthly_income"});?></span><br><?}?>
+<? if ($result{"migrantseasonal"} != "") {?><span class='bold'>Migrant/Seasonal: </span><span class='text'><?echo $result{"migrantseasonal"};?></span><br><?}?>
+<? if ($result{"homeless"} != "") {?><span class='bold'>Homeless, etc.: </span><span class='text'><?echo $result{"homeless"};?></span><br><?}?>
+     </td>
+     <td valign='top'>
+      <table>
+       <tr>
+        <td><? if ($result{"genericname1"} != "") {?><span class='bold'><?=$result{"genericname1"}?></span>:<?}?> </td>
+        <td><? if ($result{"genericval1"} != "") {?><span class='text'><?=$result{"genericval1"}?></span><?}?></td>
+       </tr>
+       <tr>
+        <td><? if ($result{"genericname2"} != "") {?><span class='bold'><?=$result{"genericname2"}?></span>:<?}?> </td>
+        <td><? if ($result{"genericval2"} != "") {?><span class='text'><?=$result{"genericval2"}?></span><?}?></td>
+       </tr>
+      </table>
+     </td>
+     <td valign='top'></td>
+    </tr>
+<?php
+//////////////////////////////////REFERRAL SECTION
+if ($result{"referrer"} != "" || $result{"referrerID"} != "")
+{
+?>
+    <tr>
+     <td valign='top'>
+      <span class='bold'>Primary Provider: </span><span class='text'><?=getProviderName($result['providerID'])?></span><br>
+      <!--<span class='bold'>Primary Provider ID: </span><span class='text'><?=$result{"referrerID"}?></span>-->
+     </td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+    </tr>
+<?php
+}
+
+/////////////////////////////////INSURANCE SECTION
+$result3 = getInsuranceData($pid, "primary");
+if ($result3{"provider"}) {
+?>
+    <tr>
+     <td valign='top'>
+      <span class='bold'>Primary Insurance Provider:</span><br><span class='text'><?echo $result3{"provider_name"}?></span><br>
+      <span class='text'>Policy Number: <?echo $result3{"policy_number"}?><br>
+      Plan Name: <?=$result3{"plan_name"}?><br>
+      Group Number: <?echo $result3{"group_number"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber: </span><br><span class='text'><?=$result3{"subscriber_fname"}?> <?=$result3{"subscriber_mname"}?> <?=$result3{"subscriber_lname"}?> <?if ($result3{"subscriber_relationship"} != "") {echo "(".$result3{"subscriber_relationship"}.")";}?><br>
+      S.S.: <?echo $result3{"subscriber_ss"}?> D.O.B.: <?if ($result3{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result3{"subscriber_DOB"};}?><br>
+      Phone: <? echo $result3{"subscriber_phone"}?>
+      </span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Address: </span><br><span class='text'><?echo $result3{"subscriber_street"}?><br><?echo $result3{"subscriber_city"}?><?if($result3{"subscriber_state"} != ""){echo ", ";}?><?echo $result3{"subscriber_state"}?><?if($result3{"subscriber_country"} != ""){echo ", ";}?><?echo $result3{"subscriber_country"}?> <?echo " ".$result3{"subscriber_postal_code"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Employer: </span><br><span class='text'><?echo $result3{"subscriber_employer"}?><br><?echo $result3{"subscriber_employer_street"}?><br><?echo $result3{"subscriber_employer_city"}?><?if($result3{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result3{"subscriber_employer_state"}?><?if($result3{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result3{"subscriber_employer_country"}?> <?echo " ".$result3{"subscriber_employer_postal_code"}?></span>
+     </td>
+    </tr>
+    <tr>
+     <td><? if ($result3{"copay"} != "") {?><span class='bold'>CoPay: </span><span class='text'><?=$result3{"copay"}?></span><?}?></td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+   </tr>
+<? } ?>
+<?
+$result4 = getInsuranceData($pid, "secondary");
+if ($result4{"provider"} != "") {
+?>
+    <tr>
+     <td valign='top'>
+      <span class='bold'>Secondary Insurance Provider:</span><br><span class='text'><?echo $result4{"provider_name"}?></span><br>
+      <span class='text'>Policy Number: <?echo $result4{"policy_number"}?><br>
+      Plan Name: <?=$result4{"plan_name"}?><br>
+      Group Number: <?echo $result4{"group_number"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber: </span><br><span class='text'><?=$result4{"subscriber_fname"}?> <?=$result4{"subscriber_mname"}?> <?=$result4{"subscriber_lname"}?> <?if ($result4{"subscriber_relationship"} != "") {echo "(".$result4{"subscriber_relationship"}.")";}?><br>
+      S.S.: <?echo $result4{"subscriber_ss"}?> D.O.B.: <?if ($result4{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result4{"subscriber_DOB"};}?><br>
+      Phone: <? echo $result4{"subscriber_phone"}?>
+      </span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Address: </span><br><span class='text'><?echo $result4{"subscriber_street"}?><br><?echo $result4{"subscriber_city"}?><?if($result4{"subscriber_state"} != ""){echo ", ";}?><?echo $result4{"subscriber_state"}?><?if($result4{"subscriber_country"} != ""){echo ", ";}?><?echo $result4{"subscriber_country"}?> <?echo " ".$result4{"subscriber_postal_code"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Employer: </span><br><span class='text'><?echo $result4{"subscriber_employer"}?><br><?echo $result4{"subscriber_employer_street"}?><br><?echo $result4{"subscriber_employer_city"}?><?if($result4{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result4{"subscriber_employer_state"}?><?if($result4{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result4{"subscriber_employer_country"}?> <?echo " ".$result4{"subscriber_employer_postal_code"}?></span>
+     </td>
+    </tr>
+    <tr>
+     <td>
+      <? if ($result4{"copay"} != "") {?><span class='bold'>CoPay: </span><span class='text'><?=$result4{"copay"}?></span><?}?>
+     </td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+    </tr>
+<? } ?>
+<?
+$result5 = getInsuranceData($pid, "tertiary");
+if ($result5{"provider"}) {
+?>
+    <tr>
+     <td valign='top'>
+      <span class='bold'>Tertiary Insurance Provider:</span><br><span class='text'><?echo $result5{"provider_name"}?></span><br>
+      <span class='text'>Policy Number: <?echo $result5{"policy_number"}?><br>
+      Plan Name: <?=$result5{"plan_name"}?><br>
+      Group Number: <?echo $result5{"group_number"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber: </span><br><span class='text'><?=$result5{"subscriber_fname"}?> <?=$result5{"subscriber_mname"}?> <?=$result5{"subscriber_lname"}?> <?if ($result5{"subscriber_relationship"} != "") {echo "(".$result5{"subscriber_relationship"}.")";}?><br>
+      S.S.: <?echo $result5{"subscriber_ss"}?> D.O.B.: <?if ($result5{"subscriber_DOB"} != "0000-00-00 00:00:00") {echo $result5{"subscriber_DOB"};}?><br>
+      Phone: <? echo $result5{"subscriber_phone"}?>
+      </span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Address: </span><br><span class='text'><?echo $result5{"subscriber_street"}?><br><?echo $result5{"subscriber_city"}?><?if($result5{"subscriber_state"} != ""){echo ", ";}?><?echo $result5{"subscriber_state"}?><?if($result5{"subscriber_country"} != ""){echo ", ";}?><?echo $result5{"subscriber_country"}?> <?echo " ".$result5{"subscriber_postal_code"}?></span>
+     </td>
+     <td valign='top'>
+      <span class='bold'>Subscriber Employer: </span><br><span class='text'><?echo $result5{"subscriber_employer"}?><br><?echo $result5{"subscriber_employer_street"}?><br><?echo $result5{"subscriber_employer_city"}?><?if($result5{"subscriber_employer_city"} != ""){echo ", ";}?><?echo $result5{"subscriber_employer_state"}?><?if($result5{"subscriber_employer_country"} != ""){echo ", ";}?><?echo $result5{"subscriber_employer_country"}?> <?echo " ".$result5{"subscriber_employer_postal_code"}?></span>
+     </td>
+    </tr>
+    <tr>
+     <td>
+      <? if ($result5{"copay"} != "") {?><span class='bold'>CoPay: </span><span class='text'><?=$result5{"copay"}?></span><?}?>
+     </td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+     <td valign='top'></td>
+    </tr>
+<?
+}
+?>
+   </table>
+  </td>
+  <td align="right" valign="top">
+<?php
+// I can't believe this crap.  It generates a whole new document with
+// <html> tag and everything, and then terminates our script prematurely!
+// So I disabled it.  BTW the comments below re postnuke are not mine.
+//  -- Rod 2005-06-16
+//
+if (false && isset($pid)) { // was: if (isset($pid)) {
+//postnuke doesn't make it easy to set globals/get/post
+//didn't want to use an ifram here so I had to fake a page
+//load environment by setting the things that would have
+//been passed in the querystring
+
+include_once("$srcdir/calendar.inc");
+
+unset($func);
+unset($module);
+unset($Date);
+$_GET['module'] = "PostCalendar";
+$_GET['func']	= "search";
+$_GET['Date']	= pc_getDate();
+$_GET['no_nav'] = 2;
+$_GET['patient_id'] = intval($pid);
+$_GET['submit'] = "listapps";
+global $func,$Date,$module;
+$module = "PostCalendar";
+$func = "search";
+$Date = $_GET['Date'];
+$submit = "listapps";
+$no_nav = 2;
+$patient_id = $_GET['patient_id'];
+
+//now that the environment is set, include the page, it will
+//behave as though it was loaded in an iframe with the querystring
+//variables set
+chdir("../../main/calendar");
+include("index.php");
+}
+?>
+  </td>
+ </tr>
+</table>
+
+</body>
+</html>
diff --git a/interface/patient_file/summary/demographics_full.php b/interface/patient_file/summary/demographics_full.php
dissimilarity index 93%
index 812f5e4b1..b223f370d 100644
--- a/interface/patient_file/summary/demographics_full.php
+++ b/interface/patient_file/summary/demographics_full.php
@@ -1,544 +1,551 @@
-<?
-include_once("../../globals.php");
-
-include_once("$srcdir/patient.inc");
-
-$relats = array('','self','spouse','child','other');
-$statii = array('married','single','divorced','widowed','separated','domestic partner');
-//$langi = array('english','spanish','french','tagalog','vietnamese');
-
-$langi = getLanguages();
-$ethnoraciali = getEthnoRacials();
-$provideri = getProviderInfo();
-$insurancei = getInsuranceProviders();
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-<SCRIPT LANGUAGE="JavaScript"><!--
-function update_phone_biz() {
-document.demographics_form.phone_biz.value = '('+document.demographics_form.phone_biz_area.value+') '+document.demographics_form.phone_biz_first.value+'-'+document.demographics_form.phone_biz_last.value;
-if (document.demographics_form.phone_biz.value == "() -"){
-	document.demographics_form.phone_biz.value = "";
-}
-}
-
-function update_phone_cell() {
-document.demographics_form.phone_cell.value = '('+document.demographics_form.phone_cell_area.value+') '+document.demographics_form.phone_cell_first.value+'-'+document.demographics_form.phone_cell_last.value;
-if (document.demographics_form.phone_cell.value == "() -"){
-	document.demographics_form.phone_cell.value = "";
-}
-}
-
-
-
-//code used from http://tech.irt.org/articles/js037/
-function replace(string,text,by) {
-  // Replaces text with by in string
-      var strLength = string.length, txtLength = text.length;
-      if ((strLength == 0) || (txtLength == 0)) return string;
-
-      var i = string.indexOf(text);
-      if ((!i) && (text != string.substring(0,txtLength))) return string;
-      if (i == -1) return string;
-
-      var newstr = string.substring(0,i) + by;
-
-      if (i+txtLength < strLength)
-          newstr += replace(string.substring(i+txtLength,strLength),text,by);
-
-      return newstr;
-  }
-
-  function upperFirst(string,text) {
-      return replace(string,text,text.charAt(0).toUpperCase() + text.substring(1,text.length));
-  }
-
-
-function update_phone_contact() {
-document.demographics_form.phone_contact.value = '('+document.demographics_form.phone_contact_area.value+') '+document.demographics_form.phone_contact_first.value+'-'+document.demographics_form.phone_contact_last.value;
-if (document.demographics_form.phone_contact.value == "() -"){
-	document.demographics_form.phone_contact.value = "";
-}
-}
-function update_phone_home() {
-document.demographics_form.phone_home.value = '('+document.demographics_form.phone_home_area.value+') '+document.demographics_form.phone_home_first.value+'-'+document.demographics_form.phone_home_last.value;
-if (document.demographics_form.phone_home.value == "() -"){
-	document.demographics_form.phone_home.value = "";
-}
-}
-<? for ($i=1;$i<=3;$i++) { ?>
-function auto_populate_employer_address<?=$i?>(){
-//alert(document.demographics_form.i<?=$i?>subscriber_relationship.options[document.demographics_form.i<?=$i?>subscriber_relationship.selectedIndex].value);
-if (document.demographics_form.i<?=$i?>subscriber_relationship.options[document.demographics_form.i<?=$i?>subscriber_relationship.selectedIndex].value == "self") {
-document.demographics_form.i<?=$i?>subscriber_fname.value=document.demographics_form.fname.value;
-document.demographics_form.i<?=$i?>subscriber_mname.value=document.demographics_form.mname.value;
-document.demographics_form.i<?=$i?>subscriber_lname.value=document.demographics_form.lname.value;
-document.demographics_form.i<?=$i?>subscriber_street.value=document.demographics_form.street.value;
-document.demographics_form.i<?=$i?>subscriber_city.value=document.demographics_form.city.value;
-document.demographics_form.i<?=$i?>subscriber_state.value=document.demographics_form.state.value;
-document.demographics_form.i<?=$i?>subscriber_postal_code.value=document.demographics_form.postal_code.value;
-document.demographics_form.i<?=$i?>subscriber_country.value=document.demographics_form.country_code.value;
-document.demographics_form.i<?=$i?>subscriber_phone.value=document.demographics_form.phone_home.value;
-document.demographics_form.i<?=$i?>subscriber_phone_area.value=document.demographics_form.phone_home_area.value;
-document.demographics_form.i<?=$i?>subscriber_phone_first.value=document.demographics_form.phone_home_first.value;
-document.demographics_form.i<?=$i?>subscriber_phone_last.value=document.demographics_form.phone_home_last.value;
-document.demographics_form.i<?=$i?>subscriber_DOB.value=document.demographics_form.dob.value;
-document.demographics_form.i<?=$i?>subscriber_ss.value=document.demographics_form.ss.value;
-document.demographics_form.i<?=$i?>subscriber_sex.selectedIndex = document.demographics_form.sex.selectedIndex;
-document.demographics_form.i<?=$i?>subscriber_employer.value=document.demographics_form.ename.value;
-document.demographics_form.i<?=$i?>subscriber_employer_street.value=document.demographics_form.estreet.value;
-document.demographics_form.i<?=$i?>subscriber_employer_city.value=document.demographics_form.ecity.value;
-document.demographics_form.i<?=$i?>subscriber_employer_state.value=document.demographics_form.estate.value;
-document.demographics_form.i<?=$i?>subscriber_employer_postal_code.value=document.demographics_form.epostal_code.value;
-document.demographics_form.i<?=$i?>subscriber_employer_country.value=document.demographics_form.ecountry.value;
-
-
-}
-}
-function update_i<?=$i?>subscriber_phone() {
-document.demographics_form.i<?=$i?>subscriber_phone.value = '('+document.demographics_form.i<?=$i?>subscriber_phone_area.value+') '+document.demographics_form.i<?=$i?>subscriber_phone_first.value+'-'+document.demographics_form.i<?=$i?>subscriber_phone_last.value;
-if (document.demographics_form.i<?=$i?>subscriber_phone.value == "() -"){
-	document.demographics_form.i<?=$i?>subscriber_phone.value = "";
-}
-}
-
-<?}?>
-
-
-function popUp(URL) {
-day = new Date();
-id = day.getTime();
-eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=400,height=300,left = 440,top = 362');");
-}
-
-function checkNum () {
-var re= new RegExp();
-re = /^\d*\.?\d*$/;
-str=document.demographics_form.monthly_income.value;
-if(re.exec(str))
-{
-
-}else{
-alert("Please enter a dollar amount using only numbers and a decimal point.");
-}
-}
-//-->
-</script>
-</head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-<?
-$result = getPatientData($pid);
-$result2 = getEmployerData($pid);
-
-
-//extract formatting of phone number:
-$pmatch_contact=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_contact"},$pmatch_contact);
-//extract formatting of phone number:
-$pmatch_home=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_home"},$pmatch_home);
-
-//extract formatting of phone number:
-$pmatch_biz=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_biz"},$pmatch_biz);
-
-//extract formatting of phone number:
-$pmatch_cell=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_cell"},$pmatch_cell);
-
-?>
-
-<form action="demographics_save.php" name=demographics_form method=post>
-<input type=hidden name=mode value=save>
-<input type=hidden name=phone_contact value="<?echo $result{"phone_contact"}?>">
-<input type=hidden name=phone_biz value="<?echo $result{"phone_biz"}?>">
-<input type=hidden name=phone_cell value="<?echo $result{"phone_cell"}?>">
-
-<a href="patient_summary.php" target=Main><font class=title>Demographics</font><font class=back><?echo $tback;?></font></a>
-
-<table border="0" cellpadding="0">
-<tr><td valign="top">
-<span class=required>Name: </span></td>
-<td colspan="6">
-<select name=title tabindex="1">
-	<option value="<?echo $result{"title"}?>"><?echo $result{"title"}?></option>
-	<option value="Mr.">Mr.</option>
-	<option value="Mrs.">Mrs.</option>
-	<option value="Ms.">Ms.</option>
-	<option value="Dr.">Dr.</option>
-</select>
-<input tabindex="2" type=entry size=15 name=fname value="<?echo $result{"fname"}?>"> <input tabindex="3" type=entry size=3 name=mname value="<?echo $result{"mname"}?>"> <input tabindex="4" type=entry size=15 name=lname value="<?echo $result{"lname"}?>">
-</td>
-
-</tr>
-<tr>
-<td valign=top>
-<span class=required>DOB: </span>
-<td><input tabindex="5" type=entry size=11 name=dob value="
-<?
-	if (!empty($result['DOB_TS'])) {
-	  echo $result['DOB_TS'];
-	}
-	else {
-	  echo "MM/DD/YYYY";
-	}
-?>
-"></td><td rowspan="12">&nbsp;</td>
-<td><span class=bold>Patient Number: </span></td><td rowspan="12">&nbsp;</td><td><input type=entry size=10 name=pubpid value="<?echo $result{"pubpid"}?>"></td>
-</tr>
-<tr>
-<td>
-<span class=required>Sex: </span></td><td>
-<select name=sex tabindex="6">
-<option value="Male" <?if ($result{"sex"} == "Male") {echo "selected";};?>>Male</option>
-<option value="Female" <?if ($result{"sex"} == "Female") {echo "selected";};?>>Female</option>
-</select>
-</td>
-<td><span class=bold>Emergency Contact: </span></td><td><input type=entry size=10 name=contact_relationship value="<?echo $result{"contact_relationship"}?>"></td>
-
-</tr>
-<tr>
-	<td><span class=bold>S.S.: </span></td><td><input tabindex="7" type=entry size=11 name=ss value="<?echo $result{"ss"}?>"></td>
-	<td><span class=bold>Emergency Phone:</span></td><td>(<input type=entry size=3 name=phone_contact_area onblur="javascript:update_phone_contact();" value="<?echo $pmatch_contact[1]?>">) <input type=entry size=3 name=phone_contact_first onblur="javascript:update_phone_contact();" value="<?echo $pmatch_contact[2]?>">-<input type=entry size=4 name=phone_contact_last onblur="javascript:update_phone_contact();" value="<?echo $pmatch_contact[3]?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Address: </span></td><td><input tabindex="8" type=entry size=25 name=street value="<?echo $result{"street"}?>"></td>
-	<td><span class=bold>Home Phone: <input type=hidden name=phone_home value="<?echo $result{"phone_home"}?>"></span></td><td>(<input type=entry size=3 name=phone_home_area onblur="javascript:update_phone_home();" value="<?echo $pmatch_home[1]?>">) <input type=entry size=3 name=phone_home_first onblur="javascript:update_phone_home();" value="<?echo $pmatch_home[2]?>">-<input type=entry size=4 name=phone_home_last onblur="javascript:update_phone_home();" value="<?echo $pmatch_home[3]?>"></td>
-</tr>
-<tr>
-	<td><span class=required>City: </span></td><td><input tabindex="9" type=entry size=15 name=city value="<?echo $result{"city"}?>"></td>
-	<td><span class=bold>Work Phone:</span></td><td>(<input type=entry size=3 name=phone_biz_area onblur="javascript:update_phone_biz();" value="<?echo $pmatch_biz[1]?>">) <input type=entry size=3 name=phone_biz_first onblur="javascript:update_phone_biz();" value="<?echo $pmatch_biz[2]?>">-<input type=entry size=4 name=phone_biz_last onblur="javascript:update_phone_biz();" value="<?echo $pmatch_biz[3]?>"></td>
-</tr>
-<tr>
-	<td><span class=required>State: </span></td><td><input tabindex="10" type=entry size=15 name=state value="<?echo $result{"state"}?>"></td>
-	<td><span class=bold>Mobile Phone: </span></td><td>(<input type=entry size=3 name=phone_cell_area onblur="javascript:update_phone_cell();" value="<?echo $pmatch_cell[1]?>">) <input type=entry size=3 name=phone_cell_first onblur="javascript:update_phone_cell();" value="<?echo $pmatch_cell[2]?>">-<input type=entry size=4 name=phone_cell_last onblur="javascript:update_phone_cell();" value="<?echo $pmatch_cell[3]?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Zip Code: </span></td><td><input tabindex="11" type=entry size=6 name=postal_code value="<?echo $result{"postal_code"}?>"></td>
-	<td><span class=bold>Contact Email: </span></td><td><input type=entry size=30 name=email value="<?echo $result{"email"}?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Country: </span></td><td><input tabindex="12" type=entry size=10 name=country_code value="<?echo $result{"country_code"}?>"></td>
-	<td><span class=bold>User Defined Fields</span></td>
-</tr>
-<tr>
-	<td><span class=required>Marital Status: </span></td>
-	<td>
-
-		<select name=status tabindex="13">
-<?php
-		print "<!-- ".$result["status"]." -->\n";
-		foreach ($statii as $s) {
-			if ($s == "unassigned") {
-				echo "<option value=''";
-			} else {
-    	    	echo "<option value='".$s."'";
-    	    }
-
-    	    if ($s == $result["status"])
-				echo " selected";
-
-        	echo ">".ucwords($s)."</option>\n";
-		}
-?>
-		</select>
-		</td>
-		<td><input name="genericname1" size=20 value="<?echo $result{"genericname1"};?>" /></td><td><input name="genericval1" size=20 value="<?echo $result{"genericval1"};?>" /></td>
-	</tr>
-<tr>
-	<td><span class=required>Provider: </span></td>
-<td>
-	<select tabindex="14" name="providerID" onchange="javascript:document.demographics_form.referrer.value=upperFirst(this.options[this.selectedIndex].text,this.options[this.selectedIndex].text);">
-	<option value=''>Unassigned</option>
-	<?php
-
-	foreach ($provideri as $s) {
-	//echo "defined provider is: " .trim($s['fname']." ".$s['lname']). " compared to : " .$result["referrer"] . "<br />";
-
-	        echo "<option value='".$s['id']."'";
-
-	        if ($s['id'] == $result["providerID"])
-	                echo " selected";
-	        echo ">".ucwords($s['fname']." ".$s['lname'])."</option>\n";
-	}
-
-?>
-
-	</select>
-	</td>
-	<td><input name="genericname2" size=20 value="<?echo $result{"genericname2"};?>" /></td><td><input name="genericval2" size=20 value="<?echo $result{"genericval2"};?>" /></td>
-</tr>
-</table>
-
-
-<table><tr>
-<td colspan=4>
-<a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a><hr></td>
-</tr>
-
-
-<tr>
-<td valign=top>
-<input type=hidden size=30 name=referrer value="<?echo ucfirst($result{"referrer"});?>">
-<input type=hidden size=20 name=referrerID value="<?echo $result{"referrerID"}?>">
-<input type=hidden size=20 name=db_id value="<?echo $result{"id"}?>">
-<table>
-  <tr>
-  <td><span class=bold>Occupation: </span></td>
-  <td><input type=entry size=20 name=occupation value="<?echo $result{"occupation"}?>"></td>
-  </tr>
-  <tr>
-  <td><span class=bold>Employer: <br>(enter Student, PT Student, or leave blank for unemployed)</span></td><td><input type=entry size=20 name=ename value="<?echo $result2{"name"}?>"></td>
-  </tr>
-</table>
-</td>
-<td valign=top>
-<table>
-  <tr>
-    <td><span class=bold>Employer Address</span></td><td><span class=bold></span><input type=entry size=25 name=estreet value="<?echo $result2{"street"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>City: </span></td><td><input type=entry size=15 name=ecity value="<?echo $result2{"city"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>State: </span></td><td><input type=entry size=15 name=estate value="<?echo $result2{"state"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Zip Code: </span></td><td><input type=entry size=10 name=epostal_code value="<?echo $result2{"postal_code"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Country: </span></td><td><input type=entry size=10 name=ecountry value="<?echo $result2{"country"}?>"></td>
-  </tr>
-</table>
-</td>
-<td valign=top></td>
-</tr>
-
-<tr>
-<td colspan=4>
-<a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a><hr></td>
-</tr>
-
-
-<tr>
-<td valign=top>
-<span class=bold>Language: </span><br>
-<select onchange="javascript:document.demographics_form.language.value=upperFirst(this.options[this.selectedIndex].value,this.options[this.selectedIndex].value);">
-<?php
-foreach ($langi as $s) {
-		if ($s == "unassigned") {
-		echo "<option value=''";
-		} else {
-        	echo "<option value='".$s."'";
-        }
-        if ($s == strtolower($result["language"]))
-                echo " selected";
-        echo ">".ucwords($s)."</option>\n";
-}
-?>
-</select><br>
-<input type=entry size=30 name=language value="<?echo ucfirst($result{"language"});?>"><br><br />
-
-
-<span class=bold>Race/Ethnicity: </span><br>
-<select onchange="javascript:document.demographics_form.ethnoracial.value=upperFirst(this.options[this.selectedIndex].value,this.options[this.selectedIndex].value);">
-<?php
-foreach ($ethnoraciali as $s) {
-		if ($s == "unassigned") {
-		echo "<option value=''";
-		} else {
-        	echo "<option value='".$s."'";
-        }
-        if ($s == strtolower($result["ethnoracial"]))
-                echo " selected";
-        echo ">".ucwords($s)."</option>\n";
-}
-?>
-</select>
-<br>
-<input type=entry size=30 name=ethnoracial value="<?echo ucfirst($result{"ethnoracial"});?>"><br>
-
-</td>
-<td valign=top>
-<table>
-  <tr>
-    <td><span class=bold>Financial Review Date: </span></td><td><input type=entry size=11 name=financial_review value="<?if ($result{"financial_review"} != "0000-00-00 00:00:00") {echo date("m/d/Y",strtotime($result{"financial_review"}));} else {echo "MM/DD/YYYY";}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Family Size: </span></td><td><input type=entry size=20 name=family_size value="<?echo $result{"family_size"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Monthly Income: </span></td><td><input type=entry size=20 name=monthly_income onblur="javascript:checkNum();" value="<?echo $result{"monthly_income"}?>"><span class=small>(Numbers only)</span></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Homeless, etc.: </span></td><td><input type=entry size=20 name=homeless value="<?echo $result{"homeless"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Interpretter: </span></td><td><input type=entry size=20 name=interpretter value="<?echo $result{"interpretter"}?>"></td>
-  </tr>
-  <tr>
-    <td><span class=bold>Migrant/Seasonal: </span></td><td><input type=entry size=20 name=migrantseasonal value="<?echo $result{"migrantseasonal"}?>"></td>
-  </tr>
-</table>
-
-
-
-
-
-
-
-</td>
-<td valign=top></td>
-</tr>
-
-<tr>
-<td colspan=4>
-<a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a>
-<hr></td>
-</tr>
-
-<?
-$insurance_headings = array("Primary Insurance Provider:", "Secondary Insurance Provider", "Tertiary Insurance provider");
-$insurance_info = array();
-$insurance_info[1] = getInsuranceData($pid,"primary");
-$insurance_info[2] = getInsuranceData($pid,"secondary");
-$insurance_info[3] = getInsuranceData($pid,"tertiary");
-for($i=1;$i<=3;$i++) {
-	$result3 = $insurance_info[$i];
-	?>
-<table border="0">
-<tr>
-<td valign=top>
-<table border="0">
-<tr>
-<td colspan="5"><span class=required><?=$insurance_headings[$i -1]?></span></td>
-<tr></tr>
-<td colspan="5"><select name="i<?=$i?>provider">
-<option value="">Unassigned</option>
-<?php
-
-foreach ($insurancei as $iid => $iname) {
-        	echo "<option value='".$iid."'";
-        if (strtolower($iid) == strtolower($result3{"provider"}))
-                echo " selected";
-        echo ">".$iname."</option>\n";
-}
-?>
-</select>&nbsp;<a href="<? echo  $GLOBALS['webroot'] ?>/controller.php?practice_settings&insurance_company&action=edit">Add New Insurer</a>
-</td>
-</tr>
-<tr>
-	<td><span class=required>Plan Name: </span></td><td><input type=entry size=20 name=i<?=$i?>plan_name value="<?echo $result3{"plan_name"}?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Policy Number: </span></td><td><input type=entry size=16 name=i<?=$i?>policy_number value="<?echo $result3{"policy_number"}?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Group Number: </span></td><td><input type=entry size=16 name=i<?=$i?>group_number value="<?echo $result3{"group_number"}?>"></td>
-</tr>
-<tr>
-	<td><span class=required>Subscriber Employer (SE) <br>(enter Student, PT Student, or leave blank for unemployed): </span></td><td><input type=entry size=25 name=i<?=$i?>subscriber_employer value="<?echo $result3{"subscriber_employer"}?>"></td>
-</tr>
-<tr>
-	<td><span class=required>SE Address: </span></td><td><input type=entry size=25 name=i<?=$i?>subscriber_employer_street value="<?echo $result3{"subscriber_employer_street"}?>"></td>
-</tr>
-<tr>
-	<td colspan="2">
-	<table>
-	  <tr>
-	    <td><span class=required>SE City: </span></td>
-		<td><input type=entry size=15 name=i<?=$i?>subscriber_employer_city value="<?echo $result3{"subscriber_employer_city"}?>"></td>
-	    <td><span class=required>SE State: </span></td>
-		<td><input type=entry size=15 name=i<?=$i?>subscriber_employer_state value="<?echo $result3{"subscriber_employer_state"}?>"></td>
-	  </tr>
-	  <tr>
-	    <td><span class=required>SE Zip Code: </span></td>
-		<td><input type=entry size=10 name=i<?=$i?>subscriber_employer_postal_code value="<?echo $result3{"subscriber_employer_postal_code"}?>"></td>
-	    <td><span class=required>SE Country: </span></td>
-		<td><input type=entry size=25 name=i<?=$i?>subscriber_employer_country value="<?echo $result3{"subscriber_employer_country"}?>"></td>
-	  </tr>
-	</table>
-	</td>
-</tr>
-</table>
-</td>
-
-<td valign=top>
-<span class=required>Subscriber: </span><input type=entry size=10 name=i<?=$i?>subscriber_fname value="<?echo $result3{"subscriber_fname"}?>"><input type=entry size=3 name=i<?=$i?>subscriber_mname value="<?echo $result3{"subscriber_mname"}?>"><input type=entry size=10 name=i<?=$i?>subscriber_lname value="<?echo $result3{"subscriber_lname"}?>">
-
-<br>
-
-<span class=required>Relationship: </span>
-<select name=i<?=$i?>subscriber_relationship onchange="javascript:auto_populate_employer_address<?=$i?>();">
-
-<?php
-foreach ($relats as $s) {
-		if ($s == "unassigned") {
-			echo "<option value=''";
-		} else {
-	        echo "<option value='".$s."'";
-	    }
-        if ($s == $result3{"subscriber_relationship"})
-                echo " selected";
-        echo ">".ucfirst($s)."</option>\n";
-}
-?>
-
-</select>
-<a href="javascript:popUp('browse.php?browsenum=<?=$i?>')" class=text>(Browse)</a><br />
-<span class=bold>D.O.B.: </span><input type=entry size=11 name=i<?=$i?>subscriber_DOB value="
-<?
-	if (!empty($result3['subscriber_DOB'])) {
-	  echo $result3['subscriber_DOB'];
-	}
-	else {
-	  echo "MM/DD/YYYY";
-	}
-?>">
-<span class=bold>S.S.: </span><input type=entry size=11 name=i<?=$i?>subscriber_ss value="<?echo $result3{"subscriber_ss"}?> ">&nbsp;
-<span class=bold>Sex: </span>
-<select name=i<?=$i?>subscriber_sex>
-<option value="Male" <? if (strtolower($result3{"subscriber_sex"}) == "male") echo "selected"?>>Male</option>
-<option value="Female" <? if (strtolower($result3{"subscriber_sex"}) == "female") echo "selected"?>>Female</option>
-</select>
-<br>
-<span class=required>Subscriber Address: </span><input type=entry size=25 name=i<?=$i?>subscriber_street value="<?echo $result3{"subscriber_street"}?>"><br>
-<span class=required>City: </span><input type=entry size=15 name=i<?=$i?>subscriber_city value="<?echo $result3{"subscriber_city"}?>">
-<span class=required>State: </span><input type=entry size=15 name=i<?=$i?>subscriber_state value="<?echo $result3{"subscriber_state"}?>"><br>
-<span class=required>Zip Code: </span><input type=entry size=10 name=i<?=$i?>subscriber_postal_code value="<?echo $result3{"subscriber_postal_code"}?>">
-<span class=required>Country: </span><input type=entry size=10 name=i<?=$i?>subscriber_country value="<?echo $result3{"subscriber_country"}?>"><br>
-
-
-<span class=bold>Subscriber Phone: <input type=hidden name=i<?=$i?>subscriber_phone value="<?echo $result3{"subscriber_phone"}?>">
-
-<?
-//extract formatting of phone number:
-$pmatch=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result3{"subscriber_phone"},$pmatch);
-?>
-(<input type=entry size=3 name=i<?=$i?>subscriber_phone_area onblur="javascript:update_i<?=$i?>subscriber_phone();" value="<?echo $pmatch[1]?>">) <input type=entry size=3 name=i<?=$i?>subscriber_phone_first onblur="javascript:update_i<?=$i?>subscriber_phone();" value="<?echo $pmatch[2]?>">-<input type=entry size=4 name=i<?=$i?>subscriber_phone_last onblur="javascript:update_i<?=$i?>subscriber_phone();" value="<?echo $pmatch[3]?>">
-</span><br />
-<span class=bold>CoPay: <input type=text size="6" name=i<?=$i?>copay value="<?echo $result3{"copay"}?>">
-</td>
-
-</tr>
-</table>
-<a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a
-<hr>
-</td></tr>
-</table>
-<?} //end insurer for loop ?>
-
-</td></tr>
-</table>
-
-</form>
-
-<br><br>
-
-</body>
-</html>
+<?
+include_once("../../globals.php");
+
+// Session pid must be right or bad things can happen when demographics are saved!
+//
+include_once("$srcdir/pid.inc");
+if ($_GET["set_pid"] && $_GET["set_pid"] != $_SESSION["pid"]) {
+ setpid($_GET["set_pid"]);
+}
+else if ($_GET["pid"] && $_GET["pid"] != $_SESSION["pid"]) {
+ setpid($_GET["pid"]);
+}
+
+include_once("$srcdir/patient.inc");
+
+$relats = array('','self','spouse','child','other');
+$statii = array('married','single','divorced','widowed','separated','domestic partner');
+
+$langi = getLanguages();
+$ethnoraciali = getEthnoRacials();
+$provideri = getProviderInfo();
+$insurancei = getInsuranceProviders();
+?>
+<html>
+<head>
+
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+
+<script type="text/javascript" src="../../../library/textformat.js"></script>
+
+<SCRIPT LANGUAGE="JavaScript"><!--
+
+var mypcc = '<? echo $GLOBALS['phone_country_code'] ?>';
+
+//code used from http://tech.irt.org/articles/js037/
+function replace(string,text,by) {
+ // Replaces text with by in string
+ var strLength = string.length, txtLength = text.length;
+ if ((strLength == 0) || (txtLength == 0)) return string;
+
+ var i = string.indexOf(text);
+ if ((!i) && (text != string.substring(0,txtLength))) return string;
+ if (i == -1) return string;
+
+ var newstr = string.substring(0,i) + by;
+
+ if (i+txtLength < strLength)
+  newstr += replace(string.substring(i+txtLength,strLength),text,by);
+
+ return newstr;
+}
+
+function upperFirst(string,text) {
+ return replace(string,text,text.charAt(0).toUpperCase() + text.substring(1,text.length));
+}
+
+<? for ($i=1;$i<=3;$i++) { ?>
+function auto_populate_employer_address<?=$i?>(){
+ //alert(document.demographics_form.i<?=$i?>subscriber_relationship.options[document.demographics_form.i<?=$i?>subscriber_relationship.selectedIndex].value);
+ if (document.demographics_form.i<?=$i?>subscriber_relationship.options[document.demographics_form.i<?=$i?>subscriber_relationship.selectedIndex].value == "self") {
+  document.demographics_form.i<?=$i?>subscriber_fname.value=document.demographics_form.fname.value;
+  document.demographics_form.i<?=$i?>subscriber_mname.value=document.demographics_form.mname.value;
+  document.demographics_form.i<?=$i?>subscriber_lname.value=document.demographics_form.lname.value;
+  document.demographics_form.i<?=$i?>subscriber_street.value=document.demographics_form.street.value;
+  document.demographics_form.i<?=$i?>subscriber_city.value=document.demographics_form.city.value;
+  document.demographics_form.i<?=$i?>subscriber_state.value=document.demographics_form.state.value;
+  document.demographics_form.i<?=$i?>subscriber_postal_code.value=document.demographics_form.postal_code.value;
+  document.demographics_form.i<?=$i?>subscriber_country.value=document.demographics_form.country_code.value;
+  document.demographics_form.i<?=$i?>subscriber_phone.value=document.demographics_form.phone_home.value;
+  document.demographics_form.i<?=$i?>subscriber_DOB.value=document.demographics_form.dob.value;
+  document.demographics_form.i<?=$i?>subscriber_ss.value=document.demographics_form.ss.value;
+  document.demographics_form.i<?=$i?>subscriber_sex.selectedIndex = document.demographics_form.sex.selectedIndex;
+  document.demographics_form.i<?=$i?>subscriber_employer.value=document.demographics_form.ename.value;
+  document.demographics_form.i<?=$i?>subscriber_employer_street.value=document.demographics_form.estreet.value;
+  document.demographics_form.i<?=$i?>subscriber_employer_city.value=document.demographics_form.ecity.value;
+  document.demographics_form.i<?=$i?>subscriber_employer_state.value=document.demographics_form.estate.value;
+  document.demographics_form.i<?=$i?>subscriber_employer_postal_code.value=document.demographics_form.epostal_code.value;
+  document.demographics_form.i<?=$i?>subscriber_employer_country.value=document.demographics_form.ecountry.value;
+ }
+}
+
+<? } ?>
+
+function popUp(URL) {
+ day = new Date();
+ id = day.getTime();
+ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=400,height=300,left = 440,top = 362');");
+}
+
+function checkNum () {
+ var re= new RegExp();
+ re = /^\d*\.?\d*$/;
+ str=document.demographics_form.monthly_income.value;
+ if(re.exec(str))
+ {
+ }else{
+  alert("Please enter a dollar amount using only numbers and a decimal point.");
+ }
+}
+
+//-->
+
+</script>
+</head>
+
+<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+<?
+$result = getPatientData($pid);
+$result2 = getEmployerData($pid);
+?>
+
+<form action='demographics_save.php' name='demographics_form' method='post'>
+<input type=hidden name=mode value=save>
+
+<a href="patient_summary.php" target=Main><font class=title>Demographics</font><font class=back><?echo $tback;?></font></a>
+
+<table border="0" cellpadding="0" width='100%'>
+ <tr>
+  <td valign="top"><span class=required>Name: </span></td>
+  <td colspan="6">
+   <select name=title tabindex="1">
+    <option value="<?echo $result{"title"}?>"><?echo $result{"title"}?></option>
+    <option value="Mr.">Mr.</option>
+    <option value="Mrs.">Mrs.</option>
+    <option value="Ms.">Ms.</option>
+    <option value="Dr.">Dr.</option>
+   </select>
+   <input tabindex="2" type=entry size=15 name=fname value="<?echo $result{"fname"}?>"> <input tabindex="3" type=entry size=3 name=mname value="<?echo $result{"mname"}?>"> <input tabindex="4" type=entry size=15 name=lname value="<?echo $result{"lname"}?>">
+  </td>
+
+ </tr>
+ <tr>
+  <td valign='top'><span class='required'>DOB: </span></td>
+  <td>
+   <input tabindex='5' type='entry' size='11' name='dob'
+    value='<? echo $result['DOB'] ?>' onkeyup='datekeyup(this,mypcc)'
+    title='yyyy-mm-dd' />
+  </td>
+  <td rowspan="12">&nbsp;</td>
+  <td><span class=bold><? echo ($GLOBALS['athletic_team']) ? 'Organizational ID' : 'Patient' ?> Number: </span></td>
+  <td rowspan="12">&nbsp;</td>
+  <td><input type='entry' size='10' name='pubpid' value="<?echo $result{"pubpid"}?>"></td>
+ </tr>
+ <tr>
+  <td><span class=required>Sex: </span></td>
+  <td>
+   <select name=sex tabindex="6">
+    <option value="Male" <?if ($result{"sex"} == "Male") {echo "selected";};?>>Male</option>
+    <option value="Female" <?if ($result{"sex"} == "Female") {echo "selected";};?>>Female</option>
+   </select>
+  </td>
+  <td><span class='bold'>Emergency Contact: </span></td>
+  <td><input type='entry' size='10' name='contact_relationship' value="<?echo $result{"contact_relationship"}?>"></td>
+ </tr>
+ <tr>
+  <td><span class=bold>S.S.: </span></td>
+  <td><input tabindex="7" type=entry size=11 name=ss value="<?echo $result{"ss"}?>"></td>
+  <td><span class=bold>Emergency Phone:</span></td>
+  <td><input type='text' size='20' name='phone_contact' value='<?echo $result['phone_contact'] ?>' onkeyup='phonekeyup(this,mypcc)' /></td>
+ </tr>
+ <tr>
+  <td><span class=required>Address: </span></td>
+  <td><input tabindex="8" type=entry size=25 name=street value="<?echo $result{"street"}?>"></td>
+  <td><span class='bold'>Home Phone: </span></td>
+  <td><input type='text' size='20' name='phone_home' value='<?echo $result['phone_home'] ?>' onkeyup='phonekeyup(this,mypcc)' /></td>
+ </tr>
+ <tr>
+  <td><span class=required>City: </span></td>
+  <td><input tabindex="9" type=entry size=15 name=city value="<?echo $result{"city"}?>"></td>
+  <td><span class=bold>Work Phone:</span></td>
+  <td><input type='text' size='20' name='phone_biz' value='<?echo $result['phone_biz'] ?>' onkeyup='phonekeyup(this,mypcc)' /></td>
+ </tr>
+ <tr>
+  <td><span class=required><? echo ($GLOBALS['phone_country_code'] == '1') ? 'State' : 'Locality' ?>: </span></td>
+  <td><input tabindex="10" type=entry size=15 name=state value="<?echo $result{"state"}?>"></td>
+  <td><span class=bold>Mobile Phone: </span></td>
+  <td><input type='text' size='20' name='phone_cell' value='<?echo $result['phone_cell'] ?>' onkeyup='phonekeyup(this,mypcc)' /></td>
+ </tr>
+ <tr>
+  <td><span class=required><? echo ($GLOBALS['phone_country_code'] == '1') ? 'Zip' : 'Postal' ?> Code: </span></td><td><input tabindex="11" type=entry size=6 name=postal_code value="<?echo $result{"postal_code"}?>"></td>
+  <td><span class=bold>Contact Email: </span></td><td><input type=entry size=30 name=email value="<?echo $result{"email"}?>"></td>
+ </tr>
+ <tr>
+  <td><span class=required>Country: </span></td><td><input tabindex="12" type=entry size=10 name=country_code value="<?echo $result{"country_code"}?>"></td>
+  <td><span class=bold>User Defined Fields</span></td>
+ </tr>
+ <tr>
+  <td><span class=required>Marital Status: </span></td>
+  <td>
+   <select name=status tabindex="13">
+<?php
+ print "<!-- ".$result["status"]." -->\n";
+ foreach ($statii as $s) {
+  if ($s == "unassigned") {
+   echo "<option value=''";
+  } else {
+   echo "<option value='".$s."'";
+  }
+
+  if ($s == $result["status"])
+   echo " selected";
+
+  echo ">".ucwords($s)."</option>\n";
+ }
+?>
+   </select>
+  </td>
+  <td><input name="genericname1" size=20 value="<? echo $result{"genericname1"} ?>" /></td><td><input name="genericval1" size='20' value="<? echo $result{"genericval1"} ?>" /></td>
+ </tr>
+ <tr>
+  <td><span class=required>Provider: </span></td>
+  <td>
+   <select tabindex="14" name="providerID" onchange="javascript:document.demographics_form.referrer.value=upperFirst(this.options[this.selectedIndex].text,this.options[this.selectedIndex].text);">
+    <option value=''>Unassigned</option>
+<?php
+ foreach ($provideri as $s) {
+  //echo "defined provider is: " .trim($s['fname']." ".$s['lname']). " compared to : " .$result["referrer"] . "<br />";
+
+  echo "<option value='".$s['id']."'";
+
+  if ($s['id'] == $result["providerID"])
+   echo " selected";
+   echo ">".ucwords($s['fname']." ".$s['lname'])."</option>\n";
+ }
+?>
+   </select>
+  </td>
+  <td><input name="genericname2" size='20' value="<?echo $result{"genericname2"};?>" /></td>
+  <td><input name="genericval2" size='20' value="<?echo $result{"genericval2"};?>" /></td>
+ </tr>
+ <tr>
+  <td colspan='6'>
+   <a href="javascript:document.demographics_form.submit();" target='Main' class='link_submit'>[Save Patient Demographics]</a>
+   <hr>
+  </td>
+ </tr>
+</table>
+
+<? if (! $GLOBALS['athletic_team']) { ?>
+
+<table width='100%'>
+ <tr>
+  <th colspan='4' align='left' class='bold'>HIPAA Choices:</th>
+ </tr>
+ <tr>
+  <td class='bold' width='10%' nowrap>Allow Mail:</td>
+  <td class='bold'>
+   <select name="hipaa_mail">
+    <?
+     echo ('<option>NO</option>');
+     $result{"hipaa_mail"}=='YES' ? $opt_out='<option selected>YES</option>' : $opt_out='<option>YES</option>' ;
+     echo $opt_out;
+    ?>
+   </select>
+  </td>
+  <td class='bold' width='10%' nowrap>Allow Voice Msg:</td>
+  <td class='bold'>
+   <select name="hipaa_voice">
+    <?
+     echo ('<option>NO</option>');
+     $result{"hipaa_voice"}=='YES' ? $opt_out='<option selected>YES</option>' : $opt_out='<option>YES</option>' ;
+     echo $opt_out;
+    ?>
+   </select>
+  </td>
+ </tr>
+ <tr>
+  <td colspan='4'>
+   <a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a>
+   <br><hr>
+  </td>
+ </tr>
+</table>
+
+<? } ?>
+
+<table width='100%'>
+ <tr>
+  <td valign=top>
+   <input type=hidden size=30 name=referrer value="<?echo ucfirst($result{"referrer"});?>">
+   <input type=hidden size=20 name=referrerID value="<?echo $result{"referrerID"}?>">
+   <input type=hidden size=20 name=db_id value="<?echo $result{"id"}?>">
+   <table>
+    <tr>
+     <td><span class=bold>Occupation: </span></td>
+     <td><input type=entry size=20 name=occupation value="<?echo $result{"occupation"}?>"></td>
+    </tr>
+    <tr>
+     <td class='bold'>Employer:</td>
+     <td><input type=entry size=20 name=ename value="<?echo $result2{"name"}?>"></td>
+    </tr>
+    <tr>
+     <td colspan='2' class='bold' style='font-weight:normal'>(if unemployed enter Student, PT Student, or leave blank)</td>
+    </tr>
+<? if ($GLOBALS['athletic_team']) { ?>
+    <tr>
+     <td colspan='2' class='bold' style='font-weight:normal'>&nbsp;</td>
+    </tr>
+    <tr>
+     <td><span class='bold'>Squad: </span></td>
+     <td>
+      <select name='squad'>
+       <option value='0'>&nbsp;</option>
+       <option value='1'<? if ($result['squad'] == '1') echo ' selected' ?>>Senior</option>
+       <option value='2'<? if ($result['squad'] == '2') echo ' selected' ?>>Academy</option>
+       <option value='3'<? if ($result['squad'] == '3') echo ' selected' ?>>Ladies</option>
+      </select>
+     </td>
+    </tr>
+<? } ?>
+   </table>
+  </td>
+  <td valign=top>
+   <table>
+    <tr>
+     <td><span class=bold>Employer Address</span></td><td><span class=bold></span><input type=entry size=25 name=estreet value="<?echo $result2{"street"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>City: </span></td><td><input type=entry size=15 name=ecity value="<?echo $result2{"city"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold><? echo ($GLOBALS['phone_country_code'] == '1') ? 'State' : 'Locality' ?>: </span></td><td><input type=entry size=15 name=estate value="<?echo $result2{"state"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold><? echo ($GLOBALS['phone_country_code'] == '1') ? 'Zip' : 'Postal' ?> Code: </span></td><td><input type=entry size=10 name=epostal_code value="<?echo $result2{"postal_code"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Country: </span></td><td><input type=entry size=10 name=ecountry value="<?echo $result2{"country"}?>"></td>
+    </tr>
+   </table>
+  </td>
+  <td valign=top></td>
+ </tr>
+
+ <tr>
+  <td colspan=4>
+   <a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a><hr></td>
+ </tr>
+
+<? if (! $GLOBALS['athletic_team']) { ?>
+
+ <tr>
+  <td valign='top'>
+   <span class='bold'>Language: </span><br>
+   <select onchange="javascript:document.demographics_form.language.value=upperFirst(this.options[this.selectedIndex].value,this.options[this.selectedIndex].value);">
+<?php
+ foreach ($langi as $s) {
+  if ($s == "unassigned") {
+   echo "<option value=''";
+  } else {
+   echo "<option value='".$s."'";
+  }
+  if ($s == strtolower($result["language"]))
+   echo " selected";
+  echo ">".ucwords($s)."</option>\n";
+}
+?>
+   </select><br>
+   <input type=entry size=30 name=language value="<?echo ucfirst($result{"language"});?>"><br><br />
+   <span class=bold>Race/Ethnicity: </span><br>
+   <select onchange="javascript:document.demographics_form.ethnoracial.value=upperFirst(this.options[this.selectedIndex].value,this.options[this.selectedIndex].value);">
+<?php
+ foreach ($ethnoraciali as $s) {
+  if ($s == "unassigned") {
+   echo "<option value=''";
+  } else {
+   echo "<option value='".$s."'";
+  }
+  if ($s == strtolower($result["ethnoracial"]))
+   echo " selected";
+  echo ">".ucwords($s)."</option>\n";
+}
+?>
+   </select>
+   <br>
+   <input type=entry size=30 name=ethnoracial value="<?echo ucfirst($result{"ethnoracial"});?>"><br>
+  </td>
+  <td valign=top>
+   <table>
+    <tr>
+     <td><span class=bold>Financial Review Date: </span></td><td><input type=entry size=11 name=financial_review value="<?if ($result{"financial_review"} != "0000-00-00 00:00:00") {echo date("m/d/Y",strtotime($result{"financial_review"}));} else {echo "MM/DD/YYYY";}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Family Size: </span></td><td><input type=entry size=20 name=family_size value="<?echo $result{"family_size"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Monthly Income: </span></td><td><input type=entry size=20 name=monthly_income onblur="javascript:checkNum();" value="<?echo $result{"monthly_income"}?>"><span class=small>(Numbers only)</span></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Homeless, etc.: </span></td><td><input type=entry size=20 name=homeless value="<?echo $result{"homeless"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Interpretter: </span></td><td><input type=entry size=20 name=interpretter value="<?echo $result{"interpretter"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=bold>Migrant/Seasonal: </span></td><td><input type=entry size=20 name=migrantseasonal value="<?echo $result{"migrantseasonal"}?>"></td>
+    </tr>
+   </table>
+  </td>
+  <td valign=top></td>
+ </tr>
+
+ <tr>
+  <td colspan=4>
+   <a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a>
+   <hr>
+  </td>
+ </tr>
+
+<? } ?>
+
+</table>
+
+<?
+ // if (! $GLOBALS['athletic_team']) {
+  $insurance_headings = array("Primary Insurance Provider:", "Secondary Insurance Provider", "Tertiary Insurance provider");
+  $insurance_info = array();
+  $insurance_info[1] = getInsuranceData($pid,"primary");
+  $insurance_info[2] = getInsuranceData($pid,"secondary");
+  $insurance_info[3] = getInsuranceData($pid,"tertiary");
+  for($i=1;$i<=3;$i++) {
+   $result3 = $insurance_info[$i];
+?>
+<table border="0">
+ <tr>
+  <td valign=top>
+   <table border="0">
+    <tr>
+     <td colspan="5"><span class='required'><?=$insurance_headings[$i -1]?></span></td>
+    </tr>
+    <tr>
+     <td colspan="5">
+      <select name="i<?=$i?>provider">
+       <option value="">Unassigned</option>
+<?php
+ foreach ($insurancei as $iid => $iname) {
+  echo "<option value='".$iid."'";
+  if (strtolower($iid) == strtolower($result3{"provider"}))
+   echo " selected";
+  echo ">".$iname."</option>\n";
+ }
+?>
+      </select>&nbsp;<a href="<? echo  $GLOBALS['webroot'] ?>/controller.php?practice_settings&insurance_company&action=edit">Add New Insurer</a>
+     </td>
+    </tr>
+    <tr>
+     <td><span class=required>Plan Name: </span></td><td><input type=entry size=20 name=i<?=$i?>plan_name value="<?echo $result3{"plan_name"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=required>Policy Number: </span></td><td><input type=entry size=16 name=i<?=$i?>policy_number value="<?echo $result3{"policy_number"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=required>Group Number: </span></td><td><input type=entry size=16 name=i<?=$i?>group_number value="<?echo $result3{"group_number"}?>"></td>
+    </tr>
+    <tr>
+     <td class='required'>Subscriber Employer (SE) <br><span style='font-weight:normal'>
+      (if unemployed enter Student,<br>PT Student, or leave blank): </span></td>
+     <td><input type=entry size=25 name=i<?=$i?>subscriber_employer value="<?echo $result3{"subscriber_employer"}?>"></td>
+    </tr>
+    <tr>
+     <td><span class=required>SE Address: </span></td><td><input type=entry size=25 name=i<?=$i?>subscriber_employer_street value="<?echo $result3{"subscriber_employer_street"}?>"></td>
+    </tr>
+    <tr>
+     <td colspan="2">
+      <table>
+       <tr>
+        <td><span class=required>SE City: </span></td>
+        <td><input type=entry size=15 name=i<?=$i?>subscriber_employer_city value="<?echo $result3{"subscriber_employer_city"}?>"></td>
+        <td><span class=required>SE <? echo ($GLOBALS['phone_country_code'] == '1') ? 'State' : 'Locality' ?>: </span></td>
+        <td><input type=entry size=15 name=i<?=$i?>subscriber_employer_state value="<?echo $result3{"subscriber_employer_state"}?>"></td>
+       </tr>
+       <tr>
+        <td><span class=required>SE <? echo ($GLOBALS['phone_country_code'] == '1') ? 'Zip' : 'Postal' ?> Code: </span></td>
+        <td><input type=entry size=10 name=i<?=$i?>subscriber_employer_postal_code value="<?echo $result3{"subscriber_employer_postal_code"}?>"></td>
+        <td><span class=required>SE Country: </span></td>
+        <td><input type=entry size=25 name=i<?=$i?>subscriber_employer_country value="<?echo $result3{"subscriber_employer_country"}?>"></td>
+       </tr>
+      </table>
+     </td>
+    </tr>
+   </table>
+  </td>
+
+  <td valign=top>
+   <span class=required>Subscriber: </span><input type=entry size=10 name=i<?=$i?>subscriber_fname value="<?echo $result3{"subscriber_fname"}?>"><input type=entry size=3 name=i<?=$i?>subscriber_mname value="<?echo $result3{"subscriber_mname"}?>"><input type=entry size=10 name=i<?=$i?>subscriber_lname value="<?echo $result3{"subscriber_lname"}?>">
+   <br>
+   <span class=required>Relationship: </span>
+   <select name=i<?=$i?>subscriber_relationship onchange="javascript:auto_populate_employer_address<?=$i?>();">
+<?php
+ foreach ($relats as $s) {
+  if ($s == "unassigned") {
+   echo "<option value=''";
+  } else {
+   echo "<option value='".$s."'";
+  }
+  if ($s == $result3{"subscriber_relationship"})
+   echo " selected";
+  echo ">".ucfirst($s)."</option>\n";
+}
+?>
+   </select>
+   <a href="javascript:popUp('browse.php?browsenum=<?=$i?>')" class=text>(Browse)</a><br />
+   <span class=bold>D.O.B.: </span>
+   <input type='entry' size='11' name='i<?=$i?>subscriber_DOB'
+    value='<? echo $result3['subscriber_DOB'] ?>'
+    onkeyup='datekeyup(this,mypcc)' title='yyyy-mm-dd' />
+   <span class=bold>S.S.: </span><input type=entry size=11 name=i<?=$i?>subscriber_ss value="<?echo $result3{"subscriber_ss"}?> ">&nbsp;
+   <span class=bold>Sex: </span>
+   <select name=i<?=$i?>subscriber_sex>
+    <option value="Male" <? if (strtolower($result3{"subscriber_sex"}) == "male") echo "selected"?>>Male</option>
+    <option value="Female" <? if (strtolower($result3{"subscriber_sex"}) == "female") echo "selected"?>>Female</option>
+   </select>
+   <br>
+   <span class=required>Subscriber Address: </span><input type=entry size=25 name=i<?=$i?>subscriber_street value="<?echo $result3{"subscriber_street"}?>"><br>
+   <span class=required>City: </span><input type=entry size=15 name=i<?=$i?>subscriber_city value="<?echo $result3{"subscriber_city"}?>">
+   <span class=required><? echo ($GLOBALS['phone_country_code'] == '1') ? 'State' : 'Locality' ?>: </span><input type=entry size=15 name=i<?=$i?>subscriber_state value="<?echo $result3{"subscriber_state"}?>"><br>
+   <span class=required><? echo ($GLOBALS['phone_country_code'] == '1') ? 'Zip' : 'Postal' ?> Code: </span><input type=entry size=10 name=i<?=$i?>subscriber_postal_code value="<?echo $result3{"subscriber_postal_code"}?>">
+   <span class=required>Country: </span><input type=entry size=10 name=i<?=$i?>subscriber_country value="<?echo $result3{"subscriber_country"}?>"><br>
+   <span class=bold>Subscriber Phone: 
+   <input type='text' size='20' name='i<?=$i?>subscriber_phone' value='<?echo $result3["subscriber_phone"] ?>' onkeyup='phonekeyup(this,mypcc)' />
+   </span><br />
+   <span class=bold>CoPay: <input type=text size="6" name=i<?=$i?>copay value="<?echo $result3{"copay"}?>">
+  </td>
+ </tr>
+</table>
+<a href="javascript:document.demographics_form.submit();" target=Main class=link_submit>[Save Patient Demographics]</a>
+<hr>
+
+<?
+  } //end insurer for loop
+ // } // end of "if not athletic team"
+?>
+
+</form>
+
+<br>
+
+<script language="JavaScript">
+ // fix inconsistently formatted phone numbers from the database
+ var f = document.forms[0];
+ phonekeyup(f.phone_contact,mypcc);
+ phonekeyup(f.phone_home,mypcc);
+ phonekeyup(f.phone_biz,mypcc);
+ phonekeyup(f.phone_cell,mypcc);
+ phonekeyup(f.i1subscriber_phone,mypcc);
+ phonekeyup(f.i2subscriber_phone,mypcc);
+ phonekeyup(f.i3subscriber_phone,mypcc);
+</script>
+
+</body>
+</html>
diff --git a/interface/patient_file/summary/demographics_save.php b/interface/patient_file/summary/demographics_save.php
dissimilarity index 92%
index d94bb3b30..a64c0d1ce 100644
--- a/interface/patient_file/summary/demographics_save.php
+++ b/interface/patient_file/summary/demographics_save.php
@@ -1,177 +1,173 @@
-<?
-include_once("../../globals.php");
-
-
-include_once("$srcdir/patient.inc");
-
-foreach ($_POST as $key => $val) {
-	if ($val == "MM/DD/YYYY") {
-		$_POST[$key] = "";
-	}// elseif ($val == "on") {//this section of code is needed only for checkboxes on the form
-	//	$_POST[$key] = "1";
-	//}
-}
-
-if ($_POST["sex"] == "Unselected") {
-	$var_sex = "";
-} else {
-	$var_sex = $_POST["sex"];
-}
-
-if ($_POST{dob} != "") {
-	$dob = $_POST["dob"];
-} else {
-	$dob = "";
-}
-
-
-$finrev = fixDate($_POST["financial_review"]);
-
-newPatientData(         $_POST["db_id"],
-						$_POST["title"],
-                        $_POST["fname"],
-                        $_POST["lname"],
-                        $_POST["mname"],
-                        $var_sex,
-                        $dob,
-                        $_POST["street"],
-                        $_POST["postal_code"],
-                        $_POST["city"],
-                        $_POST["state"],
-                        $_POST["country_code"],
-                        $_POST["ss"],
-                        $_POST["occupation"],
-                        $_POST["phone_home"],
-                        $_POST["phone_biz"],
-                        $_POST["phone_contact"],
-						$_POST["status"],
-                        $_POST["contact_relationship"],
-						$_POST["referrer"],
-						$_POST["referrerID"],
-						$_POST["email"],
-						strtolower($_POST["language"]),
-						$_POST["ethnoracial"],
-						$_POST["interpretter"],
-						$_POST["migrantseasonal"],
-						$_POST["family_size"],
-						$_POST["monthly_income"],
-						$_POST["homeless"],
-						$finrev,
-						$_POST["pubpid"],
-						$pid,
-						$_POST["providerID"],
-						$_POST["genericname1"],
-						$_POST["genericval1"],
-						$_POST["genericname2"],
-						$_POST["genericval2"],
-						$_POST["phone_cell"]
-                );
-
-newEmployerData(       $pid,
-                                $_POST["ename"],
-                                $_POST["estreet"],
-                                $_POST["epostal_code"],
-                                $_POST["ecity"],
-                                $_POST["estate"],
-                                $_POST["ecountry"]
-                        );
-
-
-$i1dob = fixDate($_POST["i1subscriber_DOB"]);
-
-newInsuranceData(      $pid,
-                                "primary",
-                                $_POST["i1provider"],
-                                $_POST["i1policy_number"],
-                                $_POST["i1group_number"],
-								$_POST["i1plan_name"],
-                                $_POST["i1subscriber_lname"],
-								$_POST["i1subscriber_mname"],
-								$_POST["i1subscriber_fname"],
-                                $_POST["i1subscriber_relationship"],
-                                $_POST["i1subscriber_ss"],
-                                $i1dob,
-                                $_POST["i1subscriber_street"],
-                                $_POST["i1subscriber_postal_code"],
-                                $_POST["i1subscriber_city"],
-                                $_POST["i1subscriber_state"],
-                                $_POST["i1subscriber_country"],
-                                $_POST["i1subscriber_phone"],
-                                $_POST["i1subscriber_employer"],
-                                $_POST["i1subscriber_employer_street"],
-                                $_POST["i1subscriber_employer_city"],
-                                $_POST["i1subscriber_employer_postal_code"],
-                                $_POST["i1subscriber_employer_state"],
-                                $_POST["i1subscriber_employer_country"],
-								$_POST['i1copay'],
-								$_POST['i1subscriber_sex']
-                        );
-
-
-
-$i2dob = fixDate($_POST["i2subscriber_DOB"]);
-
-newInsuranceData(      $pid,
-                                "secondary",
-                                $_POST["i2provider"],
-                                $_POST["i2policy_number"],
-                                $_POST["i2group_number"],
-								$_POST["i2plan_name"],
-                                $_POST["i2subscriber_lname"],
-								$_POST["i2subscriber_mname"],
-								$_POST["i2subscriber_fname"],
-                                $_POST["i2subscriber_relationship"],
-                                $_POST["i2subscriber_ss"],
-                                $i2dob,
-                                $_POST["i2subscriber_street"],
-                                $_POST["i2subscriber_postal_code"],
-                                $_POST["i2subscriber_city"],
-                                $_POST["i2subscriber_state"],
-                                $_POST["i2subscriber_country"],
-                                $_POST["i2subscriber_phone"],
-                                $_POST["i2subscriber_employer"],
-                                $_POST["i2subscriber_employer_street"],
-                                $_POST["i2subscriber_employer_city"],
-                                $_POST["i2subscriber_employer_postal_code"],
-                                $_POST["i2subscriber_employer_state"],
-                                $_POST["i2subscriber_employer_country"],
-								$_POST['i2copay'],
-								$_POST['i2subscriber_sex']
-                        );
-
-$i3dob = fixDate($_POST["i3subscriber_DOB"]);
-
-newInsuranceData(      $pid,
-                                "tertiary",
-                                $_POST["i3provider"],
-                                $_POST["i3policy_number"],
-                                $_POST["i3group_number"],
-								$_POST["i3plan_name"],
-                                $_POST["i3subscriber_lname"],
-								$_POST["i3subscriber_mname"],
-								$_POST["i3subscriber_fname"],
-                                $_POST["i3subscriber_relationship"],
-                                $_POST["i3subscriber_ss"],
-                                $i3dob,
-                                $_POST["i3subscriber_street"],
-                                $_POST["i3subscriber_postal_code"],
-                                $_POST["i3subscriber_city"],
-                                $_POST["i3subscriber_state"],
-                                $_POST["i3subscriber_country"],
-                                $_POST["i3subscriber_phone"],
-                                $_POST["i3subscriber_employer"],
-                                $_POST["i3subscriber_employer_street"],
-                                $_POST["i3subscriber_employer_city"],
-                                $_POST["i3subscriber_employer_postal_code"],
-                                $_POST["i3subscriber_employer_state"],
-                                $_POST["i3subscriber_employer_country"],
-								$_POST['i3copay'],
-								$_POST['i3subscriber_sex']
-                        );
-
-
-
-
-include_once("patient_summary.php");
-?>
-
+<?
+include_once("../../globals.php");
+include_once("$srcdir/patient.inc");
+
+foreach ($_POST as $key => $val) {
+  if ($val == "MM/DD/YYYY") {
+    $_POST[$key] = "";
+  }
+}
+
+if ($_POST["sex"] == "Unselected") {
+	$var_sex = "";
+} else {
+	$var_sex = $_POST["sex"];
+}
+
+if ($_POST{dob} != "") {
+	$dob = $_POST["dob"];
+} else {
+	$dob = "";
+}
+
+$finrev = fixDate($_POST["financial_review"]);
+
+newPatientData(
+  $_POST["db_id"],
+  $_POST["title"],
+  $_POST["fname"],
+  $_POST["lname"],
+  $_POST["mname"],
+  $var_sex,
+  $dob,
+  $_POST["street"],
+  $_POST["postal_code"],
+  $_POST["city"],
+  $_POST["state"],
+  $_POST["country_code"],
+  $_POST["ss"],
+  $_POST["occupation"],
+  $_POST["phone_home"],
+  $_POST["phone_biz"],
+  $_POST["phone_contact"],
+  $_POST["status"],
+  $_POST["contact_relationship"],
+  $_POST["referrer"],
+  $_POST["referrerID"],
+  $_POST["email"],
+  strtolower($_POST["language"]),
+  $_POST["ethnoracial"],
+  $_POST["interpretter"],
+  $_POST["migrantseasonal"],
+  $_POST["family_size"],
+  $_POST["monthly_income"],
+  $_POST["homeless"],
+  $finrev,
+  $_POST["pubpid"],
+  $pid,
+  $_POST["providerID"],
+  $_POST["genericname1"],
+  $_POST["genericval1"],
+  $_POST["genericname2"],
+  $_POST["genericval2"],
+  $_POST["phone_cell"],
+  $_POST["hipaa_mail"],
+  $_POST["hipaa_voice"],
+  $_POST["squad"]
+);
+
+newEmployerData(
+  $pid,
+  $_POST["ename"],
+  $_POST["estreet"],
+  $_POST["epostal_code"],
+  $_POST["ecity"],
+  $_POST["estate"],
+  $_POST["ecountry"]
+);
+
+$i1dob = fixDate($_POST["i1subscriber_DOB"]);
+
+newInsuranceData(
+  $pid,
+  "primary",
+  $_POST["i1provider"],
+  $_POST["i1policy_number"],
+  $_POST["i1group_number"],
+  $_POST["i1plan_name"],
+  $_POST["i1subscriber_lname"],
+  $_POST["i1subscriber_mname"],
+  $_POST["i1subscriber_fname"],
+  $_POST["i1subscriber_relationship"],
+  $_POST["i1subscriber_ss"],
+  $i1dob,
+  $_POST["i1subscriber_street"],
+  $_POST["i1subscriber_postal_code"],
+  $_POST["i1subscriber_city"],
+  $_POST["i1subscriber_state"],
+  $_POST["i1subscriber_country"],
+  $_POST["i1subscriber_phone"],
+  $_POST["i1subscriber_employer"],
+  $_POST["i1subscriber_employer_street"],
+  $_POST["i1subscriber_employer_city"],
+  $_POST["i1subscriber_employer_postal_code"],
+  $_POST["i1subscriber_employer_state"],
+  $_POST["i1subscriber_employer_country"],
+  $_POST['i1copay'],
+  $_POST['i1subscriber_sex']
+);
+
+$i2dob = fixDate($_POST["i2subscriber_DOB"]);
+
+newInsuranceData(
+  $pid,
+  "secondary",
+  $_POST["i2provider"],
+  $_POST["i2policy_number"],
+  $_POST["i2group_number"],
+  $_POST["i2plan_name"],
+  $_POST["i2subscriber_lname"],
+  $_POST["i2subscriber_mname"],
+  $_POST["i2subscriber_fname"],
+  $_POST["i2subscriber_relationship"],
+  $_POST["i2subscriber_ss"],
+  $i2dob,
+  $_POST["i2subscriber_street"],
+  $_POST["i2subscriber_postal_code"],
+  $_POST["i2subscriber_city"],
+  $_POST["i2subscriber_state"],
+  $_POST["i2subscriber_country"],
+  $_POST["i2subscriber_phone"],
+  $_POST["i2subscriber_employer"],
+  $_POST["i2subscriber_employer_street"],
+  $_POST["i2subscriber_employer_city"],
+  $_POST["i2subscriber_employer_postal_code"],
+  $_POST["i2subscriber_employer_state"],
+  $_POST["i2subscriber_employer_country"],
+  $_POST['i2copay'],
+  $_POST['i2subscriber_sex']
+);
+
+$i3dob = fixDate($_POST["i3subscriber_DOB"]);
+
+newInsuranceData(
+  $pid,
+  "tertiary",
+  $_POST["i3provider"],
+  $_POST["i3policy_number"],
+  $_POST["i3group_number"],
+  $_POST["i3plan_name"],
+  $_POST["i3subscriber_lname"],
+  $_POST["i3subscriber_mname"],
+  $_POST["i3subscriber_fname"],
+  $_POST["i3subscriber_relationship"],
+  $_POST["i3subscriber_ss"],
+  $i3dob,
+  $_POST["i3subscriber_street"],
+  $_POST["i3subscriber_postal_code"],
+  $_POST["i3subscriber_city"],
+  $_POST["i3subscriber_state"],
+  $_POST["i3subscriber_country"],
+  $_POST["i3subscriber_phone"],
+  $_POST["i3subscriber_employer"],
+  $_POST["i3subscriber_employer_street"],
+  $_POST["i3subscriber_employer_city"],
+  $_POST["i3subscriber_employer_postal_code"],
+  $_POST["i3subscriber_employer_state"],
+  $_POST["i3subscriber_employer_country"],
+  $_POST['i3copay'],
+  $_POST['i3subscriber_sex']
+);
+
+include_once("patient_summary.php");
+?>
diff --git a/interface/patient_file/summary/immunizations.php b/interface/patient_file/summary/immunizations.php
dissimilarity index 98%
index 36fd393e3..c2492371b 100644
--- a/interface/patient_file/summary/immunizations.php
+++ b/interface/patient_file/summary/immunizations.php
@@ -1,153 +1,213 @@
-<?
-include_once("../../globals.php");
-include_once("$srcdir/lists.inc");
-
-
-if (!isset($active)) {
-	$active="all";
-}
-
-
-//this code handles changing the state of activity tags when the user updates them through the interface
-if (isset($mode)) {
-if ($mode == "update") {
-	foreach ($_POST as $var => $val) {
-		if ($val == "true" || $val == "false") {
-			$id = str_replace("act","",$var);
-			if ($val == "true") {reappearList ($id);}elseif($val=="false"){disappearList($id);};
-			//print "$id: $val > $act_state<br>\n";
-			
-		}
-	}
-} elseif ($mode == "new") {
-	addList($pid,"immunization",$_POST["title"],$_POST["comments"],1);
-}
-}
-
-
-
-
-
-
-
-
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-</head>
-<body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-<table border=0 cellspacing=0 cellpadding=0 height=100%>
-<tr>
-<td background="<?echo $linepic;?>" width=7 height=100%>
-&nbsp;
-</td>
-<td valign=top>
-
-<a href="patient_summary.php" target="Main"><font class="title">Immunizations</font><font class=back><?echo $tback;?></font></a>
-<br>
-
-<form border=0 method=post name=new_note action="immunizations.php">
-<input type=hidden name=mode value="new">
-<input type=hidden name=active value="<?echo $active;?>">
-<input type=entry size=15 name=title value="YYYY-MM-DD" onfocus="javascript:this.value=''"><br>
-<textarea name=comments rows=3 cols=25 wrap=virtual onfocus="javascript:this.value=''">Comments</textarea>
-<br>
-<a href="javascript:document.new_note.submit();" class=link_submit>[Add New Immunization]</a>
-</form>
-
-
-<form border=0 method=post name=update_activity action="immunizations.php">
-
-<input type=hidden name=mode value="update">
-<input type=hidden name=active value="<?echo $active;?>">
-
-<?//change the view on the current mode, whether all, active, or inactive
-$all_class="link";$active_class="link";$inactive_class="link";
-if ($active=="all") {
-	$all_class="link_selected";
-} elseif ($active==1) {
-	$active_class="link_selected";
-} elseif ($active==0) {
-	$inactive_class="link_selected";
-}
-
-
-?>
-
-<font class=text>View: </font> 
-<a href="immunizations.php?offset=0&active=all" class=<?echo $all_class;?>>[All]</a>
-<a href="immunizations.php?offset=0&active=1" class=<?echo $active_class;?>>[Only Active]</a>
-<a href="immunizations.php?offset=0&active=0" class=<?echo $inactive_class;?>>[Only Inactive]</a>
-
-<br>
-<a href="javascript:document.update_activity.submit();" class=link_submit>[Change Activity]</a>
-<br><br>
-
-<span class=text>
-<?
-if ($result = getListByType($pid, "immunization", "id,title,comments,activity,date", $active, "all", 0)){
-	foreach ($result as $iter) {
-		//echo "<dd>" . $iter{"title"} . "</dd>\n";
-		
-		
-		
-		if ($iter{"activity"}) {
-			$checked = "checked";
-		} else {
-			$checked = "";
-		}
-		print "<input type=hidden value='' name=act".$iter{"id"}.">";
-		print "<input onClick='javascript:document.update_activity.act".$iter{"id"}.".value=this.checked' type=checkbox $checked>";
-		print "<font class=bold>".$iter{"title"} . "</font><font class=text>(".date("n/j/Y",strtotime($iter{"date"})).")</font><br>";
-		print "<font class=text>" . $iter{"comments"} . "</font><br>\n";
-	
-		
-		
-	}
-}
-
-?>
-</span>
-
-
-
-
-<br>
-<a href="javascript:document.update_activity.submit();" class=link_submit>[Change Activity]</a>
-
-
-
-
-
-
-
-
-
-
-
-</form>
-
-
-
-
-
-
-
-
-
-
-
-
-</td>
-</tr>
-</table>
-
-
-</body>
-</html>
\ No newline at end of file
+<?
+include_once("../../globals.php");
+include_once("$srcdir/sql.inc");
+// include_once("$srcdir/overlib_mini.js");
+// include_once("$srcdir/calendar.js");
+
+  if (isset($mode)) {
+    if ($mode == "add" ) {
+      $sql = "REPLACE INTO immunizations set 
+                      id = '" . mysql_real_escape_string($id) . "',
+                      administered_date    = if('" . mysql_real_escape_string($administered_date) . "','" . mysql_real_escape_string($administered_date) . "',NULL),  
+                      immunization_id  = '" . mysql_real_escape_string($immunization_id) . "',
+                      manufacturer  = '" . mysql_real_escape_string($manufacturer) . "',
+                      lot_number   = '" . mysql_real_escape_string($lot_number) . "',
+                      administered_by_id     = if(" . mysql_real_escape_string($administered_by_id) . "," . mysql_real_escape_string($administered_by_id) . ",NULL),
+                      education_date     = if('" . mysql_real_escape_string($education_date) . "','" . mysql_real_escape_string($education_date) . "',NULL), 
+                      note   = '" . mysql_real_escape_string($note) . "',
+                      patient_id   = '" . mysql_real_escape_string($pid) . "',
+                      created_by = '" . mysql_real_escape_string($_SESSION['authId']) . "',
+                      updated_by = '" . mysql_real_escape_string($_SESSION['authId']) . "',
+                      create_date = now()";
+      sqlStatement($sql);
+      $administered_date=$education_date=date('Y-m-d');
+      $immunization_id=$manufacturer=$lot_number=$administered_by_id=$note=$id="";
+    }
+    elseif ($mode == "clear" ) {
+      $administered_date=$education_date=date('Y-m-d');
+      $immunization_id=$manufacturer=$lot_number=$administered_by_id=$note=$id="";
+    }
+    elseif ($mode == "edit" ) {
+      $sql = "select * from immunizations where id = " . mysql_real_escape_string($id);
+      $results = sqlQ($sql);
+      while ($row = mysql_fetch_assoc($results)) {
+        $administered_date = $row['administered_date'];
+        $immunization_id = $row['immunization_id'];
+        $manufacturer = $row['manufacturer'];
+        $lot_number = $row['lot_number'];
+        $administered_by_id = $row['administered_by_id'] ? $row['administered_by_id'] : 0;
+        $education_date = $row['education_date'];
+        $note = stripslashes($row['note']);
+      }
+    }
+  }
+?>
+<html>
+  <head>
+    <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+    <script type="text/javascript" src="../../../library/overlib_mini.js"></script>
+    <script type="text/javascript" src="../../../library/calendar.js"></script>
+  </head>
+
+  <body <?echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+    <a href="patient_summary.php" target="Main"><font class="title">Immunizations</font><font class=back><?echo $tback;?></font></a>
+    <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
+
+    <form action="immunizations.php" name=add_immunization>
+      <input type=hidden name=mode value="add">
+      <br>
+      <table border=0 cellpadding=1 cellspacing=1>
+
+        <tr>
+          <td align="right">
+            <span class=text>
+              Immunization
+            </span>
+          </td>
+          <td>
+            <select name="immunization_id">
+              <?php
+                $sql = "select id,name from immunization order by name";
+                $result = sqlStatement($sql);
+                while($row = sqlFetchArray($result)){
+                  echo '<OPTION VALUE=' . $row{'id'};
+                  echo $immunization_id == $row{'id'} ? ' selected>' : '>';
+                  echo $row{'name'} . '</OPTION>';
+                }
+              ?>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Date Administered
+            </span>
+          </td>
+          <td>
+            <input class=text type=entry name="administered_date" size=10 value="<?php echo $administered_date ? $administered_date : date('Y-m-d'); ?>">
+            <a href="javascript:show_calendar('add_immunization.administered_date');" onMouseOver="window.status='Date Picker'; overlib('Click here to choose a date.'); return true;" onMouseOut="window.status=''; nd(); return true;"><img src='<?echo "$rootdir/pic/show_calendar.gif";?>' align='absbottom' width='24' height='22' border='0'></a>
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Immunization Manufacturer
+            </span>
+          </td>
+          <td>
+            <input class=text type=entry name="manufacturer" size=25" value="<?php echo mysql_real_escape_string($manufacturer) ?>">
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Immunization Lot Number
+            </span>
+          </td>
+          <td>
+            <input class=text  type=entry name="lot_number" size=25 value="<?php echo mysql_real_escape_string($lot_number) ?>">
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Name and Title of Immunization Administrator
+            </span>
+          </td>
+          <td>
+            <select name="administered_by_id">
+              <?php
+                $sql = "(select id
+                               ,concat(lname,', ',fname) as full_name
+                           from users
+                         order by concat(lname,', ',fname))
+                         union all
+                         select 0, 'Other'
+                       ";
+                $result = sqlStatement($sql);
+                while($row = sqlFetchArray($result)){
+                  echo '<OPTION VALUE=' . $row{'id'};
+                  echo (isset($administered_by_id) && $administered_by_id != "" ? $administered_by_id : $_SESSION['authId']) == $row{'id'} ? ' selected>' : '>';
+                  echo $row{'full_name'} . '</OPTION>';
+                }
+              ?>
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Date Immunization Information Statements Given
+            </span>
+          </td>
+          <td>
+            <input class=text type=entry name="education_date" size=10 value="<?php echo $education_date? $education_date : date('Y-m-d'); ?>">
+            <a href="javascript:show_calendar('add_immunization.education_date');" onMouseOver="window.status='Date Picker'; overlib('Click here to choose a date.'); return true;" onMouseOut="window.status=''; nd(); return true;"><img src='<?echo "$rootdir/pic/show_calendar.gif";?>' align='absbottom' width='24' height='22' border='0'></a>
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <span class=text>
+              Notes
+            </span>
+          </td>
+          <td>
+            <textarea class=text name="note" rows=5 cols=25><?php echo $note ?></textarea>
+          </td>
+        </tr>
+        <tr>
+          <td align="center">
+            <br /><a href='shot_record.php' class=link>[Print Shot Record]</a>
+          </td>
+          <td align="center">
+            <input type="hidden" name="id" value="<?=$id?>"> 
+            <br /><a href='javascript:document.add_immunization.submit();' class=link>[Save Immunization]</a>
+          </td>
+          <td align="center">
+            <br /><a href='immunizations.php?mode=clear' class=link>[Clear]</a>
+          </td>
+        </tr>
+      </table>
+    </form>
+
+    <table border=0 cellpadding=0 cellspacing=0>
+      <tr>
+        <td valign=top>
+          <table border=0 cellpadding=5 cellspacing=0>
+            <th><td><span class=bold>Date</span></td><td><span class=bold>Vaccine</span></td><td><span class=bold>Manufacturer</span></td><td><span class=bold>Lot Number</span></td><td><span class=bold>Administered By</span></td><td><span class=bold>Education Date</span></td><td><span class=bold>Note</span></td></th>
+              <?php
+                $sql = "select i1.id
+                              ,i1.administered_date
+                              ,i2.name as immunization
+                              ,i1.manufacturer
+                              ,i1.lot_number
+                              ,ifnull(concat(u.lname,', ',u.fname),'Other') as administered_by
+                              ,i1.education_date
+                              ,i1.note
+                          from immunizations i1
+                                 left join immunization i2
+                                   on i1.immunization_id = i2.id
+                                 left join users u 
+                                   on i1.administered_by_id = u.id
+                         where patient_id = $pid 
+                        order by administered_date desc";
+                $result = sqlStatement($sql);
+                while($row = sqlFetchArray($result)){
+                  print "<tr><td><a class=link href='immunizations.php?mode=edit&id=".$row{"id"}."'>[Edit]</a></td>";
+                  print "<td><span class=text>" . $row{"administered_date"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"immunization"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"manufacturer"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"lot_number"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"administered_by"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"education_date"} . "</span></td>";
+                  print "<td><span class=text>" . $row{"note"} . "</span></td></tr>";
+                }
+              ?>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
+
diff --git a/interface/patient_file/summary/patient_summary.php b/interface/patient_file/summary/patient_summary.php
index bed7a9e3c..60fe21b84 100644
--- a/interface/patient_file/summary/patient_summary.php
+++ b/interface/patient_file/summary/patient_summary.php
@@ -6,23 +6,26 @@ include_once("../../globals.php");
 <HTML>
 <HEAD>
 <TITLE>
-OpenEMR
+Patient Summary
 </TITLE>
 </HEAD>
-<frameset rows="50%,50%" cols="*">
 
-  <frame src="demographics.php" name="Demographics" scrolling="auto">
-  <frameset rows="*" cols="175,*">
-	<frame src="stats.php" name="Stats" scrolling="auto">
+
+<frameset rows="50%,50%" cols="*">
+         <frame src="demographics.php" name="Demographics" scrolling="auto">
+      <frameset rows="*" cols="20%,80%">
+        <frame src="stats.php" name="Stats" scrolling="auto">
 	<frame src="pnotes.php" name="Notes" scrolling="auto">
-  </frameset>
+     </frameset>
 </frameset>
 
 
+
+
 <noframes><body bgcolor="#FFFFFF">
 
 </body></noframes>
 
 
 
-</HTML
+</HTML>
diff --git a/interface/patient_file/summary/pnotes.php b/interface/patient_file/summary/pnotes.php
index 890df9d95..a40170271 100644
--- a/interface/patient_file/summary/pnotes.php
+++ b/interface/patient_file/summary/pnotes.php
@@ -6,7 +6,6 @@ include_once("$srcdir/pnotes.inc");
 <html>
 <head>
 
-
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
 
 </head>
@@ -19,25 +18,34 @@ include_once("$srcdir/pnotes.inc");
 </td>
 <td valign=top>
 
-
-
-
 <a href="pnotes_full.php" target="Main"><font class="title">Patient Notes</font><font class=more><?echo $tmore;?></font></a>
 
 <br>
 
-
-
 <table border=0>
 
 <?
 //display all of the notes for the day, as well as others that are active from previous dates, up to a certain number, $N
 $N = 4;
 
+$conn = $GLOBALS['adodb']['db'];
+
+// Get the billing note if there is one.
+$billing_note = "";
+$colorbeg = "";
+$colorend = "";
+$sql = "select genericname2, genericval2 " .
+    "from patient_data where pid = '$pid' limit 1";
+$resnote = $conn->Execute($sql);
+if($resnote && !$resnote->EOF && $resnote->fields['genericname2'] == 'Billing') {
+  $billing_note = $resnote->fields['genericval2'];
+  $colorbeg = "<font color='red'>";
+  $colorend = "<font>";
+}
+
 //Display what the patient owes
 require_once($GLOBALS['fileroot'] ."/library/classes/WSWrapper.class.php");
 $customer_info['id'] = 0;
-$conn = $GLOBALS['adodb']['db'];
 $sql = "SELECT foreign_id from integration_mapping as im LEFT JOIN patient_data as pd on im.local_id=pd.id where pd.pid = '" . $pid . "' and im.local_table='patient_data' and im.foreign_table='customer'";
 $result = $conn->Execute($sql);
 if($result && !$result->EOF) 
@@ -47,10 +55,13 @@ if($result && !$result->EOF)
 
 $function['ezybiz.customer_balance'] = array(new xmlrpcval($customer_info,"struct"));
 $ws = new WSWrapper($function);
-if(is_numeric($ws->value))
-{
-	$formatted = sprintf('$%01.2f', $ws->value);
-	print "<tr><td>Balance Due</td><td>$formatted</td></tr>\n";
+if(is_numeric($ws->value)) {
+  $formatted = sprintf('$%01.2f', $ws->value);
+  print "<tr><td>$colorbeg" . "Balance Due$colorend</td><td>$colorbeg$formatted$colorend</td></tr>\n";
+}
+
+if($billing_note) {
+  print "<tr><td>$colorbeg" . "Billing Note$colorend</td><td>$colorbeg$billing_note$colorend</td></tr>\n";
 }
 
 //retrieve all active notes
@@ -82,41 +93,9 @@ foreach ($result as $iter) {
 
 </table>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </td>
 </tr>
 </table>
 
-
 </body>
 </html>
diff --git a/interface/patient_file/summary/shot_record.php b/interface/patient_file/summary/shot_record.php
new file mode 100644
index 000000000..ec5d00197
--- /dev/null
+++ b/interface/patient_file/summary/shot_record.php
@@ -0,0 +1,57 @@
+<?php
+include_once("../../globals.php");
+include_once("$srcdir/sql.inc");
+require_once ($GLOBALS['fileroot'] . "/library/classes/class.ezpdf.php");
+
+$pdf =& new Cezpdf("LETTER");
+$pdf->ezSetMargins(72,30,50,30);
+$pdf->selectFont($GLOBALS['fileroot'] . "/library/fonts/Helvetica.afm");
+
+$res = sqlQuery("select concat(f.name,'\n',f.street,'\n',f.city,', ',f.state,' ',f.postal_code) as facility_address
+                   from facility f
+                       ,users u
+                  where u.facility = f.name
+                    and u.id = " . $_SESSION['authId']
+                );
+
+$opts = array('justification' => "center");
+$pdf->ezText($res['facility_address']
+            ,"",$opts
+            );
+
+$res = sqlQuery("select concat(p.lname,', ',p.fname,' ',p.mname) patient_name 
+                       ,date_format(p.DOB,'%c/%e/%Y') as patient_DOB
+                       ,concat(p.street,'\n',p.city,', ',p.state,' ',p.postal_code) as patient_address
+                   from patient_data p where p.pid = $pid");
+
+$pdf->ezText("\n" . $res['patient_name'] . "\nDate of Birth: " . $res['patient_DOB'] . "\n" . $res['patient_address']);
+$pdf->ezText("\n");
+
+$title = 'Shot Record as of: ' . date('m/d/Y h:i:s a');
+
+$res = sqlStatement("select date_format(i1.administered_date,'%Y-%c-%e') as 'Date\nAdministered'
+      ,i2.name as 'Vaccine'
+      ,i1.manufacturer as 'Manufacturer'
+      ,i1.lot_number as 'Lot\nNumber'
+      ,concat(u.lname,', ',u.fname) as 'Administered By'
+      ,date_format(i1.education_date,'%Y-%c-%e') as 'Patient\nEducation\nDate'
+      ,i1.note as 'Comments'
+  from immunizations i1
+         left join immunization i2 on i1.immunization_id = i2.id
+         left join users u on i1.administered_by_id = u.id
+         left join patient_data p on i1.patient_id = p.pid
+where p.pid = " . $pid);
+
+while ($data[] = sqlFetchArray($res)) {}
+
+$opts = array('maxWidth' => 504
+             ,'fontSize' => 8
+             );
+
+$pdf->ezTable($data,"",$title,$opts);
+
+$pdf->ezText("\n\n\n\nSignature:________________________________","",array('justification' => 'right'));
+
+$pdf->ezStream();
+
+?>
diff --git a/interface/patient_file/summary/stats.php b/interface/patient_file/summary/stats.php
index ff52b1d2a..04b9de327 100644
--- a/interface/patient_file/summary/stats.php
+++ b/interface/patient_file/summary/stats.php
@@ -4,28 +4,42 @@ include_once("$srcdir/lists.inc");
 ?>
 
 <html>
-<head>
-
 
+<head>
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
 </head>
+
+
 <body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<dl>
+
+<table ><tr>
+<td width="20%" valign="top">
+<a href="stats_full.php?active=all" target="Main"><font class="title">Medical Problems</font><font class=more><?echo $tmore;?></font></a><br>
+<?
+if ($result = getListByType($pid, "medical_problem", "id,title,comments", 1, "all", 0)){
+	foreach ($result as $iter) {
+		echo "<a class=link target=Main href='stats_full.php?active=1'>" . $iter{"title"} . "</a><br>\n";
+	}
+}
+?>
+</td>
+</tr>
+<tr>
+
+<td width="20%" valign="top">
 <a href="stats_full.php?active=all" target="Main"><font class="title">Medications</font><font class=more><?echo $tmore;?></font></a><br>
 <?
 if ($result = getListByType($pid, "medication", "id,title", 1, "all", 0)){
 	foreach ($result as $iter) {
 		echo "<a class=link target=Main href='stats_full.php?active=1'>" . $iter{"title"} . "</a><br>\n";
 	}
-
 }
-
 ?>
-
-
-
+</td>
+</tr>
+<tr>
+<td width="20%" valign="top">
 <a href="stats_full.php?active=all" target="Main"><font class="title">Allergies</font><font class=more><?echo $tmore;?></font></a><br>
 <?
 if ($result = getListByType($pid, "allergy", "id,title", 1, "all", 0)){
@@ -35,18 +49,46 @@ if ($result = getListByType($pid, "allergy", "id,title", 1, "all", 0)){
 }
 
 ?>
-
-
-<a href="stats_full.php?active=all" target="Main"><font class="title">Immunizations</font><font class=more><?echo $tmore;?></font></a><br>
+</td>
+</tr>
+<tr>
+<td width="20%" valign="top">
+<a href="stats_full.php?active=all" target="Main"><font class="title">Surgeries</font><font class=more><?echo $tmore;?></font></a><br>
 <?
-if ($result = getListByType($pid, "immunization", "id,title,comments", 1, "all", 0)){
+if ($result = getListByType($pid, "surgery", "id,title,comments", 1, "all", 0)){
 	foreach ($result as $iter) {
 		echo "<a class=link target=Main href='stats_full.php?active=1'>" . $iter{"title"} . ": ".strterm($iter{"comments"},20)."</a><br>\n";
-	}
+	}	
 }
 
-
-$cwd = getcwd();
+?>
+</td>
+</tr>
+<tr>
+<td width="20%" valign="top">
+<a href="immunizations.php" target="Main"><font class="title">Immunizations</font><font class=more><?echo $tmore;?></font></a><br>
+<?$sql = "select if(i1.administered_date
+                      ,concat(i1.administered_date,' - ',i2.name)
+                      ,substring(i1.note,1,20)
+                      ) as immunization_data
+            from immunizations i1
+                   left join immunization i2
+                     on i1.immunization_id = i2.id
+           where i1.patient_id = $pid
+          order by administered_date desc";
+
+$result = sqlStatement($sql);
+ 
+while ($row=sqlFetchArray($result)){
+  echo "<a class=link target=Main href='immunizations.php'>" . $row{'immunization_data'} . "</a><br>\n";
+}
+?>
+</td>
+</tr>
+<tr>
+<td width="20%" valid="top"
+<?
+$cwd= getcwd();
 chdir("../../../");
 require_once("library/classes/Controller.class.php");
 $c = new Controller();
@@ -54,19 +96,12 @@ echo '<font class="title">Prescriptions</font>';
 echo $c->act(array("prescription" => "", "block" => "", "patient_id" => $pid));
 
 ?>
+</td>
+</tr>
+</table>
 
 
-<a href="stats_full.php?active=all" target="Main"><font class="title">Problem List</font><font class=more><?echo $tmore;?></font></a><br>
-<?
-if ($result = getListByType($pid, "problem", "id,title,comments", 1, "all", 0)){
-	foreach ($result as $iter) {
-		echo "<a class=link target=Main href='stats_full.php?active=1'>" . $iter{"title"}."</a><br>\n";
-	}
-}
-
-?>
 
-</dl>
 
 </body>
 </html>
diff --git a/interface/patient_file/summary/stats_full.php b/interface/patient_file/summary/stats_full.php
dissimilarity index 97%
index fac9f974f..21416e022 100644
--- a/interface/patient_file/summary/stats_full.php
+++ b/interface/patient_file/summary/stats_full.php
@@ -1,28 +1,130 @@
-<?
-include_once("../../globals.php");
-
-?>
-
-<HTML>
-<HEAD>
-<TITLE>
-OpenEMR
-</TITLE>
-</HEAD>
-<frameset rows="*" cols="25%,25%,25%,25%" frameborder="NO" border="0" framespacing="0">
-
-  <frame src="medications.php?active=<?echo $active;?>" name="Medications" scrolling="auto" noresize frameborder="NO">
-  <frame src="allergies.php?active=<?echo $active;?>" name="Allergies" scrolling="auto" noresize frameborder="NO">
-  <frame src="immunizations.php?active=<?echo $active;?>" name="Immunizations" scrolling="auto" noresize frameborder="NO">
-  <frame src="problems.php?active=<?echo $active;?>" name="Problem List" scrolling="auto" noresize frameborder="NO">
-  
-</frameset>
-
-
-<noframes><body bgcolor="#FFFFFF">
-
-</body></noframes>
-
-
-
-</HTML
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ include_once("../../globals.php");
+ include_once("$srcdir/lists.inc");
+
+ $arroccur = array(
+  0   => 'Unknown or N/A',
+  1   => 'First',
+  2   => 'Second',
+  3   => 'Third',
+  4   => 'Chronic/Recurrent',
+  5   => 'Acute on Chronic'
+ );
+
+ // get issues
+ $pres = sqlStatement("SELECT * FROM lists WHERE pid = $pid " .
+  "ORDER BY type, begdate");
+?>
+<html>
+
+<head>
+
+<link rel=stylesheet href='<? echo $css_header ?>' type='text/css'>
+<title>Patient Issues</title>
+
+<style>
+tr.head   { font-size:10pt; background-color:#cccccc; text-align:center; }
+tr.detail { font-size:10pt; }
+</style>
+
+<script language="JavaScript">
+
+// Process click on issue title.
+function dopclick(id) {
+ window.open('add_edit_issue.php?issue=' + id, '_blank',
+  'width=500,height=450,scrollbars=1,resizable=1');
+}
+
+// Process click on number of encounters.
+function doeclick(id) {
+ window.open('../problem_encounter.php?issue=' + id, '_blank',
+  'menubar=1,resizable=1,scrollbars=1');
+ return false;
+}
+
+</script>
+
+</head>
+
+<body <?echo $top_bg_line;?>>
+<form method='post' action='stats_full.php'>
+
+<table width='100%' cellpadding='1' cellspacing='2'>
+ <tr class='head'>
+  <td>Type</td>
+  <td>Title</td>
+  <td>Begin</td>
+  <td>End</td>
+  <td>Occurrence</td>
+<? if ($GLOBALS['athletic_team']) { ?>
+  <td>Missed</td>
+<? } else { ?>
+  <td>RefBy</td>
+<? } ?>
+  <td>Comments</td>
+  <td>Enc</td>
+ </tr>
+<?
+ $encount = 0;
+ $lasttype = "";
+ while ($row = sqlFetchArray($pres)) {
+  if ($lasttype != $row['type']) {
+   $encount = 0;
+   $lasttype = $row['type'];
+   $disptype = $lasttype;
+   switch ($lasttype) {
+    case "allergy"        : $disptype = "Allergies"       ; break;
+    case "problem"        :
+    case "medical_problem": $disptype = "Medical Problems"; break;
+    case "medication"     : $disptype = "Medications"     ; break;
+    case "surgery"        : $disptype = "Surgeries"       ; break;
+   }
+   echo " <tr class='detail'>\n";
+   echo "  <td valign='top' colspan='8'><b>$disptype</b></td>\n";
+   echo " </tr>\n";
+  }
+
+  $rowid = $row['id'];
+
+  $disptitle = trim($row['title']) ? $row['title'] : "[Missing Title]";
+
+  $ierow = sqlQuery("SELECT count(*) AS count FROM issue_encounter WHERE " .
+   "list_id = $rowid");
+
+  ++$encount;
+  $bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
+
+  echo " <tr class='detail'>\n";
+  echo "  <td valign='top'>&nbsp;</td>\n";
+  echo "  <td valign='top' id='p_$rowid' onclick='dopclick($rowid)' bgcolor='$bgcolor'>" .
+       "<a href='' onclick='return false'>$disptitle</a></td>\n";
+  echo "  <td valign='top' bgcolor='$bgcolor'>" . $row['begdate'] . "&nbsp;</td>\n";
+  echo "  <td valign='top' bgcolor='$bgcolor'>" . $row['enddate'] . "&nbsp;</td>\n";
+  echo "  <td valign='top' bgcolor='$bgcolor' nowrap>" . $arroccur[$row['occurrence']] . "</td>\n";
+  if ($GLOBALS['athletic_team'])
+   echo "  <td valign='top' align='center' bgcolor='$bgcolor'>" . $row['extrainfo'] . "</td>\n"; // games missed
+  else
+   echo "  <td valign='top' bgcolor='$bgcolor'>" . $row['referredby'] . "</td>\n";
+  echo "  <td valign='top' bgcolor='$bgcolor'>" . $row['comments'] . "</td>\n";
+  echo "  <td valign='top' align='center' id='e_$rowid' onclick='doeclick($rowid)' bgcolor='$bgcolor'>" .
+       "<a href='' onclick='return false'>&nbsp;" . $ierow['count'] . "&nbsp;</a></td>\n";
+  echo " </tr>\n";
+ }
+?>
+</table>
+
+<center><p>
+ <input type='button' value='Add Issue' onclick='dopclick(0)' style='background-color:transparent' /> &nbsp; &nbsp;
+ <input type='button' value='Back' onclick='location="patient_summary.php"' style='background-color:transparent' />
+</p></center>
+
+</form>
+</body>
+</html>
diff --git a/interface/pic/logo.gif b/interface/pic/logo.gif
dissimilarity index 100%
index 8729b5676ee0ecbc8676ffb5e6a3a5e61cf3d001..9346c96455121851663b8e2770a9c72248dabe26 100644
GIT binary patch
literal 34408
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

literal 3220
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
W;pi!5>6>I3xMdjyiT~d=%>D}-w7|{)

diff --git a/interface/pic/show_calendar.gif b/interface/pic/show_calendar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..68d10f1b31220bb7eb2c33d0ac800c6b17512dfe
GIT binary patch
literal 200
zcwTe&bhEHblwc5J*vtR|4Pe{=rW(L3AUJT~z<;2?e}?~H>OYtT1UeucAiWGMwE~Tv
ztM@wWJG=Y;@h=J~ne(0rGATbx>(I)Q{e445XLHn~Cl>d6w`BjUlfL+P#)Y*}-cQc9
z<p|BUU0L+F_*}%Hln>9JGS1kZvZeZOoyI&PlfKhi&jwGF(_4P^m1lWCL2!~zZG%~7
flaRi6kH$oGSFNejrq9rxIeVsL-+W0y1_o;YXAV_-

literal 0
HcwPel00001

diff --git a/interface/reports/appt_encounter_report.php b/interface/reports/appt_encounter_report.php
new file mode 100644
index 000000000..b4372e238
--- /dev/null
+++ b/interface/reports/appt_encounter_report.php
@@ -0,0 +1,218 @@
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ // This report cross-references appointments with encounters.
+ // For a given date, show a line for each appointment with the
+ // matching encounter, and also for each encounter that has no
+ // matching appointment.  This helps to catch these errors:
+ //
+ // * Appointments with no encounter
+ // * Encounters with no appointment
+ // * Codes not justified
+ // * Codes not authorized
+ // * Procedure codes without a fee
+ // * Fees assigned to diagnoses (instead of procedures)
+ // * Encounters not billed
+
+ include_once("../globals.php");
+ include_once("../../library/patient.inc");
+ include_once("../../custom/code_types.inc.php");
+
+ $alertmsg = ''; // not used yet but maybe later
+
+ function bucks($amount) {
+  if ($amount)
+   printf("%.2f", $amount);
+ }
+
+ if ($_POST['form_search']) {
+  $form_date = fixDate($_POST['form_date'], "");
+
+  // MySQL doesn't grok full outer joins so we do it the hard way.
+  //
+  $query = "( " .
+   "SELECT " .
+   "e.pc_startTime, " .
+   "fe.encounter, " .
+   "f.authorized, " .
+   "p.fname, p.lname, p.pid, " .
+   "u.lname AS docname " .
+   "FROM openemr_postcalendar_events AS e " .
+   "LEFT OUTER JOIN form_encounter AS fe " .
+   "ON LEFT(fe.date, 10) = e.pc_eventDate AND fe.pid = e.pc_pid " .
+   "LEFT OUTER JOIN forms AS f ON f.encounter = fe.encounter AND f.formdir = 'newpatient' " .
+   "LEFT OUTER JOIN patient_data AS p ON p.pid = e.pc_pid " .
+   "LEFT OUTER JOIN users AS u ON u.id = e.pc_aid " .
+   "WHERE e.pc_eventDate = '$form_date' AND " .
+   "( e.pc_catid = 5 OR e.pc_catid = 9 OR e.pc_catid = 10 ) " .
+   ") UNION ( " .
+   "SELECT " .
+   "e.pc_startTime, " .
+   "fe.encounter, " .
+   "f.authorized, " .
+   "p.fname, p.lname, p.pid, " .
+   "u.lname AS docname " .
+   "FROM form_encounter AS fe " .
+   "LEFT OUTER JOIN openemr_postcalendar_events AS e " .
+   "ON LEFT(fe.date, 10) = e.pc_eventDate AND fe.pid = e.pc_pid AND " .
+   "( e.pc_catid = 5 OR e.pc_catid = 9 OR e.pc_catid = 10 ) " .
+   "LEFT OUTER JOIN forms AS f ON f.encounter = fe.encounter AND f.formdir = 'newpatient' " .
+   "LEFT OUTER JOIN patient_data AS p ON p.pid = fe.pid " .
+   "LEFT OUTER JOIN users AS u ON u.username = f.user " .
+   "WHERE LEFT(fe.date, 10) = '$form_date' " .
+   ") " .
+   "ORDER BY docname, pc_startTime";
+
+  $res = sqlStatement($query);
+ }
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+<title>Appointments and Encounters</title>
+</head>
+
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0'>
+<center>
+
+<form method='post' action='appt_encounter_report.php'>
+
+<table border='0' cellpadding='5' cellspacing='0' width='98%'>
+
+ <tr>
+  <td height="1" colspan="2">
+  </td>
+ </tr>
+
+ <tr bgcolor='#ddddff'>
+  <td align='left'>
+   <h2>Appointments and Encounters</h2>
+  </td>
+  <td align='right'>
+   Booking Date:
+   <input type='text' name='form_date' size='10' value='<? echo $_POST['form_date']; ?>'
+    title='Date of appointments mm/dd/yyyy'>
+   &nbsp;
+   <input type='submit' name='form_search' value='Search'>
+  </td>
+ </tr>
+
+ <tr>
+  <td height="1" colspan="2">
+  </td>
+ </tr>
+
+</table>
+
+<table border='0' cellpadding='1' cellspacing='2' width='98%'>
+
+ <tr bgcolor="#dddddd">
+  <td class="dehead">
+   &nbsp;Practitioner
+  </td>
+  <td class="dehead">
+   &nbsp;Time
+  </td>
+  <td class="dehead">
+   &nbsp;Patient
+  </td>
+  <td class="dehead" align="right">
+   Chart&nbsp;
+  </td>
+  <td class="dehead" align="right">
+   Encounter&nbsp;
+  </td>
+  <td class="dehead" align="right">
+   Charge&nbsp;
+  </td>
+  <td class="dehead" align="center">
+   Billed
+  </td>
+  <td class="dehead">
+   &nbsp;Error
+  </td>
+ </tr>
+<?
+ if ($res) {
+  $lastdocname = "";
+  while ($row = sqlFetchArray($res)) {
+   $patient_id = $row['pid'];
+   $encounter  = $row['encounter'];
+   $docname    = $row['docname'];
+
+   $billed  = "Y";
+   $errmsg  = "";
+   $charges = 0;
+
+   // Scan the billing items for status and fee total.
+   //
+   $query = "SELECT code_type, authorized, billed, fee, justify " .
+    "FROM billing WHERE " .
+    "pid = '$patient_id' AND encounter = '$encounter' AND activity = 1";
+   $bres = sqlStatement($query);
+   //
+   while ($brow = sqlFetchArray($bres)) {
+    if (! $brow['billed']) $billed = "";
+    if (! $brow['authorized']) $errmsg = "Needs Auth";
+    if ($code_types[$brow['code_type']]['just']) {
+     if (! $brow['justify']) $errmsg = "Needs Justify";
+    }
+    if ($code_types[$brow['code_type']]['fee']) {
+     $charges += $brow['fee'];
+     if ($brow['fee'] == 0 ) $errmsg = "Missing Fee";
+    } else {
+     if ($brow['fee'] != 0) $errmsg = "Misplaced Fee";
+    }
+   }
+   if (! $charges) $billed = "";
+?>
+ <tr bgcolor='<? echo $bgcolor ?>'>
+  <td class="detail">
+   &nbsp;<? echo ($docname == $lastdocname) ? "" : $docname ?>
+  </td>
+  <td class="detail">
+   &nbsp;<? echo substr($row['pc_startTime'], 0, 5) ?>
+  </td>
+  <td class="detail">
+   &nbsp;<? echo $row['fname'] . " " . $row['lname'] ?>
+  </td>
+  <td class="detail" align="right">
+   <? echo $row['pid'] ?>&nbsp;
+  </td>
+  <td class="detail" align="right">
+   <? echo $row['encounter'] ?>&nbsp;
+  </td>
+  <td class="detail" align="right">
+   <? bucks($charges) ?>&nbsp;
+  </td>
+  <td class="detail" align="center">
+   <? echo $billed ?>
+  </td>
+  <td class="detail" align="left">
+   &nbsp;<? echo $errmsg ?>
+  </td>
+ </tr>
+<?
+   $lastdocname = $docname;
+  }
+ }
+?>
+
+</table>
+
+</form>
+</center>
+<script>
+<?
+	if ($alertmsg) {
+		echo " alert('$alertmsg');\n";
+	}
+?>
+</script>
+</body>
+</html>
diff --git a/interface/reports/players_report.php b/interface/reports/players_report.php
new file mode 100644
index 000000000..72db233dd
--- /dev/null
+++ b/interface/reports/players_report.php
@@ -0,0 +1,148 @@
+<?
+ // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.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.
+
+ // This report simply lists all players/patients who are members
+ // of a squad.  It is applicable only for sports teams.
+
+ include_once("../globals.php");
+ include_once("../../library/patient.inc");
+
+ $squads = array(
+  'None',
+  'Senior',
+  'Academy',
+  'Ladies'
+ );
+
+ $fitnesses = array(
+  'Full Play',
+  'Full Training',
+  'Restricted Training',
+  'Injured Out'
+ );
+
+ $fitcolors = array(
+  '#00ff00',
+  '#ffff00',
+  '#ff8800',
+  '#ff3333'
+ );
+
+ $alertmsg = ''; // not used yet but maybe later
+
+ $query = "SELECT * FROM patient_data " .
+  "ORDER BY squad, lname, fname";
+ $res = sqlStatement($query);
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+
+<script language="JavaScript">
+
+ function gopid(pid) {
+  opener.top.location = '../patient_file/patient_file.php?set_pid=' + pid;
+  window.close();
+ }
+
+</script>
+
+<title>Team Roster</title>
+</head>
+
+<body leftmargin='0' topmargin='0' marginwidth='0' marginheight='0'>
+<center>
+
+<form method='post' action='players_report.php'>
+
+<table border='0' cellpadding='5' cellspacing='0' width='98%'>
+
+ <tr>
+  <td height="1" colspan="2">
+  </td>
+ </tr>
+
+ <tr bgcolor='#ddddff'>
+  <td align='left'>
+   <h2>Team Roster</h2>
+  </td>
+  <td align='right'>
+   <b><? echo date('l, F j, Y') ?></b>
+  </td>
+ </tr>
+
+ <tr>
+  <td height="1" colspan="2">
+  </td>
+ </tr>
+
+</table>
+
+<table border='0' cellpadding='1' cellspacing='2' width='98%'>
+
+ <tr bgcolor="#dddddd">
+  <td class="dehead">
+   &nbsp;Squad
+  </td>
+  <td class="dehead">
+   &nbsp;Player
+  </td>
+  <td class="dehead">
+   &nbsp;Fitness
+  </td>
+  <td class="dehead">
+   &nbsp;Last Encounter
+  </td>
+ </tr>
+<?
+ if ($res) {
+  $lastsquad = '';
+  while ($row = sqlFetchArray($res)) {
+   $patient_id = $row['pid'];
+   $squad = $squads[$row['squad']];
+   $fitness = $row['fitness'];
+   if (! $fitness) $fitness = 1;
+   $query = "SELECT date, reason " .
+    "FROM form_encounter WHERE " .
+    "pid = '$patient_id' " .
+    "ORDER BY date DESC LIMIT 1";
+   $erow = sqlQuery($query);
+?>
+ <tr bgcolor="<? echo $fitcolors[$fitness-1] ?>">
+  <td class="detail">
+   &nbsp;<? echo ($squad == $lastsquad) ? "" : $squad ?>
+  </td>
+  <td class="detail">
+   &nbsp;<a href='javascript:gopid(<? echo $patient_id ?>)'><? echo $row['lname'] . ", " . $row['fname'] ?></a>
+  </td>
+  <td class="detail">
+   <? echo $fitnesses[$fitness-1] ?>&nbsp;
+  </td>
+  <td class="detail">
+   &nbsp;<? echo substr($erow['date'], 0, 10) . ' ' . $erow['reason'] ?>&nbsp;
+  </td>
+ </tr>
+<?
+   $lastsquad = $squad;
+  }
+ }
+?>
+
+</table>
+
+</form>
+</center>
+<script>
+<?
+	if ($alertmsg) {
+		echo " alert('$alertmsg');\n";
+	}
+?>
+</script>
+</body>
+</html>
diff --git a/interface/themes/style_sky_blue.css b/interface/themes/style_sky_blue.css
index adebabf97..18f9aec52 100644
--- a/interface/themes/style_sky_blue.css
+++ b/interface/themes/style_sky_blue.css
@@ -39,8 +39,8 @@ A:{visited: #000000;}
 .required {
 	font-family: sans-serif;
 	text-decoration: none;
-	font-size: 12pt;
-	color: #770000;
+	font-size: 10pt;
+	color: #880000;
 	font-weight: bold;
 }
 
diff --git a/interface/usergroup/facility_admin.php b/interface/usergroup/facility_admin.php
index 919c8594f..5da84fa4b 100644
--- a/interface/usergroup/facility_admin.php
+++ b/interface/usergroup/facility_admin.php
@@ -1,16 +1,13 @@
 <?
 include_once("../globals.php");
-
-
 include_once("$srcdir/md5.js");
 include_once("$srcdir/sql.inc");
 require_once("$srcdir/classes/POSRef.class.php");
 
-
 if ($_POST["mode"] == "facility")
 {
-	 sqlStatement("update facility set
-	 	name='{$_POST['facility']}',
+	sqlStatement("update facility set
+		name='{$_POST['facility']}',
 		phone='{$_POST['phone']}',
 		street='{$_POST['street']}',
 		city='{$_POST['city']}',
@@ -21,7 +18,7 @@ if ($_POST["mode"] == "facility")
 		billing_location='{$_POST['billing_location']}',
 		accepts_assignment='{$_POST['accepts_assignment']}',
 		pos_code='{$_POST['pos_code']}',
-		x12_sender_id='{$_POST['x12_sender_id']}',
+		domain_identifier='{$_POST['domain_identifier']}',
 		attn='{$_POST['attn']}'
 	where id='{$_POST['fid']}'");
 }
@@ -34,10 +31,7 @@ if (isset($_POST["fid"])) {
 	$my_fid = $_POST["fid"];
 }
 
-
-
 ?>
-
 <html>
 <head>
 
@@ -100,13 +94,10 @@ if (isset($_POST["fid"])) {
 	<td><span class="text">Billing Attn:</span></td>
 	<td colspan="4"><input type="text" name="attn" size="45" value="<?=$facility['attn']?>"></td>
 </tr>
-<!--
-This is now deprecated use the newer X12 partner management in practice settings
 <tr>
-	<td><span class="text">X12 Sender ID: </span></td>
-	<td><input type="text" name="x12_sender_id" size="15" value="<?=$facility['x12_sender_id']?>"></td>
+	<td><span class="text">CLIA Number:</span></td>
+	<td colspan="4"><input type="text" name="domain_identifier" size="45" value="<?=$facility['domain_identifier']?>"></td>
 </tr>
--->
 <tr>
 	<td>&nbsp;</td><td>&nbsp;</td>
 	<td>&nbsp;</td><td><br><br><input type="submit" value="Update Info">&nbsp;&nbsp;&nbsp;<a href="usergroup_admin.php" class=link_submit>[Back]</font></a></td>
@@ -114,21 +105,5 @@ This is now deprecated use the newer X12 partner management in practice settings
 </table>
 </form>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </body>
 </html>
-
diff --git a/interface/usergroup/user_admin.php b/interface/usergroup/user_admin.php
index ade4dd86a..ebec17204 100644
--- a/interface/usergroup/user_admin.php
+++ b/interface/usergroup/user_admin.php
@@ -1,6 +1,7 @@
 <?
 include_once("../globals.php");
 include_once("$srcdir/auth.inc");
+include_once("../../library/acl.inc");
 
 include_once("$srcdir/md5.js");
 include_once("$srcdir/sql.inc");
@@ -21,7 +22,7 @@ require_once(dirname(__FILE__) . "/../../library/classes/WSProvider.class.php");
 <br><br>
 
 <?
-if (!$_GET["id"] || !$userauthorized)
+if (!$_GET["id"] || !acl_check('admin', 'users'))
 	exit();
 if ($_GET["mode"] == "update") {
 if ($_GET["username"]) {
@@ -39,6 +40,10 @@ if ($_GET["drugid"]) {
 	$tqvar = addslashes($_GET["drugid"]);
 	sqlStatement("update users set federaldrugid='$tqvar' where id={$_GET["id"]}");
 }
+if ($_GET["upin"]) {
+	$tqvar = addslashes($_GET["upin"]);
+	sqlStatement("update users set upin='$tqvar' where id={$_GET["id"]}");
+}
 if ($_GET["lname"]) {
 	$tqvar = addslashes($_GET["lname"]);
 	sqlStatement("update users set lname='$tqvar' where id={$_GET["id"]}");
@@ -123,6 +128,11 @@ foreach($result as $iter2) {
 <TD><span class=text>Federal Drug ID: </span></TD><TD><input type=text name=drugid size=20 value="<? echo $iter["federaldrugid"]?>"></td>
 </TR>
 
+<tr>
+<td><span class="text">UPIN: </span></td><td><input type="text" name="upin" size="20" value="<? echo $iter["upin"]?>"></td>
+<td><span class="text">&nbsp;</span></td><td>&nbsp;</td>
+</tr>
+
 </table>
 <span class=text>Additional Info:</span><br>
 <textarea name="comments" wrap=auto rows=4 cols=30><? echo $iter["info"];?></textarea>
diff --git a/interface/usergroup/usergroup.php b/interface/usergroup/usergroup.php
index 9386e4095..f98581c04 100644
--- a/interface/usergroup/usergroup.php
+++ b/interface/usergroup/usergroup.php
@@ -1,9 +1,10 @@
 <?
 include_once("../globals.php");
+include_once("../../library/acl.inc");
 
 $_SESSION["encounter"] = "";
 
-if ($userauthorized) {
+if (/*$userauthorized*/ true) {
 ?>
 
 <HTML>
@@ -15,7 +16,21 @@ OpenEMR
 <frameset rows="<?echo "$GLOBALS[navBarHeight],$GLOBALS[titleBarHeight]" ?>,*" cols="*" frameborder="NO" border="0" framespacing="0">
   <frame src="usergroup_navigation.php" name="Navigation" scrolling="no" noresize frameborder="NO">
   <frame src="usergroup_title.php" name="Title" scrolling="no" noresize frameborder="NO">
-  <frame src="usergroup_admin.php" name="Main" scrolling="auto" noresize frameborder="NO">
+  <frame
+<? if (acl_check('admin', 'users')) { ?>
+   src="usergroup_admin.php"
+<? } else if (acl_check('admin', 'forms')) { ?>
+   src="../forms_admin/forms_admin.php"
+<? } else if (acl_check('admin', 'practice')) { ?>
+   src="<?=$GLOBALS['webroot']?>/controller.php?practice_settings"
+<? } else if (acl_check('admin', 'calendar')) { ?>
+   src="../main/calendar/index.php?module=PostCalendar&type=admin&func=modifyconfig"
+<? } else if (acl_check('admin', 'database')) { ?>
+   src="../main/myadmin/index.php"
+<? } else { ?>
+   src="<?echo $rootdir?>/logview/logview.php"
+<? } ?>
+   name="Main" scrolling="auto" noresize frameborder="NO">
 </frameset>
 
 <noframes><body bgcolor="#FFFFFF">
diff --git a/interface/usergroup/usergroup_admin.php b/interface/usergroup/usergroup_admin.php
index 818537a6f..437eaa94d 100644
--- a/interface/usergroup/usergroup_admin.php
+++ b/interface/usergroup/usergroup_admin.php
@@ -33,7 +33,19 @@ if ($_POST["mode"] == "facility")
 	}
 
 	if ($doit == true) {
-		$prov_id = idSqlStatement("insert into users set username='".$_POST["username"]."',password='".$_POST["newauthPass"]."',fname='".$_POST["fname"]."',mname='".$_POST["mname"]."',lname='".$_POST["lname"]."',federaltaxid='".$_POST["federaltaxid"]."',authorized='".$_POST["authorized"]."',info='".$_POST["info"]."',federaldrugid='".$_POST["federaldrugid"]."',facility='".$_POST["facility"]."'");
+		$prov_id = idSqlStatement("insert into users set " .
+			"username = '"         . $_POST["username"] .
+			"', password = '"      . $_POST["newauthPass"] .
+			"', fname = '"         . $_POST["fname"] .
+			"', mname = '"         . $_POST["mname"] .
+			"', lname = '"         . $_POST["lname"] .
+			"', federaltaxid = '"  . $_POST["federaltaxid"] .
+			"', authorized = '"    . $_POST["authorized"] .
+			"', info = '"          . $_POST["info"] .
+			"', federaldrugid = '" . $_POST["federaldrugid"] .
+			"', upin = '"          . $_POST["upin"] .
+			"', facility = '"      . $_POST["facility"] .
+			"'");
 		sqlStatement("insert into groups set name='".$_POST["groupname"]."',user='".$_POST["username"]."'");
 		$ws = new WSProvider($prov_id);
 	}
@@ -206,6 +218,10 @@ foreach($result as $iter) {
 <td><span class=text>Federal Tax ID: </span></td><td><input type=entry name='federaltaxid' size=20></td>
 <td><span class=text>Federal Drug ID: </span></td><td><input type=entry name='federaldrugid' size=20></td>
 </tr>
+<tr>
+<td><span class="text">UPIN: </span></td><td><input type="entry" name="upin" size="20"></td>
+<td><span class=text>&nbsp;</span></td><td>&nbsp;</td>
+</tr>
 </table>
 <span class=text>Additional Info: </span><br>
 <textarea name=info cols=40 rows=4 wrap=auto></textarea>
diff --git a/interface/usergroup/usergroup_navigation.php b/interface/usergroup/usergroup_navigation.php
index 57d046bed..dc0c951ab 100644
--- a/interface/usergroup/usergroup_navigation.php
+++ b/interface/usergroup/usergroup_navigation.php
@@ -1,5 +1,6 @@
 <?
 include_once("../globals.php");
+include_once("../../library/acl.inc");
 ?>
 
 <html>
@@ -16,29 +17,41 @@ include_once("../globals.php");
 <table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%">
 <tr>
 
+<? if (acl_check('admin', 'users')) { ?>
 <td valign="middle" nowrap>
 &nbsp;&nbsp;<a class=menu target=Main href="usergroup_admin.php">Users & Groups</a>&nbsp;
 </td>
+<? } ?>
 
+<? if (acl_check('admin', 'forms')) { ?>
 <td valign="middle" nowrap>
 &nbsp;<a class=menu target=Main href="../forms_admin/forms_admin.php">Forms Settings</a>&nbsp;
 </td>
+<? } ?>
 
+<? if (acl_check('admin', 'practice')) { ?>
 <td valign="middle" nowrap>
 &nbsp;<a class=menu target=Main href="<?=$GLOBALS['webroot']?>/controller.php?practice_settings">Practice Settings</a>&nbsp;
 </td>
+<? } ?>
 
+<? if (acl_check('admin', 'calendar')) { ?>
 <td valign="middle" nowrap>
 &nbsp;<a class=menu target=Main href="../main/calendar/index.php?module=PostCalendar&type=admin&func=modifyconfig">Calendar Settings</a>&nbsp;
 </td>
+<? } ?>
 
+<? if (acl_check('admin', 'database')) { ?>
 <td valign="middle" nowrap>
 &nbsp;<a class=menu target=Main href="../main/myadmin/index.php">Database&nbsp;Reporting</a>&nbsp;
 </td>
+<? } ?>
 
+<? if (acl_check('admin', 'users')) { ?>
 <td valign="middle" nowrap>
 &nbsp;<a class=menu target=Main href="<?echo $rootdir?>/logview/logview.php">View Logs</a>&nbsp;
 </td>
+<? } ?>
 
 <td valign="middle" align="right" nowrap>
 <?//<a href="../logout.php?auth=logout" target="_top" class="logout">Logout</a>?>
diff --git a/templates/report/general_default.html b/templates/report/general_default.html
index 9a5400e9d..646d47f87 100644
--- a/templates/report/general_default.html
+++ b/templates/report/general_default.html
@@ -1,7 +1,8 @@
 <html>
 <head>
 {literal}
- <style type="text/css" title="mystyles" media="all">
+
+<style type="text/css" title="mystyles" media="all">
 <!--
 td {
 	font-size:8pt;
@@ -11,23 +12,41 @@ a {
 	font-size:8pt;
 	font-family:helvetica;
 }
-
 -->
 </style>
-<script language="javascript">
+
+<script language="JavaScript">
+
 function clear_vars() {
   document.report.var1.value = "";
   document.report.var2.value = "";
 }
+
+function dopopup(aurl) {
+ window.open(aurl, '_blank', 'width=750,height=550,resizable=1');
+}
+
 </script>
+
 {/literal}
 </head>
 <body bgcolor="{$STYLE.BGCOLOR2}">
 
 <a href="custom_report_range.php" target="_new">Superbill Report</a>
 <br/>
-
+<a href="appt_encounter_report.php" target="_new">Appointments-Encounters Report</a>
+{php}
+ if ($GLOBALS['athletic_team']) {
+  echo "<br/>\n";
+  echo "<a href='javascript:dopopup(\"players_report.php\")'>Team Roster</a>\n";
+ }
+{/php}
+<br/>
+&nbsp;
+<br/>
 <a href="{$printable_link}" target="_new">[printable]</a>
+&nbsp;
+<br/>
 <form name="report" action="index.php" method="get">
 <table>
 	<tr>
-- 
2.11.4.GIT