Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes - Title retrieving is failing with multiple use case

Browse source 
see https://github.com/shaarli/Shaarli/issues/531 for details
This commit is contained in:
ArthurHoaro 2016-04-06 22:00:52 +02:00
parent 11609d9fd8
commit ce7b0b6480
6 changed files with 142 additions and 16 deletions
application
Url.php

42
application/Url.php
View file

@ -62,7 +62,21 @@ function add_trailing_slash($url)
{
return $url . (!endsWith($url, '/') ? '/' : '');
}
/**
* Converts an URL with an IDN host to a ASCII one.
*
* @param string $url Input URL.
*
* @return string converted URL.
*/
function url_with_idn_to_ascii($url)
{
$parts = parse_url($url);
$parts['host'] = idn_to_ascii($parts['host']);
$httpUrl = new \http\Url($parts);
return $httpUrl->toString();
}
/**
* URL representation and cleanup utilities
*
@ -220,6 +234,22 @@ class Url
return $this->toString();
}
/**
* Converts an URL with an International Domain Name host to a ASCII one.
* This requires PHP-intl. If it's not available, just returns this->cleanup().
*
* @return string converted cleaned up URL.
*/
public function indToAscii()
{
$out = $this->cleanup();
if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) {
return $out;
}
$asciiHost = idn_to_ascii($this->parts['host']);
return str_replace($this->parts['host'], $asciiHost, $out);
}
/**
* Get URL scheme.
*
@ -232,6 +262,18 @@ class Url
return $this->parts['scheme'];
}
/**
* Get URL host.
*
* @return string the URL host or false if none is provided.
*/
public function getHost() {
if (empty($this->parts['host'])) {
return false;
}
return $this->parts['host'];
}
/**
* Test if the Url is an HTTP one.
*