Merge pull request #4443 from rabuzarus/20180212_-_fix_variables_part_three

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index a59643cfc2dfd163583e4563ff3aa35d664a31aa..ae4928bdf2b1c44d74fff3a7c7332902ce6d9ca1 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -5,6 +5,7 @@
  *     This calendar is for profile visitors and contains only the events
  *     of the profile owner
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -16,6 +17,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
 
 require_once 'include/event.php';
 
@@ -150,8 +153,8 @@ function cal_content(App $a)
 
        // The view mode part is similiar to /mod/events.php
        if ($mode == 'view') {
-               $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
-               $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+               $thisyear = DateTimeFormat::localNow('Y');
+               $thismonth = DateTimeFormat::localNow('m');
                if (!$y) {
                        $y = intval($thisyear);
                }
@@ -186,7 +189,7 @@ function cal_content(App $a)
                        $prevyear --;
                }
 
-               $dim = get_dim($y, $m);
+               $dim = Temporal::getDaysInMonth($y, $m);
                $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
                $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
@@ -201,11 +204,11 @@ function cal_content(App $a)
                        }
                }
 
-               $start = datetime_convert('UTC', 'UTC', $start);
-               $finish = datetime_convert('UTC', 'UTC', $finish);
+               $start = DateTimeFormat::utc($start);
+               $finish = DateTimeFormat::utc($finish);
 
-               $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-               $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+               $adjust_start = DateTimeFormat::local($start);
+               $adjust_finish = DateTimeFormat::local($finish);
 
                // put the event parametes in an array so we can better transmit them
                $event_params = [
@@ -229,7 +232,7 @@ function cal_content(App $a)
                if (DBM::is_result($r)) {
                        $r = sort_by_date($r);
                        foreach ($r as $rr) {
-                               $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
+                               $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
                                if (!x($links, $j)) {
                                        $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
@@ -272,7 +275,7 @@ function cal_content(App $a)
                        '$view' => L10n::t('View'),
                        '$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''],
                        '$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''],
-                       '$calendar' => cal($y, $m, $links, ' eventcal'),
+                       '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
                        '$events' => $events,
                        "today" => L10n::t("today"),
                        "month" => L10n::t("month"),