Remove not needed ?? '' in ACL\Login

missed two table arrays as class EditVisibleGroup and EditAccess

also fix wrong name for EditSchemas (wrong: EditSchemes) with a shim
lookup.

edit_schemes.php file will stay the same for now.

4dev/update/20230106_edit_page_update/20230111_edit_schemas_fix.sql

@@ -0,0 +1,7 @@
+-- Fix for edit_schemes.php DB settings
+
+-- will not change file name only visual name
+UPDATE edit_page SET name = 'Edit Schemas' WHERE filename = 'edit_schemes.php';
+
+-- will change BOTH, must have file name renamed too
+UPDATE edit_page SET name = 'Edit Schemas', filename = 'edit_schemas.php' WHERE filename = 'edit_schemes.php';

README.md

@@ -2,19 +2,20 @@
 
 ## Code Standard
 
- * Uses PSR-12
- * tab indent instead of 4 spaces indent
- * Warning at 120 character length, error at 240 character length
+* Uses PSR-12
+* tab indent instead of 4 spaces indent
+* Warning at 120 character length, error at 240 character length
 
 ## General information
 
 Base PHP class files to setup any project
-  * login
-  * database wrapper
-  * basic helper class for debugging and other features
-  * admin/frontend split
-  * domain controlled database/settings split
-  * dynamic layout groups
+
+* login
+* database wrapper
+* basic helper class for debugging and other features
+* admin/frontend split
+* domain controlled database/settings split
+* dynamic layout groups
 
 ## NOTE
 
@@ -50,7 +51,6 @@ pslam is setup but not configured
 With phpunit (`4dev/checking/phpunit.sh`)
 `phpunit -c $phpunit.xml 4dev/tests/`
 
-
 ## Other Notes
 
 ### Session used
@@ -58,29 +58,38 @@ With phpunit (`4dev/checking/phpunit.sh`)
 The following classes use _SESSION
 The main one is ACL\Login, this class will fail without a session started
 
-  * \CoreLibs\ACL\Login
-  * \CoreLibs\Admin\Backend
-  * \CoreLibs\Output\Form\Generate
-  * \CoreLibs\Output\Form\Token
-  * \CoreLibs\Template\SmartyExtend
+* \CoreLibs\ACL\Login
+* \CoreLibs\Admin\Backend
+* \CoreLibs\Output\Form\Generate
+* \CoreLibs\Output\Form\Token
+* \CoreLibs\Template\SmartyExtend
 
 ### Class extends
 
 The following classes extend these classes
 
-  * \CoreLibs\ACL\Login extends \CoreLibs\DB\IO
-  * \CoreLibs\Admin\Backend extends \CoreLibs\DB\IO
-  * \CoreLibs\DB\Extended\ArrayIO extends \CoreLibs\DB\IO
-  * \CoreLibs\Output\Form\Generate extends \CoreLibs\DB\Extended\ArrayIO
-  * \CoreLibs\Template\SmartyExtend extends SmartyBC
+* \CoreLibs\ACL\Login extends \CoreLibs\DB\IO
+* \CoreLibs\Admin\Backend extends \CoreLibs\DB\IO
+* \CoreLibs\DB\Extended\ArrayIO extends \CoreLibs\DB\IO
+* \CoreLibs\Output\Form\Generate extends \CoreLibs\DB\Extended\ArrayIO
+* \CoreLibs\Template\SmartyExtend extends SmartyBC
 
 ### Class used
 
 The following classes use the following classes
 
-* \CoreLibs\ACL\Login uses \CoreLibs\Debug\Logger, \CoreLibs\Language\L10n
-* \CoreLibs\DB\IO uses \CoreLibs\Debug\Logger, \CoreLibs\DB\SQL\PgSQL
-* \CoreLibs\Admin\Backend uses \CoreLibs\Debug\Logger, \CoreLibs\Language\L10n
-* \CoreLibs\Output\Form\Generate uses \CoreLibs\Debug\Logger, \CoreLibs\Language\L10n
+* \CoreLibs\ACL\Login uses \CoreLibs\Debug\Logging, \CoreLibs\Language\L10n
+* \CoreLibs\DB\IO uses \CoreLibs\Debug\Logging, \CoreLibs\DB\SQL\PgSQL
+* \CoreLibs\Admin\Backend uses \CoreLibs\Debug\Logging, \CoreLibs\Language\L10n
+* \CoreLibs\Output\Form\Generate uses \CoreLibs\Debug\Logging, \CoreLibs\Language\L10n
 * \CoreLibs\Template\SmartyExtend uses \CoreLibs\Language\L10n
 * \CoreLibs\Language\L10n uses FileReader, GetTextReader
+* \CoreLibs\Admin\EditBase uses \CoreLibs\Debug\Logging, \CoreLibs\Language\L10n
+
+### Class internal load
+
+Loads classes internal (not passed in, not extend)
+
+* \CoreLibs\Admin\EditBase loads \CoreLibs\Template\SmartyExtend, \CoreLibs\Output\Form\Generate
+* \CoreLibs\Output\From\Generate loads \CoreLibs\Debug\Logging, \CoreLibs\Language\L10n if not passed on
+* \CoreLibs\Output\From\Generate loads \CoreLibs\Output\From\TableArrays

www/lib/CoreLibs/ACL/Login.php

@@ -1633,7 +1633,7 @@ EOM;
 			$this->session->checkActiveSession() === true &&
 			!empty($_SESSION['DEFAULT_LOCALE'])
 		) {
-			$locale = $_SESSION['DEFAULT_LOCALE'] ?? '';
+			$locale = $_SESSION['DEFAULT_LOCALE'];
 		} else {
 			$locale = (defined('SITE_LOCALE') && !empty(SITE_LOCALE)) ?
 				SITE_LOCALE :

www/lib/CoreLibs/Output/Form/Generate.php

@@ -294,6 +294,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	// language
 	/** @var \CoreLibs\Language\L10n */
 	public $l;
+	// log
+	/** @var \CoreLibs\Debug\Logging */
+	public $log;
 
 	// now some default error msgs (english)
 	/** @var array<mixed> */
@@ -319,13 +322,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		?array $locale = null,
 		?array $table_arrays = null,
 	) {
+		// init logger if not set
+		$this->log = $log ?? new \CoreLibs\Debug\Logging();
 		// don't log per class
-		if ($log !== null) {
-			$log->setLogPer('class', false);
-		}
-		// replace any non valid variable names
-		// TODO extract only alphanumeric and _ after . to _ replacement
-		$this->my_page_name = str_replace(['.'], '_', System::getPageName(System::NO_EXTENSION));
+		$this->log->setLogPer('class', false);
 		// if pass on locale is null
 		if ($locale === null) {
 			$locale = \CoreLibs\Language\GetLocale::setLocale();
@@ -350,6 +350,13 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$this->base_acl_level = (int)$_SESSION['BASE_ACL_LEVEL'];
 		$this->acl_admin = (int)$_SESSION['ADMIN'];
 
+		// replace any non valid variable names and set my page name
+		$this->my_page_name = str_replace(
+			['.'],
+			'_',
+			System::getPageName(System::NO_EXTENSION)
+		);
+
 		// first check if we have a in page override as $table_arrays[page name]
 		if (
 			isset($table_arrays[System::getPageName(System::NO_EXTENSION)]) &&
@@ -374,7 +381,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$db_config,
 			$config_array['table_array'],
 			$config_array['table_name'],
-			$log ?? new \CoreLibs\Debug\Logging(),
+			$this->log,
 			// set the ACL
 			$this->base_acl_level,
 			$this->acl_admin
@@ -465,12 +472,22 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	*/
 	private function loadTableArray()
 	{
+		// note: it schould be Schemas but an original type made it to this
+		//       this file is kept for the old usage, new one should be EditSchemas
+		$table_array_shim = [
+			'EditSchemes' => 'EditSchemas'
+		];
 		// camel case $this->my_page_name from foo_bar_note to FooBarNote
 		$page_name_camel_case = '';
 		foreach (explode('_', $this->my_page_name) as $part) {
 			$page_name_camel_case .= ucfirst($part);
 		}
-		$class_string = __NAMESPACE__ . "\\TableArrays\\" . $page_name_camel_case;
+		$class_string = __NAMESPACE__ . "\\TableArrays\\"
+			. (
+				// shim lookup
+				$table_array_shim[$page_name_camel_case] ??
+					$page_name_camel_case
+			);
 		try {
 			/** @var \CoreLibs\Output\Form\TableArraysInterface|false $class */
 			$class = new $class_string($this);

www/lib/CoreLibs/Output/Form/TableArrays/EditAccess.php

@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CoreLibs\Output\Form\TableArrays;
+
+class EditAccess implements \CoreLibs\Output\Form\TableArraysInterface
+{
+	/** @var \CoreLibs\Output\Form\Generate */
+	private $form;
+
+	/**
+	 * constructor
+	 * @param \CoreLibs\Output\Form\Generate $form base form class
+	 */
+	public function __construct(\CoreLibs\Output\Form\Generate $form)
+	{
+		$this->form = $form;
+		$this->form->log->debug('CLASS LOAD', __NAMESPACE__ . __CLASS__);
+	}
+
+	/**
+	 * return the table array
+	 *
+	 * @return array<mixed>
+	 */
+	public function setTableArray(): array
+	{
+		return [
+			'table_array' => [
+				'edit_access_id' => [
+					'value' => $_POST['edit_access_id'] ?? '',
+					'type' => 'hidden',
+					'pk' => 1
+				],
+				'name' => [
+					'value' => $_POST['name'] ?? '',
+					'output_name' => 'Access Group Name',
+					'mandatory' => 1,
+					'type' => 'text',
+					'error_check' => 'alphanumericspace|unique'
+				],
+				'description' => [
+					'value' => $_POST['description'] ?? '',
+					'output_name' => 'Description',
+					'type' => 'textarea'
+				],
+				'color' => [
+					'value' => $_POST['color'] ?? '',
+					'output_name' => 'Color',
+					'mandatory' => 0,
+					'type' => 'text',
+					'size' => 10,
+					'length' => 9,
+					'error_check' => 'custom',
+					// FIXME: update regex check for hex/rgb/hsl with color check class
+					'error_regex' => '/^#([\dA-Fa-f]{6}|[\dA-Fa-f]{8})$/',
+					'error_example' => '#F6A544'
+				],
+				'enabled' => [
+					'value' => $_POST['enabled'] ?? 0,
+					'output_name' => 'Enabled',
+					'type' => 'binary',
+					'int' => 1, // OR 'bool' => 1
+					'element_list' => [
+						'1' => 'Yes',
+						'0' => 'No'
+					],
+				],
+				'protected' => [
+					'value' => $_POST['protected'] ?? 0,
+					'output_name' => 'Protected',
+					'type' => 'binary',
+					'int' => 1,
+					'element_list' => [
+						'1' => 'Yes',
+						'0' => 'No'
+					],
+				],
+				'additional_acl' => [
+					'value' => $_POST['additional_acl'] ?? '',
+					'output_name' => 'Additional ACL (as JSON)',
+					'type' => 'textarea',
+					'error_check' => 'json',
+					'rows' => 10,
+					'cols' => 60
+				],
+			],
+			'table_name' => 'edit_access',
+			"load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name",
+			'show_fields' => [
+				[
+					'name' => 'name'
+				],
+			],
+			'element_list' => [
+				'edit_access_data' => [
+					'output_name' => 'Edit Access Data',
+					'delete_name' => 'remove_edit_access_data',
+					// is not a sub table read and connect, but only a sub table with data
+					// 'type' => 'reference_data',
+					// maxium visible if no data is set, if filled add this number to visible
+					'max_empty' => 5,
+					'prefix' => 'ead',
+					'elements' => [
+						'name' => [
+							'type' => 'text',
+							'error_check' => 'alphanumeric|unique',
+							'output_name' => 'Name',
+							'mandatory' => 1
+						],
+						'value' => [
+							'type' => 'text',
+							'output_name' => 'Value'
+						],
+						'enabled' => [
+							'type' => 'checkbox',
+							'output_name' => 'Activate',
+							'int' => 1,
+							'element_list' => [1]
+						],
+						/*'edit_access_id' => [
+							'int' => 1,
+							'type' => 'hidden',
+							// reference main key from master table above
+							'fk_id' => 1
+						],*/
+						'edit_access_data_id' => [
+							'type' => 'hidden',
+							'int' => 1,
+							'pk_id' => 1
+						],
+					],
+				],
+			],
+		];
+	}
+}
+
+// __END__

www/lib/CoreLibs/Output/Form/TableArrays/EditVisibleGroup.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CoreLibs\Output\Form\TableArrays;
+
+class EditVisibleGroup implements \CoreLibs\Output\Form\TableArraysInterface
+{
+	/** @var \CoreLibs\Output\Form\Generate */
+	private $form;
+
+	/**
+	 * constructor
+	 * @param \CoreLibs\Output\Form\Generate $form base form class
+	 */
+	public function __construct(\CoreLibs\Output\Form\Generate $form)
+	{
+		$this->form = $form;
+		$this->form->log->debug('CLASS LOAD', __NAMESPACE__ . __CLASS__);
+	}
+
+	/**
+	 * return the table array
+	 *
+	 * @return array<mixed>
+	 */
+	public function setTableArray(): array
+	{
+		return [
+			'table_array' => [
+				'edit_visible_group_id' => [
+					'value' => $_POST['edit_visible_group_id'] ?? '',
+					'type' => 'hidden',
+					'pk' => 1
+				],
+				'name' => [
+					'value' => $_POST['name'] ?? '',
+					'output_name' => 'Group name',
+					'mandatory' => 1,
+					'type' => 'text'
+				],
+				'flag' => [
+					'value' => $_POST['flag'] ?? '',
+					'output_name' => 'Flag',
+					'mandatory' => 1,
+					'type' => 'text',
+					'error_check' => 'alphanumeric|unique'
+				],
+			],
+			'table_name' => 'edit_visible_group',
+			'load_query' => "SELECT edit_visible_group_id, name FROM edit_visible_group ORDER BY name",
+			'show_fields' => [
+				[
+					'name' => 'name'
+				],
+			],
+		];
+	}
+}
+
+// __END__

www/vendor/composer/autoload_classmap.php

@@ -58,12 +58,14 @@ return array(
     'CoreLibs\\Output\\Form\\Elements' => $baseDir . '/lib/CoreLibs/Output/Form/Elements.php',
     'CoreLibs\\Output\\Form\\Generate' => $baseDir . '/lib/CoreLibs/Output/Form/Generate.php',
     'CoreLibs\\Output\\Form\\TableArraysInterface' => $baseDir . '/lib/CoreLibs/Output/TableArraysInterface.php',
+    'CoreLibs\\Output\\Form\\TableArrays\\EditAccess' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditAccess.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditGroups' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditGroups.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditLanguages' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditLanguages.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditMenuGroup' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditMenuGroup.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditPages' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditPages.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditSchemas' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditSchemas.php',
     'CoreLibs\\Output\\Form\\TableArrays\\EditUsers' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditUsers.php',
+    'CoreLibs\\Output\\Form\\TableArrays\\EditVisibleGroup' => $baseDir . '/lib/CoreLibs/Output/Form/TableArrays/EditVisibleGroup.php',
     'CoreLibs\\Output\\Form\\Token' => $baseDir . '/lib/CoreLibs/Output/Form/Token.php',
     'CoreLibs\\Output\\Image' => $baseDir . '/lib/CoreLibs/Output/Image.php',
     'CoreLibs\\Output\\ProgressBar' => $baseDir . '/lib/CoreLibs/Output/ProgressBar.php',

www/vendor/composer/autoload_static.php

@@ -91,12 +91,14 @@ class ComposerStaticInit10fe8fe2ec4017b8644d2b64bcf398b9
         'CoreLibs\\Output\\Form\\Elements' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Elements.php',
         'CoreLibs\\Output\\Form\\Generate' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Generate.php',
         'CoreLibs\\Output\\Form\\TableArraysInterface' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/TableArraysInterface.php',
+        'CoreLibs\\Output\\Form\\TableArrays\\EditAccess' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditAccess.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditGroups' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditGroups.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditLanguages' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditLanguages.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditMenuGroup' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditMenuGroup.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditPages' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditPages.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditSchemas' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditSchemas.php',
         'CoreLibs\\Output\\Form\\TableArrays\\EditUsers' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditUsers.php',
+        'CoreLibs\\Output\\Form\\TableArrays\\EditVisibleGroup' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/TableArrays/EditVisibleGroup.php',
         'CoreLibs\\Output\\Form\\Token' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Form/Token.php',
         'CoreLibs\\Output\\Image' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/Image.php',
         'CoreLibs\\Output\\ProgressBar' => __DIR__ . '/../..' . '/lib/CoreLibs/Output/ProgressBar.php',