Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#196 Patch up some permission stuff

Browse Source
This commit is contained in:
Mike Koch 2015-06-16 00:14:28 -04:00
parent 9685a22aa1
commit 81553d4885
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/manage_users.php
View File

@ -432,7 +432,7 @@ function edit_user()
if ( ! isset($_SESSION['save_userdata'])) if ( ! isset($_SESSION['save_userdata']))
{ {
$res = hesk_dbQuery("SELECT *,`heskprivileges` AS `features`, `can_manage_settings`, `active`, `can_change_notification_settings` $res = hesk_dbQuery("SELECT *,`heskprivileges` AS `features`, `active`
FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='".intval($id)."' LIMIT 1"); FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` WHERE `id`='".intval($id)."' LIMIT 1");
$_SESSION['userdata'] = hesk_dbFetchAssoc($res); $_SESSION['userdata'] = hesk_dbFetchAssoc($res);
@ -535,8 +535,6 @@ function new_user()
`categories`, `categories`,
`autoassign`, `autoassign`,
`heskprivileges`, `heskprivileges`,
`can_manage_settings`,
`can_change_notification_settings`,
`afterreply`, `afterreply`,
`autostart`, `autostart`,
`notify_customer_new`, `notify_customer_new`,
@ -561,8 +559,6 @@ function new_user()
'".hesk_dbEscape($myuser['categories'])."', '".hesk_dbEscape($myuser['categories'])."',
'".intval($myuser['autoassign'])."', '".intval($myuser['autoassign'])."',
'".hesk_dbEscape($myuser['features'])."', '".hesk_dbEscape($myuser['features'])."',
'".hesk_dbEscape($myuser['can_manage_settings'])."',
'".hesk_dbEscape($myuser['can_change_notification_settings'])."',
'".($myuser['afterreply'])."' , '".($myuser['afterreply'])."' ,
'".($myuser['autostart'])."' , '".($myuser['autostart'])."' ,
'".($myuser['notify_customer_new'])."' , '".($myuser['notify_customer_new'])."' ,
@ -693,7 +689,6 @@ function update_user()
`active`='".intval($myuser['active'])."', `active`='".intval($myuser['active'])."',
`autoassign`='".intval($myuser['autoassign'])."', `autoassign`='".intval($myuser['autoassign'])."',
`heskprivileges`='".hesk_dbEscape($myuser['features'])."', `heskprivileges`='".hesk_dbEscape($myuser['features'])."',
`can_change_notification_settings`='".hesk_dbEscape($myuser['can_change_notification_settings'])."',
`afterreply`='".($myuser['afterreply'])."' , `afterreply`='".($myuser['afterreply'])."' ,
`autostart`='".($myuser['autostart'])."' , `autostart`='".($myuser['autostart'])."' ,
`notify_customer_new`='".($myuser['notify_customer_new'])."' , `notify_customer_new`='".($myuser['notify_customer_new'])."' ,
@ -740,10 +735,6 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
$myuser['autoassign'] = hesk_POST('autoassign') == 'Y' ? 1 : 0; $myuser['autoassign'] = hesk_POST('autoassign') == 'Y' ? 1 : 0;
$myuser['active'] = empty($_POST['active']) ? 0 : 1; $myuser['active'] = empty($_POST['active']) ? 0 : 1;
$myuser['can_change_notification_settings'] = empty($_POST['can_change_notification_settings']) ? 0 : 1; $myuser['can_change_notification_settings'] = empty($_POST['can_change_notification_settings']) ? 0 : 1;
if ($myuser['isadmin'])
{
$myuser['can_change_notification_settings'] = 1;
}
/* If it's not admin at least one category and fature is required */ /* If it's not admin at least one category and fature is required */
$myuser['categories'] = array(); $myuser['categories'] = array();

1
inc/common.inc.php
View File

@ -1945,5 +1945,6 @@ function hesk_getFeatureArray() {
'can_set_manager', /* User can set category managers */ 'can_set_manager', /* User can set category managers */
'can_man_permission_tpl', /* User can manage permission templates */ 'can_man_permission_tpl', /* User can manage permission templates */
'can_man_settings', /* User can manage helpdesk settings */ 'can_man_settings', /* User can manage helpdesk settings */
'can_change_notification_settings', /* User can change notification settings */
); );
} }

7
inc/profile_functions.inc.php
View File

@ -190,9 +190,6 @@ function hesk_profile_tab($session_array='new',$is_profile_page=true,$action='pr
echo ' />' . $hesklang[$k] . '</label></div> '; echo ' />' . $hesklang[$k] . '</label></div> ';
} }
?> ?>
<div class="checkbox">
<label><input type="checkbox" name="can_change_notification_settings" <?php if (!isset($_SESSION[$session_array]['can_change_notification_settings']) || $_SESSION[$session_array]['can_change_notification_settings']) { echo 'checked'; } ?>> <?php echo $hesklang['can_change_notification_settings']; ?> </label>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -263,7 +260,9 @@ function hesk_profile_tab($session_array='new',$is_profile_page=true,$action='pr
</div> </div>
</div> </div>
<div role="tabpanel" class="tab-pane fade" id="notifications"> <div role="tabpanel" class="tab-pane fade" id="notifications">
<?php $disabledText = isset($_SESSION[$session_array]['can_change_notification_settings']) && $_SESSION[$session_array]['can_change_notification_settings'] ? '' : 'disabled'; <?php $disabledText =
(!$_SESSION[$session_array]['isadmin'] && strpos($_SESSION[$session_array]['heskprivileges'],'can_change_notification_settings') === false)
? 'disabled' : '';
if (!$is_profile_page) { if (!$is_profile_page) {
$disabledText = ''; $disabledText = '';
} }