X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=f48134c3b21e5743d449858644ea6b6652a23ece;hb=5147404ea2cd5b41d5cad8f3c3769cbde0a2e2a9;hp=57cd847c6e3e203f7ab4c0246003183291121f2a;hpb=cb74822e7ad0d03fa0b4dbc3b9c4c14778ba3841;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 57cd847c6e..f48134c3b2 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -47,13 +47,11 @@ require_once INSTALLDIR . '/lib/mediafile.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class NewnoticeAction extends Action
 {
     /**
      * Error message, if any
      */
-
     var $msg = null;
 
     /**
@@ -63,9 +61,9 @@ class NewnoticeAction extends Action
      *
      * @return string page title
      */
-
     function title()
     {
+        // TRANS: Page title for sending a new notice.
         return _('New notice');
     }
 
@@ -85,6 +83,7 @@ class NewnoticeAction extends Action
     function handle($args)
     {
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to send a notice while not logged in.
             $this->clientError(_('Not logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             // check for this before token since all POST and FILES data
@@ -127,7 +126,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function saveNewNotice()
     {
         $user = common_current_user();
@@ -137,6 +135,7 @@ class NewnoticeAction extends Action
         Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
         if (!$content) {
+            // TRANS: Client error displayed trying to send a notice without content.
             $this->clientError(_('No content!'));
             return;
         }
@@ -154,10 +153,13 @@ class NewnoticeAction extends Action
             return;
         }
 
-        $content_shortened = common_shorten_links($content);
+        $content_shortened = $user->shortenLinks($content);
         if (Notice::contentTooLong($content_shortened)) {
-            $this->clientError(sprintf(_('That\'s too long. '.
-                                         'Max notice size is %d chars.'),
+            // TRANS: Client error displayed when the parameter "status" is missing.
+            // TRANS: %d is the maximum number of character for a notice.
+            $this->clientError(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
+                                          'That\'s too long. Maximum notice size is %d characters.',
+                                          Notice::maxContent()),
                                        Notice::maxContent()));
         }
 
@@ -178,12 +180,10 @@ class NewnoticeAction extends Action
 
             if (Notice::contentTooLong($content_shortened)) {
                 $upload->delete();
-                $this->clientError(
-                    sprintf(
-                        _('Max notice size is %d chars, including attachment URL.'),
-                          Notice::maxContent()
-                    )
-                );
+                $this->clientError(sprintf(_m('Maximum notice size is %d character, including attachment URL.',
+                                              'Maximum notice size is %d characters, including attachment URL.',
+                                              Notice::maxContent()),
+                                           Notice::maxContent()));
             }
         }
 
@@ -209,6 +209,10 @@ class NewnoticeAction extends Action
         $author_id = $user->id;
         $text      = $content_shortened;
 
+        // Does the heavy-lifting for getting "To:" information
+
+        ToSelector::fillOptions($this, $options);
+
         if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) {
 
             $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
@@ -226,6 +230,7 @@ class NewnoticeAction 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, _('Notice posted'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -255,11 +260,11 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function ajaxErrorMsg($msg)
     {
         $this->startHTML('text/xml;charset=utf-8', true);
         $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs on the send notice page.
         $this->element('title', null, _('Ajax Error'));
         $this->elementEnd('head');
         $this->elementStart('body');
@@ -268,6 +273,30 @@ class NewnoticeAction extends Action
         $this->elementEnd('html');
     }
 
+    /**
+     * Show an Ajax-y notice form
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
+    function ajaxShowForm()
+    {
+        $this->startHTML('text/xml;charset=utf-8', true);
+        $this->elementStart('head');
+        $this->element('title', null, _('New notice'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+
+        $form = new NoticeForm($this);
+        $form->show();
+
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+    }
+
     /**
      * Formerly page output
      *
@@ -282,11 +311,14 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showForm($msg=null)
     {
-        if ($msg && $this->boolean('ajax')) {
-            $this->ajaxErrorMsg($msg);
+        if ($this->boolean('ajax')) {
+            if ($msg) {
+                $this->ajaxErrorMsg($msg);
+            } else {
+                $this->ajaxShowForm();
+            }
             return;
         }
 
@@ -301,7 +333,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showNoticeForm()
     {
         $content = $this->trimmed('status_textarea');
@@ -317,7 +348,9 @@ class NewnoticeAction extends Action
             $inreplyto = null;
         }
 
-        $notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
+        $notice_form = new NoticeForm($this, array('content' => $content, 
+                                                   'inreplyto' => $inreplyto));
+
         $notice_form->show();
     }
 
@@ -330,7 +363,6 @@ class NewnoticeAction extends Action
      *
      * @todo maybe show some instructions?
      */
-
     function showPageNotice()
     {
         if ($this->msg) {
@@ -347,7 +379,6 @@ class NewnoticeAction extends Action
      *
      * @return void
      */
-
     function showNotice($notice)
     {
         $nli = new NoticeListItem($notice, $this);