[FIX]Fix deprecated warnings for preg_match() and mb_strtolower() in …

…Webmail sieve filters
cypht-org · Oct 14, 2024 · 916a37b · 916a37b
1 parent a8dc883
commit 916a37b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/module.php b/lib/module.php
@@ -191,10 +191,19 @@ trait Hm_Handler_Validate {
      * @return bool
      */
     public function validate_method($session, $request) {
-        if (!in_array(mb_strtolower($request->method), ['get', 'post'], true)) {
+        if (!empty($request->method) && is_string($request->method)) {
+            if (!in_array(mb_strtolower($request->method), ['get', 'post'], true)) {
+                if ($session->loaded) {
+                    $session->destroy($request);
+                    Hm_Debug::add(sprintf('LOGGED OUT: invalid method %s', $request->method));
+                }
+                return false;
+            }
+        } else {
+            // Handle the case where method is null or invalid
             if ($session->loaded) {
                 $session->destroy($request);
-                Hm_Debug::add(sprintf('LOGGED OUT: invalid method %s', $request->method));
+                Hm_Debug::add('LOGGED OUT: missing or invalid request method');
             }
             return false;
         }

diff --git a/lib/request.php b/lib/request.php
@@ -175,7 +175,7 @@ private function is_mobile() {
             $this->mobile = true;
             return;
         }
-        if (array_key_exists('HTTP_USER_AGENT', $this->server)) {
+        if (array_key_exists('HTTP_USER_AGENT', $this->server) && !empty($this->server['HTTP_USER_AGENT'])) {
             if (preg_match("/(iphone|ipod|ipad|android|blackberry|webos|opera mini)/i", $this->server['HTTP_USER_AGENT'])) {
                 $this->mobile = true;
             }