From 0fd6f276fc4538fd178ed6d1610a2263b25e2d83 Mon Sep 17 00:00:00 2001
From: binsky <timo@binsky.org>
Date: Fri, 12 Mar 2021 22:53:57 +0100
Subject: [PATCH] rename disable_global_search_inclusion setting to
 enable_global_search

---
 js/settings-admin.js            | 6 +++---
 lib/Search/Provider.php         | 2 +-
 lib/Service/SettingsService.php | 4 ++--
 templates/part.admin.php        | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/settings-admin.js b/js/settings-admin.js
index 3788a471..b607e161 100644
--- a/js/settings-admin.js
+++ b/js/settings-admin.js
@@ -94,7 +94,7 @@ $(document).ready(function () {
 	$('#passman_https_check').prop('checked', (settings.getKey('https_check').toString().toLowerCase() === '1'));
 	$('#passman_disable_contextmenu').prop('checked', (settings.getKey('disable_contextmenu').toString().toLowerCase() === '1'));
 	$('#passman_disable_debugger').prop('checked', (settings.getKey('disable_debugger').toString().toLowerCase() === '1'));
-	$('#passman_disable_global_search_inclusion').prop('checked', (settings.getKey('disable_global_search_inclusion').toString().toLowerCase() === '1'));
+	$('#passman_enable_global_search').prop('checked', (settings.getKey('enable_global_search').toString().toLowerCase() === '1'));
 	$('#vault_key_strength').val(settings.getKey('vault_key_strength'));
 
 
@@ -114,8 +114,8 @@ $(document).ready(function () {
 		settings.setAdminKey('disable_debugger', ($(this).is(":checked")) ? 1 : 0);
 	});
 
-	$('#passman_disable_global_search_inclusion').change(function () {
-		settings.setAdminKey('disable_global_search_inclusion', ($(this).is(":checked")) ? 1 : 0);
+	$('#passman_enable_global_search').change(function () {
+		settings.setAdminKey('enable_global_search', ($(this).is(":checked")) ? 1 : 0);
 	});
 
 	$('#passman_sharing_enabled').change(function () {
diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php
index 897ff493..45c13151 100644
--- a/lib/Search/Provider.php
+++ b/lib/Search/Provider.php
@@ -74,7 +74,7 @@ class Provider implements IProvider {
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		$searchResultEntries = [];
 
-		if ($this->settings->getAppSetting('disable_global_search_inclusion', 1) === 0) {
+		if ($this->settings->getAppSetting('enable_global_search', 0) === 1) {
 			$VaultService = new VaultService(new VaultMapper($this->db, new Utils()));
 			$Vaults = $VaultService->getByUser($user->getUID());
 			$CredentialMapper = new CredentialMapper($this->db, new Utils());
diff --git a/lib/Service/SettingsService.php b/lib/Service/SettingsService.php
index 69b256ae..0b2e8363 100644
--- a/lib/Service/SettingsService.php
+++ b/lib/Service/SettingsService.php
@@ -40,7 +40,7 @@ class SettingsService {
 		'check_version',
 		'https_check',
 		'disable_contextmenu',
-		'disable_global_search_inclusion',
+		'enable_global_search',
 		'settings_loaded'
 	);
 
@@ -58,7 +58,7 @@ class SettingsService {
 			'server_side_encryption' => $this->config->getAppValue('passman', 'server_side_encryption', 'aes-256-cbc'),
 			'rounds_pbkdf2_stretching' => $this->config->getAppValue('passman', 'rounds_pbkdf2_stretching', 100),
 			'disable_debugger' => $this->config->getAppValue('passman', 'disable_debugger', 1),
-			'disable_global_search_inclusion' => $this->config->getAppValue('passman', 'disable_global_search_inclusion', 1),
+			'enable_global_search' => $this->config->getAppValue('passman', 'enable_global_search', 0),
 			'settings_loaded' => 1
 		);
 	}
diff --git a/templates/part.admin.php b/templates/part.admin.php
index 732149ae..1f583cf3 100644
--- a/templates/part.admin.php
+++ b/templates/part.admin.php
@@ -106,11 +106,11 @@ $ciphers = openssl_get_cipher_methods();
 					</label>
 				</p>
 				<p>
-					<input type="checkbox" name="passman_disable_global_search_inclusion"
-						   id="passman_disable_global_search_inclusion" class="checkbox"
+					<input type="checkbox" name="passman_enable_global_search"
+						   id="passman_enable_global_search" class="checkbox"
 						   value="0"/>
-					<label for="passman_disable_global_search_inclusion">
-						<?php p($l->t('Disable global search inclusion')); ?>
+					<label for="passman_enable_global_search">
+						<?php p($l->t('Enable global search')); ?>
 					</label>
 				</p>
 				<p>