X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FBookmark%2Fnewbookmark.php;h=92e9bc81c59a3ee77106f7a1383fb11969e378f9;hb=524b98bfa3fd340ade6ce8b0e7f23ce773db5d92;hp=a0cf3fffb297c2e33efa77ab68142783f1547126;hpb=6e894c010fc0e7ddaaafa8795634d6343019aafb;p=quix0rs-gnu-social.git

diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index a0cf3fffb2..92e9bc81c5 100644
--- 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
@@ -43,7 +43,6 @@ 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
 {
     protected $user        = null;
@@ -59,10 +58,10 @@ class NewbookmarkAction extends Action
      *
      * @return string Action title
      */
-
     function title()
     {
-        return _('New bookmark');
+        // TRANS: Title for action to create a new bookmark.
+        return _m('New bookmark');
     }
 
     /**
@@ -72,7 +71,6 @@ class NewbookmarkAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -80,7 +78,8 @@ class NewbookmarkAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_("Must be logged in to post a bookmark."),
+            // 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);
         }
 
@@ -103,7 +102,6 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -122,24 +120,32 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function newBookmark()
     {
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
         try {
             if (empty($this->title)) {
-                throw new ClientException(_('Bookmark must have a 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.'));
+                // 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 = Bookmark::saveNew($this->user->getProfile(),
-                                              $this->title,
-                                              $this->url,
-                                              $this->tags,
-                                              $this->description);
+                                       $this->title,
+                                       $this->url,
+                                       $this->tags,
+                                       $this->description,
+                                       $options);
 
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
@@ -147,15 +153,44 @@ class NewbookmarkAction extends Action
             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)) {
@@ -182,7 +217,6 @@ class NewbookmarkAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -193,4 +227,3 @@ class NewbookmarkAction extends Action
         }
     }
 }
- 
\ No newline at end of file