\n";
echo "| \n";
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index f58b4da2b3..c9b92880dc 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -78,6 +78,7 @@
$sql .= "dashboard_name, ";
$sql .= "dashboard_path, ";
$sql .= "dashboard_icon, ";
+ $sql .= "dashboard_icon_color, ";
$sql .= "dashboard_url, ";
$sql .= "dashboard_target, ";
$sql .= "dashboard_width, ";
@@ -93,6 +94,7 @@
$sql .= "dashboard_label_background_color_hover, ";
$sql .= "dashboard_number_text_color, ";
$sql .= "dashboard_number_text_color_hover, ";
+ $sql .= "dashboard_number_background_color, ";
$sql .= "dashboard_background_color, ";
$sql .= "dashboard_background_color_hover, ";
$sql .= "dashboard_detail_background_color, ";
@@ -263,6 +265,11 @@ div.hud_chart {
".escape($dashboard_label)."";
echo " \n";
echo " \n";
- echo " ".$domain_count."\n";
+ echo " ".$domain_count."\n";
echo " \n";
echo " \n";
if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
@@ -46,4 +46,4 @@
echo " ";
echo "\n";
-?>
\ No newline at end of file
+?>
From a9b2076fbee8858961588ee0c3ed1b3f7c3d3cbc Mon Sep 17 00:00:00 2001
From: FusionPBX
Date: Wed, 11 Dec 2024 22:00:18 -0700
Subject: [PATCH 02/10] Update the cisco 192 template
---
.../provision/cisco/spa192/{$mac}.xml | 643 +++++++++---------
1 file changed, 338 insertions(+), 305 deletions(-)
diff --git a/resources/templates/provision/cisco/spa192/{$mac}.xml b/resources/templates/provision/cisco/spa192/{$mac}.xml
index 7638a0506f..969fd2086b 100644
--- a/resources/templates/provision/cisco/spa192/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa192/{$mac}.xml
@@ -1,107 +1,114 @@
-
+
-
-
-
-
-
+
+
+
+
+
3
-
+
No
-Parametersfor ProvisioningTab
-
+
+
+
+
+
+
+
Yes
Yes
2
-
+
0
0
30
20
Yes
Yes
-
-
+
+
Yes
+Yes
[--uid {$http_auth_username} --pwd {$http_auth_password}]http://{$domain_name}{$project_path}/app/provision/?mac=$MA
{else}
http://{$domain_name}{$project_path}/app/provision/?mac=$MA
{/if}
-
-
-
-
-HTTP
+
+
+
+66,160,159,150
+https
$PN $MAC -- Requesting resync $SCHEME://$SERVIP:$PORT$PATH
$PN $MAC -- Successful resync $SCHEME://$SERVIP:$PORT$PATH
$PN $MAC -- Resync failed: $ERR
-
-
+
+
-
+
Yes
3600
-
-
+
+
$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH
$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR
$PN $MAC -- Upgrade failed: $ERR
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
70
5
2
$VERSION
$VERSION
-
-
-
+
+
+
application/dtmf-relay
application/hook-flash
-Yes
+No
No
No
Yes
Yes
ptime
5060
-5090
+5080
No
No
PAID-RPID-FROM
-
+
.5
4
5
@@ -120,15 +127,15 @@ Parametersfor ProvisioningTab
0
0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
16384
32768
0.020
@@ -137,11 +144,12 @@ Parametersfor ProvisioningTab
0
No
Yes
+Yes
-
+
100
101
-
+
2
112
113
@@ -154,7 +162,7 @@ Parametersfor ProvisioningTab
G729a
encaprtp
-
+
No
No
No
@@ -163,28 +171,29 @@ Parametersfor ProvisioningTab
No
No
No
-
-
-
+
+
+
15
No
-
-
-Yes
+
-
+
+Yes
+
+
No
30
-
+
-
+
Yes
Yes
$NOTIFY
$PROXY
-
+
0x68
3
0xb8
@@ -192,13 +201,13 @@ Parametersfor ProvisioningTab
high
Yes
-
+
UDP
5060
No
-
+
Yes
-
+
Yes
No
0
@@ -213,47 +222,54 @@ Parametersfor ProvisioningTab
Yes
No
No
+Yes
-
+
No
-
+
Yes
-
+
3
No
-
-
-No
+
+
+No
+Optional
-
+
+
+
+
+
+
{$domain_name}
{$account.1.outbound_proxy_primary}
{if isset ($account.1.outbound_proxy_primary)}Yes{else}No{/if}
Yes
-
+
Yes
No
{$account.1.register_expires}
No
-Yes
-Yes
+No
+No
3600
Normal
-
-
+
+2147483647
No
-
+
{$account.1.display_name}
{$account.1.user_id}
{$account.1.password}
No
-
-
-
+
+
+
-
-{$spa_call_waiting}
+
+$spa_call_waiting}
Yes
Yes
Yes
@@ -284,11 +300,11 @@ Parametersfor ProvisioningTab
Yes
Yes
-
+
G711u
Unspecified
Unspecified
-Yes
+No
Default
Yes
No
@@ -302,7 +318,7 @@ Parametersfor ProvisioningTab
Yes
ReINVITE
Yes
-Yes
+Yes
Auto
No
Strict
@@ -317,31 +333,32 @@ Parametersfor ProvisioningTab
No
No
-
+
{$spa_dial_plan}
-
+
Forward
Forward
Forward
-
+
-
-
-Yes
+
-
+
+Yes
+
+
No
30
-
+
-
-Yes
-Yes
+
+No
+No
$NOTIFY
$PROXY
-
+
0x68
3
0xb8
@@ -349,13 +366,13 @@ Parametersfor ProvisioningTab
high
Yes
-
+
UDP
5061
No
-
+
Yes
-
+
Yes
No
0
@@ -370,46 +387,53 @@ Parametersfor ProvisioningTab
Yes
No
No
+Yes
-
+
No
-
+
Yes
-
+
3
No
-
-
+
+
No
+Optional
-
-{$domain_name}
-{$account.2.outbound_proxy_primary}
-{if isset ($account.2.outbound_proxy_primary)}Yes{else}No{/if}
+
+{$domain_name}
+{$account.2.outbound_proxy_primary}
+{if isset ($account.2.outbound_proxy_primary)}Yes{else}No{/if}
+
+
+
+
+No
Yes
-
+
Yes
No
{$account.2.register_expires}
No
-Yes
-Yes
+No
+No
3600
Normal
-
-
+
+2147483647
No
-
+
{$account.2.display_name}
{$account.2.user_id}
{$account.2.password}
No
-
-
-
+
+
+
-
+
{$spa_call_waiting}
Yes
Yes
@@ -441,11 +465,11 @@ Parametersfor ProvisioningTab
Yes
Yes
-
+
G711u
Unspecified
Unspecified
-Yes
+No
Default
Yes
No
@@ -474,55 +498,56 @@ Parametersfor ProvisioningTab
No
No
-
+
{$spa_dial_plan}
-
+
Forward
Forward
Forward
-
+
-
-
-
-
-
+
+
+
+
+
+
20
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
Yes
No
No
@@ -537,17 +562,17 @@ Parametersfor ProvisioningTab
media
Yes
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
1
1
8
@@ -558,46 +583,47 @@ Parametersfor ProvisioningTab
0
No
-
-
-
-
-
+
+
+
+
+
+
20
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
Yes
No
No
@@ -612,17 +638,17 @@ Parametersfor ProvisioningTab
media
Yes
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
1
1
8
@@ -633,8 +659,9 @@ Parametersfor ProvisioningTab
0
No
-
-
+
+
+
350@-19,440@-19;10(*/0/1+2)
420@-19,520@-19;10(*/0/1+2)
420@-16;10(*/0/1)
@@ -655,9 +682,9 @@ Parametersfor ProvisioningTab
350@-19;20(.1/.1/1,.1/9.7/1)
397@-19,507@-19;15(0/2/0,.2/.1/1,.1/2.1/2)
350@-16;*(.1/.1/1)
-
+
-
+
60(2/4)
60(.8/.4,.8/4)
60(.4/.2,.4/.2,.8/4)
@@ -667,17 +694,17 @@ Parametersfor ProvisioningTab
60(.4/.2,.4/.2,.4/4)
60(0.25/9.75)
-
+
*(.3/9.7)
-30(.1/.1,.1/9.7)
-30(.1/.1,.1/.1,.1/9.7)
+30(.1/.1, .1/9.7)
+30(.1/.1, .1/.1, .1/9.7)
30(.1/.1,.3/.1,.1/9.3)
1(.5/.5)
30(.1/.1,.3/.2,.3/9.1)
30(.3/.1,.3/.1,.1/9.1)
2.3(.3/2)
-
+
Bellcore-r1
Bellcore-r2
Bellcore-r3
@@ -687,14 +714,14 @@ Parametersfor ProvisioningTab
Bellcore-r7
Bellcore-r8
-
+
Trapezoid
20
85
440@-10
No
-
+
.1
.9
0
@@ -708,7 +735,7 @@ Parametersfor ProvisioningTab
2
.5
-
+
*69
*07
*98
@@ -751,19 +778,19 @@ Parametersfor ProvisioningTab
*17
*18
*19
-
-
+
+
*99
#99
*03
-
-
+
+
-
-
-
+
+
+
-
+
*017110
*027110
*017111
@@ -773,7 +800,7 @@ Parametersfor ProvisioningTab
*01729
*02729
-
+
600
-3
-3
@@ -786,75 +813,77 @@ Parametersfor ProvisioningTab
bell 202
Default
-
-
-
+
+
+
+
+
No
2
-0
-0
-0
+0
+0
+0
-dh
+dh
0
0
0.0.0.0:0.0.0.0:0.0.0.0
0
0
-
-
-
+
+
+
0:5:30
0
0
1
-0
-
+0
+
64
-
+
1
-auto
+auto
0
-
+00:00:00:00:00:00
ATA192-MPP
-
-2
-
-2
-
+
+2
+
+2
+
1
192.168.15.1
-255.255.255.0
-
-0
+255.255.255.0
+
+0
0.0.0.0
-
-
-
+
+
+
1
192.168.15.100
50
0
-8.8.4.4
+1.1.1.1
192.168.15.1
-0
+0
0
2001::
@@ -868,10 +897,10 @@ Parametersfor ProvisioningTab
0
-
+
-
+
0
@@ -882,24 +911,27 @@ Parametersfor ProvisioningTab
private
0
v3rwuser
-MD5
-
-DES
-
+MD5
+
+DES
+
192.168.15.100
162
-v1
+v1
{$spa_time_zone}
1
-auto
-0.ca.pool.ntp.org
+auto
+0.ciscosb.pool.ntp.org
3600
0
-1
+1
-
+
+
+Off
+
0
@@ -909,7 +941,7 @@ Parametersfor ProvisioningTab
1
1
-1
+{$cisco_router_mode}
0
1
@@ -929,37 +961,38 @@ Parametersfor ProvisioningTab
0
-
-
-
-
-
-
+
+
+
+
+
+
86400
1
0
-0
-200
+0
+512
-
+
514
-
+
514
-15
-
-0
+15
+
+0
0
+
-admin
-
+admin
+
cisco
-
+
0
-
-
+
+
From 7a33e79f4af6f14e04704a115cf83707a1f432aa Mon Sep 17 00:00:00 2001
From: FusionPBX
Date: Wed, 11 Dec 2024 22:06:44 -0700
Subject: [PATCH 03/10] Add the spa_router_mode
---
app/cisco/app_config.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/app/cisco/app_config.php b/app/cisco/app_config.php
index 34017ad789..442aa4ca55 100644
--- a/app/cisco/app_config.php
+++ b/app/cisco/app_config.php
@@ -176,5 +176,13 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "SPA PC VLAN ID. Options 0 to 4094.";
$y++;
+ $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "78637de4-ec12-4d41-8c65-39afe50d2b02";
+ $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+ $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "spa_router_mode";
+ $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+ $apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+ $apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: 0:Bridge, 1:NAT.";
+ $y++;
?>
From 7e5ac499efe61438df8f6d941385f337dd7154d8 Mon Sep 17 00:00:00 2001
From: FusionPBX
Date: Wed, 11 Dec 2024 22:08:07 -0700
Subject: [PATCH 04/10] Update {$mac}.xml
---
resources/templates/provision/cisco/spa192/{$mac}.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/templates/provision/cisco/spa192/{$mac}.xml b/resources/templates/provision/cisco/spa192/{$mac}.xml
index 969fd2086b..be860089ad 100644
--- a/resources/templates/provision/cisco/spa192/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa192/{$mac}.xml
@@ -941,7 +941,7 @@
1
1
-{$cisco_router_mode}
+{$spa_router_mode}
0
1
From 8feb150dba013e1c632e25db74a9403e417984b1 Mon Sep 17 00:00:00 2001
From: chansizzle <14916599+chansizzle@users.noreply.github.com>
Date: Wed, 11 Dec 2024 22:15:28 -0700
Subject: [PATCH 05/10] rename extension summary csv export (#7179)
rename extension summary export/download from 'user-summary.csv. to 'extension-summary.csv'
---
app/xml_cdr/xml_cdr_extension_summary.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index fc77f5f507..b7eade3167 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -67,7 +67,7 @@
//set the headers
header('Content-type: application/octet-binary');
- header('Content-Disposition: attachment; filename=user-summary.csv');
+ header('Content-Disposition: attachment; filename=extension-summary.csv');
//show the column names on the first line
$z = 0;
From 075cc4824a3f12aeb76ae2ee9523e66f05a32fe7 Mon Sep 17 00:00:00 2001
From: frytimo
Date: Thu, 12 Dec 2024 13:03:21 -0400
Subject: [PATCH 06/10] Security, Use the same number of characters for the
masked password (#7198)
* security set display asterisks to constant number
Harder to guess when length is also hidden
---
core/default_settings/default_settings.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 5c1f477daf..07c5b5939b 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -530,7 +530,7 @@
echo " [...]\n";
}
else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || substr_count($subcategory, '_key') > 0 || substr_count($subcategory, '_secret') > 0) {
- echo " ".str_repeat('*', strlen($row['default_setting_value'] ?? ''));
+ echo " ".str_repeat('*', 10); //use the same number of characters to mask the password length
}
else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') {
echo " ".$text['option-button_icons_'.$row['default_setting_value']]."\n";
From 2cd94a93a5dc2b27cf82e66cb78d2528cdb69069 Mon Sep 17 00:00:00 2001
From: FusionPBX
Date: Fri, 13 Dec 2024 10:35:36 -0700
Subject: [PATCH 07/10] Fix the device ADD button.
Also, permission_exists function uses the permission::new() method and this made it efficient enough to continue to use the permission_exists function.
---
app/devices/devices.php | 78 ++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 48 deletions(-)
diff --git a/app/devices/devices.php b/app/devices/devices.php
index 0cdcd0ee61..af2fb3015b 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -48,18 +48,6 @@
$database = database::new();
$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]);
-//set all permissions
- $has_device_import = permission_exists('device_import');
- $has_device_edit = permission_exists('device_edit');
- $has_device_all = permission_exists('device_all');
- $has_device_delete = permission_exists('device_delete');
- $has_device_domain_all = permission_exists('device_domain_all');
- $has_device_export = permission_exists('device_export');
- $has_device_vendor_view = permission_exists('device_vendor_view');
- $has_device_profile_view = permission_exists('device_profile_view');
- $has_device_add = permission_exists('device_add');
- $has_show_all = &$has_device_domain_all;
-
//add multi-lingual support
$language = new text;
$text = $language->get();
@@ -78,13 +66,13 @@
if (!empty($action) && !empty($devices) && is_array($devices) && @sizeof($devices) != 0) {
switch ($action) {
case 'toggle':
- if ($has_device_edit) {
+ if (permission_exists('device_edit')) {
$obj = new device;
$obj->toggle($devices);
}
break;
case 'delete':
- if ($has_device_delete) {
+ if (permission_exists('device_delete')) {
$obj = new device;
$obj->delete($devices);
}
@@ -105,7 +93,7 @@
//get total devices count from the database
$sql = "select count(*) from v_devices ";
$sql .= "where domain_uuid = :domain_uuid ";
- if (!$has_device_all && !$has_device_domain_all) {
+ if (!permission_exists('device_all') && !permission_exists('device_domain_all')) {
$sql .= "and device_user_uuid = :user_uuid ";
$parameters['user_uuid'] = $user_uuid;
}
@@ -113,12 +101,6 @@
$total_devices = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
-//update the has_device_add permission if the total device count is greater then set limit
- $device_limit = $settings->get('limit', 'devices', null);
- if ($has_device_add && $device_limit !== null) {
- $has_device_add = $total_devices > $device_limit;
- }
-
//get the domains if user has permission for show all
$domains = [];
if ($has_device_domain_all) {
@@ -142,7 +124,7 @@
//prepare to page the results
$sql = "select count(*) from v_devices as d ";
- if (isset($_GET['show']) && $_GET['show'] == "all" && $has_device_all) {
+ if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
if (!empty($search)) {
$sql .= "where ";
}
@@ -150,7 +132,7 @@
else {
$sql .= "where (";
$sql .= " d.domain_uuid = :domain_uuid ";
- if ($has_device_all) {
+ if (permission_exists('device_all')) {
$sql .= " or d.domain_uuid is null ";
}
$sql .= ") ";
@@ -205,7 +187,7 @@
$param = "&search=".$search;
$param .= "&fields=".$fields;
}
- if (!empty($_GET['show']) && $_GET['show'] == "all" && $has_device_all) {
+ if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
$param .= "&show=all";
}
$page = $_GET['page'] ?? 0;
@@ -218,7 +200,7 @@
$sql .= "to_char(timezone(:time_zone, d.device_provisioned_date), 'DD Mon YYYY') as provisioned_date_formatted, \n";
$sql .= "to_char(timezone(:time_zone, d.device_provisioned_date), 'HH12:MI:SS am') as provisioned_time_formatted \n";
$sql .= "from v_devices as d, v_devices as d2 ";
- if (isset($_GET['show']) && $_GET['show'] == "all" && $has_device_all) {
+ if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
$sql .= ", v_domains as d3 ";
}
$sql .= "where ( ";
@@ -228,19 +210,19 @@
$sql .= " d.device_uuid = d2.device_uuid ";
$sql .= " ) ";
$sql .= ") ";
- if (isset($_GET['show']) && $_GET['show'] == "all" && $has_device_all) {
+ if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
$sql .= " and d.domain_uuid = d3.domain_uuid ";
}
else {
$sql .= "and (";
$sql .= " d.domain_uuid = :domain_uuid ";
- if ($has_device_all) {
+ if (permission_exists('device_all')) {
$sql .= " or d.domain_uuid is null ";
}
$sql .= ") ";
$parameters['domain_uuid'] = $domain_uuid;
}
- if (!$has_device_all && !$has_device_domain_all) {
+ if (!permission_exists('device_all') && !permission_exists('device_domain_all')) {
$sql .= "and d.device_user_uuid = :user_uuid ";
$parameters['user_uuid'] = $user_uuid;
}
@@ -314,33 +296,33 @@
echo "\n";
echo " ".$text['header-devices']."".number_format($num_rows)." \n";
echo " \n";
- if ($has_device_import) {
+ if (permission_exists('device_import')) {
echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$settings->get('theme', 'button_icon_import'),'link'=>'device_imports.php']);
}
- if ($has_device_export) {
+ if (permission_exists('device_export')) {
echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>$settings->get('theme', 'button_icon_export'),'link'=>'device_download.php']);
}
- if ($has_device_vendor_view) {
+ if (permission_exists('device_vendor_view')) {
echo button::create(['type'=>'button','label'=>$text['button-vendors'],'icon'=>'fax','link'=>'device_vendors.php']);
}
- if ($has_device_profile_view) {
+ if (permission_exists('device_profile_view')) {
echo button::create(['type'=>'button','label'=>$text['button-profiles'],'icon'=>'clone','link'=>'device_profiles.php']);
}
- $margin_left = $has_device_import || $has_device_export || $has_device_vendor_view || $has_device_profile_view ? "margin-left: 15px;" : null;
- if ($has_device_add) {
+ $margin_left = permission_exists('device_import') || permission_exists('device_export') || permission_exists('device_vendor_view') || permission_exists('device_profile_view') ? "margin-left: 15px;" : null;
+ if (permission_exists('device_add') && (empty($_SESSION['limit']['devices']['numeric']) || ($total_devices < $_SESSION['limit']['devices']['numeric']))) {
echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','style'=>$margin_left,'link'=>'device_edit.php']);
unset($margin_left);
}
- if ($has_device_edit && $devices) {
+ if (permission_exists('device_edit') && $devices) {
echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none; '.($margin_left ?? null),'onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
unset($margin_left);
}
- if ($has_device_delete && $devices) {
+ if (permission_exists('device_delete') && $devices) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; '.($margin_left ?? null),'onclick'=>"modal_open('modal-delete','btn_delete');"]);
unset($margin_left);
}
echo " \n";
- if ($has_device_edit && $devices) {
+ if (permission_exists('device_edit') && $devices) {
echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle'); list_form_submit('form_list');"])]);
}
- if ($has_device_delete && $devices) {
+ if (permission_exists('device_delete') && $devices) {
echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
}
@@ -387,12 +369,12 @@
echo " \n";
echo " \n";
echo "\n";
@@ -422,7 +404,7 @@
}
}
- if ($has_device_edit) {
+ if (permission_exists('device_edit')) {
$list_row_url = "device_edit.php?id=".urlencode($row['device_uuid']);
}
@@ -437,17 +419,17 @@
}
echo "\n";
- if ($has_device_edit || $has_device_delete) {
+ if (permission_exists('device_edit') || permission_exists('device_delete')) {
echo " | \n";
echo " \n";
echo " \n";
echo " | \n";
}
- if (!empty($_GET['show']) && $_GET['show'] == "all" && $has_device_all) {
+ if (!empty($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
echo " ".escape($domains[$row['domain_uuid']])." | \n";
}
echo " ";
- echo $has_device_edit ? "".escape(format_device_address($row['device_address']))."" : escape(format_device_address($row['device_address']));
+ echo permission_exists('device_edit') ? "".escape(format_device_address($row['device_address']))."" : escape(format_device_address($row['device_address']));
echo " | \n";
echo " ".escape($row['device_label'])." | \n";
if ($device_alternate) {
@@ -463,7 +445,7 @@
echo " ".escape($row['device_vendor'])." | \n";
echo " ".escape($row['device_template'])." | \n";
echo " ".escape($device_profile_name)." | \n";
- if ($has_device_edit) {
+ if (permission_exists('device_edit')) {
echo " ";
echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['device_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
}
@@ -474,7 +456,7 @@
echo " | \n";
echo " ".escape($row['provisioned_date_formatted'])." ".escape($row['provisioned_time_formatted'])." ".escape($device_provisioned_method)." ".escape($row['device_provisioned_ip'])." | \n";
echo " ".escape($row['device_description'])." | \n";
- if ($has_device_edit && $settings->get('theme', 'list_row_edit_button', false)) {
+ if (permission_exists('device_edit') && $settings->get('theme', 'list_row_edit_button', false)) {
echo " ";
echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$settings->get('theme','button_icon_edit'),'link'=>$list_row_url]);
echo " | \n";
From 38b02f11d50797f70b97839286500ffcb23063eb Mon Sep 17 00:00:00 2001
From: frytimo
Date: Mon, 16 Dec 2024 16:53:33 -0400
Subject: [PATCH 08/10] fix missing slash '/' at end of link tag (#7200)
---
core/authentication/resources/views/email.htm | 2 +-
core/authentication/resources/views/login.htm | 2 +-
core/authentication/resources/views/totp.htm | 2 +-
core/authentication/resources/views/totp_secret.htm | 2 +-
core/authentication/resources/views/username.htm | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/authentication/resources/views/email.htm b/core/authentication/resources/views/email.htm
index 35c795d722..2f35985e79 100644
--- a/core/authentication/resources/views/email.htm
+++ b/core/authentication/resources/views/email.htm
@@ -6,7 +6,7 @@
-
+
|