From 67021c132a4cc6de1fe76aa8faab7bfc37e58423 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 9 Jun 2011 16:24:29 -0700 Subject: [PATCH 1/3] event communication basics --- boot.php | 3 ++- include/bbcode.php | 2 +- include/event.php | 51 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 1c7a157052..8e8a2bc210 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.1005' ); +define ( 'FRIENDIKA_VERSION', '2.2.1006' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1063 ); @@ -150,6 +150,7 @@ define ( 'ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person' ); define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' ); define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); +define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); /** * item weight for query ordering diff --git a/include/bbcode.php b/include/bbcode.php index c1576fbcf0..6ab67ffdcf 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -37,7 +37,7 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '$2', $Text); // Check for bold text - $Text = preg_replace("(\[b\](.*?)\[\/b])is",'$1',$Text); + $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'$1',$Text); // Check for Italics text $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'$1',$Text); diff --git a/include/event.php b/include/event.php index 6962a2f1b8..31cf536ffd 100644 --- a/include/event.php +++ b/include/event.php @@ -105,16 +105,63 @@ function parse_event($h) { } +function format_event_bbcode($ev) { + + $o = ''; + + if($ev['desc']) + $o .= '[event-description]' . $ev['desc'] . '[/event-description]'; + + if($ev['start']) + $o .= '[event-start]' . $ev['start'] . '[/event-start]'; + + if($ev['start']) + $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; + + if($ev['location']) + $o .= '[event-location]' . $ev['location'] . '[/event-location]'; + + if($ev['adjust']) + $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]'; + return $o; + +} + +function bbtovcal($s) { + $o = ''; + $ev = bbtoevent($s); + if($ev['desc']) + $o = format_event_html($ev); + return $o; +} +function bbtoevent($s) { + $ev = array(); + $match = ''; + if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match)) + $ev['desc'] = $match[1]; + $match = ''; + if(preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match)) + $ev['start'] = $match[1]; + $match = ''; + if(preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match)) + $ev['finish'] = $match[1]; + $match = ''; + if(preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match)) + $ev['location'] = $match[1]; + $match = ''; + if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) + $ev['adjust'] = $match[1]; + $match = ''; + return $ev; - - +} function sort_by_date($a) { From 8aaf55c1e6216f1221569e7087bcdd1000124d5f Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 9 Jun 2011 20:02:48 -0700 Subject: [PATCH 2/3] event item --- include/bbcode.php | 25 +++++++++++++++++++++++ include/event.php | 6 +++--- mod/events.php | 51 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 6ab67ffdcf..a44838c246 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,5 +1,8 @@ ', $Text); + + // oembed tag $Text = oembed_bbcode2html($Text); + + // If we found an event earlier, strip out all the event code and replace with a reformatted version. + + if(x($ev,'desc') && x($ev,'start')) { + $sub = format_event_html($ev); + + $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/is",$sub,$Text); + $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/is",'',$Text); + $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/is",'',$Text); + $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/is",'',$Text); + $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text); + } + + call_hooks('bbcode',$Text); diff --git a/include/event.php b/include/event.php index 31cf536ffd..86a8220808 100644 --- a/include/event.php +++ b/include/event.php @@ -1,7 +1,7 @@ contact['id']; + $arr['owner-name'] = $a->contact['name']; + $arr['owner-link'] = $a->contact['url']; + $arr['owner-avatar'] = $a->contact['thumb']; + $arr['author-name'] = $a->contact['name']; + $arr['author-link'] = $a->contact['url']; + $arr['author-avatar'] = $a->contact['thumb']; + $arr['title'] = ''; + $arr['allow_cid'] = $str_contact_allow; + $arr['allow_gid'] = $str_group_allow; + $arr['deny_cid'] = $str_contact_deny; + $arr['deny_gid'] = $str_group_deny; + $arr['last-child'] = 1; + $arr['visible'] = 1; + $arr['verb'] = ACTIVITY_POST; + $arr['object-type'] = ACTIVITY_OBJ_EVENT; + + $arr['body'] = format_event_bbcode($event); + + + $arr['object'] = '' . ACTIVITY_OBJ_EVENT . '' . $uri . ''; + $arr['object'] .= '' . format_event_bbcode($event) . ''; + $arr['object'] .= '' . "\n"; + + $item_id = item_store($arr); + if($item_id) { + q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d LIMIT 1", + dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), + intval($event['id']), + intval($local_user()), + intval($item_id) + ); + proc_run('php',"include/notifier.php","tag","$item_id"); + } + } } @@ -204,6 +252,7 @@ function events_content(&$a) { if(count($r)) { $r = sort_by_date($r); foreach($r as $rr) { + $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt)); $d = day_translate($d); if($d !== $last_date) From b857a49bfeecc91eaa5a09c9b9ded5b84516bc6e Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 9 Jun 2011 21:23:45 -0700 Subject: [PATCH 3/3] event publish --- mod/events.php | 35 +++++++++++++++++-------- view/event_form.tpl | 5 ++++ view/event_head.tpl | 62 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 view/event_head.tpl diff --git a/mod/events.php b/mod/events.php index c22038215d..052c0ef603 100644 --- a/mod/events.php +++ b/mod/events.php @@ -2,6 +2,7 @@ require_once('include/datetime.php'); require_once('include/event.php'); +require_once('include/items.php'); function events_post(&$a) { @@ -44,18 +45,27 @@ function events_post(&$a) { } - $desc = escape_tags($_POST['desc']); - $location = escape_tags($_POST['location']); + $desc = escape_tags(trim($_POST['desc'])); + $location = escape_tags(trim($_POST['location'])); $type = 'event'; - $str_group_allow = perms2str($_POST['group_allow']); - $str_contact_allow = perms2str($_POST['contact_allow']); - $str_group_deny = perms2str($_POST['group_deny']); - $str_contact_deny = perms2str($_POST['contact_deny']); + if((! $desc) || (! $start)) { + notice('Event description and start time are required.'); + goaway($a->get_baseurl() . '/events/new'); + } + $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0); - // until publishing is ready - $str_contact_allow = '<' . local_user() . '>'; + if($share) { + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); + } + else { + $str_contact_allow = '<' . local_user() . '>'; + $str_group_allow = $str_contact_deny = $str_group_deny = ''; + } if($event_id) { $r = q("UPDATE `event` SET @@ -158,7 +168,7 @@ function events_post(&$a) { q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d LIMIT 1", dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), intval($event['id']), - intval($local_user()), + intval(local_user()), intval($item_id) ); proc_run('php',"include/notifier.php","tag","$item_id"); @@ -265,7 +275,7 @@ function events_content(&$a) { } if($mode === 'edit' || $mode === 'new') { - $htpl = get_markup_template('profed_head.tpl'); + $htpl = get_markup_template('event_head.tpl'); $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl())); $tpl = get_markup_template('event_form.tpl'); @@ -274,6 +284,8 @@ function events_content(&$a) { $month = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm'); $day = datetime_convert('UTC', date_default_timezone_get(), 'now', 'd'); + require_once('include/acl_selectors.php'); + $o .= replace_macros($tpl,array( '$post' => $a->get_baseurl() . '/events', '$e_text' => t('Event details'), @@ -292,6 +304,9 @@ function events_content(&$a) { '$d_orig' => '', '$l_text' => t('Location:'), '$l_orig' => '', + '$sh_text' => t('Share this event'), + '$sh_checked' => '', + '$acl' => populate_acl($a->user,false), '$submit' => t('Submit') )); diff --git a/view/event_form.tpl b/view/event_form.tpl index 7449f845af..6401f16d08 100644 --- a/view/event_form.tpl +++ b/view/event_form.tpl @@ -29,6 +29,11 @@ $f_dsel $f_tsel
$l_text
+
$sh_text
+
+ +$acl + diff --git a/view/event_head.tpl b/view/event_head.tpl new file mode 100644 index 0000000000..4e50631316 --- /dev/null +++ b/view/event_head.tpl @@ -0,0 +1,62 @@ + + +