Fix smarty extended variable access check

It ultimate failed for the following reason.

If base class is passed on to some other class as object parameter
then accessing protected/private variables will be possible because the
__get method will interfer.
Also __set of protected/private variables is possible.

I rather run check for setting variables without defining them than
haveing open protected/private var access

.htaccess.old

@@ -9,6 +9,7 @@ php_value xdebug.show_local_vars 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

.phan/config.php

@@ -56,6 +56,7 @@ return [
 		"./www/configs/config.db.php",
 		"./www/configs/config.host.php",
 		"./www/configs/config.path.php",
+		"./www/configs/config.other.php",
 		"./www/configs/config.master.php",
 		"./www/includes/admin_header.php",
 	],
@@ -83,7 +84,7 @@ return [
 	// to parse, but not analyze
 	"exclude_analysis_directory_list" => [
 		'www/vendor',
-		'www/lib/FileUpload',
+		// 'www/lib/FileUpload',
 		'www/lib/pChart',
 		'www/lib/pChart2.1.4',
 		'www/lib/Smarty',
@@ -108,6 +109,9 @@ return [
 		// ignore the old qq tests
 		'www/admin/qq_file_upload_front.php',
 		'www/admin/qq_file_upload_ajax.php',
+		// symlink ignore
+		'www/lib/smarty-3.1.30/SmartyBC.class.php',
+		'www/lib/htmlMimeMail-2.5.1/HtmlMimeMailCreate.php',
 	],
 
 	// what not to show as problem

4dev/database/ORDER

@@ -1,7 +1,10 @@
 # functions
-function/update_function.sql
+function/set_uid.sql
+function/set_generic.sql
 function/random_string.sql
+function/set_edit_generic.sql
 function/edit_set_access_uid.sql
+function/edit_log_partition_insert.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -16,8 +19,10 @@ 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_log_overflow.sql
 table/edit_access.sql
 table/edit_access_user.sql
 table/edit_access_data.sql
@@ -26,17 +31,17 @@ trigger/trg_edit_access_right.sql
 trigger/trg_edit_access.sql
 trigger/trg_edit_access_data.sql
 trigger/trg_edit_access_user.sql
-trigger/trg_edit_generic.sql
 trigger/trg_edit_group.sql
 trigger/trg_edit_language.sql
+trigger/trg_edit_log_overflow.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
 trigger/trg_edit_user.sql
 trigger/trg_edit_visible_group.sql
 trigger/trg_edit_menu_group.sql
-trigger/trg_set_edit_access_uid.sql
 # insert data
 data/edit_tables.sql

4dev/database/bin/create_default_trigger.sh

@@ -15,22 +15,20 @@ function_name="set_generic";
 #sql_path_prep=`echo $sql_path | sed -e "s/\///g"`;
 
 # goes for each file and strips headers and endings, and creates trigger name
-for name in $sql_path*;
-do
+for name in $sql_path*; do
 	echo "Wokring on $name";
 	# strip ending
 #	t_name=`echo $name | sed -e 's/.sql$//g' | sed -e "s/^$sql_path_prep//g" | sed -e 's/\///g'`;
 	t_name=`echo $name | sed -e 's/^.*\///g' | sed -e 's/.sql$//g'`;
 	# clean all beginnings
-	for prefix in $file_prefix;
-	do
+	for prefix in $file_prefix; do
 		prefix=$prefix"_";
 		t_name=`echo $t_name | sed -e "s/\$prefix//g"`;
 	done;
 
-# those tables don't need a trigger
-# edit_generic
-# generic
+	# those tables don't need a trigger
+	# edit_generic
+	# generic
 
 	# copy the trigger template to the target
 	trg_filename=$trigger_path$trigger_prefix"_"$t_name".sql";

4dev/database/bin/drop_data.sh

@@ -14,17 +14,14 @@ file_prefix="trg";
 trigger_prefix="trg";
 index_prefix="idx";
 
-for file in `cat ORDER`;
-do
-	if [ -f $file ];
-	then
+for file in `cat ORDER`; do
+	if [ -f $file ]; then
 		# write them into a var, so we can re order them in the other way
 		new_order=$file" "$new_order;
 	fi;
 done;
 
-for file in $new_order;
-do
+for file in $new_order; do
 	sqltype=`echo $file | egrep "table/"`;
 	trgtype=`echo $file | egrep "trigger/"`;
 	idxtype=`echo $file | egrep "index/"`;
@@ -32,43 +29,34 @@ do
 	datatype=`echo $file | egrep "data/"`;
 	# remove all around to get table name
 	t_file=`echo $file | sed -e 's/^.*\///g' | sed -e 's/.sql$//g'`;
-	for prefix in $file_prefix;
-	do
+	for prefix in $file_prefix; do
 		prefix=$prefix"_";
 		t_file=`echo $t_file | sed -e "s/\$prefix//g"`;
 	done;
 	# copy the trigger template to the target
 
-	for path in $schema;
-	do
-		if [ $sqltype ];
-		then
+	for path in $schemas; do
+		if [ $sqltype ]; then
 			echo "SQL "$path"."$t_file;
 			echo "DROP TABLE "$path"."$t_file" CASCADE;" | psql -U $user -h $host $db
 		fi;
-		if [ $trgtype ];
-		then
+		if [ $trgtype ]; then
 			trigger=$trigger_prefix"_"$t_file;
 			echo "TRG $trigger TBL "$path".$t_file";
 			echo "DROP TRIGGER "$path".$trigger ON "$t_file" CASCADE;" | psql -U $user -h $host $db
 		fi;
-		if [ $fcttype ];
-		then
+		if [ $fcttype ]; then
 			echo "FCT "$path"."$t_file;
 			echo "DROP FUNCTION "$path"."$t_file"();" | psql -U $user -h $host $db
 		fi;
-		if [ $idxtype ];
-		then
+		if [ $idxtype ]; then
 			index=$index_prefix"_"$t_file;
-	#		echo "IDX "$t_file;
-	#		echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
+			# echo "IDX "$t_file;
+			# echo "DROP INDEX $index ON $t_file;" | psql -U $user -h $host $db
 		fi;
-		if [ $datatype ];
-		then
+		if [ $datatype ]; then
 			echo "DATA "$t_file;
-	#		echo "DROP FUNCTION "$t_file"();" | psql -U $user -h $host $db
+			# echo "DROP FUNCTION "$t_file"();" | psql -U $user -h $host $db
 		fi;
-
-	#	psql -U cms_user -h 192.168.12.14 -f $file CMSv2
 	done;
 done;

4dev/database/function/edit_log_partition_insert.sql

@@ -1,3 +1,10 @@
+-- AUTHOR: Clemens Schwaighofer
+-- DATE: 2018-07-17
+-- DESCRIPTION:
+-- partition the edit_log table by year
+-- auto creates table if missing, if failure writes to overflow table
+-- HISTORY:
+
 CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
 RETURNS TRIGGER AS
 $$
@@ -6,18 +13,23 @@ DECLARE
 	end_date DATE;
 	timeformat TEXT := 'YYYY';
 	selector TEXT := 'year';
-	_interval INTERVAL;
+	base_table TEXT := 'edit_log';
+	_interval INTERVAL := '1 ' || selector;
+	_interval_next INTERVAL := '2 ' || selector;
 	table_name TEXT;
+	-- compare date column
+	compare_date DATE := NEW.event_date;
+	compare_date_name TEXT := 'event_date';
+	-- the create commands
+	command_create_table TEXT := 'CREATE TABLE IF NOT EXISTS {TABLE_NAME} (CHECK({COMPARE_DATE_NAME} >= {START_DATE} AND {COMPARE_DATE_NAME} < {END_DATE})) INHERITS ({BASE_NAME})';
+	command_create_primary_key TEXT := 'ALTER TABLE {TABLE_NAME} ADD PRIMARY KEY ({BASE_TABLE}_id)';
+	command_create_foreign_key_1 TEXT := 'ALTER TABLE {TABLE_NAME} ADD CONSTRAINT {TABLE_NAME}_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL';
+	command_create_trigger_1 TEXT = 'CREATE TRIGGER trg_{TABLE_NAME} BEFORE INSERT OR UPDATE ON {TABLE_NAME} FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
 BEGIN
-	-- get year and month from edit_log date so we can build the target edit_log table
-
-	-- move interval
-	_interval := '1 ' || selector;
-	-- current table name
-	table_name := 'edit_log_' || to_char(NEW.event_date, timeformat);
-
 	-- we are in valid start time area
 	IF (NEW.event_date >= start_date) THEN
+		-- current table name
+		table_name := base_table || '_' || to_char(NEW.event_date, timeformat);
 		BEGIN
 			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
 		-- if insert failed because of missing table, create new below
@@ -25,17 +37,45 @@ BEGIN
 		WHEN undefined_table THEN
 			-- another block, so in case the creation fails here too
 			BEGIN
-				-- create new talbe here + all indexes
+				-- create new table here + all indexes
 				start_date := date_trunc(selector, NEW.event_date);
 				end_date := date_trunc(selector, NEW.event_date + _interval);
 				-- creat table
-				EXECUTE 'CREATE TABLE IF NOT EXISTS ' || quote_ident(table_name) || ' ( CHECK ( event_date >= ' || quote_literal(start_date) || ' AND event_date < ' || quote_literal(end_date) || ' ) ) INHERITS (edit_log)';
+				EXECUTE format(REPLACE( -- end date
+					REPLACE( -- start date
+						REPLACE( -- compare date name
+							REPLACE( -- base name (inherit)
+								REPLACE( -- table name
+									command_create_table,
+									'{TABLE_NAME}',
+									table_name
+								),
+								'{BASE_NAME}',
+								base_table
+							),
+							'{COMPARE_DATE_NAME}',
+							compare_date_name
+						),
+						'{START_DATE}',
+						quote_literal(start_date)
+					),
+					'{END_DATE}',
+					quote_literal(end_date)
+				));
 				-- create all indexes and triggers
-				EXECUTE 'ALTER TABLE ' || quote_ident(table_name) || ' ADD PRIMARY KEY (edit_log_id)';
+				EXECUTE format(REPLACE(
+					REPLACE(
+						command_create_primary_key,
+						'{TABLE_NAME}',
+						table_name
+					),
+					'{BASE_TABLE}',
+					base_table
+				));
 				-- FK constraints
-				EXECUTE 'ALTER TABLE ' || quote_ident(table_name) || ' ADD CONSTRAINT fk_' || quote_ident(table_name) || '_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE CASCADE';
+				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
 				-- generic trigger
-				EXECUTE 'CREATE TRIGGER trg_' || quote_ident(table_name) || ' BEFORE INSERT OR UPDATE ON ' || quote_ident(table_name) || ' FOR EACH ROW EXECUTE PROCEDURE set_edit_generic()';
+				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
 
 				-- insert try again
 				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
@@ -49,6 +89,57 @@ BEGIN
 			-- if this faled, throw it into the overflow table (so we don't loose anything)
 			INSERT INTO edit_log_overflow VALUES (NEW.*);
 		END;
+		-- main insert run done, check if we have to create next months table
+		BEGIN
+			-- check if next month table exists
+			table_name := base_table || '_' || to_char((SELECT NEW.event_date + _interval)::DATE, timeformat);
+			-- RAISE NOTICE 'SEARCH NEXT: %', table_name;
+			IF  (SELECT to_regclass(table_name)) IS NULL THEN
+				-- move inner interval same
+				start_date := date_trunc(selector, NEW.event_date + _interval);
+				end_date := date_trunc(selector, NEW.event_date + _interval_next);
+				-- RAISE NOTICE 'CREATE NEXT: %', table_name;
+				-- create table
+				EXECUTE format(REPLACE( -- end date
+					REPLACE( -- start date
+						REPLACE( -- compare date name
+							REPLACE( -- base name (inherit)
+								REPLACE( -- table name
+									command_create_table,
+									'{TABLE_NAME}',
+									table_name
+								),
+								'{BASE_NAME}',
+								base_table
+							),
+							'{COMPARE_DATE_NAME}',
+							compare_date_name
+						),
+						'{START_DATE}',
+						quote_literal(start_date)
+					),
+					'{END_DATE}',
+					quote_literal(end_date)
+				));
+				-- create all indexes and triggers
+				EXECUTE format(REPLACE(
+					REPLACE(
+						command_create_primary_key,
+						'{TABLE_NAME}',
+						table_name
+					),
+					'{BASE_TABLE}',
+					base_table
+				));
+				-- FK constraints
+				EXECUTE format(REPLACE(command_create_foreign_key_1, '{TABLE_NAME}', table_name));
+				-- generic trigger
+				EXECUTE format(REPLACE(command_create_trigger_1, '{TABLE_NAME}', table_name));
+			END IF;
+		EXCEPTION
+		WHEN OTHERS THEN
+			RAISE NOTICE 'Failed to create next table: %', table_name;
+		END;
 	ELSE
 		-- if outside valid date, insert into overflow
 		INSERT INTO edit_log_overflow VALUES (NEW.*);

4dev/database/function/edit_set_group_uid.sql

@@ -0,0 +1,28 @@
+-- add uid add for edit_group table
+
+CREATE OR REPLACE FUNCTION set_edit_group_uid() RETURNS TRIGGER AS
+$$
+	DECLARE
+		myrec RECORD;
+		v_uid VARCHAR;
+	BEGIN
+		-- skip if NEW.name is not set
+		IF NEW.name IS NOT NULL AND NEW.name <> '' THEN
+			-- use NEW.name as base, remove all spaces
+			-- name data is already unique, so we do not need to worry about this here
+			v_uid := REPLACE(NEW.name, ' ', '');
+			IF TG_OP = 'INSERT' THEN
+				-- always set
+				NEW.uid := v_uid;
+			ELSIF TG_OP = 'UPDATE' THEN
+				-- check if not set, then set
+				SELECT INTO myrec t.* FROM edit_group t WHERE edit_group_id = NEW.edit_group_id;
+				IF FOUND THEN
+					NEW.uid := v_uid;
+				END IF;
+			END IF;
+		END IF;
+		RETURN NEW;
+	END;
+$$
+	LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -2,7 +2,7 @@
 
 CREATE OR REPLACE FUNCTION set_uid() RETURNS TRIGGER AS '
 	DECLARE
-		random_length INT = 12; -- that should be long enough
+		random_length INT = 32; -- that should be long enough
 	BEGIN
 		IF TG_OP = ''INSERT'' THEN
 			NEW.uid := random_string(random_length);

4dev/database/function/update_function.sql

@@ -1,14 +1,16 @@
 -- adds the created or updated date tags
 
-CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
-	BEGIN
-		IF TG_OP = ''INSERT'' THEN
-			NEW.date_created := clock_timestamp();
-			NEW.user_created := current_user;
-		ELSIF TG_OP = ''UPDATE'' THEN
-			NEW.date_updated := clock_timestamp();
-			NEW.user_updated := current_user;
-		END IF;
-		RETURN NEW;
-	END;
-' LANGUAGE 'plpgsql';
+-- OLD, DEPRECATED, use set_generic.sql
+
+-- CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
+-- 	BEGIN
+-- 		IF TG_OP = ''INSERT'' THEN
+-- 			NEW.date_created := clock_timestamp();
+-- 			NEW.user_created := current_user;
+-- 		ELSIF TG_OP = ''UPDATE'' THEN
+-- 			NEW.date_updated := clock_timestamp();
+-- 			NEW.user_updated := current_user;
+-- 		END IF;
+-- 		RETURN NEW;
+-- 	END;
+-- ' LANGUAGE 'plpgsql';

4dev/database/log/.gitignore

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

4dev/database/table/edit_access.sql

@@ -8,12 +8,12 @@
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
 	edit_access_id	SERIAL PRIMARY KEY,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	protected SMALLINT DEFAULT 0,
+	deleted	SMALLINT DEFAULT 0,
+	uid	VARCHAR,
 	name	VARCHAR UNIQUE,
 	description	VARCHAR,
 	color	VARCHAR,
-	uid	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	protected INT,
-	deleted	SMALLINT DEFAULT 0,
 	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_data.sql

@@ -9,8 +9,8 @@
 CREATE TABLE edit_access_data (
 	edit_access_data_id	SERIAL PRIMARY KEY,
 	edit_access_id INT NOT NULL,
-	name	VARCHAR,
-	value	VARCHAR,
+	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
-	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	name	VARCHAR,
+	value	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_user.sql

@@ -8,12 +8,12 @@
 -- DROP TABLE edit_access_user;
 CREATE TABLE edit_access_user (
 	edit_access_user_id	SERIAL PRIMARY KEY,
-	edit_default	SMALLINT DEFAULT 0,
 	edit_access_id	INT NOT NULL,
-	edit_user_id	INT NOT NULL,
-	edit_access_right_id	INT NOT NULL,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
 	FOREIGN KEY (edit_access_id) REFERENCES edit_access (edit_access_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_user_id	INT NOT NULL,
 	FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_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
+	edit_access_right_id	INT NOT NULL,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_default	SMALLINT DEFAULT 0,
+	enabled	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_group.sql

@@ -8,12 +8,13 @@
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
 	edit_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
+	edit_scheme_id INT,
+	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_access_right_id INT NOT NULL,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	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
+	uid	VARCHAR,
+	name	VARCHAR,
+	additional_acl	JSONB
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_language.sql

@@ -9,10 +9,10 @@
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
 	edit_language_id SERIAL PRIMARY KEY,
-	short_name VARCHAR,
-	long_name VARCHAR,
-	iso_name VARCHAR,
-	order_number INT,
 	enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0
+	lang_default SMALLINT NOT NULL DEFAULT 0,
+	long_name VARCHAR,
+	short_name VARCHAR,
+	iso_name VARCHAR,
+	order_number INT
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log.sql

@@ -8,6 +8,8 @@
 -- DROP TABLE edit_log;
 CREATE TABLE edit_log (
 	edit_log_id	SERIAL PRIMARY KEY,
+	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
+	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL,
 	username	VARCHAR,
 	password	VARCHAR,
 	event_date	TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
@@ -26,7 +28,6 @@ CREATE TABLE edit_log (
 	action_value	VARCHAR,
 	action_type	VARCHAR,
 	action_error	VARCHAR,
-	euid	INT, -- this is a foreign key, but I don't nedd to reference to it
 	user_agent	VARCHAR,
 	referer	VARCHAR,
 	script_name	VARCHAR,
@@ -36,6 +37,5 @@ CREATE TABLE edit_log (
 	http_accept	VARCHAR,
 	http_accept_charset	VARCHAR,
 	http_accept_encoding	VARCHAR,
-	session_id	VARCHAR,
-	FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE
+	session_id	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_log_overflow.sql

@@ -0,0 +1,12 @@
+-- AUTHOR: Clemens Schwaighofer
+-- DATE: 2020/1/28
+-- DESCRIPTION:
+-- edit log overflow table
+-- this is the overflow table for partition
+-- TABLE: edit_log_overflow
+-- HISTORY:
+
+-- DROP TABLE edit_log_overflow;
+CREATE TABLE IF NOT EXISTS edit_log_overflow () INHERITS (edit_log);
+ALTER TABLE edit_log_overflow ADD PRIMARY KEY (edit_log_id);
+ALTER TABLE edit_log_overflow ADD CONSTRAINT edit_log_overflow_euid_fkey FOREIGN KEY (euid) REFERENCES edit_user (edit_user_id) MATCH FULL ON UPDATE CASCADE ON DELETE SET NULL;

4dev/database/table/edit_page.sql

@@ -9,6 +9,7 @@
 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
+	FOREIGN KEY (content_alias_edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	filename	VARCHAR,
 	name	VARCHAR UNIQUE,
 	order_number INT NOT NULL,
@@ -17,5 +18,5 @@ CREATE TABLE edit_page (
 	popup	SMALLINT NOT NULL DEFAULT 0,
 	popup_x	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,
+	hostname	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_access.sql

@@ -8,13 +8,13 @@
 -- DROP TABLE edit_page_access;
 CREATE TABLE edit_page_access (
 	edit_page_access_id	SERIAL PRIMARY KEY,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
 	edit_group_id	INT NOT NULL,
-	edit_page_id	INT NOT NULL,
-	edit_access_right_id	INT NOT NULL,
 	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_page_id	INT NOT NULL,
 	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_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
+	edit_access_right_id	INT NOT NULL,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	enabled	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 

4dev/database/table/edit_page_content.sql

@@ -10,11 +10,11 @@
 CREATE TABLE edit_page_content (
 	edit_page_content_id	SERIAL PRIMARY KEY,
 	edit_page_id	INT NOT NULL,
+	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	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
+	uid	VARCHAR UNIQUE,
+	name	VARCHAR,
+	order_number INT NOT NULL,
+	online	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_page_menu_group.sql

@@ -8,7 +8,7 @@
 -- DROP TABLE edit_page_menu_group;
 CREATE TABLE edit_page_menu_group (
 	edit_page_id INT NOT NULL,
-	edit_menu_group_id INT NOT NULL,
 	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_menu_group_id INT NOT NULL,
 	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );

4dev/database/table/edit_page_visible_group.sql

@@ -8,7 +8,7 @@
 -- DROP TABLE edit_page_visible_group;
 CREATE TABLE edit_page_visible_group (
 	edit_page_id INT NOT NULL,
-	edit_visible_group_id INT NOT NULL,
 	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_visible_group_id INT NOT NULL,
 	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );

4dev/database/table/edit_query_string.sql

@@ -8,10 +8,10 @@
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
 	edit_query_string_id	SERIAL PRIMARY KEY,
+	edit_page_id	INT NOT NULL,
+	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
 	name	VARCHAR,
 	value	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	dynamic	SMALLINT NOT NULL DEFAULT 0,
-	edit_page_id	INT NOT NULL,
-	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
+	dynamic	SMALLINT NOT NULL DEFAULT 0
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_temp_files.sql

@@ -7,5 +7,6 @@
 
 -- DROP TABLE temp_files;
 CREATE TABLE temp_files (
-	filename	VARCHAR
+	filename	VARCHAR,
+	folder	VARCHAR
 );

4dev/database/table/edit_user.sql

@@ -9,34 +9,39 @@
 CREATE TABLE edit_user (
 	edit_user_id	SERIAL PRIMARY KEY,
 	connect_edit_user_id	INT, -- possible reference to other user
+	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_language_id INT NOT NULL,
+	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_group_id INT NOT NULL,
+	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_scheme_id INT,
+	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	edit_access_right_id INT NOT NULL,
+	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
+	enabled	SMALLINT NOT NULL DEFAULT 0,
+	deleted	SMALLINT NOT NULL DEFAULT 0,
 	username	VARCHAR UNIQUE,
 	password	VARCHAR,
 	first_name	VARCHAR,
 	last_name	VARCHAR,
 	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,
 	protected SMALLINT NOT NULL DEFAULT 0,
 	admin	SMALLINT NOT NULL DEFAULT 0,
-	edit_language_id INT NOT NULL,
-	edit_group_id INT NOT NULL,
-	edit_scheme_id INT,
-	edit_access_right_id INT NOT NULL,
-	login_error_count	INT,
+	login_error_count	INT DEFAULT 0,
 	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
 	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
 	strict	SMALLINT DEFAULT 0,
 	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,
-	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
+	password_reset_time	TIMESTAMP WITHOUT TIME ZONE, -- when the password reset was requested
+	password_reset_uid	VARCHAR, -- the uid to access the password reset page
+	additional_acl	JSONB -- additional ACL as JSON string (can be set by other pages)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+COMMENT ON COLUMN edit_user.password_reset_time IS 'When the password reset was requested. For reset page uid valid check';
+COMMENT ON COLUMN edit_user.password_reset_uid IS 'Password reset page uid';

4dev/database/table/edit_visible_group.sql

@@ -11,7 +11,3 @@ CREATE TABLE edit_visible_group (
 	name	VARCHAR,
 	flag	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
-
-DELETE FROM edit_visible_group;
-INSERT INTO edit_visible_group (name, flag) VALUES ('Main Menu', 'main');
-INSERT INTO edit_visible_group (name, flag) VALUES ('Data popup Menu', 'datapopup');

4dev/database/trigger/trg_edit_access.sql

@@ -1,9 +1,9 @@
-DROP TRIGGER trg_edit_access ON edit_access;
+DROP TRIGGER IF EXISTS trg_edit_access ON edit_access;
 CREATE TRIGGER trg_edit_access
 BEFORE INSERT OR UPDATE ON edit_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
 
-DROP TRIGGER trg_set_edit_access_uid ON edit_access;
+DROP TRIGGER IF EXISTS trg_set_edit_access_uid ON edit_access;
 CREATE TRIGGER trg_set_edit_access_uid
 BEFORE INSERT OR UPDATE ON edit_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid();

4dev/database/trigger/trg_edit_access_data.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_data ON edit_access_data;
+DROP TRIGGER IF EXISTS trg_edit_access_data ON edit_access_data;
 CREATE TRIGGER trg_edit_access_data
 BEFORE INSERT OR UPDATE ON edit_access_data
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_right.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_right ON edit_access_right;
+DROP TRIGGER IF EXISTS trg_edit_access_right ON edit_access_right;
 CREATE TRIGGER trg_edit_access_right
 BEFORE INSERT OR UPDATE ON edit_access_right
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_user.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_user ON edit_access_user;
+DROP TRIGGER IF EXISTS trg_edit_access_user ON edit_access_user;
 CREATE TRIGGER trg_edit_access_user
 BEFORE INSERT OR UPDATE ON edit_access_user
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_group.sql

@@ -1,4 +1,9 @@
-DROP TRIGGER trg_edit_group ON edit_group;
+DROP TRIGGER IF EXISTS trg_edit_group ON edit_group;
 CREATE TRIGGER trg_edit_group
 BEFORE INSERT OR UPDATE ON edit_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
+
+DROP TRIGGER IF EXISTS trg_set_edit_group_uid ON edit_group;
+CREATE TRIGGER trg_set_edit_group_uid
+BEFORE INSERT OR UPDATE ON edit_group
+FOR EACH ROW EXECUTE PROCEDURE set_edit_group_uid();

4dev/database/trigger/trg_edit_language.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_language ON edit_language;
+DROP TRIGGER IF EXISTS trg_edit_language ON edit_language;
 CREATE TRIGGER trg_edit_language
 BEFORE INSERT OR UPDATE ON edit_language
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_log.sql

@@ -1,9 +1,9 @@
-DROP TRIGGER trg_edit_log ON edit_log;
+DROP TRIGGER IF EXISTS trg_edit_log ON edit_log;
 CREATE TRIGGER trg_edit_log
 BEFORE INSERT OR UPDATE ON edit_log
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
 
-DROP TRIGGER trg_edit_log_insert_partition ON edit_log;
+DROP TRIGGER IF EXISTS trg_edit_log_insert_partition ON edit_log;
 CREATE TRIGGER trg_edit_log_insert_partition
 BEFORE INSERT OR UPDATE ON edit_log
 FOR EACH ROW EXECUTE PROCEDURE edit_log_insert_trigger();

4dev/database/trigger/trg_edit_log_overflow.sql

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

4dev/database/trigger/trg_edit_menu_group.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_menu_group ON edit_menu_group;
+DROP TRIGGER IF EXISTS trg_edit_menu_group ON edit_menu_group;
 CREATE TRIGGER trg_edit_menu_group
 BEFORE INSERT OR UPDATE ON edit_menu_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page ON edit_page;
+DROP TRIGGER IF EXISTS trg_edit_page ON edit_page;
 CREATE TRIGGER trg_edit_page
 BEFORE INSERT OR UPDATE ON edit_page
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page_access.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page_access ON edit_page_access;
+DROP TRIGGER IF EXISTS trg_edit_page_access ON edit_page_access;
 CREATE TRIGGER trg_edit_page_access
 BEFORE INSERT OR UPDATE ON edit_page_access
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_page_content.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page_content ON edit_page_content;
+DROP TRIGGER IF EXISTS 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/trigger/trg_edit_query_string.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_query_string ON edit_query_string;
+DROP TRIGGER IF EXISTS trg_edit_query_string ON edit_query_string;
 CREATE TRIGGER trg_edit_query_string
 BEFORE INSERT OR UPDATE ON edit_query_string
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_scheme.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_scheme ON edit_scheme;
+DROP TRIGGER IF EXISTS trg_edit_scheme ON edit_scheme;
 CREATE TRIGGER trg_edit_scheme
 BEFORE INSERT OR UPDATE ON edit_scheme
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_user.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_user ON edit_user;
+DROP TRIGGER IF EXISTS trg_edit_user ON edit_user;
 CREATE TRIGGER trg_edit_user
 BEFORE INSERT OR UPDATE ON edit_user
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_visible_group.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_visible_group ON edit_visible_group;
+DROP TRIGGER IF EXISTS trg_edit_visible_group ON edit_visible_group;
 CREATE TRIGGER trg_edit_visible_group
 BEFORE INSERT OR UPDATE ON edit_visible_group
 FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/update/edit_tables_missing_columns.sql

@@ -0,0 +1,14 @@
+-- update missing edit_* table data
+
+ALTER TABLE edit_generic ADD cuid VARCHAR;
+
+ALTER TABLE edit_access ADD enabled SMALLINT DEFAULT 0;
+ALTER TABLE edit_access ADD protected SMALLINT DEFAULT 0;
+
+ALTER TABLE edit_group ADD uid VARCHAR;
+ALTER TABLE edit_group ADD deleted SMALLINT DEFAULT 0;
+
+ALTER TABLE temp_files ADD folder VARCHAR;
+ALTER TABLE edit_page ADD hostname VARCHAR;
+
+ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;

4dev/lang/admin/messages_ja_utf8.po

@@ -64,3 +64,14 @@ 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

@@ -88,3 +88,5 @@ 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;
+
+-- update all triggers

bin/Progress.pm

@@ -0,0 +1,498 @@
+package Progress;
+
+# AUTHOR: Clemens Schwaighofer
+# DATE CREATED: 2009/6/16
+# DESCRIPTION: progress percent class
+
+# METHODS
+# * init
+# my $prg = Progress->new();
+#   will init a new progress class in the var $prg
+#   the following parameters can be set directly during a new call
+#   - verbose (1/0)
+#   - precision (-1~10)
+#   - wide_time (0/1)
+#   - microtime (0/1)
+#   setting is done via
+# my $prg = Progress->new(verbose => 1, microtime = 1);
+# * setting methods
+# verbose($level int)
+#   $level has to be int, if not set there is no output show, at least 1 has to be given to see visible output
+# precision($decimals int)
+#   $decimals has to be int, if set to -1 then the steps are done in 10 increase, else it sets how many decimals are visible, 0 for no decimals
+# wide_time(0/1 int)
+#   sets the flag for wide time, if set to 1 the estimated time to end and time run is left prefixed with 15 chars
+# microtime(0/1 int)
+#   sets the flag to always show microtime (1) or only if the previous time was the same (0)
+# reset()
+#   resets all the internal vars for another new run
+# SetStartTime(optional timestamp)
+#   sets the start times for this progress run, the overall start/end time is set, and the time used for the actual progress
+#   in case there is some processing done before the run starts, it is highly recommended to call SetETAStartTime before the actual processing starts
+#   if no timestamp is given, internal timestamp is used (this is recommended)
+# SetETAStartTime(optional timestamp)
+#   only sets the start/end time for the actual "estimated time" calculation. It is recommended to call this right before the processing loop starts
+#   eg if there is a big query running that takes a lot of time, this method should be called before the reading loop
+#   as with SetStartTime a timestamp can be given, if not then the internal timestamp is used (this is recommended)
+# SetEndTime(optional timestamp)
+#   sets the end time for the overall processing. This should be called at the very end of the script before any final stat data is printed
+# linecount($lines int)
+#   sets the maximum lines that will be processed, used for percentage calculation. If non int is given, will set to 1. This will be only set once, to
+#   reset used reset() method.
+#   Either this or filesize NEED to be set
+# filesize($bytes int)
+#   filesize in bytes, if non valid data is given, then it is set to 1.
+#   filesize() and linecount() can both be set, but at least one of them has to be set.
+#   if filesize is set a byte data output is added, if only linecount is given, only the linecount output will be given (no bytes per second, etc)
+# ShowPosition(optional current byte position int)
+#   this is the main processing and has to be called at the end of the loop where the data is processed. If no bytes are given the internal counter (linecount)
+#   is used.
+#   for bytes it is recommended to use IO::File and $FH->tell to pass on the bytes
+#
+# VARIABLES
+# * internal set
+#   change: flagged 1 if output is given or would be given. can be used for any post processing after the ShowPosition is called
+#   precision_ten_step: flagged 1 if the precision was set to -1
+#   start: overall start time
+#   end: overall end time
+#   count: count of processed lines
+#   [TODO: describe the others too, at the moment only below in %fields]
+
+use strict;
+use warnings;
+use utf8;
+
+BEGIN {
+	use POSIX;
+	use Carp;
+	use Time::HiRes qw(time);
+	use File::Basename;
+	use Number::Format qw(format_number);
+	use vars qw($AUTOLOAD);
+	push(@INC, File::Basename::dirname($0).'/');
+}
+
+# important includes
+use functions;
+
+# variable declarationf or access
+# * can be set
+# = only for read
+# unmarked are internal only, but can be read if they are needed in further processing in the script
+my %fields = (
+	linecount => 0, # * max lines in input
+	filesize => 0, # * max file size
+	precision => 1, # * comma after percent
+	wide_time => 0, # * if flagged 1, then the wide 15 char left bound format is used
+	verbose => 0, # * verbose status from outside
+	microtime => 0, # * microtime output for last run time (1 for enable, 0 for auto, -1 for disable)
+	change => 0, # = flag if output was given
+	start => undef, # = global start for the full script running time
+	start_run => undef, # = for the eta time, can be set after a query or long read in, to not create a wrong ETA time
+	start_time => undef, # loop start
+	end => undef, # = global end
+	end_time => undef, # loop end
+	count_size => undef, # = filesize current
+	count => 0, # = position current
+	current_count => 0, # last count (position)
+	lines_processed => 0, # lines processed in the last run
+	last_group => 0, # time in seconds for the last group run (until percent change)
+	lines_in_last_group => 0, # float value, lines processed per second to the last group run
+	lines_in_global => 0, # float values, lines processed per second to complete run
+	bytes_in_last_group => 0, # flaot value, bytes processes per second in the last group run
+	bytes_in_global => 0, # float value, bytes processed per second to complete run
+	size_in_last_group => 0, # bytes processed in last run (in bytes)
+	current_size => 0, # current file position (size)
+	last_percent => 0, # last percent position
+	precision_ten_step => 0, # if we have normal % or in steps of 10
+	percent_print => 5, # the default size, this is precision + 4
+	percent_precision => 1, # this is 1 if it is 1 or 0 for precision, or precision size
+	eta => undef, # estimated time to finish
+	full_time_needed => undef, # run time since start
+	lg_microtime => 0 # last group microtime, this is auto set during process.
+);
+
+# class init
+sub new
+{
+	my $proto = shift;
+	my $class = ref($proto) || $proto;
+	my %data = @_;
+	my $self = {
+		_permitted => \%fields,
+		%fields,
+	};
+	# vars to init
+	bless ($self, $class);
+	if ($data{'verbose'} && $data{'verbose'} =~ /^\d{1}$/) {
+		$self->{verbose} = $data{'verbose'};
+	}
+	if (exists($data{'precision'}) && (($data{'precision'} || $data{'precision'} == 0) && $data{'precision'} =~ /^\-?\d{1,2}$/)) {
+		$self->precision($data{'precision'});
+	}
+	if ($data{'microtime'} && $data{'microtime'} =~ /^(0|1)$/) {
+		$self->microtime($data{'microtime'});
+	}
+	if ($data{'wide_time'} && $data{'wide_time'} =~ /^(0|1)$/) {
+		$self->wide_time($data{'wide_time'});
+	}
+	return $self;
+}
+
+# auto load for vars
+sub AUTOLOAD
+{
+	my $self = shift;
+	my $type = ref($self) || croak "$self is not an object";
+	my $name = $AUTOLOAD;
+	$name =~ s/.*://;
+
+	unless (exists $self->{_permitted}->{$name}) {
+		croak "Can't access '$name' field in class $type";
+	}
+
+	if (@_) {
+		return $self->{$name} = shift;
+	} else {
+		return $self->{$name};
+	}
+}
+
+# destructor
+sub DESTROY
+{
+	# do nothing, there is nothing to close or finish
+}
+
+# SUB: reset
+# PARAMS: none
+# DESC: resets all the current counters only and current start times
+sub reset
+{
+	my $self = shift;
+	# reset what always gets reset
+	$self->{count} = 0;
+	$self->{count_size} = undef;
+	$self->{current_count} = 0;
+	$self->{linecount} = 0;
+	$self->{lines_processed} = 0;
+	$self->{last_group} = 0;
+	$self->{lines_in_last_group} = 0;
+	$self->{lines_in_global} = 0;
+	$self->{bytes_in_last_group} = 0;
+	$self->{bytes_in_global} = 0;
+	$self->{size_in_last_group} = 0;
+	$self->{filesize} = 0;
+	$self->{current_size} = 0;
+	$self->{last_percent} = 0;
+	$self->{eta} = 0;
+	$self->{full_time_needed} = 0;
+	$self->{start_run} = undef;
+	$self->{start_time} = undef;
+	$self->{end_time} = undef;
+}
+
+# SUB: microtime
+# PARAMS: 1/0
+# DESC: flag to set microtime on or off in the time output
+#       if not 1 or 0, set to 0
+sub microtime
+{
+	my $self = shift;
+	my $microtime;
+	if (@_) {
+		$microtime = shift;
+		if ($microtime == 1 || $microtime == 0) {
+			$self->{microtime} = $microtime;
+		} else {
+			$self->{microtime} = 0;
+		}
+	}
+	return $self->{microtime};
+}
+
+
+# SUB: wide_time
+# PARAMS: 1/0
+# DESC: flag to set wide_time (15 char spacer).
+#       if not 1 or 0, set to 0
+sub wide_time
+{
+	my $self = shift;
+	my $wide;
+	if (@_) {
+		$wide = shift;
+		if ($wide == 1 || $wide == 0) {
+			$self->{wide_time} = $wide;
+		} else {
+			$self->{wide_time} = 0;
+		}
+	}
+	return $self->{wide_time};
+}
+
+# SUB: precision
+# PARAMS: precision in int
+# DESC: sets the output percent precision calculation and printf width
+#       if negative, to ten step, if bigger 10, set to one
+sub precision
+{
+	my $self = shift;
+	my $comma;
+	if (@_) {
+		$comma = shift;
+		$comma = 0 if ($comma !~ /^\-?\d{1,}$/);
+		if ($comma < 0) {
+			# -2 is 5 step
+			# -1 is 10 step
+			if ($comma < -1) {
+				$self->{precision_ten_step} = 5;
+			} else {
+				$self->{precision_ten_step} = 10;
+			}
+			$self->{precision} = 0; # no comma
+			$self->{percent_precision} = 0; # no print precision
+			$self->{percent_print} = 3; # max 3 length
+		} else {
+			$self->{precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
+			$self->{percent_precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
+			$self->{percent_print} = ($comma == 0 ? 3 : 4) + $self->{percent_precision};
+		}
+	}
+	return $self->{precision};
+}
+
+# SUB: linecount
+# PARAMS: max number of lines to be processed
+# DESC: sets the max number for lines for the percent calculation, if negative or not number, set to 1
+#       can only be set ONCE
+sub linecount
+{
+	my $self = shift;
+	my $linecount;
+	if (!$self->{linecount}) {
+		if (@_) {
+			$linecount = shift;
+			$self->{linecount} = $linecount;
+			$self->{linecount} = 1 if ($linecount < 0 || $linecount !~ /\d+/)
+		}
+	}
+	return $self->{linecount};
+}
+
+# SUB: filesize
+# PARAMS: max filesize for the to processed data
+# DESC: sets the max filesize for the to processed data, if negative or not number, set to 1
+#       input data has to be in bytes without any suffix (no b, kb, etc)
+#       can only be set ONCE
+sub filesize
+{
+	my $self = shift;
+	my $filesize;
+	if (!$self->{filesize}) {
+		if (@_) {
+			$filesize = shift;
+			$self->{filesize} = $filesize;
+			$self->{filesize} = 1 if ($filesize < 0 || $filesize !~ /\d+/)
+		}
+	}
+	return $self->{filesize};
+}
+
+# SUB: SetStartTime
+# PARAMS: time, or nothing
+# DESC: sets all the start times
+sub SetStartTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{start} = shift;
+	} else {
+		$self->{start} = time();
+	}
+	$self->{start_time} = $self->{start};
+	$self->{start_run} = $self->{start};
+}
+
+# SUB: SetETAStartTime
+# PARAMS: time, or nothing
+# DESC: sets the loop & run time, for correct ETA callculation
+sub SetETAStartTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{start_time} = shift;
+	} else {
+		$self->{start_time} = time();
+	}
+	$self->{start_run} = $self->{start_time};
+}
+
+# SUB: SetEndTime
+# PARAMS: time, or nothing
+# DESC: sets the end time for running time calculation
+sub SetEndTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{end} = shift;
+	} else {
+		$self->{end} = time();
+	}
+}
+
+# SUB: ShowPosition
+# PARAMS: optiona; file position (via file pointer)
+# RETURN: string for percent position output
+# DESC: calculates the current percent position based on the passed parameter, if no parameter uses intneral counter
+sub ShowPosition
+{
+	my $self = shift;
+	# set local vars
+	my $percent; # current percent
+	my $full_time_needed; # complete process time
+	my $full_time_per_line; # time per line
+	my $eta; # estimated end time
+	my $string = ''; # percent string that gets output
+	my $show_filesize = 1;
+	# microtime flags
+	my $eta_microtime = 0;
+	my $ftn_microtime = 0;
+	my $lg_microtime = 0;
+	# percent precision calc
+	my $_p_spf = "%.".$self->{precision}."f";
+	# output format for percent
+	my $_pr_p_spf = "%".$self->{percent_print}.".".$self->{percent_precision}."f";
+	# set the linecount precision based on the final linecount, if not, leave it empty
+	my $_pr_lc = "%s";
+	$_pr_lc = "%".length(format_number($self->{linecount}))."s" if ($self->{linecount});
+	# time format, if flag is set, the wide format is used
+	my $_pr_tf = "%s";
+	$_pr_tf = "%-15s" if ($self->{'wide_time'});
+	# do the smae for file size
+	# my $_pr_fs = "%s";
+	# $_pr_fs = "%".length(function::convert_number($self->{filesize}))."s" if ($self->{filesize});
+
+	# increase position by one
+	$self->{count} ++;
+	# see if we get anything from IO tell
+	if (@_) {
+		$self->{file_pos} = shift;
+	} else {
+		# we did not, so we set internal value
+		$self->{file_pos} = $self->{count};
+		# we also check if the filesize was set now
+		if (!$self->{filesize}) {
+			$self->{filesize} = $self->{linecount};
+		}
+		# set ignore filesize output (no data)
+		$show_filesize = 0;
+	}
+	# set the count size based on the file pos, is only used if we have filesize
+	$self->{count_size} = $self->{file_pos};
+
+	# do normal or down to 10 (0, 10, ...) %
+	if ($self->{precision_ten_step}) {
+		# calc 0 comma precision, so just do a floor
+		my $_percent = sprintf("%d", ($self->{file_pos} / $self->{filesize}) * 100);
+		# mod that to 10
+		my $mod = $_percent % $self->{precision_ten_step};
+		# either write this one, or write the previous, old one
+		$percent = $mod == 0 ? $_percent : $self->last_percent;
+		# print "P: $percent, Last: ".$self->last_percent.", Mod: ".$mod.", Calc: ".$_percent."\n";
+	} else {
+		$percent = sprintf($_p_spf, ($self->{file_pos} / $self->{filesize}) * 100);
+	}
+	# print "POS: ".$self->{file_pos}.", PERCENT: $percent / ".$self->last_percent."\n";
+	if ($percent != $self->last_percent) {
+		$self->{end_time} = time();
+		# for from the beginning
+		$full_time_needed = $self->{end_time} - $self->{start_run}; # how long from the start;
+		$self->{last_group} = $self->{end_time} - $self->{start_time};
+		$self->{lines_processed} = $self->{count} - $self->{current_count};
+		# lines in last group
+		$self->{lines_in_last_group} = $self->{'last_group'} ? ($self->{lines_processed} / $self->{last_group}) : 0;
+		# lines in global
+		$self->{lines_in_global} = $full_time_needed ? ($self->{'count'} / $full_time_needed) : 0;
+		# if we have linecount
+		if (!$self->{linecount}) {
+			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count_size}; # how long for all
+			$eta = $full_time_per_line * ($self->{filesize} - $self->{count_size}); # estimate for the rest
+		} else {
+			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count}; # how long for all
+			$eta = $full_time_per_line * ($self->{linecount} - $self->{count}); # estimate for the rest
+		}
+
+		# just in case ...
+		$eta = '0' if ($eta < 0);
+		# check if to show microtime
+		# ON: if microtime is flagged as one
+		$eta_microtime = $ftn_microtime = $lg_microtime = 1 if ($self->{microtime} == 1);
+		# AUTO: foir microtime
+		if ($self->{microtime} == 0) {
+			$eta_microtime = 1 if ($eta > 0 && $eta < 1);
+			$ftn_microtime = 1 if ($full_time_needed > 0 && $full_time_needed < 1);
+			# pre check last group: if pre comma part is same add microtime anyway
+			$lg_microtime = 1 if ($self->{last_group} > 0 && $self->{last_group} < 1);
+		}
+		# print out
+		if ($show_filesize) {
+			# last group size
+			$self->{size_in_last_group} = $self->{count_size} - $self->{current_size};
+			# calc kb/s if there is any filesize data
+			# last group
+			$self->{bytes_in_last_group} = $self->{'last_group'} ? ($self->{size_in_last_group} / $self->{last_group}) : 0;
+			# global
+			$self->{bytes_in_global} = $full_time_needed ? ($self->{count_size} / $full_time_needed) : 0;
+			# only used if we run with file size for the next check
+			$self->{current_size} = $self->{count_size};
+
+			$string = sprintf(
+				"Processed ".$_pr_p_spf."%% [%s / %s] | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines (%s) in %s, %s (%s) lines/s, %s (%s) b/s\n",
+				$percent,
+				function::convert_number($self->{count_size}),
+				function::convert_number($self->{filesize}),
+				format_number($self->{count}),
+				format_number($self->{linecount}),
+				function::convert_time($eta, $eta_microtime),
+				function::convert_time($full_time_needed, $ftn_microtime),
+				format_number($self->{lines_processed}),
+				function::convert_number($self->{size_in_last_group}),
+				function::convert_time($self->{last_group}, $lg_microtime),
+				format_number($self->{lines_in_global}, 2, 1),
+				format_number($self->{lines_in_last_group}, 2, 1),
+				function::convert_number($self->{bytes_in_global}),
+				function::convert_number($self->{bytes_in_last_group})
+			) if ($self->{verbose} >= 1);
+		} else {
+			$string = sprintf(
+				"Processed ".$_pr_p_spf."%% | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines in %s, %s (%s) lines/s\n",
+				$percent,
+				format_number($self->{count}),
+				format_number($self->{linecount}),
+				function::convert_time($eta, $eta_microtime),
+				function::convert_time($full_time_needed, $ftn_microtime),
+				format_number($self->{lines_processed}),
+				function::convert_time($self->{last_group}, $lg_microtime),
+				format_number($self->{lines_in_global}, 2, 1),
+				format_number($self->{lines_in_last_group}, 2, 1)
+			) if ($self->{verbose} >= 1);
+		}
+		# write back vars
+		$self->{last_percent} = $percent;
+		$self->{eta} = $eta;
+		$self->{full_time_needed} = $full_time_needed;
+		$self->{lg_microtime} = $lg_microtime;
+		# for the next run, check data
+		$self->{start_time} = time();
+		$self->{current_count} = $self->{count};
+		# trigger if this is a change
+		$self->{change} = 1;
+	} else {
+		# trigger if this is a change
+		$self->{change} = 0;
+	}
+	return $string;
+}
+
+1;

bin/functions.pm

@@ -0,0 +1,501 @@
+package function;
+
+# AUTHOR: Clemens Schwaighofer
+# DATE CREATED: 2004/11/09
+# DESCRIPTION: functions collection for Adidas scripts
+# HISTORY:
+# 2005/06/22 (cs) added header key check function
+# 2005/02/10 (cs) added debug flag to print output, added two new functions to format a number into B, KB, etc
+# 2005/01/13 (cs) fixed array problem with the clean up and int function
+
+use strict;
+use warnings;
+use 5.000_000;
+use POSIX qw(floor);
+use File::Copy;
+use Digest::SHA qw(sha1_hex);
+use utf8;
+#require Exporter;
+#our @ISA = qw(Exporter);
+#our @EXPORT = qw();
+
+# depending on the options given to the program, it gets the correct settings
+# to which db it should connect
+sub get_db_user
+{
+	my ($target, $db) = @_;
+
+	# the parts of the hash array (tab seperated)
+	my @array_names = qw{db_name	db_port	db_user	db_pass	db_host	db_type	db_test	db_ssl};
+	my %db_out = ();
+
+	# based on the two parameters find the correct vars
+	# each level can hold data, higher level data overrules lower data
+	# eg $config::db{'test'}{'db_user'} overrules $config::db{'db_user'}
+	for (my $i = 1; $i <= 3; $i ++) {
+		foreach my $name (@array_names) {
+			# depending on the level check the level of data
+			if ($i == 1) {
+				$db_out{$name} = $config::db{$name} if (defined($config::db{$name}));
+			} elsif ($i == 2) {
+				$db_out{$name} = $config::db{$target}{$name} if (defined($config::db{$target}{$name}));
+			} elsif ($i == 3) {
+				$db_out{$name} = $config::db{$target}{$db}{$name} if (defined($config::db{$target}{$db}{$name}));
+			}
+		} # for each db data var
+	} # for each data level in the hash
+
+	return (
+		$db_out{'db_name'},
+		$db_out{'db_port'},
+		$db_out{'db_user'},
+		$db_out{'db_pass'},
+		$db_out{'db_host'},
+		$db_out{'db_type'},
+		$db_out{'db_test'},
+		$db_out{'db_ssl'}
+	);
+}
+
+# get the DSN string for the DB connect
+sub get_db_dsn
+{
+	my (
+		$db_name,
+		$db_port,
+		$db_user,
+		$db_pass,
+		$db_host,
+		$db_type,
+		$db_ssl
+	) = @_;
+	my $dsn = '';
+
+	if ($db_type eq 'mysql' && $db_name && $db_host && $db_user) {
+		$dsn = "DBI:mysql:database=".$db_name.";host=".$db_host.";port=".$db_port;
+	} elsif ($db_type eq 'pgsql' && $db_name && $db_host && $db_user) {
+		$dsn = "DBI:Pg:dbname=".$db_name.";host=".$db_host.";port=".$db_port.";sslmode=".$db_ssl;
+	} else {
+		# invalid db type
+		$dsn = -1;
+	}
+	return $dsn;
+}
+
+sub strip_white_spaces
+{
+	my ($element) = @_;
+	# get rid of spaces at the end and at the beginning of each bloack
+	$element =~ s/^\s+//g;
+	$element =~ s/\s+$//g;
+	return $element;
+}
+
+sub prepare_hash_keys
+{
+	my($csv, $data, $csv_header) = @_;
+
+	# unset value starts at 1000 and goes up ...
+	my $unset_value = 1000;
+	my %keys = ();
+
+	# parse header
+	if ($csv->parse($data)) {
+		my @cols = $csv->fields();
+		for (my $i = 0; $i < @cols; $i ++) {
+			# remove all spaces before and afterward
+			$cols[$i] = function::strip_white_spaces($cols[$i]);
+			# write key - id number
+			$keys{$cols[$i]} = $i;
+			print $::DEBUG "\tPostion [".$i."]: ".$cols[$i]."\n" if ($::debug);
+			print "\tPosition [".$i."]: ".$cols[$i]."\n" if ($::verbose > 1);
+		}
+	} else {
+		die "ERROR[".$csv->error_diag()."]: ".$csv->error_input()."\n";
+	}
+	# add empty values
+	foreach my $csv_header_value (@$csv_header) {
+		if (!defined($keys{$csv_header_value})) {
+			$keys{$csv_header_value} = $unset_value;
+			$unset_value ++;
+			print $::DEBUG "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::debug);
+			print "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::verbose > 1);
+		}
+	}
+
+	return %keys;
+}
+
+sub error_check_keys
+{
+	my($csv_header, $keys) = @_;
+
+	if ((keys %$keys) != @$csv_header) {
+		print $::ERR "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
+		print "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
+
+		# if there are more keys in CSV file, then in the header defined in here
+		if ((keys %$keys) > @$csv_header) {
+			print $::ERR "Listing Perl Header missing\n";
+			print "Listing Perl Header missing\n";
+			foreach my $key (keys %$keys) {
+				print $::ERR "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
+				print "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
+			}
+			# if more keys are in the header defined than in the csv file
+		} else {
+			print $::ERR "Listing CSV Header missing\n";
+			print "Listing CSV Header missing\n";
+			for (my $i = 0; $i < @$csv_header; $i ++) {
+				print $::ERR "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
+				print "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
+			}
+		}
+		return 0;
+	}
+	return 1;
+}
+
+sub clean_up_row
+{
+	my ($row) = @_;
+
+	for (my $i = 0; $i < @$row; $i++) {
+		# get rid of spaces at the end and at the beginning of each bloack
+		$$row[$i] =~ s/^\s+//g;
+		$$row[$i] =~ s/\s+$//g;
+		# convert all half width Katakan to Full width Katakana
+		$$row[$i] = Unicode::Japanese->new($$row[$i])->h2zKana->get;
+		# need to decode the converted string, somehow Unicode::Japanese does not return proper utf8 if use utf8 is on
+		utf8::decode($$row[$i]);
+	}
+
+	return @$row;
+}
+
+sub set_int_fields
+{
+	my ($row, $keys, $int_fields) = @_;
+
+	# check ALL smallint/int/etc rows to be set to a number
+	for (my $i = 0; $i < @$int_fields; $i++) {
+		print "\t\tCheck ".$$int_fields[$i]." {".$$keys{$$int_fields[$i]}."} ... " if ($::verbose > 1);
+		if (!$$row[$$keys{$$int_fields[$i]}]) {
+			$$row[$$keys{$$int_fields[$i]}] = 0;
+		}
+		# if its filled, but not a digit, set to 1
+		if ($$row[$$keys{$$int_fields[$i]}] =~ /\D/) {
+			$$row[$$keys{$$int_fields[$i]}] = 1;
+		}
+		print "[".$$row[$$keys{$$int_fields[$i]}]."] [DONE]\n" if ($::verbose > 1);
+	}
+	return @$row;
+}
+
+# formats a number with dots and ,
+sub format_number
+{
+	my ($number) = @_;
+	# dummy, does nothing now
+	# should put . or , every 3 digits later
+	return $number;
+}
+
+# converts bytes to human readable format
+sub convert_number
+{
+	my ($number) = @_;
+	my $pos; # the original position in the labels array
+	# divied number until its division would be < 1024. count that position for label usage
+	for ($pos = 0; $number > 1024; $pos ++) {
+		$number = $number / 1024;
+	}
+	# before we return it, we format it [rounded to 2 digits, if has decimals, else just int]
+	# we add the right label to it and return
+	return sprintf(!$pos ? '%d' : '%.2f', $number)." ".qw(B KB MB GB TB PB EB)[$pos];
+}
+
+# make time from seconds string
+sub convert_time
+{
+	my ($timestamp, $show_micro) = @_;
+	my $ms = '';
+	# cut of the ms, but first round them up to four
+	$timestamp = sprintf("%.4f", $timestamp);
+	# print "T: ".$timestamp."\n";
+	($timestamp, $ms) = split(/\./, $timestamp);
+	my @timegroups = ("86400", "3600", "60", "1");
+	my @output = ();
+	for (my $i = 0; $i < @timegroups; $i ++) {
+		push(@output, floor($timestamp / $timegroups[$i]));
+		$timestamp = $timestamp % $timegroups[$i];
+	}
+	# output has days|hours|min|sec
+	return (($output[0]) ? $output[0]."d " : "").
+		(($output[1] || $output[0]) ? $output[1]."h " : "").
+		(($output[2] ||$output[1] || $output[0]) ? $output[2]."m " : "").
+		$output[3]."s".
+		(($show_micro) ? " ".((!$ms) ? 0 : $ms)."ms" : "");
+}
+
+# get a timestamp and create a proper formated date/time field
+sub create_time
+{
+	my ($timestamp, $show_micro) = @_;
+	my $ms = '';
+	$timestamp = 0 if (!$timestamp);
+	# round ms to 4 numbers
+	$timestamp = sprintf("%.4f", $timestamp);
+	($timestamp, $ms) = split(/\./, $timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year."-".
+		($month < 10 ? '0'.$month : $month)."-".
+		($day < 10 ? '0'.$day : $day)." ".
+		($hour < 10 ? '0'.$hour : $hour).":".
+		($min < 10 ? '0'.$min : $min).":".
+		($sec < 10 ? '0'.$sec : $sec).
+		(($ms && $show_micro) ? ".".$ms : "");
+}
+
+# create YYYYMMDD data
+sub create_date
+{
+	my ($timestamp, $split_string) = @_;
+	my $split = $split_string ? $split_string : '';
+	$timestamp = time() if (!$timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year.$split.
+		($month < 10 ? '0'.$month : $month).$split.
+		($day < 10 ? '0'.$day : $day);
+}
+
+# create YYYYMMDD_HHMMSS data
+sub create_datetime
+{
+	my ($timestamp, $split_string) = @_;
+	my $split = $split_string ? $split_string : '';
+	$timestamp = time() if (!$timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year.$split.
+		($month < 10 ? '0'.$month : $month).$split.
+		($day < 10 ? '0'.$day : $day).'_'.
+		($hour < 10 ? '0'.$hour : $hour).$split.
+		($min < 10 ? '0'.$min : $min).$split.
+		($sec < 10 ? '0'.$sec : $sec);
+}
+
+sub left_fill
+{
+	my($number, $size, $char) = @_;
+	return sprintf($char x ($size - length($number)).$number);
+}
+
+# wrapper to flip the crc32 hex string, so it is like buggy php one (php <= 5.2.6)
+sub crc32b_fix
+{
+	my ($crc) = @_;
+	# left pad with 0 to 8 chars
+	$crc = ('0' x (8 - length($crc))).$crc;
+	# flip two chars (byte hex)
+	$crc =~ s/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/$4$3$2$1/;
+	return $crc;
+}
+
+# short sha1 (9 char) function
+sub sha1_short
+{
+	my ($string) = @_;
+	return substr(sha1_hex($string), 0, 9);
+}
+
+# DEBUG helpers for dumping data
+# from: http://www.perlmonks.org/?node_id=390153
+# alternative use Dump::Dumper and print Dump(VAR);
+sub dump_data
+{
+	my ($level, $base, $data) = @_;
+	my $nextlevel = $level + 1;
+	if (ref($data) eq 'ARRAY') {
+		foreach my $k (0 .. $#{$data}) {
+			my $baseval = $base.'['.$k.']';
+			dump_it($nextlevel, $baseval, $data->[$k]);
+		}
+	} elsif (ref($data) eq 'HASH') {
+		foreach my $k (sort(keys(%{$data}))) {
+			my $baseval = $base.'{'.$k.'}';
+			dump_it($nextlevel, $baseval, $data->{$k});
+		}
+	} elsif (ref($data) eq 'SCALAR') {
+		my $baseval = $base;
+		dump_it($nextlevel, $baseval, ${$data});
+	}
+}
+
+sub dump_it
+{
+	my ($nextlevel, $baseval, $datum) = @_;
+	my $reftype = ref($datum);
+	if ($reftype eq 'HASH') {
+		dump_data($nextlevel, $baseval, \%{$datum});
+	} elsif ($reftype eq 'ARRAY') {
+		dump_data($nextlevel, $baseval, \@{$datum});
+	} else {
+		process_data($nextlevel, $baseval, $datum);
+	}
+}
+
+sub process_data
+{
+	my ($nextlevel, $baseval, $datum) = @_;
+	my $indentation = '  ' x $nextlevel;
+	print $indentation, $baseval, ' = ', $datum, "\n";
+}
+
+# METHOD: lock_run
+# PARAMS: file (plus path) to lock to
+#         the current running pid (if not given will be set in script)
+#         the current name of the script (auto set if not given)
+#         optional write encoding (set to utf8 if not given)
+# RETURN: nothing
+# DESC:   checks if this script is already running based on the lock file, if if yes will abort
+#         if file is there but pid not find it automatically cleans up the stale lock file
+sub lock_run
+{
+	my ($file, $run_pid, $name, $encoding) = @_;
+	# if no encoding, set utf8
+	$encoding = 'utf8' if (!$encoding);
+	# set the run pid if no pid is given
+	$run_pid = $$ if (!$run_pid);
+	# set the script base name
+	$name = File::Basename::fileparse($0) if (!$name);
+	# if lock file exists
+	if (-f $file) {
+		my $exists = 0;
+		my $pid = `cat $file`;
+		chomp($pid);
+		# printDebug("Lock file found for $pid", 1);
+		# check if process excists with this pid
+		# better todo A for ALL processes
+		# ps axu OR short ps a
+		open(PS, 'ps axu|') || die("$!");
+		while (<PS>) {
+			# search for pid and run file name
+			if ($_ =~ /\ $pid\ / && $_ =~ /$name/) {
+				$exists = 1;
+			}
+			last if ($exists);
+		}
+		close(PS);
+		if (!$exists) {
+			# printDebug("Lock file cleaned up for $pid", 1);
+			unlink($file);
+		} else {
+			die("Script is already running with PID $pid\n");
+		}
+	}
+	# write current PID into lock file
+	open(FP, '>:encoding('.$encoding.')', $file) || die ("Cannot open run lock file '$file' for writing\n");
+	print FP $run_pid;
+	close(FP);
+}
+
+# METHOD: printDebug
+# PARAMS: message, verbose level
+# RETURN: nothing
+# DESC:   depeding on the verbose and debug settings it will print out message and or write it to a debug file
+sub printDebug
+{
+	my($msg, $vrb, $dbg) = @_;
+	# print debug only if debug is on and debug file is available
+	print $::DEBUG '['.create_time(time(), 1).'] '.$msg."\n" if ($::debug && $::DEBUG);
+	# print to log if log is accessable and the verbose flag matches, or for debug flag if debug statement is set and not log only, or if log only, if not debug statement
+	print $::LOG $msg."\n" if (($::verbose >= $vrb || (!$::log_only && $dbg && $::debug) || ($::log_only && !$dbg)) && $::LOG);
+	# print to screen if verbose matches, but it is not a log only, or if it is debug statement and debug flag is set
+	print $msg."\n" if (($::verbose >= $vrb && !$::log_only) || ($dbg && $::debug));
+}
+
+# METHOD: waitAbort
+# PARAMS: time in seconds, if not provided set to 5
+# RETURN: nothing
+# DESC:   simple prints out a char while waiting for an abort command
+sub waitAbort
+{
+	my($sleep) = @_;
+	$sleep = 5 if ($sleep !~ /\d/);
+	print "Waiting $sleep seconds (Press CTRL + C to abort)\n";
+	for (my $i = 1; $i <= $sleep; $i ++) {
+		print ".";
+		sleep 1;
+	}
+	print "\n\n";
+}
+
+# METHOD: copyToTemporary
+# PARAMS: file to copy, and target file name
+# RETURN: the target file name
+# DESC  : sets the source to read only and makes a copy, the copy is also set to read only
+sub copyToTemporary
+{
+	my ($source, $target) = @_;
+	# get the current rights
+	my $current_chmod = (stat $source)[2];
+	# set source file ARGV to read only
+	# we skip that, the source might be NOT from the same user as the script read, just copy the file and set the target read only
+	chmod(0444, $source);
+	# create tmp backup file from which we read, data gets removed at the end of an run, or during an abort call
+	copy($source, $target) || die("Copy failed: $!\n");
+	# set read rights to r only for the copied file
+	chmod(0444, $target);
+	# set old access rights for ARGV file
+	chmod($current_chmod, $source);
+	# return target file name
+	return $target;
+}
+
+# METHOD: uniq
+# PARAMS: @array
+# RETURN: array with only unique entries
+# DESC  : used in uniq(@array) to get only unique data back
+sub uniq
+{
+	my %seen;
+	grep !$seen{$_}++, @_;
+}
+
+# METHOD: clean_test
+# PARAMS: array of data
+# RETURN: cleaned up array of data
+# DESC  : sets all undefs to '' for debug output
+sub clean_test
+{
+	my (@data) = @_;
+	# map check for defined, if not, return ''
+	return map { defined($_) ? $_ : '' } @data;
+}
+
+# METHOD: clean_test_string
+# PARAMS: string to be checked
+# RETURN: data or empty for output
+# DESC  : sets all input data to '' if it is undefined
+sub clean_test_string
+{
+	my ($data) = @_;
+	return defined($data) ? $data : '';
+}
+
+1;

phpstan.neon

@@ -5,14 +5,17 @@ parameters:
 	level: 1
 	paths:
 		- %currentWorkingDirectory%/www
-	#bootstrap: %currentWorkingDirectory%/phpstan-bootstrap.php
-	#bootstrap: phpstan-bootstrap.php
-	autoload_directories:
-	autoload_files:
+	bootstrapFiles:
 		- %currentWorkingDirectory%/phpstan-bootstrap.php
+	scanDirectories:
+		- www/lib/Smarty
+	scanFiles:
+		- www/configs/config.php
 		- www/configs/config.master.php
 		- www/lib/autoloader.php
 		- www/vendor/autoload.php
+		- www/lib/Smarty/Autoloader.php
+		- www/lib/CoreLibs/Template/SmartyExtend.php
 	excludes_analyse:
 		# no check admin
 		- www/admin/qq_file_upload_front.php
@@ -40,10 +43,12 @@ parameters:
 		- www/tmp
 		- www/lib/pChart
 		- www/lib/pChart2.1.4
-		- www/lib/Smarty/
-		- www/lib/smarty-3.1.30/
+		- www/lib/Smarty
+		- www/lib/smarty-3.1.30
 		# ignore composer
 		- www/vendor
+		# ignore the smartyextend
+		- www/lib/CoreLibs/Template/SmartyExtend.php
 	# ignore errores with
 	# ignoreErrors:
 		#- 'error regex'

www/admin/class_test.php

@@ -24,12 +24,10 @@ if (!defined('SET_SESSION_NAME')) {
 }
 // define log file id
 $LOG_FILE_ID = 'classTest';
-// set language for l10n
-$lang = 'en_utf8';
 
 // init login & backend class
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
-$basic = new CoreLibs\Admin\Backend(DB_CONFIG, $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
+$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
 $basic->dbInfo(true);
 ob_end_flush();
 
@@ -131,20 +129,20 @@ print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext,
 $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');
-$object_fields_not_touch = array ();
-$object_fields_not_update = array ();
-$data = array ('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
+$db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
+//	$db_write_table = array('test');
+$object_fields_not_touch = array();
+$object_fields_not_update = array();
+$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>";
 
@@ -215,6 +213,16 @@ print "RETURN DATA FOR search_path: ".$data."<br>";
 $status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
 print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", PRIMARY KEY: ".$basic->insert_id."<br>";
 
+print "<b>NULL TEST DB READ</b><br>";
+$q = "SELECT uid, null_varchar, null_int FROM test_null_data WHERE uid = 'A'";
+$res = $basic->dbReturnRow($q);
+var_dump($res);
+print "RES: ".$basic->printAr($res)."<br>";
+print "ISSET: ".isset($res['null_varchar'])."<br>";
+print "EMPTY: ".empty($res['null_varchar'])."<br>";
+
+// data read test
+
 // time string thest
 $timestamp = 5887998.33445;
 $time_string = $basic->timeStringFormat($timestamp);
@@ -226,6 +234,13 @@ if (round($timestamp, 4) == $basic->stringToTime($time_string)) {
 } else {
 	print "REVERSE TRIME STRING DO NOT MATCH<br>";
 }
+print "ZERO TIME STRING: ".$basic->timeStringFormat(0, true)."<br>";
+print "ZERO TIME STRING: ".$basic->timeStringFormat(0.0, true)."<br>";
+print "ZERO TIME STRING: ".$basic->timeStringFormat(1.005, true)."<br>";
+
+echo "HTML ENT INT: ".$basic->htmlent(5)."<br>";
+echo "HTML ENT STRING: ".$basic->htmlent('5<<>')."<br>";
+echo "HTML ENT NULL: ".$basic->htmlent(null)."<br>";
 
 // magic links test
 print $basic->magicLinks('user@bubu.at').'<br>';
@@ -236,8 +251,101 @@ $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>";
+
+// *** BYTES TEST ***
+$bytes = array(
+	-123123123,
+	999999, // KB-1
+	999999999, // MB-1
+	254779258, // MB-n
+	999999999999999, // TB-1
+	588795544887632, // TB-n
+	999999999999999999, // PB-1
+	9223372036854775807, // MAX INT
+	999999999999999999999, // EB-1
+);
+print "<b>BYTE FORMAT TESTS</b><br>";
+foreach ($bytes as $byte) {
+	print '<div style="display: flex; border-bottom: 1px dashed gray;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "(".number_format($byte)."/".$byte.") bytes :";
+	print '</div><div style="width: 40%;">';
+	print $basic->humanReadableByteFormat($byte);
+	print "</div>";
+	//
+	print "</div>";
+	//
+	print '<div style="display: flex; border-bottom: 1px dotted red;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "bytes [si]:";
+	print '</div><div style="width: 40%;">';
+	// print $basic->byteStringFormat($byte, true, false, true);
+	print $basic->humanReadableByteFormat($byte, $basic::BYTE_FORMAT_SI);
+	print "</div>";
+	//
+	print "</div>";
+}
+
+
+// *** IMAGE TESTS ***
+echo "<hr>";
+// 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',
+);
+$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/namespace_test.php

@@ -14,16 +14,15 @@ $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, $lang);
+$base = new CoreLibs\Admin\Backend(DB_CONFIG);
 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 "HumanReadableByteFormat: ".$base->HumanReadableByteFormat(1234567.12)."<br>";
+print "humanReadableByteFormat: ".$base->humanReadableByteFormat(1234567.12)."<br>";
 // print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
 print "getPageName: ".$base->getPageName()."<br>";
 

www/admin/phan_test.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+require 'config.php';
+require BASE.INCLUDES.'admin_header.php';
+
+// $DATA['foo'] = 'bar';
+// $messages['foo'] = 'bar';
+
+// __END__

www/admin/smarty_test.php

@@ -10,24 +10,28 @@ define('USE_DATABASE', true);
 define('USE_HEADER', true);
 require 'config.php';
 require BASE.INCLUDES.'admin_header.php';
-$MASTER_TEMPLATE_NAME = 'main_body.tpl';
-$TEMPLATE_NAME = 'smarty_test.tpl';
-$CSS_NAME = 'smart_test.css';
-$USE_PROTOTYPE = false;
-$USE_JQUERY = true;
-$JS_DATEPICKR = false;
-if ($USE_PROTOTYPE) {
-	$ADMIN_JAVASCRIPT = 'edit.pt.js';
-	$JS_NAME = 'prototype.test.js';
-} elseif ($USE_JQUERY) {
-	$ADMIN_JAVASCRIPT = 'edit.jq.js';
-	$JS_NAME = 'jquery.test.js';
-}
-$PAGE_WIDTH = "100%";
-require BASE.INCLUDES.'admin_set_paths.php';
+if (is_object($smarty)) {
+	$smarty->MASTER_TEMPLATE_NAME = 'main_body.tpl';
+	$smarty->TEMPLATE_NAME = 'smarty_test.tpl';
+	$smarty->CSS_SPECIAL_TEMPLATE_NAME = 'smart_test.css';
+	$smarty->USE_PROTOTYPE = false;
+	$smarty->USE_JQUERY = true;
+	$smarty->JS_DATEPICKR = false;
+	if ($smarty->USE_PROTOTYPE) {
+		$smarty->ADMIN_JAVASCRIPT = 'edit.pt.js';
+		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'prototype.test.js';
+	} elseif ($smarty->USE_JQUERY) {
+		$smarty->ADMIN_JAVASCRIPT = 'edit.jq.js';
+		$smarty->JS_SPECIAL_TEMPLATE_NAME = 'jquery.test.js';
+	}
+	$smarty->PAGE_WIDTH = '100%';
+	// require BASE.INCLUDES.'admin_set_paths.php';
+	$smarty->setSmartyPaths();
 
-// smarty test
-$cms->DATA['SMARTY_TEST'] = 'Test Data';
+	// smarty test
+	$smarty->DATA['SMARTY_TEST'] = 'Test Data';
+	$smarty->DATA['TRANSLATE_TEST'] = $cms->l->__('Are we translated?');
+}
 
 // drop down test with optgroups
 $options = array (
@@ -46,7 +50,10 @@ $options = array (
 	)
 );
 
-$cms->DATA['drop_down_test'] = $options;
-
-require BASE.INCLUDES.'admin_smarty.php';
+if (is_object($smarty)) {
+	$smarty->DATA['drop_down_test'] = $options;
+	$smarty->DATA['loop_start'] = 2;
+	// require BASE.INCLUDES.'admin_smarty.php';
+	$smarty->setSmartyVarsAdmin();
+}
 require BASE.INCLUDES.'admin_footer.php';

www/configs/config.db.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11

www/configs/config.host.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11

www/configs/config.master.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/06/10
@@ -9,143 +9,161 @@
 
 /************* PATHS *********************/
 // directory seperator
-DEFINE('DS', DIRECTORY_SEPARATOR);
+define('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-DEFINE('DIR', __DIR__.DS);
+define('DIR', __DIR__.DS);
 // base dir root folder level
-DEFINE('BASE', str_replace('/configs', '', __DIR__).DS);
+define('BASE', str_replace('/configs', '', __DIR__).DS);
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd().DS);
+define('ROOT', getcwd().DS);
 // libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
+define('LIB', 'lib'.DS);
+define('LIBS', 'lib'.DS);
 // configs folder
-DEFINE('CONFIGS', 'configs'.DS);
+define('CONFIGS', 'configs'.DS);
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
+define('INCLUDES', 'includes'.DS);
 // data folder (mostly in includes)
-DEFINE('DATA', 'data'.DS);
+define('DATA', 'data'.DS);
 // layout base path
-DEFINE('LAYOUT', 'layout'.DS);
+define('LAYOUT', 'layout'.DS);
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', 'images'.DS);
+define('PICTURES', 'images'.DS);
 // images
-DEFINE('IMAGES', 'images'.DS);
+define('IMAGES', 'images'.DS);
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
+define('ICONS', 'icons'.DS);
 // media
-DEFINE('MEDIA', 'media'.DS);
+define('MEDIA', 'media'.DS);
 // flash-root (below media)
-DEFINE('FLASH', 'flash'.DS);
+define('FLASH', 'flash'.DS);
 // uploads (anything to keep)
-DEFINE('UPLOADS', 'uploads'.DS);
+define('UPLOADS', 'uploads'.DS);
 // files (binaries) (below media)
-DEFINE('BINARIES', 'binaries'.DS);
+define('BINARIES', 'binaries'.DS);
 // files (videos) (below media)
-DEFINE('VIDEOS', 'videos'.DS);
+define('VIDEOS', 'videos'.DS);
 // files (documents) (below media)
-DEFINE('DOCUMENTS', 'documents'.DS);
+define('DOCUMENTS', 'documents'.DS);
 // files (pdfs) (below media)
-DEFINE('PDFS', 'documents'.DS);
+define('PDFS', 'documents'.DS);
 // CSV
-DEFINE('CSV', 'csv'.DS);
+define('CSV', 'csv'.DS);
 // css
-DEFINE('CSS', 'css'.DS);
+define('CSS', 'css'.DS);
+// font (web)
+define('FONT', 'font'.DS);
 // js
-DEFINE('JS', 'javascript'.DS);
+define('JS', 'javascript'.DS);
 // table arrays
-DEFINE('TABLE_ARRAYS', 'table_arrays'.DS);
+define('TABLE_ARRAYS', 'table_arrays'.DS);
 // smarty libs path
-DEFINE('SMARTY', 'Smarty'.DS);
+define('SMARTY', 'Smarty'.DS);
 // po langs
-DEFINE('LANG', 'lang'.DS);
+define('LANG', 'lang'.DS);
 // cache path
-DEFINE('CACHE', 'cache'.DS);
+define('CACHE', 'cache'.DS);
 // temp path
-DEFINE('TMP', 'tmp'.DS);
+define('TMP', 'tmp'.DS);
 // log files
-DEFINE('LOG', 'log'.DS);
+define('LOG', 'log'.DS);
 // compiled template folder
-DEFINE('TEMPLATES_C', 'templates_c'.DS);
+define('TEMPLATES_C', 'templates_c'.DS);
 // template base
-DEFINE('TEMPLATES', 'templates'.DS);
+define('TEMPLATES', 'templates'.DS);
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
-DEFINE('DEFAULT_HASH', 'sha256');
+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); */
+define('DEFAULT_ACL_LEVEL', 80);
 // 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);
-// allow page caching in general, set to 'FALSE' if you do debugging or development!
-//	DEFINE('ALLOW_SMARTY_CACHE', FALSE);
+// define('ERROR_STRICT', 3);
+// allow page caching in general, set to 'false' if you do debugging or development!
+// 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', '');
+define('LOGOUT_TARGET', '');
 // password change allowed
-DEFINE('PASSWORD_CHANGE', false);
-DEFINE('PASSWORD_FORGOT', false);
+define('PASSWORD_CHANGE', false);
+define('PASSWORD_FORGOT', false);
 // min/max password length
-DEFINE('PASSWORD_MIN_LENGTH', 8);
-DEFINE('PASSWORD_MAX_LENGTH', 255);
+define('PASSWORD_MIN_LENGTH', 9);
+define('PASSWORD_MAX_LENGTH', 255);
+// defines allowed special characters
+DEFINE('PASSWORD_SPECIAL_RANGE', '@$!%*?&');
+// password must have upper case, lower case, number, special
+// comment out for not mandatory
+DEFINE('PASSWORD_LOWER', '(?=.*[a-z])');
+DEFINE('PASSWORD_UPPER', '(?=.*[A-Z])');
+DEFINE('PASSWORD_NUMBER', '(?=.*\d)');
+DEFINE('PASSWORD_SPECIAL', "(?=.*[".PASSWORD_SPECIAL_RANGE."])");
+// define full regex
+DEFINE('PASSWORD_REGEX', "/^".
+	(defined('PASSWORD_LOWER') ? PASSWORD_LOWER : '').
+	(defined('PASSWORD_UPPER') ? PASSWORD_UPPER : '').
+	(defined('PASSWORD_NUMBER') ? PASSWORD_NUMBER : '').
+	(defined('PASSWORD_SPECIAL') ? PASSWORD_SPECIAL : '').
+	"[A-Za-z\d".PASSWORD_SPECIAL_RANGE."]{".PASSWORD_MIN_LENGTH.",".PASSWORD_MAX_LENGTH."}$/");
 
 /************* AJAX / ACCESS *************/
 // ajax request type
-DEFINE('AJAX_REQUEST_TYPE', 'POST');
+define('AJAX_REQUEST_TYPE', 'POST');
 // what AJAX type to use
-DEFINE('USE_PROTOTYPE', false);
-DEFINE('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', true);
+define('USE_PROTOTYPE', false);
+define('USE_SCRIPTACULOUS', false);
+define('USE_JQUERY', true);
 
 /************* LAYOUT WIDTHS *************/
-DEFINE('PAGE_WIDTH', 800);
+define('PAGE_WIDTH', 800);
+define('CONTENT_WIDTH', 800);
 // the default template name
-DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
+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_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('COMPILE_ID', 'COMPILE_'.SERVER_NAME_HASH);
+define('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
+define('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
 
 /************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', 'en_utf8');
+define('DEFAULT_LANG', 'en_utf8');
 // default web page encoding setting
-DEFINE('DEFAULT_ENCODING', 'UTF-8');
+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 *******************/
-DEFINE('LOG_FILE_ID', '');
+// as $LOG_FILE_ID which takes presence over LOG_FILE_ID
+// see Basic class constructor
+define('LOG_FILE_ID', BASE_NAME);
 
 /************* CLASS ERRORS *******************/
 // 0 = default all OFF
@@ -158,14 +176,16 @@ define('CLASS_VARIABLE_ERROR_MODE', 3);
 // 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>
-DEFINE('PUBLIC_SCHEMA', 'public');
-DEFINE('DEV_SCHEMA', 'public');
-DEFINE('TEST_SCHEMA', 'public');
-DEFINE('LIVE_SCHEMA', 'public');
+define('PUBLIC_SCHEMA', 'public');
+define('DEV_SCHEMA', 'public');
+define('TEST_SCHEMA', 'public');
+define('LIVE_SCHEMA', 'public');
+define('GLOBAL_DB_SCHEMA', '');
+define('LOGIN_DB_SCHEMA', '');
 
 /************* CORE HOST SETTINGS *****************/
 if (file_exists(BASE.CONFIGS.'config.host.php')) {
@@ -186,13 +206,19 @@ if (file_exists(BASE.CONFIGS.'config.path.php')) {
 	require BASE.CONFIGS.'config.path.php';
 }
 
+/************* MASTER INIT *****************/
 // live frontend pages
 // ** missing live domains **
 // get the name without the port
 list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
 // set HOST name
-DEFINE('HOST_NAME', $HOST_NAME);
-// BAIL ON:
+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
@@ -211,61 +237,50 @@ if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 // set SSL on
 if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
 	$_SERVER['SERVER_PORT'] == 443) {
-	DEFINE('HOST_SSL', true);
-	DEFINE('HOST_PROTOCOL', 'https://');
+	define('HOST_SSL', true);
+	define('HOST_PROTOCOL', 'https://');
 } else {
-	DEFINE('HOST_SSL', false);
-	DEFINE('HOST_PROTOCOL', 'http://');
+	define('HOST_SSL', false);
+	define('HOST_PROTOCOL', 'http://');
 }
 // define the db config set name, the db config and the db schema
-DEFINE('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
-DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
-// DEFINE('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
+// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
+// define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
 // override for login and global schemas
-// DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
-// DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
+// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
 // debug settings, site lang, etc
-DEFINE('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-DEFINE('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-DEFINE('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-DEFINE('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
+define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
+define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
+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('CSV_PATH', $PATHS[TARGET]['csv_path']);
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
+// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
 
 // show all errors if debug_all & show_error_handling are enabled
-DEFINE('SHOW_ALL_ERRORS', true);
+define('SHOW_ALL_ERRORS', true);
 
 /************* GENERAL PAGE TITLE ********/
-DEFINE('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
+define('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
 
 /************ STYLE SHEETS / JS **********/
-DEFINE('ADMIN_STYLESHEET', 'edit.css');
-DEFINE('ADMIN_JAVASCRIPT', 'edit.js');
-DEFINE('STYLESHEET', 'frontend.css');
-DEFINE('JAVASCRIPT', 'frontend.js');
+define('ADMIN_STYLESHEET', 'edit.css');
+define('ADMIN_JAVASCRIPT', 'edit.js');
+define('STYLESHEET', 'frontend.css');
+define('JAVASCRIPT', 'frontend.js');
 
 // anything optional
 /************* INTERNAL ******************/
-// any other global definitons here
-//	DEFINE('SOME_ID', <SOME VALUE>);
-
-/************* CONVERT *******************/
-$paths = array(
-	'/bin',
-	'/usr/bin',
-	'/usr/local/bin'
-);
-// find convert
-foreach ($paths as $path) {
-	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
-		// image magick convert location
-		DEFINE('CONVERT', $path.DS.'convert');
-	}
+// any other global definitons in the config.other.php
+if (file_exists(BASE.CONFIGS.'config.other.php')) {
+	require BASE.CONFIGS.'config.other.php';
 }
 
+/************* DEBUG *******************/
 // turn off debug if debug flag is OFF
 if (defined('DEBUG') && DEBUG == false) {
 	$ECHO_ALL = false;
@@ -283,6 +298,7 @@ if (defined('DEBUG') && DEBUG == false) {
 	$DEBUG_ALL_OVERRIDE = false;
 }
 
+/************* AUTO LOADER *******************/
 // read auto loader
 require BASE.LIB.'autoloader.php';
 

www/configs/config.other.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2019/10/28
+* SHORT DESCRIPTION:
+* other global constant variables
+* HISTORY:
+*********************************************************************/
+
+// DEFINE('SOME_ID', <SOME VALUE>);
+
+/************* CONVERT *******************/
+// this only needed if the external thumbnail create is used
+$paths = array(
+	'/bin',
+	'/usr/bin',
+	'/usr/local/bin'
+);
+// find convert
+foreach ($paths as $path) {
+	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
+		// image magick convert location
+		define('CONVERT', $path.DS.'convert');
+	}
+}
+unset($paths);
+
+// __END__

www/configs/config.path.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2018/10/11

www/includes/admin_header.php

@@ -13,10 +13,7 @@ if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
 	include BASE.LIBS."Error.Handling.php";
 }
 // predefine vars
-$lang = '';
 $messages = array();
-// import all POST vars
-extract($_POST, EXTR_SKIP);
 //------------------------------ variable init end
 
 //------------------------------ library include start
@@ -24,6 +21,7 @@ extract($_POST, EXTR_SKIP);
 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
@@ -34,18 +32,12 @@ if (!isset($ZIP_STREAM)) {
 	$ZIP_STREAM = false;
 }
 // set encoding
-if (!isset($encoding)) {
-	$encoding = DEFAULT_ENCODING;
-}
-// set the default lang, if not given
-if (session_id() && $_SESSION['DEFAULT_LANG']) {
-	$lang = $_SESSION['DEFAULT_LANG'];
-} elseif (!$lang) {
-	$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 (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");
@@ -54,21 +46,17 @@ if ($AJAX_PAGE && !$ZIP_STREAM) {
 
 //------------------------------ class init start
 // login & page access check
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
-// post login lang check
-if ($_SESSION['DEFAULT_LANG']) {
-	$lang = $_SESSION['DEFAULT_LANG'];
-}
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
 // 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, $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
@@ -89,12 +77,6 @@ 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['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) {
@@ -105,6 +87,6 @@ if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
 	$cms->echo_output_all = false;
 	$cms->print_output_all = false;
 }
-$cms->DATA['JS_DEBUG'] = DEBUG;
+$smarty->DATA['JS_DEBUG'] = DEBUG;
 
 // __END__

www/includes/admin_set_paths.php

@@ -7,161 +7,13 @@
 * 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))).(defined(G_TITLE) ? ' - '.G_TITLE : '');
-// strip tpl and replace it with php
-// php include file per page
-$cms->INC_TEMPLATE_NAME = str_replace('.tpl', '.php', $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 = isset($CSS_NAME) ? $CSS_NAME : '';
-// special JS file
-$cms->JS_SPECIAL_TEMPLATE_NAME = isset($JS_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;
+/******
+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->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 (isset($AJAX_PAGE) && !$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
-/** @phan-suppress-next-line PhanParamSuspiciousOrder */
-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 (isset($AJAX_PAGE) && !$AJAX_PAGE) {
-	// javascript translate data as template for auto translate
-	if (empty($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]);
+	$smarty->setSmartyPaths();
 }
 
 // __END__

www/includes/admin_smarty.php

@@ -7,109 +7,11 @@
 * 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
-
-// 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);
-}
-// 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;
-}
-
-// 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();
-$cms->DATA['nav_menu_count'] = is_array($cms->DATA['nav_menu']) ? count($cms->DATA['nav_menu']) : 0;
-// the page name
-$cms->DATA['page_name'] = $cms->page_name;
-// user name
-$cms->DATA['USER_NAME'] = $_SESSION['USER_NAME'];
-$cms->DATA['ADMIN'] = $login->acl['admin'];
-// the template part to include into the body
-$cms->DATA['TEMPLATE_NAME'] = $TEMPLATE_NAME;
-$cms->DATA['CONTENT_INCLUDE'] = $CONTENT_INCLUDE;
-$cms->DATA['TEMPLATE_TRANSLATE'] = $TEMPLATE_TRANSLATE;
-$cms->DATA['PAGE_FILE_NAME'] = $PAGE_FILE_NAME;
-// LANG
-$cms->DATA['LANG'] = $lang;
-$cms->DATA['TINYMCE_LANG'] = $lang_short;
-// form name
-$cms->DATA['FORM_NAME'] = $FORM_NAME;
-// include flags
-$cms->DATA['USE_TINY_MCE'] = isset($USE_TINY_MCE) ? $USE_TINY_MCE : false;
-$cms->DATA['JS_DATEPICKR'] = isset($JS_DATEPICKR) ? $JS_DATEPICKR : false;
-$cms->DATA['JS_FLATPICKR'] = isset($JS_FLATPICKR) ? $JS_FLATPICKR : false;
-
-// 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
-);
+/******
+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

@@ -36,23 +36,19 @@ if (!DEBUG)	{
 	$ECHO_ALL = 0;
 }
 
-// set default lang if not set otherwise
-if (!isset($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, $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
 
 // create form class
-$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $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));
 
@@ -89,12 +85,12 @@ $table_width = '100%';
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
 $HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-$HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET;
+$HEADER['STYLESHEET'] = $ADMIN_STYLESHEET ?? ADMIN_STYLESHEET;
 
 if ($form->my_page_name == 'edit_order') {
 	// get is for "table_name" and "where" only
-	$table_name = isset($_GET['table_name']) ? $_GET['table_name'] : '';
-	// $where = isset($_GET['where']) ? $_GET['where'] : '';
+	$table_name = $_GET['table_name'] ?? '';
+	// $where = $_GET['where'] ?? '';
 	// order name is _always_ order_number for the edit interface
 
 	// follwing arrays do exist here:
@@ -106,7 +102,7 @@ if ($form->my_page_name == 'edit_order') {
 	if (!isset($position)) {
 		$position = array();
 	}
-	$row_data_id = $_POST['row_data_id'];
+	$row_data_id = $_POST['row_data_id'] ?? [];
 	$original_id = $row_data_id;
 	if (count($position)) {
 		$row_data_order = $_POST['row_data_order'];
@@ -120,8 +116,8 @@ if ($form->my_page_name == 'edit_order') {
 				// this gets the old before (moves one "up")
 				// 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];
+				$temp_id = $row_data_id[$position[$i]] ?? null;
+				$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1] ?? null;
 				$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
@@ -133,8 +129,8 @@ if ($form->my_page_name == 'edit_order') {
 				// 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,
 				// element after this, gets this
-				$temp_id = $row_data_id[$position[$i] + 1];
-				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
+				$temp_id = $row_data_id[$position[$i] + 1] ?? null;
+				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]] ?? null;
 				$row_data_id[$position[$i]] = $temp_id;
 			} // for
 		} // if down
@@ -144,8 +140,10 @@ if ($form->my_page_name == 'edit_order') {
 			(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);
+				if (isset($row_data_order[$i]) && isset($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);
+				}
 			} // for all article ids ...
 		} // if write
 	} // if there is something to move
@@ -191,7 +189,9 @@ if ($form->my_page_name == 'edit_order') {
 		// 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 (isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
+				$original_id[$position[$j]] == $row_data[$i]['id']
+			) {
 				$options_selected[] = $i;
 			}
 		}
@@ -212,7 +212,7 @@ if ($form->my_page_name == 'edit_order') {
 
 	// hidden names for the table & where string
 	$DATA['table_name'] = $table_name;
-	$DATA['where_string'] = isset($where_string) ? $where_string : '';
+	$DATA['where_string'] = $where_string ?? '';
 
 	$EDIT_TEMPLATE = 'edit_order.tpl';
 } else {
@@ -274,43 +274,63 @@ if ($form->my_page_name == 'edit_order') {
 
 	$position = 0;
 	$menu_data = array();
-	for ($i = 1; $i <= count($menuarray); $i ++) {
+	// for ($i = 1; $i <= count($menuarray); $i ++) {
+	foreach ($menuarray as $i => $data) {
 		// do that for new array
-		$j = $i - 1;
-		$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]['page_name']);
-		$menu_data[$j]['filename'] = $menuarray[($i-1)]['filename'].(isset($menuarray[$j]['query_string']) ? $menuarray[$j]['query_string'] : '');
-		if ($i == 1 || !($j % $SPLIT_FACTOR)) {
-			$menu_data[$j]['splitfactor_in'] = 1;
+		$j = $i + 1;
+		$menu_data[$i]['pagename'] = htmlentities($data['page_name']);
+		$menu_data[$i]['filename'] =
+			// prefix folder or host name
+			(isset($data['hostname']) && $data['hostname'] ?
+				$data['hostname'] :
+				''
+			).
+			// filename
+			($data['filename'] ?? '').
+			// query string
+			(isset($data['query_string']) && $data['query_string'] ?
+				$data['query_string'] :
+				''
+			);
+		if ($j == 1 || !($i % $SPLIT_FACTOR)) {
+			$menu_data[$i]['splitfactor_in'] = 1;
 		} else {
-			$menu_data[$j]['splitfactor_in'] = 0;
+			$menu_data[$i]['splitfactor_in'] = 0;
 		}
-		if ($menuarray[$j]['filename'] == $form->getPageName()) {
-			$position = $j;
-			$menu_data[$j]['position'] = 1;
-			$menu_data[$j]['popup'] = 0;
+		// on matching, we also need to check if we are in the same folder
+		if (isset($data['filename']) &&
+			$data['filename'] == $form->getPageName() &&
+			(!isset($data['hostname']) || (
+				isset($data['hostname']) &&
+					(!$data['hostname'] || strstr($data['hostname'], CONTENT_PATH) !== false)
+			))
+		) {
+			$position = $i;
+			$menu_data[$i]['position'] = 1;
+			$menu_data[$i]['popup'] = 0;
 		} else {
 			// add query stuff
 			// HAS TO DONE LATER ... set urlencode, etc ...
 			// check if popup needed
-			if (isset($menuarray[$j]['popup']) && $menuarray[$j]['popup'] == 1) {
-				$menu_data[$j]['popup'] = 1;
-				$menu_data[$j]['rand'] = uniqid((string)rand());
-				$menu_data[$j]['width'] = $menuarray[$j]['popup_x'];
-				$menu_data[$j]['height'] = $menuarray[$j]['popup_y'];
+			if (isset($data['popup']) && $data['popup'] == 1) {
+				$menu_data[$i]['popup'] = 1;
+				$menu_data[$i]['rand'] = uniqid((string)rand());
+				$menu_data[$i]['width'] = $data['popup_x'];
+				$menu_data[$i]['height'] = $data['popup_y'];
 			} else {
-				$menu_data[$j]['popup'] = 0;
+				$menu_data[$i]['popup'] = 0;
 			}
-			$menu_data[$j]['position'] = 0;
+			$menu_data[$i]['position'] = 0;
 		} // highlight or not
-		if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) {
-			$menu_data[$j]['splitfactor_out'] = 1;
+		if (!($j % $SPLIT_FACTOR) || (($j + 1) > count($menuarray))) {
+			$menu_data[$i]['splitfactor_out'] = 1;
 		} else {
-			$menu_data[$j]['splitfactor_out'] = 0;
+			$menu_data[$i]['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'] ?? '-Undefined ['.$position.'] -';
 	$L_TITLE = $DATA['page_name'];
 	// html title
 	$HEADER['HTML_TITLE'] = $form->l->__($L_TITLE);
@@ -361,14 +381,35 @@ if ($form->my_page_name == 'edit_order') {
 				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);
-					// 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');
+					// gets all files in the current dir and dirs given ending with .php
+					$folders = array('../admin/', '../frontend/');
+					$files = array('*.php');
+					$search_glob = array();
+					foreach ($folders as $folder) {
+						// make sure this folder actually exists
+						if (is_dir(ROOT.$folder)) {
+							foreach ($files as $file) {
+								$search_glob[] = $folder.$file;
+							}
+						}
 					}
+					$crap = exec('ls '.join(' ', $search_glob), $output, $status);
+					// now get all that are NOT in de DB
+					$q = "INSERT INTO temp_files (folder, filename) VALUES ";
+					$t_q = '';
+					foreach ($output as $output_file) {
+						// split the ouput into folder and file
+						// eg ../admin/test.php is ../admin/ and test.php
+						preg_match("/([\.\/\w]+\/)+(\w+\.\w{1,})$/", $output_file, $matches);
+						// if named config.php, skip
+						if ($matches[2] != 'config.php') {
+							if ($t_q) {
+								$t_q .= ', ';
+							}
+							$t_q .= "('".$form->dbEscapeString($matches[1])."', '".$form->dbEscapeString($matches[2])."')";
+						}
+					}
+					$form->dbExec($q.$t_q, 'NULL');
 					$elements[] = $form->formCreateElement('filename');
 				} else {
 					// show file menu
@@ -376,6 +417,7 @@ if ($form->my_page_name == 'edit_order') {
 					$DATA['filename_exist'] = 1;
 					$DATA['filename'] = $form->table_array['filename']['value'];
 				} // File Name View IF
+				$elements[] = $form->formCreateElement('hostname');
 				$elements[] = $form->formCreateElement('name');
 				// $elements[] = $form->formCreateElement('tag');
 				// $elements[] = $form->formCreateElement('min_acl');
@@ -439,7 +481,7 @@ if ($form->my_page_name == 'edit_order') {
 }
 
 // debug data, if DEBUG flag is on, this data is print out
-$DEBUG_DATA['DEBUG'] = isset($DEBUG_TMPL) ? $DEBUG_TMPL : '';
+$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL ?? '';
 
 // create main data array
 $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
@@ -453,7 +495,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_pages.php

@@ -12,11 +12,16 @@ $edit_pages = array(
 			'output_name' => 'Add File ...',
 			'mandatory' => 1,
 			'type' => 'drop_down_db',
-			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.filename AS name ".
+			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.folder || temp_files.filename AS name ".
 				"FROM temp_files ".
 				"LEFT JOIN edit_page ep ON temp_files.filename = ep.filename ".
 				"WHERE ep.filename IS NULL"
 		),
+		'hostname' => array(
+			'value' => isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '',
+			'output_name' => 'Hostname or folder',
+			'type' => 'text'
+		),
 		'name' => array(
 			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
 			'output_name' => 'Page name',
@@ -107,7 +112,7 @@ $edit_pages = array(
 				// "ORDER BY order_number"
 		)
 	),
-	'load_query' => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
+	'load_query' => "SELECT edit_page_id, CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
 	'table_name' => 'edit_page',
 	'show_fields' => array(
 		array(

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}
@@ -9,10 +12,19 @@
 <div class="jq-container">
 	<div id="jq-test" class="jp-test">
 		<div id="test-div" class="test-div">
-			Some content ehre or asdfasdfasf
+			Some content here or asdfasdfasf
+		</div>
+		<div id="translate-div">
+			TRANSLATION SMARTY: {t}I should be translated{/t}
 		</div>
 	</div>
 </div>
+<div class="loop-test">
+	<div>LOOP TEST</div>
+{section name=page_list start=1 loop=$loop_start+1}
+	<div>LOOP OUTPUT: {$smarty.section.page_list.index}</div>
+{/section}
+</div>
 {* progresss indicator *}
 <div id="indicator"></div>
 {* the action confirm box *}

www/layout/admin/cache/.gitignore

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

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

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

www/layout/admin/css/edit.css

@@ -382,7 +382,7 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	left: 0;
 	top: 0;
 	position: absolute;
-	z-index: 100;
+	z-index: 1000;
 }
 /* Animation for above progress */
 @keyframes rotate {

www/layout/admin/javascript/edit.js

@@ -1 +1 @@
-edit.pt.js
+edit.jq.js

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
-// RETURN: none
-// DESC  : opens a popup window with winName and given features (string)
+/**
+ * opens a popup window with winName and given features (string)
+ * @param {String} theURL   the url
+ * @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
-// RETURN: none
-// DESC  : automatically resize a text area based on the amount of lines in it
+/**
+ * automatically resize a text area based on the amount of lines in it
+ * @param {[string} ta_id element id
+ */
 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
-//         id -> id to work on
-// RETURN: none
-// DESC:   shows or hides the menu
-//         this is used in some old menu templates
+/**
+ * shows or hides the menu
+ * this is used in some old menu templates
+ * @param {String} status show or hide
+ * @param {String} id     element id to work on
+ */
 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
-//         showText -> text for the element if shown
-//         hideText -> text for the element if hidden
-// RETURN: returns true if hidden, or false if not
-// DESC  : hides an element, additional writes 1 (show) or 0 (hide) into <id>Flag field
-//         this needs scriptacolous installed for BlindUp/BlindDown
+/**
+ * hides an element, additional writes 1 (show) or 0 (hide) into <id>Flag field
+ * this needs scriptacolous installed for BlindUp/BlindDown
+ * @param  {String}  id       element id to hide
+ * @param  {String}  showText text for the element if shown
+ * @param  {String}  hideText text for the element if hidden
+ * @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
-// RETURN: array with width/height
-// DESC  : wrapper to get the real window size for the current browser window
+/**
+ * wrapper to get the real window size for the current browser window
+ * @return {Object} object with width/height
+ */
 function getWindowSize()
 {
 	var width, height;
@@ -135,10 +147,10 @@ function getWindowSize()
 	};
 }
 
-// METHOD: getScrollOffset
-// PARAMS: none
-// RETURN: array with x/y px
-// DESC  : wrapper to get the correct scroll offset
+/**
+ * wrapper to get the correct scroll offset
+ * @return {Object} object with x/y px
+ */
 function getScrollOffset()
 {
 	var left, top;
@@ -150,10 +162,12 @@ function getScrollOffset()
 	};
 }
 
-// METHOD: setCenter
-// PARAMS: id to set center
-// RETURN: none
-// DESC  : centers div to current window size middle
+/**
+ * centers div to current window size middle
+ * @param {String}  id   element to center
+ * @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
@@ -162,7 +176,7 @@ function setCenter(id, left, top)
 	var viewport = getWindowSize();
 	var offset = getScrollOffset();
 
-	console.log('Id %s, type: %s, dimensions %s x %s, viewport %s x %s', id, type, dimensions.width, dimensions.height, viewport.width, viewport.height);
+	// console.log('Id %s, type: %s, dimensions %s x %s, viewport %s x %s', id, type, dimensions.width, dimensions.height, viewport.width, viewport.height);
 	// console.log('Scrolloffset left: %s, top: %s', offset.left, offset.top);
 	// console.log('Left: %s, Top: %s (%s)', parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left), parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top), parseInt((viewport.height / 2) - (dimensions.height / 2)));
 	if (left) {
@@ -179,15 +193,15 @@ function setCenter(id, left, top)
 	}
 }
 
-// METHOD: goToPos()
-// PARAMS: element, offset (default 0)
-// RETURN: none
-// DESC:   goes to an element id position
+/**
+ * goes to an element id position
+ * @param {String} element    element id to move to
+ * @param {Number} [offset=0] offset from top, default is 0 (px)
+ */
 function goToPos(element, offset = 0)
 {
 	try {
-		if ($(element))
-		{
+		if ($(element)) {
 			// get the element pos
 			var pos = $(element).cumulativeOffset();
 			// if not top element and no offset given, set auto offset for top element
@@ -203,10 +217,12 @@ function goToPos(element, offset = 0)
 	}
 }
 
-// METHOD: __
-// PARAMS: text
-// RETURN: translated text (based on PHP selected language)
-// DESC  : uses the i18n array created in the translation template, that is filled from gettext in PHP (Smarty)
+/**
+ * uses the i18n object created in the translation template
+ * that is filled from gettext in PHP
+ * @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 +232,13 @@ function __(string)
 	}
 }
 
-// METHOD: string.format
-// PARAMS: any, for string format
-// RETURN: formatted string
-// DESC  : simple sprintf formater for replace
-//         "{0} is cool, {1} is not".format("Alpha", "Beta");
-// First, checks if it isn't implemented yet.
+/**
+ * simple sprintf formater for replace
+ * usage: "{0} is cool, {1} is not".format("Alpha", "Beta");
+ * First, checks if it isn't implemented yet.
+ * @param  {String} !String.prototype.format string with elements to be replaced
+ * @return {String}                          Formated string
+ */
 if (!String.prototype.format) {
 	String.prototype.format = function()
 	{
@@ -236,25 +253,32 @@ if (!String.prototype.format) {
 	};
 }
 
-// METHOD: numberWithCommas
-// PARAMS: number
-// RETURN: formatted with , in thousands
-// DESC  : formats flat number 123456 to 123,456
+/**
+ * formats flat number 123456 to 123,456
+ * @param  {Number} x number to be formated
+ * @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
-// RETURN: string with <br>
-// DESC  : converts line breaks to br
+/**
+ * converts line breaks to br
+ * @param  {String} string any string
+ * @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 +296,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 +318,33 @@ if (!String.prototype.unescapeHTML) {
 	};
 }
 
-// METHOD: getTimestamp
-// PARAMS: none
-// RETURN: timestamp (in milliseconds)
-// DESC  : returns current timestamp (unix timestamp)
+/**
+ * returns current timestamp (unix timestamp)
+ * @return {Number} timestamp (in milliseconds)
+ */
 function getTimestamp()
 {
 	var date = new Date();
 	return date.getTime();
 }
 
-// METHOD: dec2hex
-// PARAMS: decimal string
-// RETURN: string
-// DESC  : dec2hex :: Integer -> String
-//         i.e. 0-255 -> '00'-'ff'
+/**
+ * dec2hex :: Integer -> String
+ * i.e. 0-255 -> '00'-'ff'
+ * @param  {Number} dec decimal string
+ * @return {String}     hex encdoded number
+ */
 function dec2hex(dec)
 {
 	return ('0' + dec.toString(16)).substr(-2);
 }
 
-// METHOD: generateId
-// PARAMS: lenght in int
-// RETURN: random string
-// DESC  : generateId :: Integer -> String
-//         only works on mondern browsers
+/**
+ * generateId :: Integer -> String
+ * only works on mondern browsers
+ * @param  {Number} len length of unique id string
+ * @return {String}     random string in length of len
+ */
 function generateId(len)
 {
 	var arr = new Uint8Array((len || 40) / 2);
@@ -321,20 +352,22 @@ function generateId(len)
 	return Array.from(arr, dec2hex).join('');
 }
 
-// METHOD: randomIdF()
-// PARAMS: none
-// RETURN: not true random string
-// DESC  : creates a pseudo random string of 10 characters
-//         after many runs it will create duplicates
+/**
+ * creates a pseudo random string of 10 characters
+ * works on all browsers
+ * 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
-// RETURN: true/false if it is an object or not
-// DESC  : checks if a variable is an object
+/**
+ * checks if a variable is an object
+ * @param  {Mixed}   val possible object
+ * @return {Boolean}     true/false if it is an object or not
+ */
 function isObject(val) {
 	if (val === null) {
 		return false;
@@ -342,47 +375,55 @@ function isObject(val) {
 	return ((typeof val === 'function') || (typeof val === 'object'));
 }
 
-// METHOD: keyInObject
-// PARAMS: key name, object
-// RETURN: true/false if key exists in object
-// DESC  : checks if a key exists in a given object
-const keyInObject = (key, object) => (key in object) ? true : false;
+/**
+ * checks if a key exists in a given object
+ * @param  {String}  key    key name
+ * @param  {Object}  object object to search key in
+ * @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: getKeyByValue
-// PARAMS: object, value
-// RETURN: key found
-// DESC  : returns matching key of value
+/**
+ * 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
+ */
 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);
 // }
 
-// METHOD: valueInObject
-// PARAMS: obj, value
-// RETURN: true/false
-// DESC  : returns true if value is found in object with a key
+/**
+ * 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;
 
-// METHOD: exists
-// PARAMS: uid
-// RETURN: true/false
-// DESC  : checks if a DOM element actually exists
-const exists = (id) => $('#' + id).length > 0 ? 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
-// RETURN: string in GB/MB/KB
-// DESC  : converts a int number into bytes with prefix in two decimals precision
-//         currently precision is fixed, if dynamic needs check for max/min precision
+/**
+ * converts a int number into bytes with prefix in two decimals precision
+ * currently precision is fixed, if dynamic needs check for max/min precision
+ * @param  {Number} bytes bytes in int
+ * @return {String}       string in GB/MB/KB
+ */
 function formatBytes(bytes)
 {
 	var i = -1;
@@ -394,10 +435,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
-// RETURN: none
-// DESC  : prints out error messages based on data available from the browser
+/**
+ * prints out error messages based on data available from the browser
+ * @param {Object} err error from try/catch block
+ */
 function errorCatch(err)
 {
 	// for FF & Chrome
@@ -423,10 +464,10 @@ function errorCatch(err)
 	}
 }
 
-// METHOD: actionIndicator
-// PARAMS: none
-// RETURN: none
-// DESC   : show or hide the "do" overlay
+/**
+ * show or hide the "do" overlay
+ * @param {String} [loc=''] location name for action indicator, default empty. for console.log
+ */
 function actionIndicator(loc = '')
 {
 	if ($('overlayBox').visible()) {
@@ -436,32 +477,36 @@ function actionIndicator(loc = '')
 	}
 }
 
-// METHOD: actionIndicatorShow/actionIndicatorHide
-// PARAMS: loc for console log info
-// RETURN: none
-// DESC  : explicit show/hide for action Indicator
-//         instead of automatically show or hide, do
-//         on command
+/**
+ * explicit show for action Indicator
+ * instead of automatically show or hide, do on command show
+ * @param {String} [loc=''] optional location name, empty if not set. for console.log
+ */
 function actionIndicatorShow(loc = '')
 {
-	console.log('Indicator: SHOW [%s]', loc);
+	// console.log('Indicator: SHOW [%s]', loc);
 	$('indicator').addClassName('progress');
 	setCenter('indicator', true, true);
 	$('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);
+	// console.log('Indicator: HIDE [%s]', loc);
 	$('indicator').hide();
 	$('indicator').removeClassName('progress');
 	overlayBoxHide();
 }
 
-// METHOD: overlayBoxView
-// PARAMS: none
-// RETURN: none
-// DESC  : shows or hides the overlay box
+/**
+ * shows the overlay box or if already visible, bumps the zIndex to 100
+ */
 function overlayBoxShow()
 {
 	// check if overlay box exists and if yes set the z-index to 100
@@ -471,6 +516,10 @@ function overlayBoxShow()
 		$('overlayBox').show();
 	}
 }
+
+/**
+ * hides the overlay box or if zIndex is 100 bumps it down to previous level
+ */
 function overlayBoxHide()
 {
 	// if the overlay box z-index is 100, do no hide, but set to 98
@@ -481,10 +530,9 @@ function overlayBoxHide()
 	}
 }
 
-// METHOD: setOverlayBox
-// PARAMS: none
-// RETURN: none
-// DESC   : position the overlay block box and shows it
+/**
+ * position the overlay block box and shows it
+ */
 function setOverlayBox()
 {
 	var viewport = document.viewport.getDimensions();
@@ -495,10 +543,19 @@ function setOverlayBox()
 	$('overlayBox').show();
 }
 
-// METHOD: ClearCall
-// PARAMS: none
-// RETURN: none
-// DESC  : the abort call, clears the action box and hides it and the overlay box
+/**
+ * opposite of set, always hides overlay box
+ */
+function hideOverlayBox()
+{
+	if ($('overlayBox').visible()) {
+		$('overlayBox').hide();
+	}
+}
+
+/**
+ * the abort call, clears the action box and hides it and the overlay box
+ */
 function ClearCall()
 {
 	$('actionBox').innerHTML = '';
@@ -507,14 +564,15 @@ function ClearCall()
 }
 
 // *** DOM MANAGEMENT FUNCTIONS
-// METHOD: cel [create element]
-// PARAMS: tag: must set tag (div, span, etc)
-//         id: optional set for id, if input, select will be used for name
-//         content: text content inside, is skipped if sub elements exist
-//         css: array for css tags
-//         options: anything else (value, placeholder, OnClick, style)
-// RETURN: object
-// DESC  : creates object for DOM element creation flow
+/**
+ * reates object for DOM element creation flow
+ * @param  {String} tag          must set tag (div, span, etc)
+ * @param  {String} [id='']      optional set for id, if input, select will be used for name
+ * @param  {String} [content=''] text content inside, is skipped if sub elements exist
+ * @param  {Array}  [css=[]]     array for css tags
+ * @param  {Object} [options={}] anything else (value, placeholder, OnClick, style)
+ * @return {Object}              created element as an object
+ */
 const cel = (tag, id = '', content = '', css = [], options = {}) =>
 	_element = {
 		tag: tag,
@@ -526,12 +584,13 @@ const cel = (tag, id = '', content = '', css = [], options = {}) =>
 		sub: []
 	};
 
-// METHOD: ael [attach element]
-// PARAMS: base: object where to attach/search
-//         attach: the object to be attached
-//         id: optional id, if given search in base for this id and attach there
-// RETURN: "none", technically there is no return needed
-// DESC  : attach a cel created object to another to create a basic DOM tree
+/**
+ * attach a cel created object to another to create a basic DOM tree
+ * @param  {Object} base    object where to attach/search
+ * @param  {Object} attach  the object to be attached
+ * @param  {String} [id=''] optional id, if given search in base for this id and attach there
+ * @return {Object}         "none", technically there is no return needed as it is global attach
+ */
 function ael(base, attach, id = '')
 {
 	if (id) {
@@ -553,12 +612,13 @@ function ael(base, attach, id = '')
 	return base;
 }
 
-// METHOD: aelx [attach n elements]
-// PARAMS: base: object to where we attach the elements
-//         attach 1..n: attach directly to the base element those attachments
-// RETURN: "none", technically there is no return needed
-// DESC  : directly attach n elements to one master base element
-//         this type does not support attach with optional id
+/**
+ * directly attach n elements to one master base element
+ * this type does not support attach with optional id
+ * @param  {Object}    base   object to where we attach the elements
+ * @param  {...Object} attach attach 1..n: attach directly to the base element those attachments
+ * @return {Object}           "none", technically there is no return needed, global attach
+ */
 function aelx(base, ...attach)
 {
 	attach.each(function(t) {
@@ -567,19 +627,37 @@ function aelx(base, ...attach)
 	return base;
 }
 
-// METHOD: rel [reset element]
-// PARAMS: cel created element
-// RETURN: returns reset base element
-// DESC  : resets the sub elements of the base element given
+/**
+ * same as aelx, but instead of using objects as parameters
+ * get an array of objects to attach
+ * @param  {Object} base   object to where we attach the elements
+ * @param  {Array}  attach array of objects to attach
+ * @return {Object}        "none", technically there is no return needed, global attach
+ */
+function aelxar(base, attach)
+{
+	attach.each(function(t) {
+		base.sub.push(Object.assign({}, t));
+	});
+	return base;
+}
+
+/**
+ * resets the sub elements of the base element given
+ * @param  {Object} base cel created element
+ * @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
-// RETURN: returns full element
-// DESC  : searches and removes style from css array
+/**
+ * searches and removes style from css array
+ * @param  {Object} _element element to work one
+ * @param  {String css      style sheet to remove (name)
+ * @return {Object}          returns full element
+ */
 function rcssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -589,10 +667,12 @@ function rcssel(_element, css)
 	return _element;
 }
 
-// METHOD: acssel [add css element]
-// PARAMS: element, style sheet to add
-// RETURN: returns full element
-// DESC  : adds a new style sheet to the element given
+/**
+ * adds a new style sheet to the element given
+ * @param  {Object} _element element to work on
+ * @param  {String} css      style sheet to add (name)
+ * @return {Object}         returns full element
+ */
 function acssel(_element, css)
 {
 	var css_index = _element.css.indexOf(css);
@@ -602,11 +682,14 @@ function acssel(_element, css)
 	return _element;
 }
 
-// METHOD: scssel
-// PARAMS: element, style to remove, style to add
-// RETURN: returns full element
-// DESC  : removes one css and adds another
-//         is a wrapper around rcssel/acssel
+/**
+ * removes one css and adds another
+ * is a wrapper around rcssel/acssel
+ * @param  {Object} _element element to work on
+ * @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);
@@ -614,12 +697,12 @@ function scssel(_element, rcss, acss)
 	return _element;
 }
 
-// METHOD: phfo [produce html from object]
-// PARAMS: object tree with dom element declarations
-// RETURN: HTML string that can be used as innerHTML
-// DESC  : parses the object tree created with cel/ael
-//         and converts it into an HTML string that can
-//         be inserted into the page
+/**
+ * parses the object tree created with cel/ael and converts it into an HTML string
+ * that can be inserted into the page
+ * @param  {Object} tree object tree with dom element declarations
+ * @return {String}      HTML string that can be used as innerHTML
+ */
 function phfo(tree)
 {
 	// holds the elements
@@ -681,33 +764,44 @@ function phfo(tree)
 
 // BLOCK: html wrappers for quickly creating html data blocks
 
-// NOTE  : OLD FORMAT which misses multiple block set
-// METHOD: html_options
-// PARAMS: name/id, array for the options, selected item uid
-//         options_only [def false] if this is true, it will not print the select part
-//         return_string [def false]: return as string and not as element
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
-// RETURN: html with build options block
-// DESC  : creates an select/options drop down block.
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+/**
+ * NOTE: OLD FORMAT which misses multiple block set
+ * creates an select/options drop down block.
+ * the array needs to be key -> value format.
+ * key is for the option id and value is for the data output
+ * @param  {String}  name                  name/id
+ * @param  {Object}  data                  array for the options
+ * @param  {String}  [selected='']         selected item uid
+ * @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
-// PARAMS: name/id, array for the options,
-//         selected item uid [drop down string, multi select array]
-//         multiple [def 0] if this is 1 or larger, the drop down will be turned into multiple select
-//                          the number sets the size value unless it is 1, then it is default
-//         options_only [def false] if this is true, it will not print the select part
-//         return_string [def false]: return as string and not as element
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
-// RETURN: html with build options block
-// DESC  : creates an select/options drop down block.
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
+/**
+ * NOTE: USE THIS CALL, the above one is deprecated
+ * creates an select/options drop down block.
+ * the array needs to be key -> value format.
+ * key is for the option id and value is for the data output
+ * @param  {String}  name                  name/id
+ * @param  {Object}  data                  array for the options
+ * @param  {String}  [selected='']         selected item uid
+ * @param  {Number}  [multiple=0]          if this is 1 or larger, the drop down
+ *                                         will be turned into multiple select
+ *                                         the number sets the size value unless it is 1,
+ *                                         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 = [];
@@ -778,11 +872,13 @@ function html_options_block(name, data, selected = '', multiple = 0, options_onl
 	}
 }
 
-// METHOD: html_options_refill
-// PARAMS: name/id, array of options, sort = ''
-//         sort [def '']: if empty as is, else allowed 'keys', 'values' all others are ignored
-// RETURN: none
-// DESC  : refills a select box with options and keeps the selected
+/**
+ *  refills a select box with options and keeps the selected
+ * @param {String} name      name/id
+ * @param {Object} data      array of options
+ * @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;
@@ -816,11 +912,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
-// RETURN: none
-// DESC  : submits basic data for form logout
+/**
+ * submits basic data for form logout
+ */
 function loginLogout()
 {
 	const form = document.createElement('form');

www/layout/admin/javascript/firebug.js

@@ -3,8 +3,9 @@
  * firebug 1.2+ and the webkit console */
 
 var ConsoleSetup = function() {
-	if (!window.console)
+	if (!window.console) {
 		window.console = {};
+	}
 
 	var names = ['log', 'debug', 'info', 'warn', 'error', 'assert', 'dir', 'dirxml', 'group', 'groupEnd', 'time', 'timeEnd', 'count', 'trace', 'profile', 'profileEnd'];
 

www/layout/admin/javascript/flatpickr/flatpickr.ja.js

@@ -53,7 +53,8 @@
           ]
       },
       time_24hr: true,
-      rangeSeparator: ' から '
+      rangeSeparator: " から ",
+      firstDayOfWeek: 1
   };
   fp.l10ns.ja = Japanese;
   var ja = fp.l10ns;

www/layout/frontend/cache/.gitignore

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