From aed9628c7867fc35e803bea4f2089f02294d1976 Mon Sep 17 00:00:00 2001 From: AlexanderKaschta Date: Fri, 14 Aug 2020 19:16:23 +0200 Subject: [PATCH 01/11] Creating a new development branch --- core/config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/config.php b/core/config.php index 172d793..27bce8d 100644 --- a/core/config.php +++ b/core/config.php @@ -17,3 +17,5 @@ //Beispiel für die E-Mail-Adresse des Administrators define("ADMINISTRATOR", "Hr. Mustermann"); +define("SCHULE", "Weidigschule"); + From 69d425fc65d0f20e97023d0ab4246dbc091cf21a Mon Sep 17 00:00:00 2001 From: AlexanderKaschta Date: Sat, 15 Aug 2020 20:47:12 +0200 Subject: [PATCH 02/11] Bugfix: Wrong redirect --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 30be445..053d01d 100644 --- a/index.php +++ b/index.php @@ -28,7 +28,7 @@
- +
From f2cc03732f72d3d29a1461df10939042ac0d8d2a Mon Sep 17 00:00:00 2001 From: AlexanderKaschta Date: Sun, 6 Sep 2020 20:51:17 +0200 Subject: [PATCH 03/11] =?UTF-8?q?-=20=C3=9Cberarbeitung=20des=20Footers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/Database.php | 2 +- core/config.php | 3 +++ core/include/.htaccess | 6 ++++++ core/include/footer.php | 13 +++++++++++++ main.php | 7 ++----- 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 core/include/.htaccess create mode 100644 core/include/footer.php diff --git a/core/Database.php b/core/Database.php index 7d355ec..f05a7b9 100644 --- a/core/Database.php +++ b/core/Database.php @@ -18,7 +18,7 @@ public function connect(){ } else{ $dsn = "mysql:host=".DB_HOST.";dbname=".DB_NAME.";charset=utf8"; try{ - $this->pdo = new PDO($dsn, DB_USER, DB_PASSWORT, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]); + $this->pdo = new PDO($dsn, DB_USER, DB_PASSWORT, [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_EMULATE_PREPARES => false]); $this->is_connected = true; return $this->pdo; }catch (PDOException $ex){ diff --git a/core/config.php b/core/config.php index 27bce8d..86a04c3 100644 --- a/core/config.php +++ b/core/config.php @@ -13,9 +13,12 @@ define("PROJECT_NAME", "WeidigWahl"); define("PROJECT_VERSION", "1.0.1"); +define("RELEASE_YEAR", 2019); //Beispiel für die E-Mail-Adresse des Administrators define("ADMINISTRATOR", "Hr. Mustermann"); define("SCHULE", "Weidigschule"); +define("HOSTER", "Weidigschule"); + diff --git a/core/include/.htaccess b/core/include/.htaccess new file mode 100644 index 0000000..09d10ec --- /dev/null +++ b/core/include/.htaccess @@ -0,0 +1,6 @@ +Options -Indexes + + + Order Allow,Deny + Deny from all + \ No newline at end of file diff --git a/core/include/footer.php b/core/include/footer.php new file mode 100644 index 0000000..e1aa7ee --- /dev/null +++ b/core/include/footer.php @@ -0,0 +1,13 @@ + + +
+
+

WeidigWahl | Ein Wahlsystem für die Weidigschule

+
+ © +
+
\ No newline at end of file diff --git a/main.php b/main.php index 4545597..321589a 100644 --- a/main.php +++ b/main.php @@ -225,11 +225,8 @@ -
-
-

WeidigWahl | Ein Wahlsystem für die Weidigschule

-
-
+ + From 72203624a15896e80225873ad34c2ce364222650 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 6 Sep 2020 21:56:34 +0200 Subject: [PATCH 04/11] Merged config file --- core/config.php | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/core/config.php b/core/config.php index 86a04c3..e41a3cf 100644 --- a/core/config.php +++ b/core/config.php @@ -5,20 +5,42 @@ * License: MIT License */ +// TECHNISCHE KONFIGURATION + +// Datenbank define("DB_HOST", "localhost"); define("DB_USER", "root"); define("DB_PASSWORT", ""); define("DB_NAME", "weidigwahl"); +// Versionsnummer +define("PROJECT_VERSION", "1.1.0"); + +// GitHub-Link +define("GITHUB_LINK", "https://www.github.com/AlexanderKaschta/WeidigWahl"); + +// ALLGEMEIN define("PROJECT_NAME", "WeidigWahl"); -define("PROJECT_VERSION", "1.0.1"); -define("RELEASE_YEAR", 2019); +// Name der Schule, die das System verwendet +define("SCHULE", "Weidigschule"); -//Beispiel für die E-Mail-Adresse des Administrators +// Verantortlicher Administrator an der Schule für die Nutzung des Systens define("ADMINISTRATOR", "Hr. Mustermann"); -define("SCHULE", "Weidigschule"); -define("HOSTER", "Weidigschule"); +// Jahr, in dem das System in Betrieb genommen wurde +define("RELEASE_YEAR", 2019); + +define("HOSTER", "Test"); + +// BENUTZEROBERFLÄCHE + +//Soll der Link zum GitHub-Repository in Footer angezeigt werden +define("SHOW_GITHUB", true); + + +//Soll das Impressum angezeigt werden +define("SHOW_IMPRINT", true); + From e82c72c631a854b190a54943a0018469e1d3a58d Mon Sep 17 00:00:00 2001 From: AlexanderKaschta Date: Sun, 6 Sep 2020 22:25:22 +0200 Subject: [PATCH 05/11] =?UTF-8?q?-=20=C3=9Cberarbeitung=20des=20Footers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/include/footer.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/core/include/footer.php b/core/include/footer.php index e1aa7ee..33defd5 100644 --- a/core/include/footer.php +++ b/core/include/footer.php @@ -1,13 +1,25 @@ \ No newline at end of file From 0ba764ba7d9d7bf9c84b0b04927ef0d41ad36396 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 6 Sep 2020 22:39:55 +0200 Subject: [PATCH 06/11] Finishing new footer --- core/config.php | 7 ++++++- core/include/footer.php | 46 +++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/core/config.php b/core/config.php index e41a3cf..90a42c4 100644 --- a/core/config.php +++ b/core/config.php @@ -31,6 +31,7 @@ // Jahr, in dem das System in Betrieb genommen wurde define("RELEASE_YEAR", 2019); +// Hoster der Seite define("HOSTER", "Test"); // BENUTZEROBERFLÄCHE @@ -38,9 +39,13 @@ //Soll der Link zum GitHub-Repository in Footer angezeigt werden define("SHOW_GITHUB", true); - //Soll das Impressum angezeigt werden define("SHOW_IMPRINT", true); +define("IMPRINT_LINK", ""); +define("SHOW_DSGVO", true); +define("DSGVO_LINK", ""); +define("SHOW_SCHOOL_LINK", true); +define("SCHOOL_LINK", ""); diff --git a/core/include/footer.php b/core/include/footer.php index 33defd5..f8ccd00 100644 --- a/core/include/footer.php +++ b/core/include/footer.php @@ -2,6 +2,27 @@ require_once("core/config.php"); $creation_year = RELEASE_YEAR; $current_year = date("Y"); + +$anzahl = 0; + +if (SHOW_GITHUB) { + $anzahl++; +} + +if (SHOW_IMPRINT) { + $anzahl++; +} + +if (SHOW_DSGVO) { + $anzahl++; +} + +if (SHOW_SCHOOL_LINK) { + $anzahl++; +} + +$width = 12 / $anzahl; + ?>
\ No newline at end of file From 75fca371c4198396bb8085439ecd2a61493b56ab Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 7 Sep 2020 00:44:06 +0200 Subject: [PATCH 07/11] - Added new parameter for the password length - Optimized footer --- core/.htaccess | 6 +++++- core/config.php | 7 ++++++- core/include/.htaccess | 7 ++++--- core/include/footer.php | 3 +-- core/parseStudentCSV.php | 6 +++++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/core/.htaccess b/core/.htaccess index 45552cb..1c7e001 100644 --- a/core/.htaccess +++ b/core/.htaccess @@ -1 +1,5 @@ -Options -Indexes \ No newline at end of file +Options -Indexes + + + Require all denied + \ No newline at end of file diff --git a/core/config.php b/core/config.php index 90a42c4..71aa77f 100644 --- a/core/config.php +++ b/core/config.php @@ -19,11 +19,16 @@ // GitHub-Link define("GITHUB_LINK", "https://www.github.com/AlexanderKaschta/WeidigWahl"); +// SICHERHEIT + +// Passwortlänge +define("PASSWORD_LENGTH", 8); + // ALLGEMEIN define("PROJECT_NAME", "WeidigWahl"); // Name der Schule, die das System verwendet -define("SCHULE", "Weidigschule"); +define("SCHOOL", "Weidigschule"); // Verantortlicher Administrator an der Schule für die Nutzung des Systens define("ADMINISTRATOR", "Hr. Mustermann"); diff --git a/core/include/.htaccess b/core/include/.htaccess index 09d10ec..9405fc0 100644 --- a/core/include/.htaccess +++ b/core/include/.htaccess @@ -1,6 +1,7 @@ Options -Indexes - - Order Allow,Deny - Deny from all +Require all denied + + + Require all granted \ No newline at end of file diff --git a/core/include/footer.php b/core/include/footer.php index f8ccd00..5e8ba50 100644 --- a/core/include/footer.php +++ b/core/include/footer.php @@ -27,8 +27,7 @@