More fixes regarding rcmail::url() (#9052)

roundcube · Jul 10, 2023 · ca1b23e · ca1b23e
1 parent 8adebea
commit ca1b23e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
@@ -1180,7 +1180,8 @@ protected function get_request_path()
             return rtrim($path, '/') . '/';
         }
 
-        $path = preg_replace('/[?&].*$/', '', (string) $path);
+        $path = preg_replace('/index\.php.*$/', '', (string) $path);
+        $path = preg_replace('/[?&].*$/', '', $path);
         $path = preg_replace('![^/]+$!', '', $path);
 
         return rtrim($path, '/') . '/';

diff --git a/program/include/rcmail_oauth.php b/program/include/rcmail_oauth.php
@@ -123,9 +123,7 @@ public function get_redirect_uri()
         $url = $this->rcmail->url([], true, true);
 
         // rewrite redirect URL to not contain query parameters because some providers do not support this
-        // also make sure to not duplicate the index.php/... path
         $url = preg_replace('/\?.*/', '', $url);
-        $url = preg_replace('/index\.php.*$/', '', $url);
 
         return slashify($url) . 'index.php/login/oauth';
     }