From 4779e4ccbe150685112d59f979101e84cda52b2e Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Wed, 14 Jul 2021 16:36:13 +0900
Subject: [PATCH] Bug fixes for PSR-12 update

---
 www/configs/config.db.php                 | 2 +-
 www/configs/config.other.php              | 2 +-
 www/configs/config.path.php               | 2 +-
 www/lib/CoreLibs/ACL/Login.php            | 4 ++--
 www/lib/CoreLibs/Output/Form/Generate.php | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/configs/config.db.php b/www/configs/config.db.php
index 012c1195..3df05e29 100755
--- a/www/configs/config.db.php
+++ b/www/configs/config.db.php
@@ -22,7 +22,7 @@ $DB_CONFIG = [
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
 		'db_ssl' => 'disable' // allow, disable, require, prefer
-	]
+	],
 ];
 
 // __END__
diff --git a/www/configs/config.other.php b/www/configs/config.other.php
index dcd63680..3626b48a 100755
--- a/www/configs/config.other.php
+++ b/www/configs/config.other.php
@@ -17,7 +17,7 @@ declare(strict_types=1);
 $paths = [
 	'/bin',
 	'/usr/bin',
-	'/usr/local/bin'
+	'/usr/local/bin',
 ];
 // find convert
 foreach ($paths as $path) {
diff --git a/www/configs/config.path.php b/www/configs/config.path.php
index 82740f4e..34abe19e 100755
--- a/www/configs/config.path.php
+++ b/www/configs/config.path.php
@@ -18,7 +18,7 @@ declare(strict_types=1);
 		'csv_path' => '',
 		'perl_bin' => '',
 		'other_url' => '',
-	]
+	],
 ];*/
 
 // __END__
diff --git a/www/lib/CoreLibs/ACL/Login.php b/www/lib/CoreLibs/ACL/Login.php
index 55b89785..0516a2b5 100644
--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -370,7 +370,7 @@ class Login extends \CoreLibs\DB\IO
 					. "eareu.level AS user_level, eareu.type AS user_type, "
 					. "eareg.level AS group_level, eareg.type AS group_type, "
 					. "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, "
-					. "firstheader_color AS first_header_color, "
+					. "first.header_color AS first_header_color, "
 					. "second.header_color AS second_header_color, second.template "
 					. "FROM edit_user eu "
 					. "LEFT JOIN edit_scheme second ON "
@@ -380,7 +380,7 @@ class Login extends \CoreLibs\DB\IO
 					. "edit_access_right eareg, "
 					. "edit_scheme first "
 					. "WHERE first.edit_scheme_id = eg.edit_scheme_id "
-					. "AND eu.edit_group_id = egedit_group_id "
+					. "AND eu.edit_group_id = eg.edit_group_id "
 					. "AND eu.edit_language_id = el.edit_language_id AND "
 					. "eu.edit_access_right_id = eareu.edit_access_right_id AND "
 					. "eg.edit_access_right_id = eareg.edit_access_right_id AND "
diff --git a/www/lib/CoreLibs/Output/Form/Generate.php b/www/lib/CoreLibs/Output/Form/Generate.php
index b50d849f..f7245ffa 100644
--- a/www/lib/CoreLibs/Output/Form/Generate.php
+++ b/www/lib/CoreLibs/Output/Form/Generate.php
@@ -291,14 +291,14 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			// then check general global folder
 			if (
 				is_dir(TABLE_ARRAYS) &&
-				is_file(TABLE_ARRAYS . 'array_' . $this->my_page_name . ' . php')
+				is_file(TABLE_ARRAYS . 'array_' . $this->my_page_name . '.php')
 			) {
-				include(TABLE_ARRAYS . 'array_' . $this->my_page_name . ' . php');
+				include(TABLE_ARRAYS . 'array_' . $this->my_page_name . '.php');
 			} elseif (
 				is_dir(BASE . INCLUDES . TABLE_ARRAYS) &&
-				is_file(BASE . INCLUDES . TABLE_ARRAYS . 'array_' . $this->my_page_name . ' . php')
+				is_file(BASE . INCLUDES . TABLE_ARRAYS . 'array_' . $this->my_page_name . '.php')
 			) {
-				include(BASE . INCLUDES . TABLE_ARRAYS . 'array_' . $this->my_page_name . ' . php');
+				include(BASE . INCLUDES . TABLE_ARRAYS . 'array_' . $this->my_page_name . '.php');
 			}
 			// in the include file there must be a variable with the page name matching
 			if (isset(${$this->my_page_name}) && is_array(${$this->my_page_name})) {