Index: branches/5.3.x/units/orders/orders_event_handler.php =================================================================== diff -u -N -r15899 -r15925 --- branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15899) +++ branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15925) @@ -1,6 +1,6 @@ GetDBField('Expiration'); $number_of_use = $coupon->GetDBField('NumberOfUses'); - if ( $coupon->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) || + if ( $coupon->GetDBField('Status') != 1 || ($expire_date && $expire_date < time()) || (isset($number_of_use) && $number_of_use <= 0)) { $event->status = kEvent::erFAIL; @@ -1220,7 +1220,7 @@ return ; } - $last_used = adodb_mktime(); + $last_used = time(); $coupon->SetDBField('LastUsedBy', $this->Application->RecallVar('user_id')); $coupon->SetDBField('LastUsedOn_date', $last_used); $coupon->SetDBField('LastUsedOn_time', $last_used); @@ -1654,7 +1654,7 @@ $this->setNextOrderNumber($event); $object->SetDBField('OriginalAmount', 0); } - $object->SetDBField('OrderDate', adodb_mktime()); + $object->SetDBField('OrderDate', time()); $object->UpdateFormattersSubFields(); $object->SetDBField('GWResult1', ''); $object->SetDBField('GWResult2', ''); @@ -2201,7 +2201,7 @@ $set_new_status = $this->approveOrder($order_items); // $set_new_status = $this->shipOrder($order_items); - $object->SetDBField('ShippingDate', adodb_mktime()); + $object->SetDBField('ShippingDate', time()); $object->UpdateFormattersSubFields(); $shipping_email = $object->GetDBField('ShippingEmail'); @@ -3516,7 +3516,7 @@ function OnCheckRecurringOrders($event) { $skip_clause = Array(); - $pre_expiration = adodb_mktime() + $this->Application->ConfigValue('Comm_RecurringChargeInverval') * 3600 * 24; + $pre_expiration = time() + $this->Application->ConfigValue('Comm_RecurringChargeInverval') * 3600 * 24; $to_charge = $this->getRecurringOrders($pre_expiration); if ($to_charge) { @@ -3568,7 +3568,7 @@ return ; } - $pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24; + $pre_expiration = time() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24; $to_charge = $this->getRecurringOrders($pre_expiration); foreach ($to_charge as $order_id => $record) { @@ -3891,7 +3891,7 @@ $debit = $gift_certificate->GetDBField('Debit'); $expire_date = $gift_certificate->GetDBField('Expiration'); - if ( $gift_certificate->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) || ($debit <= 0) ) { + if ( $gift_certificate->GetDBField('Status') != 1 || ($expire_date && $expire_date < time()) || ($debit <= 0) ) { $event->status = kEvent::erFAIL; $object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_CODE_EXPIRED); $event->redirect = false;