mirror of
https://github.com/friendica/friendica
synced 2024-11-09 16:22:56 +00:00
simplify the calendar download
This commit is contained in:
parent
0b5107a1a5
commit
a9302c30c3
3 changed files with 11 additions and 20 deletions
|
@ -84,7 +84,7 @@ function cal_init(App $a)
|
|||
'$about' => BBCode::convert($a->profile['about']),
|
||||
]);
|
||||
|
||||
$cal_widget = Widget\CalendarExport::getHTML();
|
||||
$cal_widget = Widget\CalendarExport::getHTML($user['uid']);
|
||||
|
||||
if (empty(DI::page()['aside'])) {
|
||||
DI::page()['aside'] = '';
|
||||
|
|
|
@ -59,7 +59,7 @@ function events_init(App $a)
|
|||
DI::page()['aside'] = '';
|
||||
}
|
||||
|
||||
$cal_widget = CalendarExport::getHTML();
|
||||
$cal_widget = CalendarExport::getHTML(local_user());
|
||||
|
||||
DI::page()['aside'] .= $cal_widget;
|
||||
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
namespace Friendica\Content\Widget;
|
||||
|
||||
use Friendica\Content\Feature;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\User;
|
||||
|
||||
/**
|
||||
* TagCloud widget
|
||||
|
@ -34,36 +34,27 @@ class CalendarExport
|
|||
{
|
||||
/**
|
||||
* Get the events widget.
|
||||
* @param int $uid
|
||||
*
|
||||
* @return string Formated HTML of the calendar widget.
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function getHTML() {
|
||||
$a = DI::app();
|
||||
|
||||
if (empty($a->data['user'])) {
|
||||
return;
|
||||
public static function getHTML(int $uid = 0) {
|
||||
if (empty($uid)) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$owner_uid = intval($a->data['user']['uid']);
|
||||
|
||||
// The permission testing is a little bit tricky because we have to respect many cases.
|
||||
|
||||
// It's not the private events page (we don't get the $owner_uid for /events).
|
||||
if (!local_user() && !$owner_uid) {
|
||||
return;
|
||||
$user = User::getById($uid, ['nickname']);
|
||||
if (empty($user['nickname'])) {
|
||||
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");
|
||||
$return = Renderer::replaceMacros($tpl, [
|
||||
'$etitle' => DI::l10n()->t("Export"),
|
||||
'$export_ical' => DI::l10n()->t("Export calendar as ical"),
|
||||
'$export_csv' => DI::l10n()->t("Export calendar as csv"),
|
||||
'$user' => $user
|
||||
'$user' => $user['nickname']
|
||||
]);
|
||||
|
||||
return $return;
|
||||
|
|
Loading…
Reference in a new issue