correct values for hidden fields

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 535b1a512dde8fd72d3274cb31b64693c211d303..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 {
@@ -43,33 +43,65 @@ class NewnoticeAction extends Action {
                $notice->profile_id = $user->id; # user id *is* profile id
                $notice->created = DB_DataObject_Cast::dateTime();
                # Default theme uses 'content' for something else
-               $notice->content = $this->trimmed('noticecontent');
+               $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_broadcast_notices($id);
-                       common_redirect(common_local_url('shownotice',
-                                                                                        array('notice' => $id)), 303);
+
+               if (!$id) {
+                       common_server_error(_('Problem saving notice.'));
+                       return;
+               }
+
+               $orig = clone($notice);
+               $notice->uri = common_notice_uri($notice);
+
+               if (!$notice->update($orig)) {
+                       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,
+                                                                       array('nickname' => $user->nickname));
                } else {
-                       common_server_error(_t('Problem saving notice.'));
+                       $url = common_local_url('shownotice',
+                                                                       array('notice' => $id));
                }
+               common_redirect($url, 303);
+       }
+
+       function show_top($content=NULL) {
+               common_notice_form(NULL, $content);
        }
 
        function show_form($msg=NULL) {
-               common_show_header(_t('New notice'));
+               $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('div', 'error', $msg);
+                       common_element('p', 'error', $msg);
                }
-               common_notice_form();
                common_show_footer();
        }
-}
\ No newline at end of file
+}