From 1b456831680b8868108afb7ebddce7095943f61c Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 27 Aug 2013 12:50:21 +0200 Subject: Translate "Permission denied" & use class-autoloader --- core/avatar/controller.php | 5 +++-- core/routes.php | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'core') diff --git a/core/avatar/controller.php b/core/avatar/controller.php index cd51810e0e0..17fe4270ff7 100644 --- a/core/avatar/controller.php +++ b/core/avatar/controller.php @@ -6,11 +6,12 @@ * See the COPYING-README file. */ -class CoreAvatarController { +class OC_Core_Avatar_Controller { public static function getAvatar($args) { if (!\OC_User::isLoggedIn()) { + $l = new \OC_L10n('core'); header("HTTP/1.0 403 Forbidden"); - \OC_Template::printErrorPage("Permission denied"); + \OC_Template::printErrorPage($l->t("Permission denied")); return; } diff --git a/core/routes.php b/core/routes.php index 150dbab9c10..30c4bf544d7 100644 --- a/core/routes.php +++ b/core/routes.php @@ -58,24 +58,23 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{ ->action('OC_Core_LostPassword_Controller', 'resetPassword'); // Avatar routes -OC::$CLASSPATH['CoreAvatarController'] = 'core/avatar/controller.php'; $this->create('core_avatar_get', '/avatar/{user}/{size}') ->defaults(array('user' => '', 'size' => 64)) ->get() - ->action('CoreAvatarController', 'getAvatar'); + ->action('OC_Core_Avatar_Controller', 'getAvatar'); $this->create('core_avatar_post', '/avatar/') ->post() - ->action('CoreAvatarController', 'postAvatar'); + ->action('OC_Core_Avatar_Controller', 'postAvatar'); $this->create('core_avatar_delete', '/avatar/') ->delete() - ->action('CoreAvatarController', 'deleteAvatar'); + ->action('OC_Core_Avatar_Controller', 'deleteAvatar'); $this->create('core_avatar_get_tmp', '/avatar/tmp/{size}') ->defaults(array('size' => 64)) ->get() - ->action('CoreAvatarController', 'getTmpAvatar'); + ->action('OC_Core_Avatar_Controller', 'getTmpAvatar'); $this->create('core_avatar_post_cropped', '/avatar/cropped') ->post() - ->action('CoreAvatarController', 'postCroppedAvatar'); + ->action('OC_Core_Avatar_Controller', 'postCroppedAvatar'); // Not specifically routed $this->create('app_css', '/apps/{app}/{file}') -- cgit v1.2.3