From 91ecb55ca33f4ef9fee55da911e035fd035b7844 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Tue, 17 Jun 2014 19:13:25 +1000 Subject: [PATCH] Tidy up #314 --- modules/backend/classes/Controller.php | 10 +++------- modules/backend/lang/de/lang.php | 5 +++++ modules/backend/lang/en/lang.php | 5 +++++ modules/backend/lang/ja/lang.php | 5 +++++ modules/backend/lang/nl/lang.php | 5 +++++ modules/backend/lang/pt-br/lang.php | 5 +++++ modules/backend/lang/ru/lang.php | 5 +++++ modules/backend/lang/sv/lang.php | 5 +++++ modules/backend/lang/tr/lang.php | 5 +++++ modules/backend/views/403.php | 16 ---------------- modules/backend/views/access_denied.php | 16 ++++++++++++++++ modules/cms/lang/de/lang.php | 5 ----- modules/cms/lang/en/lang.php | 5 ----- modules/cms/lang/ja/lang.php | 5 ----- modules/cms/lang/nl/lang.php | 5 ----- modules/cms/lang/pt-br/lang.php | 5 ----- modules/cms/lang/ru/lang.php | 5 ----- modules/cms/lang/sv/lang.php | 5 ----- modules/cms/lang/tr/lang.php | 5 ----- 19 files changed, 59 insertions(+), 63 deletions(-) delete mode 100644 modules/backend/views/403.php create mode 100644 modules/backend/views/access_denied.php diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index e9a6d8ff7..2dfab7f8d 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -146,7 +146,7 @@ class Controller extends Extendable // Not logged in, redirect to login screen or show ajax error if (!BackendAuth::check()) { return Request::ajax() - ? Response::make(View::make('backend::403'), 403) + ? Response::make(Lang::get('backend::lang.page.access_denied.label'), 403) : Redirect::guest(Backend::url('backend/auth')); } @@ -154,12 +154,8 @@ class Controller extends Extendable $this->user = BackendAuth::getUser(); // Check his access groups against the page definition - if ($this->requiredPermissions && !$this->user->hasAnyAccess($this->requiredPermissions)) { - if ($this->user->hasAnyAccess(['cms.*'])) - return Response::make(View::make('backend::403', ['cms_link' => ''.Lang::get('cms::lang.page.access_denied.cms_link').'']), 403); - - return Response::make(View::make('backend::403'), 403); - } + if ($this->requiredPermissions && !$this->user->hasAnyAccess($this->requiredPermissions)) + return Response::make(View::make('backend::access_denied'), 403); } /* diff --git a/modules/backend/lang/de/lang.php b/modules/backend/lang/de/lang.php index 8a0ab7dcb..6ad2df57b 100644 --- a/modules/backend/lang/de/lang.php +++ b/modules/backend/lang/de/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Unbenannt", + 'access_denied' => [ + 'label' => "Zugriff verweigert", + 'help' => "Sie haben nicht die erforderlichen Berechtigungen, um diese Seite zu sehen.", + 'cms_link' => "Zum CMS-Backend", + ], ], 'partial' => [ 'not_found' => "Das Partial ':name' wurde nicht gefunden.", diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index e7a7fe995..66634a6a6 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Untitled", + 'access_denied' => [ + 'label' => "Access denied", + 'help' => "You don't have the required permissions to view this page.", + 'cms_link' => "Return to the backend", + ], ], 'partial' => [ 'not_found' => "The partial ':name' is not found.", diff --git a/modules/backend/lang/ja/lang.php b/modules/backend/lang/ja/lang.php index 5b49a38e1..7cc27e8a8 100644 --- a/modules/backend/lang/ja/lang.php +++ b/modules/backend/lang/ja/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "タイトル無し", + 'access_denied' => [ + 'label' => "アクセスが拒否されました", + 'help' => "このページを表示するために必要な権限がありません。", + 'cms_link' => "CMSのバックエンドに行く", + ], ], 'partial' => [ 'not_found' => "':name'パーシャルは見つかりません。", diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php index 8f99a2be6..b54917623 100644 --- a/modules/backend/lang/nl/lang.php +++ b/modules/backend/lang/nl/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Naamloos", + 'access_denied' => [ + 'label' => "Toegang geweigerd", + 'help' => "Je hebt niet de benodigde rechten om deze pagina te bekijken.", + 'cms_link' => "Ga naar CMS backend", + ], ], 'partial' => [ 'not_found' => "Het sjabloon (partial) ':name' is niet gevonden.", diff --git a/modules/backend/lang/pt-br/lang.php b/modules/backend/lang/pt-br/lang.php index f2c8485eb..c669b4cf4 100644 --- a/modules/backend/lang/pt-br/lang.php +++ b/modules/backend/lang/pt-br/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Sem Título", + 'access_denied' => [ + 'label' => "Acesso negado", + 'help' => "Você não tem as permissões necessárias para visualizar esta página.", + 'cms_link' => "Ir para CMS backend", + ], ], 'partial' => [ 'not_found' => "O bloco ':name' não foi encontrado.", diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php index d2a65d39d..e62231745 100644 --- a/modules/backend/lang/ru/lang.php +++ b/modules/backend/lang/ru/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Без названия", + 'access_denied' => [ + 'label' => "доступ запрещен", + 'help' => "Вы не должны необходимые разрешения для просмотра этой страницы.", + 'cms_link' => "К CMS серверной", + ], ], 'partial' => [ 'not_found' => "Не удалось найти шаблон (partial) с именем :name.", diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php index a81ba3012..9706de218 100644 --- a/modules/backend/lang/sv/lang.php +++ b/modules/backend/lang/sv/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Ej namngiven", + 'access_denied' => [ + 'label' => "Nekat tillträde", + 'help' => "Du har inte behörighet att visa den här sidan.", + 'cms_link' => "Gå till CMS backend", + ], ], 'partial' => [ 'not_found' => "En partial med namn ':name' kunde ej hittas", diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php index 3edc8d84a..b86b4d461 100644 --- a/modules/backend/lang/tr/lang.php +++ b/modules/backend/lang/tr/lang.php @@ -11,6 +11,11 @@ return [ ], 'page' => [ 'untitled' => "Başlıksız", + 'access_denied' => [ + 'label' => "Giriş engellendi", + 'help' => "Bu sayfayı görüntülemek için gerekli izinlere sahip değilsiniz.", + 'cms_link' => "CMS uç git", + ], ], 'partial' => [ 'not_found' => "':name' bölümü bulunamadı.", diff --git a/modules/backend/views/403.php b/modules/backend/views/403.php deleted file mode 100644 index b22a32d05..000000000 --- a/modules/backend/views/403.php +++ /dev/null @@ -1,16 +0,0 @@ - - - - - <?= Lang::get('cms::lang.page.access_denied.label') ?> - - - - -
-

-

- -
- - \ No newline at end of file diff --git a/modules/backend/views/access_denied.php b/modules/backend/views/access_denied.php new file mode 100644 index 000000000..80766997d --- /dev/null +++ b/modules/backend/views/access_denied.php @@ -0,0 +1,16 @@ + + + + + <?= Lang::get('backend::lang.page.access_denied.label') ?> + + + + +
+

+

+ +
+ + \ No newline at end of file diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php index a2fc04250..9d5f125f9 100644 --- a/modules/cms/lang/de/lang.php +++ b/modules/cms/lang/de/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Seite nicht gefunden", 'help' => "Die angeforderte Seite kann nicht gefunden werden.", ], - 'access_denied' => [ - 'label' => "Zugriff verweigert", - 'help' => "Sie haben nicht die erforderlichen Berechtigungen, um diese Seite zu sehen.", - 'cms_link' => "Zum CMS-Backend", - ], 'custom_error' => [ 'label' => "Seitenfehler", 'help' => "Entschuldigung, ein Fehler trat auf, sodass die gewünschte Seite nicht angezeigt werden kann.", diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index cf72933e6..87f0070dc 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Page not found", 'help' => "The requested page cannot be found.", ], - 'access_denied' => [ - 'label' => "Access denied", - 'help' => "You don't have the required permissions to view this page.", - 'cms_link' => "Go to CMS backend", - ], 'custom_error' => [ 'label' => "Page error", 'help' => "We're sorry, but something went wrong and the page cannot be displayed.", diff --git a/modules/cms/lang/ja/lang.php b/modules/cms/lang/ja/lang.php index 1cc818226..9082fdf6c 100644 --- a/modules/cms/lang/ja/lang.php +++ b/modules/cms/lang/ja/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "ページが見つかりません。", 'help' => "要求されているページが見つかりません。", ], - 'access_denied' => [ - 'label' => "アクセスが拒否されました", - 'help' => "このページを表示するために必要な権限がありません。", - 'cms_link' => "CMSのバックエンドに行く", - ], 'custom_error' => [ 'label' => "ページエラー。", 'help' => "恐れいります。何かが間違っているようで、ページが表示できません。", diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php index b803c969e..0a59ce1d7 100644 --- a/modules/cms/lang/nl/lang.php +++ b/modules/cms/lang/nl/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Pagina niet gevonden", 'help' => "De opgevraagde pagina bestaat niet.", ], - 'access_denied' => [ - 'label' => "Toegang geweigerd", - 'help' => "Je hebt niet de benodigde rechten om deze pagina te bekijken.", - 'cms_link' => "Ga naar CMS backend", - ], 'custom_error' => [ 'label' => "Paginafout", 'help' => "Onze excuses, er is iets mis gegaan. De opgevraagde pagina kan niet worden getoond.", diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php index 5dcd24371..1c63967db 100644 --- a/modules/cms/lang/pt-br/lang.php +++ b/modules/cms/lang/pt-br/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Página não encontrada", 'help' => "A página solicitada não pode ser encontrada.", ], - 'access_denied' => [ - 'label' => "Acesso negado", - 'help' => "Você não tem as permissões necessárias para visualizar esta página.", - 'cms_link' => "Ir para CMS backend", - ], 'custom_error' => [ 'label' => "Erro na página", 'help' => "Lamentamos, mas algo deu errado e que a página não pode ser exibida.", diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php index 8b6997104..9949689b6 100644 --- a/modules/cms/lang/ru/lang.php +++ b/modules/cms/lang/ru/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Страница не найдена", 'help' => "Запрошенная страница не найдена.", ], - 'access_denied' => [ - 'label' => "доступ запрещен", - 'help' => "Вы не должны необходимые разрешения для просмотра этой страницы.", - 'cms_link' => "К CMS серверной", - ], 'custom_error' => [ 'label' => "Ошибка на странице", 'help' => "К сожалению, страница не может быть отображена из-за ошибки.", diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php index 045d37d20..ccc047f99 100644 --- a/modules/cms/lang/sv/lang.php +++ b/modules/cms/lang/sv/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Sidan kunde ej hittas", 'help' => "Den begärda sidan kunde ej hittas", ], - 'access_denied' => [ - 'label' => "Nekat tillträde", - 'help' => "Du har inte behörighet att visa den här sidan.", - 'cms_link' => "Gå till CMS backend", - ], 'custom_error' => [ 'label' => "Sidfel", 'help' => "Tyvärr kan inte sidan visas", diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php index 2150a3929..a0b4eac09 100644 --- a/modules/cms/lang/tr/lang.php +++ b/modules/cms/lang/tr/lang.php @@ -27,11 +27,6 @@ return [ 'label' => "Sayfa bulunamadı", 'help' => "İstenilen sayfa bulunamadı.", ], - 'access_denied' => [ - 'label' => "Giriş engellendi", - 'help' => "Bu sayfayı görüntülemek için gerekli izinlere sahip değilsiniz.", - 'cms_link' => "CMS uç git", - ], 'custom_error' => [ 'label' => "Sayfa hatası", 'help' => "Üzgünüz, bir şeyler ters gitti ve sayfa görüntülenemiyor.",