reply_to is now stored on the notice, not on the reply record

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index b65edf4c30596470d94bd1a47bbe9bdc5b01ad56..de040ef77a38301d7152c2d9be6043e861dfa6f7 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -49,36 +49,59 @@ class NewnoticeAction extends Action {
                        $this->show_form(_t('No content!'));
                        return;
                } else if (strlen($notice->content) > 140) {
-                       $this->show_form(_t('Notice content too long.'));
+                       $this->show_form(_t('That\'s too long. Max notice size is 140 chars.'));
                        return;
                }
 
-               $id = $notice->insert();
+               $notice->rendered = common_render_content($notice->content, $notice);
                
+               $id = $notice->insert();
+
                if (!$id) {
                        common_server_error(_t('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.'));
                        return;
                }
-               
+
+        common_save_replies($notice);  
                common_broadcast_notice($notice);
-               common_redirect(common_local_url('shownotice',
-                                                                                array('notice' => $id)), 303);
+               
+               $returnto = $this->trimmed('returnto');
+               if ($returnto) {
+                       $url = common_local_url($returnto,
+                                                                       array('nickname' => $user->nickname));
+               } else {
+                       $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(_t('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
+}