Fix custom URL for admin area and login page

dev/qtx-test-test-urlBases.php

@@ -0,0 +1,83 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+
+/**
+ * @param array $urls
+ * @param array $exampleAdmin
+ * @param array $exampleAdminSolves
+ *
+ * @return void
+ */
+/**
+ * @param array $urls
+ * @param array $example
+ * @param array $exampleSolves
+ *
+ * @return void
+ */
+function qtranxf_check_url_replacement(array $urls, array $example, array $exampleSolves)
+{
+    for ($i = 0; $i < count($example); $i++) {
+        $replace = str_replace([$urls[$i], '/', '.php'], '', $example[$i]);
+        if (strlen($replace) == 0 || $replace != $exampleSolves[$i]) {
+            qtranxf_tst_log(__FUNCTION__ . ': exit on url: ' . $example[$i] . '. Returned: "' . $replace
+                . '" but it should be "' . $exampleSolves[$i]. '"');
+            exit();
+        }
+    }
+}
+
+function qtranxf_run_test_urlBases() {
+    $urls = [
+        'https://localhost/wordpress/',
+        'https://www.localhost.de/',
+        'https://www.kl12354.com/234kdsfgk4534o5/wordpress/',
+        'https://www.dog.io/',
+        'https://127.0.0.1/',
+        'https://www.wordpress.com/'
+    ];
+
+    $exampleAdmin = [
+        'https://localhost/wordpress/admin-page/',
+        'https://www.localhost.de/testo_ad#1min/',
+        'https://www.kl12354.com/234kdsfgk4534o5/wordpress/testo_admin/',
+        'https://www.dog.io/testo-cutsom_url/',
+        'https://127.0.0.1/wp-admin/',          //default
+        'https://www.wordpress.com/wp-admin/'   //default
+    ];
+
+    $exampleAdminSolves = [
+        'admin-page',
+        'testo_ad#1min',
+        'testo_admin',
+        'testo-cutsom_url',
+        'wp-admin',
+        'wp-admin'
+    ];
+
+    $exampleLogin = [
+        'https://localhost/wordpress/secret-login/',
+        'https://www.localhost.de/testo_login/',
+        'https://www.kl12354.com/234kdsfgk4534o5/wordpress/testo_login/',
+        'https://www.dog.io/testo-cutsom_url/',
+        'https://127.0.0.1/wp-login.php',           //default
+        'https://www.wordpress.com/wp-login.php'    //default
+    ];
+
+    $exampleLoginSolves = [
+        'secret-login',
+        'testo_login',
+        'testo_login',
+        'testo-cutsom_url',
+        'wp-login',
+        'wp-login'
+    ];
+
+    qtranxf_check_url_replacement($urls, $exampleAdmin, $exampleAdminSolves);
+
+    qtranxf_check_url_replacement($urls, $exampleLogin, $exampleLoginSolves);
+}
+
+qtranxf_run_test_urlBases();

src/language_detect.php

@@ -30,9 +30,10 @@ function qtranxf_detect_language( array &$url_info ) {
         $http_referer             = $_SERVER['HTTP_REFERER'];
         $url_info['http_referer'] = $http_referer;
 
+
         // if needed, detect front- vs back-end
         $parse_referrer_language = true;
-        if ( strpos( $http_referer, '/wp-admin' ) !== false ) {
+        if ( strpos( $http_referer, '/'.qtranxf_get_admin_base() ) !== false ) {
             $url_info['referer_admin'] = true;
             if ( ! isset( $url_info['doing_front_end'] ) ) {
                 $url_info['doing_front_end'] = false;

src/modules/slugs/slugs.php

@@ -326,10 +326,10 @@ public function query_vars( $query_vars ) {
             }
 
             // If req_uri is empty or if it is a request for ourself, unset error.
-            if ( empty( $request ) || $req_uri == $self || strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+            if ( empty( $request ) || $req_uri == $self || strpos( $_SERVER['PHP_SELF'], qtranxf_get_admin_base().'/' ) !== false ) {
                 unset( $_GET['error'] );
                 unset( $error );
-                if ( isset( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+                if ( isset( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], qtranxf_get_admin_base().'/' ) !== false ) {
                     unset( $perma_query_vars );
                 }
                 $wp->did_permalink = false;

src/url.php

@@ -283,7 +283,8 @@ function qtranxf_language_neutral_path( string $path ): bool {
     if ( isset( $language_neutral_path_cache[ $path ] ) ) {
         return $language_neutral_path_cache[ $path ];
     }
-    if ( preg_match( '#^/(wp-.*\.php|wp-login/|wp-admin/|xmlrpc.php|robots.txt|oauth/)#', $path ) ) {
+
+    if ( preg_match( '#^/(wp-.*\.php|'.qtranxf_get_login_base().'/|'.qtranxf_get_admin_base().'/|xmlrpc.php|robots.txt|oauth/)#', $path ) ) {
         $language_neutral_path_cache[ $path ] = true;
 
         return true;
@@ -320,6 +321,36 @@ function qtranxf_get_url_info( string $url ): array {
     return $urlinfo;
 }
 
+/**
+ * Returns the base admin url of the WordPress backend name e.g. wp-admin
+ * If the $admin_base is empty it returns the standard WordPress backend name
+ *
+ * @author Sebastian Poetter https://github.com/poetter-sebastian
+ * @link https://github.com/qtranslate/qtranslate-xt/pull/1324 repo pull request
+ *
+ * @return string WordPress backend name
+ */
+function qtranxf_get_admin_base():string
+{
+    $admin_base = str_replace( [site_url(), '/'], '', admin_url() );
+    return strlen($admin_base) == 0? 'wp-admin' : $admin_base;
+}
+
+/**
+ * Returns the base admin url of the WordPress backend login url e.g. wp-login
+ * If the $login_base is empty it returns the standard WordPress backend login name
+ *
+ * @author Sebastian Poetter https://github.com/poetter-sebastian
+ * @link https://github.com/qtranslate/qtranslate-xt/pull/1324 repo pull request
+ *
+ * @return string WordPress backend login name
+ */
+function qtranxf_get_login_base():string
+{
+    $login_base = str_replace( [site_url(), '/', '.php'], '', wp_login_url() );
+    return strlen($login_base) == 0? 'wp-login' : $login_base;
+}
+
 /**
  * Complete urlinfo with 'path-base' according to home and site info.
  * If they differ, 'doing_front_end' might be set.