Changeset 502 for pro-violet-viettel/sourcecode/application/modules/frontend/controllers

Timestamp:

Nov 14, 2014 4:19:21 PM (11 years ago)

Author:

namnd

Message:

 

File:

• pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php (modified) (5 diffs)

pro-violet-viettel/sourcecode/application/modules/frontend/controllers/user.php

@@ -74 +74 @@
                         $data = array('us_id'=>$us_id, 'username'=>$username, 'fullname'=>$fullname,
                                                 'gender'=>$gender, 'email'=>$email, 'phone'=>$phone, 'school'=>$school, 'province'=>$province,
-                                                'acc_balanced'=>$us['acc_balanced'], 'expire_date'=>$us['expire_date'], 'date_diff'=>$this->dateDiff($us['expire_date'])
+                                                'acc_balanced'=>$us['acc_balanced'], 'expire_date'=>date('d/m/Y', strtotime($us['expire_date'])), 'date_diff'=>$this->dateDiff($us['expire_date']), 'use_package'=>$us['use_package']
                                         );
                         return $data;
@@ -109 +109 @@
         public function update_user()
         {
-                $this->load->helper('email');
                 $us_id=$this->uri->segment(4);
                 $user_info = $this->session->userdata('userInfo');
@@ -122 +121 @@
                         if ($input){
                                 $input['username'] = $user['username'];
-                                $input['fullname'] = $user['fullname'];
+                                if (array_key_exists('fullname', $input))
+                                {
+                                        if (strlen($input['fullname'])==0)
+                                        {
+                                                $result['errors']['fullname_err'] = "Họ tên khÃŽng được để trống !";
+                                        }
+                                }else
+                                {
+                                        $input['fullname'] = $user['fullname'];
+                                }
+                                /*
+                                if ($strlen($input['school']) == 0)
+                                {
+                                        $result['errors']['school_err'] = "Đơn vị khÃŽng được để trống !";
+                                }
+                                if ($strlen($input['province']) == 0)
+                                {
+                                        $result['errors']['province_err'] = "Tỉnh/thà nh khÃŽng được để trống !";
+                                }*/
                                 $input['password'] = '';
                                 $input['oldpass'] = '';
                                 $this->load->model('user_model');
-                                $result['fullname'] = $input['fullname'];
-                                if (strlen($input['email'])>0){
-                                        if(!valid_email($input['email']))
-                                        {
-                                                $result['errors']['email_err'] = "Email khÃŽng đúng định dạng";
-                                        }
-                                }
+                                //$result['fullname'] = $input['fullname'];
                                 if (!isset($result['errors'])){
                                         $result['data'] = $this->user_model->update_user($src, $token, $input, $us_id);
@@ -156 +167 @@
                         $src = "SBG";
                         $token = md5($us_id.self::TOKENPW);
+                        $input = $this->input->post();
                         if (strlen($input['passwd']) == 0)
                         {
@@ -173 +185 @@
                         if (!isset($result['errors']))
                         {
-                                $user = array('username'=>$username, 'fullname'=>null,  );
+                                $user = array('username'=>$user_info['username'], 'fullname'=>null, 'gender'=>null, 'email'=>null, 'school'=>null, 'province'=>null, 'password'=>$input['passwd_new'], 'oldpass'=>$input['passwd']);
                                 $data = $this->user_model->update_user($src, $token, $user, $us_id);
                                 parse_str($data);