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

Some tweaks to permission templates

Browse Source
merge-requests/2/head
Mike Koch 9 years ago
parent eae88f8294
commit 72a8d22982
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File

80
admin/manage_permission_templates.php
Unescape Escape View File

@ -89,7 +89,10 @@ else {return false;}
?> ?>
<div class="row" style="margin-top: 20px"> <div class="row" style="margin-top: 20px">
<div class="col-md-10 col-md-offset-1"> <div class="col-md-10 col-md-offset-1">
<h3><?php echo $hesklang['manage_permission_templates']; ?> <i class="fa fa-question-circle settingsquestionmark"></i></h3> <h3><?php echo $hesklang['manage_permission_templates']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="tooltip" data-placement="right"
title="<?php echo $hesklang['manage_permission_templates_help']; ?>"></i>
</h3>
<div class="footerWithBorder blankSpace"></div> <div class="footerWithBorder blankSpace"></div>
<?php <?php
hesk_handle_messages(); hesk_handle_messages();
@ -185,6 +188,11 @@ function createEditModal($template, $features, $categories) {
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<?php if ($showNotice): ?>
<div class="alert alert-info">
<i class="fa fa-info-circle"></i> <?php echo $hesklang['template_is_admin_cannot_change']; ?>
</div>
<?php endif; ?>
<div class="col-sm-2"> <div class="col-sm-2">
<label for="name" class="control-label"><?php echo $hesklang['template_name']; ?></label> <label for="name" class="control-label"><?php echo $hesklang['template_name']; ?></label>
</div> </div>
@ -194,11 +202,6 @@ function createEditModal($template, $features, $categories) {
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<?php if ($showNotice): ?>
<div class="alert alert-info">
<i class="fa fa-info-circle"></i> <?php echo $hesklang['template_is_admin_cannot_change']; ?>
</div>
<?php endif; ?>
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12">
<h4><?php echo $hesklang['menu_cat']; ?></h4> <h4><?php echo $hesklang['menu_cat']; ?></h4>
<div class="footerWithBorder blankSpace"></div> <div class="footerWithBorder blankSpace"></div>
@ -241,10 +244,11 @@ function createEditModal($template, $features, $categories) {
<div class="modal-footer"> <div class="modal-footer">
<input type="hidden" name="a" value="save"> <input type="hidden" name="a" value="save">
<input type="hidden" name="template_id" value="<?php echo $template['id']; ?>"> <input type="hidden" name="template_id" value="<?php echo $template['id']; ?>">
<?php if ($showNotice): ?>
<input type="hidden" name="name_only" value="1">
<?php endif; ?>
<div class="btn-group"> <div class="btn-group">
<?php if (!$showNotice): ?> <input type="submit" class="btn btn-success" value="<?php echo $hesklang['save_changes']; ?>">
<input type="submit" class="btn btn-success" value="<?php echo $hesklang['save_changes']; ?>">
<?php endif; ?>
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $hesklang['close_modal_without_saving']; ?></button> <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $hesklang['close_modal_without_saving']; ?></button>
</div> </div>
</div> </div>
@ -327,31 +331,39 @@ function save() {
$res = hesk_dbQuery("SELECT `heskprivileges`, `categories` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates` $res = hesk_dbQuery("SELECT `heskprivileges`, `categories` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates`
WHERE `id` = ".intval($templateId)); WHERE `id` = ".intval($templateId));
$row = hesk_dbFetchAssoc($res); $row = hesk_dbFetchAssoc($res);
// Add 'can ban emails' if 'can unban emails' is set (but not added). Same with 'can ban ips' if (hesk_POST('name_only', 0)) {
$catArray = hesk_POST_array('categories'); // We are only able to update the name
$featArray = hesk_POST_array('features'); $name = hesk_POST('name');
validate($featArray, $catArray);
if (in_array('can_unban_emails', $featArray) && !in_array('can_ban_emails', $featArray)) { hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates`
array_push($catArray, 'can_ban_emails'); SET `name` = '".hesk_dbEscape($name)."' WHERE `id` = ".intval($templateId));
} } else {
if (in_array('can_unban_ips', $featArray) && !in_array('can_ban_ips', $featArray)) { // Add 'can ban emails' if 'can unban emails' is set (but not added). Same with 'can ban ips'
array_push($featArray, 'can_ban_ips'); $catArray = hesk_POST_array('categories');
} $featArray = hesk_POST_array('features');
$categories = implode(',', $catArray); validate($featArray, $catArray);
$features = implode(',', $featArray); if (in_array('can_unban_emails', $featArray) && !in_array('can_ban_emails', $featArray)) {
$name = hesk_POST('name'); array_push($catArray, 'can_ban_emails');
}
hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates` if (in_array('can_unban_ips', $featArray) && !in_array('can_ban_ips', $featArray)) {
SET `categories` = '".hesk_dbEscape($categories)."', `heskprivileges` = '".hesk_dbEscape($features)."', array_push($featArray, 'can_ban_ips');
`name` = '".hesk_dbEscape($name)."' }
WHERE `id` = ".intval($templateId)); $categories = implode(',', $catArray);
$features = implode(',', $featArray);
if ($row['categories'] != $categories || $row['heskprivileges'] != $features) { $name = hesk_POST('name');
// Any users with this template should be switched to "custom"
hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` SET `permission_template` = NULL hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."permission_templates`
WHERE `permission_template` = ".intval($templateId)); SET `categories` = '".hesk_dbEscape($categories)."', `heskprivileges` = '".hesk_dbEscape($features)."',
} `name` = '".hesk_dbEscape($name)."'
WHERE `id` = ".intval($templateId));
if ($row['categories'] != $categories || $row['heskprivileges'] != $features) {
// Any users with this template should be switched to "custom"
hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` SET `permission_template` = NULL
WHERE `permission_template` = ".intval($templateId));
}
}
hesk_process_messages( $hesklang['permission_template_updated'],$_SERVER['PHP_SELF'],'SUCCESS'); hesk_process_messages( $hesklang['permission_template_updated'],$_SERVER['PHP_SELF'],'SUCCESS');
} }

2
language/en/text.php
Unescape Escape View File

@ -71,6 +71,8 @@ $hesklang['manager_updated'] = 'Category manager has been updated.';
$hesklang['can_set_manager'] = 'Can set category managers'; $hesklang['can_set_manager'] = 'Can set category managers';
$hesklang['no_manager'] = 'No manager'; $hesklang['no_manager'] = 'No manager';
$hesklang['manage_permission_templates'] = 'Manage Permission Templates'; $hesklang['manage_permission_templates'] = 'Manage Permission Templates';
$hesklang['manage_permission_templates_help'] = 'Here you can create and edit permission templates. These templates will appear when creating/editing a user.
Please note that if you change the permission template\'s settings, it will NOT change the permissions of any users that are set to this permission template.';
$hesklang['number_of_users'] = 'Number of Users'; $hesklang['number_of_users'] = 'Number of Users';
$hesklang['actions'] = 'Actions'; $hesklang['actions'] = 'Actions';
$hesklang['view_permissions_for_this_template'] = 'View/edit permissions for this template'; $hesklang['view_permissions_for_this_template'] = 'View/edit permissions for this template';

Write Preview
Loading…
Cancel
Save