From 466911a5c6136ce78324d75fa9de21f34773b94c Mon Sep 17 00:00:00 2001
From: marko <marko@arvi>
Date: Mon, 22 Jul 2024 05:37:58 +0200
Subject: [PATCH] WIP: first error free login

---
 .../cwsvJudo/participo/cwsvjudo@bplaced/www/index.php    | 2 +-
 .../cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php    | 2 +-
 .../cwsvjudo@bplaced/www/participo/config/.htaccess      | 3 +++
 .../cwsvjudo@bplaced/www/participo/index.inc.php         | 6 +++---
 .../participo/cwsvjudo@bplaced/www/participo/lib/db.php  | 2 +-
 .../www/participo/lib/participoLib/dbConnector.php       | 2 +-
 .../www/participo/lib/participoLib/event.php             | 3 ++-
 .../www/participo/lib/participoLib/user.php              | 4 ++--
 .../participo/cwsvjudo@bplaced/www/participo/login.php   | 3 ++-
 .../cwsvJudo/participo/cwsvjudo@bplaced/www/phpinfo.php  | 2 ++
 homepage/cwsvJudo/participo/docker-compose.yml           | 6 +++---
 homepage/cwsvJudo/participo/nginx.conf                   | 9 +++++++++
 12 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/config/.htaccess
 create mode 100644 homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/phpinfo.php

diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/index.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/index.php
index b866157..ecf82be 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/index.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/index.php
@@ -1,2 +1,2 @@
 <?
-phpinfo();
\ No newline at end of file
+echo __DIR__;
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php
index acf85fa..5b224c7 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/mysql.php
@@ -12,4 +12,4 @@ $query = $pdo->query('SHOW VARIABLES like "version"');
 
 $row = $query->fetch();
 
-echo 'MYSQL version: '. $row['Value'];
\ No newline at end of file
+echo 'MYSQL version: '. $row['Value'];
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/config/.htaccess b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/config/.htaccess
new file mode 100644
index 0000000..2a42bfb
--- /dev/null
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/config/.htaccess
@@ -0,0 +1,3 @@
+order deny,allow
+deny from all
+allow from localhost
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/index.inc.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/index.inc.php
index d9ca1cc..ae7ff88 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/index.inc.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/index.inc.php
@@ -10,20 +10,20 @@ require_once 'local/cwsvJudo.php';
 
 // legacy lib usage
 // @todo remove unused libraries
-// require_once 'db.php'; // should be replaced
+require_once 'db.php'; // should be replaced
 // require_once 'api.php'; // should be replaced
 
 // libraries
 require_once 'participoLib/participo.php';
 require_once 'participoLib/planer.php';
 require_once 'participoLib/apiKey.php';
+
 // require_once 'phpcount/phpcount.php';
 
 // Add page hit
 // PHPCount::AddHit('participo');
 
 // init the db connector
-// var_dump($cwsvJudoConfig);
 dbConnector::connect(
 	$cwsvJudoConfig['db']['host'],
 	$cwsvJudoConfig['db']['name'],
@@ -31,7 +31,7 @@ dbConnector::connect(
 	$cwsvJudoConfig['db']['password']
 );
 
-// authentication of the current user 
+// authentication of the current user
 participo::authentificate();
 
 // load the userData
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/db.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/db.php
index c0957b3..7038356 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/db.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/db.php
@@ -68,7 +68,7 @@ if( empty($someOptions['dontFetch' ]) ) $someOptions['dontFetch' ] = false;
 			array_walk(
 				$entry,
 				function (&$value, $key, $someOptions) {
-					$value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value);
+					$value = isset($value) ? iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value) : $value;
 				},
 				$someOptions
 			);
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/dbConnector.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/dbConnector.php
index 1af8c20..24c65bc 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/dbConnector.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/dbConnector.php
@@ -86,7 +86,7 @@ class dbConnector
 				array_walk(
 					$entry,
 					function (&$value, $key, $someOptions) {
-						$value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value);
+						$value = isset($value) ? iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value) : $value;
 					},
 					$someOptions
 				);
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/event.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/event.php
index c37e5cf..79a51ba 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/event.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/event.php
@@ -311,7 +311,8 @@ class Event
 
 	public static function fromDbArray($member)
 	{
-		$shiai = json_decode($member['bemerkungen'], true);
+
+		$shiai = isset($member["bemerkungen"]) ? json_decode($member['bemerkungen'], true) : null;
 
 		return new event(
 			$member['id'] ?? null,
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/user.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/user.php
index a5476f0..e5b835e 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/user.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/lib/participoLib/user.php
@@ -284,8 +284,8 @@ class User
 			$member[$columnMappings['vorname']] ?? null,
 			$member[$columnMappings['gebDatum']] ?? null,
 			array_key_exists($columnMappings['eMail'], $member) ? explode(',', $member['eMail']) : null,
-			array_key_exists($columnMappings['config'], $member) ? json_decode($member['config']) : null,
-			array_key_exists($columnMappings['pwHash'], $member) ? $member['pwHash'] : null
+			array_key_exists($columnMappings['config'], $member) && isset($member[$columnMappings['config']]) ? json_decode($member[$columnMappings['config']]) : null,
+			array_key_exists($columnMappings['pwHash'], $member) ? $member[$columnMappings['pwHash']] : null
 		);
 	}
 
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php
index 9b7d463..436fc4b 100644
--- a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/participo/login.php
@@ -7,7 +7,8 @@ require_once 'participoLib/apiKey.php';
 require_once './local/dbConf.php';
 
 require_once $config['basePath'] . '/config/cwsvJudo.config.php';
-dbConnector::connect(
+
+$dbConnection = dbConnector::connect(
 	$cwsvJudoConfig['db']['host'],
 	$cwsvJudoConfig['db']['name'],
 	$cwsvJudoConfig['db']['user'],
diff --git a/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/phpinfo.php b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/phpinfo.php
new file mode 100644
index 0000000..b866157
--- /dev/null
+++ b/homepage/cwsvJudo/participo/cwsvjudo@bplaced/www/phpinfo.php
@@ -0,0 +1,2 @@
+<?
+phpinfo();
\ No newline at end of file
diff --git a/homepage/cwsvJudo/participo/docker-compose.yml b/homepage/cwsvJudo/participo/docker-compose.yml
index b251610..66695eb 100644
--- a/homepage/cwsvJudo/participo/docker-compose.yml
+++ b/homepage/cwsvJudo/participo/docker-compose.yml
@@ -36,6 +36,7 @@ services:
     # define environment variables
     # @todo Should credentials be placed here? Even if it is just a test environment
     environment:
+      # MYSQL_TCP_PORT: 1433
       MYSQL_USER: 'cwsvjudo'
       MYSQL_DATABASE: 'cwsvjudo'
       MYSQL_ROOT_PASSWORD_FILE: /run/secrets/db_root_password
@@ -43,7 +44,7 @@ services:
     volumes:
       - mysqldata:/var/lib/mysql
       # initial database
-      # - has to be created first, e.g., by dumping the database from the prooductive system
+      # - has to be created first, e.g., by dumping the database from the productive system
       - ./cwsvjudo.sql:/docker-entrypoint-initdb.d/cwsvjudo.sql
 
     secrets:
@@ -60,8 +61,7 @@ services:
     environment:
       # name of the host is the name of the db service started above! Why? I don't know!
       - PMA_HOST=database
-      - PMA_PORT=3306 
-      # - PMA_ARBITRARY=1
+      - PMA_PORT=1433
 volumes:
   # data storage for the db
   mysqldata: {}
diff --git a/homepage/cwsvJudo/participo/nginx.conf b/homepage/cwsvJudo/participo/nginx.conf
index e8dbdd0..62c9125 100644
--- a/homepage/cwsvJudo/participo/nginx.conf
+++ b/homepage/cwsvJudo/participo/nginx.conf
@@ -5,6 +5,15 @@ server {
 
     index index.php index.html index.htm;
 
+    location / {
+        # rewrite rules
+        # - add php to requested filename if it exists
+        if (-e $request_filename.php) {
+           rewrite ^/(.*)$ /$1.php last;
+           break;
+         }
+    }
+
     location ~ \.php$ {
         fastcgi_pass php:9000;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;