* @category Applications
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @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/
*/
* @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 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()) {
- $this->clientError(_('You must be logged in to create a group.'));
+ // 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;
}
/**
* Handle the request
*
- * On GET, show the form. On POST, try to save the group.
+ * On GET, show the form. On POST, try to save the app.
*
* @param array $args unused
*
* @return void
*/
-
function handle($args)
{
parent::handle($args);
+
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $this->trySave();
+ $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')) {
+ $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->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()
{
- $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).'));
+ $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->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) {
+ // 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;
- } else if (User_group::descriptionTooLong($description)) {
+ } 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 (!is_null($source_url)
- && (strlen($source_url) > 0)
+ } 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'))
)
- )
+ )
{
+ // TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
$this->showForm(_('Source URL is not valid.'));
return;
- } elseif (!is_null($homepage)
- && (strlen($homepage) > 0)
+ } 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) {
+ // 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)
&& !Validate::uri(
$homepage,
array('allowed_schemes' => array('http', 'https'))
)
- )
+ )
{
+ // 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 (!is_null($callback_url)
- && (strlen($callback_url) > 0)
+ 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
&& !Validate::uri(
$source_url,
array('allowed_schemes' => array('http', 'https'))
)
- )
+ )
{
+ // TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
$this->showForm(_('Callback URL is not valid.'));
return;
}
-
+
$cur = common_current_user();
// Checked in prepare() above
$app->query('BEGIN');
- $app->name = $name;
- $app->owner = $cur->id;
- $app->description = $description;
- $app->source_url = $souce_url;
+ $app->name = $name;
+ $app->owner = $cur->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.'));
+ }
+
+ $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');
}
-
- $group->query('COMMIT');
- common_redirect($group->homeUrl(), 303);
-
+ try {
+ $app->uploadLogo();
+ } catch (Exception $e) {
+ $app->query('ROLLBACK');
+ $this->showForm(_('Invalid image.'));
+ return;
+ }
+
+ $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::staticGet('name', $name);
+ return !empty($app);
+ }
}
-
projects / quix0rs-gnu-social.git / blobdiff