From ff93ddf20e3f4d6d2b5802738e417da7b37bba32 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Mon, 10 Jun 2019 15:43:55 +0200
Subject: [PATCH] Fixed mobile menu no longer working.

---
 public/manage/users/user.php     | 7 ++-----
 templates/_layout/input.twig     | 2 +-
 templates/manage/macros.twig     | 6 +++---
 templates/manage/users/user.twig | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/public/manage/users/user.php b/public/manage/users/user.php
index 68953077..3543b7d7 100644
--- a/public/manage/users/user.php
+++ b/public/manage/users/user.php
@@ -18,10 +18,7 @@ if($userId < 1) {
 $isSuperUser = user_check_super($currentUserId);
 $canEdit = $isSuperUser || user_check_authority($currentUserId, $userId);
 $canEditPerms = $canEdit && perms_check_user(MSZ_PERMS_USER, $currentUserId, MSZ_PERM_USER_MANAGE_PERMS);
-
-if($canEditPerms) {
-    $permissions = manage_perms_list(perms_get_user_raw($userId));
-}
+$permissions = manage_perms_list(perms_get_user_raw($userId));
 
 if(csrf_verify('users_edit', $_POST['csrf'] ?? '') && $canEdit) {
     if(!empty($_POST['roles']) && is_array($_POST['roles']) && array_test($_POST['roles'], 'ctype_digit')) {
@@ -188,7 +185,7 @@ if(csrf_verify('users_edit', $_POST['csrf'] ?? '') && $canEdit) {
         }
     }
 
-    if(!empty($permissions) && !empty($_POST['perms']) && is_array($_POST['perms'])) {
+    if($canEditPerms && !empty($_POST['perms']) && is_array($_POST['perms'])) {
         $perms = manage_perms_apply($permissions, $_POST['perms']);
 
         if($perms !== null) {
diff --git a/templates/_layout/input.twig b/templates/_layout/input.twig
index 1f75d01a..93ca8966 100644
--- a/templates/_layout/input.twig
+++ b/templates/_layout/input.twig
@@ -26,7 +26,7 @@
 {% macro input_checkbox_raw(name, checked, class, value, radio, attributes, disabled) %}
 {% spaceless %}
     <input type="{{ radio ? 'radio' : 'checkbox' }}" class="{{ class|length > 0 ? class : 'input__checkbox__input' }}"
-        {% if name|length > 0 %}name="{{ name }}"{% else %}readonly onclick="return false"{% endif %}
+        {% if name|length > 0 %}name="{{ name }}"{% endif %}
         {% if checked %}checked{% endif %}
         {% if disabled %}disabled{% endif %}
         {% if value|length > 0 %}value="{{ value }}"{% endif %}
diff --git a/templates/manage/macros.twig b/templates/manage/macros.twig
index d4da8d85..95e86d45 100644
--- a/templates/manage/macros.twig
+++ b/templates/manage/macros.twig
@@ -40,13 +40,13 @@
                         {{ perm.title }}
                     </div>
                     <div class="permissions__choice__wrapper">
-                        {{ input_checkbox(readonly ? '' : 'perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'yes', 'permissions__choice permissions__choice--radio permissions__choice--yes', 'yes', true) }}
+                        {{ input_checkbox('perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'yes', 'permissions__choice permissions__choice--radio permissions__choice--yes', 'yes', true, null, readonly) }}
                     </div>
                     <div class="permissions__choice__wrapper">
-                        {{ input_checkbox(readonly ? '' : 'perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'no', 'permissions__choice permissions__choice--radio permissions__choice--no', 'no', true) }}
+                        {{ input_checkbox('perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'no', 'permissions__choice permissions__choice--radio permissions__choice--no', 'no', true, null, readonly) }}
                     </div>
                     <div class="permissions__choice__wrapper">
-                        {{ input_checkbox(readonly ? '' : 'perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'never', 'permissions__choice permissions__choice--radio permissions__choice--never', 'never', true) }}
+                        {{ input_checkbox('perms[' ~ perms.section ~ '][' ~ perm.section ~ '][value]', '', perm.value == 'never', 'permissions__choice permissions__choice--radio permissions__choice--never', 'never', true, null, readonly) }}
                     </div>
                 </div>
             {% endfor %}
diff --git a/templates/manage/users/user.twig b/templates/manage/users/user.twig
index e6e18294..532f5641 100644
--- a/templates/manage/users/user.twig
+++ b/templates/manage/users/user.twig
@@ -99,7 +99,7 @@
                 <label class="form__label">
                     <div class="form__label__text">Custom Colour</div>
                     <div class="form__label__input">
-                        {{ input_checkbox(can_edit_user ? 'colour[enable]' : '', '', manage_user.user_colour is not null and not manage_user.user_colour|colour_inherit) }}
+                        {{ input_checkbox('colour[enable]', '', manage_user.user_colour is not null and not manage_user.user_colour|colour_inherit, '', '', false, null, not can_edit_user) }}
                     </div>
                 </label>
 
@@ -113,11 +113,11 @@
                         <label class="manage__tag" style="{{ role.role_colour|html_colour('--accent-colour') }}">
                             <div class="manage__tag__background"></div>
                             <div class="manage__tag__content">
-                                {{ input_checkbox(can_edit_user ? 'roles[]' : '', '', role.has_role, 'manage__tag__checkbox', role.role_id) }}
+                                {{ input_checkbox('roles[]', '', role.has_role, 'manage__tag__checkbox', role.role_id, false, null, not can_edit_user) }}
                                 <div class="manage__tag__title">
                                     {{ role.role_name }}
                                 </div>
-                                {{ input_checkbox(can_edit_user ? 'user[display_role]' : '', '', role.role_id == manage_user.display_role, 'manage__tag__checkbox', role.role_id, true) }}
+                                {{ input_checkbox('user[display_role]', '', role.role_id == manage_user.display_role, 'manage__tag__checkbox', role.role_id, true, null, not can_edit_user) }}
                             </div>
                         </label>
                     {% endfor %}