X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fnewapplication.php;h=a9f3012771141e3f17fc84d80bc4c590c6ecc576;hb=24e05350011eb1b4aa05c7cfa2b9e901bd7f9c2f;hp=a78a856b18aaa80d7b79f3023c5e69f1bf82bfe0;hpb=f8025428854546b0528fd714f6af93a220de0bcc;p=quix0rs-gnu-social.git diff --git a/actions/newapplication.php b/actions/newapplication.php index a78a856b18..a9f3012771 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -22,12 +22,13 @@ * @category Applications * @package StatusNet * @author Zach Copley - * @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')) { +if (!defined('STATUSNET')) { exit(1); } @@ -42,50 +43,26 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @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 Action +class NewApplicationAction extends FormAction { - var $msg; - function title() { - return _('New Application'); + // TRANS: This is the title of the form for adding a new application. + return _('New application'); } - /** - * Prepare to run - */ - - function prepare($args) + protected function handlePost() { - parent::prepare($args); + parent::handlePost(); - if (!common_logged_in()) { - $this->clientError(_('You must be logged in to create a group.')); - return false; - } - - return true; - } - - /** - * Handle the request - * - * On GET, show the form. On POST, try to save the group. - * - * @param array $args unused - * - * @return void - */ - - function handle($args) - { - parent::handle($args); - if ($_SERVER['REQUEST_METHOD'] == 'POST') { + if ($this->arg('cancel')) { + common_redirect(common_local_url('oauthappssettings'), 303); + } elseif ($this->arg('save')) { $this->trySave(); - } else { - $this->showForm(); } + + // TRANS: Client error displayed when encountering an unexpected action on form submission. + $this->clientError(_('Unexpected form submission.')); } function showForm($msg=null) @@ -106,97 +83,160 @@ class NewApplicationAction extends Action $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.')); } } - function trySave() + private function trySave() { - $name = $this->trimmed('name'); - $description = $this->trimmed('description'); - $source_url = $this->trimmed('source_url'); - $organization = $this->trimmed('organization'); - $homepage = $this->trimmed('application'); - $callback_url = $this->trimmed('callback_url'); - $this->type = $this->trimmed('type'); - $this->access_type = $this->trimmed('access_type'); - - if (!is_null($name) && mb_strlen($name) > 255) { - $this->showForm(_('Name is too long (max 255 chars).')); - return; - } else if (User_group::descriptionTooLong($description)) { - $this->showForm(sprintf( - _('description is too long (max %d chars).'), - Oauth_application::maxDescription())); - return; - } elseif (!is_null($source_url) - && (strlen($source_url) > 0) + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('homepage'); + $callback_url = $this->trimmed('callback_url'); + $type = $this->arg('app_type'); + $access_type = $this->arg('default_access_type'); + + if (empty($name)) { + // TRANS: Validation error shown when not providing a name in the "New application" form. + $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->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->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->clientError(_('Description is required.')); + } elseif (Oauth_application::descriptionTooLong($description)) { + $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())); + } elseif (empty($source_url)) { + // TRANS: Validation error shown when not providing a source URL in the "New application" form. + $this->clientError(_('Source URL is required.')); + } elseif ((strlen($source_url) > 0) && !Validate::uri( $source_url, array('allowed_schemes' => array('http', 'https')) ) - ) - { - $this->showForm(_('Source URL is not valid.')); - return; - } elseif (!is_null($homepage) - && (strlen($homepage) > 0) + ) { + // TRANS: Validation error shown when providing an invalid source URL in the "New application" form. + $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->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->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->clientError(_('Organization homepage is required.')); + } elseif ((strlen($homepage) > 0) && !Validate::uri( $homepage, array('allowed_schemes' => array('http', 'https')) ) - ) - { - $this->showForm(_('Homepage is not a valid URL.')); - return; - } elseif (!is_null($callback_url) - && (strlen($callback_url) > 0) + ) { + // TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form. + $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->clientError(_('Callback is too long.')); + } elseif (strlen($callback_url) > 0 && !Validate::uri( $source_url, array('allowed_schemes' => array('http', 'https')) ) - ) - { - $this->showForm(_('Callback URL is not valid.')); - return; + ) { + // TRANS: Validation error shown when providing an invalid callback URL in the "New application" form. + $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->description = $description; - $app->source_url = $souce_url; + $app->name = $name; + $app->owner = $this->scoped->id; + $app->description = $description; + $app->source_url = $source_url; $app->organization = $organization; - $app->homepage = $homepage; + $app->homepage = $homepage; $app->callback_url = $callback_url; - $app->type = $type; - $app->access_type = $access_type; - + $app->type = $type; + + // Yeah, I dunno why I chose bit flags. I guess so I could + // copy this value directly to Oauth_application_user + // access_type which I think does need bit flags -- Z + + if ($access_type == 'r') { + $app->setAccessFlags(true, false); + } else { + $app->setAccessFlags(true, true); + } + + $app->created = common_sql_now(); + // generate consumer key and secret - - $app->created = common_sql_now(); - $result = $app->insert(); + $consumer = Consumer::generateNew(); + + $result = $consumer->insert(); if (!$result) { - common_log_db_error($group, 'INSERT', __FILE__); + common_log_db_error($consumer, 'INSERT', __FILE__); + // 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.')); } - - $group->query('COMMIT'); - common_redirect($group->homeUrl(), 303); - + $app->consumer_key = $consumer->consumer_key; + + $this->app_id = $app->insert(); + + if (!$this->app_id) { + common_log_db_error($app, 'INSERT', __FILE__); + // 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'); + } + + 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'); + + common_redirect(common_local_url('oauthappssettings'), 303); } + /** + * Does the app name already exist? + * + * Checks the DB to see someone has already registered an app + * with the same name. + * + * @param string $name app name to check + * + * @return boolean true if the name already exists + */ + function nameExists($name) + { + $app = Oauth_application::getKV('name', $name); + return !empty($app); + } } -