X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FPoll%2Frespondpoll.php;h=74629c3604b2ba10846b6c5cc1b7164b519fb772;hb=90d35885aeed68b11a80225ff255b6ac70a349b9;hp=07a5235406dec8505378a32b21d5a73d781487dc;hpb=88e09d45c91b5f59bd5e012ebbef73c635abcb18;p=quix0rs-gnu-social.git

diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
index 07a5235406..74629c3604 100644
--- a/plugins/Poll/respondpoll.php
+++ b/plugins/Poll/respondpoll.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Add a new Poll
+ * Respond to a Poll
  *
  * PHP version 5
  *
@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Add a new Poll
+ * Respond to a Poll
  *
  * @category  Poll
  * @package   StatusNet
@@ -43,7 +43,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class RespondPollAction extends Action
 {
     protected $user        = null;
@@ -58,9 +57,9 @@ class RespondPollAction extends Action
      *
      * @return string Action title
      */
-
     function title()
     {
+        // TRANS: Page title for poll response.
         return _m('Poll response');
     }
 
@@ -71,15 +70,18 @@ class RespondPollAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
 
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_m("Must be logged in to respond to a poll."),
+            // TRANS: Client exception thrown trying to respond to a poll while not logged in.
+            throw new ClientException(_m("You must be logged in to respond to a poll."),
                                       403);
         }
 
@@ -90,11 +92,13 @@ class RespondPollAction extends Action
         $id = $this->trimmed('id');
         $this->poll = Poll::staticGet('id', $id);
         if (empty($this->poll)) {
-            throw new ClientException(_m("Invalid or missing poll."), 404);
+            // TRANS: Client exception thrown trying to respond to a non-existing poll.
+            throw new ClientException(_m('Invalid or missing poll.'), 404);
         }
 
         $selection = intval($this->trimmed('pollselection'));
         if ($selection < 1 || $selection > count($this->poll->getOptions())) {
+            // TRANS: Client exception thrown responding to a poll with an invalid answer.
             throw new ClientException(_m('Invalid poll selection.'));
         }
         $this->selection = $selection;
@@ -109,7 +113,6 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -128,24 +131,19 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function respondPoll()
     {
         try {
-            $response = new Poll_response();
-            $response->poll_id = $this->poll->id;
-            $response->profile_id = $this->user->id;
-            $response->selection = $this->selection;
-            $response->created = common_sql_now();
-            $response->insert();
-
+            $notice = Poll_response::saveNew($this->user->getProfile(),
+                                             $this->poll,
+                                             $this->selection);
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();
             return;
         }
 
-        if ($this->arg('ajax')) {
+        if ($this->boolean('ajax')) {
             header('Content-Type: text/xml;charset=utf-8');
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
@@ -168,7 +166,6 @@ class RespondPollAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         if (!empty($this->error)) {
@@ -191,7 +188,6 @@ class RespondPollAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||