From 2d3ef1e4a8ccbb924a8a17cafa6dcea4e2ffe3f5 Mon Sep 17 00:00:00 2001
From: CJ <lim@chernjie.com>
Date: Wed, 23 Jul 2014 02:17:49 +0800
Subject: [PATCH] Fix SG vs US phone country/area code clashes

---
 app/libraries/utils.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index 11273428d7bb..fa1f2542b3c2 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -139,10 +139,17 @@ class Utils
 
 	        $phoneNumber = '+'.$countryCode.' ('.$areaCode.') '.$nextThree.'-'.$lastFour;
 	    }
-	    else if(strlen($phoneNumber) == 10 && substr($phoneNumber, 0, 2) == 65) {
+	    else if(strlen($phoneNumber) == 10 && in_array(substr($phoneNumber, 0, 3), array(653, 656, 658, 659))) {
+	        /**
+	         * SG country code are 653, 656, 658, 659
+	         * US area code consist of 650, 651 and 657
+	         * @see http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan
+	         * @see http://www.bennetyee.org/ucsd-pages/area.html
+	         */
 	        $countryCode = substr($phoneNumber, 0, 2);
 	        $nextFour = substr($phoneNumber, 2, 4);
 	        $lastFour = substr($phoneNumber, 6, 4);
+
 	        $phoneNumber = '+'.$countryCode.' '.$nextFour.' '.$lastFour;
 	    }
 	    else if(strlen($phoneNumber) == 10) {