keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cal export && public calendar - even better permissions testing

Browse source
This commit is contained in:
rabuzarus 2016-06-22 13:50:47 +02:00
parent 8cc5dd35e8
commit 2cac69ca86
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/event.php
View file

@ -818,8 +818,13 @@ function widget_events() {
// of the profile page it should be the personal /events page. So we can use $a->user // of the profile page it should be the personal /events page. So we can use $a->user
$user = ($a->data['user']['nickname'] ? $a->data['user']['nickname'] : $a->user['nickname']); $user = ($a->data['user']['nickname'] ? $a->data['user']['nickname'] : $a->user['nickname']);
if( !(local_user()) && !(feature_enabled($owner_uid, "export_calendar")) ) // a little bit tricky permission testing because we have to respect many cases
if(!(local_user()) && !($owner_uid) // not the private events page (we don't get the $owner_uid for /events)
|| (intval($owner_uid) && local_user() !== $owner_uid && !(feature_enabled($owner_uid, "export_calendar"))) // cal logged in user (test permission at foreign profile page)
|| ( !(local_user()) && !(feature_enabled($owner_uid, "export_calendar"))) // if cal && not logged in && feature is not enabled
) {
return; return;
}
return replace_macros(get_markup_template("events_aside.tpl"), array( return replace_macros(get_markup_template("events_aside.tpl"), array(
'$etitle' => t("Export"), '$etitle' => t("Export"),

3
mod/cal.php
View file

@ -302,7 +302,8 @@ function cal_content(&$a) {
return; return;
} }
if( !(local_user()) && !(feature_enabled($owner_uid, "export_calendar"))) { // Test permissions
if( ((local_user() !== $owner_uid)) && !(feature_enabled($owner_uid, "export_calendar"))) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }