Merge pull request #32 from unary/events

some fixes related to events

4 files changed, 8 insertions, 7 deletions

diff --git a/include/event.php b/include/event.php
index 6a35bd0ad..e334c5a4f 100644
--- a/include/event.php
+++ b/include/event.php
@@ -332,7 +332,7 @@ function event_store($arr) {
 			$arr['uri'] = item_message_id();
 
 
-		$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary, desc,location,type,
+		$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary, `desc`,location,type,
 			adjust,nofinish,allow_cid,allow_gid,deny_cid,deny_gid)
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
 			intval($arr['uid']),
diff --git a/mod/events.php b/mod/events.php
index 8c509cfea..dd1f92f66 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -229,9 +229,9 @@ function events_content(&$a) {
 		$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
 		$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
-
 		if (x($_GET,'id')){
-			$r = q("SELECT * from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
+		  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
 				intval(local_user()),
 				intval($_GET['id'])
 			);
@@ -242,8 +242,8 @@ function events_content(&$a) {
 			// Noting this for now - it will need to be fixed here and in Friendica.
 			// Ultimately the finish date shouldn't be involved in the query. 
 
-
-			$r = q("SELECT * from event left join item on event_hash = resource_id 
+			$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
+                              from event left join item on event_hash = resource_id 
 				where resource_type = 'event' and event.uid = %d and event.ignore = %d 
 				AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' ) 
 				OR  (  `adjust` = 1 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' )) ",
@@ -339,6 +339,7 @@ function events_content(&$a) {
 		else {
 			$tpl = get_markup_template("events-js.tpl");
 		}
+
 		$o = replace_macros($tpl, array(
 			'$baseurl'	=> $a->get_baseurl(),
 			'$tabs'		=> $tabs,
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 80c1dfc55..f1150c158 100644
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -1,7 +1,7 @@
 {{ for $events as $event }}
 	<div class="event">
 	
-	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+	{{ if $event.item.author.xchan_name }}<a href="$event.item.author.xchan_url" ><img src="$event.item.author.xchan_photo_s" height="32" width="32" />$event.item.author.xchan_name</a>{{ endif }}
 	$event.html
 	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1"  class="plink-event-link icon s22 remote-link"></a>{{ endif }}
 	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
diff --git a/view/tpl/smarty3/event.tpl b/view/tpl/smarty3/event.tpl
index 1ba472377..76c9433fd 100644
--- a/view/tpl/smarty3/event.tpl
+++ b/view/tpl/smarty3/event.tpl
@@ -6,7 +6,7 @@
 {{foreach $events as $event}}
 	<div class="event">
 	
-	{{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}}
+	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
 	{{$event.html}}
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
 	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}