Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to encode URLs in sitemap to RFC3986 #4653

Merged
merged 1 commit into from Jun 15, 2016
Merged

Try to encode URLs in sitemap to RFC3986 #4653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 48 additions & 2 deletions inc/sitemaps/class-sitemaps-renderer.php
View file
Open in desktop
Expand Up @@ -192,7 +192,7 @@ public function sitemap_url( $url ) {
$url['loc'] = htmlspecialchars( $url['loc'] );

$output = "\t<url>\n";
$output .= "\t\t<loc>" . $url['loc'] . "</loc>\n";
$output .= "\t\t<loc>" . $this->encode_url_rfc3986( $url['loc'] ) . "</loc>\n";
$output .= empty( $date ) ? '' : "\t\t<lastmod>" . htmlspecialchars( $date ) . "</lastmod>\n";
$output .= "\t\t<changefreq>" . $url['chf'] . "</changefreq>\n";
$output .= "\t\t<priority>" . str_replace( ',', '.', $url['pri'] ) . "</priority>\n";
Expand All @@ -208,7 +208,7 @@ public function sitemap_url( $url ) {
}

$output .= "\t\t<image:image>\n";
$output .= "\t\t\t<image:loc>" . esc_html( $img['src'] ) . "</image:loc>\n";
$output .= "\t\t\t<image:loc>" . esc_html( $this->encode_url_rfc3986( $img['src'] ) ) . "</image:loc>\n";

if ( ! empty( $img['title'] ) ) {
$title = _wp_specialchars( html_entity_decode( $img['title'], ENT_QUOTES, $this->charset ) );
Expand All @@ -235,4 +235,50 @@ public function sitemap_url( $url ) {
*/
return apply_filters( 'wpseo_sitemap_url', $output, $url );
}

/**
* Apply some best effort conversion to comply with RFC3986.
*
* @param string $url URL to encode.
*
* @return string
*/
protected function encode_url_rfc3986( $url ) {

if ( filter_var( $url, FILTER_VALIDATE_URL ) ) {
return $url;
}

$path = parse_url( $url, PHP_URL_PATH );

if ( ! empty( $path ) && '/' !== $path ) {

$encoded_path = explode( '/', $path );
$encoded_path = array_map( 'rawurlencode', $encoded_path );
$encoded_path = implode( '/', $encoded_path );
$encoded_path = str_replace( '%7E', '~', $encoded_path ); // PHP <5.3.

$url = str_replace( $path, $encoded_path, $url );
}

$query = parse_url( $url, PHP_URL_QUERY );

if ( ! empty( $query ) ) {

parse_str( $query, $parsed_query );

if ( defined( 'PHP_QUERY_RFC3986' ) ) { // PHP 5.4+.
$parsed_query = http_build_query( $parsed_query, null, '&amp;', PHP_QUERY_RFC3986 );
}
else {
$parsed_query = http_build_query( $parsed_query, null, '&amp;' );
$parsed_query = str_replace( '+', '%20', $parsed_query );
$parsed_query = str_replace( '%7E', '~', $parsed_query );
}

$url = str_replace( $query, $parsed_query, $url );
}

return $url;
}
}