* @category Applications
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
+ * @copyright 2013 Free Software Foundation, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Add a new application
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-class NewApplicationAction extends OwnerDesignAction
+class NewApplicationAction extends SettingsAction
{
- var $msg;
-
function title()
{
// TRANS: This is the title of the form for adding a new application.
return _('New application');
}
- /**
- * Prepare to run
- */
- function prepare($args)
- {
- parent::prepare($args);
-
- if (!common_logged_in()) {
- // TRANS: Client error displayed trying to add a new application while not logged in.
- $this->clientError(_('You must be logged in to register an application.'));
- return false;
- }
-
- return true;
- }
-
- /**
- * Handle the request
- *
- * On GET, show the form. On POST, try to save the app.
- *
- * @param array $args unused
- *
- * @return void
- */
- function handle($args)
+ protected function doPost()
{
- parent::handle($args);
-
- if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $this->handlePost($args);
- } else {
- $this->showForm();
- }
- }
-
- function handlePost($args)
- {
- // Workaround for PHP returning empty $_POST and $_FILES when POST
- // length > post_max_size in php.ini
-
- if (empty($_FILES)
- && empty($_POST)
- && ($_SERVER['CONTENT_LENGTH'] > 0)
- ) {
- // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
- // TRANS: %s is the number of bytes of the CONTENT_LENGTH.
- $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.',
- 'The server was unable to handle that much POST data (%s bytes) due to its current configuration.',
- intval($_SERVER['CONTENT_LENGTH']));
- $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
- return;
- }
-
- // CSRF protection
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->clientError(_('There was a problem with your session token.'));
- return;
- }
-
- $cur = common_current_user();
-
if ($this->arg('cancel')) {
common_redirect(common_local_url('oauthappssettings'), 303);
} elseif ($this->arg('save')) {
+ //trySave will never return, just throw exception or redirect
$this->trySave();
- } else {
- // TRANS: Client error displayed when encountering an unexpected action on form submission.
- $this->clientError(_('Unexpected form submission.'));
}
- }
- function showForm($msg=null)
- {
- $this->msg = $msg;
- $this->showPage();
+ // TRANS: Client error displayed when encountering an unexpected action on form submission.
+ $this->clientError(_('Unexpected form submission.'));
}
- function showContent()
+ protected function getForm()
{
- $form = new ApplicationEditForm($this);
- $form->show();
+ return new ApplicationEditForm($this);
}
- function showPageNotice()
+ protected function getInstructions()
{
- if ($this->msg) {
- $this->element('p', 'error', $this->msg);
- } else {
- $this->element('p', 'instructions',
- // TRANS: Form instructions for registering a new application.
- _('Use this form to register a new application.'));
- }
+ // TRANS: Form instructions for registering a new application.
+ return _('Use this form to register a new application.');
}
- function trySave()
+ protected function trySave()
{
$name = $this->trimmed('name');
$description = $this->trimmed('description');
if (empty($name)) {
// TRANS: Validation error shown when not providing a name in the "New application" form.
- $this->showForm(_('Name is required.'));
- return;
+ $this->clientError(_('Name is required.'));
} else if ($this->nameExists($name)) {
// TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
- $this->showForm(_('Name already in use. Try another one.'));
- return;
+ $this->clientError(_('Name already in use. Try another one.'));
} elseif (mb_strlen($name) > 255) {
// TRANS: Validation error shown when providing too long a name in the "New application" form.
- $this->showForm(_('Name is too long (maximum 255 characters).'));
- return;
+ $this->clientError(_('Name is too long (maximum 255 characters).'));
} elseif (empty($description)) {
// TRANS: Validation error shown when not providing a description in the "New application" form.
- $this->showForm(_('Description is required.'));
- return;
+ $this->clientError(_('Description is required.'));
} elseif (Oauth_application::descriptionTooLong($description)) {
- $this->showForm(sprintf(
+ $this->clientError(sprintf(
// TRANS: Form validation error in New application form.
// TRANS: %d is the maximum number of characters for the description.
_m('Description is too long (maximum %d character).',
'Description is too long (maximum %d characters).',
Oauth_application::maxDesc()),
Oauth_application::maxDesc()));
- return;
} elseif (empty($source_url)) {
// TRANS: Validation error shown when not providing a source URL in the "New application" form.
- $this->showForm(_('Source URL is required.'));
- return;
- } elseif ((strlen($source_url) > 0)
- && !Validate::uri(
- $source_url,
- array('allowed_schemes' => array('http', 'https'))
- )
- )
- {
+ $this->clientError(_('Source URL is required.'));
+ } elseif ((strlen($source_url) > 0) && !common_valid_http_url($source_url)) {
// TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
- $this->showForm(_('Source URL is not valid.'));
- return;
+ $this->clientError(_('Source URL is not valid.'));
} elseif (empty($organization)) {
// TRANS: Validation error shown when not providing an organisation in the "New application" form.
- $this->showForm(_('Organization is required.'));
- return;
+ $this->clientError(_('Organization is required.'));
} elseif (mb_strlen($organization) > 255) {
// TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
- $this->showForm(_('Organization is too long (maximum 255 characters).'));
- return;
+ $this->clientError(_('Organization is too long (maximum 255 characters).'));
} elseif (empty($homepage)) {
// TRANS: Form validation error show when an organisation name has not been provided in the new application form.
- $this->showForm(_('Organization homepage is required.'));
- return;
- } elseif ((strlen($homepage) > 0)
- && !Validate::uri(
- $homepage,
- array('allowed_schemes' => array('http', 'https'))
- )
- )
- {
+ $this->clientError(_('Organization homepage is required.'));
+ } elseif ((strlen($homepage) > 0) && !common_valid_http_url($homepage)) {
// TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
- $this->showForm(_('Homepage is not a valid URL.'));
- return;
+ $this->clientError(_('Homepage is not a valid URL.'));
} elseif (mb_strlen($callback_url) > 255) {
// TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
- $this->showForm(_('Callback is too long.'));
- return;
- } elseif (strlen($callback_url) > 0
- && !Validate::uri(
- $source_url,
- array('allowed_schemes' => array('http', 'https'))
- )
- )
- {
+ $this->clientError(_('Callback is too long.'));
+ } elseif (strlen($callback_url) > 0 && !common_valid_http_url($callback_url)) {
// TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
- $this->showForm(_('Callback URL is not valid.'));
- return;
+ $this->clientError(_('Callback URL is not valid.'));
}
- $cur = common_current_user();
-
- // Checked in prepare() above
-
- assert(!is_null($cur));
+ // Login is checked in parent::prepare()
+ assert(!is_null($this->scoped));
$app = new Oauth_application();
$app->query('BEGIN');
$app->name = $name;
- $app->owner = $cur->id;
+ $app->owner = $this->scoped->getID();
$app->description = $description;
$app->source_url = $source_url;
$app->organization = $organization;
if (!$result) {
common_log_db_error($consumer, 'INSERT', __FILE__);
+ $app->query('ROLLBACK');
// TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
$this->serverError(_('Could not create application.'));
}
if (!$this->app_id) {
common_log_db_error($app, 'INSERT', __FILE__);
+ $app->query('ROLLBACK');
// TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
$this->serverError(_('Could not create application.'));
- $app->query('ROLLBACK');
}
- $app->uploadLogo();
+ try {
+ $app->uploadLogo();
+ } catch (Exception $e) {
+ $app->query('ROLLBACK');
+ // TRANS: Form validation error messages displayed when uploading an invalid application logo.
+ $this->clientError(_('Invalid image.'));
+ }
$app->query('COMMIT');
*/
function nameExists($name)
{
- $app = Oauth_application::staticGet('name', $name);
+ $app = Oauth_application::getKV('name', $name);
return !empty($app);
}
}
projects / quix0rs-gnu-social.git / blobdiff