X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcal.php;h=9e32b87d6f60bc829eb8a9c7c3936b3c855ddc4b;hb=f2d917114f949b3f76c04f99247092a16b1e3e9e;hp=6f483acc163478853847b72c36b343bccb0117d4;hpb=c0abff0bda84b9151fb3314c6b33a262d0b44d13;p=friendica.git diff --git a/mod/cal.php b/mod/cal.php index 6f483acc16..9e32b87d6f 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -1,41 +1,36 @@ argc > 1) { - DFRN::autoRedir($a, $a->argv[1]); - } - - if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { - System::httpExit(403, ['title' => L10n::t('Access denied.')]); + if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { + throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } if ($a->argc < 2) { - System::httpExit(403, ['title' => L10n::t('Access denied.')]); + throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } Nav::setSelected('events'); @@ -43,7 +38,7 @@ function cal_init(App $a) $nick = $a->argv[1]; $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]); if (!DBA::isResult($user)) { - System::httpExit(404, ['title' => L10n::t('Page not found.')]); + throw new \Friendica\Network\HTTPException\NotFoundException(); } $a->data['user'] = $user; @@ -59,9 +54,9 @@ function cal_init(App $a) $account_type = Contact::getAccountType($profile); - $tpl = get_markup_template("vcard-widget.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl"); - $vcard_widget = replace_macros($tpl, [ + $vcard_widget = Renderer::replaceMacros($tpl, [ '$name' => $profile['name'], '$photo' => $profile['photo'], '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""), @@ -71,12 +66,12 @@ function cal_init(App $a) $cal_widget = Widget\CalendarExport::getHTML(); - if (!x($a->page, 'aside')) { - $a->page['aside'] = ''; + if (empty(DI::page()['aside'])) { + DI::page()['aside'] = ''; } - $a->page['aside'] .= $vcard_widget; - $a->page['aside'] .= $cal_widget; + DI::page()['aside'] .= $vcard_widget; + DI::page()['aside'] .= $cal_widget; return; } @@ -88,9 +83,8 @@ function cal_content(App $a) // get the translation strings for the callendar $i18n = Event::getStrings(); - $htpl = get_markup_template('event_head.tpl'); - $a->page['htmlhead'] .= replace_macros($htpl, [ - '$baseurl' => System::baseUrl(), + $htpl = Renderer::getMarkupTemplate('event_head.tpl'); + DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [ '$module_url' => '/cal/' . $a->data['user']['nickname'], '$modparams' => 2, '$i18n' => $i18n, @@ -99,7 +93,7 @@ function cal_content(App $a) $mode = 'view'; $y = 0; $m = 0; - $ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0); + $ignored = (!empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0); $format = 'ical'; if ($a->argc == 4 && $a->argv[2] == 'export') { @@ -108,47 +102,27 @@ function cal_content(App $a) } // Setup permissions structures - $remote_contact = false; - $contact_id = 0; - - $owner_uid = $a->data['user']['uid']; + $owner_uid = intval($a->data['user']['uid']); $nick = $a->data['user']['nickname']; - if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { - foreach ($_SESSION['remote'] as $v) { - if ($v['uid'] == $a->profile['profile_uid']) { - $contact_id = $v['cid']; - break; - } - } - } + $contact_id = Session::getRemoteContactID($a->profile['uid']); - $groups = []; - if ($contact_id) { - $groups = Group::getIdsByContactId($contact_id); - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval($a->profile['profile_uid']) - ); - if (DBA::isResult($r)) { - $remote_contact = true; - } - } + $remote_contact = $contact_id && DBA::exists('contact', ['id' => $contact_id, 'uid' => $a->profile['uid']]); - $is_owner = local_user() == $a->profile['profile_uid']; + $is_owner = local_user() == $a->profile['uid']; if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) { - notice(L10n::t('Access to this profile has been restricted.') . EOL); + notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL); return; } // get the permissions - $sql_perms = Item::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups); + $sql_perms = Item::getPermissionsSQLByUserId($owner_uid); // we only want to have the events of the profile owner $sql_extra = " AND `event`.`cid` = 0 " . $sql_perms; // get the tab navigation bar - $tabs = Profile::getTabs($a, false, $a->data['user']['nickname']); + $tabs = BaseProfile::getTabsHTML($a, 'cal', false, $a->data['user']['nickname']); // The view mode part is similiar to /mod/events.php if ($mode == 'view') { @@ -194,11 +168,11 @@ function cal_content(App $a) if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) { - if (x($_GET, 'start')) { + if (!empty($_GET['start'])) { $start = $_GET['start']; } - if (x($_GET, 'end')) { + if (!empty($_GET['end'])) { $finish = $_GET['end']; } } @@ -211,7 +185,7 @@ function cal_content(App $a) // put the event parametes in an array so we can better transmit them $event_params = [ - 'event_id' => intval(defaults($_GET, 'id', 0)), + 'event_id' => intval($_GET['id'] ?? 0), 'start' => $start, 'finish' => $finish, 'adjust_start' => $adjust_start, @@ -232,8 +206,8 @@ function cal_content(App $a) $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)) { - $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j; + if (empty($links[$j])) { + $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; } } } @@ -243,17 +217,17 @@ function cal_content(App $a) if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) { echo json_encode($events); - killme(); + exit(); } // links: array('href', 'text', 'extra css classes', 'title') - if (x($_GET, 'id')) { - $tpl = get_markup_template("event.tpl"); + if (!empty($_GET['id'])) { + $tpl = Renderer::getMarkupTemplate("event.tpl"); } else { -// if (Config::get('experimentals','new_calendar')==1){ - $tpl = get_markup_template("events_js.tpl"); +// if (DI::config()->get('experimentals','new_calendar')==1){ + $tpl = Renderer::getMarkupTemplate("events_js.tpl"); // } else { -// $tpl = get_markup_template("events.tpl"); +// $tpl = Renderer::getMarkupTemplate("events.tpl"); // } } @@ -267,41 +241,40 @@ function cal_content(App $a) $events[$key]['item'] = $event_item; } - $o = replace_macros($tpl, [ - '$baseurl' => System::baseUrl(), + $o = Renderer::replaceMacros($tpl, [ '$tabs' => $tabs, - '$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'), '', ''], + '$title' => DI::l10n()->t('Events'), + '$view' => DI::l10n()->t('View'), + '$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", DI::l10n()->t('Previous'), '', ''], + '$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", DI::l10n()->t('Next'), '', ''], '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'), '$events' => $events, - "today" => L10n::t("today"), - "month" => L10n::t("month"), - "week" => L10n::t("week"), - "day" => L10n::t("day"), - "list" => L10n::t("list"), + "today" => DI::l10n()->t("today"), + "month" => DI::l10n()->t("month"), + "week" => DI::l10n()->t("week"), + "day" => DI::l10n()->t("day"), + "list" => DI::l10n()->t("list"), ]); - if (x($_GET, 'id')) { + if (!empty($_GET['id'])) { echo $o; - killme(); + exit(); } return $o; } if ($mode == 'export') { - if (!intval($owner_uid)) { - notice(L10n::t('User not found')); + if (!$owner_uid) { + notice(DI::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(L10n::t('Permission denied.') . EOL); - $a->internalRedirect('cal/' . $nick); + if ((local_user() !== $owner_uid) && !Feature::isEnabled($owner_uid, "export_calendar")) { + notice(DI::l10n()->t('Permission denied.') . EOL); + DI::baseUrl()->redirect('cal/' . $nick); } // Get the export data by uid @@ -309,28 +282,28 @@ function cal_content(App $a) if (!$evexport["success"]) { if ($evexport["content"]) { - notice(L10n::t('This calendar format is not supported')); + notice(DI::l10n()->t('This calendar format is not supported')); } else { - notice(L10n::t('No exportable data found')); + notice(DI::l10n()->t('No exportable data found')); } // If it the own calendar return to the events page // otherwise to the profile calendar page - if (local_user() === intval($owner_uid)) { + if (local_user() === $owner_uid) { $return_path = "events"; } else { $return_path = "cal/" . $nick; } - $a->internalRedirect($return_path); + DI::baseUrl()->redirect($return_path); } // If nothing went wrong we can echo the export content if ($evexport["success"]) { header('Content-type: text/calendar'); - header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"'); + header('content-disposition: attachment; filename="' . DI::l10n()->t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"'); echo $evexport["content"]; - killme(); + exit(); } return;