nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10332 from annando/calender-download

Browse source 
simplify the calendar download
This commit is contained in:
Hypolite Petovan 2021-05-29 13:46:41 -04:00 committed by GitHub
parent 0b9346c7c0 a9302c30c3
commit 452ed8aa8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/cal.php
View file

@ -84,7 +84,7 @@ function cal_init(App $a)
'$about' => BBCode::convert($a->profile['about']), '$about' => BBCode::convert($a->profile['about']),
]); ]);
$cal_widget = Widget\CalendarExport::getHTML(); $cal_widget = Widget\CalendarExport::getHTML($user['uid']);
if (empty(DI::page()['aside'])) { if (empty(DI::page()['aside'])) {
DI::page()['aside'] = ''; DI::page()['aside'] = '';

2
mod/events.php
View file

@ -59,7 +59,7 @@ function events_init(App $a)
DI::page()['aside'] = ''; DI::page()['aside'] = '';
} }
$cal_widget = CalendarExport::getHTML(); $cal_widget = CalendarExport::getHTML(local_user());
DI::page()['aside'] .= $cal_widget; DI::page()['aside'] .= $cal_widget;

27
src/Content/Widget/CalendarExport.php
View file

@ -21,9 +21,9 @@
namespace Friendica\Content\Widget; namespace Friendica\Content\Widget;
use Friendica\Content\Feature;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User;
/** /**
* TagCloud widget * TagCloud widget
@ -34,36 +34,27 @@ class CalendarExport
{ {
/** /**
* Get the events widget. * Get the events widget.
* @param int $uid
* *
* @return string Formated HTML of the calendar widget. * @return string Formated HTML of the calendar widget.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function getHTML() { public static function getHTML(int $uid = 0) {
$a = DI::app(); if (empty($uid)) {
return '';
if (empty($a->data['user'])) {
return;
} }
$owner_uid = intval($a->data['user']['uid']); $user = User::getById($uid, ['nickname']);
if (empty($user['nickname'])) {
// The permission testing is a little bit tricky because we have to respect many cases. return '';
// It's not the private events page (we don't get the $owner_uid for /events).
if (!local_user() && !$owner_uid) {
return;
} }
// $a->data is only available if the profile page is visited. If the visited page is not part
// of the profile page it should be the personal /events page. So we can use $a->user.
$user = ($a->data['user']['nickname'] ?? '') ?: $a->user['nickname'];
$tpl = Renderer::getMarkupTemplate("widget/events.tpl"); $tpl = Renderer::getMarkupTemplate("widget/events.tpl");
$return = Renderer::replaceMacros($tpl, [ $return = Renderer::replaceMacros($tpl, [
'$etitle' => DI::l10n()->t("Export"), '$etitle' => DI::l10n()->t("Export"),
'$export_ical' => DI::l10n()->t("Export calendar as ical"), '$export_ical' => DI::l10n()->t("Export calendar as ical"),
'$export_csv' => DI::l10n()->t("Export calendar as csv"), '$export_csv' => DI::l10n()->t("Export calendar as csv"),
'$user' => $user '$user' => $user['nickname']
]); ]);
return $return; return $return;