diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 1fc4f5683f..3aee719fe0 100755 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -1529,7 +1529,7 @@ function generateSettingsForm($settings, $settings_by_access_list) case 'timezone_value': $timezone = $row['selected_value']; if (empty($timezone)) { - $timezone = _api_get_timezone(); + $timezone = api_get_timezone(); } $form->addLabel('', sprintf(get_lang('LocalTimeUsingPortalTimezoneXIsY'), $timezone, api_get_local_time())); break; diff --git a/main/admin/skill_list.php b/main/admin/skill_list.php index 074c17bb13..f66e19d19e 100644 --- a/main/admin/skill_list.php +++ b/main/admin/skill_list.php @@ -38,7 +38,7 @@ switch ($action) { } else { $updatedAt = new DateTime( api_get_utc_datetime(), - new DateTimeZone(_api_get_timezone()) + new DateTimeZone(api_get_timezone()) ); $skill->setStatus(1); @@ -71,7 +71,7 @@ switch ($action) { } else { $updatedAt = new DateTime( api_get_utc_datetime(), - new DateTimeZone(_api_get_timezone()) + new DateTimeZone(api_get_timezone()) ); $skill->setStatus(0); diff --git a/main/inc/lib/TicketManager.php b/main/inc/lib/TicketManager.php index ba014badda..835b82d281 100644 --- a/main/inc/lib/TicketManager.php +++ b/main/inc/lib/TicketManager.php @@ -1284,15 +1284,15 @@ class TicketManager $row['course'] = null; $row['start_date_from_db'] = $row['start_date']; $row['start_date'] = api_convert_and_format_date( - api_get_local_time($row['start_date']), DATE_TIME_FORMAT_LONG, _api_get_timezone() + api_get_local_time($row['start_date']), DATE_TIME_FORMAT_LONG, api_get_timezone() ); $row['end_date_from_db'] = $row['end_date']; $row['end_date'] = api_convert_and_format_date( - api_get_local_time($row['end_date']), DATE_TIME_FORMAT_LONG, _api_get_timezone() + api_get_local_time($row['end_date']), DATE_TIME_FORMAT_LONG, api_get_timezone() ); $row['sys_lastedit_datetime_from_db'] = $row['sys_lastedit_datetime']; $row['sys_lastedit_datetime'] = api_convert_and_format_date( - api_get_local_time($row['sys_lastedit_datetime']), DATE_TIME_FORMAT_LONG, _api_get_timezone() + api_get_local_time($row['sys_lastedit_datetime']), DATE_TIME_FORMAT_LONG, api_get_timezone() ); $row['course_url'] = null; if ($row['course_id'] != 0) { diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index 35381b9528..e529f47096 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -1851,7 +1851,7 @@ class Agenda private function formatEventDate($utcTime) { $utcTimeZone = new DateTimeZone('UTC'); - $platformTimeZone = new DateTimeZone(_api_get_timezone()); + $platformTimeZone = new DateTimeZone(api_get_timezone()); $eventDate = new DateTime($utcTime, $utcTimeZone); $eventDate->setTimezone($platformTimeZone); @@ -2718,7 +2718,7 @@ class Agenda ); $sentTo = array('everyone' => true); $calendar = Sabre\VObject\Reader::read($data); - $currentTimeZone = _api_get_timezone(); + $currentTimeZone = api_get_timezone(); if (!empty($calendar->VEVENT)) { foreach ($calendar->VEVENT as $event) { $start = $event->DTSTART->getDateTime(); diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php index 476c791bc9..11097f6a29 100755 --- a/main/inc/lib/internationalization.lib.php +++ b/main/inc/lib/internationalization.lib.php @@ -353,7 +353,7 @@ function api_get_timezones() * * @return string The timezone chosen */ -function _api_get_timezone() +function api_get_timezone() { // First, get the default timezone of the server $to_timezone = date_default_timezone_get(); @@ -394,7 +394,7 @@ function _api_get_timezone() */ function api_get_utc_datetime($time = null, $return_null_if_invalid_date = false, $returnObj = false) { - $from_timezone = _api_get_timezone(); + $from_timezone = api_get_timezone(); $to_timezone = 'UTC'; if (is_null($time) || empty($time) || $time === '0000-00-00 00:00:00') { if ($return_null_if_invalid_date) { @@ -451,7 +451,7 @@ function api_get_local_time( } // Determining the timezone to be converted to if (is_null($to_timezone)) { - $to_timezone = _api_get_timezone(); + $to_timezone = api_get_timezone(); } // If time is a timestamp, convert it to a string @@ -525,7 +525,7 @@ function api_strtotime($time, $timezone = null) function api_format_date($time, $format = null, $language = null) { $system_timezone = date_default_timezone_get(); - date_default_timezone_set(_api_get_timezone()); + date_default_timezone_set(api_get_timezone()); if (is_string($time)) { $time = strtotime($time); @@ -677,7 +677,7 @@ function date_to_str_ago($date, $timeZone = 'UTC') return ''; } - $getOldTimezone = _api_get_timezone(); + $getOldTimezone = api_get_timezone(); $timeAgo = new TimeAgo($timeZone, api_get_language_isocode()); $value = $timeAgo->inWords($date); diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 6de1df6fb7..9898baad1b 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -514,7 +514,7 @@ class Template 'site_name' => api_get_setting('siteName'), 'institution' => api_get_setting('Institution'), 'date' => api_format_date('now', DATE_FORMAT_LONG), - 'timezone' => _api_get_timezone(), + 'timezone' => api_get_timezone(), 'gamification_mode' => api_get_setting('gamification_mode') ); $this->assign('_s', $_s); diff --git a/tests/main/inc/lib/internationalization.lib.test.php b/tests/main/inc/lib/internationalization.lib.test.php index ccb8b0aa54..10751fe725 100755 --- a/tests/main/inc/lib/internationalization.lib.test.php +++ b/tests/main/inc/lib/internationalization.lib.test.php @@ -971,7 +971,7 @@ class TestInternationalization extends UnitTestCase { public function test_api_get_utc_datetime_with_string() { $timestamp = time(); - $timezone = _api_get_timezone(); + $timezone = api_get_timezone(); $system_timezone = date_default_timezone_get(); date_default_timezone_set($timezone); $datetime = date('Y-m-d H:i:s', $timestamp);