From 8771a78eef94f5b99e1bad16373321a847cb289d Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Tue, 9 Nov 2021 19:26:56 -0700
Subject: [PATCH] Update the dashboard list order. Disable domain limits by
 default

---
 app/call_forward/resources/dashboard/config.php  | 4 ++--
 app/domain_limits/resources/dashboard/config.php | 6 +++---
 core/dashboard/dashboard.php                     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/call_forward/resources/dashboard/config.php b/app/call_forward/resources/dashboard/config.php
index eeb58b4311..2225978bbb 100644
--- a/app/call_forward/resources/dashboard/config.php
+++ b/app/call_forward/resources/dashboard/config.php
@@ -3,7 +3,7 @@
 $array['dashboard'][$x]['dashboard_uuid'] = 'ba60799a-1c40-44a8-80ef-c2be4f4692fb';
 $array['dashboard'][$x]['dashboard_name'] = 'Call Forward';
 $array['dashboard'][$x]['dashboard_path'] = 'app/call_forward/resources/dashboard/call_forward.php';
-$array['dashboard'][$x]['dashboard_order'] = '0';
+$array['dashboard'][$x]['dashboard_order'] = '130';
 $array['dashboard'][$x]['dashboard_enabled'] = 'true';
 $array['dashboard'][$x]['dashboard_description'] = 'Call routing for extension using Call forward, Follow Me and Do Not Disturb.';
 $y = 0;
@@ -19,4 +19,4 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '6d046
 $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'ba60799a-1c40-44a8-80ef-c2be4f4692fb';
 $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user';
 
-?>
\ No newline at end of file
+?>
diff --git a/app/domain_limits/resources/dashboard/config.php b/app/domain_limits/resources/dashboard/config.php
index c13050bb38..3980870edc 100644
--- a/app/domain_limits/resources/dashboard/config.php
+++ b/app/domain_limits/resources/dashboard/config.php
@@ -3,8 +3,8 @@
 $array['dashboard'][$x]['dashboard_uuid'] = '2f7a90cc-8d60-4df4-98ee-2ef4000afac7';
 $array['dashboard'][$x]['dashboard_name'] = 'Domain Limits';
 $array['dashboard'][$x]['dashboard_path'] = 'app/domain_limits/resources/dashboard/domain_limits.php';
-$array['dashboard'][$x]['dashboard_order'] = '180';
-$array['dashboard'][$x]['dashboard_enabled'] = 'true';
+$array['dashboard'][$x]['dashboard_order'] = '120';
+$array['dashboard'][$x]['dashboard_enabled'] = 'false';
 $array['dashboard'][$x]['dashboard_description'] = '';
 $y = 0;
 $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = 'e99eb62e-4150-42a8-8c0c-4a264245f12a';
@@ -19,4 +19,4 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = 'b8772
 $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = '2f7a90cc-8d60-4df4-98ee-2ef4000afac7';
 $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user';
 
-?>
\ No newline at end of file
+?>
diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php
index 89aff09b26..7a95452a62 100644
--- a/core/dashboard/dashboard.php
+++ b/core/dashboard/dashboard.php
@@ -220,7 +220,7 @@
 		$sql .= ")\n";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
-	$sql .= order_by($order_by, $order, '', '');
+	$sql .= order_by($order_by, $order, 'dashboard_order', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
 	$dashboard = $database->select($sql, $parameters, 'all');
@@ -348,4 +348,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>