jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added documentation, simplified code

Browse source
This commit is contained in:
Michael 2020-05-22 04:52:43 +00:00
parent 95b4f35a12
commit 071505f024
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/GServer.php
View file

@ -247,6 +247,12 @@ class GServer
Logger::info('Set failed status for new server', ['url' => $url]); Logger::info('Set failed status for new server', ['url' => $url]);
} }
/**
* Remove unwanted content from the given URL
*
* @param string $url
* @return string cleaned URL
*/
public static function cleanURL(string $url) public static function cleanURL(string $url)
{ {
$url = trim($url, '/'); $url = trim($url, '/');
@ -260,13 +266,15 @@ class GServer
return Network::unparseURL($urlparts); return Network::unparseURL($urlparts);
} }
/**
* Return the base URL
*
* @param string $url
* @return string base URL
*/
private static function getBaseURL(string $url) private static function getBaseURL(string $url)
{ {
$urlparts = parse_url($url); $urlparts = parse_url(self::cleanURL($url));
unset($urlparts['user']);
unset($urlparts['pass']);
unset($urlparts['query']);
unset($urlparts['fragment']);
unset($urlparts['path']); unset($urlparts['path']);
return Network::unparseURL($urlparts); return Network::unparseURL($urlparts);
} }