From 7af2fbf3c8432df51a9bef8bf6ea3746721af854 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Tue, 5 Nov 2019 08:25:41 -0700
Subject: [PATCH] Update database_transactions.php. Functions: order_by()
 adjustment.

---
 app/database_transactions/database_transactions.php | 8 +-------
 resources/functions.php                             | 8 ++++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index 3cef663bed..5f9e1d886c 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -43,12 +43,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//get posted data
-	if (is_array($_POST['bridges'])) {
-		$action = $_POST['action'];
-		$search = $_POST['search'];
-	}
-
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
@@ -103,7 +97,7 @@
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	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'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'database_transactions.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
diff --git a/resources/functions.php b/resources/functions.php
index 6f4a48938e..866529de92 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -2000,8 +2000,12 @@ function number_pad($number,$n) {
 		function order_by($col, $dir, $col_default = '', $dir_default = 'asc') {
 			$col = preg_replace('#[^a-zA-Z0-9-_.]#', '', $col);
 			$dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
-			if ($col != '') { return ' order by '.$col.' '.$dir.' '; }
-			else if ($col_default != '') { return ' order by '.$col_default.' '.$dir.' '; }
+			if ($col != '') {
+				return ' order by '.$col.' '.$dir.' ';
+			}
+			else if ($col_default != '') {
+				return ' order by '.$col_default.' '.$dir_default.' ';
+			}
 		}
 	}