From fef45c401ad0fd582e7e0b3ba269563a007c3ecb Mon Sep 17 00:00:00 2001
From: Giandonato Inverso <70962472+giandonatoinverso@users.noreply.github.com>
Date: Sun, 28 Aug 2022 11:24:32 +0200
Subject: [PATCH] configuration file modification, docker environment variable
 support

---
 docker/docker-compose.yml     | 17 ++++++++++-------
 qrcode/config/config.php      | 35 +++++++++++++++++++++++++++++++++++
 qrcode/config/environment.php | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100755 qrcode/config/config.php
 create mode 100644 qrcode/config/environment.php

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ebfa217..a9c1932 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -15,13 +15,16 @@ services:
     ports:
       - "8080:80"
     user: "${PUID}:${PGID}"
-    #environment:
-      #ADMIN_USER: "superadmin" # not supported yet please see road map
-      #ADMIN_PASSWORD: "superadmin" # not supported yet please see road map
-      #DATABASE_HOST: "mariadb" # not supported yet please see road map
-      #DATABASE_NAME: "qrcode" # not supported yet please see road map
-      #DATABASE_USER: "qrcode" # not supported yet please see road map
-      #DATABASE_PASSWORD: "changeme" # not supported yet please see road map
+    environment:
+      ADMIN_USER: "superadmin"
+      ADMIN_PASSWORD: "superadmin"
+      DATABASE_HOST: "mariadb"
+      DATABASE_PORT: "3306"
+      DATABASE_NAME: "qrcode"
+      DATABASE_USER: "qrcode"
+      DATABASE_PASSWORD: "changeme"
+      DATABASE_PREFIX: ""
+      DATABASE_CHARSET: "utf8"
     volumes:
       - ./data/app/config:/var/www/html/config
       - ./data/app/saved_qrcode:/var/www/html/saved_qrcode
diff --git a/qrcode/config/config.php b/qrcode/config/config.php
new file mode 100755
index 0000000..cea86f7
--- /dev/null
+++ b/qrcode/config/config.php
@@ -0,0 +1,35 @@
+<?php
+
+require_once ('environment.php');
+
+//Note: This file should be included first in every php page.
+error_reporting(E_ALL);
+ini_set('display_errors', 'On');
+define('BASE_PATH', dirname(dirname(__FILE__)));
+define('APP_FOLDER', 'simpleadmin');
+define('CURRENT_PAGE', basename($_SERVER['REQUEST_URI']));
+
+/* PATH OF SAVED QR CODES */
+define('PATH', './saved_qrcode/');                              //You can change the folder where the qr code will be saved
+define('DIRECTORY', BASE_PATH.'/saved_qrcode/');
+
+//You can change the page name for the redirect and the search parameter (the default is "id")
+define('READ_PATH', $_SERVER['HTTP_HOST'].'/read.php?id=');     
+
+require_once BASE_PATH . '/lib/MysqliDb/MysqliDb.php';
+require_once BASE_PATH . '/helpers/helpers.php';
+
+
+/**
+ * Get instance of DB object
+ */
+function getDbInstance() {
+    return new MysqliDb (Array (
+        'host' => DATABASE_HOST,
+        'username' => DATABASE_USER,
+        'password' => DATABASE_PASSWORD,
+        'db'=> DATABASE_NAME,
+        'port' => DATABASE_PORT,
+        'prefix' => DATABASE_PREFIX,
+        'charset' => DATABASE_CHARSET));
+}
diff --git a/qrcode/config/environment.php b/qrcode/config/environment.php
new file mode 100644
index 0000000..4dcf888
--- /dev/null
+++ b/qrcode/config/environment.php
@@ -0,0 +1,32 @@
+<?php
+/*
+|--------------------------------------------------------------------------
+| DOCKER INSTALLATION
+|--------------------------------------------------------------------------
+ */
+$docker_cid = getenv('DOCKER_CID');
+
+if(is_string($docker_cid)) {
+    define('DATABASE_HOST', Getenv('DATABASE_HOST'));
+    define('DATABASE_PORT', filter_var(Getenv('DATABASE_PORT'), FILTER_VALIDATE_INT));
+    define('DATABASE_NAME', Getenv('DATABASE_NAME'));
+    define('DATABASE_USER', Getenv('DATABASE_USER'));
+    define('DATABASE_PASSWORD', Getenv('DATABASE_PASSWORD'));
+    define('DATABASE_PREFIX', Getenv('DATABASE_PREFIX'));
+    define('DATABASE_CHARSET', Getenv('DATABASE_CHARSET'));
+} else {
+    define('DATABASE_HOST', "localhost");
+    define('DATABASE_PORT', "3306");
+    define('DATABASE_NAME', "qrcode");
+    define('DATABASE_USER', "root");
+    define('DATABASE_PASSWORD', "root");
+    define('DATABASE_PREFIX', "");
+    define('DATABASE_CHARSET', "utf8");
+}
+/*
+|--------------------------------------------------------------------------
+| INSTALLATION WITHOUT CONTAINER
+|--------------------------------------------------------------------------
+ */
+
+?>
\ No newline at end of file