X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Feditapplication.php;h=c7e5f9052c77fc81271687f72fd09edd34496c18;hb=792b62874e13214dc12480acd2cf4a40b3292d79;hp=64cf0a5745d134fcceeb7b214844b45dc86111ec;hpb=b56b154b51ede363ee8e49ec5b9b9332b8df923c;p=quix0rs-gnu-social.git diff --git a/actions/editapplication.php b/actions/editapplication.php index 64cf0a5745..c7e5f9052c 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.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,8 +42,7 @@ 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 EditApplicationAction extends OwnerDesignAction +class EditApplicationAction extends Action { var $msg = null; var $owner = null; @@ -51,35 +50,36 @@ class EditApplicationAction extends OwnerDesignAction function title() { - return _('Edit Application'); + // TRANS: Title for "Edit application" form. + return _('Edit application'); } /** * Prepare to run */ - function prepare($args) { parent::prepare($args); if (!common_logged_in()) { + // TRANS: Client error displayed trying to edit an application while not logged in. $this->clientError(_('You must be logged in to edit an application.')); - return false; } $id = (int)$this->arg('id'); - $this->app = Oauth_application::staticGet($id); - $this->owner = User::staticGet($this->app->owner); + $this->app = Oauth_application::getKV($id); + $this->owner = User::getKV($this->app->owner); $cur = common_current_user(); if ($cur->id != $this->owner->id) { + // TRANS: Client error displayed trying to edit an application while not being its owner. $this->clientError(_('You are not the owner of this application.'), 401); } if (!$this->app) { + // TRANS: Client error displayed trying to edit an application that does not exist. $this->clientError(_('No such application.')); - return false; } return true; @@ -94,7 +94,6 @@ class EditApplicationAction extends OwnerDesignAction * * @return void */ - function handle($args) { parent::handle($args); @@ -115,8 +114,11 @@ class EditApplicationAction extends OwnerDesignAction && 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; } @@ -124,8 +126,8 @@ class EditApplicationAction extends OwnerDesignAction // 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(); @@ -136,6 +138,7 @@ class EditApplicationAction extends OwnerDesignAction } elseif ($this->arg('save')) { $this->trySave(); } else { + // TRANS: Client error displayed submitting invalid form data for edit application. $this->clientError(_('Unexpected form submission.')); } } @@ -158,6 +161,7 @@ class EditApplicationAction extends OwnerDesignAction $this->element('p', 'error', $this->msg); } else { $this->element('p', 'instructions', + // TRANS: Instructions for "Edit application" form. _('Use this form to edit your application.')); } } @@ -174,57 +178,66 @@ class EditApplicationAction extends OwnerDesignAction $access_type = $this->arg('default_access_type'); if (empty($name)) { + // TRANS: Validation error shown when not providing a name in the "Edit application" form. $this->showForm(_('Name is required.')); 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 "Edit application" form. + $this->showForm(_('Name is too long (maximum 255 characters).')); return; } else if ($this->nameExists($name)) { + // TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form. $this->showForm(_('Name already in use. Try another one.')); return; } elseif (empty($description)) { + // TRANS: Validation error shown when not providing a description in the "Edit 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: Validation error shown when providing too long a description in the "Edit application" form. + // TRANS: %d is the maximum number of allowed characters. + _m('Description is too long (maximum %d character).', + 'Description is too long (maximum %d characters).', + Oauth_application::maxDesc()), + Oauth_application::maxDesc())); return; } elseif (mb_strlen($source_url) > 255) { + // TRANS: Validation error shown when providing too long a source URL in the "Edit application" form. $this->showForm(_('Source URL is too long.')); return; } elseif ((mb_strlen($source_url) > 0) - && !Validate::uri($source_url, - array('allowed_schemes' => array('http', 'https')))) - { - $this->showForm(_('Source URL is not valid.')); - return; + && !common_valid_http_url($source_url)) { + // TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form. + $this->showForm(_('Source URL is not valid.')); + return; } elseif (empty($organization)) { + // TRANS: Validation error shown when not providing an organisation in the "Edit 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 edit application form. $this->showForm(_('Organization homepage is required.')); return; } elseif ((mb_strlen($homepage) > 0) - && !Validate::uri($homepage, - array('allowed_schemes' => array('http', 'https')))) - { - $this->showForm(_('Homepage is not a valid URL.')); - return; - } elseif (mb_strlen($callback_url) > 255) { - $this->showForm(_('Callback is too long.')); - return; - } elseif (mb_strlen($callback_url) > 0 - && !Validate::uri($source_url, - array('allowed_schemes' => array('http', 'https')) - )) - { - $this->showForm(_('Callback URL is not valid.')); - return; - } + && !common_valid_http_url($homepage)) { + // TRANS: Validation error shown when providing an invalid homepage URL in the "Edit 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 "Edit application" form. + $this->showForm(_('Callback is too long.')); + return; + } elseif (mb_strlen($callback_url) > 0 + && !common_valid_http_url($callback_url)) { + // TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form. + $this->showForm(_('Callback URL is not valid.')); + return; + } $cur = common_current_user(); @@ -253,8 +266,12 @@ class EditApplicationAction extends OwnerDesignAction $result = $this->app->update($orig); - if (!$result) { + // Note: 0 means no rows changed, which can happen if the only + // thing we changed was the icon, since it's not altered until + // the next step. + if ($result === false) { common_log_db_error($this->app, 'UPDATE', __FILE__); + // TRANS: Server error occuring when an application could not be updated from the "Edit application" form. $this->serverError(_('Could not update application.')); } @@ -273,16 +290,13 @@ class EditApplicationAction extends OwnerDesignAction * * @return boolean true if the name already exists */ - function nameExists($name) { - $newapp = Oauth_application::staticGet('name', $name); + $newapp = Oauth_application::getKV('name', $name); if (empty($newapp)) { return false; } else { return $newapp->id != $this->app->id; } } - } -