Simplify language calls

There are no more lang vars passed on to any class calls
The new order is the following
$OVERRIDE_LANG > _SESSION > SITE_LANG > DEFAULT_LANG

Todo: make the setLang better so we do not have the same method in
Backend/Generic/SmartyExtended

.htaccess

@@ -0,0 +1,29 @@
+# PHP XDEBUG SETTINGS
+# php_value xdebug.profiler_output_dir xdebug/
+# php_value xdebug.profiler_output_name timestamp
+# php_value xdebug.profiler_enable 1
+php_value xdebug.collect_params 2
+php_value xdebug.collect_vars 0
+php_value xdebug.show_local_vars 0
+#php_value xdebug.dump_globals 0
+# allowed COOKIE, FILES, GET, POST, REQUEST, SERVER, SESSION
+#php_value xdebug.dump.GET *
+# PHP ERROR SETTINGS
+php_flag short_open_tag off
+php_flag display_startup_errors on
+php_flag display_errors on
+php_flag html_errors on
+php_flag log_errors on
+php_flag ignore_repeated_errors off
+php_flag ignore_repeated_source off
+php_flag report_memleaks on
+php_flag track_errors on
+php_value docref_root 0
+php_value docref_ext 0
+# Turn this on to redirect log to different folder
+#php_value error_log /var/www/html/developers/clemens/php/php-error/php-errors.log
+# this is E_ALL reporting ON
+php_value error_reporting -1
+# this is E_ALL | ~E_NOTICE
+#php_value error_reporting 2039
+php_value log_errors_max_len 0

.phan/config.php

@@ -0,0 +1,124 @@
+<?php
+
+use Phan\Config;
+
+/**
+ * This configuration will be read and overlaid on top of the
+ * default configuration. Command line arguments will be applied
+ * after this file is read.
+ *
+ * @see src/Phan/Config.php
+ * See Config for all configurable options.
+ *
+ * A Note About Paths
+ * ==================
+ *
+ * Files referenced from this file should be defined as
+ *
+ * ```
+ *   Config::projectPath('relative_path/to/file')
+ * ```
+ *
+ * where the relative path is relative to the root of the
+ * project which is defined as either the working directory
+ * of the phan executable or a path passed in via the CLI
+ * '-d' flag.
+ */
+return [
+	// If true, missing properties will be created when
+	// they are first seen. If false, we'll report an
+	// error message.
+	"allow_missing_properties" => false,
+
+	// Allow null to be cast as any type and for any
+	// type to be cast to null.
+	"null_casts_as_any_type" => false,
+
+	// Backwards Compatibility Checking
+	'backward_compatibility_checks' => true,
+
+	// Run a quick version of checks that takes less
+	// time
+	"quick_mode" => false,
+
+	// Only emit critical issues to start with
+	// (0 is low severity, 5 is normal severity, 10 is critical)
+	"minimum_severity" => 0,
+
+	// default false for include path check
+	"enable_include_path_checks" => true,
+	"include_paths" => [
+		'.', '../configs/'
+	],
+	'ignore_undeclared_variables_in_global_scope' => true,
+
+	"file_list" => [
+		"./www/configs/config.db.php",
+		"./www/configs/config.host.php",
+		"./www/configs/config.path.php",
+		"./www/configs/config.master.php",
+		"./www/includes/admin_header.php",
+	],
+
+	// A list of directories that should be parsed for class and
+	// method information. After excluding the directories
+	// defined in exclude_analysis_directory_list, the remaining
+	// files will be statically analyzed for errors.
+	//
+	// Thus, both first-party and third-party code being used by
+	// your application should be included in this list.
+	'directory_list' => [
+		 // Change this to include the folders you wish to analyze
+		 // (and the folders of their dependencies)
+		 'www',
+		 // To speed up analysis, we recommend going back later and
+		 // limiting this to only the vendor/ subdirectories your
+		 // project depends on.
+		 // `phan --init` will generate a list of folders for you
+		 //'www/vendor',
+	],
+
+
+	// A list of directories holding code that we want
+	// to parse, but not analyze
+	"exclude_analysis_directory_list" => [
+		'www/vendor',
+		'www/lib/FileUpload',
+		'www/lib/pChart',
+		'www/lib/pChart2.1.4',
+		'www/lib/Smarty',
+		'www/lib/smarty-3.1.30',
+		'www/templates_c',
+		'www/log',
+		'www/tmp',
+		'www/cache',
+		'www/media',
+	],
+	'exclude_file_list' => [
+		// ignore all symlink files to edit
+		'www/admin/edit_access.php',
+		'www/admin/edit_groups.php',
+		'www/admin/edit_languages.php',
+		'www/admin/edit_menu_group.php',
+		'www/admin/edit_order.php',
+		'www/admin/edit_pages.php',
+		'www/admin/edit_schemes.php',
+		'www/admin/edit_users.php',
+		'www/admin/edit_visible_group.php',
+		// ignore the old qq tests
+		'www/admin/qq_file_upload_front.php',
+		'www/admin/qq_file_upload_ajax.php',
+	],
+
+	// what not to show as problem
+	'suppress_issue_types' => [
+		// 'PhanUndeclaredMethod',
+		'PhanEmptyFile',
+	],
+
+	// Override to hardcode existence and types of (non-builtin) globals in the global scope.
+	// Class names should be prefixed with `\`.
+	//
+	// (E.g. `['_FOO' => '\FooClass', 'page' => '\PageClass', 'userId' => 'int']`)
+	'globals_type_map' => [],
+];

4dev/database/ORDER

@@ -16,6 +16,7 @@ table/edit_scheme.sql
 table/edit_language.sql
 table/edit_group.sql
 table/edit_page_access.sql
+table/edit_page_content.sql
 table/edit_user.sql
 table/edit_log.sql
 table/edit_access.sql
@@ -31,6 +32,7 @@ trigger/trg_edit_group.sql
 trigger/trg_edit_language.sql
 trigger/trg_edit_log.sql
 trigger/trg_edit_page_access.sql
+trigger/trg_edit_page_content.sql
 trigger/trg_edit_page.sql
 trigger/trg_edit_query_string.sql
 trigger/trg_edit_scheme.sql

4dev/database/data/edit_tables.sql

@@ -51,6 +51,7 @@ INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHE
 DELETE FROM edit_access_right;
 INSERT INTO edit_access_right (name, level, type) VALUES ('Default', -1, 'default');
 INSERT INTO edit_access_right (name, level, type) VALUES ('No Access', 0, 'none');
+INSERT INTO edit_access_right (name, level, type) VALUES ('List', 10, 'list');
 INSERT INTO edit_access_right (name, level, type) VALUES ('Read', 20, 'read');
 INSERT INTO edit_access_right (name, level, type) VALUES ('Translator', 30, 'mod_trans');
 INSERT INTO edit_access_right (name, level, type) VALUES ('Modify', 40, 'mod');

4dev/database/table/edit_access.sql

@@ -14,5 +14,6 @@ CREATE TABLE edit_access (
 	uid	VARCHAR,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
 	protected INT,
-	deleted	SMALLINT DEFAULT 0
+	deleted	SMALLINT DEFAULT 0,
+	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_group.sql

@@ -10,8 +10,10 @@ CREATE TABLE edit_group (
 	edit_group_id	SERIAL PRIMARY KEY,
 	name	VARCHAR,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
+	deleted	SMALLINT DEFAULT 0,
 	edit_scheme_id INT,
 	edit_access_right_id INT NOT NULL,
+	additional_acl	JSONB,
 	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page.sql

@@ -2,12 +2,13 @@
 -- DATE: 2005/07/05
 -- DESCRIPTION:
 -- edit tables, this table contains all pages in the edit interface and allocates rights + values to it
--- TABLE: edit_table
+-- TABLE: edit_page
 -- HISTORY:
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
 	edit_page_id	SERIAL PRIMARY KEY,
+	content_alias_edit_page_id	INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
 	filename	VARCHAR,
 	name	VARCHAR UNIQUE,
 	order_number INT NOT NULL,
@@ -15,5 +16,6 @@ CREATE TABLE edit_page (
 	menu	SMALLINT NOT NULL DEFAULT 0,
 	popup	SMALLINT NOT NULL DEFAULT 0,
 	popup_x	SMALLINT,
-	popup_y SMALLINT
+	popup_y SMALLINT,
+	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_content.sql

@@ -0,0 +1,20 @@
+-- AUTHOR: Clemens Schwaighofer
+-- DATE: 2019/9/9
+-- DESCRIPTION:
+-- sub content to one page with additional edit access right set
+-- can be eg JS content groups on one page
+-- TABLE: edit_page_content
+-- HISTORY:
+
+-- DROP TABLE edit_page_content;
+CREATE TABLE edit_page_content (
+	edit_page_content_id	SERIAL PRIMARY KEY,
+	edit_page_id	INT NOT NULL,
+	edit_access_right_id	INT NOT NULL,
+	name	VARCHAR,
+	uid	VARCHAR UNIQUE,
+	order_number INT NOT NULL,
+	online	SMALLINT NOT NULL DEFAULT 0,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_user.sql

@@ -16,6 +16,7 @@ CREATE TABLE edit_user (
 	first_name_furigana	VARCHAR,
 	last_name_furigana	VARCHAR,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
+	deleted	SMALLINT NOT NULL DEFAULT 0,
 	debug	SMALLINT NOT NULL DEFAULT 0,
 	db_debug	SMALLINT NOT NULL DEFAULT 0,
 	email	VARCHAR,
@@ -32,6 +33,7 @@ CREATE TABLE edit_user (
 	locked	SMALLINT DEFAULT 0,
 	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
 	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
+	additional_acl	JSONB, -- additional ACL as JSON string (can be set by other pages)
 	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,

4dev/database/trigger/trg_edit_page_content.sql

@@ -0,0 +1,4 @@
+DROP TRIGGER trg_edit_page_content ON edit_page_content;
+CREATE TRIGGER trg_edit_page_content
+BEFORE INSERT OR UPDATE ON edit_page_content
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/update/edit_update_missing_cuid.sql

@@ -0,0 +1,17 @@
+-- 2019/9/10 UPDATE missing cuid in edit_* tables
+
+UPDATE edit_access SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_data SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_right SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_user SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_group SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_language SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_log SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_menu_group SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page_access SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page_content SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_query_string SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_scheme SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_user SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_visible_group SET cuid = random_string(12) WHERE cuid IS NULL;

4dev/lang/admin/messages_en_utf8.po

@@ -1,11 +1,11 @@
-#********************************************************************
+# ********************************************************************
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2005/08/09
 # SHORT DESCRIPTION:
 # Backned English Messages file for gettext
 # to craete: msgfmt -o ja.mo messages_en.po
 # HISTORY:
-#********************************************************************/
+# ********************************************************************/
 
 msgid ""
 msgstr ""
@@ -24,3 +24,6 @@ msgstr "Year"
 
 msgid "Month"
 msgstr "Month"
+
+msgid "INPUT TEST"
+msgstr "OUTPUT TEST EN"

4dev/lang/admin/messages_ja_utf8.po

@@ -1,11 +1,11 @@
-#********************************************************************
+# ********************************************************************
 # AUTHOR: Clemens Schwaighofer
 # CREATED: 2018/03/28
 # SHORT DESCRIPTION:
 # Backend Japanese Messages file for gettext
 # to craete: msgfmt -o ja.mo messages_ja.po
 # HISTORY:
-#********************************************************************/
+# ********************************************************************/
 
 msgid ""
 msgstr ""
@@ -61,3 +61,17 @@ msgstr "土"
 
 msgid "Sun"
 msgstr "日"
+
+msgid "INPUT TEST"
+msgstr "OUTPUT TEST JA"
+
+# login string
+msgid "Hello %s"
+msgstr "こにちは %s"
+
+msgid "I should be translated"
+msgstr "「スマーティー」これは正しいです"
+
+msgid "Are we translated?"
+msgstr "「クラス」これは翻訳です？"
+

4dev/update/20190910_page_content/20190910_page_content_updates.sql

@@ -0,0 +1,90 @@
+-- 2019/9/10 update edit_page with reference and additional ACLs, update core functions
+
+-- * random_string function
+-- * add cuid column in edit_generic
+-- * update generic trigger function
+-- * edit_page_content table/trigger
+-- * edit_* additional_acl entries
+-- * edit_page content alias link
+-- * update any missing cuid entries
+
+-- create random string with length X
+CREATE FUNCTION random_string(randomLength int)
+RETURNS text AS $$
+SELECT array_to_string(
+    ARRAY(
+        SELECT substring(
+            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
+            trunc(random() * 62)::int + 1,
+            1
+        )
+        FROM generate_series(1, randomLength) AS gs(x)
+    ),
+    ''
+)
+$$ LANGUAGE SQL
+RETURNS NULL ON NULL INPUT
+VOLATILE;
+-- edit_gneric update
+ALTER TABLE edit_generic ADD cuid VARCHAR;
+-- adds the created or updated date tags
+CREATE OR REPLACE FUNCTION set_edit_generic() RETURNS TRIGGER AS '
+    DECLARE
+        random_length INT = 12; -- that should be long enough
+    BEGIN
+        IF TG_OP = ''INSERT'' THEN
+            NEW.date_created := ''now'';
+            NEW.cuid := random_string(random_length);
+        ELSIF TG_OP = ''UPDATE'' THEN
+            NEW.date_updated := ''now'';
+        END IF;
+        RETURN NEW;
+    END;
+' LANGUAGE 'plpgsql';
+
+-- DROP TABLE edit_page_content;
+CREATE TABLE edit_page_content (
+    edit_page_content_id    SERIAL PRIMARY KEY,
+    edit_page_id    INT NOT NULL,
+    edit_access_right_id    INT NOT NULL,
+    name    VARCHAR,
+    uid VARCHAR UNIQUE,
+    order_number INT NOT NULL,
+    online  SMALLINT NOT NULL DEFAULT 0,
+    FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+    FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+) INHERITS (edit_generic) WITHOUT OIDS;
+DROP TRIGGER trg_edit_page_content ON edit_page_content;
+CREATE TRIGGER trg_edit_page_content
+BEFORE INSERT OR UPDATE ON edit_page_content
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
+
+-- INSERT new list entry
+INSERT INTO edit_access_right (name, level, type) VALUES ('List', 10, 'list');
+
+-- UPDATE
+ALTER TABLE edit_user ADD additional_acl JSONB;
+ALTER TABLE edit_group ADD additional_acl JSONB;
+ALTER TABLE edit_access ADD additional_acl JSONB;
+
+-- page content reference settings
+ALTER TABLE edit_page ADD content_alias_edit_page_id INT;
+ALTER TABLE edit_page ADD CONSTRAINT edit_page_content_alias_edit_page_id_fkey FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE;
+
+
+-- 2019/9/10 UPDATE missing cuid in edit_* tables
+UPDATE edit_access SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_data SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_right SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_access_user SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_group SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_language SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_log SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_menu_group SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page_access SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_page_content SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_query_string SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_scheme SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_user SET cuid = random_string(12) WHERE cuid IS NULL;
+UPDATE edit_visible_group SET cuid = random_string(12) WHERE cuid IS NULL;

phpstan-bootstrap.php

@@ -0,0 +1,6 @@
+<?php
+// Boostrap file for PHPstand
+// sets the _SERVER['HTTP_HOST'] var so we can have DB detection
+$_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
+
+// __END__

phpstan.neon

@@ -0,0 +1,55 @@
+# PHP Stan Config
+
+parameters:
+	tmpDir: /tmp/phpstan-corelibs
+	level: 1
+	paths:
+		- %currentWorkingDirectory%/www
+	#bootstrap: %currentWorkingDirectory%/phpstan-bootstrap.php
+	#bootstrap: phpstan-bootstrap.php
+	autoload_directories:
+	autoload_files:
+		- %currentWorkingDirectory%/phpstan-bootstrap.php
+		- www/configs/config.master.php
+		- www/lib/autoloader.php
+		- www/vendor/autoload.php
+	excludes_analyse:
+		# no check admin
+		- www/admin/qq_file_upload_front.php
+		- www/admin/qq_file_upload_ajax.php
+		# admin synlink files
+		- www/admin/edit_access.php
+		- www/admin/edit_groups.php
+		- www/admin/edit_languages.php
+		- www/admin/edit_menu_group.php
+		- www/admin/edit_order.php
+		- www/admin/edit_pages.php
+		- www/admin/edit_schemes.php
+		- www/admin/edit_users.php
+		- www/admin/edit_visible_group.php
+		# ignore admin header stuff
+		- www/includes/admin_header.php # ignore the admin include stuff
+		- www/includes/admin_footer.php # ignore the admin include stuff
+		- www/includes/admin_set_paths.php # ignore the admin include stuff
+		- www/includes/admin_smarty.php # ignore the admin include stuff
+		# folders with data no check needed
+		- www/templates_c
+		- www/cache
+		- www/log
+		- www/media
+		- www/tmp
+		- www/lib/pChart
+		- www/lib/pChart2.1.4
+		- www/lib/Smarty/
+		- www/lib/smarty-3.1.30/
+		# ignore composer
+		- www/vendor
+	# ignore errores with
+	# ignoreErrors:
+		#- 'error regex'
+		#-
+		#	message: 'error regex'
+		#	path: %currentWorkingDirectory%/www/some/*
+		#	paths:
+		#		- ...
+		#		- ...

static_checkers.txt

@@ -0,0 +1,9 @@
+# main static checker
+phan --progress-bar -C -o 4dev/tmp/analysis.txt
+# sub static checker
+phpstan analyse -c phpstan.neon --memory-limit=4G -l 0 www
+# only if we work with composer only
+www/: psalm (this needs the composer autoloader defined)
+
+# for linting
+parallel-lint www/

www/admin/class_test.php

@@ -1,4 +1,7 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
 
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -14,27 +17,41 @@ ob_start();
 // basic class test file
 define('USE_DATABASE', true);
 // sample config
-// require("config.inc");
 require 'config.php';
 // set session name
 if (!defined('SET_SESSION_NAME')) {
-	DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
 }
 // define log file id
-DEFINE('LOG_FILE_ID', 'classTest');
+$LOG_FILE_ID = 'classTest';
-// set language for l10n
+
-$lang = 'en_utf8';
 // init login & backend class
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
-$basic = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
+$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
-$basic->dbInfo(1);
+$basic->dbInfo(true);
 ob_end_flush();
 
+echo "DB_CONFIG_SET constant: <pre>".print_r(DB_CONFIG, true)."</pre><br>";
+
+$basic->hrRunningTime();
+$basic->runningTime();
+echo "RANDOM KEY [50]: ".$basic->randomKeyGen(50)."<br>";
+echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
+echo "TIMED [def]: ".$basic->runningTime()."<br>";
+echo "TIMED [string]: ".$basic->runningtime_string."<br>";
+$basic->hrRunningTime();
+echo "RANDOM KEY [default]: ".$basic->randomKeyGen()."<br>";
+echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
+
+// color
+print "COLOR: -1, -1, -1: ".$basic->rgb2hex(-1, -1, -1)."<br>";
+print "COLOR: 10, 20, 30: ".$basic->rgb2hex(10, 20, 30)."<br>";
+
 // set + check edit access id
 $edit_access_id = 3;
-if (isset($login) && is_object($login) && isset($login->acl['unit'])) {
+if (is_object($login) && isset($login->acl['unit'])) {
-	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
+	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), true)."<br>";
-	print "ACCESS CHECK: ".$login->loginCheckEditAccess($edit_access_id)."<br>";
+	print "ACCESS CHECK: ".(string)$login->loginCheckEditAccess($edit_access_id)."<br>";
 	if ($login->loginCheckEditAccess($edit_access_id)) {
 		$basic->edit_access_id = $edit_access_id;
 	} else {
@@ -68,7 +85,7 @@ print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
 $basic->debug('SOME MARK', 'Some error output');
 
 print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
-if (isset($login)) {
+if (is_object($login)) {
 	//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
 	$basic->debug('ACL', "ACL: ".$basic->printAr($login->acl));
 	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
@@ -82,49 +99,58 @@ if (isset($login)) {
 // DB client encoding
 print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
 
-while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
+while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
 	print "TIME: ".$res['time']."<br>";
 }
+print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
+while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
+	print "[CACHED] TIME: ".$res['time']."<br>";
+}
 
 $status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
 $basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
 $status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
-print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
 // returning test with multiple entries
 //	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
 $status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
-print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, 1)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, true)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
 // no returning, but not needed ;
 $status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
 // UPDATE WITH RETURNING
 $status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
-print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext, true)."<br>";
 
 # db write class test
 $table = 'foo';
 print "TABLE META DATA: ".$basic->printAr($basic->dbShowTableMetaData($table))."<br>";
 $primary_key = ''; # unset
-$db_write_table = array ('test', 'string_a', 'number_a', 'some_bool');
+$db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
-//	$db_write_table = array ('test');
+//	$db_write_table = array('test');
-$object_fields_not_touch = array ();
+$object_fields_not_touch = array();
-$object_fields_not_update = array ();
+$object_fields_not_update = array();
-$data = array ('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
+$data = array('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
 $primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array ('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
+$data = array('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
 $primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array ('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
+$data = array('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
 $primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
-$data = array ('test' => 'BOOL TEST UNSET '.time());
+$data = array('test' => 'BOOL TEST UNSET '.time());
 $primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 
+// return Array Test
+$query = "SELECT type, sdate, integer FROM foobar";
+$data = $basic->dbReturnArray($query, true);
+print "Full foobar list: <br><pre>".print_r($data, true)."</pre><br>";
+
 # async test queries
 /*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
 echo "WAITING FOR ASYNC: ";
@@ -156,7 +182,7 @@ while (($ret = $basic->dbCheckAsync()) === true)
 	flush();
 }
 print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
-print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>"; */
+print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>"; */
 
 $to_db_version = '9.1.9';
 print "VERSION DB: ".$basic->dbVersion()."<br>";
@@ -208,8 +234,63 @@ $date_1 = '2017/1/5';
 $date_2 = '2017-01-05';
 print "COMPARE DATE: ".$basic->compareDate($date_1, $date_2)."<br>";
 
+// recursive array search
+$test_array = array(
+	'foo' => 'bar',
+	'input' => array(
+		'element_a' => array(
+			'type' => 'text'
+		),
+		'element_b' => array(
+			'type' => 'email'
+		),
+		'element_c' => array(
+			'type' => 'email'
+		)
+	)
+);
 
-// array re
+echo "SOURCE ARRAY: ".$basic->printAr($test_array)."<br>";
+echo "FOUND ELEMENTS [base]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array, 'type'))."<br>";
+echo "FOUND ELEMENTS [input]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array['input'], 'type'))."<br>";
+
+// image thumbnail
+$images = array(
+	// height bigger
+	// 'no_picture.jpg',
+	// 'no_picture.png',
+	// width bigger
+	// 'no_picture_width_bigger.jpg',
+	// 'no_picture_width_bigger.png',
+	// square
+	// 'no_picture_square.jpg',
+	// 'no_picture_square.png',
+	// other sample images
+	// '5c501af48da6c.jpg',
+	// Apple HEIC files
+	// 'img_2145.heic',
+	// Photoshop
+	'photoshop_test.psd',
+);
+echo "<hr>";
+$thumb_width = 250;
+$thumb_height = 300;
+// return mime type ala mimetype
+$finfo = new finfo(FILEINFO_MIME_TYPE);
+foreach ($images as $image) {
+	$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.$image;
+	list ($height, $width, $img_type) = getimagesize($image);
+	echo "<div>IMAGE INFO: ".$height."x".$width.", TYPE: ".$img_type." [".$finfo->file($image)."]</div>";
+	// rotate image first
+	$basic->correctImageOrientation($image);
+	// thumbnail tests
+	echo "<div>".basename($image).": WIDTH: $thumb_width<br><img src=".$basic->createThumbnailSimple($image, $thumb_width)."></div>";
+	echo "<div>".basename($image).": HEIGHT: $thumb_height<br><img src=".$basic->createThumbnailSimple($image, 0, $thumb_height)."></div>";
+	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height<br><img src=".$basic->createThumbnailSimple($image, $thumb_width, $thumb_height)."></div>";
+	// test with dummy
+	echo "<div>".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)<br><img src=".$basic->createThumbnailSimple($image, $thumb_width, $thumb_height, null, true, false)."></div>";
+	echo "<hr>";
+}
 
 // print error messages
 // print $login->printErrorMsg();

www/admin/edit_access.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_groups.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_languages.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_menu_group.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_order.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_pages.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_schemes.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_users.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/edit_visible_group.php

@@ -1 +1 @@
-../includes/edit_base.inc
+../includes/edit_base.php

www/admin/error_test.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -11,8 +11,8 @@ if ($DEBUG_ALL) {
 
 // sample config
 require 'config.php';
-echo "FILE: ".BASE.LIB."Error.Handling.inc<br>";
+echo "FILE: ".BASE.LIB."Error.Handling.php<br>";
-require(BASE.LIB."Error.Handling.inc");
+require(BASE.LIB."Error.Handling.php");
 
 if ($var) {
 	echo "OUT<br>";

www/admin/l10n_test.php

@@ -1,17 +1,29 @@
-<?php
+<?php declare(strict_types=1);
 
 // debug for L10n issues in php 7.3
 
 // namespace test
 ob_start();
 
+// init language
 $lang = 'en_utf8';
-
 // admin class tests
 require 'config.php';
 $l = new CoreLibs\Language\L10n($lang);
-
-echo "OK<br>";
-
 ob_end_flush();
+
+$string = 'INPUT TEST';
+
+echo "LANGUAGE SET: ".$l->__getLang()."<br>";
+echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
+echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
+
+// switch to other language
+$lang = 'ja_utf8';
+$l->l10nReloadMOfile($lang);
+
+echo "LANGUAGE SET: ".$l->__getLang()."<br>";
+echo "LANGUAGE FILE: ".$l->__getMoFile()."<br>";
+echo "INPUT TEST: ".$string." => ".$l->__($string)."<br>";
+
 // __END__

www/admin/namespace_test.php

@@ -1,6 +1,4 @@
-<?php
+<?php declare(strict_types=1);
-
-declare(strict_types=1);
 
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -12,30 +10,32 @@ ob_start();
 
 // admin class tests
 require 'config.php';
-DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 
 echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";
 
-$lang = 'ja_utf8';
+$base = new CoreLibs\Admin\Backend(DB_CONFIG);
-$base = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
 ob_end_flush();
+if ($base->getConnectionStatus()) {
+	die("Cannot connect to database");
+}
 
 print "Start time: ".$base->runningTime()."<br>";
 print "ByteStringFormat: ".$base->ByteStringFormat(1234567.12)."<br>";
 print "byteStringFormat: ".$base->byteStringFormat(1234567.12)."<br>";
-print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
+// print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
 print "getPageName: ".$base->getPageName()."<br>";
 
-print "DB Info: ".$base->dbInfo(1)."<br>";
+print "DB Info: ".$base->dbInfo(true)."<br>";
 
 
 print "End Time: ".$base->runningTime()."<br>";
-print "Run Time: ".$base->runningTime()."<br>";
+print "Start Time: ".$base->runningTime()."<br>";
-$base->resetRunningtime();
 
 print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
 print "Translate test: Year -> ".$base->l->__('Year')."<br>";
 
+print "End Time: ".$base->runningTime()."<br>";
 // end error print
 print $base->printErrorMsg();
 

www/admin/other_test.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Foo;
 
@@ -21,3 +21,14 @@ class FooBar
 		echo "B: $wrong<br>";
 	}
 }
+
+$foo = $bar ?? 'EMPTY';
+echo "BAR: ".$foo."<br>";
+// define('DS', DIRECTORY_SEPARATOR);
+$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
+$du = DS ?? DIRECTORY_SEPARATOR;
+echo "DS is: ".$ds."<br>";
+
+echo "SERVER HOST: ".$_SERVER['HTTP_HOST']."<br>";
+
+// __END__

www/admin/qq_file_upload_ajax.php

@@ -16,7 +16,7 @@ $MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
 $allowedExtensions = array ('csv', 'zip', 'jpg', 'pdf', 'bz2');
 $sizeLimit = $MAX_UPLOAD_SIZE; // as set in php ini
 $base->debug('AJAX UPLOAD', 'Size: '.$sizeLimit.', Memory Limit: '.ini_get('memory_limit'));
-$uploader = new CoreLibs\Upload\qqFileUploader($allowedExtensions, $sizeLimit);
+$uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit);
 // either in post or get
 $_action= $_POST['action'] ? $_POST['action'] : $_GET['action'];
 $_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid'];

www/admin/smarty_test.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 $ENABLE_ERROR_HANDLING = 0;
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -9,24 +9,27 @@ $LOG_PER_RUN = 1;
 define('USE_DATABASE', true);
 define('USE_HEADER', true);
 require 'config.php';
-require BASE.INCLUDES.'admin_header.inc';
+require BASE.INCLUDES.'admin_header.php';
-$MASTER_TEMPLATE_NAME = 'main_body.tpl';
+$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
-$TEMPLATE_NAME = 'smarty_test.tpl';
+$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
-$CSS_NAME = 'smart_test.css';
+$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
-$USE_PROTOTYPE = false;
+$smarty->USE_PROTOTYPE = false;
-$USE_JQUERY = true;
+$smarty->USE_JQUERY = true;
-if ($USE_PROTOTYPE) {
+$smarty->JS_DATEPICKR = false;
-	$ADMIN_JAVASCRIPT = 'edit.pt.js';
+if ($smarty->USE_PROTOTYPE) {
-	$JS_NAME = 'prototype.test.js';
+	$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
-} elseif ($USE_JQUERY) {
+	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
-	$ADMIN_JAVASCRIPT = 'edit.jq.js';
+} elseif ($smarty->USE_JQUERY) {
-	$JS_NAME = 'jquery.test.js';
+	$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
+	$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
 }
-$PAGE_WIDTH = "100%";
+$smarty->PAGE_WIDTH = "100%";
-require BASE.INCLUDES.'admin_set_paths.inc';
+// require BASE.INCLUDES.'admin_set_paths.php';
+$smarty->setSmartyPaths();
 
 // smarty test
-$cms->DATA['SMARTY_TEST'] = 'Test Data';
+$smarty->DATA['SMARTY_TEST'] = 'Test Data';
+$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
 
 // drop down test with optgroups
 $options = array (
@@ -45,7 +48,8 @@ $options = array (
 	)
 );
 
-$cms->DATA['drop_down_test'] = $options;
+$smarty->DATA['drop_down_test'] = $options;
 
-require BASE.INCLUDES.'admin_smarty.inc';
+// require BASE.INCLUDES.'admin_smarty.php';
-require BASE.INCLUDES.'admin_footer.inc';
+$smarty->setSmartyVarsAdmin();
+require BASE.INCLUDES.'admin_footer.php';

www/admin/various_class_test.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * @phan-file-suppress PhanTypeSuspiciousStringExpression
+ */
+
+namespace CoreLibs;
 
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -6,16 +11,15 @@ $PRINT_ALL = 1;
 $DB_DEBUG = 1;
 
 // admin class tests
-// require 'config.inc';
 require 'config.php';
-DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$base = new CoreLibs\Basic();
+$base = new Basic();
 
 print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."<br>";
 print "DIR: ".DIR."<br>";
 print "BASE: ".BASE."<br>";
 print "ROOT: ".ROOT."<br>";
-print "HOST: ".$HOST_NAME." => DB HOST: ".$DB_HOST[$HOST_NAME]." => ".MAIN_DB."<br>";
+print "HOST: ".HOST_NAME." => DB HOST: ".DB_CONFIG_NAME." => ".print_r(DB_CONFIG, true)."<br>";
 
 $text = 'I am some text
 with some
@@ -43,7 +47,7 @@ print "LB remove: ".$base->removeLB($text, '##BR##')."<br>";
 // 	)
 // );
 
-$base->debug('ARRAY', $base->printAr($test));
+// $base->debug('ARRAY', $base->printAr($test));
 
 function rec($pre, $cur, $node = array ())
 {
@@ -82,6 +86,7 @@ function flattenArrayKey(array $array, array $return = array ())
 	return $return;
 }
 
+$test = array ();
 // core
 $test = rec('', 'A', $test);
 $test = rec('', '1', $test);

www/composer.json

@@ -0,0 +1,12 @@
+{
+    "name": "gullevek/www",
+    "description": "CoreLibs",
+    "type": "library",
+    "authors": [
+        {
+            "name": "Clemens Schwaighofer",
+            "email": "clemens.schwaighofer@egplusww.com"
+        }
+    ],
+    "require": {}
+}

www/configs/config.db.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -8,13 +8,13 @@
 *********************************************************************/
 
 // please be VERY carefull only to change the right side
-$DB_CONFIG = array (
+$DB_CONFIG = array(
-	'test' => array (
+	'test' => array(
 		'db_name' => 'gullevek',
 		'db_user' => 'gullevek',
 		'db_pass' => 'gullevek',
 		'db_host' => 'db.tokyo.tequila.jp',
-		'db_port' => '5432',
+		'db_port' => 5432,
 		'db_schema' => 'public',
 		'db_type' => 'pgsql',
 		'db_encoding' => '',

www/configs/config.host.inc

@@ -1,33 +0,0 @@
-<?php
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2018/10/11
-* SHORT DESCRIPTION:
-* configuration file for core host settings
-* - DB access name (array group from config.db)
-* - location (test/stage/live)
-* - debug flag (true/false)
-* - DB path (eg PUBLIC_SCHEMA)
-* - stie lang
-* HISTORY:
-*********************************************************************/
-
-// each host has a different db_host
-// development host
-$DB_HOST['soba.tokyo.tequila.jp'] = 'test';
-// target host (live)
-//	$DB_TARGET_HOST['soba'] = '<DB ID>';
-// url redirect database
-//	$DB_URL_REDIRECT_HOST['soba'] = '<DB ID>';
-// location flagging
-// test/dev/live
-$LOCATION['soba.tokyo.tequila.jp'] = 'test';
-// show DEBUG override
-// true/false
-$DEBUG_FLAG['soba.tokyo.tequila.jp'] = true;
-// set postgresql paths (schemas)
-$DB_PATH['soba.tokyo.tequila.jp'] = PUBLIC_SCHEMA;
-// site language
-$SITE_LANG['soba.tokyo.tequila.jp'] = 'en_utf8';
-
-// __END__

www/configs/config.host.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2018/10/11
+* SHORT DESCRIPTION:
+* configuration file for core host settings
+* - DB access name (array group from config.db)
+* - location (test/stage/live)
+* - debug flag (true/false)
+* - site lang
+* HISTORY:
+*********************************************************************/
+
+// other master config to attach
+// $__LOCAL_CONFIG = array(
+// 	'db_host' => '',
+// 	'location' => '',
+//	'debug_flag' => true,
+//	'site_lang' => 'en_utf8',
+//	'login_enabled' => true
+// );
+
+// each host has a different db_host
+$SITE_CONFIG = array(
+	// development host
+	'soba.tokyo.tequila.jp' => array(
+		// 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 language
+		'site_lang' => 'en_utf8',
+		// enable/disable login override
+		'login_enabled' => true
+	),
+	// 'other.host.com' => $__LOCAL_CONFIG
+);
+
+// __END__

www/configs/config.master.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/06/10
@@ -78,33 +78,26 @@ DEFINE('TEMPLATES', 'templates'.DS);
 DEFINE('DEFAULT_HASH', 'sha256');
 // default acl level
 DEFINE('DEFAULT_ACL_LEVEL', 80);
-// default levels for certain actions
-/*	DEFINE('DEFAULT_ACL_READ', 20);
-DEFINE('DEFAULT_ACL_CONFIRM', 35);
-DEFINE('DEFAULT_ACL_MOD', 40);
-DEFINE('DEFAULT_ACL_WRITE', 60);
-DEFINE('DEFAULT_ACL_SEND', 70);
-DEFINE('DEFAULT_ACL_DEL', 80);
-DEFINE('DEFAULT_ACL_ADMIN', 100); */
 // SSL host name
-//	DEFINE('SSL_HOST', 'ssl.host.name');
+// DEFINE('SSL_HOST', 'ssl.host.name');
 // error page strictness, Default is 3
 // 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
 // 2: if template not found, do not search, show error template
 // 3: if default template is not found, show error template, do not fall back to default tree
 // 4: very strict, even on normal fixable errors through error
-//	DEFINE('ERROR_STRICT', 3);
+// DEFINE('ERROR_STRICT', 3);
 // allow page caching in general, set to 'FALSE' if you do debugging or development!
-//	DEFINE('ALLOW_SMARTY_CACHE', FALSE);
+// DEFINE('ALLOW_SMARTY_CACHE', FALSE);
 // cache life time, in second', default here is 2 days (172800s)
 // -1 is never expire cache
-//	DEFINE('SMARTY_CACHE_LIFETIME', -1);
+// DEFINE('SMARTY_CACHE_LIFETIME', -1);
 
 /************* 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', 8);
 DEFINE('PASSWORD_MAX_LENGTH', 255);
@@ -113,44 +106,59 @@ DEFINE('PASSWORD_MAX_LENGTH', 255);
 // ajax request type
 DEFINE('AJAX_REQUEST_TYPE', 'POST');
 // what AJAX type to use
-DEFINE('USE_PROTOTYPE', true);
+DEFINE('USE_PROTOTYPE', false);
 DEFINE('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', false);
+DEFINE('USE_JQUERY', true);
 
 /************* LAYOUT WIDTHS *************/
 DEFINE('PAGE_WIDTH', 800);
 // the default template name
 DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 
+/************* OVERALL CONTROL NAMES *************/
+// BELOW has HAS to be changed
+// base name for all session and log names
+DEFINE('BASE_NAME', 'CoreLibs');
+
 /************* SESSION NAMES *************/
 // server name HASH
 DEFINE('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
+DEFINE('SERVER_PATH_HASH', hash('crc32b', BASE));
 // backend
-DEFINE('EDIT_SESSION_NAME', 'ADMIN_SESSION_NAME'.SERVER_NAME_HASH);
+DEFINE('EDIT_SESSION_NAME', BASE_NAME.'Admin'.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // frontend
-DEFINE('SESSION_NAME', 'SESSION_NAME'.SERVER_NAME_HASH);
+DEFINE('SESSION_NAME', BASE_NAME.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // SET_SESSION_NAME should be set in the header if a special session name is needed
-// DEFINE('SET_SESSION_NAME', SESSION_NAME);
+DEFINE('SET_SESSION_NAME', SESSION_NAME);
 
 /************* CACHE/COMPILE IDS *************/
-DEFINE('CACHE_ID', 'CACHE_'.SERVER_NAME_HASH);
+DEFINE('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
-DEFINE('COMPILE_ID', 'COMPILE_'.SERVER_NAME_HASH);
+DEFINE('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
 DEFINE('DEFAULT_LANG', 'en_utf8');
 // 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
-/************* LOGGING *******************/
+// as $LOG_FILE_ID which takes presence over LOG_FILE_ID
-// DEFINE('LOG_FILE_ID', '');
+// see Basic class constructor
+DEFINE('LOG_FILE_ID', BASE_NAME);
+
+/************* CLASS ERRORS *******************/
+// 0 = default all OFF
+// 1 = throw notice on unset class var
+// 2 = no notice on unset class var, but do not set undefined class var
+// 3 = throw error and do not set class var
+define('CLASS_VARIABLE_ERROR_MODE', 3);
 
 /************* QUEUE TABLE *************/
 // if we have a dev/live system
 // set_live is a per page/per item
 // live_queue is a global queue system
-//	DEFINE('QUEUE', 'live_queue');
+// DEFINE('QUEUE', 'live_queue');
 
 /************* DB PATHS (PostgreSQL) *****************/
 // schema names, can also be defined per <DB INFO>
@@ -159,32 +167,53 @@ DEFINE('DEV_SCHEMA', 'public');
 DEFINE('TEST_SCHEMA', 'public');
 DEFINE('LIVE_SCHEMA', 'public');
 
-/************* DB ACCESS *****************/
-if (file_exists(BASE.CONFIGS.'config.db.inc')) {
-	require BASE.CONFIGS.'config.db.inc';
-}
 /************* CORE HOST SETTINGS *****************/
-if (file_exists(BASE.CONFIGS.'config.host.inc')) {
+if (file_exists(BASE.CONFIGS.'config.host.php')) {
-	require BASE.CONFIGS.'config.host.inc';
+	require BASE.CONFIGS.'config.host.php';
+}
+if (!isset($SITE_CONFIG)) {
+	$SITE_CONFIG = array();
+}
+/************* DB ACCESS *****************/
+if (file_exists(BASE.CONFIGS.'config.db.php')) {
+	require BASE.CONFIGS.'config.db.php';
+}
+if (!isset($DB_CONFIG)) {
+	$DB_CONFIG = array();
 }
 /************* OTHER PATHS *****************/
-if (file_exists(BASE.CONFIGS.'config.path.inc')) {
+if (file_exists(BASE.CONFIGS.'config.path.php')) {
-	require BASE.CONFIGS.'config.path.inc';
+	require BASE.CONFIGS.'config.path.php';
 }
 
-// set the USE_DATABASE var, if there is nothing set, we assume TRUE
+/************* MASTER INIT *****************/
-$USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;
-
 // live frontend pages
 // ** missing live domains **
 // get the name without the port
 list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
-if (!isset($DB_HOST[$HOST_NAME]) && $USE_DATABASE) {
-	echo 'No matching DB config found. Contact Admin<br>';
-	exit -1;
-}
 // set HOST name
 DEFINE('HOST_NAME', $HOST_NAME);
+// BAIL ON MISSING MASTER SITE CONFIG
+if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
+	echo 'Missing SITE_CONFIG entry for: "'.HOST_NAME.'". Contact Administrator';
+	exit;
+}
+// BAIL ON MISSING DB CONFIG:
+// we have either no db selction for this host but have db config entries
+// or we have a db selection but no db config as array or empty
+// or we have a selection but no matching db config entry
+if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
+	(isset($SITE_CONFIG[HOST_NAME]['db_host']) &&
+		// missing DB CONFIG
+		((is_array($DB_CONFIG) && !count($DB_CONFIG)) ||
+		!is_array($DB_CONFIG) ||
+		// has DB CONFIG but no match
+		(is_array($DB_CONFIG) && count($DB_CONFIG) && !isset($DB_CONFIG[$SITE_CONFIG[HOST_NAME]['db_host']])))
+	)
+) {
+	echo 'No matching DB config found for: "'.HOST_NAME.'". Contact Administrator';
+	exit;
+}
 // set SSL on
 if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
 	$_SERVER['SERVER_PORT'] == 443) {
@@ -194,26 +223,26 @@ if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVE
 	DEFINE('HOST_SSL', false);
 	DEFINE('HOST_PROTOCOL', 'http://');
 }
-// define the static names
+// define the db config set name, the db config and the db schema
-DEFINE('LOGIN_DB', $DB_HOST[$HOST_NAME]);
+DEFINE('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
-DEFINE('MAIN_DB', $DB_HOST[$HOST_NAME]);
+DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
-DEFINE('DB_SCHEMA', $DB_PATH[$HOST_NAME]);
+// DEFINE('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// DEFINE('TARGET_DB', $DB_TARGET_HOST[$HOST_NAME]);
+// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
-// DEFINE('URL_REDIRECT_DB', $DB_URL_REDIRECT_HOST[$HOST_NAME]);
+// override for login and global schemas
-// next three if top is not set
+// DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
-// DEFINE('TEST_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
+// DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
-// DEFINE('DEV_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
+// debug settings, site lang, etc
-// DEFINE('PUBLIC_SCHEMA', $DB_CONFIG[TARGET_DB]['db_schema']);
+DEFINE('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
+DEFINE('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+DEFINE('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-DEFINE('TARGET', $LOCATION[$HOST_NAME]);
+DEFINE('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+// paths
 // DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
 // DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
 // DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
-DEFINE('DEBUG', $DEBUG_FLAG[$HOST_NAME]);
-DEFINE('SITE_LANG', $SITE_LANG[$HOST_NAME]);
 
-DEFINE('SHOW_ALL_ERRORS', true); // show all errors if debug_all & show_error_handling are enabled
+// show all errors if debug_all & show_error_handling are enabled
+DEFINE('SHOW_ALL_ERRORS', true);
 
 /************* GENERAL PAGE TITLE ********/
 DEFINE('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
@@ -226,11 +255,14 @@ DEFINE('JAVASCRIPT', 'frontend.js');
 
 // anything optional
 /************* INTERNAL ******************/
-// any other global definitons here
+// any other global definitons in the config.other.php
-//	DEFINE('SOME_ID', <SOME VALUE>);
+if (file_exists(BASE.CONFIGS.'config.other.php')) {
+	require BASE.CONFIGS.'config.other.php';
+}
 
 /************* CONVERT *******************/
-$paths = array (
+// this only needed if the external thumbnail create is used
+$paths = array(
 	'/bin',
 	'/usr/bin',
 	'/usr/local/bin'
@@ -242,21 +274,27 @@ foreach ($paths as $path) {
 		DEFINE('CONVERT', $path.DS.'convert');
 	}
 }
+unset($paths);
 
+/************* DEBUG *******************/
 // turn off debug if debug flag is OFF
 if (defined('DEBUG') && DEBUG == false) {
-	$ECHO_ALL = 0;
+	$ECHO_ALL = false;
-	$DEBUG_ALL = 0;
+	$DEBUG_ALL = false;
-	$PRINT_ALL = 0;
+	$PRINT_ALL = false;
-	$DB_DEBUG = 0;
+	$DB_DEBUG = false;
-	$ENABLE_ERROR_HANDLING = 0;
+	$ENABLE_ERROR_HANDLING = false;
+	$DEBUG_ALL_OVERRIDE = false;
 } else {
-	$ECHO_ALL = 0;
+	$ECHO_ALL = false;
-	$DEBUG_ALL = 1;
+	$DEBUG_ALL = true;
-	$PRINT_ALL = 1;
+	$PRINT_ALL = true;
-	$DB_DEBUG = 1;
+	$DB_DEBUG = true;
+	$ENABLE_ERROR_HANDLING = false;
+	$DEBUG_ALL_OVERRIDE = false;
 }
 
+/************* AUTO LOADER *******************/
 // read auto loader
 require BASE.LIB.'autoloader.php';
 

www/configs/config.other.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2019/10/28
+* SHORT DESCRIPTION:
+* other global constant variables
+* HISTORY:
+*********************************************************************/
+
+// DEFINE('SOME_ID', <SOME VALUE>);
+
+// __END__

www/configs/config.path.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -10,8 +10,12 @@
 
 // File and Folder paths
 // ID is TARGET (first array element)
-//	$PATHS['test']['csv_path'] = '';
+/*$PATHS = array(
-//	$PATHS['test']['perl_bin'] = '';
+	'test' => array(
-//	$PATHS['test']['redirect_url'] = '';
+		'csv_path' => '',
+		'perl_bin' => '',
+		'other_url' => '',
+	)
+)*/
 
 // __END__

www/configs/config.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11
@@ -12,8 +12,8 @@ define('CONFIG_PATH', 'configs'.DIRECTORY_SEPARATOR);
 $CONFIG_PATH_PREFIX = '';
 for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
 	$CONFIG_PATH_PREFIX .= '..'.DIRECTORY_SEPARATOR;
-	if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc')) {
+	if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php')) {
-		require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc';
+		require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php';
 		break;
 	}
 }
@@ -22,7 +22,7 @@ if (!defined('DS')) {
 	exit('Base config unloadable');
 }
 // find trigger name "admin/" or "frontend/" in the getcwd() folder
-foreach (array ('admin', 'frontend') as $folder) {
+foreach (array('admin', 'frontend') as $folder) {
 	if (strstr(getcwd(), DS.$folder)) {
 		define('CONTENT_PATH', $folder.DS);
 		break;

www/frontend/index.php

@@ -1,3 +1,3 @@
-<?php
+<?php declare(strict_types=1);
 
 require 'config.php';

www/includes/Date.Vars.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/19
@@ -7,7 +7,7 @@
 * HISTORY:
 *********************************************************************/
 
-$day_short = array (
+$day_short = array(
 	1 => 'Mon',
 	2 => 'Tue',
 	3 => 'Wed',
@@ -17,7 +17,7 @@ $day_short = array (
 	7 => 'Sun'
 );
 
-$day_long = array (
+$day_long = array(
 	1 => 'Monday',
 	2 => 'Tuesday',
 	3 => 'Wednesday',
@@ -28,7 +28,7 @@ $day_long = array (
 );
 
 // months
-$month_long = array (
+$month_long = array(
 	1 => 'January',
 	2 => 'February',
 	3 => 'March',
@@ -43,7 +43,7 @@ $month_long = array (
 	12 => 'December'
 );
 
-$month_short = array (
+$month_short = array(
 	1 => 'Jan',
 	2 => 'Feb',
 	3 => 'Mar',

www/includes/admin_footer.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/14

www/includes/admin_header.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -10,34 +10,37 @@
 //------------------------------ variable init start
 // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log
 if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
-	include BASE.LIBS."Error.Handling.inc";
+	include BASE.LIBS."Error.Handling.php";
 }
 // predefine vars
-$lang = '';
+$LANG = '';
-$messages = array ();
+$messages = array();
 // import all POST vars
-extract($_POST, EXTR_SKIP);
+// extract($_POST, EXTR_SKIP);
 //------------------------------ variable init end
 
 //------------------------------ library include start
 // set output to quiet for load of classes & session settings
 ob_start();
+// set the session name
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
+$LOG_FILE_ID = BASE_NAME.'Admin';
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
-// set encoding
+if (!isset($AJAX_PAGE)) {
-if (!isset($encoding)) {
+	$AJAX_PAGE = false;
-	$encoding = DEFAULT_ENCODING;
 }
-// set the default lang, if not given
+if (!isset($ZIP_STREAM)) {
-if (session_id() && $_SESSION['DEFAULT_LANG']) {
+	$ZIP_STREAM = false;
-	$lang = $_SESSION['DEFAULT_LANG'];
+}
-} elseif (!$lang) {
+// set encoding
-	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+if (!isset($ENCODING) || !$ENCODING) {
+	$ENCODING = DEFAULT_ENCODING;
 }
 // end the stop of the output flow, but only if we didn't request a csv file download
-if (array_key_exists('action', $_POST) && $_POST['action'] != 'download_csv') {
+if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE) {
-	header("Content-type: text/html; charset=".$encoding);
+	header("Content-type: text/html; charset=".$ENCODING);
 }
 if ($AJAX_PAGE && !$ZIP_STREAM) {
 	header("Content-Type: application/json; charset=UTF-8");
@@ -46,21 +49,21 @@ if ($AJAX_PAGE && !$ZIP_STREAM) {
 
 //------------------------------ class init start
 // login & page access check
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
 // post login lang check
-if ($_SESSION['DEFAULT_LANG']) {
+if (isset($_SESSION['DEFAULT_LANG'])) {
-	$lang = $_SESSION['DEFAULT_LANG'];
+	$LANG = $_SESSION['DEFAULT_LANG'];
 }
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new CoreLibs\Template\SmartyExtend();
 // create new DB class
-$cms = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
+$cms = new CoreLibs\Admin\Backend(DB_CONFIG);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
 $cms->dbInfo();
 // set acl
-$cms->acl = $login->acl;
+$cms->setACL($login->acl);
 // flush
 ob_end_flush();
 //------------------------------ class init end
@@ -68,7 +71,7 @@ ob_end_flush();
 //------------------------------ logging start
 // log backend data
 // data part creation
-$data = array (
+$data = array(
 	'_SESSION' => $_SESSION,
 	'_GET' => $_GET,
 	'_POST' => $_POST,
@@ -81,22 +84,16 @@ if (!$login->login) {
 }
 //------------------------------ logging end
 
-//------------------------------ page rights start
-// flag if to show the edit access id drop down list
-// check if we have more than one EA ID
-$cms->DATA['show_ea_extra'] = $login->acl['acl']['show_ea_extra'];
-//------------------------------ page rights ned
-
 // automatic hide for DEBUG messages on live server
 // can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
 if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
-	$login->debug_output_all = 0;
+	$login->debug_output_all = false;
-	$login->echo_output_all = 0;
+	$login->echo_output_all = false;
-	$login->print_output_all = 0;
+	$login->print_output_all = false;
-	$cms->debug_output_all = 0;
+	$cms->debug_output_all = false;
-	$cms->echo_output_all = 0;
+	$cms->echo_output_all = false;
-	$cms->print_output_all = 0;
+	$cms->print_output_all = false;
 }
-$cms->DATA['JS_DEBUG'] = DEBUG;
+$smarty->DATA['JS_DEBUG'] = DEBUG;
 
 // __END__

www/includes/admin_set_paths.inc

@@ -1,166 +0,0 @@
-<?php
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2007/09/03
-* SHORT DESCRIPTION:
-* set paths & language variables
-* HISTORY:
-*********************************************************************/
-
-// master template
-if (!isset($MASTER_TEMPLATE_NAME)) {
-	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
-}
-
-// just emergency fallback for language
-// set encoding
-if (isset($_SESSION['DEFAULT_CHARSET'])) {
-	$encoding = $_SESSION['DEFAULT_CHARSET'];
-} elseif (!isset($encoding)) {
-	$encoding = DEFAULT_ENCODING;
-}
-// just emergency fallback for language
-if (isset($_SESSION['DEFAULT_LANG'])) {
-	$lang = $_SESSION['DEFAULT_LANG'];
-} elseif (!isset($lang)) {
-	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
-}
-// create the char lang encoding
-$lang_short = substr($lang, 0, 2);
-
-// set include & template names
-$PAGE_FILE_NAME = str_replace(".php", "", $cms->page_name);
-// set include & template names
-if (!isset($CONTENT_INCLUDE)) {
-	$CONTENT_INCLUDE = $PAGE_FILE_NAME.'.tpl';
-}
-$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
-// set local page title
-$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
-// strip tpl and replace it with inc
-// php include file per page
-$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
-// javascript include per page
-$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
-// css per page
-$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
-// special CSS file
-$cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME;
-// special JS file
-$cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME;
-// compile & cache id
-$cms->CACHE_ID = isset($CACHE_ID) ? $CACHE_ID : CACHE_ID;
-$cms->COMPILE_ID = isset($COMPILE_ID) ? $COMPILE_ID : CACHE_ID;
-
-// set basic template path (tmp)
-$cms->includes = BASE.INCLUDES; // no longer in templates, only global
-$cms->template_path = BASE.INCLUDES.TEMPLATES.CONTENT_PATH;
-if ($smarty) {
-	$smarty->setTemplateDir($cms->template_path);
-}
-if (isset($LANGUAGE_FOLDER)) {
-	$cms->lang_dir = $LANGUAGE_FOLDER;
-} else {
-	$cms->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH; // no outside
-}
-$cms->javascript = LAYOUT.JS;
-$cms->css = LAYOUT.CSS;
-$cms->pictures = LAYOUT.IMAGES;
-$cms->cache_pictures = LAYOUT.CACHE;
-$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-if (!is_dir($cms->cache_pictures_root)) {
-	mkdir($cms->cache_pictures_root);
-}
-// check if we have an external file with the template name
-if (file_exists($cms->includes.$cms->INC_TEMPLATE_NAME) &&
-	is_file($cms->includes.$cms->INC_TEMPLATE_NAME)
-) {
-	include($cms->includes.$cms->INC_TEMPLATE_NAME);
-}
-// only CSS/JS/etc include stuff if we have non AJAX page
-if (!$AJAX_PAGE) {
-	// check for template include
-	if (isset($USE_INCLUDE_TEMPLATE) && $USE_INCLUDE_TEMPLATE === true && !isset($TEMPLATE_NAME)) {
-		$TEMPLATE_NAME = $CONTENT_INCLUDE;
-		// add to cache & compile id
-		$cms->COMPILE_ID .= '_'.$TEMPLATE_NAME;
-		$cms->CACHE_ID .= '_'.$TEMPLATE_NAME;
-	}
-	// additional per page Javascript include
-	$cms->JS_INCLUDE = '';
-	if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) {
-		$cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME;
-	}
-	// per page css file
-	$cms->CSS_INCLUDE = '';
-	if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) {
-		$cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME;
-	}
-	// optional CSS file
-	$cms->CSS_SPECIAL_INCLUDE = '';
-	if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) {
-		$cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME;
-	}
-	// optional JS file
-	$cms->JS_SPECIAL_INCLUDE = '';
-	if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) {
-		$cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME;
-	}
-	if ($smarty) {
-		// check if template names exist
-		if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) {
-			// abort if master template could not be found
-			exit('MASTER TEMPLATE: '.$MASTER_TEMPLATE_NAME.' could not be found');
-		}
-		if (isset($TEMPLATE_NAME) && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-			exit('INCLUDE TEMPLATE: '.$TEMPLATE_NAME.' could not be found');
-		}
-	}
-}
-
-// if the lang folder is different to the default one
-// if the default lang is not like the lang given, switch lang
-if (false === strstr(BASE.INCLUDES.LANG.CONTENT_PATH, $cms->lang_dir) ||
-	strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
-) {
-	$cms->debug('LANG', 'Orig: '.BASE.INCLUDES.LANG.CONTENT_PATH.', New: '.$cms->lang_dir.' | Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
-	$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
-	// if we have login class
-	if ($login) {
-		$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
-	}
-	// if we have smarty template class
-	if ($smarty) {
-		$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
-	}
-}
-
-if (!$AJAX_PAGE) {
-	// javascript translate data as template for auto translate
-	if (!$TEMPLATE_TRANSLATE) {
-		$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
-		$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
-	} else {
-		// we assume we have some fixed set
-		// we must add _<$lang>
-		// if .tpl, put before .tpl
-		// if not .tpl, add _<$lang>.tpl
-		if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
-			$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
-		} else {
-			$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
-		}
-	}
-	// if we can't find it, dump it
-	if ($smarty && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
-		unset($TEMPLATE_TRANSLATE);
-	}
-}
-
-//	$cms->debug("LANGUAGE", "L: $lang | ".$cms->lang_dir." | MO File: ".$cms->l->mofile);
-$cms->debug("LANGUAGE", "SL: ".$_SESSION['DEFAULT_CHARSET']." | ".$_SESSION['LANG']." | ".$_SESSION['DEFAULT_LANG']);
-if ($smarty) {
-	$cms->debug("TEMPLATE", "P: ".$smarty->getTemplateDir()[0]);
-}
-
-// __END__

www/includes/admin_set_paths.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2007/09/03
+* SHORT DESCRIPTION:
+* set paths & language variables
+* HISTORY:
+*********************************************************************/
+
+/******
+NOTE THAT THIS INCLUDE IS OBSOLETE
+USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
+*******/
+trigger_error('admin_set_paths.php is deprecated. Use SmartyExtended->setSmartyPaths();', E_USER_DEPRECATED);
+if ($smarty) {
+	$smarty->setSmartyPaths();
+}
+
+// __END__

www/includes/admin_smarty.inc

@@ -1,80 +0,0 @@
-<?php
-/********************************************************************
-* AUTHOR: Clemens Schwaighofer
-* CREATED: 2005/07/12
-* SHORT DESCRIPTION:
-* default smarty vars, and create output template for smarty
-* HISTORY:
-*********************************************************************/
-
-// trigger flags
-$cms->HEADER['USE_PROTOTYPE'] = isset($USE_PROTOTYPE) ? $USE_PROTOTYPE : USE_PROTOTYPE;
-// scriptacolous, can only be used with prototype
-if ($cms->HEADER['USE_PROTOTYPE']) {
-	$cms->HEADER['USE_SCRIPTACULOUS'] = isset($USE_SCRIPTACULOUS) ? $USE_SCRIPTACULOUS : USE_SCRIPTACULOUS;
-}
-// jquery and prototype should not be used together
-$cms->HEADER['USE_JQUERY'] = isset($USE_JQUERY) ? $USE_JQUERY : USE_JQUERY; // don't use either of those two together
-
-// the actual include files for javascript (per page)
-$cms->HEADER['JS_INCLUDE'] = $cms->JS_INCLUDE;
-$cms->HEADER['CSS_INCLUDE'] = $cms->CSS_INCLUDE;
-$cms->HEADER['CSS_SPECIAL_INCLUDE'] = $cms->CSS_SPECIAL_INCLUDE;
-$cms->HEADER['JS_SPECIAL_INCLUDE'] = $cms->JS_SPECIAL_INCLUDE;
-// paths to the files
-$cms->DATA['includes'] = $cms->includes;
-$cms->DATA['js'] = $cms->javascript;
-$cms->DATA['css'] = $cms->css;
-$cms->DATA['pictures'] = $cms->pictures;
-
-// default CMS settings
-// define all needed smarty stuff for the general HTML/page building
-$cms->HEADER['CSS'] = CSS;
-$cms->HEADER['JS'] = JS;
-$cms->HEADER['ENCODING'] = $encoding;
-$cms->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-$cms->HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET;
-$cms->HEADER['JAVASCRIPT'] = isset($ADMIN_JAVASCRIPT) ? $ADMIN_JAVASCRIPT : ADMIN_JAVASCRIPT;
-// html title
-$cms->HEADER['HTML_TITLE'] = isset($L_TITLE) ? $cms->l->__($L_TITLE) : $cms->l->__(G_TITLE);
-$cms->DATA['table_width'] = isset($PAGE_WIDTH) ? $PAGE_WIDTH : PAGE_WIDTH;
-
-// messages = array('msg' =>, 'class' => 'error/warning/...')
-$cms->DATA['messages'] = $cms->messages;
-
-// top menu
-$cms->DATA['nav_menu'] = $cms->adbTopMenu();
-// the page name
-$cms->DATA['page_name'] = $cms->page_name;
-// user name
-$cms->DATA['USER_NAME'] = $_SESSION['USER_NAME'];
-// the template part to include into the body
-$cms->DATA['TEMPLATE_NAME'] = $TEMPLATE_NAME;
-$cms->DATA['CONTENT_INCLUDE'] = $CONTENT_INCLUDE;
-// LANG
-$cms->DATA['LANG'] = $lang;
-$cms->DATA['TINYMCE_LANG'] = $lang_short;
-
-// debug data, if DEBUG flag is on, this data is print out
-$cms->DEBUG_DATA['debug_error_msg'] = $cms->runningTime();
-$cms->DEBUG_DATA['DEBUG'] = @$DEBUG_TMPL;
-
-// create main data array
-$cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA);
-// data is 1:1 mapping (all vars, values, etc)
-foreach ($cms->CONTENT_DATA as $key => $value) {
-	$smarty->assign($key, $value);
-}
-if (is_dir(BASE.TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE.TEMPLATES_C);
-}
-if (is_dir(BASE.CACHE)) {
-	$smarty->setCacheDir(BASE.CACHE);
-}
-$smarty->display(
-	$MASTER_TEMPLATE_NAME,
-	$cms->CACHE_ID.($cms->CACHE_ID ? '_' : '').$lang,
-	$cms->COMPILE_ID.($cms->COMPILE_ID ? '_' : '').$lang
-);
-
-// __END__

www/includes/admin_smarty.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2005/07/12
+* SHORT DESCRIPTION:
+* default smarty vars, and create output template for smarty
+* HISTORY:
+*********************************************************************/
+
+/******
+NOTE THAT THIS INCLUDE IS OBSOLETE
+USE THE BELOW FUNCTION CALL IN THE SCRIPT ITSELF
+*******/
+trigger_error('admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();', E_USER_DEPRECATED);
+$smarty->setSmartyVarsAdmin();
+
+// __END__

www/includes/edit_base.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -24,14 +24,10 @@ $DB_DEBUG = 1;
 // TODO: only extract _POST data that is needed
 extract($_POST, EXTR_SKIP);
 
-$table_width = '100%';
-// this is for certain CMS modules that set a relative path
-define('REL_PATH', '');
-
 ob_start();
 require 'config.php';
 // set session name here
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+$SET_SESSION_NAME = EDIT_SESSION_NAME;
 // overrride debug flags
 if (!DEBUG)	{
 	$DEBUG_ALL = 0;
@@ -40,23 +36,21 @@ if (!DEBUG)	{
 	$ECHO_ALL = 0;
 }
 
-// set default lang if not set otherwise
-if (!$lang) {
-	$lang = DEFAULT_LANG;
-}
 // should be utf8
 header("Content-type: text/html; charset=".DEFAULT_ENCODING);
 ob_end_flush();
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
 
 // create form class
-$form = new CoreLibs\Output\Form\Generate($DB_CONFIG[MAIN_DB], $lang);
+$form = new CoreLibs\Output\Form\Generate(DB_CONFIG);
 if ($form->mobile_phone) {
 	echo "I am sorry, but this page cannot be viewed by a mobile phone";
 	exit;
 }
 // smarty template engine (extended Translation version)
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new CoreLibs\Template\SmartyExtend();
+
+// $form->debug('POST', $form->printAr($_POST));
 
 if (TARGET == 'live' || TARGET == 'remote') {
 	// login
@@ -68,6 +62,12 @@ if (TARGET == 'live' || TARGET == 'remote') {
 	$form->echo_output_all = 0;
 	$form->print_output_all = DEBUG ? 1 : 0;
 }
+// space for setting special debug flags
+$login->debug_output_all = 1;
+// set smarty arrays
+$HEADER = array();
+$DATA = array();
+$DEBUG_DATA = array();
 // set the template dir
 // WARNING: this has a special check for the mailing tool layout (old layout)
 if (defined('LAYOUT')) {
@@ -79,32 +79,8 @@ if (defined('LAYOUT')) {
 	$DATA['css'] = CSS;
 	$DATA['js'] = JS;
 }
-
+// set table width
-// space for setting special debug flags
+$table_width = '100%';
-$login->debug_output_all = 1;
-
-// define edit logging function. should be in a special edit interface class later
-// METHOD: EditLog()
-// PARAMS: event -> any kind of event description, data -> any kind of data related to that event
-// RETURN: none
-// DESC:   writes all action vars plus other info into edit_log table
-function EditLog($event = '', $data = '')
-{
-	$q = "INSERT INTO edit_log ";
-	$q .= "(euid, event_date, ip, event, data, page) ";
-	$q .= "VALUES (".$_SESSION['EUID'].", NOW(), '".$_SERVER["REMOTE_ADDR"]."', '".$GLOBALS['form']->dbEscapeString($event)."', '".$GLOBALS['form']->dbEscapeString($data)."', '".$GLOBALS['form']->getPageName()."')";
-}
-
-// log backend data
-// data part creation
-$data = array (
-	'_SESSION' => $_SESSION,
-	'_GET' => $_GET,
-	'_POST' => $_POST,
-	'_FILES' => $_FILES
-);
-// log action
-EditLog('Edit Submit', serialize($data));
 
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
@@ -118,20 +94,22 @@ if ($form->my_page_name == 'edit_order') {
 	// order name is _always_ order_number for the edit interface
 
 	// follwing arrays do exist here:
-	// $position ... has the positions of the array (0..max), cause in a <select>
+	// $position ... has the positions of the array(0..max), cause in a <select>
 	//               I can't put an number into the array field, in this array,
 	//               there are the POSITION stored, that should CHANGE there order (up/down)
 	// $row_data_id ... has ALL ids from the sorting part
 	// $row_data_order ... has ALL order positions from the soirting part
-	if (!is_array($position)) {
+	if (!isset($position)) {
-		$position = array ();
+		$position = array();
 	}
+	$row_data_id = $_POST['row_data_id'];
+	$original_id = $row_data_id;
 	if (count($position)) {
-		$original_id = $row_data_id;
+		$row_data_order = $_POST['row_data_order'];
 
 		// FIRST u have to put right sort, then read again ...
 		// hast to be >0 or the first one is selected and then there is no move
-		if ($up && $position[0] > 0) {
+		if (isset($up) && isset($position[0]) && $position[0] > 0) {
 			for ($i = 0; $i < count($position); $i++) {
 				// change position order
 				// this gets temp, id before that, gets actual (moves one "down")
@@ -139,14 +117,14 @@ if ($form->my_page_name == 'edit_order') {
 				// is done for every element in row
 				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
 				$temp_id = $row_data_id[$position[$i]];
-				$row_data_id[$position[$i]] = $row_data_id[$position[$i]-1];
+				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1];
-				$row_data_id[$position[$i]-1] = $temp_id;
+				$row_data_id[$position[$i] - 1] = $temp_id;
 				// echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
 			} // for
 		} // if up
 
 		// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
-		if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
+		if (isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
 			for ($i = count($position) - 1; $i >= 0; $i --)	{
 				// same as up, just up in other way, starts from bottom (last element) and moves "up"
 				// element before actuel gets temp, this element, becomes element after this,
@@ -158,7 +136,9 @@ if ($form->my_page_name == 'edit_order') {
 		} // if down
 
 		// write data ... (which has to be abstrackt ...)
-		if (($up && $position[0] > 0) || ($down && ($position[count($position) - 1]!=(count($row_data_id) - 1)))) {
+		if ((isset($up) && $position[0] > 0) ||
+			(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
+		) {
 			for ($i = 0; $i < count($row_data_id); $i ++) {
 				$q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
 				$q = $form->dbExec($q);
@@ -168,13 +148,19 @@ if ($form->my_page_name == 'edit_order') {
 
 	// get ...
 	$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
-	if ($where_string) {
+	if (!empty($where_string)) {
 		$q .= "WHERE $where_string ";
 	}
 	$q .= "ORDER BY order_number";
 
+	// init arrays
+	$row_data = array();
+	$options_id = array();
+	$options_name = array();
+	$options_selected = array();
+	// DB read data for menu
 	while ($res = $form->dbReturn($q)) {
-		$row_data[] = array (
+		$row_data[] = array(
 			"id" => $res[$table_name."_id"],
 			"name" => $res["name"],
 			"order" => $res["order_number"]
@@ -184,26 +170,24 @@ if ($form->my_page_name == 'edit_order') {
 	// html title
 	$HEADER['HTML_TITLE'] = $form->l->__('Edit Order');
 
+	$messages = array();
 	// error msg
-	if ($error) {
+	if (isset($error)) {
-		$messages[] = array ('msg' => $msg, 'class' => 'error', 'width' => '100%');
+		if (!isset($msg)) {
+			$msg = array();
+		}
+		$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => '100%');
 	}
 	$DATA['form_error_msg'] = $messages;
 
 	// all the row data
-	$options_id = array ();
-	$options_name = array ();
-	$options_selected = array ();
-	if (!is_array($row_data)) {
-		$row_data = array ();
-	}
 	for ($i = 0; $i < count($row_data); $i ++) {
 		$options_id[] = $i;
-		$options_name[] = $row_data[$i]["name"];
+		$options_name[] = $row_data[$i]['name'];
 		// list of points to order
 		for ($j = 0; $j < count($position); $j++) {
 			// if matches, put into select array
-			if ($original_id[$position[$j]] == $row_data[$i]["id"]) {
+			if ($original_id[$position[$j]] == $row_data[$i]['id']) {
 				$options_selected[] = $i;
 			}
 		}
@@ -213,55 +197,63 @@ if ($form->my_page_name == 'edit_order') {
 	$DATA['options_selected'] = $options_selected;
 
 	// hidden list for the data (id, order number)
-	$row_data_id = array ();
+	$row_data_id = array();
-	$row_data_order = array ();
+	$row_data_order = array();
 	for ($i = 0; $i < count($row_data); $i++) {
-		$row_data_id[] = $row_data[$i]["id"];
+		$row_data_id[] = $row_data[$i]['id'];
-		$row_data_order[] = $row_data[$i]["order"];
+		$row_data_order[] = $row_data[$i]['order'];
 	}
 	$DATA['row_data_id'] = $row_data_id;
 	$DATA['row_data_order'] = $row_data_order;
 
 	// hidden names for the table & where string
 	$DATA['table_name'] = $table_name;
-	$DATA['where_string'] = $where_string;
+	$DATA['where_string'] = isset($where_string) ? $where_string : '';
 
 	$EDIT_TEMPLATE = 'edit_order.tpl';
 } else {
-	$form->formProcedureLoad(${$form->archive_pk_name});
+	// load call only if id is set
+	if (isset(${$form->archive_pk_name})) {
+		$form->formProcedureLoad(${$form->archive_pk_name});
+	}
 	$form->formProcedureNew();
 	$form->formProcedureSave();
 	$form->formProcedureDelete();
-	$form->formProcedureDeleteFromElementList($element_list, $remove_name);
+	// delete call only if those two are set
+	if (isset($element_list) && isset($remove_name)) {
+		$form->formProcedureDeleteFromElementList($element_list, $remove_name);
+	}
 
 	$DATA['table_width'] = $table_width;
 
+	$messages = array();
 	// write out error / status messages
 	$messages[] = $form->formPrintMsg();
 	$DATA['form_error_msg'] = $messages;
 
 	// MENU START
 	// request some session vars
-	if (!$HEADER_COLOR) {
+	if (!isset($HEADER_COLOR)) {
-		$DATA['HEADER_COLOR'] = "#E0E2FF";
+		$DATA['HEADER_COLOR'] = '#E0E2FF';
 	} else {
 		$DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR'];
 	}
-	$DATA['USER_NAME'] = $_SESSION["USER_NAME"];
+	$DATA['USER_NAME'] = $_SESSION['USER_NAME'];
-	$DATA['EUID'] = $_SESSION["EUID"];
+	$DATA['EUID'] = $_SESSION['EUID'];
-	$DATA['GROUP_NAME'] = $_SESSION["GROUP_NAME"];
+	$DATA['GROUP_NAME'] = $_SESSION['GROUP_NAME'];
-	$DATA['GROUP_LEVEL'] = $_SESSION["GROUP_LEVEL"];
+	$DATA['GROUP_LEVEL'] = $_SESSION['GROUP_ACL_LEVEL'];
-	$PAGES = $_SESSION["PAGES"];
+	$PAGES = $_SESSION['PAGES'];
 
 	//$form->debug('menu', $form->printAr($PAGES));
 
 	// build nav from $PAGES ...
-	if (!is_array($PAGES)) {
+	if (!isset($PAGES) || !is_array($PAGES)) {
-		$PAGES = array ();
+		$PAGES = array();
 	}
-	for ($i = 0, $i_max = count($PAGES); $i < $i_max; $i ++) {
+	$menuarray = array();
-		if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) {
+	foreach ($PAGES as $PAGE_CUID => $PAGE_DATA) {
-			$menuarray[] = $PAGES[$i];
+		if ($PAGE_DATA['menu'] && $PAGE_DATA['online']) {
+			$menuarray[] = $PAGE_DATA;
 		}
 	}
 
@@ -276,34 +268,45 @@ if ($form->my_page_name == 'edit_order') {
 		}
 	}
 
+	$position = 0;
+	$menu_data = array();
 	for ($i = 1; $i <= count($menuarray); $i ++) {
 		// do that for new array
 		$j = $i - 1;
-		$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]["page_name"]);
+		$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]['page_name']);
-		$menu_data[$j]['filename'] = $menuarray[($i-1)]["filename"].$menuarray[($i-1)]["query_string"];
+		$menu_data[$j]['filename'] = $menuarray[($i-1)]['filename'].(isset($menuarray[$j]['query_string']) ? $menuarray[$j]['query_string'] : '');
-		if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) {
+		if ($i == 1 || !($j % $SPLIT_FACTOR)) {
 			$menu_data[$j]['splitfactor_in'] = 1;
+		} else {
+			$menu_data[$j]['splitfactor_in'] = 0;
 		}
-		if ($menuarray[($i - 1)]["filename"] == $form->getPageName()) {
+		if ($menuarray[$j]['filename'] == $form->getPageName()) {
-			$position = $i - 1;
+			$position = $j;
 			$menu_data[$j]['position'] = 1;
+			$menu_data[$j]['popup'] = 0;
 		} else {
 			// add query stuff
 			// HAS TO DONE LATER ... set urlencode, etc ...
 			// check if popup needed
-			if ($menuarray[($i - 1)]["popup"]) {
+			if (isset($menuarray[$j]['popup']) && $menuarray[$j]['popup'] == 1) {
 				$menu_data[$j]['popup'] = 1;
-				$menu_data[$j]['rand'] = uniqid(rand());
+				$menu_data[$j]['rand'] = uniqid((string)rand());
-				$menu_data[$j]['width'] = $menuarray[($i-1)]["popup_x"];
+				$menu_data[$j]['width'] = $menuarray[$j]['popup_x'];
-				$menu_data[$j]['height'] = $menuarray[($i-1)]["popup_y"];
+				$menu_data[$j]['height'] = $menuarray[$j]['popup_y'];
-			} // popup or not
+			} else {
+				$menu_data[$j]['popup'] = 0;
+			}
+			$menu_data[$j]['position'] = 0;
 		} // highlight or not
 		if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) {
 			$menu_data[$j]['splitfactor_out'] = 1;
-		} // split
+		} else {
+			$menu_data[$j]['splitfactor_out'] = 0;
+		}
 	} // for
+	// $form->debug('MENU ARRAY', $form->printAr($menu_data));
 	$DATA['menu_data'] = $menu_data;
-	$DATA['page_name'] = $menuarray[$position]["page_name"];
+	$DATA['page_name'] = $menuarray[$position]['page_name'];
 	$L_TITLE = $DATA['page_name'];
 	// html title
 	$HEADER['HTML_TITLE'] = $form->l->__($L_TITLE);
@@ -315,115 +318,124 @@ if ($form->my_page_name == 'edit_order') {
 	if ($form->yes) {
 		$DATA['form_yes'] = $form->yes;
 		$DATA['form_my_page_name'] = $form->my_page_name;
-
+		$DATA['filename_exist'] = 0;
+		$DATA['drop_down_input'] = 0;
+		$elements = array();
 		// depending on the "getPageName()" I show different stuff
 		switch ($form->my_page_name) {
-			case "edit_users":
+			case 'edit_users':
-				$elements[] = $form->formCreateElement("login_error_count");
+				$elements[] = $form->formCreateElement('login_error_count');
-				$elements[] = $form->formCreateElement("login_error_date_last");
+				$elements[] = $form->formCreateElement('login_error_date_last');
-				$elements[] = $form->formCreateElement("login_error_date_first");
+				$elements[] = $form->formCreateElement('login_error_date_first');
-				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement('protected');
-				$elements[] = $form->formCreateElement("username");
+				$elements[] = $form->formCreateElement('username');
-				$elements[] = $form->formCreateElement("password");
+				$elements[] = $form->formCreateElement('password');
-				$elements[] = $form->formCreateElement("password_change_interval");
+				$elements[] = $form->formCreateElement('password_change_interval');
-				$elements[] = $form->formCreateElement("email");
+				$elements[] = $form->formCreateElement('email');
-				$elements[] = $form->formCreateElement("last_name");
+				$elements[] = $form->formCreateElement('last_name');
-				$elements[] = $form->formCreateElement("first_name");
+				$elements[] = $form->formCreateElement('first_name');
-				$elements[] = $form->formCreateElement("edit_group_id");
+				$elements[] = $form->formCreateElement('edit_group_id');
-				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement('edit_access_right_id');
-				$elements[] = $form->formCreateElement("strict");
+				$elements[] = $form->formCreateElement('strict');
-				$elements[] = $form->formCreateElement("locked");
+				$elements[] = $form->formCreateElement('locked');
-				$elements[] = $form->formCreateElement("admin");
+				$elements[] = $form->formCreateElement('admin');
-				$elements[] = $form->formCreateElement("debug");
+				$elements[] = $form->formCreateElement('debug');
-				$elements[] = $form->formCreateElement("db_debug");
+				$elements[] = $form->formCreateElement('db_debug');
-				$elements[] = $form->formCreateElement("edit_language_id");
+				$elements[] = $form->formCreateElement('edit_language_id');
-				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElement('edit_scheme_id');
-				$elements[] = $form->formCreateElementListTable("edit_access_user");
+				$elements[] = $form->formCreateElementListTable('edit_access_user');
+				$elements[] = $form->formCreateElement('additional_acl');
 				break;
-			case "edit_schemes":
+			case 'edit_schemes':
-				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement("header_color");
+				$elements[] = $form->formCreateElement('header_color');
-				$elements[] = $form->formCreateElement("template");
+				$elements[] = $form->formCreateElement('template');
 				break;
-			case "edit_pages":
+			case 'edit_pages':
-				if (!$form->table_array["edit_page_id"]["value"]) {
+				if (!isset($form->table_array['edit_page_id']['value'])) {
 					$q = "DELETE FROM temp_files";
 					$form->dbExec($q);
 					// gets all files in the current dir ending with .php
-					$crap = exec("ls *.php", $output, $status);
+					$crap = exec('ls *.php', $output, $status);
 					// now get all that are NOT in de DB
 					$q = "INSERT INTO temp_files VALUES ";
 					for ($i = 0; $i < count($output); $i ++) {
 						$t_q = "('".$form->dbEscapeString($output[$i])."')";
 						$form->dbExec($q.$t_q, 'NULL');
 					}
-					$elements[] = $form->formCreateElement("filename");
+					$elements[] = $form->formCreateElement('filename');
 				} else {
 					// show file menu
 					// just show name of file ...
 					$DATA['filename_exist'] = 1;
-					$DATA['filename'] = $form->table_array["filename"]["value"];
+					$DATA['filename'] = $form->table_array['filename']['value'];
 				} // File Name View IF
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				// $elements[] = $form->formCreateElement("tag");
+				// $elements[] = $form->formCreateElement('tag');
-				// $elements[] = $form->formCreateElement("min_acl");
+				// $elements[] = $form->formCreateElement('min_acl');
-				$elements[] = $form->formCreateElement("order_number");
+				$elements[] = $form->formCreateElement('order_number');
-				$elements[] = $form->formCreateElement("online");
+				$elements[] = $form->formCreateElement('online');
-				$elements[] = $form->formCreateElement("menu");
+				$elements[] = $form->formCreateElement('menu');
-				$elements[] = $form->formCreateElementListTable("edit_query_string");
+				$elements[] = $form->formCreateElementListTable('edit_query_string');
-				$elements[] = $form->formCreateElement("popup");
+				$elements[] = $form->formCreateElement('content_alias_edit_page_id');
-				$elements[] = $form->formCreateElement("popup_x");
+				$elements[] = $form->formCreateElementListTable('edit_page_content');
-				$elements[] = $form->formCreateElement("popup_y");
+				$elements[] = $form->formCreateElement('popup');
-				$elements[] = $form->formCreateElementReferenceTable("edit_visible_group");
+				$elements[] = $form->formCreateElement('popup_x');
-				$elements[] = $form->formCreateElementReferenceTable("edit_menu_group");
+				$elements[] = $form->formCreateElement('popup_y');
+				$elements[] = $form->formCreateElementReferenceTable('edit_visible_group');
+				$elements[] = $form->formCreateElementReferenceTable('edit_menu_group');
 				break;
-			case "edit_languages":
+			case 'edit_languages':
-				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement("short_name");
+				$elements[] = $form->formCreateElement('short_name');
-				$elements[] = $form->formCreateElement("long_name");
+				$elements[] = $form->formCreateElement('long_name');
-				$elements[] = $form->formCreateElement("iso_name");
+				$elements[] = $form->formCreateElement('iso_name');
 				break;
-			case "edit_groups":
+			case 'edit_groups':
-				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement('edit_access_right_id');
-				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElement('edit_scheme_id');
-				$elements[] = $form->formCreateElementListTable("edit_page_access");
+				$elements[] = $form->formCreateElementListTable('edit_page_access');
+				$elements[] = $form->formCreateElement('additional_acl');
 				break;
-			case "edit_visible_group":
+			case 'edit_visible_group':
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement("flag");
+				$elements[] = $form->formCreateElement('flag');
 				break;
-			case "edit_menu_group":
+			case 'edit_menu_group':
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement("flag");
+				$elements[] = $form->formCreateElement('flag');
-				$elements[] = $form->formCreateElement("order_number");
+				$elements[] = $form->formCreateElement('order_number');
 				break;
-			case "edit_access":
+			case 'edit_access':
-				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement('name');
-				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement('enabled');
-				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement('protected');
-				$elements[] = $form->formCreateElement("color");
+				$elements[] = $form->formCreateElement('color');
-				$elements[] = $form->formCreateElement("description");
+				$elements[] = $form->formCreateElement('description');
 				// add name/value list here
-				$elements[] = $form->formCreateElementListTable("edit_access_data");
+				$elements[] = $form->formCreateElementListTable('edit_access_data');
+				$elements[] = $form->formCreateElement('additional_acl');
 				break;
 			default:
-				print "[No valid page definition given]";
+				print '[No valid page definition given]';
 				break;
 		}
 		// $form->debug('edit', "Elements: <pre>".$form->printAr($elements));
 		$DATA['elements'] = $elements;
 		$DATA['hidden'] = $form->formCreateHiddenFields();
 		$DATA['save_delete'] = $form->formCreateSaveDelete();
+	} else {
+		$DATA['form_yes'] = 0;
 	}
 	$EDIT_TEMPLATE = 'edit_body.tpl';
 }
 
 // debug data, if DEBUG flag is on, this data is print out
-$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
+$DEBUG_DATA['DEBUG'] = isset($DEBUG_TMPL) ? $DEBUG_TMPL : '';
 
 // create main data array
 $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
@@ -437,7 +449,7 @@ if (is_dir(BASE.TEMPLATES_C)) {
 if (is_dir(BASE.CACHE)) {
 	$smarty->setCacheDir(BASE.CACHE);
 }
-$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$lang, 'editAdmin_'.$lang);
+$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$smarty->lang, 'editAdmin_'.$smarty->lang);
 
 // debug output
 echo $login->printErrorMsg();

www/includes/table_arrays/array_edit_access.inc

@@ -1,99 +0,0 @@
-<?php
-
-$edit_access = array (
-	"table_array" => array (
-		"edit_access_id" => array (
-			"value" => $GLOBALS["edit_access_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => $this->l->__("Access Group Name"),
-			"mandatory" => 1,
-			"type" => "text",
-			"error_check" => "alphanumericspace|unique"
-		),
-		"description" => array (
-			"value" => $GLOBALS["description"],
-			"output_name" => $this->l->__("Description"),
-			"type" => "textarea"
-		),
-		"color" => array (
-			"value" => $GLOBALS["color"],
-			"output_name" => $this->l->__("Color"),
-			"mandatory" => 0,
-			"type" => "text",
-			"size" => 6,
-			"length" => 6,
-			"error_check" => "custom",
-			"error_regex" => "/[\dA-Fa-f]{6}/",
-			"error_example" => "F6A544"
-		),
-		"enabled" => array (
-			"value" => $GLOBALS["enabled"],
-			"output_name" => "Enabled",
-			"type" => "binary",
-			"int" => 1, // OR "bool" => 1
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"protected" => array (
-			"value" => $GLOBALS["protected"],
-			"output_name" => "Protected",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		)
-	),
-	"table_name" => "edit_access",
-	"load_query" => "SELECT edit_access_id, name FROM edit_access ORDER BY name",
-	"show_fields" => array (
-		array (
-			"name" => "name"
-		)
-	),
-	"element_list" => array (
-		"edit_access_data" => array (
-			"output_name" => "Edit Access Data",
-			"type" => "reference_data", # is not a sub table read and connect, but only a sub table with data
-			"max_empty" => 5, # maxium visible if no data is set, if filled add this number to visible
-			"prefix" => "ead",
-			"elements" => array (
-				"edit_access_data_id" => array (
-					"output_name" => "Activate",
-					"type" => "hidden",
-					"int" => 1,
-					"pk_id" => 1
-				),
-				"name" => array (
-					"type" => "text",
-					"error_check" => "alphanumeric|unique",
-					"output_name" => "Name"
-				),
-				"value" => array (
-					"type" => "text",
-					"output_name" => "Value"
-				),
-				"enabled" => array (
-					"type" => "checkbox",
-					"output_name" => "Activate",
-					"int" => 1,
-					"element_list" => array(1)
-				),
-				"edit_access_id" => array (
-					"int" => 1,
-					"type" => "hidden",
-					"fk_id" => 1 # reference main key from master table above
-				)
-			)
-		)
-	)
-);
-
-// __END__

www/includes/table_arrays/array_edit_access.php

@@ -0,0 +1,108 @@
+<?php declare(strict_types=1);
+
+$edit_access = array(
+	'table_array' => array(
+		'edit_access_id' => array(
+			'value' => isset($GLOBALS['edit_access_id']) ? $GLOBALS['edit_access_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Access Group Name',
+			'mandatory' => 1,
+			'type' => 'text',
+			'error_check' => 'alphanumericspace|unique'
+		),
+		'description' => array(
+			'value' => isset($GLOBALS['description']) ? $GLOBALS['description'] : '',
+			'output_name' => 'Description',
+			'type' => 'textarea'
+		),
+		'color' => array(
+			'value' => isset($GLOBALS['color']) ? $GLOBALS['color'] : '',
+			'output_name' => 'Color',
+			'mandatory' => 0,
+			'type' => 'text',
+			'size' => 6,
+			'length' => 6,
+			'error_check' => 'custom',
+			'error_regex' => "/[\dA-Fa-f]{6}/",
+			'error_example' => 'F6A544'
+		),
+		'enabled' => array(
+			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : 0,
+			'output_name' => 'Enabled',
+			'type' => 'binary',
+			'int' => 1, // OR 'bool' => 1
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'protected' => array(
+			'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : 0,
+			'output_name' => 'Protected',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'additional_acl' => array(
+			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['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' => array(
+		array(
+			'name' => 'name'
+		)
+	),
+	'element_list' => array(
+		'edit_access_data' => array(
+			'output_name' => 'Edit Access Data',
+			'delete_name' => 'remove_edit_access_data',
+			// 'type' => 'reference_data', # is not a sub table read and connect, but only a sub table with data
+			'max_empty' => 5, # maxium visible if no data is set, if filled add this number to visible
+			'prefix' => 'ead',
+			'elements' => array(
+				'name' => array(
+					'type' => 'text',
+					'error_check' => 'alphanumeric|unique',
+					'output_name' => 'Name',
+					'mandatory' => 1
+				),
+				'value' => array(
+					'type' => 'text',
+					'output_name' => 'Value'
+				),
+				'enabled' => array(
+					'type' => 'checkbox',
+					'output_name' => 'Activate',
+					'int' => 1,
+					'element_list' => array(1)
+				),
+				/*'edit_access_id' => array(
+					'int' => 1,
+					'type' => 'hidden',
+					'fk_id' => 1 # reference main key from master table above
+				),*/
+				'edit_access_data_id' => array(
+					'type' => 'hidden',
+					'int' => 1,
+					'pk_id' => 1
+				)
+			)
+		)
+	)
+);
+
+// __END__

www/includes/table_arrays/array_edit_groups.inc

@@ -1,102 +0,0 @@
-<?php
-
-$edit_groups = array (
-	"table_array" => array (
-		"edit_group_id" => array (
-			"value" => $GLOBALS["edit_group_id"],
-			"pk" => 1,
-			"type" => "hidden"
-		),
-		"enabled" => array (
-			"value" => $GLOBALS["enabled"],
-			"output_name" => "Enabled",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => "Group Name",
-			"type" => "text",
-			"mandatory" => 1
-		),
-		"edit_access_right_id" => array (
-			"value" => $GLOBALS["edit_access_right_id"],
-			"output_name" => "Group Level",
-			"mandatory" => 1,
-			"int" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-		),
-		"edit_scheme_id" => array (
-			"value" => $GLOBALS["edit_scheme_id"],
-			"output_name" => "Group Scheme",
-			"int_null" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
-		)
-	),
-	"load_query" => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
-	"table_name" => "edit_group",
-	"show_fields" => array (
-		array (
-			"name" => "name"
-		),
-		array (
-			"name" => "enabled",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Enabled: "
-		)
-	),
-	"element_list" => array (
-		"edit_page_access" => array (
-			"output_name" => "Pages",
-			"mandatory" => 1,
-			"delete" => 0, // set then reference entries are deleted, else the "enable" flag is only set
-			"enable_name" => "enable_page_access",
-			"prefix" => "epa",
-			"read_data" => array (
-				"table_name" => "edit_page",
-				"pk_id" => "edit_page_id",
-				"name" => "name",
-				"order" => "order_number"
-			),
-			"elements" => array (
-				"edit_page_access_id" => array (
-					"output_name" => "Activate",
-					"type" => "hidden",
-					"int" => 1,
-					"pk_id" => 1
-				),
-				"enabled" => array (
-					"type" => "checkbox",
-					"output_name" => "Activate",
-					"int" => 1,
-					"element_list" => array(1)
-				),
-				"edit_access_right_id" => array (
-					"type" => "drop_down_db",
-					"output_name" => "Access Level",
-					"int" => 1,
-					"preset" => 1, // first of the select
-					"query" => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-				),
-				"edit_page_id" => array (
-					"int" => 1,
-					"type" => "hidden"
-				)
-				/*,
-				"edit_default" => array (
-					"output_name" => "Default",
-					"type" => "radio",
-					"mandatory" => 1
-				)*/
-			)
-		) // edit pages ggroup
-	)
-);
-
-// __END__

www/includes/table_arrays/array_edit_groups.php

@@ -0,0 +1,109 @@
+<?php declare(strict_types=1);
+
+$edit_groups = array(
+	'table_array' => array(
+		'edit_group_id' => array(
+			'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
+			'pk' => 1,
+			'type' => 'hidden'
+		),
+		'enabled' => array(
+			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+			'output_name' => 'Enabled',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Group Name',
+			'type' => 'text',
+			'mandatory' => 1
+		),
+		'edit_access_right_id' => array(
+			'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
+			'output_name' => 'Group Level',
+			'mandatory' => 1,
+			'int' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+		),
+		'edit_scheme_id' => array(
+			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+			'output_name' => 'Group Scheme',
+			'int_null' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
+		),
+		'additional_acl' => array(
+			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
+			'output_name' => 'Additional ACL (as JSON)',
+			'type' => 'textarea',
+			'error_check' => 'json',
+			'rows' => 10,
+			'cols' => 60
+		),
+	),
+	'load_query' => "SELECT edit_group_id, name, enabled FROM edit_group ORDER BY name",
+	'table_name' => 'edit_group',
+	'show_fields' => array(
+		array(
+			'name' => 'name'
+		),
+		array(
+			'name' => 'enabled',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Enabled: '
+		)
+	),
+	'element_list' => array(
+		'edit_page_access' => array(
+			'output_name' => 'Pages',
+			'mandatory' => 1,
+			'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
+			'enable_name' => 'enable_page_access',
+			'prefix' => 'epa',
+			'read_data' => array(
+				'table_name' => 'edit_page',
+				'pk_id' => 'edit_page_id',
+				'name' => 'name',
+				'order' => 'order_number'
+			),
+			'elements' => array(
+				'edit_page_access_id' => array(
+					'type' => 'hidden',
+					'int' => 1,
+					'pk_id' => 1
+				),
+				'enabled' => array(
+					'type' => 'checkbox',
+					'output_name' => 'Activate',
+					'int' => 1,
+					'element_list' => array(1)
+				),
+				'edit_access_right_id' => array(
+					'type' => 'drop_down_db',
+					'output_name' => 'Access Level',
+					'int' => 1,
+					'preset' => 1, // first of the select
+					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+				),
+				'edit_page_id' => array(
+					'int' => 1,
+					'type' => 'hidden'
+				)
+				/*,
+				'edit_default' => array(
+					'output_name' => 'Default',
+					'type' => 'radio',
+					'mandatory' => 1
+				)*/
+			)
+		) // edit pages ggroup
+	)
+);
+
+// __END__

www/includes/table_arrays/array_edit_languages.inc

@@ -1,75 +0,0 @@
-<?php
-
-$edit_languages=array (
-	"table_array" => array (
-		"edit_language_id" => array (
-			"value" => $GLOBALS["edit_language_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"short_name" => array (
-			"value" => $GLOBALS["short_name"],
-			"output_name" => "Language (short)",
-			"mandatory" => 1,
-			"type" => "text",
-			"size" => 2,
-			"length" => 2
-		),
-		"long_name" => array (
-			"value" => $GLOBALS["long_name"],
-			"output_name" => "Language (long)",
-			"mandatory" => 1,
-			"type" => "text",
-			"size" => 40
-		),
-		"iso_name" => array (
-			"value" => $GLOBALS["iso_name"],
-			"output_name" => "ISO Code",
-			"mandatory" => 1,
-			"type" => "text"
-		),
-		"order_number" => array (
-			"value" => $GLOBALS["order_number"],
-			"int" => 1,
-			"order" => 1
-		),
-		"enabled" => array (
-			"value" => $GLOBALS["enabled"],
-			"output_name" => "Enabled",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"lang_default" => array (
-			"value" => $GLOBALS["lang_default"],
-			"output_name" => "Default Language",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		)
-	),
-	"load_query" => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
-	"show_fields" => array (
-		array (
-			"name" => "long_name"
-		),
-		array (
-			"name" => "iso_name",
-			"before_value" => "ISO: "
-		),
-		array (
-			"name" => "enabled",
-			"before_value" => "Enabled: ",
-			"binary" => array ("Yes","No")
-		)
-	),
-	"table_name" => "edit_language"
-);
-
-// __END__

www/includes/table_arrays/array_edit_languages.php

@@ -0,0 +1,75 @@
+<?php declare(strict_types=1);
+
+$edit_languages=array(
+	'table_array' => array(
+		'edit_language_id' => array(
+			'value' => isset($GLOBALS['edit_language_id']) ? $GLOBALS['edit_language_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'short_name' => array(
+			'value' => isset($GLOBALS['short_name']) ? $GLOBALS['short_name'] : '',
+			'output_name' => 'Language (short)',
+			'mandatory' => 1,
+			'type' => 'text',
+			'size' => 2,
+			'length' => 2
+		),
+		'long_name' => array(
+			'value' => isset($GLOBALS['long_name']) ? $GLOBALS['long_name'] : '',
+			'output_name' => 'Language (long)',
+			'mandatory' => 1,
+			'type' => 'text',
+			'size' => 40
+		),
+		'iso_name' => array(
+			'value' => isset($GLOBALS['iso_name']) ? $GLOBALS['iso_name'] : '',
+			'output_name' => 'ISO Code',
+			'mandatory' => 1,
+			'type' => 'text'
+		),
+		'order_number' => array(
+			'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
+			'int' => 1,
+			'order' => 1
+		),
+		'enabled' => array(
+			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+			'output_name' => 'Enabled',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'lang_default' => array(
+			'value' => isset($GLOBALS['lang_default']) ? $GLOBALS['lang_default'] : '',
+			'output_name' => 'Default Language',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		)
+	),
+	'load_query' => "SELECT edit_language_id, long_name, iso_name, enabled FROM edit_language ORDER BY long_name",
+	'show_fields' => array(
+		array(
+			'name' => 'long_name'
+		),
+		array(
+			'name' => 'iso_name',
+			'before_value' => 'ISO: '
+		),
+		array(
+			'name' => 'enabled',
+			'before_value' => 'Enabled: ',
+			'binary' => array('Yes','No')
+		)
+	),
+	'table_name' => 'edit_language'
+);
+
+// __END__

www/includes/table_arrays/array_edit_menu_group.inc

@@ -1,40 +0,0 @@
-<?php
-
-$edit_menu_group = array (
-	"table_array" => array (
-		"edit_menu_group_id" => array (
-			"value" => $GLOBALS["edit_menu_group_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => $this->l->__("Group name"),
-			"mandatory" => 1,
-			"type" => "text"
-		),
-		"flag" => array (
-			"value" => $GLOBALS["flag"],
-			"output_name" => $this->l->__("Flag"),
-			"mandatory" => 1,
-			"type" => "text",
-			"error_check" => "alphanumeric|unique"
-		),
-		"order_number" => array (
-			"value" => $GLOBALS["order_number"],
-			"output_name" => "Group order",
-			"type" => "order",
-			"int" => 1,
-			"order" => 1
-		)
-	),
-	"table_name" => "edit_menu_group",
-	"load_query" => "SELECT edit_menu_group_id, name FROM edit_menu_group ORDER BY name",
-	"show_fields" => array (
-		array (
-			"name" => "name"
-		)
-	)
-);
-
-// __END__

www/includes/table_arrays/array_edit_menu_group.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+$edit_menu_group = array(
+	'table_array' => array(
+		'edit_menu_group_id' => array(
+			'value' => isset($GLOBALS['edit_menu_group_id']) ? $GLOBALS['edit_menu_group_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Group name',
+			'mandatory' => 1,
+			'type' => 'text'
+		),
+		'flag' => array(
+			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
+			'output_name' => 'Flag',
+			'mandatory' => 1,
+			'type' => 'text',
+			'error_check' => 'alphanumeric|unique'
+		),
+		'order_number' => array(
+			'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
+			'output_name' => 'Group order',
+			'type' => 'order',
+			'int' => 1,
+			'order' => 1
+		)
+	),
+	'table_name' => 'edit_menu_group',
+	'load_query' => "SELECT edit_menu_group_id, name FROM edit_menu_group ORDER BY name",
+	'show_fields' => array(
+		array(
+			'name' => 'name'
+		)
+	)
+);
+
+// __END__

www/includes/table_arrays/array_edit_pages.inc

@@ -1,180 +0,0 @@
-<?php
-
-$edit_pages = array (
-	"table_array" => array (
-		"edit_page_id" => array (
-			"value" => $GLOBALS["edit_page_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"filename" => array (
-			"value" => $GLOBALS["filename"],
-			"output_name" => "Add File ...",
-			"mandatory" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT DISTINCT temp_files.filename AS id, temp_files.filename AS name FROM temp_files LEFT JOIN edit_page ep ON temp_files.filename = ep.filename WHERE ep.filename IS NULL"
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => "Page name",
-			"mandatory" => 1,
-			"type" => "text"
-		),
-		"order_number" => array (
-			"value" => $GLOBALS["order_number"],
-			"output_name" => "Page order",
-			"type" => "order",
-			"int" => 1,
-			"order" => 1
-		),
-		/* "flag" => array (
-			"value" => $GLOBALS["flag"],
-			"output_name" => "Page Flag",
-			"type" => "drop_down_array",
-			"query" => array (
-				"0" => "0",
-				"1" => "1",
-				"2" => "2",
-				"3" => "3",
-				"4" => "4",
-				"5" => "5"
-			)
-		),*/
-		"online" => array (
-			"value" => $GLOBALS["online"],
-			"output_name" => "Online",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"menu" => array (
-			"value" => $GLOBALS["menu"],
-			"output_name" => "Menu",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				 "1" => "Yes",
-				 "0" => "No"
-			)
-		),
-		"popup" => array (
-			"value" => $GLOBALS["popup"],
-			"output_name" => "Popup",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				 "1" => "Yes",
-				 "0" => "No"
-			)
-		),
-		"popup_x" => array (
-			"value" => $GLOBALS["popup_x"],
-			"output_name" => "Popup Width",
-			"int_null" => 1,
-			"type" => "text",
-			"size" => 4,
-			"length" => 4
-		),
-		"popup_y" => array (
-			"value" => $GLOBALS["popup_y"],
-			"output_name" => "Popup Height",
-			"int_null" => 1,
-			"type" => "text",
-			"size" => 4,
-			"length" => 4
-		)/*,
-		"query_string" => array (
-			"value" => $GLOBALS["query_string"],
-			"output_name" => "Query String for Link",
-			"type" => "text",
-			"size" => "50"
-		)*/
-	),
-	"load_query" => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
-	"table_name" => "edit_page",
-	"show_fields" => array (
-		array (
-			"name" => "name"
-		),
-		array (
-			"name" => "filename",
-			"before_value" => "Filename: "
-		),
-		 array (
-		   "name" => "online",
-		   "binary" => array ("Yes","No"),
-		   "before_value" => "Online: "
-		 ),
-		 array (
-			"name" => "menu",
-			"binary" => array ("Yes","No"),
-			"before_value" => "Menu: "
-		),
-		array (
-			"name" => "popup",
-			"binary" => array ("Yes","No"),
-			"before_value" => "Popup: "
-		)
-	),
-	"reference_arrays" => array (
-		"edit_visible_group" => array (
-			"table_name" => "edit_page_visible_group",
-			"other_table_pk" => "edit_visible_group_id",
-			"output_name" => "Visible Groups (access)",
-			"mandatory" => 1,
-			"select_size" => 10,
-			"selected" => $GLOBALS["edit_visible_group_id"],
-			"query" => 'SELECT edit_visible_group_id, \'Name: \' || name || \', \' || \'Flag: \' || flag FROM edit_visible_group ORDER BY name'
-		),
-		"edit_menu_group" => array (
-			"table_name" => "edit_page_menu_group",
-			"other_table_pk" => "edit_menu_group_id",
-			"output_name" => "Menu Groups (grouping)",
-			"mandatory" => 1,
-			"select_size" => 10,
-			"selected" => $GLOBALS["edit_menu_group_id"],
-			"query" => 'SELECT edit_menu_group_id, \'Name: \' || name || \', \' || \'Flag: \' || flag FROM edit_menu_group ORDER BY order_number'
-		)
-
-	),
-	"element_list" => array (
-		"edit_query_string" => array (
-			"output_name" => "Query Strings",
-			"delete_name" => "remove_query_string",
-			"prefix" => "eqs",
-			"elements" => array (
-				"name" => array (
-					"output_name" => "Name",
-					"type" => "text",
-					"error_check" => "unique|alphanumeric",
-					"mandatory" => 1
-				),
-				"value" => array (
-					"output_name" => "Value",
-					"type" => "text"
-				),
-				"enabled" => array (
-					"output_name" => "Enabled",
-					"int" => 1,
-					"type" => "checkbox",
-					"element_list" => array (1)
-				),
-				"dynamic" => array (
-					"output_name" => "Dynamic",
-					"int" => 1,
-					"type" => "checkbox",
-					"element_list" => array (1)
-				),
-				"edit_query_string_id" => array (
-					"type" => "hidden",
-					"pk_id" => 1
-				)
-			) // elements
-		) // query_string element list
-	) // element list
-);
-
-// __END__

www/includes/table_arrays/array_edit_pages.php

@@ -0,0 +1,236 @@
+<?php declare(strict_types=1);
+
+$edit_pages = array(
+	'table_array' => array(
+		'edit_page_id' => array(
+			'value' => isset($GLOBALS['edit_page_id']) ? $GLOBALS['edit_page_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'filename' => array(
+			'value' => isset($GLOBALS['filename']) ? $GLOBALS['filename'] : '',
+			'output_name' => 'Add File ...',
+			'mandatory' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.filename AS name ".
+				"FROM temp_files ".
+				"LEFT JOIN edit_page ep ON temp_files.filename = ep.filename ".
+				"WHERE ep.filename IS NULL"
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Page name',
+			'mandatory' => 1,
+			'type' => 'text'
+		),
+		'order_number' => array(
+			'value' => isset($GLOBALS['order_number']) ? $GLOBALS['order_number'] : '',
+			'output_name' => 'Page order',
+			'type' => 'order',
+			'int' => 1,
+			'order' => 1
+		),
+		/* 'flag' => array(
+			'value' => isset($GLOBALS['flag']) ? $GLOBALS['flag'] : '',
+			'output_name' => 'Page Flag',
+			'type' => 'drop_down_array',
+			'query' => array(
+				'0' => '0',
+				'1' => '1',
+				'2' => '2',
+				'3' => '3',
+				'4' => '4',
+				'5' => '5'
+			)
+		),*/
+		'online' => array(
+			'value' => isset($GLOBALS['online']) ? $GLOBALS['online'] : '',
+			'output_name' => 'Online',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'menu' => array(
+			'value' => isset($GLOBALS['menu']) ? $GLOBALS['menu'] : '',
+			'output_name' => 'Menu',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				 '1' => 'Yes',
+				 '0' => 'No'
+			)
+		),
+		'popup' => array(
+			'value' => isset($GLOBALS['popup']) ? $GLOBALS['popup'] : '',
+			'output_name' => 'Popup',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				 '1' => 'Yes',
+				 '0' => 'No'
+			)
+		),
+		'popup_x' => array(
+			'value' => isset($GLOBALS['popup_x']) ? $GLOBALS['popup_x'] : '',
+			'output_name' => 'Popup Width',
+			'int_null' => 1,
+			'type' => 'text',
+			'size' => 4,
+			'length' => 4
+		),
+		'popup_y' => array(
+			'value' => isset($GLOBALS['popup_y']) ? $GLOBALS['popup_y'] : '',
+			'output_name' => 'Popup Height',
+			'int_null' =>  1,
+			'type' => 'text',
+			'size' => 4,
+			'length' => 4
+		),
+		'content_alias_edit_page_id' => array(
+			'value' => isset($GLOBALS['content_alias_edit_page_id']) ? $GLOBALS['content_alias_edit_page_id'] : '',
+			'output_name' => 'Content Alias Source',
+			'int_null' => 1,
+			'type' => 'drop_down_db',
+			// query creation
+			'select_distinct' => 0,
+			'pk_name' => 'edit_page_id AS content_alias_edit_page_id',
+			'input_name' => 'name',
+			'table_name' => 'edit_page',
+			'where_not_self' => 1,
+			'order_by' => 'order_number'
+			// 'query' => "SELECT edit_page_id AS content_alias_edit_page_id, name ".
+				// "FROM edit_page ".
+				// (isset($GLOBALS['edit_page_id']) ? " WHERE edit_page_id <> ".$GLOBALS['edit_page_id'] : "")." ".
+				// "ORDER BY order_number"
+		)
+	),
+	'load_query' => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
+	'table_name' => 'edit_page',
+	'show_fields' => array(
+		array(
+			'name' => 'name'
+		),
+		array(
+			'name' => 'filename',
+			'before_value' => 'Filename: '
+		),
+		 array(
+		   'name' => 'online',
+		   'binary' => array('Yes','No'),
+		   'before_value' => 'Online: '
+		 ),
+		 array(
+			'name' => 'menu',
+			'binary' => array('Yes','No'),
+			'before_value' => 'Menu: '
+		),
+		array(
+			'name' => 'popup',
+			'binary' => array('Yes','No'),
+			'before_value' => 'Popup: '
+		)
+	),
+	'reference_arrays' => array(
+		'edit_visible_group' => array(
+			'table_name' => 'edit_page_visible_group',
+			'other_table_pk' => 'edit_visible_group_id',
+			'output_name' => 'Visible Groups (access)',
+			'mandatory' => 1,
+			'select_size' => 10,
+			'selected' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
+			'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_visible_group ORDER BY name"
+		),
+		'edit_menu_group' => array(
+			'table_name' => 'edit_page_menu_group',
+			'other_table_pk' => 'edit_menu_group_id',
+			'output_name' => 'Menu Groups (grouping)',
+			'mandatory' => 1,
+			'select_size' => 10,
+			'selected' => isset($GLOBALS['edit_menu_group_id']) ? $GLOBALS['edit_menu_group_id'] : '',
+			'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_menu_group ORDER BY order_number"
+		)
+
+	),
+	'element_list' => array(
+		'edit_query_string' => array(
+			'output_name' => 'Query Strings',
+			'delete_name' => 'remove_query_string',
+			'prefix' => 'eqs',
+			'elements' => array(
+				'name' => array(
+					'output_name' => 'Name',
+					'type' => 'text',
+					'error_check' => 'unique|alphanumeric',
+					'mandatory' => 1
+				),
+				'value' => array(
+					'output_name' => 'Value',
+					'type' => 'text'
+				),
+				'enabled' => array(
+					'output_name' => 'Enabled',
+					'int' => 1,
+					'type' => 'checkbox',
+					'element_list' => array(1)
+				),
+				'dynamic' => array(
+					'output_name' => 'Dynamic',
+					'int' => 1,
+					'type' => 'checkbox',
+					'element_list' => array(1)
+				),
+				'edit_query_string_id' => array(
+					'type' => 'hidden',
+					'pk_id' => 1
+				)
+			) // elements
+		), // query_string element list
+		'edit_page_content' => array(
+			'output_name' => 'Page Content',
+			'delete_name' => 'remove_page_content',
+			'prefix' => 'epc',
+			'elements' => array(
+				'name' => array(
+					'output_name' => 'Content',
+					'type' => 'text',
+					'error_check' => 'alphanumeric',
+					'mandatory' => 1
+				),
+				'uid' => array(
+					'output_name' => 'UID',
+					'type' => 'text',
+					'error_check' => 'unique|alphanumeric',
+					'mandatory' => 1
+				),
+				'order_number' => array(
+					'output_name' => 'Order',
+					'type' => 'text',
+					'error_check' => 'int',
+					'mandatory' => 1
+				),
+				'online' => array(
+					'output_name' => 'Online',
+					'int' => 1,
+					'type' => 'checkbox',
+					'element_list' => array(1)
+				),
+				'edit_access_right_id' => array(
+					'type' => 'drop_down_db',
+					'output_name' => 'Access Level',
+					'int' => 1,
+					'preset' => 1, // first of the select
+					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+				),
+				'edit_page_content_id' => array(
+					'type' => 'hidden',
+					'pk_id' => 1
+				)
+			)
+		)
+	) // element list
+);
+
+// __END__

www/includes/table_arrays/array_edit_schemes.inc

@@ -1,57 +0,0 @@
-<?php
-
-$edit_schemes = array (
-	"table_array" => array (
-		"edit_scheme_id" => array (
-			"value" => $GLOBALS["edit_scheme_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => "Scheme Name",
-			"mandatory" => 1,
-			"type" => "text"
-		),
-		"header_color" => array (
-			"value" => $GLOBALS["header_color"],
-			"output_name" => "Header Color",
-			"mandatory" => 1,
-			"type" => "text",
-			"size" => 6,
-			"length" => 6,
-			"error_check" => "custom",
-			"error_regex" => "/[\dA-Fa-f]{6}/",
-			"error_example" => "F6A544"
-		),
-		"enabled" => array (
-			"value" => $GLOBALS["enabled"],
-			"output_name" => "Enabled",
-			"int" => 1,
-			"type" => "binary",
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"template" => array (
-			"value" => $GLOBALS["template"],
-			"output_name" => "Template",
-			"type" => "text"
-		)
-	),
-	"table_name" => "edit_scheme",
-	"load_query" => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
-	"show_fields" => array (
-		array (
-			"name" => "name"
-		),
-		array (
-			"name" => "enabled",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Enabled: "
-		)
-	)
-); // main array
-
-// __END__

www/includes/table_arrays/array_edit_schemes.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types=1);
+
+$edit_schemes = array(
+	'table_array' => array(
+		'edit_scheme_id' => array(
+			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Scheme Name',
+			'mandatory' => 1,
+			'type' => 'text'
+		),
+		'header_color' => array(
+			'value' => isset($GLOBALS['header_color']) ? $GLOBALS['header_color'] : '',
+			'output_name' => 'Header Color',
+			'mandatory' => 1,
+			'type' => 'text',
+			'size' => 6,
+			'length' => 6,
+			'error_check' => 'custom',
+			'error_regex' => '/[\dA-Fa-f]{6}/',
+			'error_example' => 'F6A544'
+		),
+		'enabled' => array(
+			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+			'output_name' => 'Enabled',
+			'int' => 1,
+			'type' => 'binary',
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'template' => array(
+			'value' => isset($GLOBALS['template']) ? $GLOBALS['template'] : '',
+			'output_name' => 'Template',
+			'type' => 'text'
+		)
+	),
+	'table_name' => 'edit_scheme',
+	'load_query' => "SELECT edit_scheme_id, name, enabled FROM edit_scheme ORDER BY name",
+	'show_fields' => array(
+		array(
+			'name' => 'name'
+		),
+		array(
+			'name' => 'enabled',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Enabled: '
+		)
+	)
+); // main array
+
+// __END__

www/includes/table_arrays/array_edit_users.inc

@@ -1,261 +0,0 @@
-<?php
-
-$edit_users = array (
-	"table_array" => array (
-		"edit_user_id" => array (
-			"value" => $GLOBALS["edit_user_id"],
-			"type" => "hidden",
-			"pk" => 1,
-			"int" => 1
-		),
-		"username" => array (
-			"value" => $GLOBALS["username"],
-			"output_name" => "Username",
-			"mandatory" => 1,
-			"error_check" => "unique|alphanumericextended",
-			"type" => "text"
-		),
-		"password" => array (
-			"value" => $GLOBALS["password"],
-			"HIDDEN_value" => $GLOBALS["HIDDEN_password"],
-			"CONFIRM_value" => $GLOBALS["CONFIRM_password"],
-			"output_name" => "Password",
-			"mandatory" => 1,
-			"type" => "password", // later has to be password for encryption in database
-			'update' => array ( // connected field updates, and update data
-				'password_change_date' => array ( // db row to update
-					'type' => 'date', // type of field (int/text/date/etc)
-					'value' => 'NOW()' // value [todo: complex reference
-				)
-			)
-		),
-		// password date when first insert and password is set, needs special field with connection to password
-		// password reset force interval, if set, user needs to reset password after X time period
-		'password_change_interval' => array (
-			'value' => $GLOBALS['password_change_interval'],
-			'output_name' => 'Password change interval',
-			'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
-			'type' => 'text',
-			'interval' => 1, // interval needs NULL write for empty
-			'size' => 5, // make it 5 chars long
-			'length' => 5
-		),
-		"enabled" => array (
-			"value" => $GLOBALS["enabled"],
-			"output_name" => "Enabled",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"strict" => array (
-			"value" => $GLOBALS["strict"],
-			"output_name" => "Strict (Lock after errors)",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"locked" => array (
-			"value" => $GLOBALS["locked"],
-			"output_name" => "Locked (auto set if strict with errors)",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"admin" => array (
-			"value" => $GLOBALS["admin"],
-			"output_name" => "Admin",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"debug" => array (
-			"value" => $GLOBALS["debug"],
-			"output_name" => "Debug",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"db_debug" => array (
-			"value" => $GLOBALS["db_debug"],
-			"output_name" => "DB Debug",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		),
-		"email" => array (
-			"value" => $GLOBALS["email"],
-			"output_name" => "E-Mail",
-			"type" => "text"
-		),
-		"last_name" => array (
-			"value" => $GLOBALS["last_name"],
-			"output_name" => "Last Name",
-			"type" => "text"
-		),
-		"first_name" => array (
-			"value" => $GLOBALS["first_name"],
-			"output_name" => "First Name",
-			"type" => "text"
-		),
-		"edit_language_id" => array (
-			"value" => $GLOBALS["edit_language_id"],
-			"output_name" => "Language",
-			"mandatory" => 1,
-			"int" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number"
-		),
-		"edit_scheme_id" => array (
-			"value" => $GLOBALS["edit_scheme_id"],
-			"output_name" => "Scheme",
-			"int_null" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
-		),
-		"edit_group_id" => array (
-			"value" => $GLOBALS["edit_group_id"],
-			"output_name" => "Group",
-			"int" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
-			"mandatory" => 1
-		),
-		"edit_access_right_id" => array (
-			"value" => $GLOBALS["edit_access_right_id"],
-			"output_name" => "User Level",
-			"mandatory" => 1,
-			"int" => 1,
-			"type" => "drop_down_db",
-			"query" => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-		),
-		"login_error_count" => array (
-			"output_name" => "Login error count",
-			"value" => $GLOBALS['login_error_count'],
-			"type" => "view",
-			"empty" => "0"
-		),
-		"login_error_date_last" => array (
-			"output_name" => "Last login error",
-			"value" => $GLOBALS['login_error_date_liast'],
-			"type" => "view",
-			"empty" => "-"
-		),
-		"login_error_date_first" => array (
-			"output_name" => "First login error",
-			"value" => $GLOBALS['login_error_date_first'],
-			"type" => "view",
-			"empty" => "-"
-		),
-		"protected" => array (
-			"value" => $GLOBALS["protected"],
-			"output_name" => "Protected",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
-		)
-	),
-	"load_query" => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
-	"table_name" => "edit_user",
-	"show_fields" => array (
-		array (
-			"name" => "username"
-		),
-		array (
-			"name" => "enabled",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Enabled: "
-		),
-		array (
-			"name" => "debug",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Debug: "
-		),
-		array (
-			"name" => "db_debug",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "DB Debug: "
-		),
-		array (
-			"name" => "strict",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Strict: "
-		),
-		array (
-			"name" => "locked",
-			"binary" => array ("Yes", "No"),
-			"before_value" => "Locked: "
-		),
-		array (
-			"name" => "login_error_count",
-			"before_value" => "Errors: "
-		)
-	),
-	"element_list" => array (
-		"edit_access_user" => array (
-			"output_name" => "Accounts",
-			"mandatory" => 1,
-			"delete" => 0, // set then reference entries are deleted, else the "enable" flag is only set
-			"prefix" => "ecu",
-			"read_data" => array (
-				"table_name" => "edit_access",
-				"pk_id" => "edit_access_id",
-				"name" => "name",
-				"order" => "name"
-			),
-			"elements" => array (
-				"edit_access_user_id" => array (
-					"output_name" => "Activate",
-					"type" => "hidden",
-					"int" => 1,
-					"pk_id" => 1
-				),
-				"enabled" => array (
-					"type" => "checkbox",
-					"output_name" => "Activate",
-					"int" => 1,
-					"element_list" => array (1)
-				),
-				"edit_access_right_id" => array (
-					"type" => "drop_down_db",
-					"output_name" => "Access Level",
-					"preset" => 1, // first of the select
-					"int" => 1,
-					"query" => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
-				),
-				"edit_default" => array (
-					"type" => "radio_group",
-					"output_name" => "Default",
-					"int" => 1,
-					"element_list" => "radio_group"
-				),
-				"edit_access_id" => array (
-					"type" => "hidden",
-					"int" => 1
-				)
-			)
-		) // edit pages ggroup
-	)
-);
-
-// __END__

www/includes/table_arrays/array_edit_users.php

@@ -0,0 +1,270 @@
+<?php declare(strict_types=1);
+
+$edit_users = array(
+	'table_array' => array(
+		'edit_user_id' => array(
+			'value' => isset($GLOBALS['edit_user_id']) ? $GLOBALS['edit_user_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1,
+			'int' => 1
+		),
+		'username' => array(
+			'value' => isset($GLOBALS['username']) ? $GLOBALS['username'] : '',
+			'output_name' => 'Username',
+			'mandatory' => 1,
+			'error_check' => 'unique|alphanumericextended',
+			'type' => 'text'
+		),
+		'password' => array(
+			'value' => isset($GLOBALS['password']) ? $GLOBALS['password'] : '',
+			'HIDDEN_value' => isset($GLOBALS['HIDDEN_password']) ? $GLOBALS['HIDDEN_password'] : '',
+			'CONFIRM_value' => isset($GLOBALS['CONFIRM_password']) ? $GLOBALS['CONFIRM_password'] : '',
+			'output_name' => 'Password',
+			'mandatory' => 1,
+			'type' => 'password', // later has to be password for encryption in database
+			'update' => array( // connected field updates, and update data
+				'password_change_date' => array( // db row to update
+					'type' => 'date', // type of field (int/text/date/etc)
+					'value' => 'NOW()' // value [todo: complex reference
+				)
+			)
+		),
+		// password date when first insert and password is set, needs special field with connection to password
+		// password reset force interval, if set, user needs to reset password after X time period
+		'password_change_interval' => array(
+			'value' => isset($GLOBALS['password_change_interval']) ? $GLOBALS['password_change_interval'] : '',
+			'output_name' => 'Password change interval',
+			'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
+			'type' => 'text',
+			'interval' => 1, // interval needs NULL write for empty
+			'size' => 5, // make it 5 chars long
+			'length' => 5
+		),
+		'enabled' => array(
+			'value' => isset($GLOBALS['enabled']) ? $GLOBALS['enabled'] : '',
+			'output_name' => 'Enabled',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'strict' => array(
+			'value' => isset($GLOBALS['strict']) ? $GLOBALS['strict'] : '',
+			'output_name' => 'Strict (Lock after errors)',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'locked' => array(
+			'value' => isset($GLOBALS['locked']) ? $GLOBALS['locked'] : '',
+			'output_name' => 'Locked (auto set if strict with errors)',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'admin' => array(
+			'value' => isset($GLOBALS['admin']) ? $GLOBALS['admin'] : '',
+			'output_name' => 'Admin',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'debug' => array(
+			'value' => isset($GLOBALS['debug']) ? $GLOBALS['debug'] : '',
+			'output_name' => 'Debug',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'db_debug' => array(
+			'value' => isset($GLOBALS['db_debug']) ? $GLOBALS['db_debug'] : '',
+			'output_name' => 'DB Debug',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'email' => array(
+			'value' => isset($GLOBALS['email']) ? $GLOBALS['email'] : '',
+			'output_name' => 'E-Mail',
+			'type' => 'text',
+			'error_check' => 'email'
+		),
+		'last_name' => array(
+			'value' => isset($GLOBALS['last_name']) ? $GLOBALS['last_name'] : '',
+			'output_name' => 'Last Name',
+			'type' => 'text'
+		),
+		'first_name' => array(
+			'value' => isset($GLOBALS['first_name']) ? $GLOBALS['first_name'] : '',
+			'output_name' => 'First Name',
+			'type' => 'text'
+		),
+		'edit_language_id' => array(
+			'value' => isset($GLOBALS['edit_language_id']) ? $GLOBALS['edit_language_id'] : '',
+			'output_name' => 'Language',
+			'mandatory' => 1,
+			'int' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_language_id, long_name FROM edit_language WHERE enabled = 1 ORDER BY order_number"
+		),
+		'edit_scheme_id' => array(
+			'value' => isset($GLOBALS['edit_scheme_id']) ? $GLOBALS['edit_scheme_id'] : '',
+			'output_name' => 'Scheme',
+			'int_null' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_scheme_id, name FROM edit_scheme WHERE enabled = 1 ORDER BY name"
+		),
+		'edit_group_id' => array(
+			'value' => isset($GLOBALS['edit_group_id']) ? $GLOBALS['edit_group_id'] : '',
+			'output_name' => 'Group',
+			'int' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_group_id, name FROM edit_group WHERE enabled = 1 ORDER BY name",
+			'mandatory' => 1
+		),
+		'edit_access_right_id' => array(
+			'value' => isset($GLOBALS['edit_access_right_id']) ? $GLOBALS['edit_access_right_id'] : '',
+			'output_name' => 'User Level',
+			'mandatory' => 1,
+			'int' => 1,
+			'type' => 'drop_down_db',
+			'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+		),
+		'login_error_count' => array(
+			'output_name' => 'Login error count',
+			'value' => isset($GLOBALS['login_error_count']) ? $GLOBALS['login_error_count'] : '',
+			'type' => 'view',
+			'empty' => '0'
+		),
+		'login_error_date_last' => array(
+			'output_name' => 'Last login error',
+			'value' => isset($GLOBALS['login_error_date_liast']) ? $GLOBALS['login_error_date_liast'] : '',
+			'type' => 'view',
+			'empty' => '-'
+		),
+		'login_error_date_first' => array(
+			'output_name' => 'First login error',
+			'value' => isset($GLOBALS['login_error_date_first']) ? $GLOBALS['login_error_date_first'] : '',
+			'type' => 'view',
+			'empty' => '-'
+		),
+		'protected' => array(
+			'value' => isset($GLOBALS['protected']) ? $GLOBALS['protected'] : '',
+			'output_name' => 'Protected',
+			'type' => 'binary',
+			'int' => 1,
+			'element_list' => array(
+				'1' => 'Yes',
+				'0' => 'No'
+			)
+		),
+		'additional_acl' => array(
+			'value' => isset($GLOBALS['additional_acl']) ? $GLOBALS['additional_acl'] : '',
+			'output_name' => 'Additional ACL (as JSON)',
+			'type' => 'textarea',
+			'error_check' => 'json',
+			'rows' => 10,
+			'cols' => 60
+		),
+	),
+	'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
+	'table_name' => 'edit_user',
+	'show_fields' => array(
+		array(
+			'name' => 'username'
+		),
+		array(
+			'name' => 'enabled',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Enabled: '
+		),
+		array(
+			'name' => 'debug',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Debug: '
+		),
+		array(
+			'name' => 'db_debug',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'DB Debug: '
+		),
+		array(
+			'name' => 'strict',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Strict: '
+		),
+		array(
+			'name' => 'locked',
+			'binary' => array('Yes', 'No'),
+			'before_value' => 'Locked: '
+		),
+		array(
+			'name' => 'login_error_count',
+			'before_value' => 'Errors: '
+		)
+	),
+	'element_list' => array(
+		'edit_access_user' => array(
+			'output_name' => 'Accounts',
+			'mandatory' => 1,
+			'delete' => 0, // set then reference entries are deleted, else the 'enable' flag is only set
+			'prefix' => 'ecu',
+			'read_data' => array(
+				'table_name' => 'edit_access',
+				'pk_id' => 'edit_access_id',
+				'name' => 'name',
+				'order' => 'name'
+			),
+			'elements' => array(
+				'edit_access_user_id' => array(
+					'output_name' => 'Activate',
+					'type' => 'hidden',
+					'int' => 1,
+					'pk_id' => 1
+				),
+				'enabled' => array(
+					'type' => 'checkbox',
+					'output_name' => 'Activate',
+					'int' => 1,
+					'element_list' => array(1)
+				),
+				'edit_access_right_id' => array(
+					'type' => 'drop_down_db',
+					'output_name' => 'Access Level',
+					'preset' => 1, // first of the select
+					'int' => 1,
+					'query' => "SELECT edit_access_right_id, name FROM edit_access_right ORDER BY level"
+				),
+				'edit_default' => array(
+					'type' => 'radio_group',
+					'output_name' => 'Default',
+					'int' => 1,
+					'element_list' => 'radio_group'
+				),
+				'edit_access_id' => array(
+					'type' => 'hidden',
+					'int' => 1
+				)
+			)
+		) // edit pages ggroup
+	)
+);
+
+// __END__

www/includes/table_arrays/array_edit_visible_group.inc

@@ -1,33 +0,0 @@
-<?php
-
-$edit_visible_group = array (
-	"table_array" => array (
-		"edit_visible_group_id" => array (
-			"value" => $GLOBALS["edit_visible_group_id"],
-			"type" => "hidden",
-			"pk" => 1
-		),
-		"name" => array (
-			"value" => $GLOBALS["name"],
-			"output_name" => $this->l->__("Group name"),
-			"mandatory" => 1,
-			"type" => "text"
-		),
-		"flag" => array (
-			"value" => $GLOBALS["flag"],
-			"output_name" => $this->l->__("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" => array (
-		array (
-			"name" => "name"
-		)
-	)
-);
-
-// __END__

www/includes/table_arrays/array_edit_visible_group.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+$edit_visible_group = array(
+	'table_array' => array(
+		'edit_visible_group_id' => array(
+			'value' => isset($GLOBALS['edit_visible_group_id']) ? $GLOBALS['edit_visible_group_id'] : '',
+			'type' => 'hidden',
+			'pk' => 1
+		),
+		'name' => array(
+			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
+			'output_name' => 'Group name',
+			'mandatory' => 1,
+			'type' => 'text'
+		),
+		'flag' => array(
+			'value' => isset($GLOBALS['flag']) ? $GLOBALS['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' => array(
+		array(
+			'name' => 'name'
+		)
+	)
+);
+
+// __END__

www/includes/templates/admin/edit_elements.tpl

@@ -114,8 +114,8 @@
 			{/foreach}
 			</table>
 			{if $element.data.delete_name}
-			<input type="hidden" value="" name="{$element.data.delete_name}">
+			<input type="hidden" value="" id="{$element.data.delete_name}" name="{$element.data.delete_name}">
-			<input type="hidden" value="" name="{$element.data.delete_name}_flag">
+			<input type="hidden" value="" id="{$element.data.delete_name}_flag" name="{$element.data.delete_name}_flag">
 			<input type="hidden" name="remove_name[]" value="{$element.data.delete_name}">
 			{/if}
 			{if $element.data.enable_name}

www/includes/templates/admin/edit_order.tpl

@@ -15,12 +15,6 @@
 	{if $STYLESHEET}
 	<link rel=stylesheet type="text/css" href="{$css}{$STYLESHEET}">
 	{/if}
-	{if $JAVASCRIPT}
-	<script language="JavaScript" src="{$JS}{$JAVASCRIPT}"></script>
-	{/if}
-	{if $DATE_JAVASCRIPT}
-	<script language="JavaScript" src="{$JS}{$DATE_JAVASCRIPT}"></script>
-	{/if}
 </head>
 <body>
 <table width="100%" border="0" cellpadding="0" cellspacing="1">

www/includes/templates/admin/main_content.tpl

@@ -1,113 +0,0 @@
-{*
-	********************************************************************
-	* AUTHOR: Clemens Schwaighofer
-	* DATE: 2007/10/18
-	* DESCRIPTION:
-	* content main part (buttons, load, etc)
-	* HISTORY:
-	********************************************************************
-*}
-
-<script language="JavaScript">
-<!--
-var form_name = '{$form_name}';
-var load_id = '{if $primary_key}{$primary_key}{else}0{/if}';
-var show_sort = {$show_sort};
-//-->
-</script>
-<div style="position:relative; width: {$table_width}px; margin-top: 5px; margin-bottom: 5px; top: 0px; left: 0px;">
-	<div id="main_menu" style="position: absolute; top: 0px; left: 0px; width: 750px; height: 550px; z-index: 5; overflow: auto; padding: 2px; visibility: hidden;" class="sidemenu">
-		<div style="position: absolute; top: 2px; left: 2px;">
-			<input type="button" id="show_menu" name="show_menu" value="{t}Close Menu{/t}" OnClick="ShowHideMenu('hide', 'main_menu');"> {if $primary_key}<a href="#{$primary_key}">&darr;</a>{/if}&nbsp;<input type="text" id="search" name="search" value="{$search}" OnKeyup="QuickSearch(); return false;" {popup text="Search" width="150"}> <span id="search_status">{t}Enter Value{/t}</span>
-			<div id="search_found">{t 1=$menu_elements}Found: %1{/t}</div>
-		</div>
-		<div id="search_results" style="position: relative; top: 32px; left: 2px; padding: 2px; margin: 2px; width: 95%; height: 90%; overflow: auto; visibility: hidden; display: none; z-index: 3;">
-		</div>
-		<div id="element_list" style="position: relative; top: 32px; left: 2px; padding: 2px; margin: 2px; width: 95%; height: 90%; overflow: auto; z-index: 3;">
-		{foreach from=$table_menu key=key item=item}
-			{if $s_title != $item.title && $item.title}
-				{assign var='s_title' value=$item.title}
-			<div style="font-weight: bold;">{$item.title}</div>
-			{/if}
-			{if $show_sort}
-			{strip}
-			<span style="font-family: monospace;">[
-				{if $item.order_move == '-' || !$item.order_move}
-			&nbsp;
-				{/if}
-				{if $item.order_move == '+' || $item.order_move == '*'}
-			<a href="javascript:me({$item.id}, '+');" {popup text="Up" width="20"}>&uarr;</a>
-				{/if}
-				{if $item.order_move == '-' || $item.order_move == '*'}
-			<a href="javascript:me({$item.id}, '-');" {popup text="Down" width="20"}>&darr;</a>
-				{/if}
-				{if $item.order_move == '+' || !$item.order_move}
-			&nbsp;
-				{/if}
-			]</span>
-			{/strip}
-			{/if}
-			<a name="{$item.id}"></a>
-			{if $item.key}[{$item.key}] {/if}{if $item.status}[{$item.status}] {/if}<a href="javascript:le('{$item.id}');" class="{if $item.deleted == 't' && $primary_key == $item.id}item_loaded_deleted{elseif $item.deleted == 't'}item_deleted{elseif $primary_key == $item.id}item_loaded{/if}" {popup text="`$item.desc`" caption="Info" width="350"}>{$item.name}</a><br>
-		{/foreach}
-		</div>
-		<div style="position: absolute; bottom: 2px; left: 2px; z-index: 5;">
-			<input type="button" id="show_menu" name="show_menu" value="{t}Close Menu{/t}" OnClick="ShowHideMenu('hide', 'main_menu');">
-		</div>
-	</div>
-	<div style="position: relative; top: 0px; left: 0px; width: 790px; z-index: 0; margin: 2px; padding: 2px;">
-		<form method="post" name="{$form_name}" enctype="multipart/form-data">
-		{* menu button *}
-		{if !$hide_menu}
-		<div style="margin-bottom: 2px; padding: 2px; position: relative;">
-			<input type="button" id="show_menu" name="show_menu" value="{t}Show Menu{/t}" OnClick="ShowHideMenu('show', 'main_menu');" {if $page_acl < 20}disabled{/if}>
-		</div>
-		{/if}
-		{* save, delete commands *}
-		<div style="margin-bottom: 2px; padding: 2px; position: relative;" class="buttongroup">
-			<div style="margin-bottom: 2px; padding: 2px; position: relative; height: 20px;">
-				<input type="button" name="new" value="{t}New{/t}" OnClick="document.{$form_name}.action.value='new';document.{$form_name}.action_yes.value=confirm('{t}Do you want to create a new entry entry?{/t}');if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				<input type="button" name="save" value="{t}Save{/t}" OnClick="document.{$form_name}.action.value='save';document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				{if $show_delete_button && !$show_undelete_button}
-				<input type="button" name="delete" value="{t}Delete{/t}" OnClick="document.{$form_name}.action.value='delete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to delete this entry?{/t}');document.{$form_name}.action_id.value='{$primary_key}';if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-				{if $show_delete_button && $show_undelete_button}
-				<input type="button" name="un_delete" value="{t}Un-Delete{/t}" OnClick="document.{$form_name}.action.value='undelete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to undelete this entry?{/t}');document.{$form_name}.action_id.value='{$primary_key}';if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-			</div>
-		</div>
-		{* status messages *}
-		<div id="status_message" style="margin-bottom: 2px; padding: 2px; text-align: center; position: relative; visibility: hidden;">
-		</div>
-		{* main grouping *}
-		<div style="margin-bottom: 5px; padding: 2px; position: relative; min-height: 400px;" class="{$status_color}">
-			{include file=$CONTENT_INCLUDE}
-		</div>
-
-		{* save, delete commands *}
-		<div style="margin-bottom: 2px; padding: 2px; position: relative;" class="buttongroup">
-			<div style="margin-bottom: 2px; padding: 2px; position: relative; height: 20px;">
-				<input type="button" name="new" value="{t}New{/t}" OnClick="document.{$form_name}.action.value='new';document.{$form_name}.action_yes.value=confirm('{t}Do you want to create a new entry entry?{/t}');if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				<input type="button" name="save" value="{t}Save{/t}" OnClick="document.{$form_name}.action.value='save';document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				{if $show_delete_button && !$show_undelete_button}
-				<input type="button" name="delete" value="{t}Delete{/t}" OnClick="document.{$form_name}.action.value='delete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to delete this entry?{/t}');document.{$form_name}.action_id.value='{$primary_key}';if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-				{if $show_delete_button && $show_undelete_button}
-				<input type="button" name="un_delete" value="{t}Un-Delete{/t}" OnClick="document.{$form_name}.action.value='undelete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to undelete this entry?{/t}');document.{$form_name}.action_id.value='{$primary_key}';if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-			</div>
-		</div>
-		{* hidden group *}
-		<input type="hidden" id="primary_key" name="primary_key" value="{$primary_key}">
-		{* action var set *}
-		<input type="hidden" id="action" name="action" value="">
-		<input type="hidden" id="action_flag" name="action_flag" value="">
-		<input type="hidden" id="action_yes" name="action_yes" value="">
-		<input type="hidden" id="action_id" name="action_id" value="">
-		<input type="hidden" id="action_value" name="action_value" value="">
-		<input type="hidden" id="action_menu" name="action_menu" value="">
-		<input type="hidden" id="action_error" name="action_error" value="">
-		<input type="hidden" name="action_loaded" value="true">
-		</form>
-	</div>
-</div>

www/includes/templates/admin/main_content_blank.tpl

@@ -1,42 +0,0 @@
-{*
-	********************************************************************
-	* AUTHOR: Clemens Schwaighofer
-	* DATE: 2007/10/18
-	* DESCRIPTION:
-	* content main part (buttons, load, etc)
-	* HISTORY:
-	********************************************************************
-*}
-
-<script language="JavaScript">
-<!--
-var form_name = '{$form_name}';
-var load_id = '{if $primary_key}{$primary_key}{/if}';
-var show_sort = {if $show_sort}{$show_sort}{else}0{/if};
-//-->
-</script>
-
-<div style="width: {$table_width}px; margin-top: 5px; margin-bottom: 5px;">
-	<form method="post" name="{$form_name}" enctype="multipart/form-data">
-	{* save, delete commands *}
-	<div style="margin-bottom: 2px; padding: 2px;" class="buttongroup">
-		{include file=cms_buttons.tpl}
-	</div>
-	{include file=$CONTENT_INCLUDE}
-	{* save, delete commands *}
-	<div style="margin-bottom: 2px; padding: 2px;" class="buttongroup">
-		{include file=cms_buttons.tpl}
-	</div> <!-- button close //-->
-	{* hidden group *}
-	<input type="hidden" id="primary_key" name="primary_key" value="{$primary_key}">
-	{* action var set *}
-	<input type="hidden" id="action" name="action" value="">
-	<input type="hidden" id="action_flag" name="action_flag" value="">
-	<input type="hidden" id="action_yes" name="action_yes" value="">
-	<input type="hidden" id="action_id" name="action_id" value="">
-	<input type="hidden" id="action_value" name="action_value" value="">
-	<input type="hidden" id="action_menu" name="action_menu" value="">
-	<input type="hidden" id="action_error" name="action_error" value="">
-	<input type="hidden" name="action_loaded" value="true">
-	</form>
-</div>

www/includes/templates/admin/main_content_index.tpl

@@ -1,19 +0,0 @@
-{*
-	********************************************************************
-	* AUTHOR: Clemens Schwaighofer
-	* DATE: 2007/10/18
-	* DESCRIPTION:
-	* content main part (buttons, load, etc)
-	* HISTORY:
-	********************************************************************
-*}
-
-<script language="JavaScript">
-<!--
-var form_name = '{$form_name}';
-var load_id = {if $primary_key}{$primary_key}{else}0{/if};
-var show_sort = {if $show_sort}{$show_sort}{else}0{/if};
-//-->
-</script>
-
-{include file=$CONTENT_INCLUDE}

www/includes/templates/admin/main_content_special.tpl

@@ -1,91 +0,0 @@
-{*
-	********************************************************************
-	* AUTHOR: Clemens Schwaighofer
-	* DATE: 2008/04/11
-	* DESCRIPTION:
-	* special content main part (buttons, load, etc)
-	* HISTORY:
-	********************************************************************
-*}
-
-<script language="JavaScript">
-<!--
-var form_name = '{$form_name}';
-var load_id = {if $primary_key}{$primary_key}{else}0{/if};
-//-->
-</script>
-
-<div style="position:relative; width: {$table_width}px; margin-top: 5px; margin-bottom: 5px; top: 0px; left: 0px;">
-	<div style="position: relative; top: 0px; left: 0px; width: 790px; z-index: 0; margin: 2px; padding: 2px;">
-		<form method="post" name="{$form_name}">
-		{* save, delete commands *}
-		<div style="margin: 2px; padding: 2px; position: relative;" class="buttongroup">
-			<div style="padding: 2px; position: relative; height: 20px;">
-				<input type="button" name="new" value="{t}New{/t}" OnClick="document.{$form_name}.action.value='new';document.{$form_name}.action_yes.value=confirm('{t}Do you want to create a new entry entry?{/t}');if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				<input type="button" name="save" value="{t}Save{/t}" OnClick="document.{$form_name}.action.value='save';document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				{if $show_delete_button && !$show_undelete_button}
-				<input type="button" name="delete" value="{t}Delete{/t}" OnClick="document.{$form_name}.action.value='delete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to delete this entry?{/t}');document.{$form_name}.action_id.value={$primary_key};if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-				{if $show_delete_button && $show_undelete_button}
-				<input type="button" name="un_delete" value="{t}Un-Delete{/t}" OnClick="document.{$form_name}.action.value='undelete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to undelete this entry?{/t}');document.{$form_name}.action_id.value={$primary_key};if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-
-			</div>
-		</div>
-		{* status messages *}
-		<div id="status_message" style="margin-bottom: 2px; padding: 2px; text-align: center; position: relative; visibility: hidden; display: none;">
-		</div>
-		{* main grouping *}
-		<div>
-			<div class="spacer"></div>
-			<div id="main_menu" style="float: left; position: relative; width: 200px; height: 450px; z-index: 5; overflow: auto; padding: 2px; margin: 2px;" class="sidemenu">
-				<div style="position: absolute; top: 2px; left: 2px;">
-					{if $primary_key}<a href="#{$primary_key}">&darr;</a>{/if}&nbsp;<input type="text" id="search" name="search" size="15" value="{$search}" OnKeyup="QuickSearch(); return false;" {popup text="Search" width="150"}> <span id="search_status">{t}Search{/t}</span>
-					<div id="search_found">{t}Found:{/t} {$menu_elements}</div>
-				</div>
-				<div id="search_results" style="position: relative; top: 32px; left: 2px; padding: 2px; margin: 2px; width: 95%; height: 90%; overflow: auto; visibility: hidden; display: none;">
-				</div>
-				<div id="element_list" style="position: relative; top: 32px; left: 2px; padding: 2px; margin: 2px; width: 95%; height: 90%; overflow: auto;">
-				{foreach from=$table_menu key=key item=item}
-					<a name="{$item.id}"></a>
-					{if $item.key}[{$item.key}] {/if}{if $item.status}[{$item.status}] {/if}<a href="javascript:le({$item.id});" class="{if $item.deleted == 't' && $primary_key == $item.id}item_loaded_deleted{elseif $item.deleted == 't'}item_deleted{elseif $primary_key == $item.id}item_loaded{/if}">{$item.name}</a><br>
-				{/foreach}
-				</div>
-			</div>
-
-			<div style="float: left; margin: 2px; padding: 2px; position: relative; width: 570px; min-height: 450px;" class="{$status_color}">
-				{* START CONTENT *}
-				{include file="$CONTENT_INCLUDE"}
-				{* END CONTENT *}
-			</div>
-			<div class="spacer"></div>
-			{* END MENU / CONTENT BLOCK *}
-		</div>
-
-		{* save, delete commands *}
-		<div style="margin: 2px; padding: 2px; position: relative;" class="buttongroup">
-			<div style="padding: 2px; position: relative; height: 20px;">
-				<input type="button" name="new" value="{t}New{/t}" OnClick="document.{$form_name}.action.value='new';document.{$form_name}.action_yes.value=confirm('{t}Do you want to create a new entry entry?{/t}');if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				<input type="button" name="save" value="{t}Save{/t}" OnClick="document.{$form_name}.action.value='save';document.{$form_name}.submit();" {if $page_acl < 60}disabled{/if}>
-				{if $show_delete_button && !$show_undelete_button}
-				<input type="button" name="delete" value="{t}Delete{/t}" OnClick="document.{$form_name}.action.value='delete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to delete this entry?{/t}');document.{$form_name}.action_id.value={$primary_key};if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-				{if $show_delete_button && $show_undelete_button}
-				<input type="button" name="un_delete" value="{t}Un-Delete{/t}" OnClick="document.{$form_name}.action.value='undelete';document.{$form_name}.action_yes.value=confirm('{t}Do you want to undelete this entry?{/t}');document.{$form_name}.action_id.value={$primary_key};if (document.{$form_name}.action_yes.value == 'true') document.{$form_name}.submit();" {if $page_acl < 80}disabled{/if}>
-				{/if}
-			</div>
-		</div>
-		{* hidden group *}
-		<input type="hidden" id="primary_key" name="primary_key" value="{$primary_key}">
-		{* action var set *}
-		<input type="hidden" id="action" name="action" value="">
-		<input type="hidden" id="action_flag" name="action_flag" value="">
-		<input type="hidden" id="action_yes" name="action_yes" value="">
-		<input type="hidden" id="action_id" name="action_id" value="">
-		<input type="hidden" id="action_value" name="action_value" value="">
-		<input type="hidden" id="action_menu" name="action_menu" value="">
-		<input type="hidden" id="action_error" name="action_error" value="">
-		<input type="hidden" name="action_loaded" value="true">
-		</form>
-	</div>
-</div>

www/includes/templates/admin/smarty_test.tpl

@@ -1,6 +1,9 @@
 <div>
 	{$SMARTY_TEST}
 </div>
+<div>
+	TRANSLATION CLASS: {$TRANSLATE_TEST}
+</div>
 <div>
 	<select id="drop_down_test" name="drop_down_test">
 		{html_options options=$drop_down_test selected=$drop_down_test_selected}
@@ -11,6 +14,9 @@
 		<div id="test-div" class="test-div">
 			Some content ehre or asdfasdfasf
 		</div>
+		<div id="translate-div">
+			TRANSLATION SMARTY: {t}I should be translated{/t}
+		</div>
 	</div>
 </div>
 {* progresss indicator *}

www/layout/admin/cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

www/layout/admin/cache/images/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

www/layout/admin/javascript/edit.jq.js

@@ -1,4 +1,5 @@
 /* general edit javascript */
+/* jquery version */
 
 /* jshint esversion: 6 */
 
@@ -11,19 +12,21 @@ if (!DEBUG) {
 	});
 }*/
 
-// METHOD: pop
+/**
-// PARAMS: url, window name, features
+ * opens a popup window with winName and given features (string)
-// RETURN: none
+ * @param {String} theURL   the url
-// DESC  : opens a popup window with winNAme and given features (string)
+ * @param {String} winName  window name
+ * @param {Object} features popup features
+ */
 function pop(theURL, winName, features) {
 	winName = window.open(theURL, winName, features);
 	winName.focus();
 }
 
-// METHOD: expandTA
+/**
-// PARAMS: id
+ * automatically resize a text area based on the amount of lines in it
-// RETURN: none
+ * @param {[string} ta_id element id
-// DESC  : automatically resize a text area based on the amount of lines in it
+ */
 function expandTA(ta_id) {
 	var ta;
 	// if a string comes, its a get by id, else use it as an element pass on
@@ -44,10 +47,10 @@ function expandTA(ta_id) {
 	ta.rows = numNewRows + theRows.length;
 }
 
-// METHOD: getWindowSize
+/**
-// PARAMS: none
+ * wrapper to get the real window size for the current browser window
-// RETURN: array with width/height
+ * @return {Object} object with width/height
-// DESC  : wrapper to get the real window size for the current browser window
+ */
 function getWindowSize()
 {
 	var width, height;
@@ -59,10 +62,10 @@ function getWindowSize()
 	};
 }
 
-// METHOD: getScrollOffset
+/**
-// PARAMS: none
+ * wrapper to get the correct scroll offset
-// RETURN: array with x/y px
+ * @return {Object} object with x/y px
-// DESC  : wrapper to get the correct scroll offset
+ */
 function getScrollOffset()
 {
 	var left, top;
@@ -74,10 +77,12 @@ function getScrollOffset()
 	};
 }
 
-// METHOD: setCenter
+/**
-// PARAMS: id to set center
+ * centers div to current window size middle
-// RETURN: none
+ * @param {String}  id   element to center
-// DESC  : centers div to current window size middle
+ * @param {Boolean} left if true centers to the middle from the left
+ * @param {Boolean} top  if true centers to the middle from the top
+ */
 function setCenter(id, left, top)
 {
 	// get size of id
@@ -107,10 +112,11 @@ function setCenter(id, left, top)
 	}
 }
 
-// METHOD: goToPos()
+/**
-// PARAMS: element, offset (default 0)
+ * goes to an element id position
-// RETURN: none
+ * @param {String} element element id to move to
-// DESC:   goes to an element id position
+ * @param {Number} offset  offset from top, default is 0 (px)
+ */
 function goToPos(element, offset = 0)
 {
 	try {
@@ -125,10 +131,12 @@ function goToPos(element, offset = 0)
 	}
 }
 
-// METHOD: __
+/**
-// PARAMS: text
+ * uses the i18n object created in the translation template
-// RETURN: translated text (based on PHP selected language)
+ * that is filled from gettext in PHP
-// DESC  : uses the i18n array created in the translation template, that is filled from gettext in PHP (Smarty)
+ * @param  {String} string text to translate
+ * @return {String}        translated text (based on PHP selected language)
+ */
 function __(string)
 {
 	if (typeof i18n !== 'undefined' && isObject(i18n) && i18n[string]) {
@@ -138,12 +146,13 @@ function __(string)
 	}
 }
 
-// METHOD: string.format
+/**
-// PARAMS: any, for string format
+ * simple sprintf formater for replace
-// RETURN: formatted string
+ * usage: "{0} is cool, {1} is not".format("Alpha", "Beta");
-// DESC  : simple sprintf formater for replace
+ * First, checks if it isn't implemented yet.
-//         "{0} is cool, {1} is not".format("Alpha", "Beta");
+ * @param  {String} !String.prototype.format string with elements to be replaced
-// First, checks if it isn't implemented yet.
+ * @return {String}                          Formated string
+ */
 if (!String.prototype.format) {
 	String.prototype.format = function()
 	{
@@ -158,25 +167,33 @@ if (!String.prototype.format) {
 	};
 }
 
-// METHOD: numberWithCommas
+/**
-// PARAMS: number
+ * formats flat number 123456 to 123,456
-// RETURN: formatted with , in thousands
+ * @param  {Number} x number to be formated
-// DESC  : formats flat number 123456 to 123,456
+ * @return {String}   formatted with , in thousands
-const numberWithCommas = (x) => {
+ */
+function numberWithCommas(x)
+{
 	var parts = x.toString().split(".");
 	parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 	return parts.join(".");
-};
+}
 
-// METHOD:
+/**
-// PARAMS: string
+ * converts line breaks to br
-// RETURN: string with <br>
+ * @param  {String} string any string
-// DESC  : converts line breaks to br
+ * @return {String}        string with <br>
+ */
 function convertLBtoBR(string)
 {
 	return string.replace(/(?:\r\n|\r|\n)/g, '<br>');
 }
 
+/**
+ * escape HTML string
+ * @param  {String} !String.prototype.escapeHTML HTML data string to be escaped
+ * @return {String}                              escaped string
+ */
 if (!String.prototype.escapeHTML) {
 	String.prototype.escapeHTML = function() {
 		return this.replace(/[&<>"'\/]/g, function (s) {
@@ -194,6 +211,11 @@ if (!String.prototype.escapeHTML) {
 	};
 }
 
+/**
+ * unescape a HTML encoded string
+ * @param  {String} !String.prototype.unescapeHTML data with escaped entries
+ * @return {String}                                HTML formated string
+ */
 if (!String.prototype.unescapeHTML) {
 	String.prototype.unescapeHTML = function() {
 		return this.replace(/&[#\w]+;/g, function (s) {
@@ -211,31 +233,33 @@ if (!String.prototype.unescapeHTML) {
 	};
 }
 
-// METHOD: getTimestamp
+/**
-// PARAMS: none
+ * returns current timestamp (unix timestamp)
-// RETURN: timestamp (in milliseconds)
+ * @return {Number} timestamp (in milliseconds)
-// DESC  : returns current timestamp (unix timestamp)
+ */
 function getTimestamp()
 {
 	var date = new Date();
 	return date.getTime();
 }
 
-// METHOD: dec2hex
+/**
-// PARAMS: decimal string
+ * dec2hex :: Integer -> String
-// RETURN: string
+ * i.e. 0-255 -> '00'-'ff'
-// DESC  : dec2hex :: Integer -> String
+ * @param  {Number} dec decimal string
-//         i.e. 0-255 -> '00'-'ff'
+ * @return {String}     hex encdoded number
+ */
 function dec2hex(dec)
 {
 	return ('0' + dec.toString(16)).substr(-2);
 }
 
-// METHOD: generateId
+/**
-// PARAMS: lenght in int
+ * generateId :: Integer -> String
-// RETURN: random string
+ * only works on mondern browsers
-// DESC  : generateId :: Integer -> String
+ * @param  {Number} len length of unique id string
-//         only works on mondern browsers
+ * @return {String}     random string in length of len
+ */
 function generateId(len)
 {
 	var arr = new Uint8Array((len || 40) / 2);
@@ -243,20 +267,22 @@ function generateId(len)
 	return Array.from(arr, dec2hex).join('');
 }
 
-// METHOD: randomIdF()
+/**
-// PARAMS: none
+ * creates a pseudo random string of 10 characters
-// RETURN: not true random string
+ * works on all browsers
-// DESC  : creates a pseudo random string of 10 characters
+ * after many runs it will create duplicates
-//         after many runs it will create duplicates
+ * @return {String} not true random string
+ */
 function randomIdF()
 {
 	return Math.random().toString(36).substring(2);
 }
 
-// METHOD: isObject
+/**
-// PARAMS: possible object
+ * checks if a variable is an object
-// RETURN: true/false if it is an object or not
+ * @param  {Mixed}   val possible object
-// DESC  : checks if a variable is an object
+ * @return {Boolean}     true/false if it is an object or not
+ */
 function isObject(val) {
 	if (val === null) {
 		return false;
@@ -264,31 +290,70 @@ function isObject(val) {
 	return ((typeof val === 'function') || (typeof val === 'object'));
 }
 
-// METHOD: keyInObject
+/**
-// PARAMS: key name, object
+ * get the length of an object (entries)
-// RETURN: true/false if key exists in object
+ * @param  {Object} object object to check
-// DESC  : checks if a key exists in a given object
+ * @return {Number} number of entry
-const keyInObject = (key, object) => (key in object) ? true : false;
+ */
-/*function keyInObject(key, object)
+function getObjectCount(object) {
-{
+	return Object.keys(object).length;
-	return (key in object) ? true : false;
+}
-}*/
 
-// METHOD: exists
+/**
-// PARAMS: uid
+ * checks if a key exists in a given object
-// RETURN: true/false
+ * @param  {String}  key    key name
-// DESC  : checks if a DOM element actually exists
+ * @param  {Object}  object object to search key in
-const exists = (id) => $('#' + id).length > 0 ? true : false;
+ * @return {Boolean}        true/false if key exists in object
-/*function exists(id)
+ */
+function keyInObject(key, object)
+{
+	return (Object.prototype.hasOwnProperty.call(object, key)) ? true : false;
+}
+
+/**
+ * returns matching key of value
+ * @param  {Object} obj   object to search value in
+ * @param  {Mixed}  value any value (String, Number, etc)
+ * @return {String}       the key found for the first matching value
+ */
+function getKeyByValue(object, value)
+{
+	return Object.keys(object).find(key => object[key] === value);
+	// return Object.keys(object).find(function (key) {
+	// 	return object[key] === value;
+	// });
+}
+
+/**
+ * returns true if value is found in object with a key
+ * @param  {Object}  obj   object to search value in
+ * @param  {Mixed}   value any value (String, Number, etc)
+ * @return {Boolean}       true on value found, false on not found
+ */
+function valueInObject(object, value)
+{
+	return (Object.keys(object).find(key => object[key] === value)) ? true : false;
+	// return Object.keys(object).find(function (key) {
+	// 	return object[key] === value;
+	// }) ? true : false;
+}
+
+/**
+ * checks if a DOM element actually exists
+ * @param  {String}  id Element id to check for
+ * @return {Boolean}    true if element exists, false on failure
+ */
+function exists(id)
 {
 	return $('#' + id).length > 0 ? true : false;
-}*/
+}
 
-// METHOD: formatBytes
+/**
-// PARAMS: bytes in int
+ * converts a int number into bytes with prefix in two decimals precision
-// RETURN: string in GB/MB/KB
+ * currently precision is fixed, if dynamic needs check for max/min precision
-// DESC  : converts a int number into bytes with prefix in two decimals precision
+ * @param  {Number} bytes bytes in int
-//         currently precision is fixed, if dynamic needs check for max/min precision
+ * @return {String}       string in GB/MB/KB
+ */
 function formatBytes(bytes)
 {
 	var i = -1;
@@ -296,14 +361,13 @@ function formatBytes(bytes)
 		bytes = bytes / 1024;
 		i++;
 	} while (bytes > 99);
-
 	return parseFloat(Math.round(bytes * Math.pow(10, 2)) / Math.pow(10, 2)) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
 }
 
-// METHOD: errorCatch
+/**
-// PARAMS: err (error from try/catch
+ * prints out error messages based on data available from the browser
-// RETURN: none
+ * @param {Object} err error from try/catch block
-// DESC  : prints out error messages based on data available from the browser
+ */
 function errorCatch(err)
 {
 	// for FF & Chrome
@@ -329,45 +393,59 @@ function errorCatch(err)
 	}
 }
 
-// METHOD: actionIndicator
+/**
-// PARAMS: none
+ * show or hide the "do" overlay
-// RETURN: none
+ * @param {String}  loc            location name for action indicator
-// DESC   : show or hide the "do" overlay
+ *                                 default empty. for console.log
-function actionIndicator(loc = '')
+ * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
+ */
+function actionIndicator(loc, overlay = true)
 {
 	if ($('#overlayBox').is(':visible')) {
-		actionIndicatorHide(loc);
+		actionIndicatorHide(loc, overlay);
 	} else {
-		 actionIndicatorShow(loc);
+		 actionIndicatorShow(loc, overlay);
 	}
 }
 
-// METHOD: actionIndicatorShow/actionIndicatorHide
+/**
-// PARAMS: loc for console log info
+ * explicit show for action Indicator
-// RETURN: none
+ * instead of automatically show or hide, do on command show
-// DESC  : explicit show/hide for action Indicator
+ * @param {String}  loc            location name for action indicator
-//         instead of automatically show or hide, do
+ *                                 default empty. for console.log
-//         on command
+ * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
-function actionIndicatorShow(loc = '')
+ */
+function actionIndicatorShow(loc, overlay = true)
 {
 	console.log('Indicator: SHOW [%s]', loc);
 	$('#indicator').addClass('progress');
 	setCenter('indicator', true, true);
 	$('#indicator').show();
-	overlayBoxShow();
+	if (overlay === true) {
+		overlayBoxShow();
+	}
 }
-function actionIndicatorHide(loc = '')
+
+/**
+ * explicit hide for action Indicator
+ * instead of automatically show or hide, do on command hide
+ * @param {String}  loc            location name for action indicator
+ *                                 default empty. for console.log
+ * @param {Boolean} [overlay=true] override the auto hide/show over the overlay div block
+ */
+function actionIndicatorHide(loc, overlay = true)
 {
 	console.log('Indicator: HIDE [%s]', loc);
 	$('#indicator').hide();
 	$('#indicator').removeClass('progress');
-	overlayBoxHide();
+	if (overlay === true) {
+		overlayBoxHide();
+	}
 }
 
-// METHOD: overlayBoxView
+/**
-// PARAMS: none
+ * shows the overlay box
-// RETURN: none
+ */
-// DESC  : shows or hides the overlay box
 function overlayBoxShow()
 {
 	// check if overlay box exists and if yes set the z-index to 100
@@ -377,6 +455,10 @@ function overlayBoxShow()
 		$('#overlayBox').show();
 	}
 }
+
+/**
+ * hides the overlay box
+ */
 function overlayBoxHide()
 {
 	// if the overlay box z-index is 100, do no hide, but set to 98
@@ -387,10 +469,9 @@ function overlayBoxHide()
 	}
 }
 
-// METHOD: setOverlayBox
+/**
-// PARAMS: none
+ * position the overlay block box and shows it
-// RETURN: none
+ */
-// DESC   : position the overlay block box and shows it
 function setOverlayBox()
 {
 	var viewport = document.viewport.getDimensions();
@@ -401,10 +482,9 @@ function setOverlayBox()
 	$('#overlayBox').show();
 }
 
-// METHOD: ClearCall
+/**
-// PARAMS: none
+ * the abort call, clears the action box and hides it and the overlay box
-// RETURN: none
+ */
-// DESC  : the abort call, clears the action box and hides it and the overlay box
 function ClearCall()
 {
 	$('#actionBox').innerHTML = '';
@@ -413,16 +493,18 @@ function ClearCall()
 }
 
 // *** DOM MANAGEMENT FUNCTIONS
-// METHOD: cel [create element]
+/**
-// PARAMS: tag: must set tag (div, span, etc)
+ * reates object for DOM element creation flow
-//         id: optional set for id, if input, select will be used for name
+ * @param  {String} tag          must set tag (div, span, etc)
-//         content: text content inside, is skipped if sub elements exist
+ * @param  {String} [id='']      optional set for id, if input, select will be used for name
-//         css: array for css tags
+ * @param  {String} [content=''] text content inside, is skipped if sub elements exist
-//         options: anything else (value, placeholder, OnClick, style)
+ * @param  {Array}  [css=[]]     array for css tags
-// RETURN: object
+ * @param  {Object} [options={}] anything else (value, placeholder, OnClick, style)
-// DESC  : creates object for DOM element creation flow
+ * @return {Object}              created element as an object
-const cel = (tag, id = '', content = '', css = [], options = {}) =>
+ */
-	_element = {
+function cel(tag, id = '', content = '', css = [], options = {})
+{
+	return {
 		tag: tag,
 		id: id,
 		name: options.name, // override name if set [name gets ignored in tree build anyway]
@@ -431,13 +513,15 @@ const cel = (tag, id = '', content = '', css = [], options = {}) =>
 		options: options,
 		sub: []
 	};
+}
 
-// METHOD: ael [attach element]
+/**
-// PARAMS: base: object where to attach/search
+ * attach a cel created object to another to create a basic DOM tree
-//         attach: the object to be attached
+ * @param  {Object} base    object where to attach/search
-//         id: optional id, if given search in base for this id and attach there
+ * @param  {Object} attach  the object to be attached
-// RETURN: "none", technically there is no return needed
+ * @param  {String} [id=''] optional id, if given search in base for this id and attach there
-// DESC  : attach a cel created object to another to create a basic DOM tree
+ * @return {Object}         "none", technically there is no return needed as it is global attach
+ */
 function ael(base, attach, id = '')
 {
 	if (id) {
@@ -459,12 +543,13 @@ function ael(base, attach, id = '')
 	return base;
 }
 
-// METHOD: aelx [attach n elements]
+/**
-// PARAMS: base: object to where we attach the elements
+ * directly attach n elements to one master base element
-//         attach 1..n: attach directly to the base element those attachments
+ * this type does not support attach with optional id
-// RETURN: "none", technically there is no return needed
+ * @param  {Object}    base   object to where we attach the elements
-// DESC  : directly attach n elements to one master base element
+ * @param  {...Object} attach attach 1..n: attach directly to the base element those attachments
-//         this type does not support attach with optional id
+ * @return {Object}           "none", technically there is no return needed, global attach
+ */
 function aelx(base, ...attach)
 {
 	for (var i = 0; i < attach.length; i ++) {
@@ -473,19 +558,23 @@ function aelx(base, ...attach)
 	return base;
 }
 
-// METHOD: rel [reset element]
+/**
-// PARAMS: cel created element
+ * resets the sub elements of the base element given
-// RETURN: returns sub reset base element
+ * @param  {Object} base cel created element
-// DESC  : resets the sub elements of the base element given
+ * @return {Object}      returns reset base element
-const rel = (base) => {
+ */
+function rel(base)
+{
 	base.sub = [];
 	return base;
-};
+}
 
-// METHOD: rcssel [remove a css from the element]
+/**
-// PARAMS: element, style sheet to remove
+ * searches and removes style from css array
-// RETURN: "none", in place because of reference
+ * @param  {Object} _element element to work one
-// DESC  : searches and removes style from css array
+ * @param  {String css      style sheet to remove (name)
+ * @return {Object}          returns full element
+ */
 function rcssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -495,10 +584,12 @@ function rcssel(_element, css)
 	return _element;
 }
 
-// METHOD: acssel [add css element]
+/**
-// PARAMS: element, style sheet to add
+ * adds a new style sheet to the element given
-// RETURN: "none", in place add because of reference
+ * @param  {Object} _element element to work on
-// DESC  : adds a new style sheet to the element given
+ * @param  {String} css      style sheet to add (name)
+ * @return {Object}         returns full element
+ */
 function acssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -508,23 +599,26 @@ function acssel(_element, css)
 	return _element;
 }
 
-// METHOD: scssel
+/**
-// PARAMS: element, style to remove, style to add
+ * removes one css and adds another
-// RETURN: "none", in place add because of reference
+ * is a wrapper around rcssel/acssel
-// DESC  : removes one css and adds another
+ * @param  {Object} _element element to work on
-//         is a wrapper around rcssel/acssel
+ * @param  {String} rcss     style to remove (name)
+ * @param  {String} acss     style to add (name)
+ * @return {Object}          returns full element
+ */
 function scssel(_element, rcss, acss)
 {
 	rcssel(_element, rcss);
 	acssel(_element, acss);
 }
 
-// METHOD: phfo [produce html from object]
+/**
-// PARAMS: object tree with dom element declarations
+ * parses the object tree created with cel/ael and converts it into an HTML string
-// RETURN: HTML string that can be used as innerHTML
+ * that can be inserted into the page
-// DESC  : parses the object tree created with cel/ael
+ * @param  {Object} tree object tree with dom element declarations
-//         and converts it into an HTML string that can
+ * @return {String}      HTML string that can be used as innerHTML
-//         be inserted into the page
+ */
 function phfo(tree)
 {
 	// holds the elements
@@ -587,33 +681,45 @@ function phfo(tree)
 
 // BLOCK: html wrappers for quickly creating html data blocks
 
-// NOTE  : OLD FORMAT which misses multiple block set
+/**
-// METHOD: html_options
+ * NOTE: OLD FORMAT which misses multiple block set
-// PARAMS: name/id, array for the options, selected item uid
+ * creates an select/options drop down block.
-//         options_only [def false] if this is true, it will not print the select part
+ * the array needs to be key -> value format.
-//         return_string [def false]: return as string and not as element
+ * key is for the option id and value is for the data output
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param  {String}  name                  name/id
-// RETURN: html with build options block
+ * @param  {Object}  data                  array for the options
-// DESC  : creates an select/options drop down block.
+ * @param  {String}  [selected='']         selected item uid
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+ * @param  {Boolean} [options_only=false]  if this is true, it will not print the select part
+ * @param  {Boolean} [return_string=false] return as string and not as element
+ * @param  {String}  [sort='']             if empty as is, else allowed 'keys',
+ *                                         'values' all others are ignored
+ * @return {String}                        html with build options block
+ */
 function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '')
 {
 	// wrapper to new call
 	return html_options_block(name, data, selected, false, options_only, return_string, sort);
 }
 
-// NOTE  : USE THIS CALL, the above one is deprecated
+/**
-// METHOD: html_options
+ * NOTE: USE THIS CALL, the above one is deprecated
-// PARAMS: name/id, array for the options,
+ * creates an select/options drop down block.
-//         selected item uid
+ * the array needs to be key -> value format.
-//         multiple [def false] if this is true, the drop down will be turned into multiple select
+ * key is for the option id and value is for the data output
-//         options_only [def false] if this is true, it will not print the select part
+ * @param  {String}  name                  name/id
-//         return_string [def false]: return as string and not as element
+ * @param  {Object}  data                  array for the options
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param  {String}  [selected='']         selected item uid
-// RETURN: html with build options block
+ * @param  {Number}  [multiple=0]          if this is 1 or larger, the drop down
-// DESC  : creates an select/options drop down block.
+ *                                         will be turned into multiple select
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+ *                                         the number sets the size value unless it is 1,
-function html_options_block(name, data, selected = '', multiple = false, options_only = false, return_string = false, sort = '')
+ *                                         then it is default
+ * @param  {Boolean} [options_only=false]  if this is true, it will not print the select part
+ * @param  {Boolean} [return_string=false] return as string and not as element
+ * @param  {String}  [sort='']             if empty as is, else allowed 'keys',
+ *                                         'values' all others are ignored
+ * @return {String}                        html with build options block
+ */
+function html_options_block(name, data, selected = '', multiple = 0, options_only = false, return_string = false, sort = '')
 {
 	var content = [];
 	var element_select;
@@ -622,8 +728,11 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	var data_list = []; // for sorted output
 	var value;
 	var option;
-	if (multiple === true) {
+	if (multiple > 0) {
 		select_options.multiple = '';
+		if (multiple > 1) {
+			select_options.size = multiple;
+		}
 	}
 	// set outside select, gets stripped on return if options only is true
 	element_select = cel('select', name, '', [], select_options);
@@ -640,14 +749,18 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	// for (const [key, value] of Object.entries(data)) {
 	for (const key of data_list) {
 		value = data[key];
-		console.log('create [%s] options: key: %s, value: %s', name, key, value);
+		// console.log('create [%s] options: key: %s, value: %s', name, key, value);
 		// basic options init
 		options = {
 			'label': value,
 			'value': key
 		};
 		// add selected if matching
-		if (selected == key) {
+		if (multiple == 0 && !Array.isArray(selected) && selected == key) {
+			options.selected = '';
+		}
+		// for multiple, we match selected as array
+		if (multiple == 1 && Array.isArray(selected) && selected.indexOf(key) != -1) {
 			options.selected = '';
 		}
 		// create the element option
@@ -676,11 +789,13 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	}
 }
 
-// METHOD: html_options_refill
+/**
-// PARAMS: name/id, array of options, sort = ''
+ *  refills a select box with options and keeps the selected
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param {String} name      name/id
-// RETURN: none
+ * @param {Object} data      array of options
-// DESC  : refills a select box with options and keeps the selected
+ * @param {String} [sort=''] if empty as is, else allowed 'keys', 'values'
+ *                            all others are ignored
+ */
 function html_options_refill(name, data, sort = '')
 {
 	var element_option;
@@ -714,11 +829,70 @@ function html_options_refill(name, data, sort = '')
 	}
 }
 
+/**
+ * parses a query string from window.location.search.substring(1)
+ * ALTERNATIVE CODE
+ * var url = new URL(window.location.href);
+ * param_uid = url.searchParams.get('uid');
+ * @param  {String}        [query='']      the query string to parse
+ *                                         if not set will auto fill
+ * @param  {String}        [return_key=''] if set only returns this key entry
+ *                                         or empty for none
+ * @return {Object|String}                 parameter entry list
+ */
+function parseQueryString(query = '', return_key = '') {
+	if (!query) {
+		query = window.location.search.substring(1);
+	}
+	var vars = query.split("&");
+	var query_string = {};
+	for (var i = 0; i < vars.length; i++) {
+		var pair = vars[i].split("=");
+		var key = decodeURIComponent(pair[0]);
+		var value = decodeURIComponent(pair[1]);
+		// If first entry with this name
+		if (typeof query_string[key] === "undefined") {
+			query_string[key] = decodeURIComponent(value);
+			// If second entry with this name
+		} else if (typeof query_string[key] === "string") {
+			var arr = [query_string[key], decodeURIComponent(value)];
+			query_string[key] = arr;
+			// If third or later entry with this name
+		} else {
+			query_string[key].push(decodeURIComponent(value));
+		}
+	}
+	if (return_key) {
+		if (keyInObject(return_key, query_string)) {
+			return query_string[return_key];
+		} else {
+			return '';
+		}
+	} else {
+		return query_string;
+	}
+}
+
+/**
+ * searchs the current url for a parameter
+ * @param  {String} key uid key to get data for
+ * @return {String}     value for the key or '' for not found
+ */
+function getQueryStringParam(key)
+{
+	var url = new URL(window.location.href);
+	var param = url.searchParams.get(key);
+	if (param) {
+		return param;
+	} else {
+		return '';
+	}
+}
+
 // *** MASTER logout call
-// METHOD: loginLogout
+/**
-// PARAMS: none
+ * submits basic data for form logout
-// RETURN: none
+ */
-// DESC  : submits basic data for form logout
 function loginLogout()
 {
 	const form = document.createElement('form');
@@ -732,4 +906,80 @@ function loginLogout()
 	form.submit();
 }
 
+/**
+ * create login string and logout button elements
+ * @param {String} login_string             the login string to show on the left
+ * @param {String} [header_id='mainHeader'] the target for the main element block
+ *                                          if not set mainHeader is assumed
+ *                                          this is the target div for the "loginRow"
+ */
+function createLoginRow(login_string, header_id = 'mainHeader')
+{
+	// if header does not exist, we do nothing
+	if (exists(header_id)) {
+		// that row must exist already, if not it must be the first in the "mainHeader"
+		if (!exists('loginRow')) {
+			$('#' + header_id).html(phfo(cel('div', 'loginRow', '', ['loginRow', 'flx-spbt'])));
+		}
+		// clear out just in case for first entry
+		// fill with div name & login/logout button
+		$('#loginRow').html(phfo(cel('div', '', login_string)));
+		$('#loginRow').append(phfo(
+			aelx(
+				// outer div
+				cel('div'),
+				// inner element
+				cel('input', 'logout', '', [], {
+					value: __('Logout'),
+					type: 'button',
+					onClick: 'loginLogout()'
+				})
+			)
+		));
+	}
+}
+
+/**
+ * create the top nav menu that switches physical between pages
+ * (edit access data based)
+ * @param {Object} nav_menu                 the built nav menu with highlight info
+ * @param {String} [header_id='mainHeader'] the target for the main element block
+ *                                          if not set mainHeader is assumed
+ *                                          this is the target div for the "menuRow"
+ */
+function createNavMenu(nav_menu, header_id = 'mainHeader') {
+	// must be an object
+	if (isObject(nav_menu) && getObjectCount(nav_menu) > 1) {
+		// do we have more than one entry, if not, do not show (single page)
+		if (!exists('menuRow')) {
+			$('#' + header_id).html(phfo(cel('div', 'menuRow', '', ['menuRow', 'flx-s'])));
+		}
+		var content = [];
+		$.each(nav_menu, function(key, item) {
+			// key is number
+			// item is object with entries
+			if (key != 0) {
+				content.push(phfo(cel('div', '', '&middot;', ['pd-2'])));
+			}
+			// ignore item.popup for now
+			if (item.enabled) {
+				// set selected based on window.location.href as the php set will not work
+				if (window.location.href.indexOf(item.url) != -1) {
+					item.selected = 1;
+				}
+				// create the entry
+				content.push(phfo(
+					aelx(
+						cel('div'),
+						cel('a', '', item.name, ['pd-2'].concat(item.selected ? 'highlight': ''), {
+							href: item.url
+						})
+					)
+				));
+			}
+		});
+		$('#menuRow').html(content.join(''));
+	}
+}
+
 /* END */

www/layout/admin/javascript/edit.pt.js

@@ -1,4 +1,5 @@
 /* general edit javascript */
+/* prototype version */
 
 /* jshint esversion: 6 */
 
@@ -11,19 +12,21 @@ if (!DEBUG) {
 	});
 }*/
 
-// METHOD: pop
+/**
-// PARAMS: url, window name, features
+ * opens a popup window with winName and given features (string)
-// RETURN: none
+ * @param {String} theURL   the url
-// DESC  : opens a popup window with winName and given features (string)
+ * @param {String} winName  window name
+ * @param {Object} features popup features
+ */
 function pop(theURL, winName, features) {
 	winName = window.open(theURL, winName, features);
 	winName.focus();
 }
 
-// METHOD: expandTA
+/**
-// PARAMS: id
+ * automatically resize a text area based on the amount of lines in it
-// RETURN: none
+ * @param {[string} ta_id element id
-// DESC  : automatically resize a text area based on the amount of lines in it
+ */
 function expandTA(ta_id) {
 	var ta;
 	// if a string comes, its a get by id, else use it as an element pass on
@@ -44,12 +47,12 @@ function expandTA(ta_id) {
 	ta.rows = numNewRows + theRows.length;
 }
 
-// METHOD: ShowHideMenu
+/**
-// PARAMS: status -> show or hide
+ * shows or hides the menu
-//         id -> id to work on
+ * this is used in some old menu templates
-// RETURN: none
+ * @param {String} status show or hide
-// DESC:   shows or hides the menu
+ * @param {String} id     element id to work on
-//         this is used in some old menu templates
+ */
 function ShowHideMenu(status, id)
 {
 	if (status == 'show') {
@@ -65,8 +68,12 @@ function ShowHideMenu(status, id)
 	}
 }
 
-// used in old templates
+/**
-// move element action
+ * used in old templates
+ * move element action
+ * @param {String} id        element id to move
+ * @param {String} direction move direction
+ */
 function mv(id, direction)
 {
 	document.forms[form_name].action.value = 'move';
@@ -75,7 +82,11 @@ function mv(id, direction)
 	document.forms[form_name].submit();
 }
 
-// load element action
+/**
+ * used in old templates
+ * load element action
+ * @param {String} id the element id to load
+ */
 function le(id)
 {
 	document.forms[form_name].action.value = 'load';
@@ -91,13 +102,14 @@ function le(id)
 	}
 }
 
-// METHOD: sh
+/**
-// PARAMS: id -> element to hide
+ * hides an element, additional writes 1 (show) or 0 (hide) into <id>Flag field
-//         showText -> text for the element if shown
+ * this needs scriptacolous installed for BlindUp/BlindDown
-//         hideText -> text for the element if hidden
+ * @param  {String}  id       element id to hide
-// RETURN: returns true if hidden, or false if not
+ * @param  {String}  showText text for the element if shown
-// DESC  : hides an element, additional writes 1 (show) or 0 (hide) into <id>Flag field
+ * @param  {String}  hideText text for the element if hidden
-//         this needs scriptacolous installed for BlindUp/BlindDown
+ * @return {Boolean}          returns true if hidden, or false if not
+ */
 function sh(id, showText, hideText)
 {
 	flag = id + 'Flag';
@@ -120,10 +132,10 @@ function sh(id, showText, hideText)
 	return divStatus;
 }
 
-// METHOD: getWindowSize
+/**
-// PARAMS: none
+ * wrapper to get the real window size for the current browser window
-// RETURN: array with width/height
+ * @return {Object} object with width/height
-// DESC  : wrapper to get the real window size for the current browser window
+ */
 function getWindowSize()
 {
 	var width, height;
@@ -135,10 +147,10 @@ function getWindowSize()
 	};
 }
 
-// METHOD: getScrollOffset
+/**
-// PARAMS: none
+ * wrapper to get the correct scroll offset
-// RETURN: array with x/y px
+ * @return {Object} object with x/y px
-// DESC  : wrapper to get the correct scroll offset
+ */
 function getScrollOffset()
 {
 	var left, top;
@@ -150,10 +162,12 @@ function getScrollOffset()
 	};
 }
 
-// METHOD: setCenter
+/**
-// PARAMS: id to set center
+ * centers div to current window size middle
-// RETURN: none
+ * @param {String}  id   element to center
-// DESC  : centers div to current window size middle
+ * @param {Boolean} left if true centers to the middle from the left
+ * @param {Boolean} top  if true centers to the middle from the top
+ */
 function setCenter(id, left, top)
 {
 	// get size of id
@@ -179,10 +193,11 @@ function setCenter(id, left, top)
 	}
 }
 
-// METHOD: goToPos()
+/**
-// PARAMS: element, offset (default 0)
+ * goes to an element id position
-// RETURN: none
+ * @param {String} element    element id to move to
-// DESC:   goes to an element id position
+ * @param {Number} [offset=0] offset from top, default is 0 (px)
+ */
 function goToPos(element, offset = 0)
 {
 	try {
@@ -203,10 +218,12 @@ function goToPos(element, offset = 0)
 	}
 }
 
-// METHOD: __
+/**
-// PARAMS: text
+ * uses the i18n object created in the translation template
-// RETURN: translated text (based on PHP selected language)
+ * that is filled from gettext in PHP
-// DESC  : uses the i18n array created in the translation template, that is filled from gettext in PHP (Smarty)
+ * @param  {String} string text to translate
+ * @return {String}        translated text (based on PHP selected language)
+ */
 function __(string)
 {
 	if (typeof i18n !== 'undefined' && isObject(i18n) && i18n[string]) {
@@ -216,12 +233,13 @@ function __(string)
 	}
 }
 
-// METHOD: string.format
+/**
-// PARAMS: any, for string format
+ * simple sprintf formater for replace
-// RETURN: formatted string
+ * usage: "{0} is cool, {1} is not".format("Alpha", "Beta");
-// DESC  : simple sprintf formater for replace
+ * First, checks if it isn't implemented yet.
-//         "{0} is cool, {1} is not".format("Alpha", "Beta");
+ * @param  {String} !String.prototype.format string with elements to be replaced
-// First, checks if it isn't implemented yet.
+ * @return {String}                          Formated string
+ */
 if (!String.prototype.format) {
 	String.prototype.format = function()
 	{
@@ -236,25 +254,32 @@ if (!String.prototype.format) {
 	};
 }
 
-// METHOD: numberWithCommas
+/**
-// PARAMS: number
+ * formats flat number 123456 to 123,456
-// RETURN: formatted with , in thousands
+ * @param  {Number} x number to be formated
-// DESC  : formats flat number 123456 to 123,456
+ * @return {String}   formatted with , in thousands
+ */
 const numberWithCommas = (x) => {
 	var parts = x.toString().split(".");
 	parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 	return parts.join(".");
 };
 
-// METHOD:
+/**
-// PARAMS: string
+ * converts line breaks to br
-// RETURN: string with <br>
+ * @param  {String} string any string
-// DESC  : converts line breaks to br
+ * @return {String}        string with <br>
+ */
 function convertLBtoBR(string)
 {
 	return string.replace(/(?:\r\n|\r|\n)/g, '<br>');
 }
 
+/**
+ * escape HTML string
+ * @param  {String} !String.prototype.escapeHTML HTML data string to be escaped
+ * @return {String}                              escaped string
+ */
 if (!String.prototype.escapeHTML) {
 	String.prototype.escapeHTML = function() {
 		return this.replace(/[&<>"'\/]/g, function (s) {
@@ -272,6 +297,11 @@ if (!String.prototype.escapeHTML) {
 	};
 }
 
+/**
+ * unescape a HTML encoded string
+ * @param  {String} !String.prototype.unescapeHTML data with escaped entries
+ * @return {String}                                HTML formated string
+ */
 if (!String.prototype.unescapeHTML) {
 	String.prototype.unescapeHTML = function() {
 		return this.replace(/&[#\w]+;/g, function (s) {
@@ -289,31 +319,33 @@ if (!String.prototype.unescapeHTML) {
 	};
 }
 
-// METHOD: getTimestamp
+/**
-// PARAMS: none
+ * returns current timestamp (unix timestamp)
-// RETURN: timestamp (in milliseconds)
+ * @return {Number} timestamp (in milliseconds)
-// DESC  : returns current timestamp (unix timestamp)
+ */
 function getTimestamp()
 {
 	var date = new Date();
 	return date.getTime();
 }
 
-// METHOD: dec2hex
+/**
-// PARAMS: decimal string
+ * dec2hex :: Integer -> String
-// RETURN: string
+ * i.e. 0-255 -> '00'-'ff'
-// DESC  : dec2hex :: Integer -> String
+ * @param  {Number} dec decimal string
-//         i.e. 0-255 -> '00'-'ff'
+ * @return {String}     hex encdoded number
+ */
 function dec2hex(dec)
 {
 	return ('0' + dec.toString(16)).substr(-2);
 }
 
-// METHOD: generateId
+/**
-// PARAMS: lenght in int
+ * generateId :: Integer -> String
-// RETURN: random string
+ * only works on mondern browsers
-// DESC  : generateId :: Integer -> String
+ * @param  {Number} len length of unique id string
-//         only works on mondern browsers
+ * @return {String}     random string in length of len
+ */
 function generateId(len)
 {
 	var arr = new Uint8Array((len || 40) / 2);
@@ -321,20 +353,22 @@ function generateId(len)
 	return Array.from(arr, dec2hex).join('');
 }
 
-// METHOD: randomIdF()
+/**
-// PARAMS: none
+ * creates a pseudo random string of 10 characters
-// RETURN: not true random string
+ * works on all browsers
-// DESC  : creates a pseudo random string of 10 characters
+ * after many runs it will create duplicates
-//         after many runs it will create duplicates
+ * @return {String} not true random string
+ */
 function randomIdF()
 {
 	return Math.random().toString(36).substring(2);
 }
 
-// METHOD: isObject
+/**
-// PARAMS: possible object
+ * checks if a variable is an object
-// RETURN: true/false if it is an object or not
+ * @param  {Mixed}   val possible object
-// DESC  : checks if a variable is an object
+ * @return {Boolean}     true/false if it is an object or not
+ */
 function isObject(val) {
 	if (val === null) {
 		return false;
@@ -342,31 +376,55 @@ function isObject(val) {
 	return ((typeof val === 'function') || (typeof val === 'object'));
 }
 
-// METHOD: keyInObject
+/**
-// PARAMS: key name, object
+ * checks if a key exists in a given object
-// RETURN: true/false if key exists in object
+ * @param  {String}  key    key name
-// DESC  : checks if a key exists in a given object
+ * @param  {Object}  object object to search key in
-const keyInObject = (key, object) => (key in object) ? true : false;
+ * @return {Boolean}        true/false if key exists in object
+ */
+const keyInObject = (key, object) => (Object.prototype.hasOwnProperty.call(object, key)) ? true : false;
 /*function keyInObject(key, object)
 {
-	return (key in object) ? true : false;
+	return (Object.prototype.hasOwnProperty.call(object, key)) ? true : false;
 }*/
 
-// METHOD: exists
+/**
-// PARAMS: uid
+ * returns matching key of value
-// RETURN: true/false
+ * @param  {Object} obj   object to search value in
-// DESC  : checks if a DOM element actually exists
+ * @param  {Mixed}  value any value (String, Number, etc)
-const exists = (id) => $('#' + id).length > 0 ? true : false;
+ * @return {String}       the key found for the first matching value
+ */
+const getKeyByValue = (obj, value) => Object.keys(obj).find(key => obj[key] === value);
+// function getKeyByValue(object, value)
+// {
+// 	return Object.keys(object).find(key => object[key] === value);
+// }
+
+/**
+ * returns true if value is found in object with a key
+ * @param  {Object}  obj   object to search value in
+ * @param  {Mixed}   value any value (String, Number, etc)
+ * @return {Boolean}       true on value found, false on not found
+ */
+const valueInObject = (obj, value) => (Object.keys(obj).find(key => obj[key] === value)) ? true : false;
+
+/**
+ * checks if a DOM element actually exists
+ * @param  {String}  id Element id to check for
+ * @return {Boolean}    true if element exists, false on failure
+ */
+const exists = (id) => $(id).length > 0 ? true : false;
 /*function exists(id)
 {
-	return $('#' + id).length > 0 ? true : false;
+	return $(id).length > 0 ? true : false;
 }*/
 
-// METHOD: formatBytes
+/**
-// PARAMS: bytes in int
+ * converts a int number into bytes with prefix in two decimals precision
-// RETURN: string in GB/MB/KB
+ * currently precision is fixed, if dynamic needs check for max/min precision
-// DESC  : converts a int number into bytes with prefix in two decimals precision
+ * @param  {Number} bytes bytes in int
-//         currently precision is fixed, if dynamic needs check for max/min precision
+ * @return {String}       string in GB/MB/KB
+ */
 function formatBytes(bytes)
 {
 	var i = -1;
@@ -378,10 +436,10 @@ function formatBytes(bytes)
 	return parseFloat(Math.round(bytes * Math.pow(10, 2)) / Math.pow(10, 2)) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
 }
 
-// METHOD: errorCatch
+/**
-// PARAMS: err (error from try/catch
+ * prints out error messages based on data available from the browser
-// RETURN: none
+ * @param {Object} err error from try/catch block
-// DESC  : prints out error messages based on data available from the browser
+ */
 function errorCatch(err)
 {
 	// for FF & Chrome
@@ -407,10 +465,10 @@ function errorCatch(err)
 	}
 }
 
-// METHOD: actionIndicator
+/**
-// PARAMS: none
+ * show or hide the "do" overlay
-// RETURN: none
+ * @param {String} [loc=''] location name for action indicator, default empty. for console.log
-// DESC   : show or hide the "do" overlay
+ */
 function actionIndicator(loc = '')
 {
 	if ($('overlayBox').visible()) {
@@ -420,12 +478,11 @@ function actionIndicator(loc = '')
 	}
 }
 
-// METHOD: actionIndicatorShow/actionIndicatorHide
+/**
-// PARAMS: loc for console log info
+ * explicit show for action Indicator
-// RETURN: none
+ * instead of automatically show or hide, do on command show
-// DESC  : explicit show/hide for action Indicator
+ * @param {String} [loc=''] optional location name, empty if not set. for console.log
-//         instead of automatically show or hide, do
+ */
-//         on command
 function actionIndicatorShow(loc = '')
 {
 	console.log('Indicator: SHOW [%s]', loc);
@@ -434,6 +491,12 @@ function actionIndicatorShow(loc = '')
 	$('indicator').show();
 	overlayBoxShow();
 }
+
+/**
+ * explicit hide for action Indicator
+ * instead of automatically show or hide, do on command hide
+ * @param {String} [loc=''] optional location name, empty if not set. for console.log
+ */
 function actionIndicatorHide(loc = '')
 {
 	console.log('Indicator: HIDE [%s]', loc);
@@ -442,10 +505,9 @@ function actionIndicatorHide(loc = '')
 	overlayBoxHide();
 }
 
-// METHOD: overlayBoxView
+/**
-// PARAMS: none
+ * shows the overlay box
-// RETURN: none
+ */
-// DESC  : shows or hides the overlay box
 function overlayBoxShow()
 {
 	// check if overlay box exists and if yes set the z-index to 100
@@ -455,6 +517,10 @@ function overlayBoxShow()
 		$('overlayBox').show();
 	}
 }
+
+/**
+ * hides the overlay box
+ */
 function overlayBoxHide()
 {
 	// if the overlay box z-index is 100, do no hide, but set to 98
@@ -465,10 +531,9 @@ function overlayBoxHide()
 	}
 }
 
-// METHOD: setOverlayBox
+/**
-// PARAMS: none
+ * position the overlay block box and shows it
-// RETURN: none
+ */
-// DESC   : position the overlay block box and shows it
 function setOverlayBox()
 {
 	var viewport = document.viewport.getDimensions();
@@ -479,10 +544,9 @@ function setOverlayBox()
 	$('overlayBox').show();
 }
 
-// METHOD: ClearCall
+/**
-// PARAMS: none
+ * the abort call, clears the action box and hides it and the overlay box
-// RETURN: none
+ */
-// DESC  : the abort call, clears the action box and hides it and the overlay box
 function ClearCall()
 {
 	$('actionBox').innerHTML = '';
@@ -491,14 +555,15 @@ function ClearCall()
 }
 
 // *** DOM MANAGEMENT FUNCTIONS
-// METHOD: cel [create element]
+/**
-// PARAMS: tag: must set tag (div, span, etc)
+ * reates object for DOM element creation flow
-//         id: optional set for id, if input, select will be used for name
+ * @param  {String} tag          must set tag (div, span, etc)
-//         content: text content inside, is skipped if sub elements exist
+ * @param  {String} [id='']      optional set for id, if input, select will be used for name
-//         css: array for css tags
+ * @param  {String} [content=''] text content inside, is skipped if sub elements exist
-//         options: anything else (value, placeholder, OnClick, style)
+ * @param  {Array}  [css=[]]     array for css tags
-// RETURN: object
+ * @param  {Object} [options={}] anything else (value, placeholder, OnClick, style)
-// DESC  : creates object for DOM element creation flow
+ * @return {Object}              created element as an object
+ */
 const cel = (tag, id = '', content = '', css = [], options = {}) =>
 	_element = {
 		tag: tag,
@@ -510,12 +575,13 @@ const cel = (tag, id = '', content = '', css = [], options = {}) =>
 		sub: []
 	};
 
-// METHOD: ael [attach element]
+/**
-// PARAMS: base: object where to attach/search
+ * attach a cel created object to another to create a basic DOM tree
-//         attach: the object to be attached
+ * @param  {Object} base    object where to attach/search
-//         id: optional id, if given search in base for this id and attach there
+ * @param  {Object} attach  the object to be attached
-// RETURN: "none", technically there is no return needed
+ * @param  {String} [id=''] optional id, if given search in base for this id and attach there
-// DESC  : attach a cel created object to another to create a basic DOM tree
+ * @return {Object}         "none", technically there is no return needed as it is global attach
+ */
 function ael(base, attach, id = '')
 {
 	if (id) {
@@ -537,12 +603,13 @@ function ael(base, attach, id = '')
 	return base;
 }
 
-// METHOD: aelx [attach n elements]
+/**
-// PARAMS: base: object to where we attach the elements
+ * directly attach n elements to one master base element
-//         attach 1..n: attach directly to the base element those attachments
+ * this type does not support attach with optional id
-// RETURN: "none", technically there is no return needed
+ * @param  {Object}    base   object to where we attach the elements
-// DESC  : directly attach n elements to one master base element
+ * @param  {...Object} attach attach 1..n: attach directly to the base element those attachments
-//         this type does not support attach with optional id
+ * @return {Object}           "none", technically there is no return needed, global attach
+ */
 function aelx(base, ...attach)
 {
 	attach.each(function(t) {
@@ -551,19 +618,22 @@ function aelx(base, ...attach)
 	return base;
 }
 
-// METHOD: rel [reset element]
+/**
-// PARAMS: cel created element
+ * resets the sub elements of the base element given
-// RETURN: returns reset base element
+ * @param  {Object} base cel created element
-// DESC  : resets the sub elements of the base element given
+ * @return {Object}      returns reset base element
+ */
 const rel = (base) => {
 	base.sub = [];
 	return base;
 };
 
-// METHOD: rcssel [remove a css from the element]
+/**
-// PARAMS: element, style sheet to remove
+ * searches and removes style from css array
-// RETURN: returns full element
+ * @param  {Object} _element element to work one
-// DESC  : searches and removes style from css array
+ * @param  {String css      style sheet to remove (name)
+ * @return {Object}          returns full element
+ */
 function rcssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -573,10 +643,12 @@ function rcssel(_element, css)
 	return _element;
 }
 
-// METHOD: acssel [add css element]
+/**
-// PARAMS: element, style sheet to add
+ * adds a new style sheet to the element given
-// RETURN: returns full element
+ * @param  {Object} _element element to work on
-// DESC  : adds a new style sheet to the element given
+ * @param  {String} css      style sheet to add (name)
+ * @return {Object}         returns full element
+ */
 function acssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -586,11 +658,14 @@ function acssel(_element, css)
 	return _element;
 }
 
-// METHOD: scssel
+/**
-// PARAMS: element, style to remove, style to add
+ * removes one css and adds another
-// RETURN: returns full element
+ * is a wrapper around rcssel/acssel
-// DESC  : removes one css and adds another
+ * @param  {Object} _element element to work on
-//         is a wrapper around rcssel/acssel
+ * @param  {String} rcss     style to remove (name)
+ * @param  {String} acss     style to add (name)
+ * @return {Object}          returns full element
+ */
 function scssel(_element, rcss, acss)
 {
 	rcssel(_element, rcss);
@@ -598,12 +673,12 @@ function scssel(_element, rcss, acss)
 	return _element;
 }
 
-// METHOD: phfo [produce html from object]
+/**
-// PARAMS: object tree with dom element declarations
+ * parses the object tree created with cel/ael and converts it into an HTML string
-// RETURN: HTML string that can be used as innerHTML
+ * that can be inserted into the page
-// DESC  : parses the object tree created with cel/ael
+ * @param  {Object} tree object tree with dom element declarations
-//         and converts it into an HTML string that can
+ * @return {String}      HTML string that can be used as innerHTML
-//         be inserted into the page
+ */
 function phfo(tree)
 {
 	// holds the elements
@@ -665,33 +740,45 @@ function phfo(tree)
 
 // BLOCK: html wrappers for quickly creating html data blocks
 
-// NOTE  : OLD FORMAT which misses multiple block set
+/**
-// METHOD: html_options
+ * NOTE: OLD FORMAT which misses multiple block set
-// PARAMS: name/id, array for the options, selected item uid
+ * creates an select/options drop down block.
-//         options_only [def false] if this is true, it will not print the select part
+ * the array needs to be key -> value format.
-//         return_string [def false]: return as string and not as element
+ * key is for the option id and value is for the data output
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param  {String}  name                  name/id
-// RETURN: html with build options block
+ * @param  {Object}  data                  array for the options
-// DESC  : creates an select/options drop down block.
+ * @param  {String}  [selected='']         selected item uid
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+ * @param  {Boolean} [options_only=false]  if this is true, it will not print the select part
+ * @param  {Boolean} [return_string=false] return as string and not as element
+ * @param  {String}  [sort='']             if empty as is, else allowed 'keys',
+ *                                         'values' all others are ignored
+ * @return {String}                        html with build options block
+ */
 function html_options(name, data, selected = '', options_only = false, return_string = false, sort = '')
 {
 	// wrapper to new call
 	return html_options_block(name, data, selected, false, options_only, return_string, sort);
 }
 
-// NOTE  : USE THIS CALL, the above one is deprecated
+/**
-// METHOD: html_options
+ * NOTE: USE THIS CALL, the above one is deprecated
-// PARAMS: name/id, array for the options,
+ * creates an select/options drop down block.
-//         selected item uid
+ * the array needs to be key -> value format.
-//         multiple [def false] if this is true, the drop down will be turned into multiple select
+ * key is for the option id and value is for the data output
-//         options_only [def false] if this is true, it will not print the select part
+ * @param  {String}  name                  name/id
-//         return_string [def false]: return as string and not as element
+ * @param  {Object}  data                  array for the options
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param  {String}  [selected='']         selected item uid
-// RETURN: html with build options block
+ * @param  {Number}  [multiple=0]          if this is 1 or larger, the drop down
-// DESC  : creates an select/options drop down block.
+ *                                         will be turned into multiple select
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+ *                                         the number sets the size value unless it is 1,
-function html_options_block(name, data, selected = '', multiple = false, options_only = false, return_string = false, sort = '')
+ *                                         then it is default
+ * @param  {Boolean} [options_only=false]  if this is true, it will not print the select part
+ * @param  {Boolean} [return_string=false] return as string and not as element
+ * @param  {String}  [sort='']             if empty as is, else allowed 'keys',
+ *                                         'values' all others are ignored
+ * @return {String}                        html with build options block
+ */
+function html_options_block(name, data, selected = '', multiple = 0, options_only = false, return_string = false, sort = '')
 {
 	var content = [];
 	var element_select;
@@ -700,8 +787,11 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	var data_list = []; // for sorted output
 	var value;
 	var option;
-	if (multiple === true) {
+	if (multiple > 0) {
 		select_options.multiple = '';
+		if (multiple > 1) {
+			select_options.size = multiple;
+		}
 	}
 	// set outside select, gets stripped on return if options only is true
 	element_select = cel('select', name, '', [], select_options);
@@ -718,14 +808,18 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	// for (const [key, value] of Object.entries(data)) {
 	for (const key of data_list) {
 		value = data[key];
-		console.log('create [%s] options: key: %s, value: %s', name, key, value);
+		// console.log('create [%s] options: key: %s, value: %s', name, key, value);
 		// basic options init
 		options = {
 			'label': value,
 			'value': key
 		};
 		// add selected if matching
-		if (selected == key) {
+		if (multiple == 0 && !Array.isArray(selected) && selected == key) {
+			options.selected = '';
+		}
+		// for multiple, we match selected as array
+		if (multiple == 1 && Array.isArray(selected) && selected.indexOf(key) != -1) {
 			options.selected = '';
 		}
 		// create the element option
@@ -754,11 +848,13 @@ function html_options_block(name, data, selected = '', multiple = false, options
 	}
 }
 
-// METHOD: html_options_refill
+/**
-// PARAMS: name/id, array of options, sort = ''
+ *  refills a select box with options and keeps the selected
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
+ * @param {String} name      name/id
-// RETURN: none
+ * @param {Object} data      array of options
-// DESC  : refills a select box with options and keeps the selected
+ * @param {String} [sort=''] if empty as is, else allowed 'keys', 'values'
+ *                            all others are ignored
+ */
 function html_options_refill(name, data, sort = '')
 {
 	var element_option;
@@ -792,11 +888,70 @@ function html_options_refill(name, data, sort = '')
 	}
 }
 
+/**
+ * parses a query string from window.location.search.substring(1)
+ * ALTERNATIVE CODE
+ * var url = new URL(window.location.href);
+ * param_uid = url.searchParams.get('uid');
+ * @param  {String}        [query='']      the query string to parse
+ *                                         if not set will auto fill
+ * @param  {String}        [return_key=''] if set only returns this key entry
+ *                                         or empty for none
+ * @return {Object|String}                 parameter entry list
+ */
+function parseQueryString(query = '', return_key = '') {
+	if (!query) {
+		query = window.location.search.substring(1);
+	}
+	var vars = query.split("&");
+	var query_string = {};
+	for (var i = 0; i < vars.length; i++) {
+		var pair = vars[i].split("=");
+		var key = decodeURIComponent(pair[0]);
+		var value = decodeURIComponent(pair[1]);
+		// If first entry with this name
+		if (typeof query_string[key] === "undefined") {
+			query_string[key] = decodeURIComponent(value);
+			// If second entry with this name
+		} else if (typeof query_string[key] === "string") {
+			var arr = [query_string[key], decodeURIComponent(value)];
+			query_string[key] = arr;
+			// If third or later entry with this name
+		} else {
+			query_string[key].push(decodeURIComponent(value));
+		}
+	}
+	if (return_key) {
+		if (keyInObject(return_key, query_string)) {
+			return query_string[return_key];
+		} else {
+			return '';
+		}
+	} else {
+		return query_string;
+	}
+}
+
+/**
+ * searchs the current url for a parameter
+ * @param  {String} key uid key to get data for
+ * @return {String}     value for the key or '' for not found
+ */
+function getQueryStringParam(key)
+{
+	var url = new URL(window.location.href);
+ 	var param = url.searchParams.get(key);
+ 	if (param) {
+ 		return param;
+ 	} else {
+ 		return '';
+ 	}
+}
+
 // *** MASTER logout call
-// METHOD: loginLogout
+/**
-// PARAMS: none
+ * submits basic data for form logout
-// RETURN: none
+ */
-// DESC  : submits basic data for form logout
 function loginLogout()
 {
 	const form = document.createElement('form');

www/layout/admin/javascript/jquery-3.4.1.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.4.0
+ * jQuery JavaScript Library v3.4.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-04-10T19:48Z
+ * Date: 2019-05-01T21:04Z
  */
 ( function( global, factory ) {
 
@@ -142,7 +142,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.4.0",
+	version = "3.4.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -4498,8 +4498,12 @@ var documentElement = document.documentElement;
 		},
 		composed = { composed: true };
 
+	// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
 	// Check attachment across shadow DOM boundaries when possible (gh-3504)
-	if ( documentElement.attachShadow ) {
+	// Support: iOS 10.0-10.2 only
+	// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
+	// leading to errors. We need to check for `getRootNode`.
+	if ( documentElement.getRootNode ) {
 		isAttached = function( elem ) {
 			return jQuery.contains( elem.ownerDocument, elem ) ||
 				elem.getRootNode( composed ) === elem.ownerDocument;
@@ -5359,8 +5363,7 @@ jQuery.event = {
 
 				// Claim the first handler
 				if ( rcheckableType.test( el.type ) &&
-					el.click && nodeName( el, "input" ) &&
+					el.click && nodeName( el, "input" ) ) {
-					dataPriv.get( el, "click" ) === undefined ) {
 
 					// dataPriv.set( el, "click", ... )
 					leverageNative( el, "click", returnTrue );
@@ -5377,8 +5380,7 @@ jQuery.event = {
 
 				// Force setup before triggering a click
 				if ( rcheckableType.test( el.type ) &&
-					el.click && nodeName( el, "input" ) &&
+					el.click && nodeName( el, "input" ) ) {
-					dataPriv.get( el, "click" ) === undefined ) {
 
 					leverageNative( el, "click" );
 				}
@@ -5419,7 +5421,9 @@ function leverageNative( el, type, expectSync ) {
 
 	// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
 	if ( !expectSync ) {
-		jQuery.event.add( el, type, returnTrue );
+		if ( dataPriv.get( el, type ) === undefined ) {
+			jQuery.event.add( el, type, returnTrue );
+		}
 		return;
 	}
 
@@ -5434,9 +5438,13 @@ function leverageNative( el, type, expectSync ) {
 			if ( ( event.isTrigger & 1 ) && this[ type ] ) {
 
 				// Interrupt processing of the outer synthetic .trigger()ed event
-				if ( !saved ) {
+				// Saved data should be false in such cases, but might be a leftover capture object
+				// from an async native handler (gh-4350)
+				if ( !saved.length ) {
 
 					// Store arguments for use when handling the inner native event
+					// There will always be at least one argument (an event object), so this array
+					// will not be confused with a leftover capture object.
 					saved = slice.call( arguments );
 					dataPriv.set( this, type, saved );
 
@@ -5449,14 +5457,14 @@ function leverageNative( el, type, expectSync ) {
 					if ( saved !== result || notAsync ) {
 						dataPriv.set( this, type, false );
 					} else {
-						result = undefined;
+						result = {};
 					}
 					if ( saved !== result ) {
 
 						// Cancel the outer synthetic event
 						event.stopImmediatePropagation();
 						event.preventDefault();
-						return result;
+						return result.value;
 					}
 
 				// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5471,17 +5479,19 @@ function leverageNative( el, type, expectSync ) {
 
 			// If this is a native event triggered above, everything is now in order
 			// Fire an inner synthetic event with the original arguments
-			} else if ( saved ) {
+			} else if ( saved.length ) {
 
 				// ...and capture the result
-				dataPriv.set( this, type, jQuery.event.trigger(
+				dataPriv.set( this, type, {
+					value: jQuery.event.trigger(
 
-					// Support: IE <=9 - 11+
+						// Support: IE <=9 - 11+
-					// Extend with the prototype to reset the above stopImmediatePropagation()
+						// Extend with the prototype to reset the above stopImmediatePropagation()
-					jQuery.extend( saved.shift(), jQuery.Event.prototype ),
+						jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
-					saved,
+						saved.slice( 1 ),
-					this
+						this
-				) );
+					)
+				} );
 
 				// Abort handling of the native event
 				event.stopImmediatePropagation();

www/layout/admin/javascript/jquery.js

@@ -1 +1 @@
-jquery-3.4.0.js
+jquery-3.4.1.js

www/layout/admin/javascript/jquery.min.js

@@ -1 +1 @@
-jquery-3.4.0.min.js
+jquery-3.4.1.min.js