fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiple SERVER_PORT references updated to use HTTP_HOST

Browse Source
This commit is contained in:
IsaiDiaz
2025-07-02 12:07:52 -04:00
parent ba7e70fcd9
commit 615f0ff5a0
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gulliver/methods/errors/block.php
View File

@@ -4,7 +4,8 @@ if (function_exists("http_response_code")) {
}
$http = G::is_https() ? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80") ? ":" . $_SERVER["SERVER_PORT"] : "");
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
$urlHome = $urlLogin;

2
gulliver/methods/errors/error403.php
View File

@@ -1,7 +1,7 @@
<?php
$http = G::is_https() ? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
$urlHome = $urlLogin;

2
workflow/engine/classes/class.pmFunctions.php
View File

@@ -608,7 +608,7 @@ function WSOpen($force = false)
);
if (!isset($_SESSION["WS_END_POINT"])) {
$defaultEndpoint = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . "/sys" . config("system.workspace") . "/en/classic/services/wsdl2";
$defaultEndpoint = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . "/sys" . config("system.workspace") . "/en/classic/services/wsdl2";
}
$endpoint = isset($_SESSION["WS_END_POINT"]) ? $_SESSION["WS_END_POINT"] : $defaultEndpoint;

11
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -324,12 +324,11 @@ class CaseScheduler extends BaseCaseScheduler
//Set variables
$port = "";
if (isset($_SERVER["SERVER_PORT"])) {
$port = ($_SERVER["SERVER_PORT"] . "" != "80")? ":" . $_SERVER["SERVER_PORT"] : "";
} else {
if (defined("SERVER_PORT")) {
$port = (SERVER_PORT . "" != "80")? ":" . SERVER_PORT : "";
}
if (defined("SERVER_PORT")) {
$port = (SERVER_PORT . "" != "80")? ":" . SERVER_PORT : "";
}else{
$port = (isset($_SERVER['HTTP_HOST']) && strpos($_SERVER['HTTP_HOST'], ':') !== false) ? ':' . explode(':', $_SERVER['HTTP_HOST'])[1] : '';
}
$url = SERVER_NAME . $port . "/sys" . config("system.workspace") . "/" . SYS_LANG . "/classic/services/wsdl2";

2
workflow/engine/controllers/adminProxy.php
View File

@@ -1380,7 +1380,7 @@ class adminProxy extends HttpProxyController
$http = G::is_https() ? 'https' : 'http';
$lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$endpoint = sprintf(
'%s://%s/sys%s/%s/%s/oauth2/grant',

3
workflow/engine/methods/login/authentication.php
View File

@@ -308,6 +308,9 @@ try {
$_CSERVER = $_SERVER;
unset($_CSERVER['REQUEST_TIME']);
unset($_CSERVER['REMOTE_PORT']);
$host = '';
$port = 80;
if (!empty($_SERVER['HTTP_HOST'])) {
$hostParts = explode(':', $_SERVER['HTTP_HOST']);

2
workflow/engine/methods/oauth2/grant.php
View File

@@ -8,7 +8,7 @@ if (! empty($_GET['error'])) {
}
$http = G::is_https() ? 'https' : 'http';
$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, config("system.workspace"));
$code = empty($_GET['code']) ? 'NN' : $_GET['code'];

3
workflow/engine/methods/services/wsdl2.php
View File

@@ -4,9 +4,8 @@ $filewsdl = PATH_METHODS . 'services' . PATH_SEP . 'pmos2.wsdl';
$content = file_get_contents($filewsdl);
$http = G::is_https() ? 'https' : 'http';
$port = $_SERVER['SERVER_PORT'] === '80' ? '' : ':' . $_SERVER['SERVER_PORT'];
$lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$endpoint = $http . '://' . $_SERVER['SERVER_NAME'] . $port . '/sys' . config("system.workspace") . '/' . $lang . '/lurana/services/soap2';
$endpoint = $http . '://' . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . $lang . '/lurana/services/soap2';
$content = str_replace("___SOAP_ADDRESS___", $endpoint, $content);

2
workflow/engine/skinEngine/base/error404.php
View File

@@ -1,7 +1,7 @@
<?php
$http = G::is_https() ? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
$urlHome = $urlLogin;

2
workflow/engine/skinEngine/lurana/error404.php
View File

@@ -3,7 +3,7 @@
}
$http = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on")? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$urlLogin = $http . "://" . $host . "/sys/en/luranasoft/login/login";
$urlHome = $urlLogin;

2
workflow/engine/src/ProcessMaker/Core/Installer.php
View File

@@ -199,7 +199,7 @@ class Installer
$http = G::is_https() ? 'https' : 'http';
$lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] !== '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$workspace = $this->options['name'];
$endpoint = sprintf(

6
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1645,10 +1645,8 @@ class System
*/
public static function getServerPort()
{
$port = "";
if (isset($_SERVER['SERVER_PORT'])) {
$port = $_SERVER['SERVER_PORT'];
} else if (defined('SERVER_PORT')) {
$port = "80";
if (defined('SERVER_PORT')) {
$port = SERVER_PORT;
}
return $port;

4
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -148,7 +148,7 @@ class Server implements iAuthenticate
public function index()
{
$http = \G::is_https() ? 'https' : 'http';
$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$host = $http .'://'. $host;
$applicationsLink = sprintf('%s/%s/oauth2/apps', $host, config("system.workspace"));
@@ -184,7 +184,7 @@ class Server implements iAuthenticate
if (! isset($_SESSION['USER_LOGGED'])) {
$http = \G::is_https() ? 'https' : 'http';
$host = $http . '://' . $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$host = $http . '://' . $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
$redirect = urlencode('/'.self::$workspace.$_SERVER['REQUEST_URI']);
$loginLink = sprintf('%s/sys%s/%s/%s/login/login?u=%s', $host, config("system.workspace"), SYS_LANG, SYS_SKIN, $redirect);

2
workflow/engine/templates/setup/webServicesTree.php
View File

@@ -25,7 +25,7 @@ if (isset ($_GET ['x'])) {
}
}
$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
$defaultEndpoint = 'http://' . $_SERVER ['HTTP_HOST'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
$wsdl = isset ($_SESSION ['END_POINT']) ? $_SESSION ['END_POINT'] : $defaultEndpoint;