do some commits

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 6e6c3ff2c2f1f80a6e688fcc115ba0990965e810..b65edf4c30596470d94bd1a47bbe9bdc5b01ad56 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -28,20 +28,14 @@ class NewnoticeAction extends Action {
                if (!common_logged_in()) {
                        common_user_error(_t('Not logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                       $id = $this->save_new_notice();
-                       if ($id) {
-                               common_broadcast_notices($id);
-                               common_redirect(common_local_url('shownotice',
-                                                                                                array('notice' => $id)), 303);
-                       } else {
-                               common_server_error(_t('Problem saving notice.'));
-                       }
+                       $this->save_new_notice();
                } else {
                        $this->show_form();
                }
        }
 
        function save_new_notice() {
+
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
                $notice = DB_DataObject::factory('notice');
@@ -49,17 +43,36 @@ 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!'));
+                       return;
                } else if (strlen($notice->content) > 140) {
                        $this->show_form(_t('Notice content too long.'));
+                       return;
+               }
+
+               $id = $notice->insert();
+               
+               if (!$id) {
+                       common_server_error(_t('Problem saving notice.'));
+                       return;
+               }
+
+               $orig = clone($notice);
+               $notice->uri = common_mint_tag('notice:' . $id);
+               
+               if (!$notice->update($orig)) {
+                       common_server_error(_t('Problem saving notice.'));
+                       return;
                }
                
-               return $notice->insert();
+               common_broadcast_notice($notice);
+               common_redirect(common_local_url('shownotice',
+                                                                                array('notice' => $id)), 303);
        }
-       
+
        function show_form($msg=NULL) {
                common_show_header(_t('New notice'));
                if ($msg) {