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

API settings page redone, contentified

Browse Source
This commit is contained in:
Mike Koch 2016-09-27 22:04:05 -04:00
parent f23ca3598e
commit 10b293d0d3
2 changed files with 114 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
admin/api_settings.php
View File

@ -41,6 +41,7 @@ if (is_dir(HESK_PATH . 'install')) {
require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/common.inc.php');
require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php');
require(HESK_PATH . 'inc/mail_functions.inc.php');
hesk_load_database_functions(); hesk_load_database_functions();
hesk_session_start(); hesk_session_start();
@ -60,86 +61,103 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
// Print main manage users page // Print main manage users page
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
<section class="content">
<div class="row move-down-20"> <div class="box">
<div class="col-sm-4"> <div class="box-header with-border">
<div class="panel panel-default"> <h1 class="box-title">
<div class="panel-heading"> <?php echo $hesklang['api_information']; ?>
API Information </h1>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-minus"></i>
</button>
</div> </div>
</div>
<div class="box-body">
<table class="table table-striped table-fixed"> <table class="table table-striped table-fixed">
<tr> <tr>
<td class="text-right"> <td class="text-right">
API Version <?php echo $hesklang['api_version']; ?>
</td> </td>
<td class="pad-right-10 warning"> <td class="warning">
<?php echo $hesklang['beta_text']; ?> <?php echo $hesklang['beta_text']; ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="text-right"> <td class="text-right">
External API <?php echo $hesklang['external_api']; ?>
</td> </td>
<td class="pad-right-10 success" id="public-api-sidebar"> <td class="success" id="public-api-sidebar">
<?php <?php
$enabled = $modsForHesk_settings['public_api'] == '1' ? '' : 'hide'; $enabled = $modsForHesk_settings['public_api'] == '1' ? '' : 'hide';
$disabled = $modsForHesk_settings['public_api'] == '1' ? 'hide' : ''; $disabled = $modsForHesk_settings['public_api'] == '1' ? 'hide' : '';
?> ?>
<span id="public-api-sidebar-disabled" class="<?php echo $disabled; ?>">Disabled</span> <span id="public-api-sidebar-disabled" class="<?php echo $disabled; ?>">
<span id="public-api-sidebar-enabled" class="<?php echo $enabled; ?>">Enabled</span> <?php echo $hesklang['disabled_title_case']; ?>
</span>
<span id="public-api-sidebar-enabled" class="<?php echo $enabled; ?>">
<?php echo $hesklang['enabled_title_case']; ?>
</span>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-8"> <div class="box">
<h3>API Settings</h3> <div class="box-header with-border">
<div class="footerWithBorder blankSpace"></div> <h1 class="box-title">
<ul class="nav nav-tabs"> <?php echo $hesklang['api_settings']; ?>
<li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li> </h1>
<li><a href="#user-security" data-toggle="tab">User Security</a></li> <div class="box-tools pull-right">
<li><a href="#" target="_blank">API Documentation <i class="fa fa-external-link"></i></a></li> <button type="button" class="btn btn-box-tool" data-widget="collapse">
</ul> <i class="fa fa-minus"></i>
<div class="tab-content summaryList tabPadding"> </button>
<div class="tab-pane fade in active" id="general"> </div>
<form class="form-horizontal"> </div>
<div class="form-group"> <div class="box-body nav-tabs-custom">
<label for="public-api" class="col-sm-3 control-label"> <ul class="nav nav-tabs">
Public API <li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <li><a href="#user-security" data-toggle="tab"><?php echo $hesklang['user_security']; ?></a></li>
title="Public API" <li><a href="#" target="_blank"><?php echo $hesklang['api_documentation']; ?> <i class="fa fa-external-link"></i></a></li>
data-content="Enable or Disable the Public REST API."></i> </ul>
</label> <div class="tab-content summaryList tabPadding">
<div class="col-sm-9"> <div class="tab-pane fade in active" id="general">
<form class="form-horizontal">
<div class="form-group">
<label for="public-api" class="col-sm-3 control-label">
<?php echo $hesklang['external_api']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo $hesklang['external_api']; ?>"
data-content="<?php echo $hesklang['external_api_help']; ?>"></i>
</label>
<div class="col-sm-9">
<span class="btn-group" data-toggle="buttons"> <span class="btn-group" data-toggle="buttons">
<?php <?php
$on = $modsForHesk_settings['public_api'] == '1' ? 'active' : ''; $on = $modsForHesk_settings['public_api'] == '1' ? 'active' : '';
$off = $modsForHesk_settings['public_api'] == '1' ? '' : 'active'; $off = $modsForHesk_settings['public_api'] == '1' ? '' : 'active';
?> ?>
<label id="enable-api-button" class="btn btn-success <?php echo $on; ?>"> <label id="enable-api-button" class="btn btn-success <?php echo $on; ?>">
<input type="radio" name="public-api" value="1" checked> <i class="fa fa-check-circle"></i> Enable <input type="radio" name="public-api" value="1"> <i class="fa fa-check-circle"></i>
<?php echo $hesklang['enable']; ?>
</label> </label>
<label id="disable-api-button" class="btn btn-danger <?php echo $off; ?>"> <label id="disable-api-button" class="btn btn-danger <?php echo $off; ?>">
<input type="radio" name="public-api" value="0"> <i class="fa fa-times-circle"></i> Disable <input type="radio" name="public-api" value="0"> <i class="fa fa-times-circle"></i>
<?php echo $hesklang['disable']; ?>
</label> </label>
</span> </span>
<span> <span>
<i id="public-api-success" class="fa fa-check-circle fa-2x green hide media-middle" <i id="public-api-success" class="fa fa-check-circle fa-2x green hide media-middle"
data-toggle="tooltip" title="Changes saved!"></i> data-toggle="tooltip" title="<?php echo $hesklang['changes_saved']; ?>"></i>
<i id="public-api-failure" class="fa fa-times-circle fa-2x red hide media-middle" <i id="public-api-failure" class="fa fa-times-circle fa-2x red hide media-middle"
data-toggle="tooltip" title="Saving changes failed. Check the logs for more information."></i> data-toggle="tooltip" title="<?php echo $hesklang['save_failed_check_logs']; ?>"></i>
<i id="public-api-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle" <i id="public-api-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle"
data-toggle="tooltip" title="Saving..."></i> data-toggle="tooltip" title="<?php echo $hesklang['saving']; ?>"></i>
</span> </span>
</div>
</div> </div>
</div> </form>
</form> </div>
</div> <div class="tab-pane fade in" id="user-security">
<div class="tab-pane fade in" id="user-security">
<div class="panel panel-default">
<div class="panel-heading">
User Security
</div>
<?php <?php
$users = array(); $users = array();
$userRs = hesk_dbQuery("SELECT `id`, `user`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'"); $userRs = hesk_dbQuery("SELECT `id`, `user`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'");
@ -155,51 +173,53 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>Username</th> <th><?php echo $hesklang['username']; ?></th>
<th>Name</th> <th><?php echo $hesklang['name']; ?></th>
<th>Number of Tokens</th> <th><?php echo $hesklang['number_of_tokens']; ?></th>
<th>Actions</th> <th><?php echo $hesklang['actions']; ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php <?php
foreach ($users as $row): foreach ($users as $row):
?> ?>
<tr> <tr>
<td><?php echo $row['user']; ?></td> <td><?php echo $row['user']; ?></td>
<td><?php echo $row['name']; ?></td> <td><?php echo $row['name']; ?></td>
<td id="token-<?php echo $row['id']; ?>-count"><?php echo $row['number_of_tokens']; ?></td> <td id="token-<?php echo $row['id']; ?>-count"><?php echo $row['number_of_tokens']; ?></td>
<td> <td>
<span class="btn-group"> <span class="btn-group">
<button class="btn btn-default btn-xs" onclick="generateToken(<?php echo $row['id']; ?>)"> <button class="btn btn-default btn-xs" onclick="generateToken(<?php echo $row['id']; ?>)">
<i class="fa fa-plus-circle"></i> Generate New Token <i class="fa fa-plus-circle"></i>
<?php echo $hesklang['generate_new_token']; ?>
</button> </button>
<button class="btn btn-danger btn-xs" onclick="clearTokens(<?php echo $row['id']; ?>)"> <button class="btn btn-danger btn-xs" onclick="clearTokens(<?php echo $row['id']; ?>)">
<i class="fa fa-undo"></i> Reset Tokens <i class="fa fa-times"></i>
<?php echo $hesklang['revoke_all_tokens']; ?>
</button> </button>
</span> </span>
<span> <span>
<i id="token-<?php echo $row['id']; ?>-success" class="fa fa-check-circle fa-2x green hide media-middle" <i id="token-<?php echo $row['id']; ?>-success" class="fa fa-check-circle fa-2x green hide media-middle"
data-toggle="tooltip" title="Changes saved!"></i> data-toggle="tooltip" title="<?php echo $hesklang['changes_saved']; ?>"></i>
<i id="token-<?php echo $row['id']; ?>-failure" class="fa fa-times-circle fa-2x red hide media-middle" <i id="token-<?php echo $row['id']; ?>-failure" class="fa fa-times-circle fa-2x red hide media-middle"
data-toggle="tooltip" title="Saving changes failed. Check the logs for more information."></i> data-toggle="tooltip" title="<?php echo $hesklang['save_failed_check_logs']; ?>"></i>
<i id="token-<?php echo $row['id']; ?>-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle" <i id="token-<?php echo $row['id']; ?>-saving" class="fa fa-spin fa-spinner fa-2x hide media-middle"
data-toggle="tooltip" title="Saving..."></i> data-toggle="tooltip" title="<?php echo $hesklang['saving']; ?>"></i>
</span> </span>
</td> </td>
</tr> </tr>
<tr id="token-<?php echo $row['id']; ?>-created" class="success hide"> <tr id="token-<?php echo $row['id']; ?>-created" class="success hide">
<td colspan="4"> <td colspan="4">
Generated Token: <code class="token"></code> <?php echo $hesklang['generated_token_colon']; ?> <code class="token"></code>
<p><b>NOTE:</b> Please record this token, as this is the only time you will be able to view it!</p> <p><b><?php echo $hesklang['record_this_token_warning']; ?></b></p>
</td> </td>
</tr> </tr>
<tr id="token-<?php echo $row['id']; ?>-reset" class="success hide"> <tr id="token-<?php echo $row['id']; ?>-reset" class="success hide">
<td colspan="4"> <td colspan="4">
<p>All tokens for this user have been removed!</p> <p><?php echo $hesklang['all_tokens_revoked']; ?></p>
</td> </td>
</tr> </tr>
<?php <?php
endforeach; endforeach;
?> ?>
</tbody> </tbody>
@ -208,7 +228,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
</div> </div>
</div> </div>
</section>
<?php <?php
require_once(HESK_PATH . 'inc/footer.inc.php'); require_once(HESK_PATH . 'inc/footer.inc.php');
exit(); exit();

17
language/en/text.php
View File

@ -48,6 +48,23 @@ $hesklang['timeline_today'] = 'Today';
$hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket'; $hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket';
$hesklang['private_message_header'] = 'Private Message'; $hesklang['private_message_header'] = 'Private Message';
$hesklang['date_colon'] = 'Date:'; $hesklang['date_colon'] = 'Date:';
$hesklang['api_information'] = 'API Information';
$hesklang['api_version'] = 'API Version';
$hesklang['external_api'] = 'External API';
$hesklang['external_api_help'] = 'Enable or Disable the external REST API';
$hesklang['disabled_title_case'] = 'Disabled';
$hesklang['enabled_title_case'] = 'Enabled';
$hesklang['api_settings'] = 'API Settings';
$hesklang['user_security'] = 'User Security';
$hesklang['api_documentation'] = 'API Documentation';
$hesklang['changes_saved'] = 'Changes saved!';
$hesklang['save_failed_check_logs'] = 'Saving changes failed. Check the logs for more information.';
$hesklang['number_of_tokens'] = 'Number of Tokens';
$hesklang['generate_new_token'] = 'Generate New Token';
$hesklang['revoke_all_tokens'] = 'Revoke All Tokens';
$hesklang['generated_token_colon'] = 'Generated Token:';
$hesklang['record_this_token_warning'] = 'Please record this token, as this is the only time you will be able to view it!';
$hesklang['all_tokens_revoked'] = 'All tokens for this user have been revoked';
// ADDED OR MODIFIED IN Mods for HESK 2.6.0 // ADDED OR MODIFIED IN Mods for HESK 2.6.0
$hesklang['search_logs'] = 'Search Logs'; $hesklang['search_logs'] = 'Search Logs';