psm_build_url(): only add https for port 443, http for the rest

This commit is contained in:
Pepijn Over 2014-03-15 01:46:14 +01:00
parent db73e9bb4b
commit ce64ec6bc3
1 changed files with 2 additions and 4 deletions

View File

@ -347,9 +347,7 @@ function psm_build_mail($from_name = null, $from_email = null) {
*/ */
function psm_build_url($params = array(), $urlencode = true) { function psm_build_url($params = array(), $urlencode = true) {
$defports = array(80, 443); $defports = array(80, 443);
$url = $url = ($_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
($_SERVER['SERVER_PORT']==80 ? 'http' : 'https').'://'.
$_SERVER['HTTP_HOST'];
if(!in_array($_SERVER['SERVER_PORT'], $defports)) { if(!in_array($_SERVER['SERVER_PORT'], $defports)) {
$url .= ':' . $_SERVER['SERVER_PORT']; $url .= ':' . $_SERVER['SERVER_PORT'];
} }
@ -384,7 +382,7 @@ function psm_GET($key, $alt = null) {
} }
/** /**
* Try existence of a GET var, if not return the alternative * Try existence of a POST var, if not return the alternative
* @param string $key * @param string $key
* @param string $alt * @param string $alt
* @return mixed * @return mixed