From e9632e57644181a26e53990ea940ca989f948a72 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 12 Oct 2016 21:25:36 -0400
Subject: [PATCH] Update manage_users

---
 admin/manage_users.php | 19 ++++++++++++++++++-
 inc/common.inc.php     |  7 +++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/admin/manage_users.php b/admin/manage_users.php
index 767b0da8..676ed631 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -86,6 +86,7 @@ $default_userdata = array(
     'notify_customer_new' => 1,
     'notify_customer_reply' => 1,
     'show_suggested' => 1,
+    'autoreload' => 0,
     'default_calendar_view' => $default_view,
 
     // Notifications
@@ -521,6 +522,7 @@ function new_user()
 	    `heskprivileges`,
 	    `afterreply`,
         `autostart`,
+        `autoreload`,
         `notify_customer_new`,
         `notify_customer_reply`,
         `show_suggested`,
@@ -547,6 +549,7 @@ function new_user()
 	'" . hesk_dbEscape($myuser['features']) . "',
 	'" . ($myuser['afterreply']) . "' ,
 	'" . ($myuser['autostart']) . "' ,
+	'" . ($myuser['autoreload']) . "' ,
 	'" . ($myuser['notify_customer_new']) . "' ,
 	'" . ($myuser['notify_customer_reply']) . "' ,
 	'" . ($myuser['show_suggested']) . "' ,
@@ -673,6 +676,7 @@ function update_user()
     `heskprivileges`='" . hesk_dbEscape($myuser['features']) . "',
     `afterreply`='" . ($myuser['afterreply']) . "' ,
 	`autostart`='" . ($myuser['autostart']) . "' ,
+	`autoreload`='" . ($myuser['autoreload']) . "' ,
 	`notify_customer_new`='" . ($myuser['notify_customer_new']) . "' ,
 	`notify_customer_reply`='" . ($myuser['notify_customer_reply']) . "' ,
 	`show_suggested`='" . ($myuser['show_suggested']) . "' ,
@@ -688,7 +692,7 @@ function update_user()
 	`autorefresh`=" . intval($myuser['autorefresh']) . ",
 	`permission_template`=" . intval($myuser['template']) . ",
 	`default_calendar_view`=" . intval($myuser['default_calendar_view']) . "
-    WHERE `id`='" . intval($myuser['id']) . "' LIMIT 1");
+    WHERE `id`='" . intval($myuser['id']) . "'");
 
     // If they are now inactive, remove any manager rights
     if (!$myuser['active']) {
@@ -788,6 +792,19 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
     $myuser['notify_customer_new'] = isset($_POST['notify_customer_new']) ? 1 : 0;
     $myuser['notify_customer_reply'] = isset($_POST['notify_customer_reply']) ? 1 : 0;
     $myuser['show_suggested'] = isset($_POST['show_suggested']) ? 1 : 0;
+    $myuser['autoreload'] = isset($_POST['autoreload']) ? 1 : 0;
+
+    if ($myuser['autoreload']) {
+        $myuser['autoreload'] = intval(hesk_POST('reload_time'));
+
+        if (hesk_POST('secmin') == 'min') {
+            $myuser['autoreload'] *= 60;
+        }
+
+        if ($myuser['autoreload'] < 0 || $myuser['autoreload'] > 65535) {
+            $myuser['autoreload'] = 30;
+        }
+    }
     $myuser['default_calendar_view'] = hesk_POST('default-calendar-view', 0);
 
     /* Notifications */
diff --git a/inc/common.inc.php b/inc/common.inc.php
index d930433f..3cac75b8 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -1769,8 +1769,11 @@ function hesk_getFeatureArray()
         'can_del_tickets',        /* User can delete tickets */
         'can_edit_tickets',        /* User can edit tickets */
         'can_merge_tickets',    /* User can merge tickets */
+        'can_resolve',			/* User can resolve tickets */
+        'can_submit_any_cat',	/* User can submit a ticket to any category/department */
         'can_del_notes',        /* User can delete ticket notes posted by other staff members */
-        'can_change_cat',        /* User can move ticke to a new category/department */
+        'can_change_cat',		/* User can move ticket to any category/department */
+        'can_change_own_cat',	/* User can move ticket to a category/department he/she has access to */
         'can_man_kb',            /* User can manage knowledgebase articles and categories */
         'can_man_users',        /* User can create and edit staff accounts */
         'can_man_cat',            /* User can manage categories/departments */
@@ -1790,7 +1793,7 @@ function hesk_getFeatureArray()
         'can_ban_ips',            /* User can ban IP addresses */
         'can_unban_ips',        /* User can delete IP bans. Also enables "can_ban_ips" */
         'can_service_msg',        /* User can manage service messages shown in customer interface */
-        'can_man_email_tpl',    /* User can manage email templates */
+        'can_email_tpl',    /* User can manage email templates */
         'can_man_ticket_statuses', /* User can manage ticket statuses */
         'can_set_manager', /* User can set category managers */
         'can_man_permission_tpl', /* User can manage permission templates */