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 22005c06aeea349459c99b317a0ff51a1cc3a9d0..ae4928bdf2b1c44d74fff3a7c7332902ce6d9ca1 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -17,6 +17,7 @@ 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';
@@ -152,8 +153,8 @@ function cal_content(App $a)
 
        // The view mode part is similiar to /mod/events.php
        if ($mode == 'view') {
-               $thisyear = Temporal::localNow('Y');
-               $thismonth = Temporal::localNow('m');
+               $thisyear = DateTimeFormat::localNow('Y');
+               $thismonth = DateTimeFormat::localNow('m');
                if (!$y) {
                        $y = intval($thisyear);
                }
@@ -188,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);
 
@@ -203,11 +204,11 @@ function cal_content(App $a)
                        }
                }
 
-               $start = Temporal::utc($start);
-               $finish = Temporal::utc($finish);
+               $start = DateTimeFormat::utc($start);
+               $finish = DateTimeFormat::utc($finish);
 
-               $adjust_start = Temporal::local($start);
-               $adjust_finish = Temporal::local($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 = [
@@ -231,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'] ? Temporal::local($rr['start'], 'j') : Temporal::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;
                                }
@@ -274,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"),