correct values for hidden fields

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a3ba4c9ccf77570a98eb182ff7e9ab2303ada249..a98829cd87f32d6005045289ee1bc6c4877c915a 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -26,7 +26,7 @@ class NewnoticeAction extends Action {
                # XXX: Ajax!
 
                if (!common_logged_in()) {
-                       common_user_error(_t('Not logged in.'));
+                       common_user_error(_('Not logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $this->save_new_notice();
                } else {
@@ -46,29 +46,33 @@ class NewnoticeAction extends Action {
                $notice->content = $this->trimmed('status_textarea');
 
                if (!$notice->content) {
-                       $this->show_form(_t('No content!'));
+                       $this->show_form(_('No content!'));
                        return;
                } else if (strlen($notice->content) > 140) {
-                       $this->show_form(_t('Notice content too long.'));
+                       $this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
                        return;
                }
 
+               $notice->rendered = common_render_content($notice->content, $notice);
+
                $id = $notice->insert();
-               
+
                if (!$id) {
-                       common_server_error(_t('Problem saving notice.'));
+                       common_server_error(_('Problem saving notice.'));
                        return;
                }
 
                $orig = clone($notice);
-               $notice->uri = common_mint_tag('notice:' . $id);
-               
+               $notice->uri = common_notice_uri($notice);
+
                if (!$notice->update($orig)) {
-                       common_server_error(_t('Problem saving notice.'));
+                       common_server_error(_('Problem saving notice.'));
                        return;
                }
-               
+
+        common_save_replies($notice);
                common_broadcast_notice($notice);
+
                $returnto = $this->trimmed('returnto');
                if ($returnto) {
                        $url = common_local_url($returnto,
@@ -80,15 +84,24 @@ class NewnoticeAction extends Action {
                common_redirect($url, 303);
        }
 
-       function show_top($msg=NULL) {
-               if ($msg) {
-                       common_element('div', 'error', $msg);
-               }
+       function show_top($content=NULL) {
+               common_notice_form(NULL, $content);
        }
-       
+
        function show_form($msg=NULL) {
-               common_show_header(_t('New notice'), NULL, $msg, array($this, 'show_top'));
-               common_notice_form();
+               $content = $this->trimmed('status_textarea');
+               if (!$content) {
+                       $replyto = $this->trimmed('replyto');
+                       $profile = Profile::staticGet('nickname', $replyto);
+                       if ($profile) {
+                               $content = '@' . $profile->nickname . ' ';
+                       }
+               }
+               common_show_header(_('New notice'), NULL, $content,
+                                  array($this, 'show_top'));
+               if ($msg) {
+                       common_element('p', 'error', $msg);
+               }
                common_show_footer();
        }
-}
\ No newline at end of file
+}