Changeset 575 for pro-violet-viettel/sourcecode/application

Timestamp:

Nov 19, 2014 7:09:09 PM (10 years ago)

Author:

dungnv

Message:

 

File:

• pro-violet-viettel/sourcecode/application/modules/services/models/services_model.php (modified) (6 diffs)

pro-violet-viettel/sourcecode/application/modules/services/models/services_model.php

@@ -69 +69 @@
                 $debugMsg = $message."\n";
                 
-                $aryMatch = array();
-                if (preg_match('/^(84)([0-9]{9,10})$/', $sentNumber, $aryMatch) == 1) {
-                        $sentNumber = '0'. $aryMatch[2];
-                }
+                $sentNumber = $this->formatPhoneNumber($sentNumber);
                 
                 $smsReturn = '';
@@ -94 +91 @@
                         case _SBG_MO_REGISTER:
                         case _SBG_MO_REGISTER_FOR:
-                                $userName = isset($aryContents[2]) ? $aryContents[2] : $sentNumber;  
+                                $userName = isset($aryContents[2]) ? $this->formatPhoneNumber($aryContents[2]) : $sentNumber;  
                                 $collaborator = isset($aryContents[2]) ? $sentNumber:null;
                                 $sms = $this->objUserModel->register($userName, $collaborator);
@@ -107 +104 @@
                                 break;
                         case _SBG_MO_PHONENUM_CHANGE:
-                                $oldPhoneNumber = $aryContents[2];
+                                $oldPhoneNumber = $this->formatPhoneNumber($aryContents[2]);
                                 $password = $aryContents[3];
                                 $smsReturn = $this->objUserModel->changeProfile($sentNumber, $oldPhoneNumber, $password);
@@ -123 +120 @@
                         case _SBG_MO_PAY_TO_ACCOUNT:
                         case _SBG_MO_PAY_TO_ACCOUNT_FOR:
-                                $userName = isset($aryContents[3]) ? $aryContents[3] : $sentNumber;
+                                $userName = isset($aryContents[3]) ? $this->formatPhoneNumber($aryContents[3]) : $sentNumber;
                                 $amount = $aryContents[2];
                                 $result =$this->chargeRootAccountProcess($sentNumber, $amount);
@@ -236 +233 @@
         {
                 $aryMatch = array();
+                
                 if (preg_match('/^(0)([0-9]{9,10})$/', $receiverID, $aryMatch) == 1) {
                         $receiverID = '84'. $aryMatch[2];
@@ -273 +271 @@
                 return _SBG_SEND_MT_SUCCESS;
         }
+        
+        public function formatPhoneNumber ($phoneNumber) {
+                $aryMatch = array();
+                if (preg_match('/^(84)([0-9]{9,10})$/', $phoneNumber, $aryMatch) == 1) {
+                        $result = '0'. $aryMatch[2];
+                }
+                else if (preg_match('/^(0)([0-9]{9,10})$/', $phoneNumber)) {
+                        $result = $phoneNumber;
+                }
+                
+                return $result;
+        }
 }