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

Timestamp:

Jan 29, 2015 5:32:13 PM (10 years ago)

Author:

namnd

Message:

 

Location:

pro-violet-viettel/sourcecode/application/modules/frontend/controllers

Files:

• lecture.php (modified) (3 diffs)
• user.php (modified) (2 diffs)

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

@@ -14 +14 @@
     public function __construct() {
         parent::__construct();
+                $this->load->helper('language');
+                $this->lang->load('messages', 'message');
     }
 
@@ -42 +44 @@
                 $update_user_info=1;
             }
+                        
+                        if ($u['province'] == '' && $u['p_id'] != ''){
+                                $update_user_info=1;
+                        }
             
             if (!$this->session->userdata('first_visit'))
@@ -49 +55 @@
             }
  
-          $this->load->view('lecture_editor', array('username' => $username, 'licenseAvailable' => $licenseAvailable, 'first_visit' => $first_visit, 'licflashVars' => $aryParams,'update_user_info'=>$update_user_info,'us_id'=>$us_id,"p_period"=>$u['p_period'],"expire_date"=>date("d-m-Y", strtotime($u['expire_date']))));
+          $this->load->view('lecture_editor', array('username' => $username, 'licenseAvailable' => $licenseAvailable, 'first_visit' => $first_visit, 'licflashVars' => $aryParams,'update_user_info'=>$update_user_info,'us_id'=>$us_id,"p_period"=>$u['p_period'],"expire_date"=>date("d-m-Y", strtotime($u['expire_date'])), "fullname"=>$info['fullname'], "school"=>$info['school'], "province"=>$u['province'], "provinces"=>lang('_PROVINCES_')));
         } else {
             redirect('/frontend/home/');

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

@@ -242 +242 @@
             parse_str($user_info['user'], $info);
             if ($input) {
-                if (strlen($input['fullname']) == 0) {
-                    $result['errors'][] = array("content"=>lang('_SBG_FULLNAME_REQUIRED_MSG'),"field"=>"fullname");
-                }
+                                if (array_key_exists('fullname', $input)) {
+                                        if (strlen($input['fullname']) == 0) {
+                                                $result['errors'][] = array("content"=>lang('_SBG_FULLNAME_REQUIRED_MSG'),"field"=>"fullname");
+                                        }
+                                }else{
+                                        $input['fullname'] = $user['fullname'];
+                                }
                 if (strlen($input['school']) == 0) {
                     $result['errors'][] = array("content"=>lang('_SBG_REGISTER_VIP_SCHOOL_REQUIRED_MSG'),"field"=>"school");
@@ -251 +255 @@
                 $input['password'] = '';
                 $input['oldpass'] = '';
-                $input['province'] = '';
+                //$input['province'] = '';
                 $this->load->model('user_model');
                 if (!isset($result['errors'])) {