add stub email canonicalizer

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index a4cc7d3aefa207ba048781018dc305cb0d60c55d..e20932b55ff9b00fb817c92d445d6fe4bc718e3a 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
        
@@ -27,16 +27,13 @@ class NewnoticeAction extends Action {
 
                if (!common_logged_in()) {
                        common_user_error(_t('Not logged in.'));
-               } else if ($this->arg('METHOD') == 'POST') {
-                       if ($this->save_new_notice()) {
-                               # XXX: smarter redirects
-                               $user = common_current_user();
-                               assert(!is_null($user)); # see if... above
-                               # XXX: redirect to source
-                               # XXX: use Ajax instead of a redirect
-                               common_redirect(common_local_url('all',
-                                                                                                array('nickname' =>
-                                                                                                          $user->nickname)));
+               } 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.'));
                        }
@@ -57,11 +54,11 @@ class NewnoticeAction extends Action {
        }
        
        function show_form() {
-               common_start_element('form', array('id' => 'newnotice', 'method' => 'POST',
+               common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
                                                                                   'action' => common_local_url('newnotice')));
                common_element('span', 'nickname', $profile->nickname);
                common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content'));
                common_element('input', array('type' => 'submit'), 'Send');
-               common_end_element('form');
+               common_element_end('form');
        }
 }
\ No newline at end of file