correct values for hidden fields

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 607f4b087101c2a70506e8b69b8a3a24ee39fd7a..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 {
@@ -36,12 +36,6 @@ class NewnoticeAction extends Action {
 
        function save_new_notice() {
 
-                #remember the current notice
-                $current_notice = DB_DataObject::factory('notice');
-                $current_notice->limit(1);
-                $current_notice->orderBy('created DESC');
-                $current_notice->find(1);
-
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
                $notice = DB_DataObject::factory('notice');
@@ -52,17 +46,19 @@ 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('That\'s too long. Max notice size is 140 chars.'));
+                       $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;
                }
 
@@ -70,13 +66,13 @@ class NewnoticeAction extends Action {
                $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_save_replies($notice);
                common_broadcast_notice($notice);
+
                $returnto = $this->trimmed('returnto');
                if ($returnto) {
                        $url = common_local_url($returnto,
@@ -94,7 +90,14 @@ class NewnoticeAction extends Action {
 
        function show_form($msg=NULL) {
                $content = $this->trimmed('status_textarea');
-               common_show_header(_t('New notice'), NULL, $content,
+               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);