X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewapplication.php;h=ca5d902a268d1f7bd2ab8d09c2546b15aa17ce67;hb=894ef352591fe581909c01c46047bf530e59a984;hp=0f819b3499881795e3ce597fd1559846875f7f15;hpb=4c7ac503d44b8ca74f68e03dd297916691e7f884;p=quix0rs-gnu-social.git diff --git a/actions/newapplication.php b/actions/newapplication.php index 0f819b3499..ca5d902a26 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -22,7 +22,7 @@ * @category Applications * @package StatusNet * @author Zach Copley - * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2008-2011 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -42,25 +42,25 @@ 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 OwnerDesignAction { 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) { 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; } @@ -77,7 +77,6 @@ class NewApplicationAction extends OwnerDesignAction * * @return void */ - function handle($args) { parent::handle($args); @@ -91,35 +90,40 @@ class NewApplicationAction extends OwnerDesignAction function handlePost($args) { - // Workaround for PHP returning empty $_POST and $_FILES when POST + // 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) ) { - $msg = _('The server was unable to handle that much POST ' . - 'data (%s bytes) due to its current configuration.'); + // 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; - } + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + // TRANS: Client error displayed when the session token does not match or is not given. + $this->clientError(_('There was a problem with your session token.')); + return; + } - $cur = common_current_user(); + $cur = common_current_user(); - if ($this->arg('cancel')) { - common_redirect(common_local_url('oauthappssettings'), 303); - } elseif ($this->arg('save')) { - $this->trySave(); - } else { - $this->clientError(_('Unexpected form submission.')); - } + if ($this->arg('cancel')) { + common_redirect(common_local_url('oauthappssettings'), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + // TRANS: Client error displayed when encountering an unexpected action on form submission. + $this->clientError(_('Unexpected form submission.')); + } } function showForm($msg=null) @@ -140,6 +144,7 @@ class NewApplicationAction extends OwnerDesignAction $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.')); } } @@ -156,23 +161,32 @@ class NewApplicationAction extends OwnerDesignAction $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->showForm(_('Name is required.')); return; } 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; } elseif (mb_strlen($name) > 255) { - $this->showForm(_('Name is too long (max 255 chars).')); + // 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; } elseif (empty($description)) { + // TRANS: Validation error shown when not providing a description in the "New application" form. $this->showForm(_('Description is required.')); return; } elseif (Oauth_application::descriptionTooLong($description)) { $this->showForm(sprintf( - _('Description is too long (max %d chars).'), - Oauth_application::maxDescription())); + // 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) @@ -182,15 +196,19 @@ class NewApplicationAction extends OwnerDesignAction ) ) { + // TRANS: Validation error shown when providing an invalid source URL in the "New application" form. $this->showForm(_('Source URL is not valid.')); return; } elseif (empty($organization)) { + // TRANS: Validation error shown when not providing an organisation in the "New application" form. $this->showForm(_('Organization is required.')); return; } elseif (mb_strlen($organization) > 255) { - $this->showForm(_('Organization is too long (max 255 chars).')); + // 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; } 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) @@ -200,9 +218,11 @@ class NewApplicationAction extends OwnerDesignAction ) ) { + // TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form. $this->showForm(_('Homepage is not a valid URL.')); return; } 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 @@ -212,6 +232,7 @@ class NewApplicationAction extends OwnerDesignAction ) ) { + // TRANS: Validation error shown when providing an invalid callback URL in the "New application" form. $this->showForm(_('Callback URL is not valid.')); return; } @@ -255,6 +276,7 @@ class NewApplicationAction extends OwnerDesignAction if (!$result) { 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.')); } @@ -264,16 +286,23 @@ class NewApplicationAction extends OwnerDesignAction 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'); } - $app->uploadLogo(); + try { + $app->uploadLogo(); + } catch (Exception $e) { + $app->query('ROLLBACK'); + // TRANS: Form validation error on New application page when providing an invalid image upload. + $this->showForm(_('Invalid image.')); + return; + } $app->query('COMMIT'); common_redirect(common_local_url('oauthappssettings'), 303); - } /** @@ -286,12 +315,9 @@ class NewApplicationAction extends OwnerDesignAction * * @return boolean true if the name already exists */ - function nameExists($name) { $app = Oauth_application::staticGet('name', $name); return !empty($app); } - } -