X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffavor.php;h=bcefcd26e70c21f7ce22f4c91651e035e557f4eb;hb=691f374a52f68db6895c15cce79e92d4d6420592;hp=3b7d979ebcc8139b67abaafb36904e0244629505;hpb=6be15dfcacfa821566c16e71cc7bc478b2ff9433;p=quix0rs-gnu-social.git

diff --git a/actions/favor.php b/actions/favor.php
index 3b7d979ebc..bcefcd26e7 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -1,21 +1,18 @@
 <?php
-
 /**
  * Favor action.
  *
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
-
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -31,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -42,11 +39,11 @@ require_once INSTALLDIR.'/lib/disfavorform.php';
  * Favor class.
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class FavorAction extends Action
 {
@@ -61,6 +58,7 @@ class FavorAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
             $this->clientError(_('Not logged in.'));
             return;
         }
@@ -74,15 +72,17 @@ class FavorAction extends Action
         $notice = Notice::staticGet($id);
         $token  = $this->trimmed('token-'.$notice->id);
         if (!$token || $token != common_session_token()) {
-            $this->clientError(_("There was a problem with your session token. Try again, please."));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
         if ($user->hasFave($notice)) {
+            // TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
             $this->clientError(_('This notice is already a favorite!'));
             return;
         }
-        $fave = Fave::addNew($user, $notice);
+        $fave = Fave::addNew($user->getProfile(), $notice);
         if (!$fave) {
+            // TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
             $this->serverError(_('Could not create favorite.'));
             return;
         }
@@ -91,6 +91,7 @@ class FavorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for page on which favorite notices can be unfavourited.
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -106,7 +107,7 @@ class FavorAction extends Action
     }
 
     /**
-     * Notifies a user when his notice is favorited.
+     * Notifies a user when their notice is favorited.
      *
      * @param class $notice favorited notice
      * @param class $user   user declaring a favorite
@@ -125,4 +126,3 @@ class FavorAction extends Action
         }
     }
 }
-