Changeset 3216792

Timestamp:

01/04/2025 08:40:43 AM (15 months ago)

Author:

ttodua

Message:

current url detect

File:

• sign-in-with-essentials/trunk/src/includes/class-siwe-handlers.php (modified) (2 diffs)

sign-in-with-essentials/trunk/src/includes/class-siwe-handlers.php

@@ -108 +108 @@
     }
 
+    public static function get_install_subdir_from_home () {
+        $siteurl = get_site_url('siteurl');
+        $relpath = str_replace( ['http://', 'https://'], '', $siteurl );
+        $relpath = str_replace( $_SERVER['HTTP_HOST'], '', $relpath );
+        if ($relpath === '/') {
+            $relpath = '';
+        }
+        return $relpath;
+    }
+
     /**
      * Uses the code response from redirection-back to authenticate the user, before anything is rendered.
@@ -129 +139 @@
         $redir_url = $this->parent->siwe_redirect_back_url();
         $is_query = str_contains ($redir_url, '?' );
+        $start_path = str_replace ( $this->get_install_subdir_from_home(), '', $_SERVER['REQUEST_URI'] );
 
         if (
             (   $is_query && array_key_exists(str_replace('?', '', $redir_url), $_GET) )
                 ||
-            ( ! $is_query && str_starts_with(sanitize_url($_SERVER['REQUEST_URI']), $redir_url ) )
+            ( ! $is_query && str_starts_with(sanitize_url($start_path), $redir_url ) )
         )
         {