PHPCS newbookmark

This commit is contained in:
Evan Prodromou 2010-12-21 10:22:50 -05:00
parent 907f1ad633
commit d9ff466d2c

View File

@ -47,18 +47,24 @@ if (!defined('STATUSNET')) {
class NewbookmarkAction extends Action class NewbookmarkAction extends Action
{ {
private $_user = null; private $_user = null;
private $_error = null; private $_error = null;
private $_complete = null; private $_complete = null;
private $_title = null; private $_title = null;
private $_url = null; private $_url = null;
private $_tags = null; private $_tags = null;
private $_description = null; private $_description = null;
function title() /**
{ * Returns the title of the action
return _('New bookmark'); *
} * @return string Action title
*/
function title()
{
return _('New bookmark');
}
/** /**
* For initializing members of the class. * For initializing members of the class.
@ -72,20 +78,21 @@ class NewbookmarkAction extends Action
{ {
parent::prepare($argarray); parent::prepare($argarray);
$this->_user = common_current_user(); $this->_user = common_current_user();
if (empty($this->_user)) { if (empty($this->_user)) {
throw new ClientException(_("Must be logged in to post a bookmark."), 403); throw new ClientException(_("Must be logged in to post a bookmark."),
} 403);
}
if ($this->isPost()) { if ($this->isPost()) {
$this->checkSessionToken(); $this->checkSessionToken();
} }
$this->_title = $this->trimmed('title'); $this->_title = $this->trimmed('title');
$this->_url = $this->trimmed('url'); $this->_url = $this->trimmed('url');
$this->_tags = $this->trimmed('tags'); $this->_tags = $this->trimmed('tags');
$this->_description = $this->trimmed('description'); $this->_description = $this->trimmed('description');
return true; return true;
} }
@ -100,13 +107,13 @@ class NewbookmarkAction extends Action
function handle($argarray=null) function handle($argarray=null)
{ {
parent::handle($argarray); parent::handle($argarray);
if ($this->isPost()) { if ($this->isPost()) {
$this->newBookmark(); $this->newBookmark();
} else { } else {
$this->showPage(); $this->showPage();
} }
return; return;
} }
@ -119,29 +126,29 @@ class NewbookmarkAction extends Action
function newBookmark() function newBookmark()
{ {
try { try {
if (empty($this->_title)) { if (empty($this->_title)) {
throw new ClientException(_('Bookmark must have a title.')); throw new ClientException(_('Bookmark must have a title.'));
} }
if (empty($this->_url)) { if (empty($this->_url)) {
throw new ClientException(_('Bookmark must have an URL.')); throw new ClientException(_('Bookmark must have an URL.'));
} }
$saved = Notice_bookmark::saveNew($this->_user, $saved = Notice_bookmark::saveNew($this->_user,
$this->_title, $this->_title,
$this->_url, $this->_url,
$this->_tags, $this->_tags,
$this->_description); $this->_description);
} catch (ClientException $ce) { } catch (ClientException $ce) {
$this->_error = $ce->getMessage(); $this->_error = $ce->getMessage();
$this->showPage(); $this->showPage();
return; return;
} }
common_redirect($saved->bestUrl(), 303); common_redirect($saved->bestUrl(), 303);
} }
/** /**
@ -152,17 +159,17 @@ class NewbookmarkAction extends Action
function showContent() function showContent()
{ {
if (!empty($this->_error)) { if (!empty($this->_error)) {
$this->element('p', 'error', $this->_error); $this->element('p', 'error', $this->_error);
} }
$form = new BookmarkForm($this, $form = new BookmarkForm($this,
$this->_title, $this->_title,
$this->_url, $this->_url,
$this->_tags, $this->_tags,
$this->_description); $this->_description);
$form->show(); $form->show();
return; return;
} }
@ -187,3 +194,4 @@ class NewbookmarkAction extends Action
} }
} }
} }