From 8f9cf2c32a9969f09925957d6dc138e46a78a162 Mon Sep 17 00:00:00 2001
From: sunsetsystems <sunsetsystems>
Date: Fri, 1 Apr 2005 01:29:12 +0000
Subject: [PATCH] fixed failures to deal with pid changes; better parsing of
 phone numbers

---
 .../patient_file/summary/demographics_full.php     | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/interface/patient_file/summary/demographics_full.php b/interface/patient_file/summary/demographics_full.php
index 812f5e4b1..65e9a18ce 100644
--- a/interface/patient_file/summary/demographics_full.php
+++ b/interface/patient_file/summary/demographics_full.php
@@ -1,6 +1,16 @@
 <?
 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');
@@ -134,21 +144,25 @@ alert("Please enter a dollar amount using only numbers and a decimal point.");
 $result = getPatientData($pid);
 $result2 = getEmployerData($pid);
 
-
 //extract formatting of phone number:
 $pmatch_contact=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_contact"},$pmatch_contact);
+// preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_contact"},$pmatch_contact);
+preg_match("/\D*(\d\d\d)\D*(\d\d\d)\D*(\d\d\d\d)\D*$/",$result{"phone_contact"},$pmatch_contact);
+
 //extract formatting of phone number:
 $pmatch_home=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_home"},$pmatch_home);
+// preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_home"},$pmatch_home);
+preg_match("/\D*(\d\d\d)\D*(\d\d\d)\D*(\d\d\d\d)\D*$/",$result{"phone_home"},$pmatch_home);
 
 //extract formatting of phone number:
 $pmatch_biz=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_biz"},$pmatch_biz);
+// preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_biz"},$pmatch_biz);
+preg_match("/\D*(\d\d\d)\D*(\d\d\d)\D*(\d\d\d\d)\D*$/",$result{"phone_biz"},$pmatch_biz);
 
 //extract formatting of phone number:
 $pmatch_cell=array();
-preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_cell"},$pmatch_cell);
+// preg_match("/^\((.*?)\)\s(.*?)\-(.*?)$/",$result{"phone_cell"},$pmatch_cell);
+preg_match("/\D*(\d\d\d)\D*(\d\d\d)\D*(\d\d\d\d)\D*$/",$result{"phone_cell"},$pmatch_cell);
 
 ?>
 
-- 
2.11.4.GIT