From 7b4cad6aa923ca1ed35b6d0486876ccfed2a5fe5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 13 Dec 2020 09:37:38 +0100
Subject: [PATCH] use fulltext search if set as default or explixitly asked for

---
 out/out.Search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index e0210b50b..2cb15b8b7 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -55,12 +55,12 @@ if (isset($_GET["navBar"])) {
 			header("Location: ../op/op.SearchFulltext.php?folderid=".$folderid."&query=".$_GET["query"]);
 		}
 	}
-	*/
+	 */
 }
 
 $accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
-if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) {
+if((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@@ -537,10 +537,10 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
+		$view->setParam('fullsearch', ((!empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('orderby', isset($orderby) ? $orderby : '');
-		$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
+		$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);
 		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
 		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);