From 1230cc1f218c8126899a2194ddc50905cf02b852 Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 16 Sep 2016 22:18:59 +0200 Subject: [PATCH] moved appearance into account, closes #33 --- .../Settings/AccountController.php | 71 ++++++++++++++ .../Settings/AppearanceController.php | 92 ------------------- app/Controllers/Settings/Controller.php | 20 ++-- .../{appearance => account}/_preview.twig | 0 .../{appearance => account}/signature.twig | 6 +- .../{appearance => account}/userpage.twig | 6 +- .../yuuno/settings/appearance/master.twig | 3 - routes.php | 17 +--- 8 files changed, 90 insertions(+), 125 deletions(-) delete mode 100644 app/Controllers/Settings/AppearanceController.php rename resources/views/yuuno/settings/{appearance => account}/_preview.twig (100%) rename resources/views/yuuno/settings/{appearance => account}/signature.twig (86%) rename resources/views/yuuno/settings/{appearance => account}/userpage.twig (87%) delete mode 100644 resources/views/yuuno/settings/appearance/master.twig diff --git a/app/Controllers/Settings/AccountController.php b/app/Controllers/Settings/AccountController.php index 4f6f8c6..2099ca0 100644 --- a/app/Controllers/Settings/AccountController.php +++ b/app/Controllers/Settings/AccountController.php @@ -277,4 +277,75 @@ class AccountController extends Controller return view('settings/account/ranks', compact('locked')); } + /** + * Renders the userpage editing page. + */ + public function userpage() + { + // Check permission + if (!( + CurrentSession::$user->page + && CurrentSession::$user->permission(Site::CHANGE_USERPAGE) + ) && !CurrentSession::$user->permission(Site::CREATE_USERPAGE)) { + throw new HttpMethodNotAllowedException(); + } + + $userpage = $_POST['userpage'] ?? null; + $maxLength = config('user.page_max'); + + if (session_check() && $userpage) { + $redirect = route('settings.account.userpage'); + + if (strlen($userpage) > $maxLength) { + $message = 'Your userpage is too long, shorten it a little!'; + } else { + DB::table('users') + ->where('user_id', CurrentSession::$user->id) + ->update([ + 'user_page' => $userpage, + ]); + + $message = 'Updated your userpage!'; + } + + return view('global/information', compact('message', 'redirect')); + } + + return view('settings/account/userpage', compact('maxLength')); + } + + /** + * Renders the signature changing page. + * @return string + */ + public function signature() + { + // Check permission + if (!CurrentSession::$user->permission(Site::CHANGE_SIGNATURE)) { + throw new HttpMethodNotAllowedException(); + } + + $signature = $_POST['signature'] ?? null; + $maxLength = config('user.signature_max'); + + if (session_check() && $signature) { + $redirect = route('settings.account.signature'); + + if (strlen($signature) > $maxLength) { + $message = 'Your signature is too long, shorten it a little!'; + } else { + DB::table('users') + ->where('user_id', CurrentSession::$user->id) + ->update([ + 'user_signature' => $signature, + ]); + + $message = 'Updated your signature!'; + } + + return view('global/information', compact('message', 'redirect')); + } + + return view('settings/account/signature', compact('maxLength')); + } } diff --git a/app/Controllers/Settings/AppearanceController.php b/app/Controllers/Settings/AppearanceController.php deleted file mode 100644 index 3bf07c2..0000000 --- a/app/Controllers/Settings/AppearanceController.php +++ /dev/null @@ -1,92 +0,0 @@ - - */ -class AppearanceController extends Controller -{ - /** - * Renders the userpage editing page. - */ - public function userpage() - { - // Check permission - if (!( - CurrentSession::$user->page - && CurrentSession::$user->permission(Site::CHANGE_USERPAGE) - ) && !CurrentSession::$user->permission(Site::CREATE_USERPAGE)) { - throw new HttpMethodNotAllowedException(); - } - - $userpage = $_POST['userpage'] ?? null; - $maxLength = config('user.page_max'); - - if (session_check() && $userpage) { - $redirect = route('settings.appearance.userpage'); - - if (strlen($userpage) > $maxLength) { - $message = 'Your userpage is too long, shorten it a little!'; - } else { - DB::table('users') - ->where('user_id', CurrentSession::$user->id) - ->update([ - 'user_page' => $userpage, - ]); - - $message = 'Updated your userpage!'; - } - - return view('global/information', compact('message', 'redirect')); - } - - return view('settings/appearance/userpage', compact('maxLength')); - } - - /** - * Renders the signature changing page. - * @return string - */ - public function signature() - { - // Check permission - if (!CurrentSession::$user->permission(Site::CHANGE_SIGNATURE)) { - throw new HttpMethodNotAllowedException(); - } - - $signature = $_POST['signature'] ?? null; - $maxLength = config('user.signature_max'); - - if (session_check() && $signature) { - $redirect = route('settings.appearance.signature'); - - if (strlen($signature) > $maxLength) { - $message = 'Your signature is too long, shorten it a little!'; - } else { - DB::table('users') - ->where('user_id', CurrentSession::$user->id) - ->update([ - 'user_signature' => $signature, - ]); - - $message = 'Updated your signature!'; - } - - return view('global/information', compact('message', 'redirect')); - } - - return view('settings/appearance/signature', compact('maxLength')); - } -} diff --git a/app/Controllers/Settings/Controller.php b/app/Controllers/Settings/Controller.php index 0cba411..fbdb596 100644 --- a/app/Controllers/Settings/Controller.php +++ b/app/Controllers/Settings/Controller.php @@ -47,6 +47,15 @@ class Controller extends BaseController if (CurrentSession::$user->permission(Site::ALTER_RANKS)) { $nav["Account"]["Ranks"] = route('settings.account.ranks'); } + if (( + CurrentSession::$user->page + && CurrentSession::$user->permission(Site::CHANGE_USERPAGE) + ) || CurrentSession::$user->permission(Site::CREATE_USERPAGE)) { + $nav["Account"]["Userpage"] = route('settings.account.userpage'); + } + if (CurrentSession::$user->permission(Site::CHANGE_SIGNATURE)) { + $nav["Account"]["Signature"] = route('settings.account.signature'); + } // Friends if (CurrentSession::$user->permission(Site::MANAGE_FRIENDS)) { @@ -54,17 +63,6 @@ class Controller extends BaseController $nav["Friends"]["Requests"] = route('settings.friends.requests'); } - // Appearance - if (( - CurrentSession::$user->page - && CurrentSession::$user->permission(Site::CHANGE_USERPAGE) - ) || CurrentSession::$user->permission(Site::CREATE_USERPAGE)) { - $nav["Appearance"]["Userpage"] = route('settings.appearance.userpage'); - } - if (CurrentSession::$user->permission(Site::CHANGE_SIGNATURE)) { - $nav["Appearance"]["Signature"] = route('settings.appearance.signature'); - } - // Advanced if (CurrentSession::$user->permission(Site::MANAGE_SESSIONS)) { $nav["Advanced"]["Sessions"] = route('settings.advanced.sessions'); diff --git a/resources/views/yuuno/settings/appearance/_preview.twig b/resources/views/yuuno/settings/account/_preview.twig similarity index 100% rename from resources/views/yuuno/settings/appearance/_preview.twig rename to resources/views/yuuno/settings/account/_preview.twig diff --git a/resources/views/yuuno/settings/appearance/signature.twig b/resources/views/yuuno/settings/account/signature.twig similarity index 86% rename from resources/views/yuuno/settings/appearance/signature.twig rename to resources/views/yuuno/settings/account/signature.twig index 334f40d..9633e49 100644 --- a/resources/views/yuuno/settings/appearance/signature.twig +++ b/resources/views/yuuno/settings/account/signature.twig @@ -1,4 +1,4 @@ -{% extends 'settings/appearance/master.twig' %} +{% extends 'settings/account/master.twig' %} {% set mode = 'Signature' %} @@ -9,7 +9,7 @@ {% block settingsContent %}
{{ user.signature()|raw|nl2br }}
-
+
@@ -17,5 +17,5 @@
- {% include 'settings/appearance/_preview.twig' %} + {% include 'settings/account/_preview.twig' %} {% endblock %} diff --git a/resources/views/yuuno/settings/appearance/userpage.twig b/resources/views/yuuno/settings/account/userpage.twig similarity index 87% rename from resources/views/yuuno/settings/appearance/userpage.twig rename to resources/views/yuuno/settings/account/userpage.twig index a25afdf..a771467 100644 --- a/resources/views/yuuno/settings/appearance/userpage.twig +++ b/resources/views/yuuno/settings/account/userpage.twig @@ -1,4 +1,4 @@ -{% extends 'settings/appearance/master.twig' %} +{% extends 'settings/account/master.twig' %} {% set mode = 'Userpage' %} @@ -9,7 +9,7 @@ {% block settingsContent %}
{{ user.userPage()|raw|nl2br }}
-
+
@@ -17,5 +17,5 @@
- {% include 'settings/appearance/_preview.twig' %} + {% include 'settings/account/_preview.twig' %} {% endblock %} diff --git a/resources/views/yuuno/settings/appearance/master.twig b/resources/views/yuuno/settings/appearance/master.twig deleted file mode 100644 index ff94170..0000000 --- a/resources/views/yuuno/settings/appearance/master.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% extends 'settings/master.twig' %} - -{% set category = 'Appearance' %} diff --git a/routes.php b/routes.php index 0dcf77f..72590b9 100644 --- a/routes.php +++ b/routes.php @@ -233,6 +233,10 @@ Routerv1::group(['before' => 'maintenance'], function () { Routerv1::post('/details', 'Settings.AccountController@details', 'settings.account.details'); Routerv1::get('/ranks', 'Settings.AccountController@ranks', 'settings.account.ranks'); Routerv1::post('/ranks', 'Settings.AccountController@ranks', 'settings.account.ranks'); + Routerv1::get('/userpage', 'Settings.AccountController@userpage', 'settings.account.userpage'); + Routerv1::post('/userpage', 'Settings.AccountController@userpage', 'settings.account.userpage'); + Routerv1::get('/signature', 'Settings.AccountController@signature', 'settings.account.signature'); + Routerv1::post('/signature', 'Settings.AccountController@signature', 'settings.account.signature'); }); // Friends section @@ -256,19 +260,6 @@ Routerv1::group(['before' => 'maintenance'], function () { Routerv1::get('/history', 'Settings.NotificationsController@history', 'settings.notifications.history'); }); - // Appearance section - Routerv1::group(['prefix' => 'appearance'], function () { - Routerv1::get('/', function () { - $route = Routerv1::route('settings.appearance.avatar'); - return header("Location: {$route}"); - }); - - Routerv1::get('/userpage', 'Settings.AppearanceController@userpage', 'settings.appearance.userpage'); - Routerv1::post('/userpage', 'Settings.AppearanceController@userpage', 'settings.appearance.userpage'); - Routerv1::get('/signature', 'Settings.AppearanceController@signature', 'settings.appearance.signature'); - Routerv1::post('/signature', 'Settings.AppearanceController@signature', 'settings.appearance.signature'); - }); - // Advanced section Routerv1::group(['prefix' => 'advanced'], function () { Routerv1::get('/', function () {