Ensembia/QRForge-selfhosted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix redirect url with docker installation

Browse Source
This commit is contained in:
Giandonato Inverso
2023-10-17 23:24:34 +02:00
committed by giandonato.inverso@edempg.it
parent c9fa6abf06
commit b52a61ca40
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/environment.php
+2
View File
@@ -13,6 +13,8 @@ if(is_string(Getenv('TYPE')) && Getenv('TYPE') == "docker") {
define('DATABASE_PASSWORD', Getenv('DATABASE_PASSWORD'));
define('DATABASE_PREFIX', Getenv('DATABASE_PREFIX')); // This must have a trailing underscore. Example: qr_
define('DATABASE_CHARSET', Getenv('DATABASE_CHARSET'));
define('TYPE', Getenv('TYPE'));
define('BASE_URL', Getenv('BASE_URL'));
} else {
define('DATABASE_HOST', "localhost");
define('DATABASE_PORT', "3306");
src/helpers/helpers.php
+12 -7
View File
@@ -117,11 +117,16 @@ function paginationLinks($current_page, $total_pages, $base_url) {
return $html;
}
function base_url(){
return sprintf(
"%s://%s:%s",
isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http',
$_SERVER['SERVER_NAME'],
$_SERVER['SERVER_PORT']
);
function base_url() {
require_once(__DIR__ . '/../config/environment.php');
if (defined('BASE_URL') && BASE_URL !== null) {
return BASE_URL;
} else {
return sprintf(
"%s://%s:%s",
isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http',
$_SERVER['SERVER_NAME'],
$_SERVER['SERVER_PORT']
);
}
}