From f3f0c61325b014cb8977fcc20b64c336c8fb3d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kov=C3=A1ts=20Levente?= <tovask59@gmail.com>
Date: Tue, 19 Jan 2021 08:50:47 +0100
Subject: [PATCH 1/3] =?UTF-8?q?submodul=20friss=C3=ADt=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wwwdata | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wwwdata b/wwwdata
index d2f1075..22a9491 160000
--- a/wwwdata
+++ b/wwwdata
@@ -1 +1 @@
-Subproject commit d2f10756019c038035112f1b5bf56ec566a5add5
+Subproject commit 22a949120115b80be7423d0f0e4b2e59bcf8fff3

From f60ce36393ecda938d51701c28507cfee5c1b19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kov=C3=A1ts=20Levente?= <tovask59@gmail.com>
Date: Tue, 19 Jan 2021 12:29:49 +0100
Subject: [PATCH 2/3] =?UTF-8?q?adatb=C3=A1zis=20inicializ=C3=A1l=C3=A1s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile        |  1 +
 database_init.php | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 entrypoint.sh     |  2 ++
 3 files changed, 57 insertions(+)
 create mode 100644 database_init.php

diff --git a/Dockerfile b/Dockerfile
index 66b4df2..22e8baa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,7 @@ COPY ./wwwdata/*.css /var/www/html/
 COPY ./wwwdata/media /var/www/html/media/
 COPY ./php.ini /etc/php/7.4/apache2/
 COPY ./config/apache2 /etc/apache2
+COPY ./database_init.php /database_init.php
 
 # let through ports for webserver and xdebug access
 EXPOSE 80
diff --git a/database_init.php b/database_init.php
new file mode 100644
index 0000000..d1aa3e7
--- /dev/null
+++ b/database_init.php
@@ -0,0 +1,54 @@
+<?php
+include_once "globals.php";
+
+// csatlakozás az adatbázis szervezhez,
+// a konkrét adatbázist még nem adjuk meg, mert lehet még nem létezik
+$dbconn = mysqli_connect(SQL_IP, SQL_USER, SQL_PASS);
+
+$create_database_query = 'CREATE DATABASE IF NOT EXISTS ' . SQL_DB . ';';
+$use_database_query = 'USE ' . SQL_DB . ';';
+if (mysqli_query($dbconn, $create_database_query) && mysqli_query($dbconn, $use_database_query)) {
+    echo "Adatbázis létrehozva." . PHP_EOL;
+} else {
+    echo "Hiba az adatbázis létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
+}
+
+$create_tables_queries = "
+/*DROP TABLE IF EXISTS `publish_table`;/**/
+CREATE TABLE IF NOT EXISTS `publish_table` (
+  `No` int NOT NULL AUTO_INCREMENT,
+  `Author` varchar(45) NOT NULL,
+  `Title` varchar(45) NOT NULL,
+  `Description` text,
+  `Image_FileName` varchar(45) NOT NULL,
+  `AspectRatio` float NOT NULL DEFAULT '1',
+  `ColorMean` varchar(32) NOT NULL DEFAULT 'cadetblue',
+  `Approved` tinyint NOT NULL DEFAULT '1',
+  `UID` varchar(32) NOT NULL,
+  `TS` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`No`),
+  UNIQUE KEY `UID_UNIQUE` (`UID`)
+) /*ENGINE=InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci*/ ;
+
+/*DROP TABLE IF EXISTS `server_access`;/**/
+CREATE TABLE IF NOT EXISTS `server_access` (
+  `No` INT NOT NULL AUTO_INCREMENT,
+  `IP` VARCHAR(45) NOT NULL,
+  `Image_FileName` VARCHAR(45) NULL,
+  `Timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`No`)
+);
+";
+mysqli_multi_query($dbconn, $create_tables_queries);
+
+// flush results
+while (mysqli_more_results($dbconn) && mysqli_next_result($dbconn)) {;}
+
+// check errors
+if (mysqli_errno($dbconn)) {
+    echo "Hiba a táblák létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
+} else {
+    echo "Táblák létrehozva." . PHP_EOL;
+}
+
+mysqli_close($dbconn);
diff --git a/entrypoint.sh b/entrypoint.sh
index 85ae075..a48b07b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,6 +16,8 @@ chown -R www-data:www-data ARTWORKS
 # substitute server name
 sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
 
+# initialize database
+cat /database_init.php | php -d display_errors=on -d error_reporting=-1
 
 # start webserver
 /usr/sbin/apache2ctl -D FOREGROUND

From 57ee0ff8a59fec765375723fe6b3c1a499466b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiesner=20Andr=C3=A1s?= <wabe@t-email.hu>
Date: Wed, 20 Jan 2021 21:06:18 +0100
Subject: [PATCH 3/3] merge

---
 wwwdata | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wwwdata b/wwwdata
index 22a9491..87463e3 160000
--- a/wwwdata
+++ b/wwwdata
@@ -1 +1 @@
-Subproject commit 22a949120115b80be7423d0f0e4b2e59bcf8fff3
+Subproject commit 87463e3a90a03a8832ef2609c82001274704c1cf