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
docker-compose.yml
+1 -1
View File
@@ -5,6 +5,7 @@ services:
restart: "unless-stopped" restart: "unless-stopped"
environment: environment:
TYPE: "docker" TYPE: "docker"
BASE_URL: "https://mydomain.com"
DATABASE_HOST: "php-dynamic-qrcode-db" DATABASE_HOST: "php-dynamic-qrcode-db"
DATABASE_PORT: "3306" DATABASE_PORT: "3306"
DATABASE_NAME: "qrcode" DATABASE_NAME: "qrcode"
@@ -17,7 +18,6 @@ services:
depends_on: depends_on:
- php-dynamic-qrcode-db - php-dynamic-qrcode-db
volumes: volumes:
- php_dynamic_qrcode_config_data:/var/www/html/config
- php_dynamic_qrcode_saved_qrcode_data:/var/www/html/saved_qrcode - php_dynamic_qrcode_saved_qrcode_data:/var/www/html/saved_qrcode
networks: networks:
- php-dynamic-qrcode-network - php-dynamic-qrcode-network
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_PASSWORD', Getenv('DATABASE_PASSWORD'));
define('DATABASE_PREFIX', Getenv('DATABASE_PREFIX')); // This must have a trailing underscore. Example: qr_ define('DATABASE_PREFIX', Getenv('DATABASE_PREFIX')); // This must have a trailing underscore. Example: qr_
define('DATABASE_CHARSET', Getenv('DATABASE_CHARSET')); define('DATABASE_CHARSET', Getenv('DATABASE_CHARSET'));
define('TYPE', Getenv('TYPE'));
define('BASE_URL', Getenv('BASE_URL'));
} else { } else {
define('DATABASE_HOST', "localhost"); define('DATABASE_HOST', "localhost");
define('DATABASE_PORT', "3306"); 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; return $html;
} }
function base_url(){ function base_url() {
return sprintf( require_once(__DIR__ . '/../config/environment.php');
"%s://%s:%s", if (defined('BASE_URL') && BASE_URL !== null) {
isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http', return BASE_URL;
$_SERVER['SERVER_NAME'], } else {
$_SERVER['SERVER_PORT'] return sprintf(
); "%s://%s:%s",
isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http',
$_SERVER['SERVER_NAME'],
$_SERVER['SERVER_PORT']
);
}
} }