Changeset 632

Timestamp:

Dec 2, 2014 11:35:56 AM (10 years ago)

Author:

dungnv

Message:

 

Location:

pro-violet-viettel/sourcecode/application

Files:

• helpers/lockfile_helper.php (modified) (2 diffs)
• modules/frontend/views/lecture_editor.php (modified) (1 diff)
• modules/services/models/services_model.php (modified) (1 diff)

pro-violet-viettel/sourcecode/application/helpers/lockfile_helper.php

@@ -82 +82 @@
 
                 $diff = date_diff($datetime1, $datetime2);
+                //$diff = DateTime::diff($datetime1, $datetime2);
                 $total = 0;
                 switch( $differenceFormat){
@@ -109 +110 @@
         }
 }
+
+if(!function_exists('date_diff')) {
+  class DateInterval {
+    public $y;
+    public $m;
+    public $d;
+    public $h;
+    public $i;
+    public $s;
+    public $invert;
+    public $days;
+ 
+    public function format($format) {
+      $format = str_replace('%R%y', 
+        ($this->invert ? '-' : '+') . $this->y, $format);
+      $format = str_replace('%R%m', 
+         ($this->invert ? '-' : '+') . $this->m, $format);
+      $format = str_replace('%R%d', 
+         ($this->invert ? '-' : '+') . $this->d, $format);
+      $format = str_replace('%R%h', 
+         ($this->invert ? '-' : '+') . $this->h, $format);
+      $format = str_replace('%R%i', 
+         ($this->invert ? '-' : '+') . $this->i, $format);
+      $format = str_replace('%R%s', 
+         ($this->invert ? '-' : '+') . $this->s, $format);
+ 
+      $format = str_replace('%y', $this->y, $format);
+      $format = str_replace('%m', $this->m, $format);
+      $format = str_replace('%d', $this->d, $format);
+      $format = str_replace('%h', $this->h, $format);
+      $format = str_replace('%i', $this->i, $format);
+      $format = str_replace('%s', $this->s, $format);
+ 
+      return $format;
+    }
+  }
+ 
+  function date_diff(DateTime $date1, DateTime $date2) {
+ 
+    $diff = new DateInterval();
+ 
+    if($date1 > $date2) {
+      $tmp = $date1;
+      $date1 = $date2;
+      $date2 = $tmp;
+      $diff->invert = 1;
+    } else {
+      $diff->invert = 0;
+    }
+ 
+    $diff->y = ((int) $date2->format('Y')) - ((int) $date1->format('Y'));
+    $diff->m = ((int) $date2->format('n')) - ((int) $date1->format('n'));
+    if($diff->m < 0) {
+      $diff->y -= 1;
+      $diff->m = $diff->m + 12;
+    }
+    $diff->d = ((int) $date2->format('j')) - ((int) $date1->format('j'));
+    if($diff->d < 0) {
+      $diff->m -= 1;
+      $diff->d = $diff->d + ((int) $date1->format('t'));
+    }
+    $diff->h = ((int) $date2->format('G')) - ((int) $date1->format('G'));
+    if($diff->h < 0) {
+      $diff->d -= 1;
+      $diff->h = $diff->h + 24;
+    }
+    $diff->i = ((int) $date2->format('i')) - ((int) $date1->format('i'));
+    if($diff->i < 0) {
+      $diff->h -= 1;
+      $diff->i = $diff->i + 60;
+    }
+    $diff->s = ((int) $date2->format('s')) - ((int) $date1->format('s'));
+    if($diff->s < 0) {
+      $diff->i -= 1;
+      $diff->s = $diff->s + 60;
+    }
+ 
+    $start_ts   = $date1->format('U');
+    $end_ts   = $date2->format('U');
+    $days     = $end_ts - $start_ts;
+    $diff->days  = round($days / 86400);
+ 
+    if (($diff->h > 0 || $diff->i > 0 || $diff->s > 0))
+      $diff->days += ((bool) $diff->invert)
+        ? 1
+        : -1;
+ 
+    return $diff;
+ 
+  }
+ 
+}

pro-violet-viettel/sourcecode/application/modules/frontend/views/lecture_editor.php

@@ -12 +12 @@
                                                                 <?php $flashVars.= '&youtubeUrl='.$base_url.'assets/soanbai/Service/fake_youtube.php'.$langParam.'&command=Init OK' ?>
                                                                 <?php $flashVars.= '&licenseStatus='.$licenseAvailable ?>
-                                                                <?php $flashVars.= '&userId='.$licflashVars['id'] ?>
-                                                                <?php $flashVars.= '&appUserName='.$licflashVars['fullname'] ?>
-                                                                <?php $flashVars.= '&appAddress='.$licflashVars['school'] ?>
+                                                                <?php $flashVars.= '&userId='. isset($licflashVars['id']) ? $licflashVars['id']:'' ?>
+                                                                <?php $flashVars.= '&appUserName='.isset($licflashVars['fullname']) ? $licflashVars['fullname']:'' ?>
+                                                                <?php $flashVars.= '&appAddress='.isset($licflashVars['school']) ? $licflashVars['school']:'' ?>
  
                                                                 <div class="embed-responsive embed-responsive-4by3">

pro-violet-viettel/sourcecode/application/modules/services/models/services_model.php

@@ -268 +268 @@
                 
                 $aryTopupResult = $result[$keys[0]];
-                
+
+                $debugMsg = 'Logged time: '. date('Y-m-d H:i:s') ."\n";
+                $debugMsg .=  'Send:'."\n" .$xml ."\n\n";
+                $debugMsg .= 'Result:'."\n". var_export($result, TRUE);
+                write_file('./log/topup_log', $debugMsg);
+
                 if ($aryTopupResult['Success'] == 'false') {
                         return _SBG_CARD_PAY_FAIL;