nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Registrations: Restore Show All button, better widths for Agent and Status columns.

Browse Source
This commit is contained in:
Nate
2019-12-02 19:01:41 -07:00
parent 6263fd7a0a
commit 941b21adbb
4 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/registrations/registrations.php
View File

@@ -44,10 +44,12 @@
$text = $language->get();
//get common submitted data
$show = $_REQUEST['show'];
$search = $_REQUEST['search'];
$profile = $_REQUEST['profile'];
//define query string array
if ($show) { $qs['show'] = "&show=".urlencode($show); }
if ($search) { $qs['search'] = "&search=".urlencode($search); }
if ($profile) { $qs['profile'] = "&profile=".urlencode($profile); }
@@ -75,13 +77,14 @@
break;
}
header('Location: registrations.php'.($search || $profile ? '?' : null).$qs['search'].$qs['profile']);
header('Location: registrations.php'.($show || $search || $profile ? '?' : null).$qs['show'].$qs['search'].$qs['profile']);
exit;
}
//get the registrations
$obj = new registrations;
$registrations = $obj->get(!$profile ? 'all' : $profile);
$obj->show = $show;
$registrations = $obj->get($profile);
//order the array
require_once "resources/classes/array_order.php";
@@ -120,21 +123,28 @@
echo " <div class='heading'><b>".$text['header-registrations']." (".$num_rows.")</b></div>\n";
echo " <div class='actions'>\n";
if (!$reload) {
echo button::create(['type'=>'button','label'=>$text['button-refresh'],'icon'=>$_SESSION['theme']['button_icon_refresh'],'link'=>$location.($qs ? '?' : null).$qs['search'].$qs['profile']]);
echo button::create(['type'=>'button','label'=>$text['button-refresh'],'icon'=>$_SESSION['theme']['button_icon_refresh'],'link'=>$location.($qs ? '?' : null).$qs['show'].$qs['search'].$qs['profile']]);
}
echo button::create(['type'=>'button','label'=>$text['button-unregister'],'title'=>$text['button-unregister'],'icon'=>'user-slash','style'=>'margin-left: 15px;','onclick'=>"if (confirm('".$text['confirm-unregister']."')) { list_action_set('unregister'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
echo button::create(['type'=>'button','label'=>$text['button-provision'],'title'=>$text['button-provision'],'icon'=>'fax','onclick'=>"if (confirm('".$text['confirm-provision']."')) { list_action_set('provision'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
echo button::create(['type'=>'button','label'=>$text['button-reboot'],'title'=>$text['button-reboot'],'icon'=>'power-off','onclick'=>"if (confirm('".$text['confirm-reboot']."')) { list_action_set('reboot'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
echo "<form id='form_search' class='inline' method='get'>\n";
if (permission_exists('registration_all')) {
echo "<input type='hidden' name='profile' value='".escape($profile)."'>";
if ($show == 'all') {
echo "<input type='hidden' name='show' value='".escape($show)."'>";
echo button::create(['type'=>'button','label'=>$text['button-show_local'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>$location.($qs['search'] || $qs['profile'] ? '?' : null).$qs['search'].$qs['profile']]);
}
else {
echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>$location.'?show=all'.$qs['search'].$qs['profile']]);
}
if ($profile != '') {
echo button::create(['type'=>'button','label'=>$text['button-all_profiles'],'icon'=>'network-wired','style'=>'margin-left: 15px;','link'=>$location.'?'.$qs['search']]);
echo "<input type='hidden' name='profile' value='".escape($profile)."'>";
echo button::create(['type'=>'button','label'=>$text['button-all_profiles'],'icon'=>'network-wired','style'=>'margin-left: 15px;','link'=>$location.($qs['show'] || $qs['search'] ? '?' : null).$qs['show'].$qs['search']]);
}
}
echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>$location.($qs['profile'] ? '?' : null).$qs['profile'],'style'=>($search == '' ? 'display: none;' : null)]);
echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>$location.($qs['show'] || $qs['profile'] ? '?' : null).$qs['show'].$qs['profile'],'style'=>($search == '' ? 'display: none;' : null)]);
echo " </form>\n";
echo " </div>\n";
echo " <div style='clear: both;'></div>\n";
@@ -154,13 +164,13 @@
echo " <input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($registrations ?: "style='visibility: hidden;'").">\n";
echo " </th>\n";
echo " <th>".$text['label-user']."</th>\n";
echo " <th class='min-pct-25'>".$text['label-agent']."</th>\n";
echo " <th class='pct-25'>".$text['label-agent']."</th>\n";
echo " <th class='hide-md-dn'>".$text['label-contact']."</th>\n";
echo " <th class='hide-sm-dn'>".$text['label-lan_ip']."</th>\n";
echo " <th class='hide-sm-dn'>".$text['label-ip']."</th>\n";
echo " <th class='hide-sm-dn'>".$text['label-port']."</th>\n";
echo " <th class='hide-md-dn'>".$text['label-hostname']."</th>\n";
echo " <th class='min-pct-35'>".$text['label-status']."</th>\n";
echo " <th class='pct-35' style='width: 35%;'>".$text['label-status']."</th>\n";
echo " <th class='hide-md-dn'>".$text['label-ping']."</th>\n";
echo " <th class='hide-md-dn'>".$text['label-sip_profile_name']."</th>\n";
echo " <td class='action-button'>&nbsp;</td>\n";

4
app/registrations/resources/classes/registrations.php
View File

@@ -35,6 +35,7 @@ if (!class_exists('registrations')) {
private $app_uuid;
private $permission_prefix;
private $list_page;
public $show;
/**
* called when the object is created
@@ -46,6 +47,7 @@ if (!class_exists('registrations')) {
$this->app_uuid = '5d9e7cd7-629e-3553-4cf5-f26e39fefa39';
$this->permission_prefix = 'registration_';
$this->list_page = 'registrations.php';
$this->show = 'local';
}
@@ -163,7 +165,7 @@ if (!class_exists('registrations')) {
//remove unrelated domains
if (count($_SESSION["domains"]) > 1) {
if (!(permission_exists('registration_all') && $profile == "all")) {
if (!permission_exists('registration_all') || $this->show != 'all') {
if ($registrations[$id]['sip-auth-realm'] == $_SESSION['domain_name']) {}
else if ($user_array[1] == $_SESSION['domain_name']) {}
else {