MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cal export && public calendar - fix permissions

Browse source
This commit is contained in:
rabuzarus 2016-06-22 00:39:52 +02:00
parent d076f61a4a
commit 8cc5dd35e8
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/event.php
View file

@ -818,7 +818,7 @@ 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")) ) if( !(local_user()) && !(feature_enabled($owner_uid, "export_calendar")) )
return; return;
return replace_macros(get_markup_template("events_aside.tpl"), array( return replace_macros(get_markup_template("events_aside.tpl"), array(

7
mod/cal.php
View file

@ -153,7 +153,10 @@ function cal_content(&$a) {
return; return;
} }
$sql_extra = item_permissions_sql($owner_uid,$remote_contact,$groups); // get the permissions
$sql_perms = item_permissions_sql($owner_uid,$remote_contact,$groups);
// we only want to have the events of the profile owner
$sql_extra = " AND `event`.`cid` = 0 ";
// get the tab navigation bar // get the tab navigation bar
$tabs .= profile_tabs($a,false, $a->data['user']['nickname']); $tabs .= profile_tabs($a,false, $a->data['user']['nickname']);
@ -299,7 +302,7 @@ function cal_content(&$a) {
return; return;
} }
if(! (feature_enabled($owner_uid, "export_calendar"))) { if( !(local_user()) && !(feature_enabled($owner_uid, "export_calendar"))) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
} }