Changeset 583 for pro-violet-viettel/sourcecode/application/modules

Timestamp:

Nov 20, 2014 4:06:59 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

@@ -37 +37 @@
                 _SBG_MO_REGISTER                        => array('pattern' => '/^(SBG[[:blank:]])(DK)$/'),
                 _SBG_MO_REGISTER_FOR            => array('pattern' => '/^(SBG[[:blank:]])(DK)([[:blank:]][0-9]{10,11})$/'),
-                _SBG_MO_PHONENUM_CHANGE         => array('pattern' => '/^(SBG[[:blank:]])(DDT)([[:blank:]][0-9]{10,11})([[:blank:]][a-zA-Z0-9]{4,16})$/'),
+                _SBG_MO_PHONENUM_CHANGE         => array('pattern' => '/^(SBG[[:blank:]])(DDT)([[:blank:]][0-9]{10,11})([[:blank:]][a-zA-Z0-9~!@#$%^&*]{4,16})$/'),
                 _SBG_MO_PASSWORD_RECOVERY       => array('pattern' => '/^(SBG[[:blank:]])(MK)$/'),
                 _SBG_MO_PASSWORD_CHANGE         => array('pattern' => '/^(SBG[[:blank:]])(MK)([[:blank:]][a-zA-Z0-9~!@#$%^&*]{4,16})$/'),
@@ -46 +46 @@
         );
         
+        private $_arySmsService = array(
+                        'DK' => _SBG_MO_REGISTER_FOR,
+                        'DDT' => _SBG_MO_PHONENUM_CHANGE,
+                        'NAP' => _SBG_MO_PAY_TO_ACCOUNT_FOR,
+        );      
+        
         public function __construct(){
                 parent::__construct();
@@ -61 +67 @@
                         if ((bool)$result) break;
                 }
+                
+                $key = (bool)$result ? $key:_SBG_MO_SYNTAX_ERR;
                 
                 if (count ($aryMatched) > 0) {
@@ -69 +77 @@
                 }
         
-                $key = (bool)$result ? $key:_SBG_MO_SYNTAX_ERR;
+                if ((bool)$result == FALSE) {
+                        $aryContent = array();
+                        foreach(explode(' ',strtoupper($message)) as $k => $val) {
+                                $aryContent[] = $val;
+                        }
+                        $key = $this->_arySmsService[$aryContent[1]];
+                        $result = 1;
+                }
+                
                 if ($key == _SBG_MO_PASSWORD_CHANGE || $key == _SBG_MO_PHONENUM_CHANGE) {
                         $index = $key == _SBG_MO_PASSWORD_CHANGE ? 2 : 3;
@@ -98 +114 @@
                         case _SBG_MO_REGISTER:
                         case _SBG_MO_REGISTER_FOR:
+                                if ($case == _SBG_MO_REGISTER_FOR) {
+                                        if (!preg_match('/^([0-9]{10,11}$)$/', $aryContents[2])) {
+                                                $smsReturn = '0|So dien thoai khach hang khong hop le';
+                                                break;
+                                        }
+                                }
+                                
                                 $userName = isset($aryContents[2]) ? $this->formatPhoneNumber($aryContents[2]) : $sentNumber;  
                                 $collaborator = isset($aryContents[2]) ? $sentNumber:null;
@@ -113 +136 @@
                                 break;
                         case _SBG_MO_PHONENUM_CHANGE:
+                                
+                                if (!preg_match('/^([0-9]{10,11}$)$/', $aryContents[2])) {
+                                        $smsReturn = '0|So dien thoai khach hang khong hop le';
+                                        break;
+                                }
+                                
                                 $oldPhoneNumber = $this->formatPhoneNumber($aryContents[2]);
                                 $password = $aryContents[3];
                                 $smsReturn = $this->objUserModel->changeProfile($sentNumber, $oldPhoneNumber, $password);
-                                $sendMT = $this->sendMT($oldPhoneNumber, $smsReturn);
+                                $arySMS = explode ('|', $smsReturn);
+                                $sendMT = $this->sendMT($this->formatPhoneNumber($oldPhoneNumber, -1), $arySMS[1]);
+                                
                                 break;
                         case _SBG_MO_PASSWORD_RECOVERY: