]> git.mxchange.org Git - friendica.git/blobdiff - mod/cal.php
Add Temporal::local() shorthand for Temporal::convert()
[friendica.git] / mod / cal.php
index 31ab5976b56a45f5755dff0f0d15eba4c28131c8..22005c06aeea349459c99b317a0ff51a1cc3a9d0 100644 (file)
@@ -5,15 +5,19 @@
  *     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;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
+use Friendica\Util\Temporal;
 
 require_once 'include/event.php';
 
@@ -27,7 +31,7 @@ function cal_init(App $a)
                return;
        }
 
-       nav_set_selected('events');
+       Nav::setSelected('events');
 
        if ($a->argc > 1) {
                $nick = $a->argv[1];
@@ -51,13 +55,13 @@ function cal_init(App $a)
 
                $tpl = get_markup_template("vcard-widget.tpl");
 
-               $vcard_widget = replace_macros($tpl, array(
+               $vcard_widget = replace_macros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
                        '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
                        '$account_type' => $account_type,
                        '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
-               ));
+               ]);
 
                $cal_widget = widget_events();
 
@@ -74,23 +78,23 @@ function cal_init(App $a)
 
 function cal_content(App $a)
 {
-       nav_set_selected('events');
+       Nav::setSelected('events');
 
        // get the translation strings for the callendar
        $i18n = get_event_strings();
 
        $htpl = get_markup_template('event_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($htpl, array(
+       $a->page['htmlhead'] .= replace_macros($htpl, [
                '$baseurl' => System::baseUrl(),
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
                '$modparams' => 2,
                '$i18n' => $i18n,
-       ));
+       ]);
 
        $etpl = get_markup_template('event_end.tpl');
-       $a->page['end'] .= replace_macros($etpl, array(
+       $a->page['end'] .= replace_macros($etpl, [
                '$baseurl' => System::baseUrl(),
-       ));
+       ]);
 
        $mode = 'view';
        $y = 0;
@@ -134,7 +138,7 @@ function cal_content(App $a)
        $is_owner = local_user() == $a->profile['profile_uid'];
 
        if ($a->profile['hidewall'] && (!$is_owner) && (!$remote_contact)) {
-               notice(t('Access to this profile has been restricted.') . EOL);
+               notice(L10n::t('Access to this profile has been restricted.') . EOL);
                return;
        }
 
@@ -148,8 +152,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 = Temporal::localNow('Y');
+               $thismonth = Temporal::localNow('m');
                if (!$y) {
                        $y = intval($thisyear);
                }
@@ -199,21 +203,21 @@ function cal_content(App $a)
                        }
                }
 
-               $start = datetime_convert('UTC', 'UTC', $start);
-               $finish = datetime_convert('UTC', 'UTC', $finish);
+               $start = Temporal::utc($start);
+               $finish = Temporal::utc($finish);
 
-               $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-               $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
+               $adjust_start = Temporal::local($start);
+               $adjust_finish = Temporal::local($finish);
 
                // put the event parametes in an array so we can better transmit them
-               $event_params = array(
+               $event_params = [
                        'event_id' => (x($_GET, 'id') ? $_GET["id"] : 0),
                        'start' => $start,
                        'finish' => $finish,
                        'adjust_start' => $adjust_start,
                        'adjust_finish' => $adjust_finish,
                        'ignored' => $ignored,
-               );
+               ];
 
                // get events by id or by date
                if (x($_GET, 'id')) {
@@ -222,12 +226,12 @@ function cal_content(App $a)
                        $r = events_by_date($owner_uid, $event_params, $sql_extra);
                }
 
-               $links = array();
+               $links = [];
 
                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'] ? Temporal::local($rr['start'], 'j') : Temporal::utc($rr['start'], 'j');
                                if (!x($links, $j)) {
                                        $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
@@ -255,7 +259,7 @@ function cal_content(App $a)
 
                // Get rid of dashes in key names, Smarty3 can't handle them
                foreach ($events as $key => $event) {
-                       $event_item = array();
+                       $event_item = [];
                        foreach ($event['item'] as $k => $v) {
                                $k = str_replace('-', '_', $k);
                                $event_item[$k] = $v;
@@ -263,21 +267,21 @@ function cal_content(App $a)
                        $events[$key]['item'] = $event_item;
                }
 
-               $o = replace_macros($tpl, array(
+               $o = replace_macros($tpl, [
                        '$baseurl' => System::baseUrl(),
                        '$tabs' => $tabs,
-                       '$title' => t('Events'),
-                       '$view' => t('View'),
-                       '$previous' => array(System::baseUrl() . "/events/$prevyear/$prevmonth", t('Previous'), '', ''),
-                       '$next' => array(System::baseUrl() . "/events/$nextyear/$nextmonth", t('Next'), '', ''),
+                       '$title' => L10n::t('Events'),
+                       '$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'),
                        '$events' => $events,
-                       "today" => t("today"),
-                       "month" => t("month"),
-                       "week" => t("week"),
-                       "day" => t("day"),
-                       "list" => t("list"),
-               ));
+                       "today" => L10n::t("today"),
+                       "month" => L10n::t("month"),
+                       "week" => L10n::t("week"),
+                       "day" => L10n::t("day"),
+                       "list" => L10n::t("list"),
+               ]);
 
                if (x($_GET, 'id')) {
                        echo $o;
@@ -289,14 +293,14 @@ function cal_content(App $a)
 
        if ($mode == 'export') {
                if (!(intval($owner_uid))) {
-                       notice(t('User not found'));
+                       notice(L10n::t('User not found'));
                        return;
                }
 
                // Test permissions
                // Respect the export feature setting for all other /cal pages if it's not the own profile
                if (((local_user() !== intval($owner_uid))) && !Feature::isEnabled($owner_uid, "export_calendar")) {
-                       notice(t('Permission denied.') . EOL);
+                       notice(L10n::t('Permission denied.') . EOL);
                        goaway('cal/' . $nick);
                }
 
@@ -305,9 +309,9 @@ function cal_content(App $a)
 
                if (!$evexport["success"]) {
                        if ($evexport["content"]) {
-                               notice(t('This calendar format is not supported'));
+                               notice(L10n::t('This calendar format is not supported'));
                        } else {
-                               notice(t('No exportable data found'));
+                               notice(L10n::t('No exportable data found'));
                        }
 
                        // If it the own calendar return to the events page
@@ -324,7 +328,7 @@ function cal_content(App $a)
                // If nothing went wrong we can echo the export content
                if ($evexport["success"]) {
                        header('Content-type: text/calendar');
-                       header('content-disposition: attachment; filename="' . t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
+                       header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
                        echo $evexport["content"];
                        killme();
                }