fix banner in duepuntozero

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index 31df86e2c595599641ddca6bf9525a59203cf120..8078a9a5ed1ea3ad76e1b7b9d50366f7c0f1b0d3 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -10,9 +10,9 @@ function format_event_html($ev) {
 
        $bd_format = t('l F d, Y \@ g A') ; // Friday January 18, 2011 @ 8 AM
 
-       $o = '<div class="vevent">';
+       $o = '<div class="vevent">' . "\r\n";
 
-       $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>';
+       $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
 
        $o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
                . datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
@@ -21,7 +21,7 @@ function format_event_html($ev) {
                        $ev['start'] , $bd_format ))
                        :  day_translate(datetime_convert('UTC', 'UTC', 
                        $ev['start'] , $bd_format)))
-               . '</abbr></p>';
+               . '</abbr></p>' . "\r\n";
 
        if(! $ev['nofinish'])
                $o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
@@ -31,14 +31,14 @@ function format_event_html($ev) {
                                $ev['finish'] , $bd_format ))
                                :  day_translate(datetime_convert('UTC', 'UTC', 
                                $ev['finish'] , $bd_format )))
-                       . '</abbr></p>';
+                       . '</abbr></p>'  . "\r\n";
 
        if(strlen($ev['location']))
                $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' 
                        . bbcode($ev['location']) 
-                       . '</span></p>';
+                       . '</span></p>' . "\r\n";
 
-       $o .= '</div>';
+       $o .= '</div>' . "\r\n";
        return $o;
 }
 
@@ -175,6 +175,9 @@ function ev_compare($a,$b) {
 
        $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
        $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+
+       if($date_a === $date_b)
+               return strcasecmp($a['desc'],$b['desc']);
        
        return strcmp($date_a,$date_b);
 }
@@ -305,7 +308,7 @@ function event_store($arr) {
                $item_arr['uri']           = $arr['uri'];
                $item_arr['parent-uri']    = $arr['uri'];
                $item_arr['type']          = 'activity';
-               $item_arr['wall']          = 1;
+               $item_arr['wall']          = (($arr['cid']) ? 0 : 1);
                $item_arr['contact-id']    = $contact['id'];
                $item_arr['owner-name']    = $contact['name'];
                $item_arr['owner-link']    = $contact['url'];