upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #22211 from nextcloud/fix/noid/rm-useless-log

Browse source 
remove logging message carrying no valuable information
This commit is contained in:
blizzz 2020-08-12 09:15:44 +00:00 committed by GitHub
commit 4c1f13c569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/user_ldap/lib/Access.php
View file

@ -46,6 +46,7 @@
namespace OCA\User_LDAP;
use DomainException;
use OC\HintException;
use OC\Hooks\PublicEmitter;
use OC\ServerNotAvailableException;
@ -1518,11 +1519,11 @@ class Access extends LDAPUtility {
* @param string[] $searchAttributes needs to have at least two attributes,
* otherwise it does not make sense :)
* @return string the final filter part to use in LDAP searches
* @throws \Exception
* @throws DomainException
*/
private function getAdvancedFilterPartForSearch($search, $searchAttributes) {
if (!is_array($searchAttributes) || count($searchAttributes) < 2) {
throw new \Exception('searchAttributes must be an array with at least two string');
throw new DomainException('searchAttributes must be an array with at least two string');
}
$searchWords = explode(' ', trim($search));
$wordFilters = [];
@ -1553,12 +1554,8 @@ class Access extends LDAPUtility {
if ($haveMultiSearchAttributes && strpos(trim($search), ' ') !== false) {
try {
return $this->getAdvancedFilterPartForSearch($search, $searchAttributes);
} catch (\Exception $e) {
\OCP\Util::writeLog(
'user_ldap',
'Creating advanced filter for search failed, falling back to simple method.',
ILogger::INFO
);
} catch (DomainException $e) {
// Creating advanced filter for search failed, falling back to simple method. Edge case, but valid.
}
}