nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-26 05:16:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

rename disable_global_search_inclusion setting to enable_global_search

Browse source
This commit is contained in:
binsky 2021-03-12 22:53:57 +01:00
parent a2a23f69d5
commit 0fd6f276fc
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/settings-admin.js
View file

@ -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 () {

2
lib/Search/Provider.php
View file

@ -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());

4
lib/Service/SettingsService.php
View file

@ -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
);
}

8
templates/part.admin.php
View file

@ -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>