diff options
Diffstat (limited to 'application')
-rw-r--r-- | application/HttpUtils.php | 4 | ||||
-rw-r--r-- | application/TimeZone.php | 4 | ||||
-rw-r--r-- | application/Url.php | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/application/HttpUtils.php b/application/HttpUtils.php index 0e1ce879..c84ba6f0 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php | |||
@@ -27,7 +27,7 @@ | |||
27 | function get_http_response($url, $timeout = 30, $maxBytes = 4194304) | 27 | function get_http_response($url, $timeout = 30, $maxBytes = 4194304) |
28 | { | 28 | { |
29 | $urlObj = new Url($url); | 29 | $urlObj = new Url($url); |
30 | $cleanUrl = $urlObj->indToAscii(); | 30 | $cleanUrl = $urlObj->idnToAscii(); |
31 | 31 | ||
32 | if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { | 32 | if (! filter_var($cleanUrl, FILTER_VALIDATE_URL) || ! $urlObj->isHttp()) { |
33 | return array(array(0 => 'Invalid HTTP Url'), false); | 33 | return array(array(0 => 'Invalid HTTP Url'), false); |
@@ -70,7 +70,7 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304) | |||
70 | * Retrieve HTTP headers, following n redirections (temporary and permanent ones). | 70 | * Retrieve HTTP headers, following n redirections (temporary and permanent ones). |
71 | * | 71 | * |
72 | * @param string $url initial URL to reach. | 72 | * @param string $url initial URL to reach. |
73 | * @param int $redirectionLimit max redirection follow.. | 73 | * @param int $redirectionLimit max redirection follow. |
74 | * | 74 | * |
75 | * @return array HTTP headers, or false if it failed. | 75 | * @return array HTTP headers, or false if it failed. |
76 | */ | 76 | */ |
diff --git a/application/TimeZone.php b/application/TimeZone.php index e363d90a..26f2232d 100644 --- a/application/TimeZone.php +++ b/application/TimeZone.php | |||
@@ -101,10 +101,6 @@ function generateTimeZoneForm($preselectedTimezone='') | |||
101 | */ | 101 | */ |
102 | function isTimeZoneValid($continent, $city) | 102 | function isTimeZoneValid($continent, $city) |
103 | { | 103 | { |
104 | if ($continent == 'UTC' && $city == 'UTC') { | ||
105 | return true; | ||
106 | } | ||
107 | |||
108 | return in_array( | 104 | return in_array( |
109 | $continent.'/'.$city, | 105 | $continent.'/'.$city, |
110 | timezone_identifiers_list() | 106 | timezone_identifiers_list() |
diff --git a/application/Url.php b/application/Url.php index 61a30a78..77447c8d 100644 --- a/application/Url.php +++ b/application/Url.php | |||
@@ -240,7 +240,7 @@ class Url | |||
240 | * | 240 | * |
241 | * @return string converted cleaned up URL. | 241 | * @return string converted cleaned up URL. |
242 | */ | 242 | */ |
243 | public function indToAscii() | 243 | public function idnToAscii() |
244 | { | 244 | { |
245 | $out = $this->cleanup(); | 245 | $out = $this->cleanup(); |
246 | if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { | 246 | if (! function_exists('idn_to_ascii') || ! isset($this->parts['host'])) { |