Merge branch '0.8.x' into small-fixes

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

diff --git a/actions/disfavor.php b/actions/disfavor.php
index 6ac94d720ac48aeb09949630fd95ca81f4f0985b..02e01d6e006bd3747beca0bfdfb694fd530309d0 100644 (file)
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -1,7 +1,19 @@
 <?php
-/*
+
+/**
+ * Disfavor action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -17,67 +29,80 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-class DisfavorAction extends Action {
-
-       function handle($args) {
-
-               parent::handle($args);
-
-               if (!common_logged_in()) {
-                       common_user_error(_('Not logged in.'));
-                       return;
-               }
-
-               $user = common_current_user();
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-                       common_redirect(common_local_url('showfavorites', array('nickname' => $user->nickname)));
-                       return;
-               }
+require_once INSTALLDIR.'/lib/favorform.php';
 
-               $id = $this->trimmed('notice');
-
-               $notice = Notice::staticGet($id);
-
-               $token = $this->trimmed('token-'.$notice->id);
-
-               if (!$token || $token != common_session_token()) {
-                       $this->client_error(_("There was a problem with your session token. Try again, please."));
-                       return;
-               }
-
-               $fave = new Fave();
-               $fave->user_id = $this->id;
-               $fave->notice_id = $notice->id;
-               if (!$fave->find(true)) {
-                       $this->client_error(_('This notice is not a favorite!'));
-                       return;
-               }
-
-               $result = $fave->delete();
-
-               if (!$result) {
-                       common_log_db_error($fave, 'DELETE', __FILE__);
-                       $this->server_error(_('Could not delete favorite.'));
-                       return;
-               }
-               
-               $user->blowFavesCache();
+/**
+ * Disfavor class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+class DisfavorAction extends Action
+{
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     *
+     * @return void
+     */
+    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);
+        $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;
+        }
+        $fave            = new Fave();
+        $fave->user_id   = $user->id;
+        $fave->notice_id = $notice->id;
+        if (!$fave->find(true)) {
+            $this->clientError(_('This notice is not a favorite!'));
+            return;
+        }
+        $result = $fave->delete();
+        if (!$result) {
+            common_log_db_error($fave, 'DELETE', __FILE__);
+            $this->serverError(_('Could not delete favorite.'));
+            return;
+        }
+        $user->blowFavesCache();
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Add to favorites'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $favor = new FavorForm($this, $notice);
+            $favor->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('showfavorites',
+                                             array('nickname' => $user->nickname)),
+                            303);
+        }
+    }
+}
 
-               if ($this->boolean('ajax')) {
-                       common_start_html('text/xml');
-                       common_element_start('head');
-                       common_element('title', null, _('Add to favorites'));
-                       common_element_end('head');
-                       common_element_start('body');
-                       common_favor_form($notice);
-                       common_element_end('body');
-                       common_element_end('html');
-               } else {
-                       common_redirect(common_local_url('showfavorites',
-                                                                                        array('nickname' => $user->nickname)));
-               }
-       }
-}
\ No newline at end of file