Merge pull request #14 from duthied/master

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 1032022b34820646964e79d61f51dbc33a2f5679..99f685d0bd9f2021c5ef39380c5a93453b460d2c 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -8,7 +8,7 @@ function format_event_html($ev) {
        if(! ((is_array($ev)) && count($ev)))
                return '';
 
-       $bd_format = t('l F d, Y \@ g A') ; // Friday January 18, 2011 @ 8 AM
+       $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
        $o = '<div class="vevent">' . "\r\n";
 
@@ -197,6 +197,7 @@ function event_store($arr) {
        $arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );   
        $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
        $arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
+       $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
 
        if($arr['cid'])
                $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -275,7 +276,7 @@ function event_store($arr) {
                        $object .= '</object>' . "\n";
 
 
-                       q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       q("UPDATE `item` SET `body` = '%s', `object` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `edited` = '%s', `private` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                dbesc(format_event_bbcode($arr)),
                                dbesc($object),
                                dbesc($arr['allow_cid']),
@@ -283,6 +284,7 @@ function event_store($arr) {
                                dbesc($arr['deny_cid']),
                                dbesc($arr['deny_gid']),
                                dbesc($arr['edited']),
+                               intval($arr['private']),
                                intval($r[0]['id']),
                                intval($arr['uid'])
                        );
@@ -341,10 +343,11 @@ function event_store($arr) {
                $item_arr['author-link']   = $contact['url'];
                $item_arr['author-avatar'] = $contact['thumb'];
                $item_arr['title']         = '';
-               $item_arr['allow_cid']     = $str_contact_allow;
-               $item_arr['allow_gid']     = $str_group_allow;
-               $item_arr['deny_cid']      = $str_contact_deny;
-               $item_arr['deny_gid']      = $str_group_deny;
+               $item_arr['allow_cid']     = $arr['allow_cid'];
+               $item_arr['allow_gid']     = $arr['allow_gid'];
+               $item_arr['deny_cid']      = $arr['deny_cid'];
+               $item_arr['deny_gid']      = $arr['deny_gid'];
+               $item_arr['private']       = $arr['private'];
                $item_arr['last-child']    = 1;
                $item_arr['visible']       = 1;
                $item_arr['verb']          = ACTIVITY_POST;