summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/editapplication.php79
-rw-r--r--actions/newapplication.php100
-rw-r--r--actions/showapplication.php9
3 files changed, 135 insertions, 53 deletions
diff --git a/actions/editapplication.php b/actions/editapplication.php
index 3af482844..6b8dd501c 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -81,7 +81,7 @@ class EditApplicationAction extends OwnerDesignAction
/**
* 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
*
@@ -91,31 +91,49 @@ class EditApplicationAction extends OwnerDesignAction
function handle($args)
{
parent::handle($args);
+
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $this->handlePost($args);
+ } else {
+ $this->showForm();
+ }
+ }
- // 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('showapplication',
- array(
- 'nickname' => $cur->nickname,
- 'id' => $this->app->id)
- ), 303);
- } elseif ($this->arg('save')) {
- $this->trySave();
- } else {
- $this->clientError(_('Unexpected form submission.'));
- }
- } 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)
+ ) {
+ $msg = _('The server was unable to handle that much POST ' .
+ 'data (%s bytes) due to its current configuration.');
+ $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('showapplication',
+ array(
+ 'nickname' => $cur->nickname,
+ 'id' => $this->app->id)
+ ), 303);
+ } elseif ($this->arg('save')) {
+ $this->trySave();
+ } else {
+ $this->clientError(_('Unexpected form submission.'));
+ }
}
function showForm($msg=null)
@@ -149,7 +167,7 @@ class EditApplicationAction extends OwnerDesignAction
$homepage = $this->trimmed('homepage');
$callback_url = $this->trimmed('callback_url');
$type = $this->arg('app_type');
- $access_type = $this->arg('access_type');
+ $access_type = $this->arg('default_access_type');
if (empty($name)) {
$this->showForm(_('Name is required.'));
@@ -214,6 +232,7 @@ class EditApplicationAction extends OwnerDesignAction
// Checked in prepare() above
assert(!is_null($cur));
+ assert(!is_null($this->app));
$orig = clone($this->app);
@@ -225,16 +244,18 @@ class EditApplicationAction extends OwnerDesignAction
$this->app->callback_url = $callback_url;
$this->app->type = $type;
+ $result = $this->app->update($orig);
+
+ common_debug("access_type = $access_type");
+
if ($access_type == 'r') {
- $this->app->setAccessFlags(true, false);
+ $this->app->access_type = 1;
} else {
- $this->app->setAccessFlags(true, true);
+ $this->app->access_type = 3;
}
- $result = $this->app->update($orig);
-
if (!$result) {
- common_log_db_error($app, 'UPDATE', __FILE__);
+ common_log_db_error($this->app, 'UPDATE', __FILE__);
$this->serverError(_('Could not update application.'));
}
diff --git a/actions/newapplication.php b/actions/newapplication.php
index ec0f2e7af..a0e61d288 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -71,7 +71,7 @@ class NewApplicationAction extends OwnerDesignAction
/**
* 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
*
@@ -83,29 +83,46 @@ class NewApplicationAction extends OwnerDesignAction
parent::handle($args);
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-
- // 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('apps',
- array('nickname' => $cur->nickname)), 303);
- } elseif ($this->arg('save')) {
- $this->trySave();
- } else {
- $this->clientError(_('Unexpected form submission.'));
- }
+ $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)
+ ) {
+ $msg = _('The server was unable to handle that much POST ' .
+ 'data (%s bytes) due to its current configuration.');
+ $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('apps',
+ array('nickname' => $cur->nickname)), 303);
+ } elseif ($this->arg('save')) {
+ $this->trySave();
+ } else {
+ $this->clientError(_('Unexpected form submission.'));
+ }
+ }
+
function showForm($msg=null)
{
$this->msg = $msg;
@@ -130,14 +147,14 @@ class NewApplicationAction extends OwnerDesignAction
function trySave()
{
- $name = $this->trimmed('name');
+ $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('access_type');
+ $access_type = $this->arg('default_access_type');
if (empty($name)) {
$this->showForm(_('Name is required.'));
@@ -241,14 +258,16 @@ class NewApplicationAction extends OwnerDesignAction
$app->consumer_key = $consumer->consumer_key;
- $result = $app->insert();
+ $this->app_id = $app->insert();
- if (!$result) {
+ if (!$this->app_id) {
common_log_db_error($app, 'INSERT', __FILE__);
$this->serverError(_('Could not create application.'));
$app->query('ROLLBACK');
}
+ $this->uploadLogo($app);
+
$app->query('COMMIT');
common_redirect(common_local_url('apps',
@@ -256,5 +275,40 @@ class NewApplicationAction extends OwnerDesignAction
}
+ /**
+ * Handle an image upload
+ *
+ * Does all the magic for handling an image upload, and crops the
+ * image by default.
+ *
+ * @return void
+ */
+
+ function uploadLogo($app)
+ {
+ if ($_FILES['app_icon']['error'] ==
+ UPLOAD_ERR_OK) {
+
+ try {
+ $imagefile = ImageFile::fromUpload('app_icon');
+ } catch (Exception $e) {
+ common_debug("damn that sucks");
+ $this->showForm($e->getMessage());
+ return;
+ }
+
+ $filename = Avatar::filename($app->id,
+ image_type_to_extension($imagefile->type),
+ null,
+ 'oauth-app-icon-'.common_timestamp());
+
+ $filepath = Avatar::path($filename);
+
+ move_uploaded_file($imagefile->filepath, $filepath);
+
+ $app->setOriginal($filename);
+ }
+ }
+
}
diff --git a/actions/showapplication.php b/actions/showapplication.php
index 6b8eff4a6..6d19b9561 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -55,7 +55,6 @@ class ShowApplicationAction extends OwnerDesignAction
var $owner = null;
-
var $msg = null;
var $success = null;
@@ -187,6 +186,14 @@ class ShowApplicationAction extends OwnerDesignAction
$this->elementStart('ul', 'entity_application_details');
+ $this->elementStart('li', 'entity_application-icon');
+
+ if (!empty($this->application->icon)) {
+ $this->element('img', array('src' => $this->application->icon));
+ }
+
+ $this->elementEnd('li');
+
$this->elementStart('li', 'entity_application_name');
$this->element('span', array('class' => 'big'), $this->application->name);
$this->raw(sprintf(_(' by %1$s'), $this->application->organization));
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-19 18:11:02 +0000