aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-05-02 21:12:57 -0600
committerZach Prezkuta <fermion@gmx.com>2012-05-02 21:12:57 -0600
commit5d957c3803936b8be54b5e197246d670fdcfa223 (patch)
treebdd70771e28b9c4e2da9b4fd5729448aa7b84ab5
parent3ecde2d72f27c248eb13d53d3f601934f6baaf16 (diff)
downloadvolse-hubzilla-5d957c3803936b8be54b5e197246d670fdcfa223.tar.gz
volse-hubzilla-5d957c3803936b8be54b5e197246d670fdcfa223.tar.bz2
volse-hubzilla-5d957c3803936b8be54b5e197246d670fdcfa223.zip
Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
-rw-r--r--mod/events.php19
1 files changed, 19 insertions, 0 deletions
diff --git a/mod/events.php b/mod/events.php
index e66a2dc44..1f11e7503 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -28,6 +28,9 @@ function events_post(&$a) {
$adjust = intval($_POST['adjust']);
$nofinish = intval($_POST['nofinish']);
+ // The default setting for the `private` field in event_store() is false, so mirror that
+ $private_event = false;
+
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
if($nofinish)
@@ -70,8 +73,23 @@ function events_post(&$a) {
$str_contact_allow = perms2str($_POST['contact_allow']);
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
+
+ // Undo the pseudo-contact of self, since there are real contacts now
+ if( strpos($str_contact_allow, '<' . local_user() . '>') !== false )
+ {
+ $str_contact_allow = str_replace('<' . local_user() . '>', '', $str_contact_allow);
+ }
+ // Make sure to set the `private` field as true. This is necessary to
+ // have the posts show up correctly in Diaspora if an event is created
+ // as visible only to self at first, but then edited to display to others.
+ if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
+ {
+ $private_event = true;
+ }
}
else {
+ // Note: do not set `private` field for self-only events. It will
+ // keep even you from seeing them!
$str_contact_allow = '<' . local_user() . '>';
$str_group_allow = $str_contact_deny = $str_group_deny = '';
}
@@ -91,6 +109,7 @@ function events_post(&$a) {
$datarray['allow_gid'] = $str_group_allow;
$datarray['deny_cid'] = $str_contact_deny;
$datarray['deny_gid'] = $str_group_deny;
+ $datarray['private'] = $private_event;
$datarray['id'] = $event_id;
$datarray['created'] = $created;
$datarray['edited'] = $edited;