From 96f73211d9304781f51b2c612e463502d906b37d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 15 Oct 2014 23:32:06 -0400
Subject: [PATCH] Closes #61: Manage help desk settings can be toggled for
 non-admins and admins

---
 admin/admin_settings.php      | 2 +-
 admin/admin_settings_save.php | 2 +-
 admin/manage_users.php        | 5 ++---
 inc/show_admin_nav.inc.php    | 2 +-
 language/en/text.php          | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 633d9ce8..6a4e52bd 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_man_settings');
+hesk_checkPermission('can_manage_settings');
 
 // Test languages function
 if (isset($_GET['test_languages']))
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index de2e9438..8ee0d3c2 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -49,7 +49,7 @@ hesk_dbConnect();
 hesk_isLoggedIn();
 
 // Check permissions for this feature
-hesk_checkPermission('can_man_settings');
+hesk_checkPermission('can_manage_settings');
 
 // A security check
 hesk_token_check('POST');
diff --git a/admin/manage_users.php b/admin/manage_users.php
index f678dfc3..3d584d63 100644
--- a/admin/manage_users.php
+++ b/admin/manage_users.php
@@ -61,7 +61,6 @@ $hesk_settings['features'] = array(
 'can_man_users',		/* User can create and edit staff accounts */
 'can_man_cat',			/* User can manage categories/departments */
 'can_man_canned',		/* User can manage canned responses */
-'can_man_settings',		/* User can manage help desk settings */
 'can_add_archive',		/* User can mark tickets as "Tagged" */
 'can_assign_self',		/* User can assign tickets to himself/herself */
 'can_assign_others',	/* User can assign tickets to other staff members */
@@ -278,7 +277,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </div>
                             <?php } if ($_SESSION['can_manage_settings']) { ?>
                             <div class="checkbox">
-                                    <label><input type="checkbox" name="manage_settings"> Can Manage Settings (!)</label>
+                                    <label><input type="checkbox" name="manage_settings"> <?php echo $hesklang['can_man_settings']; ?></label>
                             </div>
                             <?php } ?>
                         </div>
@@ -691,7 +690,7 @@ function edit_user()
                                 <?php if (isset($_SESSION['userdata']['can_manage_settings'])) { ?>
                                     <label><input type="checkbox" name="manage_settings"
                                             <?php if ($_SESSION['userdata']['can_manage_settings']) { echo 'checked="checked"';} ?>
-                                            <?php if (!$_SESSION['can_manage_settings']) { echo 'disabled'; } ?>> Can Manage Settings (!)</label>
+                                            <?php if (!$_SESSION['can_manage_settings']) { echo 'disabled'; } ?>> <?php echo $hesklang['can_man_settings']; ?></label>
                                     <?php if (!$_SESSION['can_manage_settings'] && $_SESSION['userdata']['can_manage_settings']) {
                                         echo '<input type="hidden" name="manage_settings" value="1">';
                                     } ?>
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index bb4de4e5..69b1546f 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -59,7 +59,7 @@ $num_mail = hesk_checkNewMail();
                     else {echo '<li><a href="knowledgebase_private.php"><i class="fa fa-book" '.$iconDisplay.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';}
                 if (hesk_checkPermission('can_run_reports',0)) {echo '<li><a href="reports.php"><i class="fa fa-line-chart" '.$iconDisplay.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
                     elseif (hesk_checkPermission('can_export',0)) {echo '<li><a href="export.php"><i class="fa fa-line-chart" '.$iconDisplay.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
-                if (hesk_checkPermission('can_man_settings',0)) {echo '<li><a href="admin_settings.php"><i class="fa fa-cog" '.$iconDisplay.'></i>&nbsp;'.$hesklang['settings'].'</a></li>';} ?>
+                if (hesk_checkPermission('can_manage_settings',0)) {echo '<li><a href="admin_settings.php"><i class="fa fa-cog" '.$iconDisplay.'></i>&nbsp;'.$hesklang['settings'].'</a></li>';} ?>
           <li><a href="profile.php"><i class="fa fa-user" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_profile']; ?></a></li>
           <li><a href="mail.php"><i class="fa fa-envelope-o" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['menu_msg']; ?>
               <?php if ($num_mail != 0)
diff --git a/language/en/text.php b/language/en/text.php
index 99fda3c8..83c1c762 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -25,6 +25,7 @@ $hesklang['EMAIL_HR']='------ Reply above this line ------';
 $hesklang['display_rtl'] = 'Display site right-to-left';
 $hesklang['show_icons_navigation'] = 'Show icons on navigation bar';
 $hesklang['enable_maintenance'] = 'Enable maintenance mode';
+$hesklang['can_man_settings']='Can manage help desk settings';
 
 // ADDED OR MODIFIED IN NuMods 1.4.0
 $hesklang['numods'] = 'NuMods';
@@ -563,7 +564,6 @@ $hesklang['can_man_kb']='Manage knowledgebase';
 $hesklang['can_man_users']='Manage users';
 $hesklang['can_man_cat']='Manage categories';
 $hesklang['can_man_canned']='Manage canned responses';
-$hesklang['can_man_settings']='Manage help desk settings';
 $hesklang['can_del_notes']='Delete any ticket notes';
 $hesklang['dan']='users can delete their own ticket notes, select this only if you wish to allow this user to also be able to delete notes from other users';
 $hesklang['in_all_cat']='in allowed categories only';