From ebfc51b302ce89c38c9490bce1cdcc31da72051b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 15 Jun 2015 23:15:10 -0400 Subject: [PATCH] #196 Bring back can_man_settings --- admin/admin_settings.php | 2 +- admin/manage_users.php | 1 - inc/common.inc.php | 1 + inc/show_admin_nav.inc.php | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 938ed1d2..f215630a 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -56,7 +56,7 @@ hesk_dbConnect(); hesk_isLoggedIn(); // Check permissions for this feature -hesk_checkPermission('can_manage_settings'); +hesk_checkPermission('can_man_settings'); // Test languages function if (isset($_GET['test_languages'])) diff --git a/admin/manage_users.php b/admin/manage_users.php index 456e093a..7ec815ea 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -70,7 +70,6 @@ $default_userdata = array( 'active' => 1, 'categories' => array('1'), 'features' => array('can_view_tickets','can_reply_tickets','can_change_cat','can_assign_self','can_view_unassigned','can_view_online'), - 'can_manage_settings' => 0, // Preferences 'afterreply' => 0, diff --git a/inc/common.inc.php b/inc/common.inc.php index d7ac8df1..265ef680 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -1944,5 +1944,6 @@ function hesk_getFeatureArray() { '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 */ + 'can_man_settings', /* User can manage helpdesk settings */ ); } \ No newline at end of file diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php index 93752446..b52b4bf1 100644 --- a/inc/show_admin_nav.inc.php +++ b/inc/show_admin_nav.inc.php @@ -125,7 +125,7 @@ if ( hesk_check_kb_only(false) ) } elseif (hesk_checkPermission('can_man_ticket_statuses',0)) { echo '
  •  '.$hesklang['tools'].'
  • '; } - if (hesk_checkPermission('can_manage_settings',0)) { + if (hesk_checkPermission('can_man_settings',0)) { echo '
  •  '.$hesklang['settings'].'
  • '; } ?>