X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FEvent%2FEventPlugin.php;h=a1dffea3b96b6befbe0207c08447ffafba66560b;hb=546a03b5eac5f172d543a889625e2f4de446e8b7;hp=978b4610b2019df4111c39cb4905bac02d090599;hpb=638d29a82061daaa59348db987d1da18b735da1b;p=quix0rs-gnu-social.git diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 978b4610b2..a1dffea3b9 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -37,14 +37,14 @@ if (!defined('STATUSNET')) { /** * Event plugin * - * @category Sample + * @category Event * @package StatusNet * @author Evan Prodromou * @copyright 2011 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ -class EventPlugin extends MicroappPlugin +class EventPlugin extends MicroAppPlugin { /** * Set up our tables (event and rsvp) @@ -64,40 +64,6 @@ class EventPlugin extends MicroappPlugin return true; } - /** - * Load related modules when needed - * - * @param string $cls Name of the class to be loaded - * - * @return boolean hook value; true means continue processing, false means stop. - */ - function onAutoload($cls) - { - $dir = dirname(__FILE__); - - switch ($cls) - { - case 'NeweventAction': - case 'NewrsvpAction': - case 'CancelrsvpAction': - case 'ShoweventAction': - case 'ShowrsvpAction': - include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; - return false; - case 'EventForm': - case 'RSVPForm': - case 'CancelRSVPForm': - include_once $dir . '/'.strtolower($cls).'.php'; - break; - case 'Happening': - case 'RSVP': - include_once $dir . '/'.$cls.'.php'; - return false; - default: - return true; - } - } - /** * Map URLs to actions * @@ -119,13 +85,15 @@ class EventPlugin extends MicroappPlugin $m->connect('rsvp/:id', array('action' => 'showrsvp'), array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')); + $m->connect('main/event/updatetimes', + array('action' => 'timelist')); return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Event', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Event', 'description' => @@ -160,10 +128,11 @@ class EventPlugin extends MicroappPlugin * * @return Notice the resulting notice */ - function saveNoticeFromActivity($activity, $actor, $options=array()) + function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array()) { if (count($activity->objects) != 1) { - throw new Exception(_('Too many activity objects.')); + // TRANS: Exception thrown when there are too many activity objects. + throw new Exception(_m('Too many activity objects.')); } $happeningObj = $activity->objects[0]; @@ -177,18 +146,20 @@ class EventPlugin extends MicroappPlugin switch ($activity->verb) { case ActivityVerb::POST: + // FIXME: get startTime, endTime, location and URL $notice = Happening::saveNew($actor, - $start_time, - $end_time, - $happeningObj->title, - null, - $happeningObj->summary, - $options); + $start_time, + $end_time, + $happeningObj->title, + null, + $happeningObj->summary, + null, + $options); break; case RSVP::POSITIVE: case RSVP::NEGATIVE: case RSVP::POSSIBLE: - $happening = Happening::staticGet('uri', $happeningObj->id); + $happening = Happening::getKV('uri', $happeningObj->id); if (empty($happening)) { // FIXME: save the event // TRANS: Exception thrown when trying to RSVP for an unknown event. @@ -211,7 +182,7 @@ class EventPlugin extends MicroappPlugin * * @return ActivityObject */ - function activityObjectFromNotice($notice) + function activityObjectFromNotice(Notice $notice) { $happening = null; @@ -245,7 +216,7 @@ class EventPlugin extends MicroappPlugin $obj->type = Happening::OBJECT_TYPE; $obj->title = $happening->title; $obj->summary = $happening->description; - $obj->link = $notice->bestUrl(); + $obj->link = $notice->getUrl(); // XXX: how to get this stuff into JSON?! @@ -257,6 +228,9 @@ class EventPlugin extends MicroappPlugin array('xmlns' => 'urn:ietf:params:xml:ns:xcal'), common_date_iso8601($happening->end_time)); + // FIXME: add location + // FIXME: add URL + // XXX: probably need other stuff here return $obj; @@ -269,177 +243,34 @@ class EventPlugin extends MicroappPlugin * * @return ActivityObject */ - function onEndNoticeAsActivity($notice, &$act) { - switch ($notice->object_type) { + protected function extendActivity(Notice $stored, Activity $act, Profile $scoped=null) { + switch ($stored->object_type) { case RSVP::POSITIVE: case RSVP::NEGATIVE: case RSVP::POSSIBLE: - $act->verb = $notice->object_type; + $act->verb = $stored->object_type; break; } return true; } - /** - * Custom HTML output for our notices - * - * @param Notice $notice - * @param HTMLOutputter $out - */ - function showNotice($notice, $out) + function adaptNoticeListItem($nli) { + $notice = $nli->notice; + switch ($notice->object_type) { case Happening::OBJECT_TYPE: - $this->showEventNotice($notice, $out); + return new EventListItem($nli); break; case RSVP::POSITIVE: case RSVP::NEGATIVE: case RSVP::POSSIBLE: - $this->showRSVPNotice($notice, $out); + return new RSVPListItem($nli); break; } - - // @fixme we have to start the name/avatar and open this div - $out->elementStart('div', array('class' => 'event-info entry-content')); // EVENT-INFO.ENTRY-CONTENT IN - - $profile = $notice->getProfile(); - $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); - - $out->element('img', - array('src' => ($avatar) ? - $avatar->displayUrl() : - Avatar::defaultImage(AVATAR_MINI_SIZE), - 'class' => 'avatar photo bookmark-avatar', - 'width' => AVATAR_MINI_SIZE, - 'height' => AVATAR_MINI_SIZE, - 'alt' => $profile->getBestName())); - - $out->raw(' '); // avoid   for AJAX XML compatibility - - $out->elementStart('span', 'vcard author'); // hack for belongsOnTimeline; JS needs to be able to find the author - $out->element('a', - array('class' => 'url', - 'href' => $profile->profileurl, - 'title' => $profile->getBestName()), - $profile->nickname); - $out->elementEnd('span'); - } - - function showRSVPNotice($notice, $out) - { - $rsvp = RSVP::fromNotice($notice); - - if (empty($rsvp)) { - $out->element('p', null, _('Deleted.')); - return; - } - - $out->elementStart('div', 'rsvp'); - $out->raw($rsvp->asHTML()); - $out->elementEnd('div'); - return; + return null; } - function showEventNotice($notice, $out) - { - $profile = $notice->getProfile(); - $event = Happening::fromNotice($notice); - - if (empty($event)) { - $out->element('p', null, _('Deleted.')); - return; - } - - $out->elementStart('div', 'vevent event'); // VEVENT IN - - $out->elementStart('h3'); // VEVENT/H3 IN - - if (!empty($event->url)) { - $out->element('a', - array('href' => $event->url, - 'class' => 'event-title entry-title summary'), - $event->title); - } else { - $out->text($event->title); - } - - $out->elementEnd('h3'); // VEVENT/H3 OUT - - $startDate = strftime("%x", strtotime($event->start_time)); - $startTime = strftime("%R", strtotime($event->start_time)); - - $endDate = strftime("%x", strtotime($event->end_time)); - $endTime = strftime("%R", strtotime($event->end_time)); - - // FIXME: better dates - - $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN - - // TRANS: Field label for event description. - $out->element('strong', null, _m('Time:')); - - $out->element('abbr', array('class' => 'dtstart', - 'title' => common_date_iso8601($event->start_time)), - $startDate . ' ' . $startTime); - $out->text(' - '); - if ($startDate == $endDate) { - $out->element('span', array('class' => 'dtend', - 'title' => common_date_iso8601($event->end_time)), - $endTime); - } else { - $out->element('span', array('class' => 'dtend', - 'title' => common_date_iso8601($event->end_time)), - $endDate . ' ' . $endTime); - } - - $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT - - if (!empty($event->location)) { - $out->elementStart('div', 'event-location'); - // TRANS: Field label for event description. - $out->element('strong', null, _m('Location:')); - $out->element('span', 'location', $event->location); - $out->elementEnd('div'); - } - - if (!empty($event->description)) { - $out->elementStart('div', 'event-description'); - // TRANS: Field label for event description. - $out->element('strong', null, _m('Description:')); - $out->element('span', 'description', $event->description); - $out->elementEnd('div'); - } - - $rsvps = $event->getRSVPs(); - - $out->elementStart('div', 'event-rsvps'); - // TRANS: Field label for event description. - $out->element('strong', null, _m('Attending:')); - $out->element('span', 'event-rsvps', - // TRANS: RSVP counts. - // TRANS: %1$d, %2$d and %3$d are numbers of RSVPs. - sprintf(_m('Yes: %1$d No: %2$d Maybe: %3$d'), - count($rsvps[RSVP::POSITIVE]), - count($rsvps[RSVP::NEGATIVE]), - count($rsvps[RSVP::POSSIBLE]))); - $out->elementEnd('div'); - - $user = common_current_user(); - - if (!empty($user)) { - $rsvp = $event->getRSVP($user->getProfile()); - - if (empty($rsvp)) { - $form = new RSVPForm($event, $out); - } else { - $form = new CancelRSVPForm($rsvp, $out); - } - - $form->show(); - } - - $out->elementEnd('div'); // vevent out - } /** * Form for our app @@ -457,7 +288,7 @@ class EventPlugin extends MicroappPlugin * * @param Notice $notice */ - function deleteRelated($notice) + function deleteRelated(Notice $notice) { switch ($notice->object_type) { case Happening::OBJECT_TYPE: @@ -480,26 +311,22 @@ class EventPlugin extends MicroappPlugin function onEndShowScripts($action) { - $action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });'); + $action->script($this->path('js/event.js')); } function onEndShowStyles($action) { - $action->cssLink($this->path('event.css')); + $action->cssLink($this->path('css/event.css')); return true; } - function onStartShowThreadedNoticeTail($nli, $notice, &$children) + function onStartAddNoticeReply($nli, $parent, $child) { // Filter out any poll responses - if ($notice->object_type == Happening::OBJECT_TYPE) { - $children = array_filter($children, array($this, 'isNotRSVP')); + if (($parent->object_type == Happening::OBJECT_TYPE) && + in_array($child->object_type, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE))) { + return false; } return true; } - - function isNotRSVP($notice) - { - return (!in_array($notice->object_type, array(RSVP::POSITIVE, RSVP::NEGATIVE, RSVP::POSSIBLE))); - } }