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

Timestamp:

Jan 9, 2015 11:01:39 AM (10 years ago)

Author:

dungnv

Message:

 

File:

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

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

@@ -18 +18 @@
         $user_info = $this->session->userdata('userInfo');
         if ($user_info) {
-            $this->load->model('user_model');
-            $this->load->model('servicepackage_model');
+            $this->load->model('User_model');
+            $this->load->model('Servicepackage_model');
             $user = $user_info['user'];
             $us_id = $user_info['us_id'];
@@ -25 +25 @@
             $token = md5($us_id . self::TOKENPW);
             $data = $this->get_data($src, $token, $us_id);
-            $u = $this->user_model->get_user_by_id($us_id);
+            $u = $this->User_model->get_user_by_id($us_id);
             $data['current_tab'] = $this->uri->segment(4, 'edit-basic');
-            $data['packages'] = $this->servicepackage_model->getAllPackages();
-            $data['is_viettel'] = $user_info['is_viettel'];
-                        $data = array_merge($data, $u);
-            $data = array_merge($data, $user_info);
+            $data['packages'] = $this->Servicepackage_model->getAllPackages();
+            $data['is_viettel'] = isset($user_info['is_viettel']) ? $user_info['is_viettel']:FALSE;
+            
+            $data = (is_array($u)) ? array_merge($data, $u) : $data;
+            $data = (is_array($user_info)) ? array_merge($data, $user_info):$data;
                         
             $this->load->view('frontend/user_profile', $data);