X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FPoll%2FPollPlugin.php;h=4f74e82a359da2048b4a7578de61b752e56f8bcc;hb=2c5cba28b6a8e13a58fe7584835340aa9779b146;hp=1fadcf108c386885b5c6273d58b9327a80eda9d5;hpb=3fc1d245a179efabfa862d3539642fe0fc67f856;p=quix0rs-gnu-social.git diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php index 1fadcf108c..4f74e82a35 100644 --- a/plugins/Poll/PollPlugin.php +++ b/plugins/Poll/PollPlugin.php @@ -51,6 +51,8 @@ class PollPlugin extends MicroAppPlugin const POLL_OBJECT = 'http://activityschema.org/object/poll'; const POLL_RESPONSE_OBJECT = 'http://activityschema.org/object/poll-response'; + var $oldSaveNew = true; + /** * Database schema setup * @@ -77,52 +79,18 @@ class PollPlugin extends MicroAppPlugin */ function onEndShowStyles($action) { - $action->cssLink($this->path('poll.css')); + $action->cssLink($this->path('css/poll.css')); 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 'ShowpollAction': - case 'NewpollAction': - case 'RespondpollAction': - case 'PollsettingsAction': - include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; - return false; - case 'Poll': - case 'Poll_response': - case 'User_poll_prefs': - include_once $dir.'/'.$cls.'.php'; - return false; - case 'NewPollForm': - case 'PollResponseForm': - case 'PollResultForm': - include_once $dir.'/'.strtolower($cls).'.php'; - return false; - default: - return true; - } - } - /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + public function onRouterInitialized(URLMapper $m) { $m->connect('main/poll/new', array('action' => 'newpoll')); @@ -152,12 +120,12 @@ class PollPlugin extends MicroAppPlugin * * @return value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Poll', 'version' => self::VERSION, 'author' => 'Brion Vibber', - 'homepage' => 'http://status.net/wiki/Plugin:Poll', + 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Poll', 'rawdescription' => // TRANS: Plugin description. _m('Simple extension for supporting basic polls.')); @@ -176,7 +144,7 @@ class PollPlugin extends MicroAppPlugin * * @return boolean hook value */ - function deleteRelated($notice) + function deleteRelated(Notice $notice) { $p = Poll::getByNotice($notice); @@ -196,7 +164,7 @@ class PollPlugin extends MicroAppPlugin * * @return Notice resulting notice */ - function saveNoticeFromActivity($activity, $profile, $options=array()) + function saveNoticeFromActivity(Activity $activity, Profile $profile, array $options=array()) { // @fixme common_log(LOG_DEBUG, "XXX activity: " . var_export($activity, true)); @@ -235,7 +203,7 @@ class PollPlugin extends MicroAppPlugin // TRANS: Exception thrown trying to respond to a poll without a poll reference. throw new Exception(_m('Invalid poll response: No poll reference.')); } - $poll = Poll::staticGet('uri', $pollUri); + $poll = Poll::getKV('uri', $pollUri); if (!$poll) { // TRANS: Exception thrown trying to respond to a non-existing poll. throw new Exception(_m('Invalid poll response: Poll is unknown.')); @@ -253,7 +221,7 @@ class PollPlugin extends MicroAppPlugin } } - function activityObjectFromNotice($notice) + function activityObjectFromNotice(Notice $notice) { assert($this->isMyNotice($notice)); @@ -269,14 +237,14 @@ class PollPlugin extends MicroAppPlugin } } - function activityObjectFromNoticePollResponse($notice) + function activityObjectFromNoticePollResponse(Notice $notice) { $object = new ActivityObject(); $object->id = $notice->uri; $object->type = self::POLL_RESPONSE_OBJECT; $object->title = $notice->content; $object->summary = $notice->content; - $object->link = $notice->bestUrl(); + $object->link = $notice->getUrl(); $response = Poll_response::getByNotice($notice); if ($response) { @@ -292,14 +260,14 @@ class PollPlugin extends MicroAppPlugin return $object; } - function activityObjectFromNoticePoll($notice) + function activityObjectFromNoticePoll(Notice $notice) { $object = new ActivityObject(); $object->id = $notice->uri; $object->type = self::POLL_OBJECT; $object->title = $notice->content; $object->summary = $notice->content; - $object->link = $notice->bestUrl(); + $object->link = $notice->getUrl(); $poll = Poll::getByNotice($notice); if ($poll) { @@ -407,70 +375,6 @@ class PollPlugin extends MicroAppPlugin } } - - /** - * @fixme WARNING WARNING WARNING parent class closes the final div that we - * open here, but we probably shouldn't open it here. Check parent class - * and Bookmark plugin for if that's right. - */ - function showNotice($notice, $out) - { - switch ($notice->object_type) { - case self::POLL_OBJECT: - return $this->showNoticePoll($notice, $out); - case self::POLL_RESPONSE_OBJECT: - return $this->showNoticePollResponse($notice, $out); - default: - // TRANS: Exception thrown when performing an unexpected action on a poll. - // TRANS: %s is the unexpected object type. - throw new Exception(sprintf(_m('Unexpected type for poll plugin: %s.'), $notice->object_type)); - } - } - - function showNoticePoll($notice, $out) - { - $user = common_current_user(); - - // @hack we want regular rendering, then just add stuff after that - $nli = new NoticeListItem($notice, $out); - $nli->showNotice(); - - $out->elementStart('div', array('class' => 'entry-content poll-content')); - $poll = Poll::getByNotice($notice); - if ($poll) { - if ($user) { - $profile = $user->getProfile(); - $response = $poll->getResponse($profile); - if ($response) { - // User has already responded; show the results. - $form = new PollResultForm($poll, $out); - } else { - $form = new PollResponseForm($poll, $out); - } - $form->show(); - } - } else { - // TRANS: Error text displayed if no poll data could be found. - $out->text(_m('Poll data is missing')); - } - $out->elementEnd('div'); - - // @fixme - $out->elementStart('div', array('class' => 'entry-content')); - } - - function showNoticePollResponse($notice, $out) - { - $user = common_current_user(); - - // @hack we want regular rendering, then just add stuff after that - $nli = new NoticeListItem($notice, $out); - $nli->showNotice(); - - // @fixme - $out->elementStart('div', array('class' => 'entry-content')); - } - function entryForm($out) { return new NewPollForm($out); @@ -503,9 +407,9 @@ class PollPlugin extends MicroAppPlugin function onEndNoticeWhoGets($notice, &$ni) { if ($notice->object_type == self::POLL_RESPONSE_OBJECT) { foreach ($ni as $id => $source) { - $user = User::staticGet('id', $id); + $user = User::getKV('id', $id); if (!empty($user)) { - $pollPrefs = User_poll_prefs::staticGet('user_id', $user->id); + $pollPrefs = User_poll_prefs::getKV('user_id', $user->id); if (!empty($pollPrefs) && ($pollPrefs->hide_responses)) { unset($ni[$id]); } @@ -536,4 +440,27 @@ class PollPlugin extends MicroAppPlugin return true; } + + protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null) + { + if ($stored->object_type == self::POLL_RESPONSE_OBJECT) { + parent::showNoticeContent($stored, $out, $scoped); + return; + } + + // If the stored notice is a POLL_OBJECT + $poll = Poll::getByNotice($stored); + if ($poll instanceof Poll) { + if (!$scoped instanceof Profile || $poll->getResponse($scoped) instanceof Poll_response) { + // Either the user is not logged in or it has already responded; show the results. + $form = new PollResultForm($poll, $out); + } else { + $form = new PollResponseForm($poll, $out); + } + $form->show(); + } else { + // TRANS: Error text displayed if no poll data could be found. + $out->text(_m('Poll data is missing')); + } + } }