Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / plugins / Bookmark / newbookmark.php

diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index efc664e7b64869603d18c06991f3a30425b2a052..57be783b3805003ad8d4ba8941ded6ae75bc77c2 100644 (file)
--- a/plugins/Bookmark/newbookmark.php
+++ b/plugins/Bookmark/newbookmark.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Add a new bookmark
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,6 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 if (!defined('STATUSNET')) {
     // This check helps protect against security problems;
     // your code file can't be executed directly from the web.
@@ -44,26 +43,25 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class NewbookmarkAction extends Action
 {
-    private $_user        = null;
-    private $_error       = null;
-    private $_complete    = null;
-    private $_title       = null;
-    private $_url         = null;
-    private $_tags        = null;
-    private $_description = null;
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+    protected $title       = null;
+    protected $url         = null;
+    protected $tags        = null;
+    protected $description = null;
 
     /**
      * Returns the title of the action
      *
      * @return string Action title
      */
-
     function title()
     {
-        return _('New bookmark');
+        // TRANS: Title for action to create a new bookmark.
+        return _m('New bookmark');
     }
 
     /**
@@ -73,15 +71,19 @@ class NewbookmarkAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
 
-        $this->_user = common_current_user();
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
+
+        $this->user = common_current_user();
 
-        if (empty($this->_user)) {
-            throw new ClientException(_("Must be logged in to post a bookmark."),
+        if (empty($this->user)) {
+            // TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+            throw new ClientException(_m('Must be logged in to post a bookmark.'),
                                       403);
         }
 
@@ -89,10 +91,10 @@ class NewbookmarkAction extends Action
             $this->checkSessionToken();
         }
 
-        $this->_title       = $this->trimmed('title');
-        $this->_url         = $this->trimmed('url');
-        $this->_tags        = $this->trimmed('tags');
-        $this->_description = $this->trimmed('description');
+        $this->title       = $this->trimmed('title');
+        $this->url         = $this->trimmed('url');
+        $this->tags        = $this->trimmed('tags');
+        $this->description = $this->trimmed('description');
 
         return true;
     }
@@ -104,7 +106,6 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -123,51 +124,100 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function newBookmark()
     {
         try {
-            if (empty($this->_title)) {
-                throw new ClientException(_('Bookmark must have a title.'));
+            if (empty($this->title)) {
+                // TRANS: Client exception thrown when trying to create a new bookmark without a title.
+                throw new ClientException(_m('Bookmark must have a title.'));
             }
 
-            if (empty($this->_url)) {
-                throw new ClientException(_('Bookmark must have an URL.'));
+            if (empty($this->url)) {
+                // TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+                throw new ClientException(_m('Bookmark must have an URL.'));
             }
 
+            $options = array();
+
+            ToSelector::fillOptions($this, $options);
 
-            $saved = Notice_bookmark::saveNew($this->_user,
-                                              $this->_title,
-                                              $this->_url,
-                                              $this->_tags,
-                                              $this->_description);
+            $saved = Bookmark::saveNew($this->user->getProfile(),
+                                       $this->title,
+                                       $this->url,
+                                       $this->tags,
+                                       $this->description,
+                                       $options);
 
         } catch (ClientException $ce) {
-            $this->_error = $ce->getMessage();
-            $this->showPage();
-            return;
+            if ($this->boolean('ajax')) {
+                header('Content-Type: text/xml;charset=utf-8');
+                $this->xw->startDocument('1.0', 'UTF-8');
+                $this->elementStart('html');
+                $this->elementStart('head');
+                // TRANS: Page title after an AJAX error occurs
+                $this->element('title', null, _('Ajax Error'));
+                $this->elementEnd('head');
+                $this->elementStart('body');
+                $this->element('p', array('id' => 'error'), $ce->getMessage());
+                $this->elementEnd('body');
+                $this->elementEnd('html');
+                return;
+            } else {
+                $this->error = $ce->getMessage();
+                $this->showPage();
+                return;
+            }
         }
 
-        common_redirect($saved->bestUrl(), 303);
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml;charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after posting a bookmark.
+            $this->element('title', null, _m('Bookmark posted'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->showNotice($saved);
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($saved->bestUrl(), 303);
+        }
     }
 
     /**
-     * Show the bookmark form
+     * Output a notice
+     *
+     * Used to generate the notice code for Ajax results.
+     *
+     * @param Notice $notice Notice that was saved
      *
      * @return void
      */
+    function showNotice($notice)
+    {
+        class_exists('NoticeList'); // @fixme hack for autoloader
+        $nli = new NoticeListItem($notice, $this);
+        $nli->show();
+    }
 
+    /**
+     * Show the bookmark form
+     *
+     * @return void
+     */
     function showContent()
     {
-        if (!empty($this->_error)) {
-            $this->element('p', 'error', $this->_error);
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
         }
 
         $form = new BookmarkForm($this,
-                                 $this->_title,
-                                 $this->_url,
-                                 $this->_tags,
-                                 $this->_description);
+                                 $this->title,
+                                 $this->url,
+                                 $this->tags,
+                                 $this->description);
 
         $form->show();
 
@@ -183,7 +233,6 @@ class NewbookmarkAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -194,4 +243,3 @@ class NewbookmarkAction extends Action
         }
     }
 }
- 
\ No newline at end of file