Merge https://github.com/redmatrix/hubzilla into pending_merge

4 files changed, 64 insertions, 1 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 512e12838..8be99d91e 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -346,6 +346,7 @@ class Item extends BaseObject {
 			'owner_photo' => $this->get_owner_photo(),
 			'owner_name' => $this->get_owner_name(),
 			'photo' => $body['photo'],
+			'event' => $body['event'],
 			'has_tags' => $has_tags,
 
 // Item toolbar buttons
diff --git a/include/conversation.php b/include/conversation.php
index 2c447acbc..3b534dc69 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -697,6 +697,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'thumb' => $profile_avatar,
 					'title' => $item['title'],
 					'body' => $body['html'],
+					'event' => $body['event'],
 					'photo' => $body['photo'],
 					'tags' => $body['tags'],
 					'categories' => $body['categories'],
diff --git a/include/event.php b/include/event.php
index 9d111ca25..539bfe484 100644
--- a/include/event.php
+++ b/include/event.php
@@ -787,6 +787,12 @@ function event_store_item($arr, $event) {
 			'type'    => ACTIVITY_OBJ_EVENT,
 			'id'      => z_root() . '/event/' . $r[0]['resource_id'],
 			'title'   => $arr['summary'],
+			'start'   => $arr['start'],
+			'finish'  => $arr['finish'],
+			'nofinish'  => $arr['nofinish'],
+			'description' => $arr['description'],
+			'location'   => $arr['location'],
+			'adjust'   => $arr['adjust'],
 			'content' => format_event_bbcode($arr),
 			'author'  => array(
 			'name'     => $r[0]['xchan_name'],
@@ -926,6 +932,12 @@ function event_store_item($arr, $event) {
 				'type'    => ACTIVITY_OBJ_EVENT,
 				'id'      => z_root() . '/event/' . $event['event_hash'],
 				'title'   => $arr['summary'],
+				'start'   => $arr['start'],
+				'finish'  => $arr['finish'],
+				'nofinish'  => $arr['nofinish'],
+				'description' => $arr['description'],
+				'location'   => $arr['location'],
+				'adjust'   => $arr['adjust'],
 				'content' => format_event_bbcode($arr),
 				'author'  => array(
 					'name'     => $x[0]['xchan_name'],
diff --git a/include/text.php b/include/text.php
index eb9171b40..f40d67f23 100644
--- a/include/text.php
+++ b/include/text.php
@@ -5,6 +5,7 @@
 
 require_once("include/template_processor.php");
 require_once("include/smarty.php");
+require_once("include/bbcode.php");
 
 // random string, there are 86 characters max in text mode, 128 for hex
 // output is urlsafe
@@ -1413,9 +1414,55 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
+	$event = array();
+	$is_event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? true : false);
+
+	if($is_event) {
+		$object = json_decode($item['object'],true);
+		
+		//ensure compatibility with older items
+		if(array_key_exists('description', $object)) {
+
+			$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
+
+			$event['header'] 	= '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($object['title']) .  '</h3></div>' . "\r\n";
+
+			$event['header'] 	.= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
+						. datetime_convert('UTC', 'UTC', $object['start'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+						. '" >' 
+						. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+							$object['start'] , $bd_format ))
+							:  day_translate(datetime_convert('UTC', 'UTC', 
+							$object['start'] , $bd_format)))
+						. '</span></div>' . "\r\n";
+
+			if(! $object['nofinish'])
+				$event['header'] .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
+						 . datetime_convert('UTC','UTC',$object['finish'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+						 . '" >' 
+						 . (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
+							$object['finish'] , $bd_format ))
+							:  day_translate(datetime_convert('UTC', 'UTC', 
+							$object['finish'] , $bd_format )))
+						 . '</span></div>'  . "\r\n";
+
+
+			$event['content'] = '<div class="event-description">' . bbcode($object['description']) .  '</div>' . "\r\n";
+
+			if(strlen($object['location']))
+				$event['content'] .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">' 
+						  . bbcode($object['location'])
+						  . '</span></div>' . "\r\n";
+		}
+		else {
+			$is_event = false;
+		}
+	}
+
 	$prep_arr = array(
 		'item' => $item,
-		'html' => $s,
+		'html' => $is_event ? $event['content'] : $s,
+		'event' => $event['header'],
 		'photo' => $photo
 	);
 
@@ -1423,6 +1470,7 @@ function prepare_body(&$item,$attach = false) {
 
 	$s = $prep_arr['html'];
 	$photo = $prep_arr['photo'];
+	$event = $prep_arr['event'];
 
 //	q("update item set html = '%s' where id = %d",
 //		dbesc($s),
@@ -1489,6 +1537,7 @@ function prepare_body(&$item,$attach = false) {
 		'item' => $item,
 		'photo' => $photo,
 		'html' => $s,
+		'event' => $event,
 		'categories' => $categories,
 		'folders' => $filer,
 		'tags' => $tags,