\n";
+ echo "
\n";
echo " ".$text['header-ring-group-forward']."\n";
//doughnut chart
@@ -307,7 +307,7 @@
echo "\n";
}
- echo "";
+ echo "";
}
echo "
\n";
diff --git a/app/switch/resources/dashboard/switch_status.php b/app/switch/resources/dashboard/switch_status.php
index 3fb031e61d..cbcddbc288 100644
--- a/app/switch/resources/dashboard/switch_status.php
+++ b/app/switch/resources/dashboard/switch_status.php
@@ -77,7 +77,7 @@
}
//show the content
- echo "
\n";
+ echo "
\n";
echo " ".$text['label-switch_status']."\n";
if (!isset($dashboard_chart_type) || $dashboard_chart_type == "doughnut") {
@@ -178,7 +178,7 @@
echo "
";
//$n++;
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/app/system/resources/dashboard/system_counts.php b/app/system/resources/dashboard/system_counts.php
index c143d18433..add6584799 100644
--- a/app/system/resources/dashboard/system_counts.php
+++ b/app/system/resources/dashboard/system_counts.php
@@ -295,7 +295,7 @@
echo "
\n";
if ($show_stat) {
- echo "
\n";
+ echo "
\n";
echo "
".$text['label-system_counts']."\n";
if (!isset($dashboard_chart_type) || $dashboard_chart_type == "doughnut") {
@@ -499,7 +499,7 @@
echo "
";
//$n++;
- echo "
\n";
+ echo "
\n";
}
echo "
\n";
?>
diff --git a/app/system/resources/dashboard/system_cpu_status.php b/app/system/resources/dashboard/system_cpu_status.php
index 606fedaff9..f95c1b9423 100644
--- a/app/system/resources/dashboard/system_cpu_status.php
+++ b/app/system/resources/dashboard/system_cpu_status.php
@@ -51,7 +51,7 @@
}
//show the content
- echo "
\n";
+ echo "
\n";
echo "
".$text['label-cpu_usage']."\n";
$token = (new token())->create($_SERVER['PHP_SELF']);
@@ -379,7 +379,7 @@
echo "
";
//$n++;
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/app/system/resources/dashboard/system_services.php b/app/system/resources/dashboard/system_services.php
index 3fbcdf4c0a..1bccbc9172 100644
--- a/app/system/resources/dashboard/system_services.php
+++ b/app/system/resources/dashboard/system_services.php
@@ -39,8 +39,6 @@
exit;
}
- $dashboard_name = "System Services";
-
//function to parse a FusionPBX service from a .service file
if (!function_exists('get_classname')) {
function get_classname(string $file) {
@@ -161,7 +159,7 @@
//show the results
echo "
\n";
-echo "
\n";
+echo "
\n";
echo "
System Services\n";
//doughnut chart
diff --git a/app/system/resources/dashboard/system_status.php b/app/system/resources/dashboard/system_status.php
index 1854523721..1d50726db9 100644
--- a/app/system/resources/dashboard/system_status.php
+++ b/app/system/resources/dashboard/system_status.php
@@ -120,7 +120,7 @@
\n";
+ echo "
\n";
echo "
".$text['label-system_status']."\n";
if ($dashboard_chart_type == "doughnut") {
@@ -406,7 +406,7 @@
echo "
";
//$n++;
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php
index e24f957850..e5f42636af 100644
--- a/app/voicemails/resources/dashboard/voicemails.php
+++ b/app/voicemails/resources/dashboard/voicemails.php
@@ -49,7 +49,7 @@
}
}
- echo "
\n";
+ echo "
\n";
echo "
".$text['label-new_messages']."";
if (isset($dashboard_chart_type) && $dashboard_chart_type == "doughnut") {
@@ -147,7 +147,7 @@
echo "
";
//$n++;
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php
index 20051cb68e..23e6b7b353 100644
--- a/app/xml_cdr/resources/dashboard/missed_calls.php
+++ b/app/xml_cdr/resources/dashboard/missed_calls.php
@@ -90,7 +90,7 @@
//missed calls
echo "
\n";
- echo "
\n";
+ echo "
\n";
echo "
".$text['label-missed_calls']."";
if ($dashboard_chart_type == "doughnut") {
@@ -214,7 +214,7 @@
echo "
";
//$n++;
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php
index b5ca5a635b..0ef18847f5 100644
--- a/app/xml_cdr/resources/dashboard/recent_calls.php
+++ b/app/xml_cdr/resources/dashboard/recent_calls.php
@@ -87,7 +87,7 @@
//recent calls
echo "
\n";
- echo "
\n";
+ echo "
\n";
echo "
".$text['label-recent_calls']."\n";
if ($dashboard_chart_type == "doughnut") {
@@ -234,7 +234,7 @@
echo "
".$text['label-view_all']."\n";
echo "
";
- echo "
";
+ echo "
";
}
echo "
\n";
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index 2c257a000c..18b73b2dad 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -130,13 +130,13 @@
$parent_uuid = null;
foreach ($dashboard as $row) {
- $dashboard_name = trim(preg_replace("/[^a-z0-9_]/", '_', strtolower($row['dashboard_name'])),'_');
- if ($widget_id == $dashboard_name) {
+ $dashboard_id = 'id_'.md5(preg_replace('/[^-A-Fa-f0-9]/', '', $row['dashboard_uuid']));
+ if ($widget_id == $dashboard_id) {
if (!empty($parent_id)) {
//find parent uuid
foreach ($dashboard as $parent_row) {
- $parent_dashboard_name = trim(preg_replace("/[^a-z0-9_]/", '_', strtolower($parent_row['dashboard_name'])), '_');
- if ($parent_dashboard_name === $parent_id) {
+ $parent_dashboard_id = 'id_'.md5(preg_replace('/[^-A-Fa-f0-9]/', '', $parent_row['dashboard_uuid']));
+ if ($parent_dashboard_id === $parent_id) {
$parent_uuid = $parent_row['dashboard_uuid'];
break;
}
@@ -284,48 +284,48 @@ div.hud_chart {
/* dashboard settings */
2) {
- echo "#".$dashboard_name." {\n";
+ echo "#".$dashboard_id." {\n";
echo " grid-column: span 2;\n";
echo "}\n";
}
else if (is_numeric($row['dashboard_column_span'])) {
- echo "#".$dashboard_name." {\n";
+ echo "#".$dashboard_id." {\n";
echo " grid-column: span ".$row['dashboard_column_span'].";\n";
echo "}\n";
}
if ($row['dashboard_details_state'] == "contracted") {
- echo "#".$dashboard_name." .hud_box .hud_details {\n";
+ echo "#".$dashboard_id." .hud_box .hud_details {\n";
echo " display: none;\n";
echo "}\n";
}
if ($row['dashboard_details_state'] == "hidden" || $row['dashboard_details_state'] == "disabled") {
- echo "#".$dashboard_name." .hud_box .hud_expander, \n";
- echo "#".$dashboard_name." .hud_box .hud_details {\n";
+ echo "#".$dashboard_id." .hud_box .hud_expander, \n";
+ echo "#".$dashboard_id." .hud_box .hud_details {\n";
echo " display: none;\n";
echo "}\n";
}
@@ -468,9 +468,9 @@ foreach ($dashboard as $row) {
.col-num { grid-column: span 2; }
\n";
+ echo "