Merge pull request #7737 from MrPetovan/task/4090-move-search-to-src

Saved Search fixes

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e376485e564adae830ee0e1103d71d1a868fe281..e8d95fa857bf67fae7e990e7cab8a7ac94d2ebd9 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -64,7 +64,6 @@ class Logger extends BaseObject
                self::TRACE => 'Trace',
                self::DEBUG => 'Debug',
                self::DATA => 'Data',
-               self::ALL => 'All',
        ];
 
        /**

diff --git a/src/Model/User.php b/src/Model/User.php
index b6121ad04e07c46098f2eeec60b8cf8e17dbf07f..ef49f45edab1012f9873678c473f2137542d960f 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -412,6 +412,7 @@ class User
         *
         * @param string $password
         * @return bool
+        * @throws Exception
         */
        public static function isPasswordExposed($password)
        {
@@ -420,9 +421,20 @@ class User
                        'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
                ]);
 
-               $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
+               try {
+                       $passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
+
+                       return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
+               } catch (\Exception $e) {
+                       Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
+                               'code' => $e->getCode(),
+                               'file' => $e->getFile(),
+                               'line' => $e->getLine(),
+                               'trace' => $e->getTraceAsString()
+                       ]);
 
-               return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
+                       return false;
+               }
        }
 
        /**