Create the token once for Active Calls
Improve efficiency by using one token for active calls. When token generated inside the include it would generate many tokens.
This commit is contained in:
FusionPBX
GitHub
parent
b01bf7d08c
commit
edb6e43462
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Portions created by the Initial Developer are Copyright (C) 2008-2023
|
Portions created by the Initial Developer are Copyright (C) 2008-2025
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
@ -78,7 +78,12 @@
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: url,
|
url: url,
|
||||||
success: function(response){
|
success: function(response){
|
||||||
$("#ajax_reponse").html(response);
|
$("#ajax_response").html(response);
|
||||||
|
const table = document.getElementById('calls_active');
|
||||||
|
var row_count = table.rows.length;
|
||||||
|
if (row_count > 0) { row_count = row_count - 1; }
|
||||||
|
const calls_active_count = document.getElementById('calls_active_count');
|
||||||
|
calls_active_count.innerHTML = row_count;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
timer_id = setTimeout(ajax_get, refresh);
|
timer_id = setTimeout(ajax_get, refresh);
|
||||||
|
|
@ -132,19 +137,70 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
//create simple array of users own extensions
|
//create simple array of users own extensions
|
||||||
unset($_SESSION['user']['extensions']);
|
unset($_SESSION['user']['extensions']);
|
||||||
if (is_array($_SESSION['user']['extension'])) {
|
if (is_array($_SESSION['user']['extension'])) {
|
||||||
foreach ($_SESSION['user']['extension'] as $assigned_extensions) {
|
foreach ($_SESSION['user']['extension'] as $assigned_extensions) {
|
||||||
$_SESSION['user']['extensions'][] = $assigned_extensions['user'];
|
$_SESSION['user']['extensions'][] = $assigned_extensions['user'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
echo "<div id='ajax_reponse'></div>\n";
|
//create token
|
||||||
echo "<div id='cmd_response' style='display: none;'></div>\n";
|
$object = new token;
|
||||||
echo "<div id='time_stamp' style='visibility:hidden'>".date('Y-m-d-s')."</div>\n";
|
$token = $object->create('/app/calls_active/calls_active_inc.php');
|
||||||
echo "<br><br><br>";
|
$_SESSION['app']['calls_active']['token']['name'] = $token['name'];
|
||||||
|
$_SESSION['app']['calls_active']['token']['hash'] = $token['hash'];
|
||||||
|
|
||||||
require_once "resources/footer.php";
|
//show the content header
|
||||||
|
echo "<div class='action_bar' id='action_bar'>\n";
|
||||||
|
echo " <div class='heading'><b>".$text['title']."</b><div id='calls_active_count' class='count'>".number_format($num_rows)."</div></div>\n";
|
||||||
|
echo " <div class='actions'>\n";
|
||||||
|
echo " <span id='refresh_state'>".button::create(['type'=>'button','title'=>$text['label-refresh_pause'],'icon'=>'sync-alt fa-spin','onclick'=>'refresh_stop()'])."</span>";
|
||||||
|
if (permission_exists('call_active_eavesdrop') && !empty($user['extensions'])) {
|
||||||
|
if (sizeof($user['extensions']) > 1) {
|
||||||
|
echo " <input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $user['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
|
||||||
|
echo " <i class='fas fa-headphones' style='margin-left: 15px; cursor: help;' title='".$text['description-eavesdrop_destination']."' align='absmiddle'></i>\n";
|
||||||
|
echo " <select class='formfld' style='margin-right: 5px;' align='absmiddle' onchange=\"document.getElementById('eavesdrop_dest').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();'>\n";
|
||||||
|
if (is_array($user['extensions'])) {
|
||||||
|
foreach ($user['extensions'] as $user_extension) {
|
||||||
|
echo " <option value='".escape($user_extension)."' ".(($_REQUEST['eavesdrop_dest'] == $user_extension) ? "selected" : null).">".escape($user_extension)."</option>\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
echo " </select>\n";
|
||||||
|
}
|
||||||
|
else if (sizeof($user['extensions']) == 1) {
|
||||||
|
echo " <input type='hidden' id='eavesdrop_dest' value=\"".escape($user['extension'][0]['destination'])."\">\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (permission_exists('call_active_hangup') && $rows) {
|
||||||
|
echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','id'=>'btn_delete','onclick'=>"refresh_stop(); modal_open('modal-hangup','btn_hangup');"]);
|
||||||
|
}
|
||||||
|
if (permission_exists('call_active_all')) {
|
||||||
|
if ($show == "all") {
|
||||||
|
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$theme_button_icon_back,'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$theme_button_icon_all,'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
echo " </div>\n";
|
||||||
|
echo " <div style='clear: both;'></div>\n";
|
||||||
|
echo "</div>\n";
|
||||||
|
|
||||||
|
if (permission_exists('call_active_hangup') && $rows) {
|
||||||
|
echo modal::create(['id'=>'modal-hangup','type'=>'general','message'=>$text['confirm-hangups'],'actions'=>button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'check','id'=>'btn_hangup','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('hangup'); list_form_submit('form_list');"])]);
|
||||||
|
}
|
||||||
|
|
||||||
|
echo $text['description']."\n";
|
||||||
|
echo "<br /><br />\n";
|
||||||
|
|
||||||
|
//show the content body
|
||||||
|
echo "<div id='ajax_response'></div>\n";
|
||||||
|
echo "<div id='cmd_response' style='display: none;'></div>\n";
|
||||||
|
echo "<div id='time_stamp' style='visibility:hidden'>".date('Y-m-d-s')."</div>\n";
|
||||||
|
echo "<br><br><br>";
|
||||||
|
|
||||||
|
//show the footer
|
||||||
|
require_once "resources/footer.php";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// deprecated functions for this page
|
// deprecated functions for this page
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Portions created by the Initial Developer are Copyright (C) 2008-2023
|
Portions created by the Initial Developer are Copyright (C) 2008-2025
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
@ -119,10 +119,6 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//create token
|
|
||||||
$object = new token;
|
|
||||||
$token = $object->create('/app/calls_active/calls_active_inc.php');
|
|
||||||
|
|
||||||
//add the style
|
//add the style
|
||||||
echo "<style>\n";
|
echo "<style>\n";
|
||||||
echo " /* Small screens: Hide columns with class 'hide-small' */\n";
|
echo " /* Small screens: Hide columns with class 'hide-small' */\n";
|
||||||
|
|
@ -141,49 +137,6 @@
|
||||||
echo "\n";
|
echo "\n";
|
||||||
echo "</style>\n";
|
echo "</style>\n";
|
||||||
|
|
||||||
//show the content
|
|
||||||
echo "<div class='action_bar' id='action_bar'>\n";
|
|
||||||
echo " <div class='heading'><b>".$text['title']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
|
|
||||||
echo " <div class='actions'>\n";
|
|
||||||
echo " <span id='refresh_state'>".button::create(['type'=>'button','title'=>$text['label-refresh_pause'],'icon'=>'sync-alt fa-spin','onclick'=>'refresh_stop()'])."</span>";
|
|
||||||
if (permission_exists('call_active_eavesdrop') && !empty($user['extensions'])) {
|
|
||||||
if (sizeof($user['extensions']) > 1) {
|
|
||||||
echo " <input type='hidden' id='eavesdrop_dest' value=\"".(($_REQUEST['eavesdrop_dest'] == '') ? $user['extension'][0]['destination'] : escape($_REQUEST['eavesdrop_dest']))."\">\n";
|
|
||||||
echo " <i class='fas fa-headphones' style='margin-left: 15px; cursor: help;' title='".$text['description-eavesdrop_destination']."' align='absmiddle'></i>\n";
|
|
||||||
echo " <select class='formfld' style='margin-right: 5px;' align='absmiddle' onchange=\"document.getElementById('eavesdrop_dest').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();'>\n";
|
|
||||||
if (is_array($user['extensions'])) {
|
|
||||||
foreach ($user['extensions'] as $user_extension) {
|
|
||||||
echo " <option value='".escape($user_extension)."' ".(($_REQUEST['eavesdrop_dest'] == $user_extension) ? "selected" : null).">".escape($user_extension)."</option>\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
echo " </select>\n";
|
|
||||||
}
|
|
||||||
else if (sizeof($user['extensions']) == 1) {
|
|
||||||
echo " <input type='hidden' id='eavesdrop_dest' value=\"".escape($user['extension'][0]['destination'])."\">\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (permission_exists('call_active_hangup') && $rows) {
|
|
||||||
echo button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'phone-slash','id'=>'btn_delete','onclick'=>"refresh_stop(); modal_open('modal-hangup','btn_hangup');"]);
|
|
||||||
}
|
|
||||||
if (permission_exists('call_active_all')) {
|
|
||||||
if ($show == "all") {
|
|
||||||
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$theme_button_icon_back,'link'=>'calls_active.php','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$theme_button_icon_all,'link'=>'calls_active.php?show=all','onmouseover'=>'refresh_stop()','onmouseout'=>'refresh_start()']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
echo " </div>\n";
|
|
||||||
echo " <div style='clear: both;'></div>\n";
|
|
||||||
echo "</div>\n";
|
|
||||||
|
|
||||||
if (permission_exists('call_active_hangup') && $rows) {
|
|
||||||
echo modal::create(['id'=>'modal-hangup','type'=>'general','message'=>$text['confirm-hangups'],'actions'=>button::create(['type'=>'button','label'=>$text['label-hangup'],'icon'=>'check','id'=>'btn_hangup','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('hangup'); list_form_submit('form_list');"])]);
|
|
||||||
}
|
|
||||||
|
|
||||||
echo $text['description']."\n";
|
|
||||||
echo "<br /><br />\n";
|
|
||||||
|
|
||||||
//show the results
|
//show the results
|
||||||
echo "<div id='cmd_reponse'></div>\n";
|
echo "<div id='cmd_reponse'></div>\n";
|
||||||
|
|
||||||
|
|
@ -191,7 +144,7 @@
|
||||||
echo "<input type='hidden' id='action' name='action' value=''>\n";
|
echo "<input type='hidden' id='action' name='action' value=''>\n";
|
||||||
|
|
||||||
echo "<div class='card'>\n";
|
echo "<div class='card'>\n";
|
||||||
echo " <table class='list'>\n";
|
echo " <table id='calls_active' class='list'>\n";
|
||||||
echo " <tr class='list-header'>\n";
|
echo " <tr class='list-header'>\n";
|
||||||
if (permission_exists('call_active_hangup')) {
|
if (permission_exists('call_active_hangup')) {
|
||||||
echo " <th class='checkbox'>\n";
|
echo " <th class='checkbox'>\n";
|
||||||
|
|
@ -320,7 +273,7 @@
|
||||||
|
|
||||||
echo " </table>\n";
|
echo " </table>\n";
|
||||||
echo "</div>\n";
|
echo "</div>\n";
|
||||||
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
|
echo "<input type='hidden' name='".$_SESSION['app']['calls_active']['token']['name']."' value='".$_SESSION['app']['calls_active']['token']['hash']."'>\n";
|
||||||
echo "</form>\n";
|
echo "</form>\n";
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue