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

Timestamp:

Feb 14, 2015 10:38:40 AM (10 years ago)

Author:

dungnv

Message:

 

Location:

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

Files:

• lecture.php (modified) (1 diff)
• user.php (modified) (3 diffs)

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

@@ -54 +54 @@
                $first_visit=1;
             }
+            
+            $isOverDate = strtotime($u['expire_date']) < strtotime(date('Y-m-d')) ? 0:1; 
  
-          $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_')));
+            $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'])), 'isOverDate' => $isOverDate , "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

@@ -64 +64 @@
             $result['can_buy'] = 1;
             $result['can_edit'] = 0;
+            
             if ($user['acc_balanced'] < $package['p_price']) {
                 $result['can_buy'] = 0;
@@ -142 +143 @@
         $user['acc_balanced'] = $user['acc_balanced'] - $package['p_price'];
         
-        $currentExpireDate = $user['expire_date'] == NULL || trim($user['expire_date']) == '' ? date('Y-m-d 00:00:00') : $user['expire_date'];
+        $today_dt = new DateTime(date('Y-m-d 00:00:00'));
+        $expire_dt = new DateTime($user['expire_date']);
+        
+        $currentExpireDate = $user['expire_date'] == NULL || trim($user['expire_date']) == '' || $today_dt > $expire_dt  ? date('Y-m-d 00:00:00') : $user['expire_date'];
         $user['expire_date'] = date('Y-m-d', strtotime("+" . $package['p_period'] . " ".$package['p_unit'], strtotime($currentExpireDate))); 
         $user['p_id'] = $package['p_id'];
@@ -175 +179 @@
         } else {
             $user['acc_balanced'] = $user['acc_balanced'] - $package['p_price'];
-            $currentExpireDate = $user['expire_date'] == NULL || trim($user['expire_date']) == '' ? date('Y-m-d 00:00:00') : $user['expire_date'];
+            
+            $today_dt = new DateTime(date('Y-m-d 00:00:00'));
+            $expire_dt = new DateTime($user['expire_date']);
+            
+            $currentExpireDate = $user['expire_date'] == NULL || trim($user['expire_date']) == ''  || $today_dt > $expire_dt ? date('Y-m-d 00:00:00') : $user['expire_date'];
 
             $user['expire_date'] = date('Y-m-d', strtotime("+" . $package['p_period'] . " " . $package['p_unit'], strtotime($currentExpireDate)));