X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b576e1326641b0c593feae507b644e8742366e72;hb=0bba990e2f4506da877224285442c81f68662743;hp=6e6c3ff2c2f1f80a6e688fcc115ba0990965e810;hpb=764a391d196287a9400ee597019c3e5207c5a5f0;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index 6e6c3ff2c2..b576e13266 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -20,52 +20,73 @@ 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') { - $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'); - 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('noticecontent'); + $content = $this->trimmed('status_textarea'); + + if (!$content) { + $this->show_form(_('No content!')); + return; + } else if (strlen($content) > 140) { + $this->show_form(_('That\'s too long. Max notice size is 140 chars.')); + return; + } - if (!$notice->content) { - $this->show_form(_t('No content!')); - } else if (strlen($notice->content) > 140) { - $this->show_form(_t('Notice content too long.')); + $notice = Notice::saveNew($user->id, $content, 'web'); + + if (is_string($notice)) { + $this->show_form($notice); + return; } - return $notice->insert(); + 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' => $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 +}