Merge branch 'NewFeatures' into phpstan-strict

2024-10-18 09:16:05 +09:00
parent da0d939068 9d131cf6dd
commit 4b4e655374
3459 changed files with 22055 additions and 423696 deletions
--- 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' => 'allow', // allow, disable, require, prefer
-		'db_debug' => true, // turn on logging or not
+		// 'db_convert_type' => ['json'] // on, json, numeric, bytea
 	],
 	// same as above, but uses pg bouncer
 	'test_pgbouncer' => [
@@ -35,7 +35,6 @@ $DB_CONFIG = [
 		'db_type' => 'pgsql',
 		'db_encoding' => '',
 		'db_ssl' => 'allow', // allow, disable, require, prefer
-		'db_debug' => true, // turn on logging or not
 	],
 ];

--- a/www/configs/config.host.php
+++ b/www/configs/config.host.php
@@ -24,35 +24,29 @@ declare(strict_types=1);
 // ];

 $__LOCAL_CONFIG = [
+	// db config selection
 	'db_host' => 'test',
+	// other db connections
+	// 'db_host_target' => '',
+	// 'db_host_other' => '',
+	// location flagging (test/dev/live) for debug output
 	'location' => 'test',
-	'debug_flag' => true,
+	// show DEBUG override
+	'debug_level' => 'debug',
+	// site locale
 	'site_locale' => 'en_US.UTF-8',
+	// site encoding
 	'site_encoding' => 'UTF-8',
+	// enable/disable login override
 	'login_enabled' => true
 ];

 // each host has a different db_host
 $SITE_CONFIG = [
 	// development host
-	'soba.tokyo.tequila.jp' => [
-		// db config selection
-		'db_host' => 'test',
-		// other db connections
-		// 'db_host_target' => '',
-		// 'db_host_other' => '',
-		// location flagging (test/dev/live) for debug output
-		'location' => 'test',
-		// show DEBUG override
-		'debug_flag' => true,
-		// site locale
-		'site_locale' => 'en_US.UTF-8',
-		// site encoding
-		'site_encoding' => 'UTF-8',
-		// enable/disable login override
-		'login_enabled' => true
-	],
+	'soba.tokyo.tequila.jp' => $__LOCAL_CONFIG,
 	// 'other.host.com' => $__LOCAL_CONFIG
+	'soba.egplusww.jp' => $__LOCAL_CONFIG,
 	'soba-dev.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.tequila.jp' => $__LOCAL_CONFIG,
 	'soba.teq.jp' => $__LOCAL_CONFIG,
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -100,27 +100,6 @@ define('DEFAULT_ACL_LEVEL', 80);
 /************* LOGOUT ********************/
 // logout target
 define('LOGOUT_TARGET', '');
-// password change allowed
-define('PASSWORD_CHANGE', false);
-define('PASSWORD_FORGOT', false);
-// min/max password length
-define('PASSWORD_MIN_LENGTH', 9);
-define('PASSWORD_MAX_LENGTH', 255);
-// defines allowed special characters
-define('PASSWORD_SPECIAL_RANGE', '@$!%*?&');
-// password must have upper case, lower case, number, special
-// comment out for not mandatory
-define('PASSWORD_LOWER', '(?=.*[a-z])');
-define('PASSWORD_UPPER', '(?=.*[A-Z])');
-define('PASSWORD_NUMBER', '(?=.*\d)');
-define('PASSWORD_SPECIAL', "(?=.*[" . PASSWORD_SPECIAL_RANGE . "])");
-// define full regex
-define('PASSWORD_REGEX', "/^"
-	. (defined('PASSWORD_LOWER') ? PASSWORD_LOWER : '')
-	. (defined('PASSWORD_UPPER') ? PASSWORD_UPPER : '')
-	. (defined('PASSWORD_NUMBER') ? PASSWORD_NUMBER : '')
-	. (defined('PASSWORD_SPECIAL') ? PASSWORD_SPECIAL : '')
-	. "[A-Za-z\d" . PASSWORD_SPECIAL_RANGE . "]{" . PASSWORD_MIN_LENGTH . "," . PASSWORD_MAX_LENGTH . "}$/");

 /************* AJAX / ACCESS *************/
 // ajax request type
@@ -161,13 +140,6 @@ define('DEFAULT_LOCALE', 'en_US.UTF-8');
 // default web page encoding setting
 define('DEFAULT_ENCODING', 'UTF-8');

-/************* LOGGING *******************/
-// below two can be defined here, but they should be
-// defined in either the header file or the file itself
-// as $LOG_FILE_ID which takes presence over LOG_FILE_ID
-// see Basic class constructor
-define('LOG_FILE_ID', BASE_NAME);
-
 /************* QUEUE TABLE *************/
 // if we have a dev/live system
 // set_live is a per page/per item
@@ -206,7 +178,7 @@ if (file_exists(BASE . CONFIGS . 'config.path.php')) {
 // live frontend pages
 // ** missing live domains **
 // get the name without the port
-list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
+[$HOST_NAME] = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
 // set HOST name
 define('HOST_NAME', $HOST_NAME);
 // BAIL ON MISSING MASTER SITE CONFIG
@@ -252,7 +224,17 @@ if ($is_secure) {
 }
 // define the db config set name, the db config and the db schema
 define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host'] ?? '');
-define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? []);
+define('DB_CONFIG', $DB_CONFIG[DB_CONFIG_NAME] ?? [
+	'db_name' => '',
+	'db_user' => '',
+	'db_pass' => '',
+	'db_host' => '',
+	'db_port' => 5432,
+	'db_schema' => '',
+	'db_encoding' => '',
+	'db_type' => '',
+	'db_ssl' => ''
+]);
 // because we can't change constant, but we want to for db debug flag
 $GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
 // define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
@@ -264,8 +246,9 @@ $GLOBALS['DB_CONFIG_SET'] = DB_CONFIG;
 // define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA);
 // debug settings, site lang, etc
 define('TARGET', $SITE_CONFIG[HOST_NAME]['location'] ?? 'test');
-define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag'] ?? false);
+define('DEBUG_LEVEL', $SITE_CONFIG[HOST_NAME]['debug_level'] ?? 'debug');
 define('SITE_LOCALE', $SITE_CONFIG[HOST_NAME]['site_locale'] ?? DEFAULT_LOCALE);
+define('SITE_DOMAIN', str_replace(DIRECTORY_SEPARATOR, '', CONTENT_PATH));
 define('SITE_ENCODING', $SITE_CONFIG[HOST_NAME]['site_encoding'] ?? DEFAULT_ENCODING);
 define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled'] ?? false);
 define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
@@ -274,9 +257,6 @@ define('AUTH', $SITE_CONFIG[HOST_NAME]['auth'] ?? false);
 // define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin'] ?? '');
 // define('REDIRECT_URL', $PATHS[TARGET]['redirect_url'] ?? '');

-// show all errors if debug_all & show_error_handling are enabled
-define('SHOW_ALL_ERRORS', true);
-
 /************* GENERAL PAGE TITLE ********/
 define('G_TITLE', $_ENV['G_TITLE'] ?? '');

@@ -293,22 +273,4 @@ if (file_exists(BASE . CONFIGS . 'config.other.php')) {
 	require BASE . CONFIGS . 'config.other.php';
 }

-/************* DEBUG *******************/
-// turn off debug if debug flag is OFF
-if (defined('DEBUG') && DEBUG == false) {
-	$ECHO_ALL = false;
-	$DEBUG_ALL = false;
-	$PRINT_ALL = false;
-	$DB_DEBUG = false;
-	$ENABLE_ERROR_HANDLING = false;
-	$DEBUG_ALL_OVERRIDE = false;
-} else {
-	$ECHO_ALL = false;
-	$DEBUG_ALL = true;
-	$PRINT_ALL = true;
-	$DB_DEBUG = true;
-	$ENABLE_ERROR_HANDLING = false;
-	$DEBUG_ALL_OVERRIDE = false;
-}
-
 // __END__
--- a/www/configs/config.other.php
+++ b/www/configs/config.other.php
@@ -10,6 +10,9 @@

 declare(strict_types=1);

+// style sheet for the edit base interface
+define('EDIT_BASE_STYLESHEET', 'edit.css');
+
 // define('SOME_ID', <SOME VALUE>);

 /************* CONVERT *******************/
--- a/www/configs/config.path.php
+++ b/www/configs/config.path.php
@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore PSR1.Files.SideEffects

 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -11,6 +11,20 @@

 declare(strict_types=1);

+// find trigger name "admin/" or "frontend/" in the getcwd() folder
+$folder = '';
+foreach (['admin', 'frontend'] as $_folder) {
+	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $_folder)) {
+		$folder = $_folder;
+		break;
+	}
+}
+// if content path is empty, fallback is default
+if (empty($folder)) {
+	$folder = 'default';
+}
+define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);
+
 // File and Folder paths
 // ID is TARGET (first array element)
 /*$PATHS = [
--- a/www/configs/config.php
+++ b/www/configs/config.php
@@ -1,4 +1,4 @@
-<?php // phpcs:ignore warning
+<?php // phpcs:ignore PSR1.Files.SideEffects

 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
@@ -50,7 +50,7 @@ for (
 		is_file($__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php')
 	) {
 		// load enviorment file if it exists
-		\CoreLibs\Get\DotEnv::readEnvFile(
+		\gullevek\dotEnv\DotEnv::readEnvFile(
 			$__DIR__PATH . $CONFIG_PATH_PREFIX . CONFIG_PATH
 		);
 		// load master config file that loads all other config files
@@ -62,16 +62,5 @@ for (
 if (!defined('DIR')) {
 	exit('Base config could not be loaded');
 }
-// find trigger name "admin/" or "frontend/" in the getcwd() folder
-foreach (['admin', 'frontend'] as $folder) {
-	if (strstr(getcwd() ?: '', DIRECTORY_SEPARATOR . $folder)) {
-		break;
-	}
-}
-// if content path is empty, fallback is default
-if (empty($folder)) {
-	$folder = 'default';
-}
-define('CONTENT_PATH', $folder . DIRECTORY_SEPARATOR);

 // __END__