* i18n/L10n fixes.

[quix0rs-gnu-social.git] / actions / apidirectmessage.php

diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 4e55886d95bb0240473ce3ecca3d992823338594..e072e27b8319b925aee1296c6663a79e862cc381 100644 (file)
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -21,6 +21,9 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Adrian Lang <mail@adrianlang.de>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,18 +34,20 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Show a list of direct messages from or to the authenticating user
  *
  * @category API
  * @package  StatusNet
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <robin@millette.info>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiDirectMessageAction extends ApiAuthAction
 {
     var $messages     = null;
@@ -58,9 +63,7 @@ class ApiDirectMessageAction extends ApiAuthAction
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -68,22 +71,25 @@ class ApiDirectMessageAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            // TRANS: Client error given when a user was not found (404).
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
         $server   = common_root_url();
-        $taguribase = common_config('integration', 'taguri');
+        $taguribase = TagURI::base();
 
         if ($this->arg('sent')) {
 
             // Action was called by /api/direct_messages/sent.format
 
             $this->title = sprintf(
+                // TRANS: Title. %s is a user nickname.
                 _("Direct messages from %s"),
                 $this->user->nickname
             );
             $this->subtitle = sprintf(
+                // TRANS: Subtitle. %s is a user nickname.
                 _("All the direct messages sent from %s"),
                 $this->user->nickname
             );
@@ -92,10 +98,12 @@ class ApiDirectMessageAction extends ApiAuthAction
             $this->id = "tag:$taguribase:SentDirectMessages:" . $this->user->id;
         } else {
             $this->title = sprintf(
+                // TRANS: Title. %s is a user nickname.
                 _("Direct messages to %s"),
                 $this->user->nickname
             );
             $this->subtitle = sprintf(
+                // TRANS: Subtitle. %s is a user nickname.
                 _("All the direct messages sent to %s"),
                 $this->user->nickname
             );
@@ -118,7 +126,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -130,7 +137,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showMessages()
     {
         switch($this->format) {
@@ -147,7 +153,8 @@ class ApiDirectMessageAction extends ApiAuthAction
             $this->showJsonDirectMessages();
             break;
         default:
-            $this->clientError(_('API method not found!'), $code = 404);
+            // TRANS: Client error given when an API method was not found (404).
+            $this->clientError(_('API method not found.'), $code = 404);
             break;
         }
     }
@@ -157,7 +164,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return array notices
      */
-
     function getMessages()
     {
         $message  = new Message();
@@ -176,11 +182,6 @@ class ApiDirectMessageAction extends ApiAuthAction
             $message->whereAdd('id > ' . $this->since_id);
         }
 
-        if (!empty($since)) {
-            $d = date('Y-m-d H:i:s', $this->since);
-            $message->whereAdd("created > '$d'");
-        }
-
         $message->orderBy('created DESC, id DESC');
         $message->limit((($this->page - 1) * $this->count), $this->count);
         $message->find();
@@ -201,7 +202,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -212,7 +212,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return string datestamp of the latest notice in the stream
      */
-
     function lastModified()
     {
         if (!empty($this->messages)) {
@@ -227,11 +226,11 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showXmlDirectMessages()
     {
         $this->initDocument('xml');
-        $this->elementStart('direct-messages', array('type' => 'array'));
+        $this->elementStart('direct-messages', array('type' => 'array',
+                                                     'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
 
         foreach ($this->messages as $m) {
             $dm_array = $this->directMessageArray($m);
@@ -247,7 +246,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showJsonDirectMessages()
     {
         $this->initDocument('json');
@@ -268,7 +266,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showRssDirectMessages()
     {
         $this->initDocument('rss');
@@ -303,7 +300,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showAtomDirectMessages()
     {
         $this->initDocument('atom');
@@ -345,7 +341,6 @@ class ApiDirectMessageAction extends ApiAuthAction
      *
      * @return string etag
      */
-
     function etag()
     {
         if (!empty($this->messages)) {
@@ -355,6 +350,7 @@ class ApiDirectMessageAction extends ApiAuthAction
             return '"' . implode(
                 ':',
                 array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
                       common_language(),
                       strtotime($this->messages[0]->created),
                       strtotime($this->messages[$last]->created)
@@ -365,5 +361,4 @@ class ApiDirectMessageAction extends ApiAuthAction
 
         return null;
     }
-
 }