From d5009b38a404629f15c8de71f6a546baf59d6dbb Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@skmobi.com>
Date: Thu, 15 Mar 2012 11:41:14 +0000
Subject: [PATCH] cleanPhone fix ("00" for international prefix and javascript
 country prefix cleanup)

---
 .gitignore                         |  4 ++++
 wifiSMS/Classes/MyHTTPConnection.m |  4 ++++
 wifiSMS/Web/func.js                | 11 ++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a22bc48
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+build
+temp
+.DS_Store
+DerivedData
diff --git a/wifiSMS/Classes/MyHTTPConnection.m b/wifiSMS/Classes/MyHTTPConnection.m
index 26c5303..effc6bb 100755
--- a/wifiSMS/Classes/MyHTTPConnection.m
+++ b/wifiSMS/Classes/MyHTTPConnection.m
@@ -892,6 +892,10 @@ -(NSString *)LoadFullAddressBook:(NSString *)CC {
 			
 			phoneNoFormat = [[mobile componentsSeparatedByCharactersInSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]] componentsJoinedByString:@""];
 			
+            if ([phoneNoFormat hasPrefix:@"00"]){
+				phoneNoFormat = [phoneNoFormat substringFromIndex:2];
+			}
+            
 			if ([phoneNoFormat hasPrefix:@"0"]){
 				phoneNoFormat = [phoneNoFormat substringFromIndex:1];
 			}
diff --git a/wifiSMS/Web/func.js b/wifiSMS/Web/func.js
index 4f47a07..ee254a1 100644
--- a/wifiSMS/Web/func.js
+++ b/wifiSMS/Web/func.js
@@ -303,12 +303,17 @@ function cleanPhone(s) {
 	
 	 s = s.replace(/[^\d.]/g, "");
 	 
+     if (s.substring(0, 2) == "00") {
+	 	s = s.substring(2);
+     }
+    
 	 if (s.substring(0, 1) == "0") {
 	 	s = s.substring(1);
 	 }
 	 
-	 if (s.substring(0, 1) == localStorage.getItem("CC")) {
-	 	s = s.substring(1);
+     var cc = localStorage.getItem("CC");
+	 if (s.substring(0, cc.length) == cc) {
+	 	s = s.substring(cc.length);
 	 }
 	 
 	return s;
@@ -752,7 +757,7 @@ function QuerySMS() {
 							var tot = json.messages.length-1;
 							
 							for(var i = 1; i <= tot; i++) {
-								var Phone = json.messages[i].Phone;
+								var Phone = cleanPhone(json.messages[i].Phone);
 								var SMS = json.messages[i].Text;
 								var flags = json.messages[i].flags;
 								var group = json.messages[i].group;