Backport Login changes

Password change backport

.htaccess

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

.phan/config.php

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

4dev/composer/install.txt

@@ -1,21 +0,0 @@
-Install composer:
-curl -sS https://getcomposer.org/installer | /usr/local/php-7.3-httpd-2.4/bin/php
-
-Update composer phar file
-/usr/local/php-7.3-httpd-2.4/bin/php composer.phar selfupdate
-
-Install something:
-/usr/local/php-7.3-httpd-2.4/bin/php composer.phar require something/something
-
-Update all installed:
-/usr/local/php-7.3-httpd-2.4/bin/php composer.phar update
-
-Or update only one package:
-/usr/local/php-7.3-httpd-2.4/bin/php composer.phar something/something
-
-Install AWS SDK:
-/usr/local/php-7.3-httpd-2.4/bin/php -d memory_limit=-1 composer.phar require aws/aws-sdk-php
-
-Install zipStream:
-/usr/local/php-7.3-httpd-2.4/bin/php composer.phar require maennchen/zipstream-php
-

4dev/database/ORDER

@@ -1,7 +1,5 @@
 # functions
 function/update_function.sql
-function/random_string.sql
-function/edit_set_access_uid.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -20,11 +18,9 @@ table/edit_user.sql
 table/edit_log.sql
 table/edit_access.sql
 table/edit_access_user.sql
-table/edit_access_data.sql
 # all triggers (after all tables have been created)
 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
@@ -37,6 +33,3 @@ 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/import_data.sh

@@ -5,63 +5,19 @@
 #echo "EXIT";
 #exit;
 
-# if flagged 'y' then it will ask after each import to continue
-development='y';
-test='n';
-input='';
-# database connection info
 db='<db name>';
 host='<db host>';
 user='<db user>';
-schema="public";
-export PGPASSWORD='';
+#schema="publicv";
 
-# log files
-error_file="log/error";
-output_file="log/output";
-
-if [ ! -f ORDER ]; then
-	echo "Could not find ORDER file";
-	exit;
-fi;
-
-if [ "$test" != "n" ]; then
-	echo "TESTING MODE, NO DATA WILL BE IMPORTED";
-fi;
-if [ "$development" = "y" ]; then
-	echo "STEP BY STEP IMPORT MODE ACTIVATED";
-fi;
-
-while read file <&3; do
-	if [ "$file" = "FINISHED" ]; then
-		echo "Database data is flagged as FINISHED in ORDER file";
-		exit;
+for file in `cat ORDER`;
+do
+	if [ -f $file ];
+	then
+#		for path in $schema;
+#		do
+#			echo "WORK ON "$schema"."$file;
+			psql -U $user -h $host -f $file $db 1>> output 2>> error
+#		done;
 	fi;
-	if [ -f "$file" ]; then
-		for path in "$schemas"; do
-			echo "[+] WORK ON '${file}' @ '${path}'";
-			if [ "$test" = 'n' ]; then
-				echo "=== START [$file] ===>" >> ${error_file};
-				psql -U ${user} -h ${host} -f "${file}" ${db} 1>> ${output_file} 2>> ${error_file}
-				echo "=== END   [$file] ===>" >> ${error_file};
-			fi;
-			if [ "$development" = "y" ]; then
-				echo "Press 'y' to move to next. Press 'r' to reload last file. ^c to abort";
-			fi;
-			while [ "$development" = "y" ] && [ "$input" != "y" ]; do
-				read -ep "Continue (y|r|^c): " input;
-				if [ "$input" = "r" ]; then
-					echo "Reload File '${file}' ...";
-					if [ "$test" = 'n' ]; then
-						echo "=== START RELOAD [$file] ===>" >> ${error_file};
-						psql -U ${user} -h ${host} -f "${file}" ${db} 1>> ${output_file} 2>> ${error_file}
-						echo "=== END RELOAD   [$file] ===>" >> ${error_file};
-					fi;
-				fi;
-			done;
-			input='';
-		done;
-	elif [[ ${file::1} != "#" ]]; then
-		echo "[!] COULD NOT FIND FILE: '${file}'";
-	fi;
-done 3<ORDER;
+done;

4dev/database/data/edit_tables.sql

@@ -1,148 +0,0 @@
--- edit tables insert data in order
-
--- edit visible group
-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');
-
--- edit menu group
-DELETE FROM edit_menu_group;
-INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Menu', 'admin', 1);
-INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Data Popup Menu', 'AdminDataPopup', 2);
-
--- edit page
-DELETE FROM edit_page;
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_pages.php', 'Edit Pages', 1, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_users.php', 'Edit Users', 2, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_languages.php', 'Edit Languages', 3, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_schemes.php', 'Edit Schemes', 4, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_groups.php', 'Edit Groups', 5, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_visible_group.php', 'Edit Visible Groups', 6, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_menu_group.php', 'Edit Menu Groups', 7, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_access.php', 'Edit Access', 8, 1, 1);
-INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_order.php', 'Edit Order', 9, 1, 0);
-
--- edit visible group
-DELETE FROM edit_page_visible_group;
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
--- INSERT INTO edit_page_visible_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'), (SELECT edit_visible_group_id FROM edit_visible_group WHERE flag = 'main'));
-
--- edit page menu group
-DELETE FROM edit_page_menu_group;
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
--- INSERT INTO edit_page_menu_group VALUES ((SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'), (SELECT edit_menu_group_id FROM edit_menu_group WHERE flag = 'admin'));
-
-
--- edit access right
-DELETE FROM edit_access_right;
-INSERT INTO edit_access_right (name, level, type) VALUES ('Default', -1, 'default');
-INSERT INTO edit_access_right (name, level, type) VALUES ('No Access', 0, 'none');
-INSERT INTO edit_access_right (name, level, type) VALUES ('List', 10, 'list');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Read', 20, 'read');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Translator', 30, 'mod_trans');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Modify', 40, 'mod');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Create/Write', 60, 'write');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Delete', 80, 'del');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Site Admin', 90, 'siteadmin');
-INSERT INTO edit_access_right (name, level, type) VALUES ('Admin', 100, 'admin');
-
--- edit scheme
-DELETE FROM edit_scheme;
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Default Scheme', 'E0E2FF', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Admin', 'CC7E7E', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', 'B0C4B3', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('User', '1E789E', 1);
-
--- edit language
-DELETE FROM edit_language;
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1);
-INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('ja', 'Japanese', 'UTF-8', 2, 1, 0);
-
--- edit group
-DELETE FROM edit_group;
-INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Admin', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin'));
-INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('User', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'User'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'write'));
-
--- edit page access
-DELETE FROM edit_page_access;
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Pages'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Users'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Languages'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Schemes'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Visible Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Menu Groups'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Access'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1,
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_page_id FROM edit_page WHERE name = 'Edit Order'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-
--- edit user
--- inserts admin user so basic users can be created
-DELETE FROM edit_user;
-INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1,
-    (SELECT edit_language_id FROM edit_language WHERE short_name = 'en'),
-    (SELECT edit_group_id FROM edit_group WHERE name = 'Admin'),
-    (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);
-
--- edit access
-DELETE FROM edit_access;
-INSERT INTO edit_access (name, enabled, protected) VALUES ('Admin Access', 1, 1);
-
--- edit access user
-DELETE FROM edit_access_user;
-INSERT INTO edit_access_user (edit_default, enabled, edit_access_id, edit_user_id, edit_access_right_id) VALUES (1, 1,
-    (SELECT edit_access_id FROM edit_access WHERE uid = 'AdminAccess'),
-    (SELECT edit_user_id FROM edit_user WHERE username = 'admin'),
-    (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin')
-);

4dev/database/function/edit_log_partition_insert.sql

@@ -1,59 +0,0 @@
-CREATE OR REPLACE FUNCTION edit_log_insert_trigger ()
-RETURNS TRIGGER AS
-$$
-DECLARE
-	start_date DATE := '2010-01-01';
-	end_date DATE;
-	timeformat TEXT := 'YYYY';
-	selector TEXT := 'year';
-	_interval INTERVAL;
-	table_name TEXT;
-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
-		BEGIN
-			EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-		-- if insert failed because of missing table, create new below
-		EXCEPTION
-		WHEN undefined_table THEN
-			-- another block, so in case the creation fails here too
-			BEGIN
-				-- create new talbe 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)';
-				-- create all indexes and triggers
-				EXECUTE 'ALTER TABLE ' || quote_ident(table_name) || ' ADD PRIMARY KEY (edit_log_id)';
-				-- 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';
-				-- 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()';
-
-				-- insert try again
-				EXECUTE 'INSERT INTO ' || quote_ident(table_name) || ' SELECT ($1).*' USING NEW;
-			EXCEPTION
-			WHEN OTHERS THEN
-				-- if this faled, throw it into the overflow table (so we don't loose anything)
-				INSERT INTO edit_log_overflow VALUES (NEW.*);
-			END;
-		-- other errors, insert into overlow
-		WHEN OTHERS THEN
-			-- if this faled, throw it into the overflow table (so we don't loose anything)
-			INSERT INTO edit_log_overflow VALUES (NEW.*);
-		END;
-	ELSE
-		-- if outside valid date, insert into overflow
-		INSERT INTO edit_log_overflow VALUES (NEW.*);
-	END IF;
-	RETURN NULL;
-END
-$$
-LANGUAGE 'plpgsql'

4dev/database/function/edit_set_access_uid.sql

@@ -1,6 +1,6 @@
 -- add uid add for edit_access table
 
-CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS
+CREATE OR REPLACE FUNCTION set_edit_access_uid() RETURNS TRIGGER AS 
 $$
 	DECLARE
 		myrec RECORD;

4dev/database/function/random_string.sql

@@ -1,18 +0,0 @@
--- create random string with length X
-
-CREATE FUNCTION random_string(randomLength int)
-RETURNS text AS $$
-SELECT array_to_string(
-	ARRAY(
-		SELECT substring(
-			'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',
-			trunc(random() * 62)::int + 1,
-			1
-		)
-		FROM generate_series(1, randomLength) AS gs(x)
-	),
-	''
-)
-$$ LANGUAGE SQL
-RETURNS NULL ON NULL INPUT
-VOLATILE; -- LEAKPROOF;

4dev/database/function/set_edit_generic.sql

@@ -1,15 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_edit_generic() RETURNS TRIGGER AS '
-	DECLARE
-		random_length INT = 12; -- that should be long enough
-	BEGIN
-		IF TG_OP = ''INSERT'' THEN
-			NEW.date_created := ''now'';
-			NEW.cuid := random_string(random_length);
-		ELSIF TG_OP = ''UPDATE'' THEN
-			NEW.date_updated := ''now'';
-		END IF;
-		RETURN NEW;
-	END;
-' LANGUAGE 'plpgsql';

4dev/database/function/set_uid.sql

@@ -1,12 +0,0 @@
--- adds the created or updated date tags
-
-CREATE OR REPLACE FUNCTION set_uid() RETURNS TRIGGER AS '
-	DECLARE
-		random_length INT = 12; -- that should be long enough
-	BEGIN
-		IF TG_OP = ''INSERT'' THEN
-			NEW.uid := random_string(random_length);
-		END IF;
-		RETURN NEW;
-	END;
-' LANGUAGE 'plpgsql';

4dev/database/table/edit_access.sql

@@ -8,12 +8,10 @@
 -- DROP TABLE edit_access;
 CREATE TABLE edit_access (
 	edit_access_id	SERIAL PRIMARY KEY,
-	name	VARCHAR UNIQUE,
+	name	VARCHAR(255) UNIQUE,
 	description	VARCHAR,
-	color	VARCHAR,
-	uid	VARCHAR,
-	enabled	SMALLINT NOT NULL DEFAULT 0,
-	protected INT,
-	deleted	SMALLINT DEFAULT 0,
-	additional_acl	JSONB
+	COLOR	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access;
+INSERT INTO edit_access (name) VALUES ('Admin Access');

4dev/database/table/edit_access_data.sql

@@ -11,6 +11,6 @@ CREATE TABLE edit_access_data (
 	edit_access_id INT NOT NULL,
 	name	VARCHAR,
 	value	VARCHAR,
-	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
+	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 
 ) INHERITS (edit_generic) WITHOUT OIDS;

4dev/database/table/edit_access_right.sql

@@ -14,3 +14,14 @@ CREATE TABLE edit_access_right (
 	type VARCHAR,
 	UNIQUE (level,type)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access_right;
+INSERT INTO edit_access_right (name, level, type) VALUES ('Default', -1, 'default');
+INSERT INTO edit_access_right (name, level, type) VALUES ('No Access', 0, 'none');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Read', 20, 'read');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Translator', 30, 'mod_trans');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Modify', 40, 'mod');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Create/Write', 60, 'write');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Delete', 80, 'del');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Site Admin', 90, 'siteadmin');
+INSERT INTO edit_access_right (name, level, type) VALUES ('Admin', 100, 'admin');

4dev/database/table/edit_access_user.sql

@@ -17,3 +17,6 @@ CREATE TABLE edit_access_user (
 	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
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access_user;
+INSERT INTO edit_access_user (edit_default, edit_access_id, edit_user_id, edit_access_right_id) VALUES (1, 1, 1, 8);

4dev/database/table/edit_generic.sql

@@ -7,7 +7,7 @@
 
 -- DROP TABLE edit_generic;
 CREATE TABLE edit_generic (
-	cuid	VARCHAR,
+	eg_status	INT,
 	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
 	date_updated	TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

@@ -8,12 +8,12 @@
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
 	edit_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
+	name	VARCHAR(50),
 	enabled	SMALLINT NOT NULL DEFAULT 0,
-	deleted	SMALLINT DEFAULT 0,
 	edit_scheme_id INT,
 	edit_access_right_id INT NOT NULL,
-	additional_acl	JSONB,
 	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Admin', 1, 2, 8);

4dev/database/table/edit_language.sql

@@ -9,10 +9,12 @@
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
 	edit_language_id SERIAL PRIMARY KEY,
-	short_name VARCHAR,
-	long_name VARCHAR,
-	iso_name VARCHAR,
+	short_name VARCHAR(2),
+	long_name VARCHAR(70),
+	iso_name VARCHAR(12),
 	order_number INT,
 	enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0
+	lang_default SMALLINT NOT NULL DEFAULT 0 UNIQUE
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enabled, lang_default) VALUES ('en', 'English', 'UTF-8', 1, 1, 1);

4dev/database/table/edit_menu_group.sql

@@ -8,9 +8,11 @@
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
 	edit_menu_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR,
+	name	VARCHAR(255),
+	flag	VARCHAR(50),
 	order_number	INT NOT NULL
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
-
+DELETE FROM edit_menu_group;
+INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Menu', 'admin', 1);
+INSERT INTO edit_menu_group (name, flag, order_number) VALUES ('Admin Data Popup Menu', 'AdminDataPopup', 2);

4dev/database/table/edit_page.sql

@@ -2,20 +2,29 @@
 -- DATE: 2005/07/05
 -- DESCRIPTION:
 -- edit tables, this table contains all pages in the edit interface and allocates rights + values to it
--- TABLE: edit_page
+-- TABLE: edit_table
 -- HISTORY:
 
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
 	edit_page_id	SERIAL PRIMARY KEY,
-	content_alias_edit_page_id	INT, -- alias for page content, if the page content is defined on a different page, ege for ajax backend pages
-	filename	VARCHAR,
-	name	VARCHAR UNIQUE,
+	filename	VARCHAR(70),
+	name	VARCHAR(255) UNIQUE,
 	order_number INT NOT NULL,
 	online	SMALLINT NOT NULL DEFAULT 0,
 	menu	SMALLINT NOT NULL DEFAULT 0,
 	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,
+	popup_y SMALLINT
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_page;
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_pages.php', 'Edit Pages', 1, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_users.php', 'Edit Users', 2, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_languages.php', 'Edit Languages', 3, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_schemes.php', 'Edit Schemes', 4, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_groups.php', 'Edit Groups', 5, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_visible_group.php', 'Edit Visible Groups', 6, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_menu_group.php', 'Edit Menu Groups', 7, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_access.php', 'Edit Access', 8, 1, 1);
+INSERT INTO edit_page (filename, name, order_number, online, menu) VALUES ('edit_order.php', 'Edit Order', 9, 1, 0);

4dev/database/table/edit_page_access.sql

@@ -17,4 +17,12 @@ CREATE TABLE edit_page_access (
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
-
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 1, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 2, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 3, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 4, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 5, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 6, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 7, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 8, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 9, 8);

4dev/database/table/edit_page_content.sql

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

4dev/database/table/edit_page_menu_group.sql

@@ -12,3 +12,12 @@ CREATE TABLE edit_page_menu_group (
 	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_menu_group_id) REFERENCES edit_menu_group (edit_menu_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
+
+DELETE FROM edit_page_menu_group;
+INSERT INTO edit_page_menu_group VALUES (1, 1);
+INSERT INTO edit_page_menu_group VALUES (2, 1);
+INSERT INTO edit_page_menu_group VALUES (3, 1);
+INSERT INTO edit_page_menu_group VALUES (4, 1);
+INSERT INTO edit_page_menu_group VALUES (5, 1);
+INSERT INTO edit_page_menu_group VALUES (6, 1);
+INSERT INTO edit_page_menu_group VALUES (7, 1);

4dev/database/table/edit_page_visible_group.sql

@@ -12,3 +12,12 @@ CREATE TABLE edit_page_visible_group (
 	FOREIGN KEY (edit_page_id) REFERENCES edit_page (edit_page_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_visible_group_id) REFERENCES edit_visible_group (edit_visible_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 );
+
+DELETE FROM edit_page_visible_group;
+INSERT INTO edit_page_visible_group VALUES (1, 1);
+INSERT INTO edit_page_visible_group VALUES (2, 1);
+INSERT INTO edit_page_visible_group VALUES (3, 1);
+INSERT INTO edit_page_visible_group VALUES (4, 1);
+INSERT INTO edit_page_visible_group VALUES (5, 1);
+INSERT INTO edit_page_visible_group VALUES (6, 1);
+INSERT INTO edit_page_visible_group VALUES (7, 1);

4dev/database/table/edit_query_string.sql

@@ -8,8 +8,8 @@
 -- DROP TABLE edit_query_string;
 CREATE TABLE edit_query_string (
 	edit_query_string_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	value	VARCHAR,
+	name	VARCHAR(255),
+	value	VARCHAR(255),
 	enabled	SMALLINT NOT NULL DEFAULT 0,
 	dynamic	SMALLINT NOT NULL DEFAULT 0,
 	edit_page_id	INT NOT NULL,

4dev/database/table/edit_scheme.sql

@@ -9,8 +9,12 @@
 CREATE TABLE edit_scheme (
 	edit_scheme_id	SERIAL PRIMARY KEY,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR,
-	header_color	VARCHAR,
-	css_file	VARCHAR,
-	template	VARCHAR
+	name	VARCHAR(50),
+	header_color	VARCHAR(7),
+	css_file	VARCHAR(50),
+	template	VARCHAR(50)
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Default Scheme', '#E0E2FF', 1);
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Admin', '#CC7E7E', 1);
+INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', '#B0C4B3', 1);

4dev/database/table/edit_temp_files.sql

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

4dev/database/table/edit_user.sql

@@ -8,15 +8,9 @@
 -- DROP TABLE edit_user;
 CREATE TABLE edit_user (
 	edit_user_id	SERIAL PRIMARY KEY,
-	connect_edit_user_id	INT, -- possible reference to other user
 	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,
@@ -27,16 +21,18 @@ CREATE TABLE edit_user (
 	edit_scheme_id INT,
 	edit_access_right_id INT NOT NULL,
 	login_error_count	INT,
-	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
+	login_error_date_last	TIMESTAMP WTIHOUT TIME ZONE,
+	login_error_date_first	TIMESTAMP WTIHOUT 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
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+-- inserts admin user so basic users can be created
+DELETE FROM edit_user;
+INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1, 1, 1, 2, 8);

4dev/database/table/edit_visible_group.sql

@@ -8,8 +8,8 @@
 -- DROP TABLE edit_visible_group;
 CREATE TABLE edit_visible_group (
 	edit_visible_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR,
-	flag	VARCHAR
+	name	VARCHAR(255),
+	flag	VARCHAR(50)
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 DELETE FROM edit_visible_group;

4dev/database/trigger/trg_edit_access.sql

@@ -1,9 +1,4 @@
-DROP TRIGGER trg_edit_access ON edit_access;
+-- DROP TRIGGER 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;
-CREATE TRIGGER trg_set_edit_access_uid
-BEFORE INSERT OR UPDATE ON edit_access
-FOR EACH ROW EXECUTE PROCEDURE set_edit_access_uid();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_access_data.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_access_data ON edit_access_data;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_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 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();
+FOR EACH ROW EXECUTE PROCEDURE set_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 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_group.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_group ON edit_group;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_language.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_language ON edit_language;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_log.sql

@@ -1,9 +1,4 @@
-DROP TRIGGER trg_edit_log ON edit_log;
+-- DROP TRIGGER 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;
-CREATE TRIGGER trg_edit_log_insert_partition
-BEFORE INSERT OR UPDATE ON edit_log
-FOR EACH ROW EXECUTE PROCEDURE edit_log_insert_trigger();
+FOR EACH ROW EXECUTE PROCEDURE set_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 trg_edit_visible_group ON edit_visible_group;
 CREATE TRIGGER trg_edit_menu_group
 BEFORE INSERT OR UPDATE ON edit_menu_group
-FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_page.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_page ON edit_page;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_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 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_page_content.sql

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

4dev/database/trigger/trg_edit_query_string.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_query_string ON edit_query_string;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_scheme.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_scheme ON edit_scheme;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_edit_user.sql

@@ -1,4 +1,4 @@
-DROP TRIGGER trg_edit_user ON edit_user;
+-- DROP TRIGGER 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();
+FOR EACH ROW EXECUTE PROCEDURE set_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 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();
+FOR EACH ROW EXECUTE PROCEDURE set_generic();

4dev/database/trigger/trg_set_edit_access_uid.sql

@@ -0,0 +1,4 @@
+-- DROP TRIGGER 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/update/edit_update_missing_cuid.sql

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

4dev/lang/admin/messages_ja_utf8.po

@@ -1,66 +0,0 @@
-# ********************************************************************
-# AUTHOR: Clemens Schwaighofer
-# CREATED: 2018/03/28
-# SHORT DESCRIPTION:
-# Backend Japanese Messages file for gettext
-# to craete: msgfmt -o ja.mo messages_ja.po
-# HISTORY:
-# ********************************************************************/
-
-msgid ""
-msgstr ""
-"Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Yes"
-msgstr "はい"
-
-msgid "No"
-msgstr "いいえ"
-
-# Basic date info
-msgid "Year"
-msgstr "年"
-
-msgid "Month"
-msgstr "月"
-
-msgid "Day"
-msgstr "日"
-
-msgid "Hour"
-msgstr "時"
-
-msgid "Minute"
-msgstr "分"
-
-msgid "Mon"
-msgstr "月"
-
-msgid "Tue"
-msgstr "火"
-
-msgid "Wed"
-msgstr "水"
-
-msgid "Thu"
-msgstr "木"
-
-msgid "Fri"
-msgstr "金"
-
-msgid "Sat"
-msgstr "土"
-
-msgid "Sun"
-msgstr "日"
-
-msgid "INPUT TEST"
-msgstr "OUTPUT TEST JA"

4dev/sync/sync_template.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
 # create path
-path=$(pwd)"/"$0;
+path=`pwd`"/"$0;
 
 LOCAL_BASE_DIR="<local folder>";
 LOCAL_DIR=$LOCAL_BASE_DIR"";
 REMOTE_WEB="<remote folder>";
-TARGET_HOST_WEB="<user>@<host>";
-TMP_DIR=$LOCAL_BASE_DIR"/4dev/tmp/";
-tmpf_web=$TMP_DIR"sync.exclude.tmp";
+TARGET_HOST_WEB="<user>@<host>
+TMP_DIR=$LOCAL_BASE_DIR"/4dev/";
+tmpf_web=$TMP_DIR"tmp.web";
 
 # for web (ika)
 rm -f $tmpf_web;

4dev/update/20180323_namespace/comp_func.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-OIFS=${IFS};
-base_dir="/home/clemens/html/developers/clemens/core_data/php_libraries/trunk/";
-class_file="CoreLibs/Output/Form/Generate.inc";
-tmp_file=${base_dir}"4dev/tmp/tmp.comp."$(echo "${class_file}" | tr \/. _);
-rpl_file=${base_dir}"4dev/tmp/tmp.rpl."$(echo "${class_file}" | tr \/. _);
-rm -f "${tmp_file}";
-rm -f "${rpl_file}";
-if [ ! -f ${class_file} ];
-then
-    echo "Cannot find ${class_file} in current folder: $(pwd)";
-    exit;
-fi;
-cat "${class_file}" | grep "WAS   :" -B 1 | while read line;
-do
-    # if method grep for function call
-    found=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "METHOD:");
-    if [ -n "${found}" ];
-    then
-        method=$(echo "${line}" | cut -d " " -f 3);
-        echo "1 MET: ${method}";
-        # is method
-        if [ -n "${method}" ];
-        then
-            # the full new call
-            new_function_call_full=$(grep "function ${method}(" "${class_file}" | grep "function" | sed -e 's/^[ \t]*//');
-            # just the method name
-            new_function_call=$(echo "${new_function_call_full}" | sed -e 's/public //' | sed -e 's/private //' | sed -e 's/static //' | sed -e 's/function //' | cut -d "(" -f 1);
-            # check if func call is more than just alphanumeric (we don't need to redeclare those, functions are case insenstivie)
-            #
-            # only params (remove all = ... stuff)
-            new_function_call_params=$(echo "${new_function_call_full}" | cut -d "(" -f 2- | sed -e 's/)//');
-            old_function_call_params='';
-            IFS=',';
-            for el in ${new_function_call_params};
-            do
-                if [ -n "${old_function_call_params}" ];
-                then
-                    old_function_call_params=${old_function_call_params}", ";
-                fi;
-                old_function_call_params=${old_function_call_params}$(echo "${el}" | cut -d "=" -f 1 | tr -d ' ');
-            done;
-            # cut -d "," "${new_function_call_params}" | while
-        fi;
-    fi;
-    # if this is a WAS
-    was=$(echo "${line}" | sed -e 's/^[ \t]*//' | grep "WAS   :" | tr -s " ");
-    if [ -n "${was}" ];
-    then
-        old_function_call=$(echo "${was}" | cut -d " " -f 4)
-        echo "2 OLD: ${old_function_call} => ${new_function_call} [${new_function_call_full}]";
-        # for return write:
-        # rpl new -> old { new }
-        rpl=$(echo "${new_function_call_full}" | sed -e "s/${new_function_call}/${old_function_call}/");
-        new_call="${rpl}\n";
-        new_call=${new_call}"{\n";
-        new_call=${new_call}"\terror_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);\n";
-        new_call=${new_call}"\treturn \$this->${new_function_call}(${old_function_call_params});\n";
-        new_call=${new_call}"}\n";
-        echo -e "${new_call}" >> "${tmp_file}";
-        echo "3A RPL CALL: ${rpl}";
-        echo "3B RPL CALL: return \$this->${new_function_call}(${old_function_call_params});";
-        echo "4  SWT RPL : rpl '\$this->${old_function_call}' '\$this->${new_function_call}'";
-        # write the replace calls for old $this->old_call to $this->new_call
-        echo "rpl '\$this->${old_function_call}' '\$this->${new_function_call}' ##TARGET_FILE##" >> "${rpl_file}";
-        echo "----";
-    fi;
-done;
-IFS=${OIFS};
-
-# __END__

4dev/update/20180323_namespace/rpl_old_method_in_file.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cat tmp.comp | while read i;
-do
-	found=$(echo "${i}" | grep "function ");
-	if [ -n "${found}" ]; then
-		fk=$(echo "${i}" | cut -d " " -f 3 | cut -d "(" -f 1);
-	fi;
-	found=$(echo "${i}" | grep "\$this->");
-	if [ -n "${found}" ]; then
-		# no to debug
-		found=$(echo "${i}" | grep "debug(");
-		if [ -z "${found}" ]; then
-			fk_n=$(echo "${i}" | cut -d "(" -f 1);
-			echo "rpl '\$this->${fk}' '${fk_n}' CoreLibs/DB/IO.inc";
-		fi;
-	fi;
-done;

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

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

README.md

@@ -14,14 +14,12 @@ There are three branches:
 
 ### master
 
-The active branch, which is the namespace branch
+This is currently the legacy branch set live. This will change to the namespace branch once development is finished
 
 ### legacy
 
-The old non namepsace format layout.
-This is fully deprecated and will no longer be maintaned.
-last tested PHP 5.6 and PHP 7.0
+The old non namepsace format layout. This will only get bug fixes and no new development
 
 ### namespace
 
-The new namespace branch. This is the development area for the master branch
+The new namespace branch. Once development is finished this branch will be removed or renamed to development only branch

phpstan-bootstrap.php

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

phpstan.neon

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

static_checkers.txt

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

www/Smarty

@@ -0,0 +1 @@
+smarty-3.1.30

www/admin/.htaccess

@@ -1,4 +1,3 @@
-# all .inc files are denied access from outside
-<Files "*.inc">
-	Require all denied
-</Files>
+php_value xdebug.profiler_output_dir /home/developer/html/adidas/20081208_catalogue/4dev/xdebug/
+php_value xdebug.profiler_output_name timestamp 
+php_value xdebug.profiler_enable 0

www/admin/Smarty

@@ -0,0 +1 @@
+../Smarty

www/admin/cache

@@ -0,0 +1 @@
+../cache/

www/admin/class_test.php

@@ -1,8 +1,4 @@
-<?php declare(strict_types=1);
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
+<?
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
 $PRINT_ALL = 1;
@@ -12,55 +8,35 @@ if ($DEBUG_ALL) {
 	error_reporting(E_ALL | E_STRICT | E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
 }
 
-ob_start();
-
-// basic class test file
 define('USE_DATABASE', true);
 // sample config
-require 'config.php';
+require("config.inc");
 // set session name
-if (!defined('SET_SESSION_NAME')) {
-	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+//	session_name(EDIT_SESSION_NAME);
+//	session_start();
+// basic class test file
+foreach (array ('Login', 'Admin.Backend') as $class) {
+	_spl_autoload('Class.'.$class.'.inc');
 }
-// 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);
-$basic->dbInfo(true);
-ob_end_flush();
-
-echo "DB_CONFIG_SET constant: <pre>".print_r(DB_CONFIG, true)."</pre><br>";
-
-$basic->hrRunningTime();
-$basic->runningTime();
-echo "RANDOM KEY [50]: ".$basic->randomKeyGen(50)."<br>";
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
-echo "TIMED [def]: ".$basic->runningTime()."<br>";
-echo "TIMED [string]: ".$basic->runningtime_string."<br>";
-$basic->hrRunningTime();
-echo "RANDOM KEY [default]: ".$basic->randomKeyGen()."<br>";
-echo "TIMED [hr]: ".$basic->hrRunningTime()."<br>";
-
-// color
-print "COLOR: -1, -1, -1: ".$basic->rgb2hex(-1, -1, -1)."<br>";
-print "COLOR: 10, 20, 30: ".$basic->rgb2hex(10, 20, 30)."<br>";
+DEFINE('LOG_FILE_ID', 'classTest');
+$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+// init with standard
+//	$basic = new db_io($DB_CONFIG[MAIN_DB]);
+$basic = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
+$basic->db_info(1);
 
 // set + check edit access id
 $edit_access_id = 3;
-if (is_object($login) && isset($login->acl['unit'])) {
-	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), true)."<br>";
-	print "ACCESS CHECK: ".(string)$login->loginCheckEditAccess($edit_access_id)."<br>";
-	if ($login->loginCheckEditAccess($edit_access_id)) {
-		$basic->edit_access_id = $edit_access_id;
-	} else {
-		$basic->edit_access_id = $login->acl['unit_id'];
-	}
+print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
+print "ACCESS CHECK: ".$login->login_check_edit_access($edit_access_id)."<br>";
+if ($login->login_check_edit_access($edit_access_id)) {
+	$basic->edit_access_id = $edit_access_id;
 } else {
-	print "Something went wrong with the login<br>";
+	$basic->edit_access_id = $login->acl['unit_id'];
 }
 
 //	$basic->debug('SESSION', $basic->print_ar($_SESSION));
@@ -83,81 +59,64 @@ print "DEBUG OUT ALL: ".$basic->debug_output_all."<br>";
 print "ECHO OUT ALL: ".$basic->echo_output_all."<br>";
 print "PRINT OUT ALL: ".$basic->print_output_all."<br>";
 
-print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
+print "CALLER BACKTRACE: ".$basic->get_caller_method()."<br>";
 $basic->debug('SOME MARK', 'Some error output');
 
 print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
-if (is_object($login)) {
-	//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
-	$basic->debug('ACL', "ACL: ".$basic->printAr($login->acl));
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
-	//	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
-	//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
-	// DEPRICATED CALL
-	//	$basic->adbSetACL($login->acl);
-}
+//	print "ACL: <br>".$basic->print_ar($login->acl)."<br>";
+$basic->debug('ACL', "ACL: ".$basic->print_ar($login->acl));
+//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
+//	print "DEFAULT ACL: <br>".$basic->print_ar($login->default_acl_list)."<br>";
+//	$result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
+//	print "DEFAULT ACL: <br>".$basic->print_ar($result)."<br>";
+// DEPRICATED CALL
+//	$basic->adbSetACL($login->acl);
 
-// DB client encoding
-print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
-
-while ($res = $basic->dbReturn("SELECT * FROM max_test", 0, true)) {
+while ($res = $basic->db_return("SELECT * FROM max_test")) {
 	print "TIME: ".$res['time']."<br>";
 }
-print "CACHED DATA: <pre>".print_r($basic->cursor_ext, true)."</pre><br>";
-while ($res = $basic->dbReturn("SELECT * FROM max_test")) {
-	print "[CACHED] TIME: ".$res['time']."<br>";
-}
 
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
-$basic->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
-$status = $basic->dbExecute("ins_foo", array('BAR TEST '.time()));
-print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>";
+$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
+$basic->db_prepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
+$status = $basic->db_execute("ins_foo", array('BAR TEST '.time()));
+print "PREPARE INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>";
 // returning test with multiple entries
 //	$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
-$status = $basic->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
-print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, true)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
+$status = $basic->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->insert_id, 1)." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
 // no returning, but not needed ;
-$status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
-print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, true)."<br>";
-// UPDATE WITH RETURNING
-$status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
-print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext, true)."<br>";
+$status = $basic->db_exec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
 
 # db write class test
 $table = 'foo';
-print "TABLE META DATA: ".$basic->printAr($basic->dbShowTableMetaData($table))."<br>";
+print "TABLE META DATA: ".$basic->print_ar($basic->db_show_table_meta_data($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);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->db_write_data_ext($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);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->db_write_data_ext($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);
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->db_write_data_ext($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());
-$primary_key = $basic->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$primary_key = $basic->db_write_data_ext($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
 print "Wrote to DB tabel $table and got primary key $primary_key<br>";
 
-// return Array Test
-$query = "SELECT type, sdate, integer FROM foobar";
-$data = $basic->dbReturnArray($query, true);
-print "Full foobar list: <br><pre>".print_r($data, true)."</pre><br>";
-
 # async test queries
-/*	$basic->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
+/*	$basic->db_exec_async("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
 echo "WAITING FOR ASYNC: ";
 $chars = array('|', '/', '-', '\\');
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $basic->db_check_async()) === true)
 {
 	if ((list($_, $char) = each($chars)) === FALSE)
 	{
@@ -169,80 +128,68 @@ while (($ret = $basic->dbCheckAsync()) === true)
 	flush();
 }
 print "<br>END STATUS: ".$ret."<br>";
-//	while ($res = $basic->dbFetchArray($ret))
-while ($res = $basic->dbFetchArray())
+//	while ($res = $basic->db_fetch_array($ret))
+while ($res = $basic->db_fetch_array())
 {
 	echo "RES: ".$res['test']."<br>";
 }
 # test async insert
-$basic->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+$basic->db_exec_async("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
 echo "WAITING FOR ASYNC INSERT: ";
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $basic->db_check_async()) === true)
 {
 	print ".";
 	sleep(1);
 	flush();
 }
 print "<br>END STATUS: ".$ret." | PK: ".$basic->insert_id."<br>";
-print "ASYNC PREVIOUS INSERTED: ".print_r($basic->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), true)."<br>"; */
+print "ASYNC PREVIOUS INSERTED: ".print_r($basic->db_return_row("SELECT foo_id, test FROM foo WHERE foo_id = ".$basic->insert_id), 1)."<br>"; */
 
 $to_db_version = '9.1.9';
-print "VERSION DB: ".$basic->dbVersion()."<br>";
-print "DB Version smaller $to_db_version: ".$basic->dbCompareVersion('<'.$to_db_version)."<br>";
-print "DB Version smaller than $to_db_version: ".$basic->dbCompareVersion('<='.$to_db_version)."<br>";
-print "DB Version equal $to_db_version: ".$basic->dbCompareVersion('='.$to_db_version)."<br>";
-print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$to_db_version)."<br>";
-print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
+print "VERSION DB: ".$basic->db_version()."<br>";
+print "DB Version smaller $to_db_version: ".$basic->db_compare_version('<'.$to_db_version)."<br>";
+print "DB Version smaller than $to_db_version: ".$basic->db_compare_version('<='.$to_db_version)."<br>";
+print "DB Version equal $to_db_version: ".$basic->db_compare_version('='.$to_db_version)."<br>";
+print "DB Version bigger than $to_db_version: ".$basic->db_compare_version('>='.$to_db_version)."<br>";
+print "DB Version bigger $to_db_version: ".$basic->db_compare_version('>'.$to_db_version)."<br>";
 
 /*	$q = "SELECT FOO FRO BAR";
-// $q = "Select * from foo";
-$foo = $basic->dbExecAsync($q);
+//	$q = "Select * from foo";
+$foo = $basic->db_exec_async($q);
 print "[ERR] Query: ".$q."<br>";
 print "[ERR] RESOURCE: $foo<br>";
-while (($ret = $basic->dbCheckAsync()) === true)
+while (($ret = $basic->db_check_async()) === true)
 {
 	print "[ERR]: $ret<br>";
-	sleep(5);
+//		sleep(5);
 } */
 
 // search path check
 $q = "SHOW search_path";
-$cursor = $basic->dbExec($q);
-$data = $basic->dbFetchArray($cursor)['search_path'];
+$cursor = $basic->db_exec($q);
+$data = $basic->db_fetch_array($cursor)['search_path'];
 print "RETURN DATA FOR search_path: ".$data."<br>";
-//	print "RETURN DATA FOR search_path: ".$basic->printAr($data)."<br>";
+//	print "RETURN DATA FOR search_path: ".$basic->print_ar($data)."<br>";
 // insert something into test.schema_test and see if we get the PK back
-$status = $basic->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
+$status = $basic->db_exec("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>";
 
 // time string thest
 $timestamp = 5887998.33445;
-$time_string = $basic->timeStringFormat($timestamp);
-print "PLANE TIME STRING: ".$timestamp."<br>";
+$time_string = $basic->TimeStringFormat($timestamp);
 print "TIME STRING TEST: ".$time_string."<br>";
-print "REVERSE TIME STRING: ".$basic->stringToTime($time_string)."<br>";
-if (round($timestamp, 4) == $basic->stringToTime($time_string)) {
-	print "REVERSE TIME STRING MATCH<br>";
-} else {
-	print "REVERSE TRIME STRING DO NOT MATCH<br>";
-}
+print "REVERSE TIME STRING: ".$basic->StringToTime($time_string);
 
 // magic links test
-print $basic->magicLinks('user@bubu.at').'<br>';
-print $basic->magicLinks('http://test.com/foo/bar.php?foo=1').'<br>';
+print $basic->magic_links('user@bubu.at').'<br>';
+print $basic->magic_links('http://test.com/foo/bar.php?foo=1').'<br>';
 
 // compare date
 $date_1 = '2017/1/5';
 $date_2 = '2017-01-05';
-print "COMPARE DATE: ".$basic->compareDate($date_1, $date_2)."<br>";
-
-
-// array re
+print "COMPARE DATE: ".$basic->CompareDate($date_1, $date_2)."<br>";
 
 // print error messages
-// print $login->printErrorMsg();
-print $basic->printErrorMsg();
+print $basic->print_error_msg();
 
 print "</body></html>";
-
-# __END__

www/admin/config.inc

@@ -0,0 +1 @@
+../configs/config.inc

www/admin/config.php

@@ -1 +0,0 @@
-../configs/config.php

www/admin/edit_access.php

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

www/admin/edit_base.inc

@@ -0,0 +1,324 @@
+<?
+/********************************************************************
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
+* CREATED: 2003/06/10
+* SHORT DESCRIPTION:
+*	central include for all edit_pages
+*	 - edit_groups.php
+*	 - edit_languages.php
+*	 - edit_pages.php
+*	 - edit_schemes.php
+*	 - edit_users.php
+*	 - edit_visible_group.php
+* HISTORY:
+* 2005/06/30 (cs) remove color settings, they are in CSS File now
+* 2005/06/22 (cs) moved load of config array into form class, set lang and lang is must set var for form class; removed the page name setting, moved it into the form class, remove all HTML from main page
+* 2004/09/30 (cs) changed layout to fit default layout & changed LIBS, etc
+* 2003-06-10: creation of this page
+*********************************************************************/
+
+$DEBUG_ALL = 1;
+$DB_DEBUG = 1;
+
+extract($_POST, EXTR_SKIP);
+
+$table_width = 750;
+// this is for certain CMS modules that set a relative path
+define(REL_PATH, '');
+
+ob_start();
+include("config.inc");
+// overrride debug flags
+if (!DEBUG)	{
+	$DEBUG_ALL = 0;
+	$PRINT_ALL = 0;
+	$DB_DEBUG = 0;
+	$ECHO_ALL = 0;
+//		$DEBUG_TMPL = 0;
+}
+// set session name here
+define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+// login class
+require(LIBS."Class.Login.inc");
+// form generate for edit interface
+require(LIBS."Class.Form.Generate.inc");
+// Smarty: and the small extend for l10n calls
+require(LIBS.'Class.Smarty.Extend.inc');
+
+// set default lang if not set otherwise
+if (!$lang) {
+	$lang = DEFAULT_LANG;
+}
+// should be utf8
+header("Content-type: text/html; charset=".DEFAULT_ENCODING);
+ob_end_flush();
+$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+
+// create form class
+$form = new form($DB_CONFIG[MAIN_DB], $lang);
+$form->db_exec("SET search_path TO ".LOGIN_DB_SCHEMA);
+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 SmartyML($lang);
+
+if (TARGET == 'live' || TARGET == 'remote') {
+	// login
+	$login->debug_output_all = DEBUG ? 1 : 0;
+	$login->echo_output_all = 0;
+	$login->print_output_all = DEBUG ? 1 : 0;
+	// form
+	$form->debug_output_all = DEBUG ? 1 : 0;
+	$form->echo_output_all = 0;
+	$form->print_output_all = DEBUG ? 1 : 0;
+}
+// set the template dir
+// WARNING: this has a special check for the mailing tool layout (old layout)
+if (defined('LAYOUT')) {
+	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+	$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
+	$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
+} else {
+	$smarty->setTemplateDir(TEMPLATES.DEFAULT_TEMPLATE);
+	$DATA['css'] = CSS.DEFAULT_TEMPLATE;
+	$DATA['js'] = JS.DEFAULT_TEMPLATE;
+}
+
+// space for setting special debug flags
+$login->debug_output_all = 1;
+
+// define edit logging function. should be in a special edit interface class later
+// METHOD: EditLog()
+// PARAMS: event -> any kind of event description, data -> any kind of data related to that event
+// RETURN: none
+// DESC:   writes all action vars plus other info into edit_log table
+function EditLog($event = '', $data = '')
+{
+	$q = "INSERT INTO edit_log ";
+	$q .= "(euid, event_date, ip, event, data, page) ";
+	$q .= "VALUES (".$_SESSION['EUID'].", NOW(), '".$_SERVER["REMOTE_ADDR"]."', '".$GLOBALS['form']->db_escape_string($event)."', '".$GLOBALS['form']->db_escape_string($data)."', '".$GLOBALS['form']->get_page_name()."')";
+}
+
+// log backend data
+// data part creation
+$data = array (
+	'_SESSION' => $_SESSION,
+	'_GET' => $_GET,
+	'_POST' => $_POST,
+	'_FILES' => $_FILES
+);
+// log action
+EditLog('Edit Submit', serialize($data));
+
+$form->form_procedure_load(${$form->archive_pk_name});
+$form->form_procedure_new();
+$form->form_procedure_save();
+$form->form_procedure_delete();
+$form->form_procedure_delete_from_element_list($element_list, $remove_name);
+
+// define all needed smarty stuff for the general HTML/page building
+$HEADER['CSS'] = CSS;
+$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
+$HEADER['JS'] = JS;
+$HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
+$HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
+
+$DATA['table_width'] = $table_width;
+
+// write out error / status messages
+$messages[] = $form->form_error_msg();
+$DATA['form_error_msg'] = $messages;
+
+// MENU START
+// request some session vars
+if (!$HEADER_COLOR) {
+	$DATA['HEADER_COLOR'] = "#E0E2FF";
+} else {
+	$DATA['HEADER_COLOR'] = $_SESSION['HEADER_COLOR'];
+}
+$DATA['USER_NAME'] = $_SESSION["USER_NAME"];
+$DATA['EUID'] = $_SESSION["EUID"];
+$DATA['GROUP_NAME'] = $_SESSION["GROUP_NAME"];
+$DATA['GROUP_LEVEL'] = $_SESSION["GROUP_LEVEL"];
+$PAGES = $_SESSION["PAGES"];
+
+//$form->debug('menu', $form->print_ar($PAGES));
+
+// baue nav aus $PAGES ...
+for ($i = 0; $i < count($PAGES); $i ++) {
+	if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) {
+		$menuarray[] = $PAGES[$i];
+	}
+}
+
+// split point for nav points
+$COUNT_NAV_POINTS = count($menuarray);
+$SPLIT_FACTOR = 3;
+$START_SPLIT_COUNT = 3;
+// WTF ?? I dunno what I am doing here ...
+for ($i = 9; $i < $COUNT_NAV_POINTS; $i += $START_SPLIT_COUNT) {
+	if ($COUNT_NAV_POINTS > $i) {
+		$SPLIT_FACTOR += 1;
+	}
+}
+
+for ($i = 1; $i <= count($menuarray); $i ++) {
+	// do that for new array
+	$j = $i - 1;
+	$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]["page_name"]);
+	$menu_data[$j]['filename'] = $menuarray[($i-1)]["filename"].$menuarray[($i-1)]["query_string"];
+	if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) {
+		$menu_data[$j]['splitfactor_in'] = 1;
+	}
+	if ($menuarray[($i - 1)]["filename"] == $form->get_page_name()) {
+		$position = $i - 1;
+		$menu_data[$j]['position'] = 1;
+	} else {
+		// add query stuff
+		// HAS TO DONE LATER ... set urlencode, etc ...
+		// check if popup needed
+		if ($menuarray[($i - 1)]["popup"]) {
+			$menu_data[$j]['popup'] = 1;
+			$menu_data[$j]['rand'] = uniqid(rand());
+			$menu_data[$j]['width'] = $menuarray[($i-1)]["popup_x"];
+			$menu_data[$j]['height'] = $menuarray[($i-1)]["popup_y"];
+		} // popup or not
+	} // highlight or not
+	if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) {
+		$menu_data[$j]['splitfactor_out'] = 1;
+	} // split
+} // for
+$DATA['menu_data'] = $menu_data;
+$DATA['page_name'] = $menuarray[$position]["page_name"];
+$L_TITLE = $DATA['page_name'];
+// html title
+$HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $form->l->__($G_TITLE) : $form->l->__($L_TITLE));
+// END MENU
+// LOAD AND NEW
+$DATA['load'] = $form->form_create_load();
+$DATA['new'] = $form->form_create_new();
+// SHOW DATA PART
+if ($form->yes) {
+	$DATA['form_yes'] = $form->yes;
+	$DATA['form_my_page_name'] = $form->my_page_name;
+
+	// depending on the "get_page_name()" I show different stuff
+	switch ($form->my_page_name) {
+		case "edit_users":
+			$elements[] = $form->form_create_element("login_error_count");
+			$elements[] = $form->form_create_element("login_error_date_last");
+			$elements[] = $form->form_create_element("login_error_date_first");
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("username");
+			$elements[] = $form->form_create_element("password");
+			$elements[] = $form->form_create_element("password_change_interval");
+			$elements[] = $form->form_create_element("email");
+			$elements[] = $form->form_create_element("last_name");
+			$elements[] = $form->form_create_element("first_name");
+			$elements[] = $form->form_create_element("edit_group_id");
+			$elements[] = $form->form_create_element("edit_access_right_id");
+			$elements[] = $form->form_create_element("strict");
+			$elements[] = $form->form_create_element("locked");
+			$elements[] = $form->form_create_element("admin");
+			$elements[] = $form->form_create_element("debug");
+			$elements[] = $form->form_create_element("db_debug");
+			$elements[] = $form->form_create_element("edit_language_id");
+			$elements[] = $form->form_create_element("edit_scheme_id");
+			$elements[] = $form->form_show_list_table("edit_access_user");
+			break;
+		case "edit_schemes":
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("header_color");
+			$elements[] = $form->form_create_element("template");
+			break;
+		case "edit_pages":
+			if (!$form->table_array["edit_page_id"]["value"]) {
+				$q = "DELETE FROM temp_files";
+				$form->db_exec($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->db_escape_string($output[$i])."')";
+					$form->db_exec($q.$t_q, 'NULL');
+				}
+				$elements[] = $form->form_create_element("filename");
+			} else {
+				// show file menu
+				// just show name of file ...
+				$DATA['filename_exist'] = 1;
+				$DATA['filename'] = $form->table_array["filename"]["value"];
+			} // File Name View IF
+			$elements[] = $form->form_create_element("name");
+			// $elements[] = $form->form_create_element("tag");
+			// $elements[] = $form->form_create_element("min_acl");
+			$elements[] = $form->form_create_element("order_number");
+			$elements[] = $form->form_create_element("online");
+			$elements[] = $form->form_create_element("menu");
+			$elements[] = $form->form_show_list_table("edit_query_string");
+			$elements[] = $form->form_create_element("popup");
+			$elements[] = $form->form_create_element("popup_x");
+			$elements[] = $form->form_create_element("popup_y");
+			$elements[] = $form->form_show_reference_table("edit_visible_group");
+			$elements[] = $form->form_show_reference_table("edit_menu_group");
+			break;
+		case "edit_languages":
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("short_name");
+			$elements[] = $form->form_create_element("long_name");
+			$elements[] = $form->form_create_element("iso_name");
+			break;
+		case "edit_groups":
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("edit_access_right_id");
+			$elements[] = $form->form_create_element("edit_scheme_id");
+			$elements[] = $form->form_show_list_table("edit_page_access");
+			break;
+		case "edit_visible_group":
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("flag");
+			break;
+		case "edit_menu_group":
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("flag");
+			$elements[] = $form->form_create_element("order_number");
+			break;
+		case "edit_access":
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("color");
+			$elements[] = $form->form_create_element("description");
+			// add name/value list here
+			$elements[] = $form->form_show_list_table("edit_access_data");
+			break;
+		default:
+			print "[No valid page definition given]";
+			break;
+	}
+//		$form->debug('edit', "Elements: <pre>".$form->print_ar($elements));
+	$DATA['elements'] = $elements;
+	$DATA['hidden'] = $form->form_create_hidden_fields();
+	$DATA['save_delete'] = $form->form_create_save_delete();
+}
+
+// debug data, if DEBUG flag is on, this data is print out
+$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
+
+// create main data array
+$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
+// data is 1:1 mapping (all vars, values, etc)
+while (list($key, $value) = each($CONTENT_DATA)) {
+	$smarty->assign($key, $value);
+}
+
+//	$smarty->assign('popup_page', 'mt_popup_'.$body_part.'.tpl');
+
+$smarty->display('edit_body.tpl');
+
+// debug output
+echo $login->print_error_msg();
+echo $form->print_error_msg();

www/admin/edit_groups.php

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

www/admin/edit_languages.php

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

www/admin/edit_menu_group.php

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

www/admin/edit_order.php

@@ -1 +0,0 @@
-../includes/edit_base.php

www/admin/edit_order.php

@@ -0,0 +1,209 @@
+<?
+	/********************************************************************
+	* AUTHOR: Clemens Schwaighofer
+	* CREATED: 2001/07/11
+	* SHORT DESCRIPTION:
+	* sets the order from a table (edit_)
+	* HISTORY:
+	* 2005/07/11 (cs) adept to new edit interface
+	* 2002-10-18: little include changes
+	* 2001-07-11: erste Version
+	**********************************************************************/
+
+	$DEBUG_ALL = 1;
+	$DB_DEBUG = 1;
+
+	extract($_GET, EXTR_SKIP);
+	extract($_POST, EXTR_SKIP);
+
+	include("config.inc");
+	// overrride debug flags
+	if (!DEBUG)
+	{
+		$DEBUG_ALL = 0;
+		$PRINT_ALL = 0;
+		$DB_DEBUG = 0;
+		$ECHO_ALL = 0;
+//		$DEBUG_TMPL = 0;
+	}
+	// set session name
+	define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+	require(LIBS."Class.Login.inc");
+	require(LIBS.'Class.Smarty.Extend.inc');
+
+	// default lang
+	if (!$lang)
+		$lang = DEFAULT_LANG;
+
+	$table_width = 600;
+	if (!$table_width)
+		$table_width = PAGE_WIDTH;
+
+	ob_end_flush();
+	$login = new login($DB_CONFIG[LOGIN_DB], $lang);
+	$db = new db_io($DB_CONFIG[MAIN_DB]);
+	$db->db_exec("SET search_path TO ".LOGIN_DB_SCHEMA);
+	$smarty = new SmartyML($lang);
+	if (TARGET == 'live' || TARGET == 'remote')
+	{
+		// login
+		$login->debug_output_all = DEBUG ? 1 : 0;
+		$login->echo_output_all = 0;
+		$login->print_output_all = DEBUG ? 1 : 0;
+		// form
+		$db->debug_output_all = DEBUG ? 1 : 0;
+		$db->echo_output_all = 0;
+		$db->print_output_all = DEBUG ? 1 : 0;
+	}
+	// set the template dir
+	if (defined('LAYOUT'))
+	{
+		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+		$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
+		$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
+	}
+	else
+	{
+		$smarty->setTemplateDir(TEMPLATES.DEFAULT_TEMPLATE);
+		$DATA['css'] = CSS.DEFAULT_TEMPLATE;
+		$DATA['js'] = JS.DEFAULT_TEMPLATE;
+	}
+
+	// order name is _always_ order_number for the edit interface
+
+	// follwing arrays do exist here:
+	// $position ... has the positions of the array (0..max), cause in a <select> I can't put an number into the array field, in this array, there are the POSITION stored, that should CHANGE there order (up/down)
+	// $row_data_id ... has ALL ids from the sorting part
+	// $row_data_order ... has ALL order positions from the soirting part
+	if (count($position))
+	{
+		$original_id = $row_data_id;
+
+		// FIRST u have to put right sort, then read again ...
+		if ($up && $position[0] > 0) // hast to be >0 or the first one is selected and then there is no move
+		{
+			for ($i = 0; $i < count($position); $i++)
+			{
+				// change position order
+				// this gets temp, id before that, gets actual (moves one "down")
+				// 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];
+				$row_data_id[$position[$i]-1] = $temp_id;
+//echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")<br>";
+			} // for
+		} // if up
+
+		if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) // the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+		{
+			for ($i = count($position) - 1; $i >= 0; $i --)
+			{
+				// same as up, just up in other way, starts from bottom (last element) and moves "up"
+				// element before actuel gets temp, this element, becomes element after this,
+				// element after this, gets this
+				$temp_id = $row_data_id[$position[$i] + 1];
+				$row_data_id[$position[$i] + 1] = $row_data_id[$position[$i]];
+				$row_data_id[$position[$i]] = $temp_id;
+			} // for
+		} // if down
+
+		// write data ... (which has to be abstrackt ...)
+		if (($up && $position[0] > 0) || ($down && ($position[count($position) - 1]!=(count($row_data_id) - 1))))
+		{
+			for ($i = 0;$i < count($row_data_id); $i ++)
+			{
+//				$q="UPDATE broschueren SET broschuere_order=".$row_data_order[$i]." WHERE unique_id='".$row_data_id[$i]."'";
+				$q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
+//echo "Q: $q<br>";
+				$q = $db->db_exec($q);
+			} // for all article ids ...
+		} // if write
+	} // if there is something to move
+
+	// get ...
+	$q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
+	if ($where_string)
+		$q .= "WHERE $where_string ";
+	$q .= "ORDER BY order_number";
+
+	while ($res = $db->db_return($q))
+	{
+		$row_data[] = array (
+			"id" => $res[$table_name."_id"],
+			"name" => $res["name"],
+			"order" => $res["order_number"]
+		);
+	} // while read data ...
+
+	// define all needed smarty stuff for the general HTML/page building
+	$DATA['css'] = LAYOUT.DEFAULT_TEMPLATE.CSS;
+	$DATA['js'] = LAYOUT.DEFAULT_TEMPLATE.JS;
+	$HEADER['CSS'] = CSS;
+	$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
+	$HEADER['JS'] = JS;
+	$HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
+	$HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
+	// html title
+	$HEADER['HTML_TITLE'] = ((!$L_TITLE) ? $smarty->l10n->__($G_TITLE) : $smarty->l10n->__($L_TITLE));
+
+	$DATA['table_width'] = $table_width;
+
+	// error msg
+	if ($error)
+	{
+		$messages[] = array('msg' => $msg, 'class' => 'error', 'width' => $table_width);
+	}
+	$DATA['form_error_msg'] = $messages;
+
+	// all the row data
+	$options_id = array();
+	$options_name = array();
+	$options_selected = array();
+	for ($i = 0; $i < count($row_data); $i ++)
+	{
+		$options_id[] = $i;
+		$options_name[] = $row_data[$i]["name"];
+		// list of points to order
+		for ($j = 0; $j < count($position); $j++)
+		{
+			// if matches, put into select array
+			if ($original_id[$position[$j]] == $row_data[$i]["id"])
+				$options_selected[] = $i;
+		}
+	}
+	$DATA['options_id'] = $options_id;
+	$DATA['options_name'] = $options_name;
+	$DATA['options_selected'] = $options_selected;
+
+	// hidden list for the data (id, order number)
+	$row_data_id = array();
+	$row_data_order = array();
+	for ($i = 0; $i < count($row_data); $i++)
+	{
+		$row_data_id[] = $row_data[$i]["id"];
+		$row_data_order[] = $row_data[$i]["order"];
+	}
+	$DATA['row_data_id'] = $row_data_id;
+	$DATA['row_data_order'] = $row_data_order;
+
+	// hidden names for the table & where string
+	$DATA['table_name'] = $table_name;
+	$DATA['where_string'] = $where_string;
+
+	// debug data, if DEBUG flag is on, this data is print out
+	$DEBUG_DATA['DEBUG'] = $DEBUG_TMPL;
+
+	// create main data array
+	$CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
+	// data is 1:1 mapping (all vars, values, etc)
+	while (list($key, $value) = each($CONTENT_DATA))
+	{
+		$smarty->assign($key, $value);
+	}
+	$smarty->display('edit_order.tpl');
+
+	echo $login->print_error_msg();
+	echo $db->print_error_msg();
+?>

www/admin/edit_pages.php

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

www/admin/edit_schemes.php

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

www/admin/edit_users.php

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

www/admin/edit_visible_group.php

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

www/admin/error_test.php

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

www/admin/files.php

@@ -0,0 +1,456 @@
+<?
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2005/07/13
+* SHORT DESCRIPTION:
+* Create categories for CMS
+* HISTORY:
+* 2005/08/19 (cs) changed the mime type get from the _FILE to mime get fkt
+*********************************************************************/
+
+// DEBUG vars here
+$DEBUG_ALL = 1;
+$DB_DEBUG = 1;
+$DEBUG_TMPL = 1;
+
+//------------------------------ header
+require("header.inc");
+$MASTER_TEMPLATE_NAME = 'cms_popup.tpl';
+$TEMPLATE_NAME = 'cms_files.tpl';
+$PAGE_WIDTH = 750;
+require("set_paths.inc");
+//------------------------------ header
+
+//------------------------------ processing data start
+$form_name = $_GET['form'];
+$value_name = $_GET['name'];
+$data_id = $_GET['id'];
+$show_type = $_GET['type']; // P (pic), F (flash), V (video), D (document: word), A (document: pdf), B (binary); , separated string
+
+// default view is list
+if (!$view && !$data_id) {
+	$view = 'list';
+} elseif (!$view && $data_id) {
+	$view = 'list';
+}
+// default is online
+if (!isset($online)) {
+	$online = 't';
+}
+// if not set, it is a fresh load
+if (!$show_amount) {
+	$fresh_load = 1;
+}
+// the next two are for page view
+if (!$start_row) {
+	$start_row = 0;
+}
+if (!$show_amount) {
+	$show_amount = 12;
+}
+if (!$show_type) {
+	$show_type = 'P';
+}
+
+// yes no list (online)
+$yesno_list['f'] = 'No';
+$yesno_list['t'] = 'Yes';
+// order list
+$sort_order_list['date_created'] = 'ID / Insert time'; // default
+$sort_order_list['file_name'] = 'File Name';
+$sort_order_list['file_size'] = 'File Size';
+$sort_order_list['mime_type'] = 'Mime Type';
+$sort_order_list['name_en'] = 'Alt Name English';
+$sort_order_list['name_ja'] = 'Alt Name Japanese';
+$sort_order_list['date_updated'] = 'Updated';
+if (!$sort_order) {
+	$sort_order = 'date_created';
+}
+$sort_direction_list['ASC'] = 'Normal';
+$sort_direction_list['DESC'] = 'Reverse';
+if (!$sort_direction) {
+	$sort_direction = 'ASC';
+}
+// set if we need to write to any of the set live queues
+// a) on page save with set_live
+// b) global page with live_queue
+// set via QUEUE variable
+
+// create 0 entries for: templates, menu, data_group?
+if ($cms->action == 'new' && $cms->action_yes == 'true') {
+	unset($file_uid);
+	unset($file_id);
+	unset($file_type);
+	$new_okay = 1;
+}
+// file type: P picture, M mouse over picutre, F flash, V video, B binary
+if ($cms->action == 'save') {
+	if (!$file_type) {
+		$file_type = 'B';
+	}
+	$file_ok = false;
+	if (!$_FILES['file_up']['name'] && !$file_uid) {
+		$cms->messages[] = array('msg' => 'No file name given', 'class' => 'error');
+		$error = 1;
+	}
+	if (!$_FILES['file_up']['name'] && $file_uid) {
+		$file_ok = true;
+	}
+	// echo "FILE TYPE: ".$_FILES['file_up']['type']."<br>";
+	foreach (split(',', $show_type) as $_show_type) {
+		// check if the uploaded filename matches to the given type
+		if ($_FILES['file_up']['name'] && preg_match("/jpeg|png|gif/", $_FILES['file_up']['type']) && preg_match("/P/", $show_type)) {
+			$file_ok = true;
+		}
+		if ($_FILES['file_up']['name'] && preg_match("/swf/", $_FILES['file_up']['type']) && preg_match("/F/", $show_type)) {
+			$file_ok = true;
+		}
+		if ($_FILES['file_up']['name'] && preg_match("/video/", $_FILES['file_up']['type']) && preg_match("/V/", $show_type)) {
+			$file_ok = true;
+		}
+		if ($_FILES['file_up']['name'] && preg_match("/msword|vnd.oasis.opendocument.text/", $_FILES['file_up']['type']) && preg_match("/D/", $show_type)) {
+			$file_ok = true;
+		}
+		if ($_FILES['file_up']['name'] && preg_match("/pdf/", $_FILES['file_up']['type']) && preg_match("/A/", $show_type)) {
+			$file_ok = true;
+		}
+		if ($_FILES['file_up']['name'] && preg_match("/B/", $show_type)) {
+			$file_ok = true;
+		}
+	}
+	// write out error messages according to show type
+	if (!$file_ok) {
+		if (preg_match("/P/", $show_type)) {
+			$cms->messages[] = array('msg' => 'File is not a JPEG/PNG/GIF file', 'class' => 'error');
+			$error = 1;
+		}
+		if (preg_match("/F/", $show_type)) {
+			$cms->messages[] = array('msg' => 'File is not a Flash File', 'class' => 'error');
+			$error = 1;
+		}
+		if (preg_match("/V/", $show_type)) {
+			$cms->messages[] = array('msg' => 'File is not a Video', 'class' => 'error');
+			$error = 1;
+		}
+		if (preg_match("/D/", $show_type)) {
+			$cms->messages[] = array('msg' => 'File is not a DOC/ODT file', 'class' => 'error');
+			$error = 1;
+		}
+		if (preg_match("/A/", $show_type)) {
+			$cms->messages[] = array('msg' => 'File is not a PDF file', 'class' => 'error');
+			$error = 1;
+		}
+		if (preg_match("/B/", $show_type)) {
+			$cms->messages[] = array('msg' => 'No valid file was given', 'class' => 'error');
+			$error = 1;
+		}
+	}
+	// binary: all okay
+	// if no error, save data
+	if (!$error) {
+		if ($_FILES['file_up']['name']) {
+			$mime_type = $_FILES['file_up']['type'];
+			$file_size = $_FILES['file_up']['size'];
+			$file_name = $_FILES['file_up']['name'];
+			// get picture size
+			list($width, $height) = getimagesize($_FILES['file_up']['tmp_name']);
+			$cms->debug('upload', "Width: $width X Height: $height");
+			// set the file type and the target folder
+			if (preg_match("/jpeg|png|gif/", $mime_type)) {
+				$file_type = 'P';
+			} elseif (preg_match("/swf/", $mime_type)) {
+				$file_type = 'F';
+			} elseif (preg_match("/video/", $mime_type)) {
+				$file_type = 'V';
+			} elseif (preg_match("/msword|vnd.oasis.opendocument.text/", $mime_type)) {
+				$file_type = 'D';
+			} elseif (preg_match("/pdf/", $mime_type)) {
+				$file_type = 'A';
+			} elseif ($mime_type) {
+				$file_type = 'B';
+			}
+		}
+		// if we have an id -> updated
+		if ($file_uid) {
+			$q = "UPDATE file SET";
+			$q_set = " name_en = '".addslashes($name_en)."', name_ja = '".addslashes($name_ja)."', file_name = '".addslashes($file_name)."', online = '".$online."' ";
+			if ($_FILES['file_up']['name']) {
+				$q_set .= ", type = '".$file_type."', mime_type = '$mime_type', file_size = $file_size, size_x = $width, size_y = $height ";
+			}
+			$q .= $q_set."WHERE file_uid = '".$file_uid."'";
+			$cms->db_exec($q);
+			if (QUEUE == 'live_queue') {
+				$sql_action = 'UPDATE';
+				$sql_data = $q_set;
+			}
+		} else {
+			// insert new data
+			$file_uid = md5(uniqid(rand(), true));
+			$q = "INSERT INTO file (name_en, name_ja, file_name, online, mime_type, file_size, size_x, size_y, file_uid, type) VALUES (";
+			$q .= "'".addslashes($name_en)."', '".addslashes($name_ja)."', '".addslashes($file_name)."', '".$online."', '".$mime_type."', ";
+			$q .= "$file_size, ".(($width) ? $width : 'NULL').", ".(($height) ? $height : 'NULL').", '".$file_uid."', '".$file_type."')";
+			$cms->db_exec($q);
+			$file_id = $cms->insert_id;
+			// if queue
+			if (QUEUE == 'live_queue') {
+				$sql_data = $q;
+				$sql_action = 'INSERT';
+			}
+		}
+		$size_x = $width;
+		$size_y = $height;
+		$file = DEV_SCHEMA."_".$file_uid;
+		// now upload the file
+		if ($_FILES['file_up']['name']) {
+			$upload_file = ROOT.MEDIA.$cms->data_path[$file_type].$file;
+			// wipe out any old tmp data for this new upload
+			if (is_array(glob(ROOT.TMP."thumb_".$file."*"))) {
+				foreach (glob(ROOT.TMP."thumb_".$file."*") as $filename) {
+					@unlink($filename);
+				}
+			}
+			# copy file to correct path
+			$error = move_uploaded_file($_FILES['file_up']['tmp_name'], $upload_file);
+
+			$cms->debug('file_upload', "UP: $upload_file");
+			$cms->debug('file_upload', "Orig: ".$cms->print_ar($_FILES['file_up']));
+
+			// because I get bogus error info from move_uploaded_file ...
+			$error = 0;
+			if ($error) {
+				$cms->debug('file_upload', "ERROR: $error | INI FSize: ".ini_get("upload_max_filesize"));
+				$cms->messages[] = array('msg' => 'File upload failed', 'class' => 'error');
+				$q = "DELETE FROM file WHERE file_uid = '".$file_uid."'";
+				$cms->db_exec($q);
+				unset($file_id);
+				unset($file_uid);
+				$view = 'list';
+			} else {
+				$cms->messages[] = array('msg' => 'File upload successful', 'class' => 'warning');
+				// $view = 'list';
+			}
+		} // if file upload
+		// create thumbs + file size
+		$picture = $cms->cache_pictures.$cms->adbCreateThumbnail($file, 400, 280, $file_type, '', $cms->cache_pictures_root);
+		$picture_small = $cms->cache_pictures.$cms->adbCreateThumbnail($file, 80, 60, $file_type, '', $cms->cache_pictures_root);
+		$file_size = $cms->adbByteStringFormat($file_size);
+		// for live queue this is here needed
+		if (QUEUE == 'live_queue') {
+			$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (queue_key, key_value, key_name, type, target, data, group_key, action";
+			if ($_FILES['file_up']['name']) {
+				$q .= ", file";
+			}
+			$q .= ") VALUES ('".$cms->queue_name."', '".$file_uid."', 'file_uid', '".$sql_action."', 'file', '".$cms->db_escape_string($sql_data)."', '".$cms->queue_key."', '".$cms->action."'";
+			if ($_FILES['file_up']['name']) {
+				$q .= ", '".ROOT.MEDIA.$cms->data_path[$file_type].$file."#".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'";
+			}
+			$q .= ")";
+			$cms->db_exec($q);
+		}
+	} // if not error
+}
+if ($cms->action == 'delete' && $cms->action_yes == 'true') {
+	$file_uid = $cms->action_id;
+	$q = "SELECT type FROM file WHERE file_uid = '".$file_uid."'";
+	list ($file_type) = $cms->db_return_row($q);
+	// get the file type for the file path
+	$q = "DELETE FROM file WHERE file_uid = '".$file_uid."'";
+	$cms->db_exec($q);
+	if (QUEUE == 'set_live') {
+		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".set_live (table_name, pkid, delete_flag) VALUES ('".$cms->page_name."', ".$file_uid.", 't')";
+		$cms->db_exec($q);
+	}
+	if (QUEUE == 'live_queue') {
+		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (queue_key, key_value, key_name, type, target, data, group_key, action, file) VALUES (";
+		$q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
+	}
+	@unlink(ROOT.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid);
+	unset($file_uid);
+	unset($file_id);
+	$delete_done = 1;
+	$view = 'list';
+}
+if ($cms->action == 'load') {
+	$file_uid = $cms->action_id;
+	// load the data
+	$q = "SELECT file_id, name_en, name_ja, file_name, online, mime_type, file_size, size_x, size_y, type FROM file WHERE file_uid = '".$file_uid."'";
+	list($file_id, $name_en, $name_ja, $file_name, $online, $mime_type, $file_size, $size_x, $size_y, $file_type) = $cms->db_return_row($q);
+	// create thumbnail for edit view
+	$file = DEV_SCHEMA."_".$file_uid;
+	// thumbnails are only valid for pictures
+	$picture = $cms->cache_pictures.$cms->adbCreateThumbnail($file, 400, 280, $file_type, '', $cms->cache_pictures_root);
+	$picture_small = $cms->cache_pictures.$cms->adbCreateThumbnail($file, 80, 60, $file_type, '', $cms->cache_pictures_root);
+	$file_size = $cms->adbByteStringFormat($file_size);
+	// view to edit
+	$view = 'edit';
+}
+if ($cms->action == 'add_new') {
+	$view = 'edit';
+}
+if ($cms->action == 'view_files' && $cms->action_yes == 'true') {
+	$view = 'list';
+}
+// set delete live
+if ($cms->action_flag == 'set_live' && $cms->action = 'set_delete') {
+	$q = "SELECT file_uid, pkid, type FROM ".LOGIN_DB_SCHEMA.".set_live sl, file f WHERE sl.pkid = f.file_uid table_name = '".$cms->page_name."' AND delete_flag = 't'";
+	while ($res = $cms->db_return($q)) {
+		$q_del = "DELETE FROM ".PUBLIC_SCHEMA.".file WHERE file_uid = '".$res['pkid'].'"';
+		$cms->db_exec($q_del);
+		@unlink(ROOT.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']);
+	}
+	$q = "DELETE FROM ".LOGIN_DB_SCHEMA.".set_live WHERE table_name = '".$cms->page_name."' AND delete_flag = 't'";
+	$cms->db_exec($q);
+}
+if (DEV_SCHEMA != PUBLIC_SCHEMA) {
+	// read out possible deleted, to add "delete from live"
+	$q = "SELECT pkid FROM ".LOGIN_DB_SCHEMA.".set_live WHERE table_name = '".$cms->page_name."' AND delete_flag = 't'";
+	while ($res = $cms->db_return($q, 3)) {
+		$cms->DATA['set_delete'][]['pkid'] = $res['pkid'];
+	}
+}
+// get th max entries
+$q = "SELECT COUNT(file_uid) FROM file ";
+$q_search_where = "WHERE type in ('".str_replace(',', "','", $show_type)."') ";
+if ($search_what) {
+	$q_search_where .= "AND LOWER(name_en) LIKE '%".addslashes(strtolower($search_what))."%' OR name_ja LIKE '%".addslashes($search_what)."%' OR LOWER(file_name) LIKE '%".addslashes(strtolower($search_what))."%' ";
+}
+$q .= $q_search_where;
+// get selection from show_type
+list ($file_count) = $cms->db_return_row($q);
+
+if ($cms->action == 'browse') {
+	// browse in the list of data
+	switch ($cms->action_id) {
+		case "<<<<":
+			$start_row = 0;
+			break;
+		case "<":
+			$start_row -= $show_amount;
+			break;
+		case ">":
+			$start_row += $show_amount;
+			break;
+		case ">>>>":
+			$start_row = $file_count - $show_amount;
+			break;
+		case "gopage":
+			// for page is page -1, so page 1 start from 0, etc
+			$start_row = ((($cms->action_value - 1) > 0) ? ($cms->action_value - 1) * $show_amount : 0);
+			$current_page = $cms->action_value;
+			break;
+	}
+}
+
+// check overflow
+if ($start_row < 0) {
+	$start_row = 0;
+}
+if ($start_row > $file_count) {
+	$start_row = $file_count - $show_amount;
+}
+
+// if we have a "fresh_load"
+if ($fresh_load) {
+	$count = 1;
+	$q = "SELECT file_uid FROM file ";
+	if ($q_search_where) {
+		$q .= $q_search_where;
+	}
+	$q .= "ORDER BY ".$sort_order." ".$sort_direction." ";
+	while ($res = $cms->db_return($q)) {
+		// if data_id is set and not file_id, go to the page where the current highlight is, but only if this is a "virgin" load of the page
+		if ($data_id && ($data_id == $res['file_uid'])) {
+			$current_page = floor(($count / $show_amount));
+			$start_row = $current_page * $show_amount;
+			$current_page ++;
+		}
+		$count ++;
+	}
+}
+
+// page forward/back buttons settings
+if ($start_row > 0) {
+	$cms->DATA['show_back'] = 1;
+}
+$cms->DATA['page_number'] = ceil($start_row / $show_amount) + 1;
+$cms->DATA['page_count'] = ceil($file_count / $show_amount);
+if ($cms->DATA['page_count'] > 2 && !$current_page) {
+	$current_page = 1;
+}
+if (($start_row + $show_amount) < $file_count) {
+	$cms->DATA['show_forward'] = 1;
+}
+
+$q = "SELECT file_id, name_en, name_ja, file_name, online, mime_type, file_size, size_x, size_y, file_uid, type FROM file ";
+// if search what, search in name_en, name_ja, file_name for the string
+if ($q_search_where) {
+	$q .= $q_search_where;
+}
+$q .= "ORDER BY ".$sort_order." ".$sort_direction." ";
+$q .= "LIMIT ".$show_amount." OFFSET ".$start_row;
+while ($res = $cms->db_return($q)) {
+	$data_files[] = array (
+		'id' => $res['file_id'],
+		'name_en' => $res['name_en'],
+		'name_ja' => $res['name_ja'],
+		'file_name' => $res['file_name'],
+		'online' => $res['online'],
+		'mime_type' => $res['mime_type'],
+		'file_size' => $cms->adbByteStringFormat($res['file_size']),
+		'size_x' => $res['size_x'],
+		'size_y' => $res['size_y'],
+		'file_uid' => $res['file_uid'],
+		'file_type' => $res['type'],
+		'picture' => $cms->cache_pictures.$cms->adbCreateThumbnail(DEV_SCHEMA.'_'.$res['file_uid'], 80, 60, $res['type'], '', $cms->cache_pictures_root)
+	);
+}
+
+$cms->DATA['show_type'] = $show_type;
+$cms->DATA['data_files'] = $data_files;
+$cms->DATA['view'] = $view;
+$cms->DATA['images_path'] = MEDIA.$cms->data_path[$file_type];
+// get vars for position (only when)
+$cms->DATA['form_name'] = $form_name;
+$cms->DATA['value_name'] = $value_name;
+$cms->DATA['file_id'] = $file_id;
+$cms->DATA['file_uid'] = $file_uid;
+
+// write back all the other vars
+if (!($delete_done || $new_okay)) {
+	// data name
+	$cms->DATA['file_name'] = $file_name;
+	$cms->DATA['name_en'] = $name_en;
+	$cms->DATA['name_ja'] = $name_ja;
+	$cms->DATA['mime_type'] = $mime_type;
+	$cms->DATA['file_size'] = $file_size;
+	$cms->DATA['size_x'] = $size_x;
+	$cms->DATA['size_y'] = $size_y;
+	$cms->DATA['online'] = $online;
+	$cms->DATA['picture'] = $picture;
+	$cms->DATA['picture_small'] = $picture_small;
+	$cms->DATA['file_type'] = $file_type;
+}
+$cms->DATA['sort_order_list'] = $sort_order_list;
+$cms->DATA['sort_order'] = $sort_order;
+$cms->DATA['sort_direction_list'] = $sort_direction_list;
+$cms->DATA['sort_direction'] = $sort_direction;
+$cms->DATA['search_what'] = $search_what;
+$cms->DATA['current_page'] = $current_page;
+$cms->DATA['yesno_list'] = $yesno_list;
+$cms->DATA['start_row'] = $start_row;
+$cms->DATA['show_amount'] = $show_amount;
+if ($data_id) {
+	$cms->DATA['data_id'] = $data_id;
+}
+$cms->DATA['top'] = 0;
+$cms->DATA['left'] = 0;
+
+//------------------------------ processing data end
+
+//------------------------------ smarty start
+require("smarty.inc");
+//------------------------------ smarty end
+
+//------------------------------ footer
+require("footer.inc");
+//------------------------------ footer

www/admin/footer.inc

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/14
@@ -8,7 +8,5 @@
 *********************************************************************/
 
 // print debug messages
-echo $login->printErrorMsg();
-echo $cms->printErrorMsg();
-
-// __END__
+echo $login->print_error_msg();
+echo $cms->print_error_msg();

www/admin/header.inc

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -10,11 +10,11 @@
 //------------------------------ variable init start
 // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log
 if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
-	include BASE.LIBS."Error.Handling.php";
+	include("libs/Error.Handling.inc");
 }
 // predefine vars
 $lang = '';
-$messages = array();
+$messages = array ();
 // import all POST vars
 extract($_POST, EXTR_SKIP);
 //------------------------------ variable init end
@@ -22,17 +22,15 @@ extract($_POST, EXTR_SKIP);
 //------------------------------ library include start
 // set output to quiet for load of classes & session settings
 ob_start();
-// set the session name
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
+require("config.inc");
+
+// login class, DB connections & Admin class, Smarty extension
+foreach (array ('Login', 'Admin.Backend', 'Smarty.Extend') as $class) {
+	_spl_autoload('Class.'.$class.'.inc');
+}
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
-if (!isset($AJAX_PAGE)) {
-	$AJAX_PAGE = false;
-}
-if (!isset($ZIP_STREAM)) {
-	$ZIP_STREAM = false;
-}
 // set encoding
 if (!isset($encoding)) {
 	$encoding = DEFAULT_ENCODING;
@@ -41,42 +39,40 @@ if (!isset($encoding)) {
 if (session_id() && $_SESSION['DEFAULT_LANG']) {
 	$lang = $_SESSION['DEFAULT_LANG'];
 } elseif (!$lang) {
-	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+	$lang = DEFAULT_LANG;
 }
 // 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) {
+if (array_key_exists('action', $_POST) && $_POST['action'] != 'download_csv') {
 	header("Content-type: text/html; charset=".$encoding);
-}
-if ($AJAX_PAGE && !$ZIP_STREAM) {
-	header("Content-Type: application/json; charset=UTF-8");
+	ob_end_flush();
 }
 //------------------------------ basic variable settings start
 
 //------------------------------ class init start
 // login & page access check
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
+$login = new login($DB_CONFIG[LOGIN_DB], $lang);
 // post login lang check
 if ($_SESSION['DEFAULT_LANG']) {
 	$lang = $_SESSION['DEFAULT_LANG'];
 }
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new SmartyML($lang);
 // create new DB class
-$cms = new CoreLibs\Admin\Backend(DB_CONFIG, $lang);
+$cms = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
+// set search path to the default DB schema
+$cms->db_exec("SET search_path TO ".DB_SCHEMA);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
-$cms->dbInfo();
+$cms->db_info();
 // set acl
 $cms->acl = $login->acl;
-// flush
-ob_end_flush();
 //------------------------------ class init end
 
 //------------------------------ logging start
 // log backend data
 // data part creation
-$data = array(
+$data = array (
 	'_SESSION' => $_SESSION,
 	'_GET' => $_GET,
 	'_POST' => $_POST,
@@ -92,19 +88,17 @@ if (!$login->login) {
 //------------------------------ 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'] = isset($login->acl['show_ea_extra']) ? $login->acl['show_ea_extra'] : false;
+$cms->DATA['show_ea_extra'] = $login->acl['acl']['show_ea_extra'];
 //------------------------------ page rights ned
 
 // automatic hide for DEBUG messages on live server
 // can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
 if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
-	$login->debug_output_all = false;
-	$login->echo_output_all = false;
-	$login->print_output_all = false;
-	$cms->debug_output_all = false;
-	$cms->echo_output_all = false;
-	$cms->print_output_all = false;
+	$login->debug_output_all = 0;
+	$login->echo_output_all = 0;
+	$login->print_output_all = 0;
+	$cms->debug_output_all = 0;
+	$cms->echo_output_all = 0;
+	$cms->print_output_all = 0;
 }
 $cms->DATA['JS_DEBUG'] = DEBUG;
-
-// __END__

www/admin/includes/Date.Vars.inc

@@ -0,0 +1,51 @@
+<?
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2005/07/19
+* SHORT DESCRIPTION:
+* preset date variables
+* HISTORY:
+*********************************************************************/
+
+$day_short[1] = "Mon";
+$day_short[2] = "Tue";
+$day_short[3] = "Wed";
+$day_short[4] = "Thu";
+$day_short[5] = "Fri";
+$day_short[6] = "Sat";
+$day_short[7] = "Sun";
+
+$day_long[1] = "Monday";
+$day_long[2] = "Tuesday";
+$day_long[3] = "Wednesday";
+$day_long[4] = "Thursday";
+$day_long[5] = "Friday";
+$day_long[6] = "Saturday";
+$day_long[7] = "Sunday";
+
+// monate
+$month_long[1] = "January";
+$month_long[2] = "February";
+$month_long[3] = "March";
+$month_long[4] = "April";
+$month_long[5] = "May";
+$month_long[6] = "June";
+$month_long[7] = "July";
+$month_long[8] = "August";
+$month_long[9] = "September";
+$month_long[10] = "October";
+$month_long[11] = "November";
+$month_long[12] = "December";
+
+$month_short[1] = "Jan";
+$month_short[2] = "Feb";
+$month_short[3] = "Mar";
+$month_short[4] = "Apr";
+$month_short[5] = "May";
+$month_short[6] = "Jun";
+$month_short[7] = "Jul";
+$month_short[8] = "Aug";
+$month_short[9] = "Sep";
+$month_short[10] = "Oct";
+$month_short[11] = "Nov";
+$month_short[12] = "Dec";

www/admin/l10n_test.php

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

www/admin/libs

@@ -0,0 +1 @@
+../libs/

www/admin/log

@@ -0,0 +1 @@
+../log/

www/admin/namespace_test.php

@@ -1,43 +0,0 @@
-<?php declare(strict_types=1);
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// namespace test
-ob_start();
-
-// admin class tests
-require 'config.php';
-$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);
-ob_end_flush();
-if ($base->getConnectionStatus()) {
-	die("Cannot connect to database");
-}
-
-print "Start time: ".$base->runningTime()."<br>";
-print "ByteStringFormat: ".$base->ByteStringFormat(1234567.12)."<br>";
-print "byteStringFormat: ".$base->byteStringFormat(1234567.12)."<br>";
-// print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
-print "getPageName: ".$base->getPageName()."<br>";
-
-print "DB Info: ".$base->dbInfo(true)."<br>";
-
-
-print "End Time: ".$base->runningTime()."<br>";
-print "Start Time: ".$base->runningTime()."<br>";
-
-print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
-print "Translate test: Year -> ".$base->l->__('Year')."<br>";
-
-print "End Time: ".$base->runningTime()."<br>";
-// end error print
-print $base->printErrorMsg();
-
-# __END__

www/admin/other_test.php

@@ -1,34 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Foo;
-
-class FooBar
-{
-	public $foo = '';
-
-	public function __construct()
-	{
-		$this->foo = 'BAR';
-	}
-
-	public function otherBarBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-
-	public function barBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-}
-
-$foo = $bar ?? 'EMPTY';
-echo "BAR: ".$foo."<br>";
-// define('DS', DIRECTORY_SEPARATOR);
-$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
-$du = DS ?? DIRECTORY_SEPARATOR;
-echo "DS is: ".$ds."<br>";
-
-echo "SERVER HOST: ".$_SERVER['HTTP_HOST']."<br>";
-
-// __END__

www/admin/qq_file_upload_ajax.php

@@ -1,46 +0,0 @@
-<?php
-
-$DEBUG_ALL = 1;
-$ECHO_ALL = 0;
-$PRINT_ALL = 1;
-
-// load the Basic && qq file uploader here
-require 'config.php';
-// class load
-$base = new CoreLibs\Basic();
-$base->debug('AJAX UPLOAD', 'START Backend');
-// set max upload size
-$MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
-
-// test for qqFileUploader (AJAX side)
-$allowedExtensions = array ('csv', 'zip', 'jpg', 'pdf', 'bz2');
-$sizeLimit = $MAX_UPLOAD_SIZE; // as set in php ini
-$base->debug('AJAX UPLOAD', 'Size: '.$sizeLimit.', Memory Limit: '.ini_get('memory_limit'));
-$uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit);
-// either in post or get
-$_action= $_POST['action'] ? $_POST['action'] : $_GET['action'];
-$_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid'];
-$get_post['start'] = microtime(true);
-$base->debug('AJAX UPLOAD', 'Action: '.$_action.', Task UID: '.$_task_uid.' => '.$base->dateStringFormat($get_post['start']));
-
-$upload_path = ROOT.MEDIA.UPLOADS;
-$get_post['result'] = $uploader->handleUpload($upload_path, false);
-$base->debug('AJAX UPLOAD', 'Memory peak: '.$base->ByteStringFormat(memory_get_usage()).' | '.$base->ByteStringFormat(memory_get_peak_usage()));
-
-// set file name
-$get_post['filename'] = $uploader->uploadFileName;
-$get_post['type'] = $uploader->uploadFileExt;
-$get_post['filesize'] = filesize($uploader->uploadFileName);
-$get_post['filesize_formated'] = $base->ByteStringFormat($get_post['filesize']);
-$get_post['end'] = microtime(true);
-$get_post['time'] = $get_post['end'] - $get_post['start'];
-
-$base->debug('AJAX RESULT', $base->printAr($get_post));
-// return data
-$output = htmlspecialchars(json_encode($get_post), ENT_NOQUOTES);
-// $base->debug('AJAX JSON', $output);
-print $output;
-
-$base->printErrorMsg();
-
-// __END__

www/admin/qq_file_upload_front.php

@@ -1,225 +0,0 @@
-<?php
-
-$DEBUG_ALL = 1;
-$ECHO_ALL = 0;
-$PRINT_ALL = 1;
-
-// test file for qqFileUploader (HTML side)
-// load the Basic class here
-require 'config.php';
-$base = new CoreLibs\Basic();
-// set max upload size
-$MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
-$base->debug('UPLOADED FRONT', 'With max size: '.$MAX_UPLOAD_SIZE);
-
-// very basic template output with super basic div for two file upload
-?>
-<html>
-<head>
-<title>File upload AJAX</title>
-<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
-<style type="text/css">
-.normal {
-	width: 25%;
-}
-.flx-s {
-	align-content: stretch;
-	display: flex;
-	flex: 1 100%;
-}
-.uploadError {
-	font-weight: bold;
-	color: red;
-}
-.uploadCancel {
-	font-weight: bold;
-	color: orange;
-}
-
-.qq-file-upload-button {
-	border: 1px solid #999999;
-	border-radius: 2px 2px 2px 2px;
-	box-shadow: 0 10px rgba(255, 255, 255, 0.3) inset, 0 10px rgba(255, 255, 255, 0.2) inset, 0 10px 2px rgba(255, 255, 255, 0.25) inset, 0 -1px 2px rgba(0, 0, 0, 0.3) inset;
-	text-align: center;
-	padding: 3px 5px 3px;
-	background-color: #cacaca;
-	margin: 2px;
-}
-
-.qq-file-upload-button:hover {
-	box-shadow: 0 10px 2px rgba(107, 107, 107, 0.2) inset, 0 12px rgba(107, 107, 107, 0.05) inset, 0 12px 2px rgba(107, 107, 107, 0.1) inset, 0 -1px 2px rgba(255, 255, 255, 0.3) inset;
-}
-
-.qq-file-upload-button:active {
-	border: 1px solid red;
-	background-color: rgba(80, 80, 80, 0.5);
-}
-
-.qq-upload-cancel {
-	border: 1px solid red;
-	border-radius: 2px;
-	text-align: center;
-	padding: 3px 5px 3px;
-	background-color: #eb652d;
-	margin: 2px;
-}
-.qq-upload-cancel:hover {
-	background-color: #eb8686;
-}
-.qq-upload-cancel:active {
-	border: 1px solid black;
-	background-color: #eb2d2d;
-}
-
-.progressBarOutside {
-	background-color: #f1f1f1;
-	color: black;
-	width: 100%;
-}
-
-.progressBarInside {
-	background-color: #1e9e84;
-	border-radius: 4px;
-	padding: 0.01em;
-	text-align: center;
-	font-size: 0.8em;
-}
-
-</style>
-<script src="layout/default/javascript/prototype.js" type="text/javascript"></script>
-<script src="layout/default/javascript/file-uploader/fileuploader.js" type="text/javascript"></script>
-<script type="text/javascript">
-function formatBytes(bytes)
-{
-	var i = -1;
-	do {
-		bytes = bytes / 1024;
-		i++;
-	} while (bytes > 99);
-
-	// return Math.max(bytes, 0.1).toFixed(1) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
-	return parseFloat(Math.round(bytes * Math.pow(10, 2)) / Math.pow(10, 2)) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
-}
-var MAX_UPLOAD_SIZE = <?=$MAX_UPLOAD_SIZE;?>;
-// function to add an AJAX uploadeder to the set
-function createUploaderSin(divName, divNumber) {
-	divID = divName + '_' + divNumber;
-	console.log('Div: %s, Number: %s => ID: %s', divName, divNumber, divID);
-	$(divID + '_Cancel').hide();
-	var uploader = new qq.FileUploaderBasic({
-		// element: document.getElementById(divID),
-		element: $(divID),
-		cancel: $(divID + '_Cancel'),
-		action: 'qq_file_upload_ajax.php',
-		multiple: false,
-		button: $(divID),
-		allowedExtensions: ['csv', 'zip', 'jpg', 'pdf', 'bz2'],
-		sizeLimit: MAX_UPLOAD_SIZE, // size set from php ini
-		name: divID,
-		params: {
-			'file_pos': divNumber, // we need to add here ID or something
-			'action': 'upload',
-			'task_uid': divNumber // -> test for some internal uid
-		},
-		onSubmit: function(id, filename, target) {
-			console.log('File upload: "%s", ID: "%s" => "%s"', filename, id, target);
-			// remove any assigned error classes and flags
-			if ($(target + '_ProgressText').hasClassName('uploadError') || $(target + '_ProgressText').hasClassName('uploadCancel')) {
-				$(target + '_ProgressText').className = '';
-				$(target + '_Error').value = 0;
-			}
-			$(target + '_ProgressText').innerHTML = 'Start uploading file: ' + filename;
-			$(target + '_Cancel').show();
-			// disabled stuff here
-		},
-		onProgress: function(id, filename, loaded, total, target) {
-			console.log('Progress for file: "%s", ID: "%s", loaded: "%s", total: "%s" => "%s"', id, filename, loaded, total, target);
-			var percent = Math.round((loaded / total) * 100);
-			$(target + '_ProgressBar').innerHTML = percent + '%';
-			$(target + '_ProgressBar').style.width = percent + '%';
-			$(target + '_ProgressText').innerHTML = 'Uploading: ' + filename + ', ' + formatBytes(loaded) + '/' + formatBytes(total);
-		},
-		onComplete: function(id, filename, responseJSON, target) {
-			console.log('File upload for file "%s", id "%s" done with status "%s" => "%s", And success: %s', filename, id, responseJSON, target, responseJSON.result.success);
-			if (responseJSON.result.success) {
-				$(target + '_ProgressBar').innerHTML = '100%';
-				$(target + '_ProgressBar').style.width = '100%';
-				$(target + '_ProgressText').innerHTML = 'Uploaded: ' + filename + ' (' + responseJSON.filesize_formated + ')';
-				// also write hidden vars for this (file name, etc)
-				// for that we replace the divName part from the target and get just the pos number ?
-				// $(target + 'Name').value = filename;
-				// $(target + 'NameUpload').value = responseJSON.filename;
-				// $(target + 'Type').value = responseJSON.type;
-				// $(target + 'Size').value = responseJSON.filesize;
-			} else {
-				// set the error class
-				$(target + '_ProgressText').className = 'uploadError';
-				// flag error
-				$(target + '_Error').value = 1;
-				// and write the error
-				$(target + '_ProgressText').innerHTML = 'UPLOAD FAILED FOR FILE: ' + filename;
-			}
-			// renable stuff here
-			$(target + '_Cancel').hide();
-		},
-		onCancel: function (id, filename, target) {
-			// cancel upload
-			console.log('File upload cancled for file "%s", id "%s"', filename, id);
-			// upload cancel
-			$(target + '_ProgressText').className = 'uploadCancel';
-			$(target + '_Error').value = 1;
-			$(target + '_ProgressText').innerHTML = 'UPLOAD CANCELED FOR FILE: ' + filename;
-			$(target + '_Cancel').hide();
-		},
-		/*showMessage: function(message) {
-			console.log('MESSAGE: %s', message);
-		}, */
-		debug: true
-	});
-	// console.log('INIT Nr %s => cnt: %s', divNumber, uploader);
-	return uploader;
-}
-</script>
-</head>
-
-<body>
-<div id="masterGroup">
-	<div>File upload via AJAX (MAX SIZE: <?=$base->byteStringFormat($MAX_UPLOAD_SIZE);?>)</div>
-	<div class="flx-s">
-		<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7" class="normal qq-file-upload-button" style="width: 20%">Upload File</div>
-		<div style="width: 5%">
-			<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7_Cancel" class="qq-upload-cancel">X</div>
-		</div>
-		<div style="width: 75%; padding: 5px;">
-			<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7_ProgressText"></div>
-			<div class="progressBarOutside">
-				<div class="progressBarInside" id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7_ProgressBar" style="width: 0%">0%</div>
-			</div>
-		</div>
-		<input type="hidden" name="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7_Error" id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7_Error" value="">
-	</div>
-	<div class="flx-s">
-		<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou" class="normal qq-file-upload-button" style="width: 20%">Upload File</div>
-		<div style="width: 5%">
-			<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou_Cancel" class="qq-upload-cancel">X</div>
-		</div>
-		<div style="width: 75%; padding: 5px;">
-			<div id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou_ProgressText"></div>
-			<div class="progressBarOutside">
-				<div class="progressBarInside" id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou_ProgressBar" style="width: 0%">0%</div>
-			</div>
-		</div>
-		<input type="hidden" name="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou_Error" id="Uploader_3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou_Error" value="">
-	</div>
-</div>
-</body>
-</html>
-<script type="text/javascript">
-// attach uploader to div areas
-createUploaderSin('Uploader', '3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_MF5tISORiay7');
-createUploaderSin('Uploader', '3WD7MAFmjAux_dlvvu13tezNj_XeSO0Ovauli0_Ww9iWKrl3Xou');
-</script>
-<?php
-$base->printErrorMsg();
-
-// __END__

www/admin/set_paths.inc

@@ -0,0 +1,119 @@
+<?
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2007/09/03
+* SHORT DESCRIPTION:
+* set paths & language variables
+* HISTORY:
+*********************************************************************/
+
+// template path
+if ($_SESSION['TEMPLATE']) {
+	$TEMPLATE = $_SESSION['TEMPLATE'];
+} elseif ($LOCAL_TEMPLATE) {
+	$TEMPLATE = $LOCAL_TEMPLATE;
+} else {
+	$TEMPLATE = DEFAULT_TEMPLATE;
+}
+$TEMPLATE_DIR = $TEMPLATE.'/';
+// master template
+if (!$MASTER_TEMPLATE_NAME) {
+	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
+}
+
+// just emergency fallback for language
+// set encoding
+if ($_SESSION['DEFAULT_CHARSET']) {
+	$encoding = $_SESSION['DEFAULT_CHARSET'];
+} elseif (!$encoding) {
+	$encoding = DEFAULT_ENCODING;
+}
+// just emergency fallback for language
+if ($_SESSION['DEFAULT_LANG']) {
+	$lang = $_SESSION['DEFAULT_LANG'];
+} elseif (!$lang) {
+	$lang = DEFAULT_LANG;
+}
+// create the char lang encoding
+$lang_short = substr($lang, 0, 2);
+
+// set include & template names
+$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
+$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->get_page_name(1))).' - '.$G_TITLE;
+// strip tpl and replace it with inc
+// php include file per page
+$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
+// javascript include per page
+$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
+// css per page
+$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
+// special CSS file
+$cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
+// special JS file
+$cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
+
+// set basic template path (tmp)
+$smarty->setTemplateDir(LAYOUT.$TEMPLATE_DIR.TEMPLATES.'/');
+$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG."/";
+$cms->includes = LAYOUT.$TEMPLATE_DIR.INCLUDES."/";
+$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS."/";
+$cms->css = LAYOUT.$TEMPLATE_DIR.CSS."/";
+$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES."/";
+$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE.IMAGES.'/';
+$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
+if (!is_dir($cms->cache_pictures_root)) {
+	mkdir($cms->cache_pictures_root);
+}
+$template_set = $TEMPLATE;
+
+// if we don't find the master template, set the template path back AND set the insert template as absolute path
+if (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".MASTER_TEMPLATE_NAME)) {
+	if (file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
+		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME;
+	}
+	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+	$template_set = DEFAULT_TEMPLATE;
+} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
+	// check if the template exists in the template path, if not, set path to to default
+	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
+	$template_set = DEFAULT_TEMPLATE;
+}
+// loop to check if dir exists
+// check if file exists, if not reset to default path
+
+// check if the javascript folder exists in the template path, if not fall back to default
+if (!is_dir($cms->javascript)) {
+	$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS."/";
+}
+// check if lang_dir folder exists in the template path, if not fall back to default
+if (!is_dir($cms->lang_dir)) {
+	$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG."/";
+}
+// check if include folder exists in the template path, if not fall back to default
+if (!is_dir($cms->includes)) {
+	$cms->includes = LAYOUT.DEFAULT_TEMPLATE.INCLUDES."/";
+}
+// check if css folder exists in the template path, if not fall back to default
+if (!is_dir($cms->css)) {
+	$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS."/";
+}
+if (!is_dir($cms->pictures)) {
+	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES.'/';
+}
+if (!is_dir($cms->cache_pictures)) {
+	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE.IMAGES.'/';
+}
+
+// if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
+// if the default lang is not like the lang given, switch lang
+if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) || strcasecmp(DEFAULT_LANG, $lang)) {
+	$cms->debug('LANG', 'Orig: '.LAYOUT.DEFAULT_TEMPLATE.LANG.', New: '.$cms->lang_dir.' | Orig Lang: '.DEFAULT_LANG.', New Lang: '.$lang);
+	$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
+	$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
+}
+
+//	$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']);
+$cms->debug("TEMPLATE", "P: ".$smarty->getTemplateDir()[0]);

www/admin/smarty.inc

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/12
@@ -8,13 +8,16 @@
 *********************************************************************/
 
 // trigger flags
-$cms->HEADER['USE_PROTOTYPE'] = isset($USE_PROTOTYPE) ? $USE_PROTOTYPE : USE_PROTOTYPE;
+$cms->HEADER['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;
+if (USE_PROTOTYPE) {
+	$cms->HEADER['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
+$cms->HEADER['USE_JQUERY'] = USE_JQUERY; // don't use either of those two toger
+
+// set basic template path (tmp)
+// paths are set in the 'set_paths.inc' file
 
 // 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)) {
@@ -58,58 +61,36 @@ $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;
+$cms->HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
+$cms->HEADER['JAVASCRIPT'] = $EDIT_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;
+$cms->HEADER['HTML_TITLE'] = (!isset($L_TITLE) || !$L_TITLE) ? $cms->l->__($G_TITLE) : $cms->l->__($L_TITLE);
+$cms->DATA['table_width'] = $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_error_msg'] = $cms->running_time();
 $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) {
+while (list($key, $value) = each($cms->CONTENT_DATA)) {
 	$smarty->assign($key, $value);
 }
-if (is_dir(BASE.TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE.TEMPLATES_C);
-}
-if (is_dir(BASE.CACHE)) {
-	$smarty->setCacheDir(BASE.CACHE);
-}
-$smarty->display(
-	$MASTER_TEMPLATE_NAME,
-	$cms->CACHE_ID.($cms->CACHE_ID ? '_' : '').$lang,
-	$cms->COMPILE_ID.($cms->COMPILE_ID ? '_' : '').$lang
-);
-
-// __END__
+$smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang);

www/admin/smarty_test.php

@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?
 $ENABLE_ERROR_HANDLING = 0;
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
@@ -7,46 +7,14 @@ $DB_DEBUG = 1;
 $LOG_PER_RUN = 1;
 
 define('USE_DATABASE', true);
-define('USE_HEADER', true);
-require 'config.php';
-require BASE.INCLUDES.'admin_header.php';
+require("header.inc");
 $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';
+$PAGE_WIDTH = 750;
+require("set_paths.inc");
 
 // smarty test
 $cms->DATA['SMARTY_TEST'] = 'Test Data';
 
-// drop down test with optgroups
-$options = array (
-	'' => '選択してください',
-	'4/25(木)' => array (
-		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
-		'4/25(木) 12:20-13:00' => '4/25(木) 12:20-13:00'
-	),
-	'4/26(金)' => array (
-		'4/26(金) 11:00-11:50' => '4/26(金) 11:00-11:50',
-		'4/26(金) 12:20-13:00' => '4/26(金) 12:20-13:00'
-	),
-	'4/27(土)' => array (
-		'4/27(土) 11:00-11:50' => '4/27(土) 11:00-11:50',
-		'4/27(土) 12:20-13:00' => '4/27(土) 12:20-13:00'
-	)
-);
-
-$cms->DATA['drop_down_test'] = $options;
-
-require BASE.INCLUDES.'admin_smarty.php';
-require BASE.INCLUDES.'admin_footer.php';
+require("smarty.inc");
+require("footer.inc");

www/admin/table_arrays/array_edit_access.inc

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

www/admin/table_arrays/array_edit_groups.inc

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

www/admin/table_arrays/array_edit_languages.inc

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

www/admin/table_arrays/array_edit_menu_group.inc

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

www/admin/table_arrays/array_edit_pages.inc

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

www/admin/table_arrays/array_edit_schemes.inc

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

www/admin/table_arrays/array_edit_users.inc

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

www/admin/table_arrays/array_edit_visible_group.inc

@@ -0,0 +1,30 @@
+<?
+	$edit_visible_group = array (
+		"table_array" => array (
+			"edit_visible_group_id" => array (
+				"value" => $GLOBALS["edit_visible_group_id"],
+				"type" => "hidden",
+				"pk" => 1
+			),
+			"name" => array (
+				"value" => $GLOBALS["name"],
+				"output_name" => $this->l->__("Group name"),
+				"mandatory" => 1,
+				"type" => "text"
+			),
+			"flag" => array (
+				"value" => $GLOBALS["flag"],
+				"output_name" => $this->l->__("Flag"),
+				"mandatory" => 1,
+				"type" => "text",
+				"error_check" => "alphanumeric|unique"
+			)
+		),
+		"table_name" => "edit_visible_group",
+		"load_query" => "SELECT edit_visible_group_id, name FROM edit_visible_group ORDER BY name",
+		"show_fields" => array (
+			array (
+				"name" => "name"
+			)
+		)
+	);

www/admin/templates_c

@@ -0,0 +1 @@
+../templates_c/

www/admin/tmp

@@ -0,0 +1 @@
+../tmp/

www/admin/various_class_test.php

@@ -1,111 +0,0 @@
-<?php
-/**
- * @phan-file-suppress PhanTypeSuspiciousStringExpression
- */
-
-namespace CoreLibs;
-
-$DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
-$DEBUG_ALL = 1;
-$PRINT_ALL = 1;
-$DB_DEBUG = 1;
-
-// admin class tests
-require 'config.php';
-$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$base = new Basic();
-
-print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."<br>";
-print "DIR: ".DIR."<br>";
-print "BASE: ".BASE."<br>";
-print "ROOT: ".ROOT."<br>";
-print "HOST: ".HOST_NAME." => DB HOST: ".DB_CONFIG_NAME." => ".print_r(DB_CONFIG, true)."<br>";
-
-$text = 'I am some text
-with some
-line breaks
-in there. Theis 
-is sucky';
-
-print "LB remove: ".$base->removeLB($text)."<br>";
-print "LB remove: ".$base->removeLB($text, '##BR##')."<br>";
-
-// $test = array (
-// 	'A' => array (
-// 		'B' => array (),
-// 		'C' => array (
-// 			'D' => array (),
-// 			'E' => array (
-// 				'F' => array ()
-// 			)
-// 		)
-// 	),
-// 	'1' => array (),
-// 	'2' => array (),
-// 	'3' => array (
-// 		'G' => array ()
-// 	)
-// );
-
-// $base->debug('ARRAY', $base->printAr($test));
-
-function rec($pre, $cur, $node = array ())
-{
-	if (!is_array($node)) {
-		$node = array ();
-	}
-	print "<div style='color: green;'>#### PRE: ".$pre.", CUR: ".$cur.", N-c: ".count($node)." [".join('|', array_keys($node))."]</div>";
-	if (!$pre) {
-		print "** <span style='color: red;'>NEW</span><br>";
-		$node[$cur] = array ();
-	} else {
-		if (array_key_exists($pre, $node)) {
-			print "+ <span style='color: orange;'>KEY FOUND:</span> ".$pre.", add: ".$cur."<br>";
-			$node[$pre][$cur] = array ();
-		} else {
-			print "- NOT FOUND: loop<br>";
-			foreach ($node as $_pre => $_cur) {
-				print "> TRY: ".$_pre." => ".count($_cur)." [".join('|', array_keys($_cur))."]<br>";
-				if (count($_cur) > 0) {
-					$node[$_pre] = rec($pre, $cur, $_cur);
-				}
-			}
-		}
-	}
-	return $node;
-}
-
-function flattenArrayKey(array $array, array $return = array ())
-{
-	foreach ($array as $key => $sub) {
-		$return[] = $key;
-		if (count($sub) > 0) {
-			$return = flattenArrayKey($sub, $return);
-		}
-	}
-	return $return;
-}
-
-$test = array ();
-// core
-$test = rec('', 'A', $test);
-$test = rec('', '1', $test);
-$test = rec('', '2', $test);
-$test = rec('', '3', $test);
-$test = rec('3', 'G', $test);
-$test = rec('A', 'B', $test);
-$test = rec('A', 'C', $test);
-$test = rec('C', 'D', $test);
-$test = rec('C', 'E', $test);
-$test = rec('E', 'F', $test);
-// new
-$test = rec('C', 'U', $test);
-$test = rec('F', 'U', $test);
-$test = rec('', 'Al', $test);
-$test = rec('B', 'B1', $test);
-$base->debug('REC', $base->printAr($test));
-print "FLATTEN: ".$base->printAr(flattenArrayKey($test))."<br>";
-
-print $base->printErrorMsg();
-
-// __END__