harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IDN: force baseurl to be punycode; for consistency and federation all internal urls are US-ASCII, unicode MAY be used for display.

Browse Source
This commit is contained in:
zotlabs 2018-03-25 23:02:41 -07:00
parent 2fc3f381ac
commit a92f22a4a4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@ -857,7 +857,7 @@ class App {
self::$scheme = 'https'; self::$scheme = 'https';
if(x($_SERVER,'SERVER_NAME')) { if(x($_SERVER,'SERVER_NAME')) {
self::$hostname = $_SERVER['SERVER_NAME']; self::$hostname = punify($_SERVER['SERVER_NAME']);
if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
self::$hostname .= ':' . $_SERVER['SERVER_PORT']; self::$hostname .= ':' . $_SERVER['SERVER_PORT'];
@ -954,14 +954,14 @@ class App {
&& is_array(self::$config['system']) && is_array(self::$config['system'])
&& array_key_exists('baseurl',self::$config['system']) && array_key_exists('baseurl',self::$config['system'])
&& strlen(self::$config['system']['baseurl'])) { && strlen(self::$config['system']['baseurl'])) {
$url = self::$config['system']['baseurl']; $url = punify(self::$config['system']['baseurl']);
$url = trim($url,'\\/'); $url = trim($url,'\\/');
return $url; return $url;
} }
$scheme = self::$scheme; $scheme = self::$scheme;
self::$baseurl = $scheme . "://" . self::$hostname . ((isset(self::$path) && strlen(self::$path)) ? '/' . self::$path : '' ); self::$baseurl = $scheme . "://" . punify(self::$hostname) . ((isset(self::$path) && strlen(self::$path)) ? '/' . self::$path : '' );
return self::$baseurl; return self::$baseurl;
} }
@ -972,7 +972,7 @@ class App {
&& is_array(self::$config['system']) && is_array(self::$config['system'])
&& array_key_exists('baseurl',self::$config['system']) && array_key_exists('baseurl',self::$config['system'])
&& strlen(self::$config['system']['baseurl'])) { && strlen(self::$config['system']['baseurl'])) {
$url = self::$config['system']['baseurl']; $url = punify(self::$config['system']['baseurl']);
$url = trim($url,'\\/'); $url = trim($url,'\\/');
} }
@ -983,7 +983,7 @@ class App {
if($parsed !== false) { if($parsed !== false) {
self::$scheme = $parsed['scheme']; self::$scheme = $parsed['scheme'];
self::$hostname = $parsed['host']; self::$hostname = punify($parsed['host']);
if(x($parsed,'port')) if(x($parsed,'port'))
self::$hostname .= ':' . $parsed['port']; self::$hostname .= ':' . $parsed['port'];
if(x($parsed,'path')) if(x($parsed,'path'))