diff options
| -rw-r--r-- | include/event.php | 11 | ||||
| -rw-r--r-- | include/session.php | 4 | ||||
| -rwxr-xr-x | mod/cal.php | 2 | ||||
| -rwxr-xr-x | mod/events.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/include/event.php b/include/event.php index 73033a1c3..2969f4f61 100644 --- a/include/event.php +++ b/include/event.php @@ -440,6 +440,17 @@ function event_addtocal($item_id, $uid) { $ev['event_hash'] = $item['resource_id']; } + if($ev->private) + $ev['allow_cid'] = '<' . $channel['channel_hash'] . '>'; + else { + $acl = new Zotlabs\Access\AccessList($channel); + $x = $acl->get(); + $ev['allow_cid'] = $x['allow_cid']; + $ev['allow_gid'] = $x['allow_gid']; + $ev['deny_cid'] = $x['deny_cid']; + $ev['deny_gid'] = $x['deny_gid']; + } + $event = event_store_event($ev); if($event) { $r = q("update item set resource_id = '%s', resource_type = 'event' where id = %d and uid = %d", diff --git a/include/session.php b/include/session.php index 182805980..43bba528b 100644 --- a/include/session.php +++ b/include/session.php @@ -124,12 +124,12 @@ session_set_save_handler( // Force cookies to be secure (https only) if this site is SSL enabled. Must be done before session_start(). - if(intval($a->config['system']['ssl_cookie_protection'])) { + if(intval(get_app()->config['system']['ssl_cookie_protection'])) { $arr = session_get_cookie_params(); session_set_cookie_params( ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0), ((isset($arr['path'])) ? $arr['path'] : '/'), - ((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()), + ((isset($arr['domain'])) ? $arr['domain'] : get_app()->get_hostname()), ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false), ((isset($arr['httponly'])) ? $arr['httponly'] : true)); }
\ No newline at end of file diff --git a/mod/cal.php b/mod/cal.php index 9899b33b0..1e2405cd0 100755 --- a/mod/cal.php +++ b/mod/cal.php @@ -85,7 +85,7 @@ function cal_content(&$a) { $m = 0; $ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " " : ''); -logger('args: ' . print_r($a->argv,true)); + // logger('args: ' . print_r($a->argv,true)); if(argc() > 3 && intval(argv(2)) && intval(argv(3))) { $mode = 'view'; diff --git a/mod/events.php b/mod/events.php index be39902aa..8e3b3e06b 100755 --- a/mod/events.php +++ b/mod/events.php @@ -299,7 +299,7 @@ function events_content(&$a) { $ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " " : ''); -logger('args: ' . print_r($a->argv,true)); + // logger('args: ' . print_r($a->argv,true)); diff --git a/version.inc b/version.inc index 2d59eb514..c612b6ed2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-02-24.1317H +2016-02-25.1318H |