X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FBookmark%2Fnewbookmark.php;h=57be783b3805003ad8d4ba8941ded6ae75bc77c2;hb=59043dca7fb6f974b11797c4d0f20e5b78b0611d;hp=79266e52b2d2ed3e44320704f512c742331e9fab;hpb=14456cbbb2b8f9266eb5ca13acff77e6b6699ac2;p=quix0rs-gnu-social.git

diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index 79266e52b2..57be783b38 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,9 +58,9 @@ class NewbookmarkAction extends Action
      *
      * @return string Action title
      */
-
     function title()
     {
+        // TRANS: Title for action to create a new bookmark.
         return _m('New bookmark');
     }
 
@@ -72,15 +71,19 @@ class NewbookmarkAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
 
+        if ($this->boolean('ajax')) {
+            StatusNet::setApi(true);
+        }
+
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            throw new ClientException(_m("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 +106,6 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -122,32 +124,49 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function newBookmark()
     {
-        if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
-        }
         try {
             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)) {
+                // 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();
-            $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;
+            }
         }
 
         if ($this->boolean('ajax')) {
@@ -155,8 +174,8 @@ class NewbookmarkAction extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
-            // TRANS: Page title after sending a notice.
-            $this->element('title', null, _m('Notice posted'));
+            // TRANS: Page title after posting a bookmark.
+            $this->element('title', null, _m('Bookmark posted'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $this->showNotice($saved);
@@ -188,7 +207,6 @@ class NewbookmarkAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         if (!empty($this->error)) {
@@ -215,7 +233,6 @@ class NewbookmarkAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -226,4 +243,3 @@ class NewbookmarkAction extends Action
         }
     }
 }
- 
\ No newline at end of file