* @link http://status.net/
*/
-if (!defined('STATUSNET')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Action for posting new notices
*/
function title()
{
+ if ($this->getInfo() && $this->stored instanceof Notice) {
+ // TRANS: Page title after sending a notice.
+ return _('Notice posted');
+ }
+ if ($this->int('inreplyto')) {
+ return _m('TITLE', 'New reply');
+ }
// TRANS: Page title for sending a new notice.
return _m('TITLE','New notice');
}
protected function doPreparation()
{
foreach(array('inreplyto') as $opt) {
- if (!empty($this->trimmed($opt))) {
+ if ($this->trimmed($opt)) {
$this->formOpts[$opt] = $this->trimmed($opt);
}
}
+
+ // Backwards compatibility for "share this" widget things.
+ // If no 'content', use 'status_textarea'
+ $this->formOpts['content'] = $this->trimmed('content') ?: $this->trimmed('status_textarea');
}
/**
- * This handlePost saves a new notice, based on arguments
+ * This doPost saves a new notice, based on arguments
*
* If successful, will show the notice, or return an Ajax-y result.
* If not, it will show an error message -- possibly Ajax-y.
*
* @return void
*/
- protected function handlePost()
+ protected function doPost()
{
- parent::handlePost();
-
- assert($this->scoped); // XXX: maybe an error instead...
+ assert($this->scoped instanceof Profile); // XXX: maybe an error instead...
$user = $this->scoped->getUser();
$content = $this->trimmed('status_textarea');
$options = array();
Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options));
- if (!$content) {
+ if (empty($content)) {
// TRANS: Client error displayed trying to send a notice without content.
$this->clientError(_('No content!'));
}
$cmd = $inter->handle_command($user, $content);
if ($cmd) {
- if (StatusNet::isAjax()) {
+ if (GNUsocial::isAjax()) {
$cmd->execute(new AjaxWebChannel($this));
} else {
$cmd->execute(new WebChannel($this));
Notice::maxContent()));
}
- $replyto = intval($this->trimmed('inreplyto'));
+ $replyto = $this->int('inreplyto');
if ($replyto) {
$options['reply_to'] = $replyto;
}
- $upload = MediaFile::fromUpload('attach', $this->scoped);
-
- if (isset($upload)) {
-
+ $upload = null;
+ try {
+ // throws exception on failure
+ $upload = MediaFile::fromUpload('attach', $this->scoped);
if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) {
$content_shortened .= ' ' . $upload->shortUrl();
}
Notice::maxContent()),
Notice::maxContent()));
}
+ } catch (NoUploadedMediaException $e) {
+ // simply no attached media to the new notice
}
+
if ($this->scoped->shareLocation()) {
// use browser data if checked; otherwise profile data
if ($this->arg('notice_data-geo')) {
$this->stored = Notice::saveNew($this->scoped->id, $content_shortened, 'web', $options);
- if (isset($upload)) {
+ if ($upload instanceof MediaFile) {
$upload->attachToNotice($this->stored);
}
Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
- if (!StatusNet::isAjax()) {
- $returnto = $this->trimmed('returnto');
-
- if ($returnto) {
- $url = common_local_url($returnto,
- array('nickname' => $this->scoped->getNickname()));
- } else {
- $url = common_local_url('shownotice', array('notice' => $this->stored->id));
- }
+ if (!GNUsocial::isAjax()) {
+ $url = common_local_url('shownotice', array('notice' => $this->stored->id));
common_redirect($url, 303);
}
$nli = new NoticeListItem($notice, $this);
$nli->show();
}
+
+ public function showNoticeForm()
+ {
+ // pass
+ }
}