Index: branches/5.3.x/units/listings/listings_tag_processor.php =================================================================== diff -u -N -r15696 -r15926 --- branches/5.3.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 15696) +++ branches/5.3.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 15926) @@ -1,6 +1,6 @@ GetDBField('Duration'); $duration_type = $listing_type->GetDBField('DurationType'); $expiration_interval = $duration * $dur_type_mapping[$duration_type]; - $expiration_date = adodb_mktime() + $expiration_interval; + $expiration_date = time() + $expiration_interval; $lang = $this->Application->recallObject('lang.current'); /* @var $lang LanguagesItem */ - return adodb_date($lang->GetDBField($format_field), $expiration_date); + return date($lang->GetDBField($format_field), $expiration_date); } } \ No newline at end of file Index: branches/5.3.x/install/upgrades.sql =================================================================== diff -u -N -r15900 -r15926 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15900) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15926) @@ -203,3 +203,5 @@ WHERE `Name` = 'In-Link'; # ===== v 5.2.1-RC1 ===== + +# ===== v 5.3.0-B1 ===== Index: branches/5.3.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r15808 -r15926 --- branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15808) +++ branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15926) @@ -1,6 +1,6 @@ Load($link_id, 'LinkId'); - $now = adodb_mktime(); + $now = time(); $fields_hash = Array ( 'LinkId' => $link_id, Index: branches/5.3.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r15808 -r15926 --- branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15808) +++ branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15926) @@ -1,6 +1,6 @@ GetDBField('ExpiresOn') < adodb_mktime() ) { + if ( $object->GetDBField('ExpiresOn') < time() ) { $object->SetDBField('Status', STATUS_PENDING); $object->Update(); $this->ResetLink($original_values); @@ -389,7 +389,7 @@ } // set date of purchase for new listings - $purchased_on = max(adodb_mktime(), $object->GetDBField('ExpiresOn')); + $purchased_on = max(time(), $object->GetDBField('ExpiresOn')); if (!$object->isLoaded()) { $object->SetDBField('PurchasedOn_date', $purchased_on); $object->SetDBField('PurchasedOn_time', $purchased_on); @@ -494,7 +494,7 @@ $object->Load($listing_id); // moved enhancement period to time admin approved enhancement - $time_diff = adodb_mktime() - $object->GetDBField('PurchasedOn'); + $time_diff = time() - $object->GetDBField('PurchasedOn'); $object->SetDBField('PurchasedOn_date', $object->GetDBField('PurchasedOn_date') + $time_diff); $object->SetDBField('PurchasedOn_time', $object->GetDBField('PurchasedOn_time') + $time_diff); $object->SetDBField('ExpiresOn_date', $object->GetDBField('ExpiresOn_date') + $time_diff); @@ -626,7 +626,7 @@ $duration = $lst_object->GetDBField('Duration'); $duration_type = $lst_object->GetDBField('DurationType'); $expiration_interval = $duration * $dur_type_mapping[$duration_type]; - $renewal_begins = max(adodb_mktime(), $object->GetDBField('ExpiresOn')); + $renewal_begins = max(time(), $object->GetDBField('ExpiresOn')); $expiration_date = $renewal_begins + $expiration_interval; $object->SetDBField('ExpiresOn_date', $expiration_date); @@ -760,7 +760,7 @@ $links_config = $this->Application->getUnitConfig('l'); $sql = 'SELECT ListingId FROM '.$config->getTableName().' - WHERE ExpiresOn < '.adodb_mktime().' AND Status = 1'; + WHERE ExpiresOn < '.time().' AND Status = 1'; $expired_listings = $this->Conn->GetCol($sql); if(is_array($expired_listings) && count($expired_listings) > 0) { @@ -788,7 +788,7 @@ LEFT JOIN '.$links_config->getTableName().' l ON ls.ItemResourceId = l.ResourceId WHERE ls.Status = 1 - AND ls.ExpiresOn < '.adodb_mktime().' + lst.RenewalReminder * 3600 *24 + AND ls.ExpiresOn < '.time().' + lst.RenewalReminder * 3600 *24 AND ls.RenewalReminderSent = 0'; $res = $this->Conn->Query($sql); if(is_array($res) && count($res) > 0) Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -N -r15900 -r15926 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15900) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15926) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.1-B1'), '5.2.1-B2' => Array ('Core' => '5.2.1-B2'), '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), + '5.3.0-B1' => Array ('Core' => '5.3.0-B1'), ); } Index: branches/5.3.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15808 -r15926 --- branches/5.3.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15808) +++ branches/5.3.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15926) @@ -1,6 +1,6 @@ Application->isAdminUser ) { - $object->addFilter('expire_filter', '(Expire > ' . adodb_mktime() . ' OR Expire IS NULL)'); + $object->addFilter('expire_filter', '(Expire > ' . time() . ' OR Expire IS NULL)'); } if ( substr($event->Special, 0, 10) == 'duplicates' ) { Index: branches/5.3.x/units/links/link_tag_processor.php =================================================================== diff -u -N -r15696 -r15926 --- branches/5.3.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 15696) +++ branches/5.3.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 15926) @@ -1,6 +1,6 @@ Conn->GetOne($sql) * 3600 * 24; - return ($listing_info['ExpiresOn'] - adodb_mktime() < $renewal_interval) ? 1 : 0; + return ($listing_info['ExpiresOn'] - time() < $renewal_interval) ? 1 : 0; } function FirstListingType($params) @@ -224,8 +224,8 @@ $link_visit->Load( Array ('ResourceId' => $resource_id, 'PortalUserId' => $user_id) ); if ($link_visit->isLoaded()) { // for existing visits update date - $link_visit->SetDBField('VisitTimestamp_date', adodb_mktime()); - $link_visit->SetDBField('VisitTimestamp_time', adodb_mktime()); + $link_visit->SetDBField('VisitTimestamp_date', time()); + $link_visit->SetDBField('VisitTimestamp_time', time()); } else { // for new visits set user & link, visit will be set as default value @@ -323,7 +323,7 @@ $display_format = $lang->GetDBField('DateFormat'); } - return adodb_date($display_format, $link_visit); + return date($display_format, $link_visit); } return $link_visit;