Merge remote-tracking branch 'friendika/master' into newacl

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 156b464ba7d7f0150b480458dcf737695896f7ab..b0b54601fdf09f653b9d94d12935ec57bdeebb52 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -103,8 +103,23 @@ function events_content(&$a) {
                return;
        }
 
+       $o ="";
+       // tabs
+       $tpl = get_markup_template('profile_tabs.tpl');
+       $o .= replace_macros($tpl,array(
+               '$url' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
+               '$phototab' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
+               '$status' => t('Status'),
+               '$profile' => t('Profile'),
+               '$photos' => t('Photos'),
+               '$events' => t('Events') ,
+               '$notes' => t('Personal Notes'),
+               '$activetab' => "events",
+       ));     
+
        $o .= '<h2>' . t('Events') . '</h2>';
 
+
        $mode = 'view';
        $y = 0;
        $m = 0;
@@ -168,7 +183,8 @@ function events_content(&$a) {
                $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
 
-               $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
+               $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
+                       `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` 
                        WHERE `event`.`uid` = %d
                        AND (( `adjust` = 0 AND `start` >= '%s' AND `start` <= '%s' ) 
                        OR  (  `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ",
@@ -203,10 +219,6 @@ function events_content(&$a) {
 
 
 
-
-
-
-
                $last_date = '';
                $fmt = t('l, F j');
 
@@ -220,7 +232,7 @@ function events_content(&$a) {
                                        $o .= '<hr /><a name="link-' . $j . '" ><div class="event-list-date">' . $d . '</div></a>';
                                $last_date = $d;
                                $o .= format_event_html($rr);
-                               $o .= '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>';
+                               $o .= ((! $rr['cid']) ? '<a href="' . $a->get_baseurl() . '/events/event/' . $rr['id'] . '" title="' . t('Edit event') . '" class="edit-event-link icon pencil"></a>' : '');
                                if($rr['plink'])
                                        $o .= '<a href="' . $rr['plink'] . '" title="' . t('link to source') . '" target="external-link" class="plink-event-link icon remote-link"></a></div>';
 
@@ -318,4 +330,4 @@ function events_content(&$a) {
 
                return $o;
        }
-}
\ No newline at end of file
+}