OStatus and XMPP plugins now inform Nodeinfo plugins about their activity

[quix0rs-gnu-social.git] / plugins / Event / actions / newevent.php

diff --git a/plugins/Event/actions/newevent.php b/plugins/Event/actions/newevent.php
index cdb9e9e724ae551a7bc08b693485d9b48c731212..023aee6c75f033334c16a69c5756d1a136d95716 100644 (file)
--- a/plugins/Event/actions/newevent.php
+++ b/plugins/Event/actions/newevent.php
@@ -132,37 +132,34 @@ class NeweventAction extends FormAction
         $actobj->id = UUID::gen();
         $actobj->type = Happening::OBJECT_TYPE;
         $actobj->title = $title;
-        // TRANS: Rendered microformats2 tagged event description.
-        // TRANS: %1$s is a title, %2$s is iso8601 start time, %3$s is start time,
-        // TRANS: %4$s is iso8601 end time, %5$s is end time, %6$s is location, %7$s is description.
-        // TRANS: Class names should not be translated.
-        $actobj->summary = sprintf(_m('<div class="h-event">'.
-                              '<p class="p-name p-summary">%1$s</p> '.
-                              '<time class="dt-start" datetime="%2$s">%3$s</time> - '.
-                              '<time class="dt-end" datetime="%4$s">%5$s</time> '.
-                              '(<span class="p-location">%6$s</span>): '.
-                              '<div class="p-description">%7$s</div> '.
-                              '</div>'),
-                            htmlspecialchars($title),
-                            htmlspecialchars(common_date_iso8601($start_str)),
-                            htmlspecialchars(common_exact_date($start_str)),
-                            htmlspecialchars(common_date_iso8601($end_str)),
-                            htmlspecialchars(common_exact_date($end_str)),
-                            htmlspecialchars($location),
-                            htmlspecialchars($description));
-
+        $actobj->summary = $description;
         $actobj->extra[] = array('dtstart',
-                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($start_str));
+                                array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                                common_date_iso8601($start_str));
         $actobj->extra[] = array('dtend',
-                              array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
-                              common_date_iso8601($start_str));
-        $actobj->extra[] = array('location', false, $location);
-        $actobj->extra[] = array('url', false, $url);
+                                array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                                common_date_iso8601($end_str));
+        $actobj->extra[] = array('location',
+                                array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                                $location);
+        $actobj->extra[] = array('url',
+                                array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
+                                $url);
+
+        /* We don't use these ourselves, but we add them to be nice RSS/XML citizens */
+        $actobj->extra[] = array('startdate',
+                                array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'),
+                                common_date_iso8601($start_str));
+        $actobj->extra[] = array('enddate',
+                                array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'),
+                                common_date_iso8601($end_str));
+        $actobj->extra[] = array('location',
+                                array('xmlns' => 'http://purl.org/rss/1.0/modules/event/'),
+                                $location);
 
         $act->objects = array($actobj);
 
-        $stored = Notice::saveActivity($act, $this->scoped);
+        $stored = Notice::saveActivity($act, $this->scoped, $options);
 
         return _m('Saved the event.');
     }