From 9d02e8fe16fe6fc8dbf5030d55aeedd518bb4e97 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sun, 31 Aug 2014 00:57:58 +0000
Subject: [PATCH] Fix and move the format_phone array

---
 app/vars/app_defaults.php | 2 --
 resources/functions.php   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php
index 0c3d5b87ea..8580bf7dbf 100644
--- a/app/vars/app_defaults.php
+++ b/app/vars/app_defaults.php
@@ -64,8 +64,6 @@ $vars = <<<EOD
 {"var_name":"default_dialect","var_value":"us","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"default_voice","var_value":"callie","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"ajax_refresh_rate","var_value":"3000","var_cat":"Defaults","var_enabled":"true","var_description":""},
-{"var_name":"format_phone","var_value":"Rxxx-xxx-xxxx","var_cat":"Defaults","var_enabled":"true","var_description":""},
-{"var_name":"format_phone","var_value":"xxx-xxx-xxxx","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"xml_cdr_archive","var_value":"dir","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"ringback","var_value":"\$\${us-ring}","var_cat":"Defaults","var_enabled":"true","var_description":""},
 {"var_name":"transfer_ringback","var_value":"\$\${us-ring}","var_cat":"Defaults","var_enabled":"true","var_description":""}
diff --git a/resources/functions.php b/resources/functions.php
index a5a179af4f..fab9c3cd05 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -759,6 +759,7 @@ function format_string ($format, $data) {
 		foreach ($_SESSION["format"]["phone"] as &$format) {
 			$format_count = substr_count($format, 'x');
 			$format_count = $format_count + substr_count($format, 'R');
+			$format_count = $format_count + substr_count($format, 'r');
 			if ($format_count == strlen($phone_number)) {
 				//format the number
 				$phone_number = format_string($format, $phone_number);