| @@ -1,9 +1,14 @@ | ||
| 1 | 1 | <?php |
| 2 | +namespace WPDeveloper\BetterDocs\Core; | |
| 2 | 3 | |
| 3 | -namespace WPDeveloper\BetterDocs\Core; | |
| 4 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 5 | + exit; | |
| 6 | +} | |
| 4 | 7 | |
| 8 | + | |
| 5 | 9 | use WPDeveloper\BetterDocs\Utils\Base; |
| 10 | +use WPDeveloper\BetterDocs\Utils\Helper; | |
| 6 | 11 | |
| 7 | 12 | class Request extends Base { |
| 8 | 13 | /** |
| 9 | 14 | * Flag for already parsed or not |
| @@ -147,8 +152,15 @@ | ||
| 147 | 152 | * Hook into template_redirect to validate category-post relationships |
| 148 | 153 | * Priority 0 to run before WordPress canonical redirect (priority 10) |
| 149 | 154 | */ |
| 150 | 155 | add_action( 'template_redirect', [ $this, 'validate_single_docs_category_redirect' ], 0 ); |
| 156 | + | |
| 157 | + /** | |
| 158 | + * Hook into template_redirect to 301 non-canonical single doc URLs. | |
| 159 | + * Priority 5: after the validation above (0) so requests already headed for | |
| 160 | + * a 404 are left alone, and before WordPress canonical redirect (10). | |
| 161 | + */ | |
| 162 | + add_action( 'template_redirect', [ $this, 'redirect_to_canonical_docs_url' ], 5 ); | |
| 151 | 163 | } |
| 152 | 164 | |
| 153 | 165 | public function provide_compatibility( $element_id, $uri_parts, $request_url ) { |
| 154 | 166 | if ( $request_url == $this->settings->get( 'docs_slug' ) ) { |
| @@ -215,9 +227,9 @@ | ||
| 215 | 227 | if ( $this->invalid_request_query_vars !== null ) { |
| 216 | 228 | return false; // Block the redirect, show 404 instead |
| 217 | 229 | } |
| 218 | 230 | |
| 219 | - $actual_url = home_url( $_SERVER['REQUEST_URI'] ?? '' ); | |
| 231 | + $actual_url = home_url( isset( $_SERVER['REQUEST_URI'] ) ? esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '' ); | |
| 220 | 232 | |
| 221 | 233 | // Legacy check: if post_type=docs is already set in query vars, validate category |
| 222 | 234 | if ( isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] === 'docs' && |
| 223 | 235 | isset( $wp_query->query_vars['doc_category'] ) && isset( $wp_query->query_vars['name'] ) ) { |
| @@ -333,11 +345,14 @@ | ||
| 333 | 345 | }, 999 ); |
| 334 | 346 | return; |
| 335 | 347 | } |
| 336 | 348 | |
| 337 | - // Legacy check: if post_type=docs is already set in query vars, validate category | |
| 349 | + // Legacy check: if post_type=docs is already set in query vars, validate category. | |
| 350 | + // `name` must be a non-empty string — WP populates it with '' for taxonomy archive | |
| 351 | + // requests (e.g. comma-separated multi-category URLs like /docs-category/a,b/), | |
| 352 | + // which `isset()` would treat as present and incorrectly trigger this single-doc branch. | |
| 338 | 353 | if ( isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] === 'docs' && |
| 339 | - isset( $wp_query->query_vars['doc_category'] ) && isset( $wp_query->query_vars['name'] ) ) { | |
| 354 | + isset( $wp_query->query_vars['doc_category'] ) && ! empty( $wp_query->query_vars['name'] ) ) { | |
| 340 | 355 | |
| 341 | 356 | $doc_category = $wp_query->query_vars['doc_category']; |
| 342 | 357 | $post_name = $wp_query->query_vars['name']; |
| 343 | 358 | |
| @@ -342,9 +357,9 @@ | ||
| 342 | 357 | $post_name = $wp_query->query_vars['name']; |
| 343 | 358 | |
| 344 | 359 | // Get the post |
| 345 | 360 | $post = get_page_by_path( $post_name, OBJECT, 'docs' ); |
| 346 | - | |
| 361 | + | |
| 347 | 362 | if ( ! $post ) { |
| 348 | 363 | $wp_query->set_404(); |
| 349 | 364 | status_header( 404 ); |
| 350 | 365 | nocache_headers(); |
| @@ -387,8 +402,225 @@ | ||
| 387 | 402 | } |
| 388 | 403 | } |
| 389 | 404 | |
| 390 | 405 | /** |
| 406 | + * 301 redirect a single doc to its canonical permalink. | |
| 407 | + * | |
| 408 | + * With `enable_category_hierarchy_slugs` enabled the single doc rewrite rule | |
| 409 | + * captures every segment between the base and the doc slug into `doc_category` | |
| 410 | + * (see Rewrite::rules), and the category validation above only requires ONE of | |
| 411 | + * those segments to match. That looseness is deliberate — a strict match would | |
| 412 | + * 404 legitimate Multiple KB and WPML URLs, where the KB slug and translated | |
| 413 | + * segments share the same capture group — but it also means a doc resolves on an | |
| 414 | + * unlimited number of URLs, e.g. /docs/anything/real-category/doc-slug/. | |
| 415 | + * | |
| 416 | + * Rather than tightening the match, this compares the requested category path | |
| 417 | + * against every path the doc legitimately has and redirects the rest. Every URL | |
| 418 | + * that resolves today keeps resolving; only the extra ones collapse. | |
| 419 | + */ | |
| 420 | + public function redirect_to_canonical_docs_url() { | |
| 421 | + global $wp_query; | |
| 422 | + | |
| 423 | + /** | |
| 424 | + * Allow the canonical redirect to be disabled. | |
| 425 | + * | |
| 426 | + * @param bool $enabled Whether non-canonical single doc URLs should 301. | |
| 427 | + */ | |
| 428 | + if ( ! apply_filters( 'betterdocs_enable_canonical_redirect', true ) ) { | |
| 429 | + return; | |
| 430 | + } | |
| 431 | + | |
| 432 | + if ( is_admin() || wp_doing_ajax() || is_feed() || is_embed() || is_preview() || is_customize_preview() ) { | |
| 433 | + return; | |
| 434 | + } | |
| 435 | + | |
| 436 | + $request_method = isset( $_SERVER['REQUEST_METHOD'] ) ? strtoupper( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) ) : 'GET'; | |
| 437 | + if ( $request_method !== 'GET' ) { | |
| 438 | + return; | |
| 439 | + } | |
| 440 | + | |
| 441 | + if ( ! is_singular( 'docs' ) || is_404() ) { | |
| 442 | + return; | |
| 443 | + } | |
| 444 | + | |
| 445 | + /** | |
| 446 | + * The request is already headed for a 404 — leave it alone. Note that | |
| 447 | + * prevent_any_redirect_for_invalid_docs() cancels every wp_redirect() while | |
| 448 | + * this flag is set, so the redirect below would be swallowed anyway. | |
| 449 | + */ | |
| 450 | + if ( $this->invalid_request_query_vars !== null ) { | |
| 451 | + return; | |
| 452 | + } | |
| 453 | + | |
| 454 | + $requested_category = isset( $wp_query->query_vars['doc_category'] ) ? $wp_query->query_vars['doc_category'] : ''; | |
| 455 | + if ( ! is_string( $requested_category ) || $requested_category === '' ) { | |
| 456 | + return; | |
| 457 | + } | |
| 458 | + | |
| 459 | + $post_id = get_queried_object_id(); | |
| 460 | + if ( ! $post_id ) { | |
| 461 | + return; | |
| 462 | + } | |
| 463 | + | |
| 464 | + $valid_paths = $this->get_valid_category_paths( $post_id ); | |
| 465 | + if ( empty( $valid_paths ) ) { | |
| 466 | + return; | |
| 467 | + } | |
| 468 | + | |
| 469 | + $requested_category = urldecode( trim( $requested_category, '/' ) ); | |
| 470 | + | |
| 471 | + /** | |
| 472 | + * Under Multiple KB the knowledge base segment is parsed into its own query | |
| 473 | + * var, so put it back in front of the category chain before comparing — | |
| 474 | + * otherwise a crossed `/kb-a/category-of-kb-b/doc/` would look canonical. | |
| 475 | + */ | |
| 476 | + $requested_kb = isset( $wp_query->query_vars['knowledge_base'] ) ? $wp_query->query_vars['knowledge_base'] : ''; | |
| 477 | + if ( is_string( $requested_kb ) && $requested_kb !== '' ) { | |
| 478 | + $requested_category = urldecode( trim( $requested_kb, '/' ) ) . '/' . $requested_category; | |
| 479 | + } | |
| 480 | + | |
| 481 | + if ( in_array( $requested_category, $valid_paths, true ) ) { | |
| 482 | + return; // Already canonical (or another legitimate category of this doc). | |
| 483 | + } | |
| 484 | + | |
| 485 | + $canonical = get_permalink( $post_id ); | |
| 486 | + if ( ! $canonical ) { | |
| 487 | + return; | |
| 488 | + } | |
| 489 | + | |
| 490 | + // Keep the multipage segment the rewrite rule captured. | |
| 491 | + $page = isset( $wp_query->query_vars['page'] ) ? absint( $wp_query->query_vars['page'] ) : 0; | |
| 492 | + if ( $page > 1 ) { | |
| 493 | + $canonical = trailingslashit( $canonical ) . user_trailingslashit( $page, 'single_paged' ); | |
| 494 | + } | |
| 495 | + | |
| 496 | + /** | |
| 497 | + * Belt and braces: never redirect a URL onto itself. The allowed set is built | |
| 498 | + * from the same term chains get_permalink() uses, so this should be | |
| 499 | + * unreachable, but a third party filtering the permalink could otherwise turn | |
| 500 | + * a redirect into a loop. | |
| 501 | + */ | |
| 502 | + $requested_path = isset( $_SERVER['REQUEST_URI'] ) ? wp_parse_url( wp_unslash( $_SERVER['REQUEST_URI'] ), PHP_URL_PATH ) : ''; | |
| 503 | + $canonical_path = wp_parse_url( $canonical, PHP_URL_PATH ); | |
| 504 | + if ( untrailingslashit( urldecode( (string) $requested_path ) ) === untrailingslashit( urldecode( (string) $canonical_path ) ) ) { | |
| 505 | + return; | |
| 506 | + } | |
| 507 | + | |
| 508 | + $query_string = isset( $_SERVER['QUERY_STRING'] ) ? sanitize_text_field( wp_unslash( $_SERVER['QUERY_STRING'] ) ) : ''; | |
| 509 | + if ( $query_string !== '' ) { | |
| 510 | + $canonical .= ( strpos( $canonical, '?' ) === false ? '?' : '&' ) . $query_string; | |
| 511 | + } | |
| 512 | + | |
| 513 | + if ( wp_safe_redirect( $canonical, 301 ) ) { | |
| 514 | + exit; | |
| 515 | + } | |
| 516 | + } | |
| 517 | + | |
| 518 | + /** | |
| 519 | + * Every category path a doc can legitimately be reached at. | |
| 520 | + * | |
| 521 | + * Includes the full parent/child chain of each assigned category, and — because | |
| 522 | + * the hierarchy rewrite rule folds the knowledge base slug into `doc_category` | |
| 523 | + * for the `docs/%knowledge_base%/%doc_category%` structure — the KB-prefixed | |
| 524 | + * variants too. | |
| 525 | + * | |
| 526 | + * @param int $post_id The doc id. | |
| 527 | + * @return string[] Normalised (urldecoded, unslashed) category paths. | |
| 528 | + */ | |
| 529 | + protected function get_valid_category_paths( $post_id ) { | |
| 530 | + $cat_terms = wp_get_object_terms( $post_id, 'doc_category' ); | |
| 531 | + | |
| 532 | + if ( is_wp_error( $cat_terms ) ) { | |
| 533 | + return []; | |
| 534 | + } | |
| 535 | + | |
| 536 | + $paths = []; | |
| 537 | + $cat_paths = []; | |
| 538 | + | |
| 539 | + if ( empty( $cat_terms ) ) { | |
| 540 | + $paths[] = 'uncategorized'; | |
| 541 | + } else { | |
| 542 | + foreach ( $cat_terms as $cat_term ) { | |
| 543 | + $path = PostType::build_category_path( $cat_term ); | |
| 544 | + | |
| 545 | + if ( $path !== '' ) { | |
| 546 | + $paths[] = $path; | |
| 547 | + $cat_paths[ $cat_term->term_id ] = $path; | |
| 548 | + } | |
| 549 | + } | |
| 550 | + } | |
| 551 | + | |
| 552 | + if ( taxonomy_exists( 'knowledge_base' ) ) { | |
| 553 | + $kb_terms = wp_get_object_terms( $post_id, 'knowledge_base', [ 'fields' => 'slugs' ] ); | |
| 554 | + | |
| 555 | + if ( ! is_wp_error( $kb_terms ) && ! empty( $kb_terms ) ) { | |
| 556 | + $kb_paths = []; | |
| 557 | + | |
| 558 | + /** | |
| 559 | + * Read the KB association once per category rather than once per | |
| 560 | + * KB/category pair. The wp_get_object_terms() call above primes the | |
| 561 | + * term meta cache for these terms (`update_term_meta_cache` defaults | |
| 562 | + * to true), so these reads are cache hits and add no queries. | |
| 563 | + * | |
| 564 | + * The association mirrors how PostType::post_link() picks the | |
| 565 | + * category via `doc_category_knowledge_base`. Without it a doc in | |
| 566 | + * KB A / category A and KB B / category B would treat the crossed | |
| 567 | + * `/kb-a/category-b/doc/` as canonical. A term with no association | |
| 568 | + * meta is unassigned rather than KB specific, so it stays valid | |
| 569 | + * under every KB — post_link() falls back the same way. | |
| 570 | + */ | |
| 571 | + $term_kbs = []; | |
| 572 | + | |
| 573 | + if ( ! empty( $cat_paths ) ) { | |
| 574 | + foreach ( array_keys( $cat_paths ) as $term_id ) { | |
| 575 | + $meta = get_term_meta( $term_id, 'doc_category_knowledge_base', true ); | |
| 576 | + $term_kbs[ $term_id ] = ( ! empty( $meta ) && is_array( $meta ) ) ? $meta : null; | |
| 577 | + } | |
| 578 | + } | |
| 579 | + | |
| 580 | + foreach ( $kb_terms as $kb_slug ) { | |
| 581 | + if ( empty( $cat_paths ) ) { | |
| 582 | + // Uncategorised doc: the KB slug is the only prefix there is. | |
| 583 | + foreach ( $paths as $path ) { | |
| 584 | + $kb_paths[] = $kb_slug . '/' . $path; | |
| 585 | + } | |
| 586 | + continue; | |
| 587 | + } | |
| 588 | + | |
| 589 | + foreach ( $cat_paths as $term_id => $path ) { | |
| 590 | + if ( $term_kbs[ $term_id ] !== null && ! in_array( $kb_slug, $term_kbs[ $term_id ], true ) ) { | |
| 591 | + continue; | |
| 592 | + } | |
| 593 | + | |
| 594 | + $kb_paths[] = $kb_slug . '/' . $path; | |
| 595 | + } | |
| 596 | + } | |
| 597 | + | |
| 598 | + $paths = array_merge( $paths, $kb_paths ); | |
| 599 | + } | |
| 600 | + } | |
| 601 | + | |
| 602 | + /** | |
| 603 | + * Non-Latin slugs are stored URL encoded while the requested path arrives | |
| 604 | + * decoded, so normalise both sides before comparing. | |
| 605 | + */ | |
| 606 | + $paths = array_map( | |
| 607 | + function ( $path ) { | |
| 608 | + return urldecode( trim( $path, '/' ) ); | |
| 609 | + }, | |
| 610 | + $paths | |
| 611 | + ); | |
| 612 | + | |
| 613 | + /** | |
| 614 | + * Filter the category paths a doc is allowed to be reached at. | |
| 615 | + * | |
| 616 | + * @param string[] $paths Valid category paths. | |
| 617 | + * @param int $post_id The doc id. | |
| 618 | + */ | |
| 619 | + return array_values( array_unique( apply_filters( 'betterdocs_valid_docs_category_paths', $paths, $post_id ) ) ); | |
| 620 | + } | |
| 621 | + | |
| 622 | + /** | |
| 391 | 623 | * Check if a URL matches a BetterDocs single docs permalink structure |
| 392 | 624 | * but has invalid KB/category slugs that don't match the post. |
| 393 | 625 | * |
| 394 | 626 | * @param string $url The URL to check. |
| @@ -395,9 +627,9 @@ | ||
| 395 | 627 | * @return bool True if the URL is a BetterDocs docs URL with invalid slugs. |
| 396 | 628 | */ |
| 397 | 629 | protected function is_invalid_docs_url( $url ) { |
| 398 | 630 | // Get the path from the URL |
| 399 | - $path = trim( parse_url( $url, PHP_URL_PATH ), '/' ); | |
| 631 | + $path = trim( (string) wp_parse_url( $url, PHP_URL_PATH ), '/' ); | |
| 400 | 632 | |
| 401 | 633 | // Check each permalink structure |
| 402 | 634 | foreach ( $this->perma_structure as $_type => $structure ) { |
| 403 | 635 | if ( $_type !== 'is_single_docs' ) { |
| @@ -576,8 +808,14 @@ | ||
| 576 | 808 | |
| 577 | 809 | // Normalize request path: remove index.php/ and leading/trailing slashes |
| 578 | 810 | $request_path = trim( preg_replace( '#^index\.php(/|$)#', '', $request_path ), '/' ); |
| 579 | 811 | |
| 812 | + // If the request path is empty, this is a query-string-only request (e.g. /?post_type=docs). | |
| 813 | + // There is no URL prefix to validate in that case, so bail early. | |
| 814 | + if ( $request_path === '' ) { | |
| 815 | + return; | |
| 816 | + } | |
| 817 | + | |
| 580 | 818 | // Normalize base slug |
| 581 | 819 | $docs_slug = $this->rewrite->get_base_slug(); |
| 582 | 820 | |
| 583 | 821 | // If user is using a custom page as root, use that page's path |
| @@ -614,18 +852,46 @@ | ||
| 614 | 852 | } |
| 615 | 853 | |
| 616 | 854 | // Check if request path strictly starts with docs slug, category slug, or tag slug |
| 617 | 855 | // Using # as delimiter, need to preg_quote |
| 618 | - $valid_prefixes = [ | |
| 619 | - preg_quote( $docs_slug, '#' ), | |
| 620 | - preg_quote( trim( $this->settings->get( 'category_slug', 'docs-category' ), '/' ), '#' ), | |
| 621 | - preg_quote( trim( $this->settings->get( 'tag_slug', 'docs-tag' ), '/' ), '#' ) | |
| 856 | + $valid_slugs = [ | |
| 857 | + $docs_slug, | |
| 858 | + trim( $this->settings->get( 'category_slug', 'docs-category' ), '/' ), | |
| 859 | + trim( $this->settings->get( 'tag_slug', 'docs-tag' ), '/' ) | |
| 622 | 860 | ]; |
| 623 | - $valid_prefixes = array_filter( $valid_prefixes ); | |
| 624 | - | |
| 861 | + | |
| 862 | + // WPML/Polylang translate the registered rewrite slug per active language, | |
| 863 | + // while $docs_slug from settings is always the default-language slug. Include | |
| 864 | + // the post type's / taxonomies' currently-registered rewrite slugs so that | |
| 865 | + // translated archive URLs (e.g. /en/support/ when settings.docs_slug is | |
| 866 | + // "soporte") are accepted instead of being 404'd. | |
| 867 | + $docs_pt = get_post_type_object( 'docs' ); | |
| 868 | + if ( $docs_pt && ! empty( $docs_pt->rewrite['slug'] ) ) { | |
| 869 | + $valid_slugs[] = trim( $docs_pt->rewrite['slug'], '/' ); | |
| 870 | + } | |
| 871 | + foreach ( [ 'doc_category', 'doc_tag', 'knowledge_base' ] as $tax ) { | |
| 872 | + $tax_obj = get_taxonomy( $tax ); | |
| 873 | + if ( $tax_obj && ! empty( $tax_obj->rewrite['slug'] ) ) { | |
| 874 | + $valid_slugs[] = trim( $tax_obj->rewrite['slug'], '/' ); | |
| 875 | + } | |
| 876 | + } | |
| 877 | + | |
| 878 | + // Belt-and-suspenders for WPML's slug-translation feature, which may store | |
| 879 | + // the translated slug separately from the post type's rewrite['slug']. | |
| 880 | + if ( has_filter( 'wpml_get_translated_slug' ) ) { | |
| 881 | + // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- WPML-owned filter; name must be used verbatim. | |
| 882 | + $wpml_slug = apply_filters( 'wpml_get_translated_slug', $docs_slug, 'docs' ); | |
| 883 | + if ( is_string( $wpml_slug ) && $wpml_slug !== '' ) { | |
| 884 | + $valid_slugs[] = trim( $wpml_slug, '/' ); | |
| 885 | + } | |
| 886 | + } | |
| 887 | + | |
| 888 | + $valid_prefixes = array_unique( array_filter( $valid_slugs ) ); | |
| 889 | + $valid_prefixes = array_map( function ( $slug ) { return preg_quote( $slug, '#' ); }, $valid_prefixes ); | |
| 890 | + | |
| 625 | 891 | // Allow optional language prefixes (e.g. /en/, /pt-br/) for WPML/Polylang/TranslatePress compatibility |
| 626 | 892 | $lang_pattern = '(?:[a-zA-Z]{2,3}(?:-[a-zA-Z0-9]{2,4})?/)?'; |
| 627 | - | |
| 893 | + | |
| 628 | 894 | $prefix_pattern = '#^' . $lang_pattern . '(' . implode( '|', $valid_prefixes ) . ')(/|$)#'; |
| 629 | 895 | |
| 630 | 896 | if ( ! preg_match( $prefix_pattern, $request_path ) ) { |
| 631 | 897 | global $wp_query; |
| @@ -926,8 +1192,9 @@ | ||
| 926 | 1192 | if ( ! isset( $query_vars['name'] ) && ! isset( $query_vars['docs'] ) ) { |
| 927 | 1193 | return false; |
| 928 | 1194 | } |
| 929 | 1195 | |
| 1196 | + // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching -- frontend single-doc URL resolution; queries vary per request and run on `parse_request`, before object cache is reliable. | |
| 930 | 1197 | global $wpdb; |
| 931 | 1198 | $name = isset( $query_vars['docs'] ) ? $query_vars['docs'] : $query_vars['name']; |
| 932 | 1199 | |
| 933 | 1200 | |
| @@ -948,22 +1215,37 @@ | ||
| 948 | 1215 | $_encoded_name = rawurlencode( $name ); |
| 949 | 1216 | |
| 950 | 1217 | if ( isset( $query_vars['knowledge_base'] ) && ! empty( $query_vars['knowledge_base'] ) ) { |
| 951 | 1218 | // KB-aware lookup: only select the post that is assigned to this KB. |
| 1219 | + // Also join doc_category when present so that, on Polylang/WPML sites | |
| 1220 | + // where multiple translated posts share both the same post_name and | |
| 1221 | + // the same KB term (e.g. all language variants assigned to the | |
| 1222 | + // "advice" KB), we land on the translation whose doc_category matches | |
| 1223 | + // the URL — not the one the DB happens to return first. | |
| 952 | 1224 | $_kb_slug = $query_vars['knowledge_base']; |
| 953 | 1225 | $_kb_slug_enc = strtolower( rawurlencode( $_kb_slug ) ); |
| 1226 | + | |
| 1227 | + $_cat_target = $target_category_slug; | |
| 1228 | + $_cat_target_enc = strtolower( rawurlencode( $_cat_target ) ); | |
| 1229 | + | |
| 954 | 1230 | $_post_id = (int) $wpdb->get_var( |
| 955 | 1231 | $wpdb->prepare( |
| 956 | 1232 | "SELECT p.ID FROM {$wpdb->posts} p |
| 957 | - INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id = p.ID | |
| 958 | - INNER JOIN {$wpdb->term_taxonomy} tt ON tt.term_taxonomy_id = tr.term_taxonomy_id AND tt.taxonomy = 'knowledge_base' | |
| 959 | - INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id | |
| 1233 | + INNER JOIN {$wpdb->term_relationships} tr_kb ON tr_kb.object_id = p.ID | |
| 1234 | + INNER JOIN {$wpdb->term_taxonomy} tt_kb ON tt_kb.term_taxonomy_id = tr_kb.term_taxonomy_id AND tt_kb.taxonomy = 'knowledge_base' | |
| 1235 | + INNER JOIN {$wpdb->terms} t_kb ON t_kb.term_id = tt_kb.term_id | |
| 1236 | + INNER JOIN {$wpdb->term_relationships} tr_cat ON tr_cat.object_id = p.ID | |
| 1237 | + INNER JOIN {$wpdb->term_taxonomy} tt_cat ON tt_cat.term_taxonomy_id = tr_cat.term_taxonomy_id AND tt_cat.taxonomy = 'doc_category' | |
| 1238 | + INNER JOIN {$wpdb->terms} t_cat ON t_cat.term_id = tt_cat.term_id | |
| 960 | 1239 | WHERE p.post_name = %s AND p.post_type = 'docs' |
| 961 | - AND t.slug IN (%s, %s) | |
| 1240 | + AND t_kb.slug IN (%s, %s) | |
| 1241 | + AND t_cat.slug IN (%s, %s) | |
| 962 | 1242 | LIMIT 1", |
| 963 | 1243 | esc_sql( $_encoded_name ), |
| 964 | 1244 | esc_sql( $_kb_slug ), |
| 965 | - esc_sql( $_kb_slug_enc ) | |
| 1245 | + esc_sql( $_kb_slug_enc ), | |
| 1246 | + esc_sql( $_cat_target_enc ), | |
| 1247 | + esc_sql( $_cat_target ) | |
| 966 | 1248 | ) |
| 967 | 1249 | ); |
| 968 | 1250 | // Fallback: post_name stored as decoded Unicode |
| 969 | 1251 | if ( ! $_post_id && $_encoded_name !== $name ) { |
| @@ -969,8 +1251,35 @@ | ||
| 969 | 1251 | if ( ! $_post_id && $_encoded_name !== $name ) { |
| 970 | 1252 | $_post_id = (int) $wpdb->get_var( |
| 971 | 1253 | $wpdb->prepare( |
| 972 | 1254 | "SELECT p.ID FROM {$wpdb->posts} p |
| 1255 | + INNER JOIN {$wpdb->term_relationships} tr_kb ON tr_kb.object_id = p.ID | |
| 1256 | + INNER JOIN {$wpdb->term_taxonomy} tt_kb ON tt_kb.term_taxonomy_id = tr_kb.term_taxonomy_id AND tt_kb.taxonomy = 'knowledge_base' | |
| 1257 | + INNER JOIN {$wpdb->terms} t_kb ON t_kb.term_id = tt_kb.term_id | |
| 1258 | + INNER JOIN {$wpdb->term_relationships} tr_cat ON tr_cat.object_id = p.ID | |
| 1259 | + INNER JOIN {$wpdb->term_taxonomy} tt_cat ON tt_cat.term_taxonomy_id = tr_cat.term_taxonomy_id AND tt_cat.taxonomy = 'doc_category' | |
| 1260 | + INNER JOIN {$wpdb->terms} t_cat ON t_cat.term_id = tt_cat.term_id | |
| 1261 | + WHERE p.post_name = %s AND p.post_type = 'docs' | |
| 1262 | + AND t_kb.slug IN (%s, %s) | |
| 1263 | + AND t_cat.slug IN (%s, %s) | |
| 1264 | + LIMIT 1", | |
| 1265 | + esc_sql( $name ), | |
| 1266 | + esc_sql( $_kb_slug ), | |
| 1267 | + esc_sql( $_kb_slug_enc ), | |
| 1268 | + esc_sql( $_cat_target_enc ), | |
| 1269 | + esc_sql( $_cat_target ) | |
| 1270 | + ) | |
| 1271 | + ); | |
| 1272 | + } | |
| 1273 | + | |
| 1274 | + // Fallback to the KB-only lookup (no category filter) when nothing | |
| 1275 | + // matched both KB + category. Keeps single-language behaviour intact | |
| 1276 | + // and lets the category-validation block below handle any genuine | |
| 1277 | + // mismatch by setting invalid_request_query_vars. | |
| 1278 | + if ( ! $_post_id ) { | |
| 1279 | + $_post_id = (int) $wpdb->get_var( | |
| 1280 | + $wpdb->prepare( | |
| 1281 | + "SELECT p.ID FROM {$wpdb->posts} p | |
| 973 | 1282 | INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id = p.ID |
| 974 | 1283 | INNER JOIN {$wpdb->term_taxonomy} tt ON tt.term_taxonomy_id = tr.term_taxonomy_id AND tt.taxonomy = 'knowledge_base' |
| 975 | 1284 | INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id |
| 976 | 1285 | WHERE p.post_name = %s AND p.post_type = 'docs' |
| @@ -975,31 +1284,91 @@ | ||
| 975 | 1284 | INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id |
| 976 | 1285 | WHERE p.post_name = %s AND p.post_type = 'docs' |
| 977 | 1286 | AND t.slug IN (%s, %s) |
| 978 | 1287 | LIMIT 1", |
| 979 | - esc_sql( $name ), | |
| 1288 | + esc_sql( $_encoded_name ), | |
| 980 | 1289 | esc_sql( $_kb_slug ), |
| 981 | 1290 | esc_sql( $_kb_slug_enc ) |
| 982 | 1291 | ) |
| 983 | 1292 | ); |
| 1293 | + if ( ! $_post_id && $_encoded_name !== $name ) { | |
| 1294 | + $_post_id = (int) $wpdb->get_var( | |
| 1295 | + $wpdb->prepare( | |
| 1296 | + "SELECT p.ID FROM {$wpdb->posts} p | |
| 1297 | + INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id = p.ID | |
| 1298 | + INNER JOIN {$wpdb->term_taxonomy} tt ON tt.term_taxonomy_id = tr.term_taxonomy_id AND tt.taxonomy = 'knowledge_base' | |
| 1299 | + INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id | |
| 1300 | + WHERE p.post_name = %s AND p.post_type = 'docs' | |
| 1301 | + AND t.slug IN (%s, %s) | |
| 1302 | + LIMIT 1", | |
| 1303 | + esc_sql( $name ), | |
| 1304 | + esc_sql( $_kb_slug ), | |
| 1305 | + esc_sql( $_kb_slug_enc ) | |
| 1306 | + ) | |
| 1307 | + ); | |
| 1308 | + } | |
| 984 | 1309 | } |
| 985 | 1310 | } else { |
| 986 | - // No KB in URL — use the simple post_name lookup (single-KB sites). | |
| 987 | - $_post_id = (int) $wpdb->get_var( | |
| 1311 | + // No KB in URL — disambiguate via doc_category. WPML/Polylang assign each | |
| 1312 | + // translated post the same post_name (e.g. "spacious-family-home..."), | |
| 1313 | + // so a plain `WHERE post_name = ... LIMIT 1` returns whichever language | |
| 1314 | + // the DB serves first. When that pick does not belong to the category in | |
| 1315 | + // the URL, the validation below falsely fires a 404 even though the | |
| 1316 | + // correctly-translated post exists. Join doc_category so we land on the | |
| 1317 | + // translation that actually owns the requested category. | |
| 1318 | + $_cat_target = $target_category_slug; | |
| 1319 | + $_cat_target_enc = strtolower( rawurlencode( $_cat_target ) ); | |
| 1320 | + $_post_id = (int) $wpdb->get_var( | |
| 988 | 1321 | $wpdb->prepare( |
| 989 | - "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s AND post_type = %s LIMIT 1", | |
| 1322 | + "SELECT p.ID FROM {$wpdb->posts} p | |
| 1323 | + INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id = p.ID | |
| 1324 | + INNER JOIN {$wpdb->term_taxonomy} tt ON tt.term_taxonomy_id = tr.term_taxonomy_id AND tt.taxonomy = 'doc_category' | |
| 1325 | + INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id | |
| 1326 | + WHERE p.post_name = %s AND p.post_type = 'docs' | |
| 1327 | + AND t.slug IN (%s, %s) | |
| 1328 | + LIMIT 1", | |
| 990 | 1329 | esc_sql( $_encoded_name ), |
| 991 | - 'docs' | |
| 1330 | + esc_sql( $_cat_target_enc ), | |
| 1331 | + esc_sql( $_cat_target ) | |
| 992 | 1332 | ) |
| 993 | 1333 | ); |
| 994 | 1334 | if ( ! $_post_id && $_encoded_name !== $name ) { |
| 995 | 1335 | $_post_id = (int) $wpdb->get_var( |
| 996 | 1336 | $wpdb->prepare( |
| 1337 | + "SELECT p.ID FROM {$wpdb->posts} p | |
| 1338 | + INNER JOIN {$wpdb->term_relationships} tr ON tr.object_id = p.ID | |
| 1339 | + INNER JOIN {$wpdb->term_taxonomy} tt ON tt.term_taxonomy_id = tr.term_taxonomy_id AND tt.taxonomy = 'doc_category' | |
| 1340 | + INNER JOIN {$wpdb->terms} t ON t.term_id = tt.term_id | |
| 1341 | + WHERE p.post_name = %s AND p.post_type = 'docs' | |
| 1342 | + AND t.slug IN (%s, %s) | |
| 1343 | + LIMIT 1", | |
| 1344 | + esc_sql( $name ), | |
| 1345 | + esc_sql( $_cat_target_enc ), | |
| 1346 | + esc_sql( $_cat_target ) | |
| 1347 | + ) | |
| 1348 | + ); | |
| 1349 | + } | |
| 1350 | + | |
| 1351 | + // Fallback: post exists with this name but not under the requested | |
| 1352 | + // category. Let the category-validation block below handle the 404 so | |
| 1353 | + // we keep the existing single-language behaviour intact. | |
| 1354 | + if ( ! $_post_id ) { | |
| 1355 | + $_post_id = (int) $wpdb->get_var( | |
| 1356 | + $wpdb->prepare( | |
| 997 | 1357 | "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s AND post_type = %s LIMIT 1", |
| 998 | - esc_sql( $name ), | |
| 1358 | + esc_sql( $_encoded_name ), | |
| 999 | 1359 | 'docs' |
| 1000 | 1360 | ) |
| 1001 | 1361 | ); |
| 1362 | + if ( ! $_post_id && $_encoded_name !== $name ) { | |
| 1363 | + $_post_id = (int) $wpdb->get_var( | |
| 1364 | + $wpdb->prepare( | |
| 1365 | + "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s AND post_type = %s LIMIT 1", | |
| 1366 | + esc_sql( $name ), | |
| 1367 | + 'docs' | |
| 1368 | + ) | |
| 1369 | + ); | |
| 1370 | + } | |
| 1002 | 1371 | } |
| 1003 | 1372 | } |
| 1004 | 1373 | |
| 1005 | 1374 | // If post exists, validate it belongs to the category in the URL |
| @@ -1154,17 +1523,23 @@ | ||
| 1154 | 1523 | array_unshift( $hierarchy_path, $current_term->slug ); |
| 1155 | 1524 | $current_term = $current_term->parent ? get_term( $current_term->parent, 'doc_category' ) : null; |
| 1156 | 1525 | } |
| 1157 | 1526 | |
| 1158 | - // Check if this hierarchy matches the URL structure | |
| 1527 | + // Check if this hierarchy matches the URL structure. | |
| 1528 | + // WordPress/Polylang store non-Latin term slugs URL-encoded | |
| 1529 | + // (%e0%a6...) while $doc_category arrives decoded from | |
| 1530 | + // is_perma_valid_for. Compare in the decoded form so Bengali, | |
| 1531 | + // Arabic, CJK, etc. hierarchies actually match. | |
| 1159 | 1532 | $built_path = implode('/', $hierarchy_path); |
| 1533 | + $built_path_norm = urldecode( $built_path ); | |
| 1534 | + $doc_cat_norm = urldecode( $doc_category ); | |
| 1160 | 1535 | |
| 1161 | 1536 | // Allow partial path matching to accommodate KB-prefixed URLs or partial hierarchies. |
| 1162 | 1537 | // Using substr for broad PHP version compatibility (equivalent to str_ends_with). |
| 1163 | - $is_suffix = strlen($built_path) > 0 && substr($doc_category, -strlen($built_path)) === $built_path; | |
| 1164 | - $is_prefix = strlen($doc_category) > 0 && substr($built_path, -strlen($doc_category)) === $doc_category; | |
| 1538 | + $is_suffix = strlen( $built_path_norm ) > 0 && substr( $doc_cat_norm, -strlen( $built_path_norm ) ) === $built_path_norm; | |
| 1539 | + $is_prefix = strlen( $doc_cat_norm ) > 0 && substr( $built_path_norm, -strlen( $doc_cat_norm ) ) === $doc_cat_norm; | |
| 1165 | 1540 | |
| 1166 | - if ( $built_path === $doc_category || $is_suffix || $is_prefix ) { | |
| 1541 | + if ( $built_path_norm === $doc_cat_norm || $is_suffix || $is_prefix ) { | |
| 1167 | 1542 | $found_valid_hierarchy = true; |
| 1168 | 1543 | break; |
| 1169 | 1544 | } |
| 1170 | 1545 | } |
| @@ -1254,8 +1629,9 @@ | ||
| 1254 | 1629 | } |
| 1255 | 1630 | } |
| 1256 | 1631 | |
| 1257 | 1632 | return $_post_id > 0; |
| 1633 | + // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery,WordPress.DB.DirectDatabaseQuery.NoCaching | |
| 1258 | 1634 | } |
| 1259 | 1635 | |
| 1260 | 1636 | protected function is_docs_category( $query_vars ) { |
| 1261 | 1637 | $result = $this->term_exists( $query_vars, 'doc_category' ); |
| @@ -1322,8 +1698,18 @@ | ||
| 1322 | 1698 | |
| 1323 | 1699 | public function parse( $wp ) { |
| 1324 | 1700 | static::$already_parsed = true; |
| 1325 | 1701 | |
| 1702 | + // An API Reference rewrite rule already matched (/docs/api/{slug}). | |
| 1703 | + // The permalink magic below re-interprets the raw path against the | |
| 1704 | + // docs/category/KB structures and would hijack the request whenever a | |
| 1705 | + // doc_category or knowledge_base term shares the reference's slug — | |
| 1706 | + // an explicit CPT match always wins. | |
| 1707 | + if ( isset( $wp->query_vars['betterdocs_api_ref'] ) ) { | |
| 1708 | + return; | |
| 1709 | + } | |
| 1710 | + | |
| 1711 | + // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- legacy public filter name, retained for back-compat with Pro/extensions. | |
| 1326 | 1712 | $this->perma_structure = apply_filters('docs_rewrite_rules', $this->perma_structure); |
| 1327 | 1713 | |
| 1328 | 1714 | $this->permalink_magic( $wp ); |
| 1329 | 1715 | } |
| @@ -1340,12 +1726,28 @@ | ||
| 1340 | 1726 | // DB lookups handle the encoding separately below. |
| 1341 | 1727 | $request = isset( $wp->request ) ? urldecode( $wp->request ) : ''; |
| 1342 | 1728 | $request = trim( preg_replace( '#^index\.php(/|$)#', '', $request ), '/' ); |
| 1343 | 1729 | |
| 1730 | + // Strip pagination segment (/page/N) before matching permalink structures. | |
| 1731 | + // When hierarchy slugs are enabled, the (.+?) regex for %doc_category% would | |
| 1732 | + // otherwise capture "/page/2" as part of the category slug, breaking pagination. | |
| 1733 | + $paged = 0; | |
| 1734 | + if ( preg_match( '#/page/([0-9]+)/?$#', $request, $page_matches ) ) { | |
| 1735 | + $paged = intval( $page_matches[1] ); | |
| 1736 | + $request = preg_replace( '#/page/[0-9]+/?$#', '', $request ); | |
| 1737 | + } | |
| 1738 | + | |
| 1344 | 1739 | // Strip optional language prefix injected by Polylang/WPML (e.g. "en/", "bn/", "pt-br/") |
| 1345 | 1740 | // so that "bn/docs/..." matches the structure "docs/..." correctly. |
| 1346 | 1741 | $request_without_lang = preg_replace( '#^[a-zA-Z]{2,3}(?:-[a-zA-Z0-9]{2,8})?/#', '', $request ); |
| 1347 | 1742 | |
| 1743 | + // When WPML translates a taxonomy base slug per language (e.g. doc_tag | |
| 1744 | + // "docs-tag" -> "docs-tag-bn"), the incoming URL uses the translated slug, | |
| 1745 | + // but perma_structure is built from the default-language slug. Map the | |
| 1746 | + // leading translated slug back to its default so the raw structures match. | |
| 1747 | + // No-op on non-WPML sites and when the slug isn't translated. | |
| 1748 | + $request_canonical = $this->canonicalize_translated_slug( $request_without_lang ); | |
| 1749 | + | |
| 1348 | 1750 | foreach ( $this->perma_structure as $_type => $structure ) { |
| 1349 | 1751 | // First try the raw (possibly language-prefixed) request, then the lang-stripped variant. |
| 1350 | 1752 | // This ensures we still match non-multilingual sites without stripping valid slugs. |
| 1351 | 1753 | $_perma_vars = $this->is_perma_valid_for( $structure, $request ); |
| @@ -1351,8 +1753,11 @@ | ||
| 1351 | 1753 | $_perma_vars = $this->is_perma_valid_for( $structure, $request ); |
| 1352 | 1754 | if ( ! $_perma_vars && $request_without_lang !== $request ) { |
| 1353 | 1755 | $_perma_vars = $this->is_perma_valid_for( $structure, $request_without_lang ); |
| 1354 | 1756 | } |
| 1757 | + if ( ! $_perma_vars && $request_canonical !== $request_without_lang ) { | |
| 1758 | + $_perma_vars = $this->is_perma_valid_for( $structure, $request_canonical ); | |
| 1759 | + } | |
| 1355 | 1760 | |
| 1356 | 1761 | // $_valid = empty( $_valid ) && $_perma_vars ? [ 'type' => $_type, 'query_vars' => $_perma_vars ] : $_valid; |
| 1357 | 1762 | if ( ( $_perma_vars && method_exists( $this, $_type ) && call_user_func_array( [$this, $_type], [ & $_perma_vars] ) ) ) { |
| 1358 | 1763 | |
| @@ -1372,8 +1777,13 @@ | ||
| 1372 | 1777 | |
| 1373 | 1778 | $type = isset( $_valid['type'] ) ? $_valid['type'] : ''; |
| 1374 | 1779 | $query_vars = isset( $_valid['query_vars'] ) ? $_valid['query_vars'] : []; |
| 1375 | 1780 | |
| 1781 | + // Inject the paged query var if a /page/N segment was stripped from the request. | |
| 1782 | + if ( $paged > 0 && ! empty( $type ) ) { | |
| 1783 | + $query_vars['paged'] = $paged; | |
| 1784 | + } | |
| 1785 | + | |
| 1376 | 1786 | if ( ! empty( $type ) ) { |
| 1377 | 1787 | unset( $this->query_vars[ $type ] ); |
| 1378 | 1788 | array_map( |
| 1379 | 1789 | function ( $_vars ) use ( &$wp ) { |
| @@ -1388,9 +1798,9 @@ | ||
| 1388 | 1798 | ); |
| 1389 | 1799 | } |
| 1390 | 1800 | |
| 1391 | 1801 | $wp->query_vars = is_array( $query_vars ) ? array_merge( $wp->query_vars, $query_vars ) : $wp->query_vars; |
| 1392 | - | |
| 1802 | + | |
| 1393 | 1803 | // Fallback |
| 1394 | 1804 | if ( ! empty( $_valid ) ) { |
| 1395 | 1805 | unset( $wp->query_vars['attachment'] ); |
| 1396 | 1806 | } |
| @@ -1395,8 +1805,46 @@ | ||
| 1395 | 1805 | unset( $wp->query_vars['attachment'] ); |
| 1396 | 1806 | } |
| 1397 | 1807 | } |
| 1398 | 1808 | } |
| 1809 | + | |
| 1810 | + /** | |
| 1811 | + * Map a leading WPML-translated taxonomy base slug back to its default-language | |
| 1812 | + * value so the default-language perma_structure patterns can match a translated URL. | |
| 1813 | + * | |
| 1814 | + * Only the first path segment is considered (the taxonomy base). Returns the | |
| 1815 | + * request unchanged when WPML is inactive or the leading segment isn't a | |
| 1816 | + * translated BetterDocs slug. | |
| 1817 | + * | |
| 1818 | + * @param string $request Language-stripped request path (no leading/trailing slash). | |
| 1819 | + * @return string | |
| 1820 | + */ | |
| 1821 | + private function canonicalize_translated_slug( $request ) { | |
| 1822 | + if ( $request === '' || strpos( $request, '/' ) === false ) { | |
| 1823 | + return $request; | |
| 1824 | + } | |
| 1825 | + | |
| 1826 | + $slug_map = [ | |
| 1827 | + 'doc_tag' => trim( $this->settings->get( 'tag_slug', 'docs-tag' ), '/' ), | |
| 1828 | + 'doc_category' => trim( $this->settings->get( 'category_slug', 'docs-category' ), '/' ), | |
| 1829 | + ]; | |
| 1830 | + | |
| 1831 | + $segments = explode( '/', $request ); | |
| 1832 | + | |
| 1833 | + foreach ( $slug_map as $taxonomy => $default ) { | |
| 1834 | + if ( $default === '' ) { | |
| 1835 | + continue; | |
| 1836 | + } | |
| 1837 | + | |
| 1838 | + $translated = Helper::wpml_translated_tax_slug( $taxonomy, $default ); | |
| 1839 | + if ( $translated !== $default && $segments[0] === $translated ) { | |
| 1840 | + $segments[0] = $default; | |
| 1841 | + return implode( '/', $segments ); | |
| 1842 | + } | |
| 1843 | + } | |
| 1844 | + | |
| 1845 | + return $request; | |
| 1846 | + } | |
| 1399 | 1847 | |
| 1400 | 1848 | /** |
| 1401 | 1849 | * This method is responsible for checking a structure is valid again a request. |
| 1402 | 1850 | * |
