better error reporting in user authorization action

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 6d98c820cc46d4f8b40ef7d8376ea354175528a6..cc40f89bc137a519843858e7fdc20f659447d0b0 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -20,13 +20,13 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
-
+       
        function handle($args) {
                parent::handle($args);
                # 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 {
@@ -38,57 +38,57 @@ class NewnoticeAction extends Action {
 
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
-               $notice = DB_DataObject::factory('notice');
-               assert($notice);
-               $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('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();
+               $content = $this->trimmed('status_textarea');
                
-               if (!$id) {
-                       common_server_error(_t('Problem saving notice.'));
+               if (!$content) {
+                       $this->show_form(_('No content!'));
+                       return;
+               } else if (mb_strlen($content) > 140) {
+                       common_debug("Content = '$content'", __FILE__);
+                       common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
+                       $this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
                        return;
                }
 
-               $orig = clone($notice);
-               $notice->uri = common_notice_uri($notice);
+               $notice = Notice::saveNew($user->id, $content, 'web');
                
-               if (!$notice->update($orig)) {
-                       common_server_error(_t('Problem saving notice.'));
+               if (is_string($notice)) {
+                       $this->show_form($notice);
                        return;
                }
                
                common_broadcast_notice($notice);
+               
                $returnto = $this->trimmed('returnto');
+               
                if ($returnto) {
                        $url = common_local_url($returnto,
                                                                        array('nickname' => $user->nickname));
                } else {
                        $url = common_local_url('shownotice',
-                                                                       array('notice' => $id));
+                                                                       array('notice' => $notice->id));
                }
                common_redirect($url, 303);
        }
 
-       function show_top($msg=NULL) {
-               if ($msg) {
-                       common_element('div', 'error', $msg);
-               }
+       function show_top($content=NULL) {
+               common_notice_form(NULL, $content);
        }
-       
+
        function show_form($msg=NULL) {
-               common_show_header(_t('New notice'), NULL, $msg, array($this, 'show_top'));
-               common_notice_form();
+               $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('p', 'error', $msg);
+               }
                common_show_footer();
        }
 }