From 8fd76e39cf52fc9caaf7d2eac365dd03ed6b0cd0 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 4 Sep 2013 22:22:56 +0200
Subject: [PATCH] Use proper controller naming
---
core/avatar/controller.php | 8 +++++---
core/routes.php | 10 +++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index d0edde50647..43ee811f191 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -6,7 +6,9 @@
* See the COPYING-README file.
*/
-class OC_Core_Avatar_Controller {
+namespace OC\Core\Avatar;
+
+class Controller {
public static function getAvatar($args) {
if (!\OC_User::isLoggedIn()) {
$l = new \OC_L10n('core');
@@ -91,7 +93,7 @@ class OC_Core_Avatar_Controller {
}
public static function deleteAvatar($args) {
- $user = OC_User::getUser();
+ $user = \OC_User::getUser();
try {
$avatar = new \OC_Avatar();
@@ -118,7 +120,7 @@ class OC_Core_Avatar_Controller {
}
public static function postCroppedAvatar($args) {
- $user = OC_User::getUser();
+ $user = \OC_User::getUser();
if (isset($_POST['crop'])) {
$crop = $_POST['crop'];
} else {
diff --git a/core/routes.php b/core/routes.php
index 9cedcb0956c..388fa934c4d 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -61,19 +61,19 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{
// Avatar routes
$this->create('core_avatar_get_tmp', '/avatar/tmp')
->get()
- ->action('OC_Core_Avatar_Controller', 'getTmpAvatar');
+ ->action('OC\Core\Avatar\Controller', 'getTmpAvatar');
$this->create('core_avatar_get', '/avatar/{user}/{size}')
->get()
- ->action('OC_Core_Avatar_Controller', 'getAvatar');
+ ->action('OC\Core\Avatar\Controller', 'getAvatar');
$this->create('core_avatar_post', '/avatar/')
->post()
- ->action('OC_Core_Avatar_Controller', 'postAvatar');
+ ->action('OC\Core\Avatar\Controller', 'postAvatar');
$this->create('core_avatar_delete', '/avatar/')
->delete()
- ->action('OC_Core_Avatar_Controller', 'deleteAvatar');
+ ->action('OC\Core\Avatar\Controller', 'deleteAvatar');
$this->create('core_avatar_post_cropped', '/avatar/cropped')
->post()
- ->action('OC_Core_Avatar_Controller', 'postCroppedAvatar');
+ ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
// Not specifically routed
$this->create('app_css', '/apps/{app}/{file}')
--
GitLab