Index: branches/5.3.x/core/install/install_toolkit.php =================================================================== diff -u -r15919 -r15928 --- branches/5.3.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15919) +++ branches/5.3.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15928) @@ -1,6 +1,6 @@ $object->GetID(), 'RatingValue' => $rating, 'IPAddress' => $this->Application->getClientIp(), - 'CreatedOn' => adodb_mktime(), + 'CreatedOn' => time(), ); $this->Conn->doInsert($fields_hash, TABLE_PREFIX.'CatalogRatings'); @@ -219,7 +219,7 @@ /*function purgeVotes() { - $expired = adodb_mktime() - 86400 * $this->Application->ConfigValue('Timeout_Rating'); // 3600 + $expired = time() - 86400 * $this->Application->ConfigValue('Timeout_Rating'); // 3600 $sql = 'DELETE FROM ' . TABLE_PREFIX . 'CatalogRatings WHERE CreatedOn < ' . $expired; Index: branches/5.3.x/core/kernel/session/session_storage.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/session/session_storage.php (.../session_storage.php) (revision 15902) +++ branches/5.3.x/core/kernel/session/session_storage.php (.../session_storage.php) (revision 15928) @@ -1,7 +1,7 @@ IDField . ' FROM ' . $this->TableName . ' - WHERE ' . $this->TimestampField . ' > ' . adodb_mktime(); + WHERE ' . $this->TimestampField . ' > ' . time(); return $this->Conn->GetCol($sql); } Index: branches/5.3.x/core/units/helpers/count_helper.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/helpers/count_helper.php (.../count_helper.php) (revision 15902) +++ branches/5.3.x/core/units/helpers/count_helper.php (.../count_helper.php) (revision 15928) @@ -1,6 +1,6 @@ Conn->doInsert($count_data, TABLE_PREFIX.'Counters', 'REPLACE'); } @@ -108,7 +108,7 @@ // reset expired counts $sql = 'UPDATE '.TABLE_PREFIX.'Counters SET CountValue = NULL - WHERE (LifeTime > 0) AND (LastCounted < '.adodb_mktime().' - LifeTime)'; + WHERE (LifeTime > 0) AND (LastCounted < '.time().' - LifeTime)'; $this->Conn->Query($sql); $reset = true; } @@ -160,7 +160,7 @@ $where_clauses[] = 'item_table.Status = ' . STATUS_ACTIVE; if ( isset($params['today']) && $params['today'] ) { - $today = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), adodb_date('Y')); + $today = mktime(0, 0, 0, date('m'), date('d'), date('Y')); $where_clauses[] = 'item_table.CreatedOn >= ' . $today; } @@ -200,7 +200,7 @@ list ($sql, $where_clause) = $this->attachViewPermissionCheck($prefix, $sql, $where_clause, 'ci.CategoryId'); if ( $today ) { - $today_date = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), adodb_date('Y')); + $today_date = mktime(0, 0, 0, date('m'), date('d'), date('Y')); $where_clause[] = 'item_table.CreatedOn >= ' . $today_date; } @@ -220,7 +220,7 @@ $cache_key = 'category_count[%CSerial%]'; if ( $today ) { - $today_date = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), adodb_date('Y')); + $today_date = mktime(0, 0, 0, date('m'), date('d'), date('Y')); $cache_key .= ':date=' . $today_date; } Index: branches/5.3.x/core/install/upgrades.php =================================================================== diff -u -r15910 -r15928 --- branches/5.3.x/core/install/upgrades.php (.../upgrades.php) (revision 15910) +++ branches/5.3.x/core/install/upgrades.php (.../upgrades.php) (revision 15928) @@ -1,6 +1,6 @@ 0, 'FromRevisionId' => 0, 'CreatedById' => USER_ROOT, - 'CreatedOn' => adodb_mktime(), + 'CreatedOn' => time(), 'Status' => STATUS_ACTIVE, ); Index: branches/5.3.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r15911 -r15928 --- branches/5.3.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15911) +++ branches/5.3.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ $phrase_prefix) { if (strpos($format, $format_char) === false) { unset($replacements[$format_char]); continue; } - $replacements[$format_char] = $this->Application->Phrase($phrase_prefix . adodb_date($format_char, $date)); + $replacements[$format_char] = $this->Application->Phrase($phrase_prefix . date($format_char, $date)); $format = str_replace($format_char, '#' . ord($format_char) . '#', $format); } - $date_formatted = adodb_date($format, $date); + $date_formatted = date($format, $date); - // unescape formats, that are resolved to words by adodb_date + // unescape formats, that are resolved to words by `date` foreach ($replacements as $format_char => $format_replacement) { $date_formatted = str_replace('#' . ord($format_char) . '#', $format_replacement, $date_formatted); } Index: branches/5.3.x/core/kernel/session/session.php =================================================================== diff -u -r15912 -r15928 --- branches/5.3.x/core/kernel/session/session.php (.../session.php) (revision 15912) +++ branches/5.3.x/core/kernel/session/session.php (.../session.php) (revision 15928) @@ -1,6 +1,6 @@ SetCookie('cookies_on', 1, adodb_mktime() + 31104000); //one year should be enough + $this->SetCookie('cookies_on', 1, time() + 31104000); //one year should be enough } } else { @@ -371,7 +371,7 @@ */ function SetCookie($name, $value, $expires = null) { - if (isset($expires) && $expires < adodb_mktime()) { + if (isset($expires) && $expires < time()) { unset($this->Application->HttpQuery->Cookie[$name]); } else { @@ -394,7 +394,7 @@ foreach ($old_style_domains as $old_style_domain) { if ($this->CookieDomain != $old_style_domain) { // new style cookie domain -> delete old style cookie to prevent infinite redirect - setcookie($name, $encrypted_value, adodb_mktime() - 3600, $this->CookiePath, $old_style_domain, $this->CookieSecure, true); + setcookie($name, $encrypted_value, time() - 3600, $this->CookiePath, $old_style_domain, $this->CookieSecure, true); } } @@ -426,7 +426,7 @@ $this->Expiration = $this->Storage->GetExpiration(); // If session has expired - if ($this->Expiration < adodb_mktime()) { + if ($this->Expiration < time()) { // when expired session is loaded, then SID is // not assigned, but used in Destroy method $this->SID = $sid; @@ -572,7 +572,7 @@ return true; } - $this->Expiration = adodb_mktime() + $this->SessionTimeout; + $this->Expiration = time() + $this->SessionTimeout; if ( !$force && /*!$this->Application->isAdmin &&*/ !$this->Application->GetVar('admin') && !$this->NeedSession() ) { // don't create session (in db) on Front-End, when sid is present (GPC), but data in db isn't Index: branches/5.3.x/core/units/phrases/phrases_event_handler.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 15698) +++ branches/5.3.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ SetDBField('PhraseType', $this->_getPhraseType($label)); if ( $this->translationChanged($object) ) { - $object->SetDBField('LastChanged_date', adodb_mktime() ); - $object->SetDBField('LastChanged_time', adodb_mktime() ); + $object->SetDBField('LastChanged_date', time() ); + $object->SetDBField('LastChanged_time', time() ); $object->SetDBField('LastChangeIP', $this->Application->getClientIp()); } Index: branches/5.3.x/core/units/languages/languages_event_handler.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 15698) +++ branches/5.3.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ getFieldByName($field); foreach ($field_options['options'] as $option_key => $option_title) { - $field_options['options'][$option_key] .= ' (' . adodb_date($option_key) . ')'; + $field_options['options'][$option_key] .= ' (' . date($option_key) . ')'; } $config->addFields($field_options, $field); Index: branches/5.3.x/core/units/forms/forms/forms_eh.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15902) +++ branches/5.3.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15928) @@ -1,6 +1,6 @@ SetDBFieldsFromHash($submission_fields); $form_submission->SetDBField('FormId', $form_id); $form_submission->SetDBField('MessageId', $fields_hash['MessageId']); - $form_submission->SetDBField('SubmissionTime_date', adodb_mktime()); - $form_submission->SetDBField('SubmissionTime_time', adodb_mktime()); + $form_submission->SetDBField('SubmissionTime_date', time()); + $form_submission->SetDBField('SubmissionTime_time', time()); $form_submission->SetDBField('ReferrerURL', $this->Application->Phrase('la_Text_Email')); return $form_submission->Create(); Index: branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15902) +++ branches/5.3.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15928) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ - $now = adodb_mktime(); + $now = time(); $sent_status = $object->GetDBField('SentStatus'); if (($event->Special != 'merge') && ($sent_status == SUBMISSION_LOG_SENT) && ($sent_status != $object->GetOriginalField('SentStatus'))) { Index: branches/5.3.x/core/units/helpers/page_helper.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/helpers/page_helper.php (.../page_helper.php) (revision 15698) +++ branches/5.3.x/core/units/helpers/page_helper.php (.../page_helper.php) (revision 15928) @@ -1,6 +1,6 @@ $this->Application->GetSID(), - 'Timestamp' => adodb_mktime(), + 'Timestamp' => time(), 'MainPrefix' => $this->_tables->getPrefix(), ); Index: branches/5.3.x/core/units/visits/visits_event_handler.php =================================================================== diff -u -r15677 -r15928 --- branches/5.3.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 15677) +++ branches/5.3.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ - $object->SetDBField('VisitDate_date', adodb_mktime()); - $object->SetDBField('VisitDate_time', adodb_mktime()); + $object->SetDBField('VisitDate_date', time()); + $object->SetDBField('VisitDate_time', time()); $object->SetDBField('Referer', getArrayValue($_SERVER, 'HTTP_REFERER')); $object->SetDBField('IPAddress', $this->Application->getClientIp()); Index: branches/5.3.x/core/units/categories/categories_event_handler.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15902) +++ branches/5.3.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ checkFilename(); $object->generateFilename(); - $now = adodb_mktime(); + $now = time(); if ( !$this->Application->isDebugMode() && strpos($event->Special, 'rebuild') === false ) { $object->SetDBField('Type', $object->GetOriginalField('Type')); Index: branches/5.3.x/core/units/languages/languages_tag_processor.php =================================================================== diff -u -r15483 -r15928 --- branches/5.3.x/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 15483) +++ branches/5.3.x/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ Application->Phrase('lu_weekday_'.adodb_date('l')); + $week_day = $this->Application->Phrase('lu_weekday_' . date('l')); $format = str_replace('l', '#@#', $format); // replace with reserved char (preserves translation link) - return str_replace('#@#', $week_day, adodb_date($format, $date)); + return str_replace('#@#', $week_day, date($format, $date)); } - return adodb_date($format, $date); + return date($format, $date); } function ListLanguages($params) Index: branches/5.3.x/core/units/helpers/minifiers/minify_helper.php =================================================================== diff -u -r15483 -r15928 --- branches/5.3.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 15483) +++ branches/5.3.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 15928) @@ -1,6 +1,6 @@ Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ - return $file_helper->pathToUrl($dst_file) . '?ts=' . adodb_date('Y-m-d_H:i:s', filemtime($dst_file)); + return $file_helper->pathToUrl($dst_file) . '?ts=' . date('Y-m-d_H:i:s', filemtime($dst_file)); } /** Index: branches/5.3.x/core/units/helpers/curl_helper.php =================================================================== diff -u -r15911 -r15928 --- branches/5.3.x/core/units/helpers/curl_helper.php (.../curl_helper.php) (revision 15911) +++ branches/5.3.x/core/units/helpers/curl_helper.php (.../curl_helper.php) (revision 15928) @@ -1,6 +1,6 @@ $this->Application->isAdminUser ? 1 : 0, 'PageData' => implode("\n", $page_data), 'RequestData' => $this->requestData, - 'RequestDate' => adodb_mktime(), + 'RequestDate' => time(), ); $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'CurlLog'); @@ -506,7 +506,7 @@ if ( $this->debugMode ) { $fields_hash = Array ( 'ResponseData' => $this->lastResponse, - 'ResponseDate' => adodb_mktime(), + 'ResponseDate' => time(), 'ResponseHttpCode' => $this->lastHTTPCode, 'CurlError' => $this->lastErrorCode != 0 ? '#' . $this->lastErrorCode . ' (' . $this->lastErrorMsg . ')' : '', ); Index: branches/5.3.x/core/kernel/managers/rewrite_url_processor.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/managers/rewrite_url_processor.php (.../rewrite_url_processor.php) (revision 15902) +++ branches/5.3.x/core/kernel/managers/rewrite_url_processor.php (.../rewrite_url_processor.php) (revision 15928) @@ -1,6 +1,6 @@ (int)$this->Application->siteDomainField('DomainId'), 'Prefixes' => $prefixes ? '|' . implode('|', $prefixes) . '|' : '', 'ParsedVars' => serialize($data), - 'Cached' => adodb_mktime(), + 'Cached' => time(), 'LifeTime' => isset($expiration) && is_numeric($expiration) ? $expiration : -1 ); Index: branches/5.3.x/core/units/helpers/user_helper.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 15902) +++ branches/5.3.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 15928) @@ -1,6 +1,6 @@ Application->RecallPersistentVar('ThisLogin'); $this->Application->StorePersistentVar('LastLogin', $this_login); - $this->Application->StorePersistentVar('ThisLogin', adodb_mktime()); + $this->Application->StorePersistentVar('ThisLogin', time()); } $hook_event = new kEvent('u:OnAfterLogin'); Index: branches/5.3.x/core/units/helpers/spam_helper.php =================================================================== diff -u -r15677 -r15928 --- branches/5.3.x/core/units/helpers/spam_helper.php (.../spam_helper.php) (revision 15677) +++ branches/5.3.x/core/units/helpers/spam_helper.php (.../spam_helper.php) (revision 15928) @@ -1,6 +1,6 @@ Expiration = adodb_mktime() + $expiration; + $this->Expiration = time() + $expiration; } /** @@ -177,7 +177,7 @@ $cache =& $this->ExpirationCache[$this->DataType]; $expires = array_key_exists($this->ResourceId, $cache) ? $cache[$this->ResourceId] : false; - if ( $expires && $expires < adodb_mktime() ) { + if ( $expires && $expires < time() ) { // spam control record is expired $sql = 'DELETE FROM ' . $this->TableName . ' WHERE ' . $key_clause; Index: branches/5.3.x/core/units/helpers/search_helper.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 15698) +++ branches/5.3.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 15928) @@ -1,6 +1,6 @@ _getInputTimeFormat($options); if ( $time_format ) { // time is missing, but time format available -> guess time and add to date - $time = ($type == 'from') ? adodb_mktime(0, 0, 0) : adodb_mktime(23, 59, 59); - $time = adodb_date($time_format, $time); + $time = ($type == 'from') ? mktime(0, 0, 0) : mktime(23, 59, 59); + $time = date($time_format, $time); $value[$type] .= $dt_separator . $time; } } Index: branches/5.3.x/core/kernel/db/cat_event_handler.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15902) +++ branches/5.3.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ GetChangedFields() ) { - $now = adodb_mktime(); + $now = time(); $object->SetDBField('Modified_date', $now); $object->SetDBField('Modified_time', $now); $object->SetDBField('ModifiedById', $this->Application->RecallVar('user_id')); @@ -1766,7 +1766,7 @@ if ($keywords[$field]) { if (in_array($keywords[$field], Array('today', 'yesterday'))) { $current_time = getdate(); - $day_begin = adodb_mktime(0, 0, 0, $current_time['mon'], $current_time['mday'], $current_time['year']); + $day_begin = mktime(0, 0, 0, $current_time['mon'], $current_time['mday'], $current_time['year']); $time_mapping = Array('today' => $day_begin, 'yesterday' => ($day_begin - 86400)); $min_time = $time_mapping[$keywords[$field]]; } @@ -1775,7 +1775,7 @@ 'last_week' => 604800, 'last_month' => 2628000, 'last_3_months' => 7884000, 'last_6_months' => 15768000, 'last_year' => 31536000, ); - $min_time = adodb_mktime() - $time_mapping[$keywords[$field]]; + $min_time = time() - $time_mapping[$keywords[$field]]; } $condition = $field_name.' > '.$min_time; } Index: branches/5.3.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15902) +++ branches/5.3.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ TableName . ' - WHERE (ParentPath LIKE "' . $object->GetDBField('ParentPath') . '%") AND (CreatedOn > ' . (adodb_mktime() - 86400) . ')'; + WHERE (ParentPath LIKE "' . $object->GetDBField('ParentPath') . '%") AND (CreatedOn > ' . (time() - 86400) . ')'; return $this->Conn->GetOne($sql) - 1; } @@ -865,7 +865,7 @@ } } - return adodb_date($format, $date); + return date($format, $date); } function CategoryItemCount($params) Index: branches/5.3.x/core/units/helpers/deployment_helper.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/helpers/deployment_helper.php (.../deployment_helper.php) (revision 15902) +++ branches/5.3.x/core/units/helpers/deployment_helper.php (.../deployment_helper.php) (revision 15928) @@ -1,6 +1,6 @@ dryRun = $dry_run; - $this->toLog(PHP_EOL . '[' . adodb_date('Y-m-d H:i:s') . '] === ' . $this->ip . ' ==='); + $this->toLog(PHP_EOL . '[' . date('Y-m-d H:i:s') . '] === ' . $this->ip . ' ==='); foreach ($this->Application->ModuleInfo as $module_name => $module_info) { $this->moduleName = $module_name; Index: branches/5.3.x/core/units/content/content_eh.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15902) +++ branches/5.3.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15928) @@ -1,6 +1,6 @@ Update(); if ( $updated ) { - $revision->SetDBField('AutoSavedOn_date', adodb_mktime()); - $revision->SetDBField('AutoSavedOn_time', adodb_mktime()); + $revision->SetDBField('AutoSavedOn_date', time()); + $revision->SetDBField('AutoSavedOn_time', time()); $revision->Update(); } Index: branches/5.3.x/core/kernel/db/cat_tag_processor.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/db/cat_tag_processor.php (.../cat_tag_processor.php) (revision 15902) +++ branches/5.3.x/core/kernel/db/cat_tag_processor.php (.../cat_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ _getStylesheetPath() . DIRECTORY_SEPARATOR . 'admin-' . mb_strtolower($object->GetDBField('Name')) . '-' . $compile_ts . '.css'; $fp = fopen($css_file, 'w'); Index: branches/5.3.x/core/units/users/users_event_handler.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15902) +++ branches/5.3.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15928) @@ -1,6 +1,6 @@ GetChangedFields()); if ( $changed_fields && !in_array('Modified', $changed_fields) ) { - $object->SetDBField('Modified_date', adodb_mktime()); - $object->SetDBField('Modified_time', adodb_mktime()); + $object->SetDBField('Modified_date', time()); + $object->SetDBField('Modified_time', time()); } if ( !$this->Application->isAdmin && in_array('Email', $changed_fields) && ($event->Special != 'email-restore') ) { @@ -1025,7 +1025,7 @@ function OnCheckExpiredMembership($event) { // send pre-expiration reminders: begin - $pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24; + $pre_expiration = time() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24; $sql = 'SELECT PortalUserId, GroupId FROM '.TABLE_PREFIX.'UserGroupRelations WHERE (MembershipExpires IS NOT NULL) AND (ExpirationReminderSent = 0) AND (MembershipExpires < '.$pre_expiration.')'; @@ -1053,7 +1053,7 @@ // remove users from groups with expired membership: begin $sql = 'SELECT PortalUserId FROM '.TABLE_PREFIX.'UserGroupRelations - WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.adodb_mktime().')'; + WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')'; $user_ids = $this->Conn->GetCol($sql); if ($user_ids) { foreach ($user_ids as $id) { @@ -1062,7 +1062,7 @@ } } $sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroupRelations - WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.adodb_mktime().')'; + WHERE (MembershipExpires IS NOT NULL) AND (MembershipExpires < '.time().')'; $this->Conn->Query($sql); // remove users from groups with expired membership: end } Index: branches/5.3.x/core/kernel/processors/main_processor.php =================================================================== diff -u -r15907 -r15928 --- branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15907) +++ branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15928) @@ -1,6 +1,6 @@ Fields as $field => $options) { if ( array_key_exists('default', $options) && $options['default'] === '#NOW#' ) { - $this->Fields[$field]['default'] = adodb_mktime(); + $this->Fields[$field]['default'] = time(); } } } Index: branches/5.3.x/core/kernel/utility/formatters/date_formatter.php =================================================================== diff -u -r15483 -r15928 --- branches/5.3.x/core/kernel/utility/formatters/date_formatter.php (.../date_formatter.php) (revision 15483) +++ branches/5.3.x/core/kernel/utility/formatters/date_formatter.php (.../date_formatter.php) (revision 15928) @@ -1,6 +1,6 @@ SetDBField($sub_fields['time'], $empty_time); } elseif ( $object->GetDBField($sub_fields['time']) != '' && $object->GetDBField($sub_fields['date']) == '' ) { // when date is not supplied, then use "1970-01-01 00:00:00" instead (or unit config override) $empty_date = getArrayValue($options, 'empty_date'); if ( $empty_date === false ) { - $empty_date = adodb_mktime(0, 0, 0, 1, 1, 1970); + $empty_date = mktime(0, 0, 0, 1, 1, 1970); } $object->SetDBField($sub_fields['date'], $empty_date); } @@ -265,7 +265,7 @@ } if (!$options['use_timezone']) { - return adodb_gmdate($options['format'], $value); + return gmdate($options['format'], $value); } $format = defined($options['format']) ? constant($options['format']) : $options['format']; @@ -275,7 +275,7 @@ $format = trim($format, $dt_separator); } - return adodb_date($format, $value); + return date($format, $value); } function HumanFormat($format) @@ -373,7 +373,7 @@ $format = $options['input_format']; if ($dt_separator) $format = trim($format, $dt_separator); - $error_params = Array( $this->HumanFormat($format), adodb_date($format), 'value' => $value ); + $error_params = Array( $this->HumanFormat($format), date($format), 'value' => $value ); $hour = 0; $minute = 0; @@ -496,14 +496,14 @@ } if (!$options['use_timezone']) { - return adodb_gmmktime($hour, $minute, $second, $month, $day, $year); + return gmmktime($hour, $minute, $second, $month, $day, $year); } - return adodb_mktime($hour, $minute, $second, $month, $day, $year); + return mktime($hour, $minute, $second, $month, $day, $year); } function GetSample($field, &$options, &$object) { - return $this->Format( adodb_mktime(), $field, $object, $options['input_format']); + return $this->Format( time(), $field, $object, $options['input_format']); } } \ No newline at end of file Index: branches/5.3.x/core/kernel/startup.php =================================================================== diff -u -r15919 -r15928 --- branches/5.3.x/core/kernel/startup.php (.../startup.php) (revision 15919) +++ branches/5.3.x/core/kernel/startup.php (.../startup.php) (revision 15928) @@ -1,6 +1,6 @@ AttachToApplication(); } - if( !function_exists('adodb_mktime') ) { - include_once(KERNEL_PATH . '/utility/adodb-time.inc.php'); - } - // system users define('USER_ROOT', -1); define('USER_GUEST', -2); \ No newline at end of file Index: branches/5.3.x/core/kernel/db/db_load_balancer.php =================================================================== diff -u -r15922 -r15928 --- branches/5.3.x/core/kernel/db/db_load_balancer.php (.../db_load_balancer.php) (revision 15922) +++ branches/5.3.x/core/kernel/db/db_load_balancer.php (.../db_load_balancer.php) (revision 15928) @@ -1,6 +1,6 @@ Application->setCache($cache_key, $times, $expiry); // but don't give the timestamp to the caller Index: branches/5.3.x/core/units/users/users_tag_processor.php =================================================================== diff -u -r15677 -r15928 --- branches/5.3.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 15677) +++ branches/5.3.x/core/units/users/users_tag_processor.php (.../users_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ getCachedCode(); $user->SetDBField('PwResetConfirm', $code); - $user->SetDBField('PwRequestTime_date', adodb_mktime()); - $user->SetDBField('PwRequestTime_time', adodb_mktime()); + $user->SetDBField('PwRequestTime_date', time()); + $user->SetDBField('PwRequestTime_time', time()); if ( $user->GetChangedFields() ) { // tag is called 2 times within USER.PWDC email event, so don't update user record twice @@ -269,8 +269,8 @@ $code = $this->getCachedCode(); $object->SetDBField('PwResetConfirm', $code); - $object->SetDBField('PwRequestTime_date', adodb_mktime()); - $object->SetDBField('PwRequestTime_time', adodb_mktime()); + $object->SetDBField('PwRequestTime_date', time()); + $object->SetDBField('PwRequestTime_time', time()); $object->Update(); $params['user_key'] = $code; Index: branches/5.3.x/core/kernel/db/dbitem.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15902) +++ branches/5.3.x/core/kernel/db/dbitem.php (.../dbitem.php) (revision 15928) @@ -1,6 +1,6 @@ $this->Prefix, 'ItemId' => $this->GetID(), - 'OccuredOn' => adodb_mktime(), + 'OccuredOn' => time(), 'MasterPrefix' => $main_prefix, 'Action' => $mode, ); Index: branches/5.3.x/core/units/users/users_item.php =================================================================== diff -u -r15677 -r15928 --- branches/5.3.x/core/units/users/users_item.php (.../users_item.php) (revision 15677) +++ branches/5.3.x/core/units/users/users_item.php (.../users_item.php) (revision 15928) @@ -1,6 +1,6 @@ GetID() . ') AND ( (MembershipExpires IS NULL) OR (MembershipExpires >= ' . adodb_mktime() . ') ) + WHERE (PortalUserId = ' . $this->GetID() . ') AND ( (MembershipExpires IS NULL) OR (MembershipExpires >= ' . time() . ') ) ORDER BY IF(GroupId = ' . $this->GetDBField('PrimaryGroupId') . ', 1, 0) DESC'; $groups = $this->Conn->GetCol($sql); Index: branches/5.3.x/core/units/helpers/mailing_list_helper.php =================================================================== diff -u -r15916 -r15928 --- branches/5.3.x/core/units/helpers/mailing_list_helper.php (.../mailing_list_helper.php) (revision 15916) +++ branches/5.3.x/core/units/helpers/mailing_list_helper.php (.../mailing_list_helper.php) (revision 15928) @@ -1,6 +1,6 @@ Conn->Query($sql); } Index: branches/5.3.x/core/kernel/nparser/template_cache.php =================================================================== diff -u -r15640 -r15928 --- branches/5.3.x/core/kernel/nparser/template_cache.php (.../template_cache.php) (revision 15640) +++ branches/5.3.x/core/kernel/nparser/template_cache.php (.../template_cache.php) (revision 15928) @@ -1,6 +1,6 @@ $filename, 'Data' => &$compiled_template, - 'Cached' => adodb_mktime(), + 'Cached' => time(), ); $this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'SystemCache', 'REPLACE'); Index: branches/5.3.x/core/kernel/session/inp_session_storage.php =================================================================== diff -u -r15677 -r15928 --- branches/5.3.x/core/kernel/session/inp_session_storage.php (.../inp_session_storage.php) (revision 15677) +++ branches/5.3.x/core/kernel/session/inp_session_storage.php (.../inp_session_storage.php) (revision 15928) @@ -1,7 +1,7 @@ DirectVars['LastAccessed'] > $this->SessionTimeout/10) { $this->SetField($this->TimestampField, $time + $this->SessionTimeout); @@ -68,7 +68,7 @@ function GetExpiredSIDs() { - $query = ' SELECT '.$this->IDField.' FROM '.$this->TableName.' WHERE '.$this->TimestampField.' < '.(adodb_mktime()); + $query = ' SELECT '.$this->IDField.' FROM '.$this->TableName.' WHERE '.$this->TimestampField.' < '.(time()); $ret = $this->Conn->GetCol($query); if($ret) { $this->DeleteEditTables(); Index: branches/5.3.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -r15910 -r15928 --- branches/5.3.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15910) +++ branches/5.3.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15928) @@ -1,6 +1,6 @@ GetDBField('TimeFormat')); for ($i = 0; $i <= 23; $i++) { - $ret[$i] = adodb_date($short_time_format, adodb_mktime($i, 0, 0)) . ' (' . $i . ')'; + $ret[$i] = date($short_time_format, mktime($i, 0, 0)) . ' (' . $i . ')'; } } elseif ( $field_type == self::DAY ) { @@ -324,7 +324,7 @@ $date = TIMENOW; } - $next_run = strtotime('-' . (int)adodb_date('s', $date) . ' seconds', $date); + $next_run = strtotime('-' . (int)date('s', $date) . ' seconds', $date); $expression_parts = explode(' ', $expression); $cron_field = new kCronField(); @@ -570,7 +570,7 @@ $mapping[$field_type] = in_array(7, str_split($rule)) ? 'N' : 'w'; } - return (int)adodb_date($mapping[$field_type], $date); + return (int)date($mapping[$field_type], $date); } /** @@ -658,22 +658,22 @@ { if ( $field_type == kCronHelper::MONTH || $field_type == kCronHelper::WEEKDAY || $field_type == kCronHelper::DAY ) { if ( $inverse ) { - $date = strtotime(adodb_date('Y-m-d 23:59:59', $date)); + $date = strtotime(date('Y-m-d 23:59:59', $date)); // set time 23:59:00 } else { // set time 00:00:00 - $date = strtotime(adodb_date('Y-m-d 00:00:00', $date)); + $date = strtotime(date('Y-m-d 00:00:00', $date)); } } elseif ( $field_type == kCronHelper::HOUR ) { if ( $inverse ) { // set time :59:00 - $date = strtotime(adodb_date('Y-m-d H:59:59', $date)); + $date = strtotime(date('Y-m-d H:59:59', $date)); } else { // set time :00:00 - $date = strtotime(adodb_date('Y-m-d H:00:00', $date)); + $date = strtotime(date('Y-m-d H:00:00', $date)); } } Index: branches/5.3.x/core/units/stylesheets/stylesheets_item.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/stylesheets/stylesheets_item.php (.../stylesheets_item.php) (revision 15698) +++ branches/5.3.x/core/units/stylesheets/stylesheets_item.php (.../stylesheets_item.php) (revision 15928) @@ -1,6 +1,6 @@ GetDBField('AdvancedCSS'); - $compile_ts = adodb_mktime(); + $compile_ts = time(); $css_path = WRITEABLE . '/stylesheets/'; $file_helper = $this->Application->recallObject('FileHelper'); Index: branches/5.3.x/core/kernel/managers/cache_manager.php =================================================================== diff -u -r15919 -r15928 --- branches/5.3.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 15919) +++ branches/5.3.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 15928) @@ -1,6 +1,6 @@ implode(',', $this->Application->Phrases->Ids), - 'CacheDate' => adodb_mktime(), + 'CacheDate' => time(), 'Template' => md5( $this->getCacheKey() ), 'ConfigVariables' => implode(',', array_unique($this->configIDs)), ); @@ -340,7 +340,7 @@ $this->getToCache() ); - $cache_rebuild_by = SERVER_NAME . ' (' . $this->Application->getClientIp() . ') - ' . adodb_date('d/m/Y H:i:s'); + $cache_rebuild_by = SERVER_NAME . ' (' . $this->Application->getClientIp() . ') - ' . date('d/m/Y H:i:s'); if ($this->Application->isCachingType(CACHING_TYPE_MEMORY)) { $this->Application->setCache('master:configs_parsed', serialize($cache)); @@ -650,7 +650,7 @@ $lifetime = (int)$cached_data[$name]['LifeTime']; // in seconds - if ( ($lifetime > 0) && ($cached_data[$name]['Cached'] + $lifetime < adodb_mktime()) ) { + if ( ($lifetime > 0) && ($cached_data[$name]['Cached'] + $lifetime < time()) ) { // delete expired $this->Conn->nextQueryCachable = true; @@ -704,7 +704,7 @@ $fields_hash = Array ( 'VarName' => $name, 'Data' => &$value, - 'Cached' => adodb_mktime(), + 'Cached' => time(), 'LifeTime' => (int)$expiration, ); Index: branches/5.3.x/core/kernel/managers/scheduled_task_manager.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/kernel/managers/scheduled_task_manager.php (.../scheduled_task_manager.php) (revision 15698) +++ branches/5.3.x/core/kernel/managers/scheduled_task_manager.php (.../scheduled_task_manager.php) (revision 15928) @@ -1,6 +1,6 @@ 0 AND ' . adodb_mktime() . ' - LastRunOn > Timeout'; + $timeout_clause = 'LastRunStatus = ' . ScheduledTask::LAST_RUN_RUNNING . ' AND Timeout > 0 AND ' . time() . ' - LastRunOn > Timeout'; $sql = 'SELECT * FROM ' . $this->Application->getUnitConfig('scheduled-task')->getTableName() . ' @@ -135,12 +135,12 @@ // remember LastTimeoutOn only for events that are still running and will be reset if ( $event_data['LastRunStatus'] == ScheduledTask::LAST_RUN_RUNNING ) { - $this->update($event_data, Array ('LastTimeoutOn' => adodb_mktime())); + $this->update($event_data, Array ('LastTimeoutOn' => time())); } $next_run = (int)$event_data['NextRunOn']; - if ($next_run && ($next_run > adodb_mktime())) { + if ($next_run && ($next_run > time())) { continue; } @@ -169,7 +169,7 @@ $cron_helper = $this->Application->recallObject('kCronHelper'); /* @var $cron_helper kCronHelper */ - $start_time = adodb_mktime(); + $start_time = time(); // remember, when scheduled task execution started $fields_hash = Array ( @@ -189,7 +189,7 @@ $event->MasterEvent = new kEvent('scheduled-task:OnRun'); $this->Application->HandleEvent($event); - $now = adodb_mktime(); + $now = time(); $next_run = $cron_helper->getMatch($scheduled_task_data['RunSchedule'], $start_time); while ($next_run < $now) { Index: branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 15902) +++ branches/5.3.x/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 15928) @@ -1,6 +1,6 @@ Application->RecallVar('user_id') + date('Ymd-His'), $unit_prefix, 'u' . $this->Application->RecallVar('user_id') ); return str_replace($replace_from, $replace_to, $option); Index: branches/5.3.x/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r15914 -r15928 --- branches/5.3.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 15914) +++ branches/5.3.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ Application->ConfigValue('FirstDayOfWeek'); if ( $fdow && $w == 0 ) { $w = 7; } - $today_start = adodb_mktime(0, 0, 0, adodb_date('m'), adodb_date('d'), $y); + + $today_start = mktime(0, 0, 0, date('m'), date('d'), $y); $first_day_of_this_week = $today_start - ($w - $fdow) * 86400; - $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y); + $first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y); $this_quater = ceil($m / 3); - $this_quater_start = adodb_mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y); + $this_quater_start = mktime(0, 0, 0, $this_quater * 3 - 2, 1, $y); switch ( $params['type'] ) { case 'last_week_start': @@ -535,31 +536,31 @@ break; case 'last_month_start': - $timestamp = $m == 1 ? adodb_mktime(0, 0, 0, 12, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 1, 1, $y); + $timestamp = $m == 1 ? mktime(0, 0, 0, 12, 1, $y - 1) : mktime(0, 0, 0, $m - 1, 1, $y); break; case 'last_month_end': - $timestamp = $first_day_of_this_month = adodb_mktime(0, 0, 0, $m, 1, $y) - 1; + $timestamp = $first_day_of_this_month = mktime(0, 0, 0, $m, 1, $y) - 1; break; case 'last_quater_start': - $timestamp = $this_quater == 1 ? adodb_mktime(0, 0, 0, 10, 1, $y - 1) : adodb_mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y); + $timestamp = $this_quater == 1 ? mktime(0, 0, 0, 10, 1, $y - 1) : mktime(0, 0, 0, ($this_quater - 1) * 3 - 2, 1, $y); break; case 'last_quater_end': $timestamp = $this_quater_start - 1; break; case 'last_6_months_start': - $timestamp = $m <= 6 ? adodb_mktime(0, 0, 0, $m + 6, 1, $y - 1) : adodb_mktime(0, 0, 0, $m - 6, 1, $y); + $timestamp = $m <= 6 ? mktime(0, 0, 0, $m + 6, 1, $y - 1) : mktime(0, 0, 0, $m - 6, 1, $y); break; case 'last_year_start': - $timestamp = adodb_mktime(0, 0, 0, 1, 1, $y - 1); + $timestamp = mktime(0, 0, 0, 1, 1, $y - 1); break; case 'last_year_end': - $timestamp = adodb_mktime(23, 59, 59, 12, 31, $y - 1); + $timestamp = mktime(23, 59, 59, 12, 31, $y - 1); break; default: @@ -577,7 +578,7 @@ $format = $lang->GetDBField($regs[1]); } - return adodb_date($format, $timestamp); + return date($format, $timestamp); } return $timestamp; Index: branches/5.3.x/core/units/statistics/statistics_tag_processor.php =================================================================== diff -u -r15698 -r15928 --- branches/5.3.x/core/units/statistics/statistics_tag_processor.php (.../statistics_tag_processor.php) (revision 15698) +++ branches/5.3.x/core/units/statistics/statistics_tag_processor.php (.../statistics_tag_processor.php) (revision 15928) @@ -1,6 +1,6 @@ PostFormatting, array_shift($values)); + $value = date($this->PostFormatting, array_shift($values)); break; } $this->PostFormatting = false; Index: branches/5.3.x/core/kernel/constants.php =================================================================== diff -u -r15916 -r15928 --- branches/5.3.x/core/kernel/constants.php (.../constants.php) (revision 15916) +++ branches/5.3.x/core/kernel/constants.php (.../constants.php) (revision 15928) @@ -1,6 +1,6 @@ adodb_mktime(), + 'SessionStart' => time(), 'IP' => $this->Application->getClientIp(), 'PortalUserId' => $this->Application->RecallVar('user_id'), 'SessionId' => $this->Application->GetSID(), @@ -64,7 +64,7 @@ } $fields_hash = Array ( - 'SessionEnd' => adodb_mktime(), + 'SessionEnd' => time(), 'Status' => SESSION_LOG_LOGGED_OUT, ); Index: branches/5.3.x/core/kernel/application.php =================================================================== diff -u -r15919 -r15928 --- branches/5.3.x/core/kernel/application.php (.../application.php) (revision 15919) +++ branches/5.3.x/core/kernel/application.php (.../application.php) (revision 15928) @@ -1,6 +1,6 @@ _updateAverageStatistics($data, 'SqlCount', $query_statistics['count']); $data['Hits']++; - $data['LastHit'] = adodb_mktime(); + $data['LastHit'] = time(); $this->Conn->doUpdate($data, TABLE_PREFIX . 'StatisticsCapture', 'StatisticsId = ' . $data['StatisticsId']); } @@ -1257,7 +1257,7 @@ $data['SqlCountMin'] = $data['SqlCountAvg'] = $data['SqlCountMax'] = $query_statistics['count']; $data['TemplateName'] = $this->GetVar('t'); $data['Hits'] = 1; - $data['LastHit'] = adodb_mktime(); + $data['LastHit'] = time(); $this->Conn->doInsert($data, TABLE_PREFIX . 'StatisticsCapture'); } } @@ -1309,7 +1309,7 @@ $data['TemplateNames'] = implode(',', array_unique($template_names)); $data['Hits']++; - $data['LastHit'] = adodb_mktime(); + $data['LastHit'] = time(); $this->Conn->doUpdate($data, TABLE_PREFIX . 'SlowSqlCapture', 'CaptureId = ' . $data['CaptureId']); } @@ -1319,7 +1319,7 @@ $data['QueryCrc'] = $query_crc; $data['TemplateNames'] = $this->GetVar('t'); $data['Hits'] = 1; - $data['LastHit'] = adodb_mktime(); + $data['LastHit'] = time(); $this->Conn->doInsert($data, TABLE_PREFIX . 'SlowSqlCapture'); } Index: branches/5.3.x/core/units/page_revisions/page_revision_eh.php =================================================================== diff -u -r15810 -r15928 --- branches/5.3.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15810) +++ branches/5.3.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15928) @@ -1,6 +1,6 @@ GetDBField('IsDraft') == 0 && $object->GetOriginalField('IsDraft') == 1 ) { - $object->SetDBField('CreatedOn_date', adodb_mktime()); - $object->SetDBField('CreatedOn_time', adodb_mktime()); + $object->SetDBField('CreatedOn_date', time()); + $object->SetDBField('CreatedOn_time', time()); } } Index: branches/5.3.x/core/kernel/utility/email_send.php =================================================================== diff -u -r15483 -r15928 --- branches/5.3.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 15483) +++ branches/5.3.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 15928) @@ -1,6 +1,6 @@ $message_headers['To'], 'Subject' => $message_headers['Subject'], - 'Queued' => adodb_mktime(), + 'Queued' => time(), 'SendRetries' => 0, 'LastSendRetry' => 0, 'MailingId' => (int)$immediate_send, Index: branches/5.3.x/core/units/helpers/backup_helper.php =================================================================== diff -u -r15483 -r15928 --- branches/5.3.x/core/units/helpers/backup_helper.php (.../backup_helper.php) (revision 15483) +++ branches/5.3.x/core/units/helpers/backup_helper.php (.../backup_helper.php) (revision 15928) @@ -1,6 +1,6 @@ $tables, 'table_count' => count($tables), 'record_count' => 0, - 'file_name' => $this->getBackupFile( adodb_mktime() ), + 'file_name' => $this->getBackupFile( time() ), ); $this->Application->RemoveVar('adm.backupcomplete_filename'); Index: branches/5.3.x/core/kernel/utility/logger.php =================================================================== diff -u -r15902 -r15928 --- branches/5.3.x/core/kernel/utility/logger.php (.../logger.php) (revision 15902) +++ branches/5.3.x/core/kernel/utility/logger.php (.../logger.php) (revision 15928) @@ -1,6 +1,6 @@ _logRecord['LogMemoryUsed'] = memory_get_usage(); - $this->_logRecord['LogTimestamp'] = adodb_mktime(); - $this->_logRecord['LogDate'] = adodb_date('Y-m-d H:i:s'); + $this->_logRecord['LogTimestamp'] = time(); + $this->_logRecord['LogDate'] = date('Y-m-d H:i:s'); if ( $storage_medium == self::LS_AUTOMATIC ) { $storage_medium = $this->Conn->connectionOpened() ? self::LS_DATABASE : self::LS_DISK; @@ -922,7 +922,7 @@ */ protected function _saveToFile($filename) { - $time = adodb_date('Y-m-d H:i:s'); + $time = date('Y-m-d H:i:s'); $log_file = new SplFileObject($filename, 'a'); return $log_file->fwrite('[' . $time . '] #' . $this->toString(null, true) . PHP_EOL) > 0;