Using nickname only for uid

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

diff --git a/actions/favor.php b/actions/favor.php
index a4baa817a6a0e0a305717a23da470ad1901efcda..afda93cff29ae109c81a6e287ad797934f7d7814 100644 (file)
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -21,91 +21,77 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
 
-class FavorAction extends Action {
-
-       function handle($args) {
-               parent::handle($args);
-
-               if (!common_logged_in()) {
-                       common_user_error(_('Not logged in.'));
-                       return;
-               }
-
-               $user = common_current_user();
-
-               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-                       common_redirect(common_local_url('showfavorites', array('nickname' => $user->nickname)));
-                       return;
-               }
-
-               # CSRF protection
-
-               $token = $this->trimmed('token');
-               if (!$token || $token != common_session_token()) {
-                       $this->client_error(_('There was a problem with your session token. Try again, please.'));
-                       return;
-               }
-               $id = $this->trimmed('notice');
-
-               $notice = Notice::staticGet($id);
-
-               if ($user->hasFave($notice)) {
-                       $this->client_error(_('This notice is already a favorite!'));
-                       return;
-               }
-
-               $fave = Fave::addNew($user, $notice);
-
-               if (!$fave) {
-                       $this->server_error(_('Could not create favorite.'));
-                       return;
-               }
-
-               $this->notify($fave, $notice, $user);
-
-               if ($this->boolean('ajax')) {
-                       common_start_html('text/xml');
-                       common_element_start('head');
-                       common_element('title', _('Disfavor'));
-                       common_element_end('head');
-                       common_element_start('body');
-                       common_disfavor_form($notice);
-                       common_element_end('body');
-                       common_element_end('html');
-               } else {
-                       common_redirect(common_local_url('showfavorites',
-                                                                                        array('nickname' => $user->nickname)));
-               }
-       }
-
-       function notify($fave, $notice, $user) {
-           $other = User::staticGet('id', $notice->profile_id);
-               if ($other && $other->id != $user->id) {
-                       if ($other->email && $other->emailnotifyfav) {
-                               $this->notify_mail($other, $user, $notice);
-                       }
-                       # XXX: notify by IM
-                       # XXX: notify by SMS
-               }
-       }
-
-       function notify_mail($other, $user, $notice) {
-               $profile = $user->getProfile();
-               $bestname = $profile->getBestName();
-               $subject = sprintf(_('%s added your notice as a favorite'), $bestname);
-               $body = sprintf(_("%1\$s just added your notice from %2\$s as one of their favorites.\n\n" .
-                                                 "In case you forgot, you can see the text of your notice here:\n\n" .
-                                                 "%3\$s\n\n" .
-                                                 "You can see the list of %1\$s's favorites here:\n\n" .
-                                                 "%4\$s\n\n" .
-                                                 "Faithfully yours,\n" .
-                                                 "%5\$s\n"),
-                                               $bestname,
-                                               common_exact_date($notice->created),
-                                               common_local_url('shownotice', array('notice' => $notice->id)),
-                                               common_local_url('showfavorites', array('nickname' => $user->nickname)),
-                                               common_config('site', 'name'));
-
-               mail_to_user($other, $subject, $body);
-       }
-}
\ No newline at end of file
+class FavorAction extends Action
+{
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return;
+        }
+
+        $user = common_current_user();
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('showfavorites', array('nickname' => $user->nickname)));
+            return;
+        }
+
+        $id = $this->trimmed('notice');
+
+        $notice = Notice::staticGet($id);
+
+        # CSRF protection
+
+        $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."));
+            return;
+        }
+
+        if ($user->hasFave($notice)) {
+            $this->clientError(_('This notice is already a favorite!'));
+            return;
+        }
+
+        $fave = Fave::addNew($user, $notice);
+
+        if (!$fave) {
+            $this->serverError(_('Could not create favorite.'));
+            return;
+        }
+
+        $this->notify($fave, $notice, $user);
+        $user->blowFavesCache();
+        
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->elementStart('head');
+            $this->element('title', null, _('Disfavor favorite'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            common_disfavor_form($notice);
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('showfavorites',
+                                             array('nickname' => $user->nickname)));
+        }
+    }
+
+    function notify($fave, $notice, $user)
+    {
+        $other = User::staticGet('id', $notice->profile_id);
+        if ($other && $other->id != $user->id) {
+            if ($other->email && $other->emailnotifyfav) {
+                mail_notify_fave($other, $user, $notice);
+            }
+            # XXX: notify by IM
+            # XXX: notify by SMS
+        }
+    }
+
+}