Merged in bugfix/HOR-2673 (pull request #5407)

HOR-2673

Approved-by: Paula Quispe
Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Ronald Henry Quenta Apaza
2017-02-10 20:01:03 +00:00
committed by Aldo Mauricio Veliz Valenzuela

View File

@@ -45,19 +45,16 @@ class G
/**
* is_https
* @return void
*/
* @return bool
*/
public static function is_https()
{
if (isset($_SERVER['HTTPS'])) {
if ($_SERVER['HTTPS']=='on') {
return true;
} else {
return false;
}
} else {
return false;
$is_http = false;
if ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ||
(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) {
$is_http = true;
}
return $is_http;
}
/**