From 79f41a7652a764f9f3a770dbee23974f5ea2e246 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 18 Sep 2017 13:04:26 -0400
Subject: [PATCH] Permission groups seem to be good to go?

---
 admin/manage_users.php        |  2 +-
 inc/profile_functions.inc.php | 16 +++++++++-------
 language/en/text.php          |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/admin/manage_users.php b/admin/manage_users.php
index edad176c..e96aff40 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -700,7 +700,7 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
     $myuser['email'] = hesk_validateEmail(hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer .= '<li>' . $hesklang['enter_valid_email'] . '</li>';
     $myuser['user'] = hesk_input(hesk_POST('user')) or $hesk_error_buffer .= '<li>' . $hesklang['enter_username'] . '</li>';
     $myuser['isadmin'] = hesk_POST('template') == '1' ? 1 : 0;
-    $myuser['template'] = hesk_POST('reset-permission-template') === '1' ? -1 : hesk_POST('template');
+    $myuser['template'] = hesk_POST('template');
     $myuser['signature'] = hesk_input(hesk_POST('signature'));
     $myuser['autoassign'] = hesk_POST('autoassign') == 'Y' ? 1 : 0;
     $myuser['active'] = empty($_POST['active']) ? 0 : 1;
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
index acbad51b..52bb241a 100644
--- a/inc/profile_functions.inc.php
+++ b/inc/profile_functions.inc.php
@@ -182,17 +182,19 @@ function hesk_profile_tab($session_array = 'new', $is_profile_page = true, $acti
                             $selected = $_SESSION[$session_array]['permission_template'] == '-1' ? 'selected' : '';
                             echo '<option value="-1" ' . $selected . '>' . htmlspecialchars($hesklang['custom']) . '</option>';
                             echo '</select>';
-                            outputCheckboxJavascript($action);
                             ?>
                         </div>
                     </div>
-                    <?php elseif ($action == 'update-user'): ?>
-                        <input type="hidden" name="permission-tpl"
+                    <?php elseif ($action == 'edit_user'): ?>
+                        <input type="hidden" name="template"
                                value="<?php echo $_SESSION[$session_array]['permission_template']; ?>" />
                         <div id="changed-group-warning" class="alert alert-warning" style="display: none">
-                            [!] <b>Warning:</b> Changing a users categories / features will reset their permission group!
+                            <i class="fa fa-exclamation-triangle"></i> <?php echo $hesklang['changing_permissions_will_reset_permission_group']; ?>
                         </div>
-                    <?php endif; ?>
+                    <?php
+                    endif;
+                    outputCheckboxJavascript($action);
+                    ?>
                     <div id="options">
                         <div class="form-group">
                             <label for="categories[]"
@@ -602,9 +604,9 @@ function outputCheckboxJavascript($action)
         });
     }
     function setTemplateToCustom() {
-        $('#permission-tpl').val('-1');
+        $('input[name=\"template\"]').val('-1');
         
-        " . ($_SESSION['is_admin'] && $action == 'update-user' ? '' : "$('#changed-group-warning').show();") . "
+        " . ($action == 'edit_user' ? ($_SESSION['isadmin']  ? '' : "$('#changed-group-warning').show();") : '') . "
     }
     </script>";
 }
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 2f675006..61f0c1cd 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2186,6 +2186,7 @@ $hesklang['permission_groups'] = 'Permission Groups';
 $hesklang['can_man_permission_tpl'] = 'Can manage permission groups';
 $hesklang['permission_group_colon'] = 'Permission Group:';
 $hesklang['permission_group'] = 'Permission Group';
+$hesklang['changing_permissions_will_reset_permission_group'] = 'Changing a user\'s categories / features will reset their permission group! Click "Discard Changes" to reset the user\'s categories / features.';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');