Update use statement lists with new Friendica\Database\dba class

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index cafef3e300beede45824bccdb0f33eb44480831a..246d8a6447b6c7376fc3e00711a5ab6229422ce5 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -9,17 +9,19 @@
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
-
-require_once 'include/event.php';
+use Friendica\Util\Temporal;
 
 function cal_init(App $a)
 {
@@ -63,7 +65,7 @@ function cal_init(App $a)
                        '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
                ]);
 
-               $cal_widget = widget_events();
+               $cal_widget = Widget\CalendarExport::getHTML();
 
                if (!x($a->page, 'aside')) {
                        $a->page['aside'] = '';
@@ -81,7 +83,7 @@ function cal_content(App $a)
        Nav::setSelected('events');
 
        // get the translation strings for the callendar
-       $i18n = get_event_strings();
+       $i18n = Event::getStrings();
 
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl, [
@@ -188,7 +190,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);
 
@@ -211,25 +213,25 @@ function cal_content(App $a)
 
                // put the event parametes in an array so we can better transmit them
                $event_params = [
-                       'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0),
-                       'start' => $start,
-                       'finish' => $finish,
-                       'adjust_start' => $adjust_start,
+                       'event_id'      => intval(defaults($_GET, 'id', 0)),
+                       'start'         => $start,
+                       'finish'        => $finish,
+                       'adjust_start'  => $adjust_start,
                        'adjust_finish' => $adjust_finish,
-                       'ignored' => $ignored,
+                       'ignore'        => $ignored,
                ];
 
                // get events by id or by date
-               if (x($_GET, 'id')) {
-                       $r = event_by_id($owner_uid, $event_params, $sql_extra);
+               if ($event_params['event_id']) {
+                       $r = Event::getListById($owner_uid, $event_params['event-id'], $sql_extra);
                } else {
-                       $r = events_by_date($owner_uid, $event_params, $sql_extra);
+                       $r = Event::getListByDate($owner_uid, $event_params, $sql_extra);
                }
 
                $links = [];
 
                if (DBM::is_result($r)) {
-                       $r = sort_by_date($r);
+                       $r = Event::sortByDate($r);
                        foreach ($r as $rr) {
                                $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
                                if (!x($links, $j)) {
@@ -239,7 +241,7 @@ function cal_content(App $a)
                }
 
                // transform the event in a usable array
-               $events = process_events($r);
+               $events = Event::prepareListForTemplate($r);
 
                if ($a->argv[2] === 'json') {
                        echo json_encode($events);
@@ -274,7 +276,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"),
@@ -305,7 +307,7 @@ function cal_content(App $a)
                }
 
                // Get the export data by uid
-               $evexport = event_export($owner_uid, $format);
+               $evexport = Event::exportListByUserId($owner_uid, $format);
 
                if (!$evexport["success"]) {
                        if ($evexport["content"]) {