summaryrefslogtreecommitdiffstats
path: root/core/routes.php
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-31 18:27:28 +0200
committerkondou <kondou@ts.unde.re>2013-08-31 18:27:28 +0200
commitaa88eea9cf366c07b0a311adc5ee64f0ae86ff33 (patch)
treedd9a4a47f56e4eb688366a70f1bd0fb7dd2c5a36 /core/routes.php
parent5d653753bd8f6f1294dfbfa112757e5509ddc80d (diff)
downloadnextcloud-server-aa88eea9cf366c07b0a311adc5ee64f0ae86ff33.tar.gz
nextcloud-server-aa88eea9cf366c07b0a311adc5ee64f0ae86ff33.zip
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
Diffstat (limited to 'core/routes.php')
-rw-r--r--core/routes.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/routes.php b/core/routes.php
index d2ad699bd08..a0d06bf807e 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -59,8 +59,10 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{
->action('OC_Core_LostPassword_Controller', 'resetPassword');
// Avatar routes
+$this->create('core_avatar_get_tmp', '/avatar/tmp')
+ ->get()
+ ->action('OC_Core_Avatar_Controller', 'getTmpAvatar');
$this->create('core_avatar_get', '/avatar/{user}/{size}')
- ->defaults(array('user' => '', 'size' => 64))
->get()
->action('OC_Core_Avatar_Controller', 'getAvatar');
$this->create('core_avatar_post', '/avatar/')
@@ -69,9 +71,6 @@ $this->create('core_avatar_post', '/avatar/')
$this->create('core_avatar_delete', '/avatar/')
->delete()
->action('OC_Core_Avatar_Controller', 'deleteAvatar');
-$this->create('core_avatar_get_tmp', '/avatartmp/') //TODO better naming, so it doesn't conflict with core_avatar_get
- ->get()
- ->action('OC_Core_Avatar_Controller', 'getTmpAvatar');
$this->create('core_avatar_post_cropped', '/avatar/cropped')
->post()
->action('OC_Core_Avatar_Controller', 'postCroppedAvatar');