Update include files for more cleaner work

- Class Basic convert string to bytes fix
- admin edit_* pages do not need JS except pop call, moved that into the
template and do not load any other JS anymore
- changed the EDIT_STYLESHEET/JAVACSRIPT names to ADMIN_ to give them
the proper name that they are admin based functions
- paths are in an extra config file
- plan on moving edit_* css rules into a special CSS file just for this

4dev/composer/install.txt

@@ -0,0 +1,21 @@
+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,5 +1,7 @@
 # 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
@@ -18,9 +20,11 @@ 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
@@ -33,3 +37,6 @@ 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,19 +5,63 @@
 #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="publicv";
+schema="public";
+export PGPASSWORD='';
 
-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;
+# 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;
 	fi;
-done;
+	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;

4dev/database/data/edit_tables.sql

@@ -0,0 +1,147 @@
+-- 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 ('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

@@ -0,0 +1,59 @@
+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

@@ -0,0 +1,18 @@
+-- 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

@@ -0,0 +1,15 @@
+-- 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

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

4dev/database/table/edit_access_right.sql

@@ -14,14 +14,3 @@ 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,6 +17,3 @@ 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 (
-	eg_status	INT,
+	cuid	VARCHAR,
 	date_created	TIMESTAMP WITHOUT TIME ZONE DEFAULT clock_timestamp(),
 	date_updated	TIMESTAMP WITHOUT TIME ZONE
 );

4dev/database/table/edit_group.sql

@@ -8,12 +8,10 @@
 -- DROP TABLE edit_group;
 CREATE TABLE edit_group (
 	edit_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR(50),
+	name	VARCHAR,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
 	edit_scheme_id INT,
 	edit_access_right_id INT NOT NULL,
 	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,12 +9,10 @@
 -- DROP TABLE edit_language;
 CREATE TABLE edit_language (
 	edit_language_id SERIAL PRIMARY KEY,
-	short_name VARCHAR(2),
-	long_name VARCHAR(70),
-	iso_name VARCHAR(12),
+	short_name VARCHAR,
+	long_name VARCHAR,
+	iso_name VARCHAR,
 	order_number INT,
 	enabled SMALLINT NOT NULL DEFAULT 0,
-	lang_default SMALLINT NOT NULL DEFAULT 0 UNIQUE
+	lang_default SMALLINT NOT NULL DEFAULT 0
 ) 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,11 +8,9 @@
 -- DROP TABLE edit_menu_group;
 CREATE TABLE edit_menu_group (
 	edit_menu_group_id	SERIAL PRIMARY KEY,
-	name	VARCHAR(255),
-	flag	VARCHAR(50),
+	name	VARCHAR,
+	flag	VARCHAR,
 	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

@@ -8,8 +8,8 @@
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
 	edit_page_id	SERIAL PRIMARY KEY,
-	filename	VARCHAR(70),
-	name	VARCHAR(255) UNIQUE,
+	filename	VARCHAR,
+	name	VARCHAR UNIQUE,
 	order_number INT NOT NULL,
 	online	SMALLINT NOT NULL DEFAULT 0,
 	menu	SMALLINT NOT NULL DEFAULT 0,
@@ -17,14 +17,3 @@ CREATE TABLE edit_page (
 	popup_x	SMALLINT,
 	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,12 +17,4 @@ 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_menu_group.sql

@@ -12,12 +12,3 @@ 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,12 +12,3 @@ 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(255),
-	value	VARCHAR(255),
+	name	VARCHAR,
+	value	VARCHAR,
 	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,12 +9,8 @@
 CREATE TABLE edit_scheme (
 	edit_scheme_id	SERIAL PRIMARY KEY,
 	enabled	SMALLINT NOT NULL DEFAULT 0,
-	name	VARCHAR(50),
-	header_color	VARCHAR(7),
-	css_file	VARCHAR(50),
-	template	VARCHAR(50)
+	name	VARCHAR,
+	header_color	VARCHAR,
+	css_file	VARCHAR,
+	template	VARCHAR
 ) 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(250)
+	filename	VARCHAR
 );

4dev/database/table/edit_user.sql

@@ -8,8 +8,13 @@
 -- 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,
 	debug	SMALLINT NOT NULL DEFAULT 0,
 	db_debug	SMALLINT NOT NULL DEFAULT 0,
@@ -21,18 +26,15 @@ CREATE TABLE edit_user (
 	edit_scheme_id INT,
 	edit_access_right_id INT NOT NULL,
 	login_error_count	INT,
-	login_error_date_last	TIMESTAMP WTIHOUT TIME ZONE,
-	login_error_date_first	TIMESTAMP WTIHOUT TIME ZONE,
+	login_error_date_last	TIMESTAMP WITHOUT TIME ZONE,
+	login_error_date_first	TIMESTAMP WITHOUT TIME ZONE,
 	strict	SMALLINT DEFAULT 0,
 	locked	SMALLINT DEFAULT 0,
 	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
 	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
+	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(255),
-	flag	VARCHAR(50)
+	name	VARCHAR,
+	flag	VARCHAR
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
 DELETE FROM edit_visible_group;

4dev/database/trigger/trg_edit_access.sql

@@ -1,4 +1,9 @@
--- 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_generic();
+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();

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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_right.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER trg_edit_access_right ON edit_access_right;
+DROP TRIGGER 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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_access_user.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER trg_edit_access_user ON edit_access_user;
+DROP TRIGGER 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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_log.sql

@@ -1,4 +1,9 @@
--- 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_generic();
+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();

4dev/database/trigger/trg_edit_menu_group.sql

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

4dev/database/trigger/trg_edit_page.sql

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

4dev/database/trigger/trg_edit_page_access.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER trg_edit_page_access ON edit_page_access;
+DROP TRIGGER 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_generic();
+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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_edit_scheme.sql

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

4dev/database/trigger/trg_edit_user.sql

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

4dev/database/trigger/trg_edit_visible_group.sql

@@ -1,4 +1,4 @@
--- DROP TRIGGER trg_edit_visible_group ON edit_visible_group;
+DROP TRIGGER 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_generic();
+FOR EACH ROW EXECUTE PROCEDURE set_edit_generic();

4dev/database/trigger/trg_set_edit_access_uid.sql

@@ -1,4 +0,0 @@
--- 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/sync/sync_template.sh

@@ -7,8 +7,8 @@ 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/";
-tmpf_web=$TMP_DIR"tmp.web";
+TMP_DIR=$LOCAL_BASE_DIR"/4dev/tmp/";
+tmpf_web=$TMP_DIR"sync.exclude.tmp";
 
 # for web (ika)
 rm -f $tmpf_web;

README.md

@@ -18,7 +18,9 @@ The active branch, which is the namespace branch
 
 ### legacy
 
-The old non namepsace format layout. This will only get bug fixes and no new development
+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
 
 ### namespace
 

www/admin/.htaccess

@@ -1,3 +1,4 @@
-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
+# all .inc files are denied access from outside
+<Files "*.inc">
+	Require all denied
+</Files>

www/admin/class_test.php

@@ -1,4 +1,5 @@
 <?php
+
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;
 $PRINT_ALL = 1;
@@ -13,9 +14,12 @@ ob_start();
 // basic class test file
 define('USE_DATABASE', true);
 // sample config
-require("config.inc");
+// require("config.inc");
+require 'config.php';
 // set session name
-DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+if (!defined('SET_SESSION_NAME')) {
+	DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+}
 // define log file id
 DEFINE('LOG_FILE_ID', 'classTest');
 // set language for l10n
@@ -28,7 +32,7 @@ ob_end_flush();
 
 // set + check edit access id
 $edit_access_id = 3;
-if (array_key_exists('unit', $login->acl)) {
+if (isset($login) && is_object($login) && isset($login->acl['unit'])) {
 	print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."<br>";
 	print "ACCESS CHECK: ".$login->loginCheckEditAccess($edit_access_id)."<br>";
 	if ($login->loginCheckEditAccess($edit_access_id)) {
@@ -64,14 +68,16 @@ print "CALLER BACKTRACE: ".$basic->getCallerMethod()."<br>";
 $basic->debug('SOME MARK', 'Some error output');
 
 print "EDIT ACCESS ID: ".$basic->edit_access_id."<br>";
-//	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);
+if (isset($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);
+}
 
 // DB client encoding
 print "DB Client encoding: ".$basic->dbGetEncoding()."<br>";
@@ -94,6 +100,9 @@ print "DIRECT MULTIPLE INSERT STATUS: $status | PRIMARY KEYS: ".print_r($basic->
 // no returning, but not needed ;
 $status = $basic->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
 print "DIRECT INSERT STATUS: $status | PRIMARY KEY: ".$basic->insert_id." | PRIMARY KEY EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
+// UPDATE WITH RETURNING
+$status = $basic->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
+print "UPDATE STATUS: $status | RETURNING EXT: ".print_r($basic->insert_id_ext, 1)."<br>";
 
 # db write class test
 $table = 'foo';
@@ -158,14 +167,14 @@ print "DB Version bigger than $to_db_version: ".$basic->dbCompareVersion('>='.$t
 print "DB Version bigger $to_db_version: ".$basic->dbCompareVersion('>'.$to_db_version)."<br>";
 
 /*	$q = "SELECT FOO FRO BAR";
-//	$q = "Select * from foo";
+// $q = "Select * from foo";
 $foo = $basic->dbExecAsync($q);
 print "[ERR] Query: ".$q."<br>";
 print "[ERR] RESOURCE: $foo<br>";
 while (($ret = $basic->dbCheckAsync()) === true)
 {
 	print "[ERR]: $ret<br>";
-//		sleep(5);
+	sleep(5);
 } */
 
 // search path check
@@ -181,8 +190,14 @@ print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$basic->pk_name.", P
 // time string thest
 $timestamp = 5887998.33445;
 $time_string = $basic->timeStringFormat($timestamp);
+print "PLANE TIME STRING: ".$timestamp."<br>";
 print "TIME STRING TEST: ".$time_string."<br>";
-print "REVERSE TIME STRING: ".$basic->stringToTime($time_string);
+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>";
+}
 
 // magic links test
 print $basic->magicLinks('user@bubu.at').'<br>';
@@ -193,8 +208,11 @@ $date_1 = '2017/1/5';
 $date_2 = '2017-01-05';
 print "COMPARE DATE: ".$basic->compareDate($date_1, $date_2)."<br>";
 
+
+// array re
+
 // print error messages
-print $login->printErrorMsg();
+// print $login->printErrorMsg();
 print $basic->printErrorMsg();
 
 print "</body></html>";

www/admin/config.inc

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

www/admin/config.php

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

www/admin/edit_access.php

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

www/admin/edit_base.inc

@@ -1,322 +0,0 @@
-<?php
-/********************************************************************
-* 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");
-// set session name here
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-// overrride debug flags
-if (!DEBUG)	{
-	$DEBUG_ALL = 0;
-	$PRINT_ALL = 0;
-	$DB_DEBUG = 0;
-	$ECHO_ALL = 0;
-}
-
-// set default lang if not set otherwise
-if (!$lang) {
-	$lang = DEFAULT_LANG;
-}
-// should be utf8
-header("Content-type: text/html; charset=".DEFAULT_ENCODING);
-ob_end_flush();
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
-
-// create form class
-$form = new CoreLibs\Output\Form\Generate($DB_CONFIG[MAIN_DB], $lang);
-$form->dbExec("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 CoreLibs\Template\SmartyExtend($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']->dbEscapeString($event)."', '".$GLOBALS['form']->dbEscapeString($data)."', '".$GLOBALS['form']->getPageName()."')";
-}
-
-// log backend data
-// data part creation
-$data = array (
-	'_SESSION' => $_SESSION,
-	'_GET' => $_GET,
-	'_POST' => $_POST,
-	'_FILES' => $_FILES
-);
-// log action
-EditLog('Edit Submit', serialize($data));
-
-$form->formProcedureLoad(${$form->archive_pk_name});
-$form->formProcedureNew();
-$form->formProcedureSave();
-$form->formProcedureDelete();
-$form->formProcedureDeleteFromElementList($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->formPrintMsg();
-$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->getPageName()) {
-		$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->formCreateLoad();
-$DATA['new'] = $form->formCreateNew();
-// SHOW DATA PART
-if ($form->yes) {
-	$DATA['form_yes'] = $form->yes;
-	$DATA['form_my_page_name'] = $form->my_page_name;
-
-	// depending on the "getPageName()" I show different stuff
-	switch ($form->my_page_name) {
-		case "edit_users":
-			$elements[] = $form->formCreateElement("login_error_count");
-			$elements[] = $form->formCreateElement("login_error_date_last");
-			$elements[] = $form->formCreateElement("login_error_date_first");
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("username");
-			$elements[] = $form->formCreateElement("password");
-			$elements[] = $form->formCreateElement("password_change_interval");
-			$elements[] = $form->formCreateElement("email");
-			$elements[] = $form->formCreateElement("last_name");
-			$elements[] = $form->formCreateElement("first_name");
-			$elements[] = $form->formCreateElement("edit_group_id");
-			$elements[] = $form->formCreateElement("edit_access_right_id");
-			$elements[] = $form->formCreateElement("strict");
-			$elements[] = $form->formCreateElement("locked");
-			$elements[] = $form->formCreateElement("admin");
-			$elements[] = $form->formCreateElement("debug");
-			$elements[] = $form->formCreateElement("db_debug");
-			$elements[] = $form->formCreateElement("edit_language_id");
-			$elements[] = $form->formCreateElement("edit_scheme_id");
-			$elements[] = $form->formCreateElementListTable("edit_access_user");
-			break;
-		case "edit_schemes":
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("header_color");
-			$elements[] = $form->formCreateElement("template");
-			break;
-		case "edit_pages":
-			if (!$form->table_array["edit_page_id"]["value"]) {
-				$q = "DELETE FROM temp_files";
-				$form->dbExec($q);
-				// gets all files in the current dir ending with .php
-				$crap = exec("ls *.php", $output, $status);
-				// now get all that are NOT in de DB
-				$q = "INSERT INTO temp_files VALUES ";
-				for ($i = 0; $i < count($output); $i ++) {
-					$t_q = "('".$form->dbEscapeString($output[$i])."')";
-					$form->dbExec($q.$t_q, 'NULL');
-				}
-				$elements[] = $form->formCreateElement("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->formCreateElement("name");
-			// $elements[] = $form->formCreateElement("tag");
-			// $elements[] = $form->formCreateElement("min_acl");
-			$elements[] = $form->formCreateElement("order_number");
-			$elements[] = $form->formCreateElement("online");
-			$elements[] = $form->formCreateElement("menu");
-			$elements[] = $form->formCreateElementListTable("edit_query_string");
-			$elements[] = $form->formCreateElement("popup");
-			$elements[] = $form->formCreateElement("popup_x");
-			$elements[] = $form->formCreateElement("popup_y");
-			$elements[] = $form->formCreateElementReferenceTable("edit_visible_group");
-			$elements[] = $form->formCreateElementReferenceTable("edit_menu_group");
-			break;
-		case "edit_languages":
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("short_name");
-			$elements[] = $form->formCreateElement("long_name");
-			$elements[] = $form->formCreateElement("iso_name");
-			break;
-		case "edit_groups":
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("edit_access_right_id");
-			$elements[] = $form->formCreateElement("edit_scheme_id");
-			$elements[] = $form->formCreateElementListTable("edit_page_access");
-			break;
-		case "edit_visible_group":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("flag");
-			break;
-		case "edit_menu_group":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("flag");
-			$elements[] = $form->formCreateElement("order_number");
-			break;
-		case "edit_access":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("color");
-			$elements[] = $form->formCreateElement("description");
-			// add name/value list here
-			$elements[] = $form->formCreateElementListTable("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->formCreateHiddenFields();
-	$DATA['save_delete'] = $form->formCreateSaveDelete();
-}
-
-// 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);
-}
-if (is_dir(BASE.TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE.TEMPLATES_C);
-}
-if (is_dir(BASE.CACHE)) {
-	$smarty->setCacheDir(BASE.CACHE);
-}
-$smarty->display('edit_body.tpl');
-
-// debug output
-echo $login->printErrorMsg();
-echo $form->printErrorMsg();
-
-# __END__

www/admin/edit_groups.php

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

www/admin/edit_languages.php

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

www/admin/edit_menu_group.php

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

www/admin/edit_order.php

@@ -1,196 +0,0 @@
-<?php
-/********************************************************************
-* 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");
-// set session name
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-// overrride debug flags
-if (!DEBUG) {
-	$DEBUG_ALL = 0;
-	$PRINT_ALL = 0;
-	$DB_DEBUG = 0;
-	$ECHO_ALL = 0;
-}
-
-// default lang
-if (!$lang) {
-	$lang = DEFAULT_LANG;
-}
-
-$table_width = 600;
-if (!$table_width) {
-	$table_width = PAGE_WIDTH;
-}
-
-ob_end_flush();
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
-$db = new CoreLibs\DB\IO($DB_CONFIG[MAIN_DB]);
-$db->dbExec("SET search_path TO ".LOGIN_DB_SCHEMA);
-$smarty = new CoreLibs\Template\SmartyExtend($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 ...
-	// hast to be >0 or the first one is selected and then there is no move
-	if ($up && $position[0] > 0) {
-		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
-
-	// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
-	if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
-		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 ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
-			$q = $db->dbExec($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->dbReturn($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->printErrorMsg();
-echo $db->printErrorMsg();
-
-# __END__
-

www/admin/edit_order.php

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

www/admin/edit_pages.php

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

www/admin/edit_schemes.php

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

www/admin/edit_users.php

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

www/admin/edit_visible_group.php

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

www/admin/error_test.php

@@ -10,7 +10,7 @@ if ($DEBUG_ALL) {
 }
 
 // sample config
-require("config.inc");
+require 'config.php';
 echo "FILE: ".BASE.LIB."Error.Handling.inc<br>";
 require(BASE.LIB."Error.Handling.inc");
 

www/admin/files.php

@@ -1,456 +0,0 @@
-<?php
-/********************************************************************
-* 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 = BASE.MEDIA.$cms->data_path[$file_type].$file;
-			// wipe out any old tmp data for this new upload
-			if (is_array(glob(BASE.TMP."thumb_".$file."*"))) {
-				foreach (glob(BASE.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->printAr($_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 .= ", '".BASE.MEDIA.$cms->data_path[$file_type].$file."#".BASE.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."', '".BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
-	}
-	@unlink(BASE.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(BASE.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/includes/Date.Vars.inc

@@ -1,51 +0,0 @@
-<?
-/********************************************************************
-* 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

@@ -0,0 +1,17 @@
+<?php
+
+// debug for L10n issues in php 7.3
+
+// namespace test
+ob_start();
+
+$lang = 'en_utf8';
+
+// admin class tests
+require 'config.php';
+$l = new CoreLibs\Language\L10n($lang);
+
+echo "OK<br>";
+
+ob_end_flush();
+// __END__

www/admin/namespace_test.php

@@ -11,7 +11,7 @@ $DB_DEBUG = 1;
 ob_start();
 
 // admin class tests
-require 'config.inc' ;
+require 'config.php';
 DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
 
 echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";

www/admin/qq_file_upload_ajax.php

@@ -0,0 +1,46 @@
+<?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 CoreLibs\Upload\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

@@ -0,0 +1,225 @@
+<?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

@@ -1,119 +0,0 @@
-<?php
-/********************************************************************
-* 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->getPageName(1))).' - '.$G_TITLE;
-// strip tpl and replace it with inc
-// php include file per page
-$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
-// javascript include per page
-$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
-// css per page
-$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
-// special CSS file
-$cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
-// special JS file
-$cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
-
-// 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].DS.MASTER_TEMPLATE_NAME)) {
-	if (file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME;
-	}
-	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-	$template_set = DEFAULT_TEMPLATE;
-} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$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_test.php

@@ -7,14 +7,45 @@ $DB_DEBUG = 1;
 $LOG_PER_RUN = 1;
 
 define('USE_DATABASE', true);
-require("header.inc");
+define('USE_HEADER', true);
+require 'config.php';
+require BASE.INCLUDES.'admin_header.inc';
 $MASTER_TEMPLATE_NAME = 'main_body.tpl';
 $TEMPLATE_NAME = 'smarty_test.tpl';
-$PAGE_WIDTH = 750;
-require("set_paths.inc");
+$CSS_NAME = 'smart_test.css';
+$USE_PROTOTYPE = false;
+$USE_JQUERY = true;
+if ($USE_PROTOTYPE) {
+	$EDIT_JAVASCRIPT = 'edit.pt.js';
+	$JS_NAME = 'prototype.test.js';
+} else if ($USE_JQUERY) {
+	$EDIT_JAVASCRIPT = 'edit.jq.js';
+	$JS_NAME = 'jquery.test.js';
+}
+$PAGE_WIDTH = "100%";
+require BASE.INCLUDES.'admin_set_paths.inc';
 
 // smarty test
 $cms->DATA['SMARTY_TEST'] = 'Test Data';
 
-require("smarty.inc");
-require("footer.inc");
+// 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.inc';
+require BASE.INCLUDES.'admin_footer.inc';

www/admin/table_arrays/array_edit_visible_group.inc

@@ -1,30 +0,0 @@
-<?
-	$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/various_class_test.php

@@ -0,0 +1,106 @@
+<?php
+
+$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.inc';
+require 'config.php';
+DEFINE('SET_SESSION_NAME', EDIT_SESSION_NAME);
+$base = new CoreLibs\Basic();
+
+print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."<br>";
+print "DIR: ".DIR."<br>";
+print "BASE: ".BASE."<br>";
+print "ROOT: ".ROOT."<br>";
+print "HOST: ".$HOST_NAME." => DB HOST: ".$DB_HOST[$HOST_NAME]." => ".MAIN_DB."<br>";
+
+$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;
+}
+
+// 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__

www/configs/config.db.inc

@@ -0,0 +1,25 @@
+<?php
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2018/10/11
+* SHORT DESCRIPTION:
+* configuration file for database settings
+* HISTORY:
+*********************************************************************/
+
+// please be VERY carefull only to change the right side
+$DB_CONFIG = array (
+	'test' => array (
+		'db_name' => 'gullevek',
+		'db_user' => 'gullevek',
+		'db_pass' => 'gullevek',
+		'db_host' => 'db.tokyo.tequila.jp',
+		'db_port' => '5432',
+		'db_schema' => 'public',
+		'db_type' => 'pgsql',
+		'db_encoding' => '',
+		'db_ssl' => 'disable' // allow, disable, require, prefer
+	)
+);
+
+// __END__

www/configs/config.host.inc

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

www/configs/config.inc

@@ -1,89 +1,77 @@
-<?
+<?php
 /********************************************************************
-* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
+* AUTHOR: Clemens Schwaighofer
 * CREATED: 2003/06/10
 * SHORT DESCRIPTION:
-*   configuration file
+* configuration file
 * HISTORY:
 *********************************************************************/
 
-/************* SESSION NAMES *************/
-// backend
-DEFINE('EDIT_SESSION_NAME', "<ADMIN SESSION NAME>");
-// frontend
-DEFINE('SESSION_NAME', "<SESSION NAME>");
-// set the session name
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-
-/************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', "en_utf8");
-// default web page encoding setting
-DEFINE('DEFAULT_ENCODING', "UTF-8");
-
 /************* PATHS *********************/
+// directory seperator
+DEFINE('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-DEFINE('DIR', __DIR__."/");
-// libs base path based on DIR
-DEFINE('LIBDIR', DIR.'libs/');
-// SMARTY path based on DIR
-DEFINE('SMARTYDIR', DIR.'Smarty/');
-// table arrays for Class Form
-DEFINE('TABLEARRAYDIR', DIR.'table_arrays/');
+DEFINE('DIR', __DIR__.DS);
+// base dir root folder level
+DEFINE('BASE', str_replace('/configs', '', __DIR__).DS);
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd()."/");
+DEFINE('ROOT', getcwd().DS);
 // libs path
-DEFINE('LIBS', "libs/");
+DEFINE('LIB', 'lib'.DS);
+DEFINE('LIBS', 'lib'.DS);
+// configs folder
+DEFINE('CONFIGS', 'configs'.DS);
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', "includes/");
+DEFINE('INCLUDES', 'includes'.DS);
+// data folder (mostly in includes)
+DEFINE('DATA', 'data'.DS);
 // layout base path
-DEFINE('LAYOUT', 'layout/');
+DEFINE('LAYOUT', 'layout'.DS);
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', "images/");
+DEFINE('PICTURES', 'images'.DS);
 // images
-DEFINE('IMAGES', "images/");
+DEFINE('IMAGES', 'images'.DS);
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons/');
+DEFINE('ICONS', 'icons'.DS);
 // media
-DEFINE('MEDIA', "media/");
+DEFINE('MEDIA', 'media'.DS);
 // flash-root (below media)
-DEFINE('FLASH', "flash/");
+DEFINE('FLASH', 'flash'.DS);
 // uploads (anything to keep)
-DEFINE('UPLOADS', "uploads/");
+DEFINE('UPLOADS', 'uploads'.DS);
 // files (binaries) (below media)
-DEFINE('BINARIES', "binaries/");
+DEFINE('BINARIES', 'binaries'.DS);
 // files (videos) (below media)
-DEFINE('VIDEOS', "videos/");
+DEFINE('VIDEOS', 'videos'.DS);
 // files (documents) (below media)
-DEFINE('DOCUMENTS', "documents/");
+DEFINE('DOCUMENTS', 'documents'.DS);
 // files (pdfs) (below media)
-DEFINE('PDFS', "documents/");
+DEFINE('PDFS', 'documents'.DS);
+// CSV
+DEFINE('CSV', 'csv'.DS);
 // css
-DEFINE('CSS', "css/");
+DEFINE('CSS', 'css'.DS);
 // js
-DEFINE('JS', "javascript/");
+DEFINE('JS', 'javascript'.DS);
 // table arrays
-DEFINE('TABLE_ARRAYS', "table_arrays/");
+DEFINE('TABLE_ARRAYS', 'table_arrays'.DS);
 // smarty libs path
-DEFINE('SMARTY', "Smarty/");
+DEFINE('SMARTY', 'Smarty'.DS);
 // po langs
-DEFINE('LANG', "lang/");
+DEFINE('LANG', 'lang'.DS);
 // cache path
-DEFINE('CACHE', "cache/");
+DEFINE('CACHE', 'cache'.DS);
 // temp path
-DEFINE('TMP', "tmp/");
+DEFINE('TMP', 'tmp'.DS);
 // log files
-DEFINE('LOG', 'log/');
+DEFINE('LOG', 'log'.DS);
+// compiled template folder
+DEFINE('TEMPLATES_C', 'templates_c'.DS);
 // template base
-DEFINE('TEMPLATES', "templates/");
-// frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', "templates_frontend/");
-// default template
-DEFINE('DEFAULT_TEMPLATE', "default/");
-// default template file
-DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
+DEFINE('TEMPLATES', 'templates'.DS);
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
@@ -99,16 +87,16 @@ DEFINE('DEFAULT_ACL_SEND', 70);
 DEFINE('DEFAULT_ACL_DEL', 80);
 DEFINE('DEFAULT_ACL_ADMIN', 100); */
 // SSL host name
-//	DEFINE('SSL_HOST', "ssl.host.name");
+//	DEFINE('SSL_HOST', 'ssl.host.name');
 // error page strictness, Default is 3
 // 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
 // 2: if template not found, do not search, show error template
 // 3: if default template is not found, show error template, do not fall back to default tree
 // 4: very strict, even on normal fixable errors through error
 //	DEFINE('ERROR_STRICT', 3);
-// allow page caching in general, set to "FALSE" if you do debugging or development!
+// allow page caching in general, set to 'FALSE' if you do debugging or development!
 //	DEFINE('ALLOW_SMARTY_CACHE', FALSE);
-// cache life time, in seconds, default here is 2 days (172800s)
+// cache life time, in second', default here is 2 days (172800s)
 // -1 is never expire cache
 //	DEFINE('SMARTY_CACHE_LIFETIME', -1);
 
@@ -117,6 +105,9 @@ DEFINE('DEFAULT_ACL_ADMIN', 100); */
 DEFINE('LOGOUT_TARGET', '');
 // password change allowed
 DEFINE('PASSWORD_CHANGE', false);
+// min/max password length
+DEFINE('PASSWORD_MIN_LENGTH', 8);
+DEFINE('PASSWORD_MAX_LENGTH', 255);
 
 /************* AJAX / ACCESS *************/
 // ajax request type
@@ -131,6 +122,30 @@ DEFINE('PAGE_WIDTH', 800);
 // the default template name
 DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 
+/************* SESSION NAMES *************/
+// server name HASH
+DEFINE('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
+// backend
+DEFINE('EDIT_SESSION_NAME', 'ADMIN_SESSION_NAME'.SERVER_NAME_HASH);
+// frontend
+DEFINE('SESSION_NAME', 'SESSION_NAME'.SERVER_NAME_HASH);
+// SET_SESSION_NAME should be set in the header if a special session name is needed
+// DEFINE('SET_SESSION_NAME', SESSION_NAME);
+
+/************* CACHE/COMPILE IDS *************/
+DEFINE('CACHE_ID', 'CACHE_'.SERVER_NAME_HASH);
+DEFINE('COMPILE_ID', 'COMPILE_'.SERVER_NAME_HASH);
+
+/************* LANGUAGE / ENCODING *******/
+DEFINE('DEFAULT_LANG', 'en_utf8');
+// default web page encoding setting
+DEFINE('DEFAULT_ENCODING', 'UTF-8');
+
+// below two can be defined here, but they should be
+// defined in either the header file or the file itself
+/************* LOGGING *******************/
+// DEFINE('LOG_FILE_ID', '');
+
 /************* QUEUE TABLE *************/
 // if we have a dev/live system
 // set_live is a per page/per item
@@ -142,45 +157,20 @@ DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 DEFINE('PUBLIC_SCHEMA', 'public');
 DEFINE('DEV_SCHEMA', 'public');
 DEFINE('TEST_SCHEMA', 'public');
+DEFINE('LIVE_SCHEMA', 'public');
 
-// non constant part
 /************* DB ACCESS *****************/
-// please be VERY carefull only to change the right side
-$DB_CONFIG = array (
-	"<db id>" => array (
-		"db_name" => "<database>",
-		"db_user" => "<user>",
-		"db_pass" => "<password>",
-		"db_host" => "<host>",
-		"db_port" => "5432",
-		"db_schema" => "public", // if not set, uses public
-		"db_type" => "pgsql",
-		"db_encoding" => '',
-		"db_ssl" => 'disable' // allow, disable, require, prefer
-	)
-);
-
-// File and Folder paths
-// ID is TARGET (first array element)
-//	$PATHS["test"]["csv_path"] = "";
-//	$PATHS["test"]["perl_bin"] = "";
-//	$PATHS["test"]["redirect_url"] = "";
-
-// each host has a different db_host
-// development host
-$DB_HOST['<host>'] = "<db id>";
-// target host (live)
-//	$DB_TARGET_HOST['<host>'] = "<DB ID>";
-// url redirect database
-//	$DB_URL_REDIRECT_HOST['<host>'] = "<DB ID>";
-// location flagging
-// test/dev/live
-$LOCATION['<host>'] = '<test|live|remote|etc>';
-// show DEBUG override
-// true/false
-$DEBUG_FLAG['<host>'] = true;
-// set postgresql paths (schemas)
-$DB_PATH['<host>'] = PUBLIC_SCHEMA;
+if (file_exists(BASE.CONFIGS.'config.db.inc')) {
+	require BASE.CONFIGS.'config.db.inc';
+}
+/************* CORE HOST SETTINGS *****************/
+if (file_exists(BASE.CONFIGS.'config.host.inc')) {
+	require BASE.CONFIGS.'config.host.inc';
+}
+/************* OTHER PATHS *****************/
+if (file_exists(BASE.CONFIGS.'config.path.inc')) {
+	require BASE.CONFIGS.'config.path.inc';
+}
 
 // set the USE_DATABASE var, if there is nothing set, we assume TRUE
 $USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;
@@ -188,40 +178,56 @@ $USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;
 // live frontend pages
 // ** missing live domains **
 // get the name without the port
-list($HOST_NAME, $PORT) = array_pad(explode(":", $_SERVER['HTTP_HOST'], 2), 2, null);
-if (!$DB_HOST[$HOST_NAME] && $USE_DATABASE) {
-	echo "No matching DB config found. Contact Admin<br>";
+list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
+if (!isset($DB_HOST[$HOST_NAME]) && $USE_DATABASE) {
+	echo 'No matching DB config found. Contact Admin<br>';
 	exit -1;
 }
-
+// set HOST name
+DEFINE('HOST_NAME', $HOST_NAME);
+// set SSL on
+if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
+	$_SERVER['SERVER_PORT'] == 443) {
+	DEFINE('HOST_SSL', true);
+	DEFINE('HOST_PROTOCOL', 'https://');
+} else {
+	DEFINE('HOST_SSL', false);
+	DEFINE('HOST_PROTOCOL', 'http://');
+}
 // define the static names
 DEFINE('LOGIN_DB', $DB_HOST[$HOST_NAME]);
 DEFINE('MAIN_DB', $DB_HOST[$HOST_NAME]);
 DEFINE('DB_SCHEMA', $DB_PATH[$HOST_NAME]);
-//	DEFINE('TARGET_DB', $DB_TARGET_HOST[$HOST_NAME]);
-//	DEFINE('URL_REDIRECT_DB', $DB_URL_REDIRECT_HOST[$HOST_NAME]);
+// DEFINE('TARGET_DB', $DB_TARGET_HOST[$HOST_NAME]);
+// DEFINE('URL_REDIRECT_DB', $DB_URL_REDIRECT_HOST[$HOST_NAME]);
 // next three if top is not set
-//	DEFINE('DEV_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
-//	DEFINE('TEST_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
-//	DEFINE('PUBLIC_SCHEMA', $DB_CONFIG[TARGET_DB]['db_schema']);
-DEFINE('LOGIN_DB_SCHEMA', 'public'); // where the edit* tables are
-DEFINE('GLOBAL_DB_SCHEMA', 'public'); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+// DEFINE('TEST_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
+// DEFINE('DEV_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
+// DEFINE('PUBLIC_SCHEMA', $DB_CONFIG[TARGET_DB]['db_schema']);
+DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
+DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
 DEFINE('TARGET', $LOCATION[$HOST_NAME]);
-//	DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
-//	DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
-//	DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
+// DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
+// DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
+// DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
 DEFINE('DEBUG', $DEBUG_FLAG[$HOST_NAME]);
-DEFINE('SHOW_ALL_ERRORS', false); // show all errors if debug_all & show_error_handling are enabled
+DEFINE('SITE_LANG', $SITE_LANG[$HOST_NAME]);
+
+DEFINE('SHOW_ALL_ERRORS', true); // show all errors if debug_all & show_error_handling are enabled
 
 /************* GENERAL PAGE TITLE ********/
-$G_TITLE = '<OVERALL PAGE TITLE>';
+DEFINE('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
 
 /************ STYLE SHEETS / JS **********/
-$EDIT_STYLESHEET = "edit.css";
-$EDIT_JAVASCRIPT = "edit.js";
+DEFINE('ADMIN_STYLESHEET', 'edit.css');
+DEFINE('ADMIN_JAVASCRIPT', 'edit.js');
+DEFINE('STYLESHEET', 'frontend.css');
+DEFINE('JAVASCRIPT', 'frontend.js');
 
-$STYLESHEET = "frontend.css";
-$JAVASCRIPT = "frontend.js";
+// anything optional
+/************* INTERNAL ******************/
+// any other global definitons here
+//	DEFINE('SOME_ID', <SOME VALUE>);
 
 /************* CONVERT *******************/
 $paths = array (
@@ -231,45 +237,27 @@ $paths = array (
 );
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path."/convert") && is_file($path."/convert")) {
+	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
 		// image magick convert location
-		DEFINE('CONVERT', $path."/convert");
+		DEFINE('CONVERT', $path.DS.'convert');
 	}
 }
 
 // turn off debug if debug flag is OFF
-if (DEBUG == false) {
+if (defined('DEBUG') && DEBUG == false) {
 	$ECHO_ALL = 0;
 	$DEBUG_ALL = 0;
 	$PRINT_ALL = 0;
 	$DB_DEBUG = 0;
 	$ENABLE_ERROR_HANDLING = 0;
+} else {
+	$ECHO_ALL = 0;
+	$DEBUG_ALL = 1;
+	$PRINT_ALL = 1;
+	$DB_DEBUG = 1;
 }
 
-// any other global definitons here
-//	DEFINE('SOME_ID', <SOME VALUE>);
+// read auto loader
+require BASE.LIB.'autoloader.php';
 
-// function that will be called on top of each class include to load the class
-function _spl_autoload($include_file)
-{
-	// where to search for the files to include
-	$dirs = array (
-		LIBDIR,
-		SMARTYDIR,
-		TABLEARRAYDIR,
-		'',
-		LIBS,
-		SMARTY,
-		TABLE_ARRAYS,
-		__DIR__.'/'.LIBS,
-		__DIR__.'/'.SMARTY
-	);
-	// try to find and load the class ifle
-	foreach ($dirs as $folder) {
-		if (file_exists($folder.$include_file))	{
-			require_once($folder.$include_file);
-			return true;
-		}
-	}
-	return false;
-}
+// __END__

www/configs/config.path.inc

@@ -0,0 +1,17 @@
+<?php
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2018/10/11
+* SHORT DESCRIPTION:
+* configuration file for core path settings
+* CSV target paths, and other download access URLS or paths needed
+* HISTORY:
+*********************************************************************/
+
+// File and Folder paths
+// ID is TARGET (first array element)
+//	$PATHS['test']['csv_path'] = '';
+//	$PATHS['test']['perl_bin'] = '';
+//	$PATHS['test']['redirect_url'] = '';
+
+// __END__

www/configs/config.php

@@ -0,0 +1,32 @@
+<?php
+/********************************************************************
+* AUTHOR: Clemens Schwaighofer
+* CREATED: 2018/10/11
+* SHORT DESCRIPTION:
+* pre config included -> includes master config
+* HISTORY:
+*********************************************************************/
+
+define('CONFIG_PATH', 'configs'.DIRECTORY_SEPARATOR);
+// config path prefix search, start with 0, got down each level __DIR__ has, if nothing found -> bail
+$CONFIG_PATH_PREFIX = '';
+for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
+	$CONFIG_PATH_PREFIX .= '..'.DIRECTORY_SEPARATOR;
+	if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc')) {
+		require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.inc';
+		break;
+	}
+}
+// fail if no base DS is not set
+if (!defined('DS')) {
+	exit('Base config unloadable');
+}
+// find trigger name "admin/" or "frontend/" in the getcwd() folder
+foreach (array ('admin', 'frontend') as $folder) {
+	if (strstr(getcwd(), DS.$folder)) {
+		define('CONTENT_PATH', $folder.DS);
+		break;
+	}
+}
+
+// __END__

www/configs/config.template.inc

@@ -1,254 +0,0 @@
-<?php
-/********************************************************************
-* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
-* CREATED: 2003/06/10
-* SHORT DESCRIPTION:
-*   configuration file
-* HISTORY:
-*********************************************************************/
-
-/************* SESSION NAMES *************/
-// backend
-DEFINE('EDIT_SESSION_NAME', "<ADMIN SESSION NAME>");
-// frontend
-DEFINE('SESSION_NAME', "<SESSION NAME>");
-// set the session name
-define('SET_SESSION_NAME', EDIT_SESSION_NAME);
-
-/************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', "en_utf8");
-// default web page encoding setting
-DEFINE('DEFAULT_ENCODING', "UTF-8");
-
-/************* PATHS *********************/
-// directory seperator
-DEFINE('DS', DIRECTORY_SEPARATOR);
-// ** NEW/BETTER DIR DECLARATIONS **
-// path to original file (if symlink)
-DEFINE('DIR', __DIR__.DS);
-// base dir root folder level
-DEFINE('BASE', str_replace('configs', '', __DIR__));
-
-// ** OLD DIR DECLARATIONS **
-// path to document root of file called
-DEFINE('ROOT', getcwd().DS);
-// libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
-// includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
-// layout base path
-DEFINE('LAYOUT', 'layout'.DS);
-// pic-root (compatible to CMS)
-DEFINE('PICTURES', "images".DS);
-// images
-DEFINE('IMAGES', "images".DS);
-// icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
-// media
-DEFINE('MEDIA', "media".DS);
-// flash-root (below media)
-DEFINE('FLASH', "flash".DS);
-// uploads (anything to keep)
-DEFINE('UPLOADS', "uploads".DS);
-// files (binaries) (below media)
-DEFINE('BINARIES', "binaries".DS);
-// files (videos) (below media)
-DEFINE('VIDEOS', "videos".DS);
-// files (documents) (below media)
-DEFINE('DOCUMENTS', "documents".DS);
-// files (pdfs) (below media)
-DEFINE('PDFS', "documents".DS);
-// css
-DEFINE('CSS', "css".DS);
-// js
-DEFINE('JS', "javascript".DS);
-// table arrays
-DEFINE('TABLE_ARRAYS', "table_arrays".DS);
-// smarty libs path
-DEFINE('SMARTY', "Smarty".DS);
-// po langs
-DEFINE('LANG', "lang".DS);
-// cache path
-DEFINE('CACHE', "cache".DS);
-// temp path
-DEFINE('TMP', "tmp".DS);
-// log files
-DEFINE('LOG', 'log'.DS);
-// template base
-DEFINE('TEMPLATES', "templates".DS);
-// frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', "templates_frontend".DS);
-// default template
-DEFINE('DEFAULT_TEMPLATE', "default".DS);
-// default template file
-DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
-
-/************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
-// default hash type
-DEFINE('DEFAULT_HASH', 'sha256');
-// default acl level
-DEFINE('DEFAULT_ACL_LEVEL', 80);
-// default levels for certain actions
-/*	DEFINE('DEFAULT_ACL_READ', 20);
-DEFINE('DEFAULT_ACL_CONFIRM', 35);
-DEFINE('DEFAULT_ACL_MOD', 40);
-DEFINE('DEFAULT_ACL_WRITE', 60);
-DEFINE('DEFAULT_ACL_SEND', 70);
-DEFINE('DEFAULT_ACL_DEL', 80);
-DEFINE('DEFAULT_ACL_ADMIN', 100); */
-// SSL host name
-//	DEFINE('SSL_HOST', "ssl.host.name");
-// error page strictness, Default is 3
-// 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
-// 2: if template not found, do not search, show error template
-// 3: if default template is not found, show error template, do not fall back to default tree
-// 4: very strict, even on normal fixable errors through error
-//	DEFINE('ERROR_STRICT', 3);
-// allow page caching in general, set to "FALSE" if you do debugging or development!
-//	DEFINE('ALLOW_SMARTY_CACHE', FALSE);
-// cache life time, in seconds, default here is 2 days (172800s)
-// -1 is never expire cache
-//	DEFINE('SMARTY_CACHE_LIFETIME', -1);
-
-/************* LOGOUT ********************/
-// logout target
-DEFINE('LOGOUT_TARGET', '');
-// password change allowed
-DEFINE('PASSWORD_CHANGE', false);
-
-/************* AJAX / ACCESS *************/
-// ajax request type
-DEFINE('AJAX_REQUEST_TYPE', 'POST');
-// what AJAX type to use
-DEFINE('USE_PROTOTYPE', true);
-DEFINE('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', false);
-
-/************* LAYOUT WIDTHS *************/
-DEFINE('PAGE_WIDTH', 800);
-// the default template name
-DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
-
-/************* QUEUE TABLE *************/
-// if we have a dev/live system
-// set_live is a per page/per item
-// live_queue is a global queue system
-//	DEFINE('QUEUE', 'live_queue');
-
-/************* DB PATHS (PostgreSQL) *****************/
-// schema names, can also be defined per <DB INFO>
-DEFINE('PUBLIC_SCHEMA', 'public');
-DEFINE('DEV_SCHEMA', 'public');
-DEFINE('TEST_SCHEMA', 'public');
-
-// non constant part
-/************* DB ACCESS *****************/
-// please be VERY carefull only to change the right side
-$DB_CONFIG = array (
-	"<DB ID>" => array (
-		"db_name" => "<DB NAME>",
-		"db_user" => "<DB USER>",
-		"db_pass" => "<DB PASSWORD>",
-		"db_host" => "<DB HOST>",
-		"db_port" => "5432",
-		"db_schema" => "<DB SCHEMA>", // if not set, uses public
-		"db_type" => "pgsql",
-		"db_encoding" => '',
-		"db_ssl" => 'disable' // allow, disable, require, prefer
-	)
-);
-
-// File and Folder paths
-// ID is TARGET (first array element)
-//	$PATHS["test"]["csv_path"] = "";
-//	$PATHS["test"]["perl_bin"] = "";
-//	$PATHS["test"]["redirect_url"] = "";
-
-// each host has a different db_host
-// development host
-$DB_HOST['<HOST NAME>'] = "<DB ID>";
-// target host (live)
-//	$DB_TARGET_HOST['<HOST NAME>'] = "<DB ID>";
-// url redirect database
-//	$DB_URL_REDIRECT_HOST['<HOST NAME>'] = "<DB ID>";
-// location flagging
-// test/dev/live
-$LOCATION['<HOST NAME>'] = '<test|live|remote|etc>';
-// show DEBUG override
-// true/false
-$DEBUG_FLAG['<HOST NAME>'] = true;
-// set postgresql paths (schemas)
-$DB_PATH['<HOST NAME>'] = PUBLIC_SCHEMA;
-
-// set the USE_DATABASE var, if there is nothing set, we assume TRUE
-$USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;
-
-// live frontend pages
-// ** missing live domains **
-// get the name without the port
-list($HOST_NAME, $PORT) = array_pad(explode(":", $_SERVER['HTTP_HOST'], 2), 2, null);
-if (!$DB_HOST[$HOST_NAME] && $USE_DATABASE) {
-	echo "No matching DB config found. Contact Admin<br>";
-	exit -1;
-}
-
-// define the static names
-DEFINE('LOGIN_DB', $DB_HOST[$HOST_NAME]);
-DEFINE('MAIN_DB', $DB_HOST[$HOST_NAME]);
-DEFINE('DB_SCHEMA', $DB_PATH[$HOST_NAME]);
-//	DEFINE('TARGET_DB', $DB_TARGET_HOST[$HOST_NAME]);
-//	DEFINE('URL_REDIRECT_DB', $DB_URL_REDIRECT_HOST[$HOST_NAME]);
-// next three if top is not set
-//	DEFINE('DEV_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
-//	DEFINE('TEST_SCHEMA', $DB_CONFIG[MAIN_DB]['db_schema']);
-//	DEFINE('PUBLIC_SCHEMA', $DB_CONFIG[TARGET_DB]['db_schema']);
-DEFINE('LOGIN_DB_SCHEMA', 'public'); // where the edit* tables are
-DEFINE('GLOBAL_DB_SCHEMA', 'public'); // where global tables are that are used by all schemas (eg queue tables for online, etc)
-DEFINE('TARGET', $LOCATION[$HOST_NAME]);
-//	DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
-//	DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
-//	DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
-DEFINE('DEBUG', $DEBUG_FLAG[$HOST_NAME]);
-DEFINE('SHOW_ALL_ERRORS', false); // show all errors if debug_all & show_error_handling are enabled
-
-/************* GENERAL PAGE TITLE ********/
-$G_TITLE = '<OVERALL PAGE TITLE>';
-
-/************ STYLE SHEETS / JS **********/
-$EDIT_STYLESHEET = "edit.css";
-$EDIT_JAVASCRIPT = "edit.js";
-
-$STYLESHEET = "frontend.css";
-$JAVASCRIPT = "frontend.js";
-
-/************* CONVERT *******************/
-$paths = array (
-	'/bin',
-	'/usr/bin',
-	'/usr/local/bin'
-);
-// find convert
-foreach ($paths as $path) {
-	if (file_exists($path."/convert") && is_file($path."/convert")) {
-		// image magick convert location
-		DEFINE('CONVERT', $path."/convert");
-	}
-}
-
-// turn off debug if debug flag is OFF
-if (DEBUG == false) {
-	$ECHO_ALL = 0;
-	$DEBUG_ALL = 0;
-	$PRINT_ALL = 0;
-	$DB_DEBUG = 0;
-	$ENABLE_ERROR_HANDLING = 0;
-}
-
-// any other global definitons here
-//	DEFINE('SOME_ID', <SOME VALUE>);
-
-// read auto loader
-require BASE.LIB.'autoloader.php';
-
-# __END__

www/frontend/.htaccess

@@ -0,0 +1,7 @@
+RewriteEngine on
+# not a file
+RewriteCond %{REQUEST_FILENAME}       !-f
+# not a directory
+RewriteCond %{REQUEST_FILENAME}       !-d
+# throw the whole path to the url as form parameter
+RewriteRule (.*)                      index.php?path=$1  [QSA,L]

www/frontend/config.php

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

www/frontend/foo/config.php

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

www/frontend/foo/index.php

@@ -0,0 +1,3 @@
+<?php
+
+require 'config.php';

www/frontend/index.php

@@ -0,0 +1,3 @@
+<?php
+
+require 'config.php';

www/includes/Date.Vars.inc

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

www/includes/admin_footer.inc

@@ -10,3 +10,5 @@
 // print debug messages
 echo $login->printErrorMsg();
 echo $cms->printErrorMsg();
+
+// __END__

www/includes/admin_header.inc

@@ -10,7 +10,7 @@
 //------------------------------ 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("libs/Error.Handling.inc");
+	include BASE.LIBS."Error.Handling.inc";
 }
 // predefine vars
 $lang = '';
@@ -22,7 +22,6 @@ extract($_POST, EXTR_SKIP);
 //------------------------------ library include start
 // set output to quiet for load of classes & session settings
 ob_start();
-require("config.inc");
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
@@ -34,12 +33,14 @@ if (!isset($encoding)) {
 if (session_id() && $_SESSION['DEFAULT_LANG']) {
 	$lang = $_SESSION['DEFAULT_LANG'];
 } elseif (!$lang) {
-	$lang = DEFAULT_LANG;
+	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
 }
 // end the stop of the output flow, but only if we didn't request a csv file download
 if (array_key_exists('action', $_POST) && $_POST['action'] != 'download_csv') {
 	header("Content-type: text/html; charset=".$encoding);
-	ob_end_flush();
+}
+if ($AJAX_PAGE && !$ZIP_STREAM) {
+	header("Content-Type: application/json; charset=UTF-8");
 }
 //------------------------------ basic variable settings start
 
@@ -60,6 +61,8 @@ $cms->menu_show_flag = 'main';
 $cms->dbInfo();
 // set acl
 $cms->acl = $login->acl;
+// flush
+ob_end_flush();
 //------------------------------ class init end
 
 //------------------------------ logging start
@@ -95,3 +98,5 @@ if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) {
 	$cms->print_output_all = 0;
 }
 $cms->DATA['JS_DEBUG'] = DEBUG;
+
+// __END__

www/includes/admin_set_paths.inc

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

www/includes/admin_smarty.inc

@@ -8,41 +8,13 @@
 *********************************************************************/
 
 // trigger flags
-$cms->HEADER['USE_PROTOTYPE'] = USE_PROTOTYPE;
+$cms->HEADER['USE_PROTOTYPE'] = isset($USE_PROTOTYPE) ? $USE_PROTOTYPE : USE_PROTOTYPE;
 // scriptacolous, can only be used with prototype
-if (USE_PROTOTYPE) {
-	$cms->HEADER['USE_SCRIPTACULOUS'] = USE_SCRIPTACULOUS;
+if ($cms->HEADER['USE_PROTOTYPE']) {
+	$cms->HEADER['USE_SCRIPTACULOUS'] = isset($USE_SCRIPTACULOUS) ? $USE_SCRIPTACULOUS : USE_SCRIPTACULOUS;
 }
 // jquery and prototype should not be used together
-$cms->HEADER['USE_JQUERY'] = 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)) {
-	include($cms->includes.$cms->INC_TEMPLATE_NAME);
-}
-// additional per page Javascript include
-$cms->JS_INCLUDE = '';
-if (file_exists($cms->javascript.$cms->JS_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_TEMPLATE_NAME)) {
-	$cms->JS_INCLUDE = $cms->javascript.$cms->JS_TEMPLATE_NAME;
-}
-// per page css file
-$cms->CSS_INCLUDE = '';
-if (file_exists($cms->css.$cms->CSS_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_TEMPLATE_NAME)) {
-	$cms->CSS_INCLUDE = $cms->css.$cms->CSS_TEMPLATE_NAME;
-}
-// optional CSS file
-$cms->CSS_SPECIAL_INCLUDE = '';
-if (file_exists($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME) && is_file($cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME)) {
-	$cms->CSS_SPECIAL_INCLUDE = $cms->css.$cms->CSS_SPECIAL_TEMPLATE_NAME;
-}
-// optional JS file
-$cms->JS_SPECIAL_INCLUDE = '';
-if (file_exists($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME) && is_file($cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME)) {
-	$cms->JS_SPECIAL_INCLUDE = $cms->javascript.$cms->JS_SPECIAL_TEMPLATE_NAME;
-}
+$cms->HEADER['USE_JQUERY'] = isset($USE_JQUERY) ? $USE_JQUERY : USE_JQUERY; // don't use either of those two together
 
 // the actual include files for javascript (per page)
 $cms->HEADER['JS_INCLUDE'] = $cms->JS_INCLUDE;
@@ -61,11 +33,11 @@ $cms->HEADER['CSS'] = CSS;
 $cms->HEADER['JS'] = JS;
 $cms->HEADER['ENCODING'] = $encoding;
 $cms->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
-$cms->HEADER['STYLESHEET'] = $EDIT_STYLESHEET;
-$cms->HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
+$cms->HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET;
+$cms->HEADER['JAVASCRIPT'] = isset($ADMIN_JAVASCRIPT) ? $ADMIN_JAVASCRIPT : ADMIN_JAVASCRIPT;
 // html title
-$cms->HEADER['HTML_TITLE'] = (!isset($L_TITLE) || !$L_TITLE) ? $cms->l->__($G_TITLE) : $cms->l->__($L_TITLE);
-$cms->DATA['table_width'] = $PAGE_WIDTH ? $PAGE_WIDTH : PAGE_WIDTH;
+$cms->HEADER['HTML_TITLE'] = isset($L_TITLE) ? $cms->l->__($L_TITLE) : $cms->l->__(G_TITLE);
+$cms->DATA['table_width'] = isset($PAGE_WIDTH) ? $PAGE_WIDTH : PAGE_WIDTH;
 
 // messages = array('msg' =>, 'class' => 'error/warning/...')
 $cms->DATA['messages'] = $cms->messages;
@@ -90,7 +62,7 @@ $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)
-while (list($key, $value) = each($cms->CONTENT_DATA)) {
+foreach ($cms->CONTENT_DATA as $key => $value) {
 	$smarty->assign($key, $value);
 }
 if (is_dir(BASE.TEMPLATES_C)) {
@@ -99,4 +71,10 @@ if (is_dir(BASE.TEMPLATES_C)) {
 if (is_dir(BASE.CACHE)) {
 	$smarty->setCacheDir(BASE.CACHE);
 }
-$smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang);
+$smarty->display(
+	$MASTER_TEMPLATE_NAME,
+	$cms->CACHE_ID.($cms->CACHE_ID ? '_' : '').$lang,
+	$cms->COMPILE_ID.($cms->COMPILE_ID ? '_' : '').$lang
+);
+
+// __END__

www/includes/edit_base.inc

@@ -0,0 +1,446 @@
+<?php
+/********************************************************************
+* 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;
+$PRINT_ALL = 1;
+$DB_DEBUG = 1;
+
+// TODO: only extract _POST data that is needed
+extract($_POST, EXTR_SKIP);
+
+$table_width = '100%';
+// this is for certain CMS modules that set a relative path
+define('REL_PATH', '');
+
+ob_start();
+require 'config.php';
+// set session name here
+define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+// overrride debug flags
+if (!DEBUG)	{
+	$DEBUG_ALL = 0;
+	$PRINT_ALL = 0;
+	$DB_DEBUG = 0;
+	$ECHO_ALL = 0;
+}
+
+// set default lang if not set otherwise
+if (!$lang) {
+	$lang = DEFAULT_LANG;
+}
+// should be utf8
+header("Content-type: text/html; charset=".DEFAULT_ENCODING);
+ob_end_flush();
+$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+
+// create form class
+$form = new CoreLibs\Output\Form\Generate($DB_CONFIG[MAIN_DB], $lang);
+if ($form->mobile_phone) {
+	echo "I am sorry, but this page cannot be viewed by a mobile phone";
+	exit;
+}
+// smarty template engine (extended Translation version)
+$smarty = new CoreLibs\Template\SmartyExtend($lang);
+
+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(BASE.INCLUDES.TEMPLATES.CONTENT_PATH);
+	$DATA['css'] = LAYOUT.CSS;
+	$DATA['js'] = LAYOUT.JS;
+} else {
+	$smarty->setTemplateDir(TEMPLATES);
+	$DATA['css'] = CSS;
+	$DATA['js'] = JS;
+}
+
+// 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']->dbEscapeString($event)."', '".$GLOBALS['form']->dbEscapeString($data)."', '".$GLOBALS['form']->getPageName()."')";
+}
+
+// log backend data
+// data part creation
+$data = array (
+	'_SESSION' => $_SESSION,
+	'_GET' => $_GET,
+	'_POST' => $_POST,
+	'_FILES' => $_FILES
+);
+// log action
+EditLog('Edit Submit', serialize($data));
+
+// define all needed smarty stuff for the general HTML/page building
+$HEADER['CSS'] = CSS;
+$HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
+$HEADER['STYLESHEET'] = isset($ADMIN_STYLESHEET) ? $ADMIN_STYLESHEET : ADMIN_STYLESHEET;
+
+if ($form->my_page_name == 'edit_order') {
+	// get is for "table_name" and "where" only
+	$table_name = isset($_GET['table_name']) ? $_GET['table_name'] : '';
+	// $where = isset($_GET['where']) ? $_GET['where'] : '';
+	// 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 (!is_array($position)) {
+		$position = array ();
+	}
+	if (count($position)) {
+		$original_id = $row_data_id;
+
+		// FIRST u have to put right sort, then read again ...
+		// hast to be >0 or the first one is selected and then there is no move
+		if ($up && $position[0] > 0) {
+			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
+
+		// the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+		if ($down && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
+			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 ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
+				$q = $form->dbExec($q);
+			} // for all article ids ...
+		} // if write
+	} // if there is something to move
+
+	// 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 = $form->dbReturn($q)) {
+		$row_data[] = array (
+			"id" => $res[$table_name."_id"],
+			"name" => $res["name"],
+			"order" => $res["order_number"]
+		);
+	} // while read data ...
+
+	// html title
+	$HEADER['HTML_TITLE'] = $form->l->__('Edit Order');
+
+	// error msg
+	if ($error) {
+		$messages[] = array ('msg' => $msg, 'class' => 'error', 'width' => '100%');
+	}
+	$DATA['form_error_msg'] = $messages;
+
+	// all the row data
+	$options_id = array ();
+	$options_name = array ();
+	$options_selected = array ();
+	if (!is_array($row_data)) {
+		$row_data = array ();
+	}
+	for ($i = 0; $i < count($row_data); $i ++) {
+		$options_id[] = $i;
+		$options_name[] = $row_data[$i]["name"];
+		// 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;
+
+	$EDIT_TEMPLATE = 'edit_order.tpl';
+} else {
+	$form->formProcedureLoad(${$form->archive_pk_name});
+	$form->formProcedureNew();
+	$form->formProcedureSave();
+	$form->formProcedureDelete();
+	$form->formProcedureDeleteFromElementList($element_list, $remove_name);
+
+	$DATA['table_width'] = $table_width;
+
+	// write out error / status messages
+	$messages[] = $form->formPrintMsg();
+	$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->printAr($PAGES));
+
+	// build nav from $PAGES ...
+	if (!is_array($PAGES)) {
+		$PAGES = array ();
+	}
+	for ($i = 0, $i_max = count($PAGES); $i < $i_max; $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->getPageName()) {
+			$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'] = $form->l->__($L_TITLE);
+	// END MENU
+	// LOAD AND NEW
+	$DATA['load'] = $form->formCreateLoad();
+	$DATA['new'] = $form->formCreateNew();
+	// SHOW DATA PART
+	if ($form->yes) {
+		$DATA['form_yes'] = $form->yes;
+		$DATA['form_my_page_name'] = $form->my_page_name;
+
+		// depending on the "getPageName()" I show different stuff
+		switch ($form->my_page_name) {
+			case "edit_users":
+				$elements[] = $form->formCreateElement("login_error_count");
+				$elements[] = $form->formCreateElement("login_error_date_last");
+				$elements[] = $form->formCreateElement("login_error_date_first");
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement("username");
+				$elements[] = $form->formCreateElement("password");
+				$elements[] = $form->formCreateElement("password_change_interval");
+				$elements[] = $form->formCreateElement("email");
+				$elements[] = $form->formCreateElement("last_name");
+				$elements[] = $form->formCreateElement("first_name");
+				$elements[] = $form->formCreateElement("edit_group_id");
+				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement("strict");
+				$elements[] = $form->formCreateElement("locked");
+				$elements[] = $form->formCreateElement("admin");
+				$elements[] = $form->formCreateElement("debug");
+				$elements[] = $form->formCreateElement("db_debug");
+				$elements[] = $form->formCreateElement("edit_language_id");
+				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElementListTable("edit_access_user");
+				break;
+			case "edit_schemes":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("header_color");
+				$elements[] = $form->formCreateElement("template");
+				break;
+			case "edit_pages":
+				if (!$form->table_array["edit_page_id"]["value"]) {
+					$q = "DELETE FROM temp_files";
+					$form->dbExec($q);
+					// gets all files in the current dir ending with .php
+					$crap = exec("ls *.php", $output, $status);
+					// now get all that are NOT in de DB
+					$q = "INSERT INTO temp_files VALUES ";
+					for ($i = 0; $i < count($output); $i ++) {
+						$t_q = "('".$form->dbEscapeString($output[$i])."')";
+						$form->dbExec($q.$t_q, 'NULL');
+					}
+					$elements[] = $form->formCreateElement("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->formCreateElement("name");
+				// $elements[] = $form->formCreateElement("tag");
+				// $elements[] = $form->formCreateElement("min_acl");
+				$elements[] = $form->formCreateElement("order_number");
+				$elements[] = $form->formCreateElement("online");
+				$elements[] = $form->formCreateElement("menu");
+				$elements[] = $form->formCreateElementListTable("edit_query_string");
+				$elements[] = $form->formCreateElement("popup");
+				$elements[] = $form->formCreateElement("popup_x");
+				$elements[] = $form->formCreateElement("popup_y");
+				$elements[] = $form->formCreateElementReferenceTable("edit_visible_group");
+				$elements[] = $form->formCreateElementReferenceTable("edit_menu_group");
+				break;
+			case "edit_languages":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("short_name");
+				$elements[] = $form->formCreateElement("long_name");
+				$elements[] = $form->formCreateElement("iso_name");
+				break;
+			case "edit_groups":
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("edit_access_right_id");
+				$elements[] = $form->formCreateElement("edit_scheme_id");
+				$elements[] = $form->formCreateElementListTable("edit_page_access");
+				break;
+			case "edit_visible_group":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("flag");
+				break;
+			case "edit_menu_group":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("flag");
+				$elements[] = $form->formCreateElement("order_number");
+				break;
+			case "edit_access":
+				$elements[] = $form->formCreateElement("name");
+				$elements[] = $form->formCreateElement("enabled");
+				$elements[] = $form->formCreateElement("protected");
+				$elements[] = $form->formCreateElement("color");
+				$elements[] = $form->formCreateElement("description");
+				// add name/value list here
+				$elements[] = $form->formCreateElementListTable("edit_access_data");
+				break;
+			default:
+				print "[No valid page definition given]";
+				break;
+		}
+		// $form->debug('edit', "Elements: <pre>".$form->printAr($elements));
+		$DATA['elements'] = $elements;
+		$DATA['hidden'] = $form->formCreateHiddenFields();
+		$DATA['save_delete'] = $form->formCreateSaveDelete();
+	}
+	$EDIT_TEMPLATE = 'edit_body.tpl';
+}
+
+// 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)
+foreach ($CONTENT_DATA as $key => $value) {
+	$smarty->assign($key, $value);
+}
+if (is_dir(BASE.TEMPLATES_C)) {
+	$smarty->setCompileDir(BASE.TEMPLATES_C);
+}
+if (is_dir(BASE.CACHE)) {
+	$smarty->setCacheDir(BASE.CACHE);
+}
+$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$lang, 'editAdmin_'.$lang);
+
+// debug output
+echo $login->printErrorMsg();
+echo $form->printErrorMsg();
+
+// __END__

www/includes/table_arrays/array_edit_access.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_access = array (
 	"table_array" => array (
 		"edit_access_id" => array (
@@ -28,6 +29,26 @@ $edit_access = array (
 			"error_check" => "custom",
 			"error_regex" => "/[\dA-Fa-f]{6}/",
 			"error_example" => "F6A544"
+		),
+		"enabled" => array (
+			"value" => $GLOBALS["enabled"],
+			"output_name" => "Enabled",
+			"type" => "binary",
+			"int" => 1, // OR "bool" => 1
+			"element_list" => array (
+				"1" => "Yes",
+				"0" => "No"
+			)
+		),
+		"protected" => array (
+			"value" => $GLOBALS["protected"],
+			"output_name" => "Protected",
+			"type" => "binary",
+			"int" => 1,
+			"element_list" => array (
+				"1" => "Yes",
+				"0" => "No"
+			)
 		)
 	),
 	"table_name" => "edit_access",
@@ -74,3 +95,5 @@ $edit_access = array (
 		)
 	)
 );
+
+// __END__

www/includes/table_arrays/array_edit_groups.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_groups = array (
 	"table_array" => array (
 		"edit_group_id" => array (
@@ -97,3 +98,5 @@ $edit_groups = array (
 		) // edit pages ggroup
 	)
 );
+
+// __END__

www/includes/table_arrays/array_edit_languages.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_languages=array (
 	"table_array" => array (
 		"edit_language_id" => array (
@@ -70,3 +71,5 @@ $edit_languages=array (
 	),
 	"table_name" => "edit_language"
 );
+
+// __END__

www/includes/table_arrays/array_edit_menu_group.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_menu_group = array (
 	"table_array" => array (
 		"edit_menu_group_id" => array (
@@ -35,3 +36,5 @@ $edit_menu_group = array (
 		)
 	)
 );
+
+// __END__

www/includes/table_arrays/array_edit_pages.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_pages = array (
 	"table_array" => array (
 		"edit_page_id" => array (
@@ -26,7 +27,7 @@ $edit_pages = array (
 			"int" => 1,
 			"order" => 1
 		),
-/*			"flag" => array (
+		/* "flag" => array (
 			"value" => $GLOBALS["flag"],
 			"output_name" => "Page Flag",
 			"type" => "drop_down_array",
@@ -175,3 +176,5 @@ $edit_pages = array (
 		) // query_string element list
 	) // element list
 );
+
+// __END__

www/includes/table_arrays/array_edit_schemes.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_schemes = array (
 	"table_array" => array (
 		"edit_scheme_id" => array (
@@ -53,3 +54,4 @@ $edit_schemes = array (
 	)
 ); // main array
 
+// __END__

www/includes/table_arrays/array_edit_users.inc

@@ -1,4 +1,5 @@
-<?
+<?php
+
 $edit_users = array (
 	"table_array" => array (
 		"edit_user_id" => array (
@@ -29,6 +30,7 @@ $edit_users = array (
 			)
 		),
 		// password date when first insert and password is set, needs special field with connection to password
+		// password reset force interval, if set, user needs to reset password after X time period
 		'password_change_interval' => array (
 			'value' => $GLOBALS['password_change_interval'],
 			'output_name' => 'Password change interval',
@@ -38,7 +40,6 @@ $edit_users = array (
 			'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",
@@ -163,10 +164,15 @@ $edit_users = array (
 			"type" => "view",
 			"empty" => "-"
 		),
-		// planned delete lock flag
 		"protected" => array (
 			"value" => $GLOBALS["protected"],
-			"int" => 1
+			"output_name" => "Protected",
+			"type" => "binary",
+			"int" => 1,
+			"element_list" => array (
+				"1" => "Yes",
+				"0" => "No"
+			)
 		)
 	),
 	"load_query" => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
@@ -251,3 +257,5 @@ $edit_users = array (
 		) // edit pages ggroup
 	)
 );
+
+// __END__

www/includes/table_arrays/array_edit_visible_group.inc

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

www/includes/templates/admin/edit_body.tpl

@@ -15,12 +15,14 @@
 	{if $STYLESHEET}
 	<link rel=stylesheet type="text/css" href="{$css}{$STYLESHEET}">
 	{/if}
-	{if $JAVASCRIPT}
-	<script language="JavaScript" src="{$js}{$JAVASCRIPT}"></script>
-	{/if}
-	{if $DATE_JAVASCRIPT}
-	<script language="JavaScript" src="{$JS}{$DATE_JAVASCRIPT}"></script>
-	{/if}
+	<script language="JavaScript">
+<!--
+function pop(theURL, winName, features) {
+	winName = window.open(theURL, winName, features);
+	winName.focus();
+}
+//-->
+	</script>
 </head>
 <body>
 <table width="{$table_width}" border="0" cellpadding="0" cellspacing="1">
@@ -79,7 +81,7 @@
 <!-- TOP MENU END //-->
 <tr>
   <td width="{$table_width}" class="edit_bgcolor">
-	 <form method="post" name="edit_form">
+	 <form method="post" name="edit_form" style="margin-block-end: 0em;">
 	 <table width="100%" border="0" cellpadding="2" cellspacing="1">
 	 <!-- LOAD START //-->
 	{include file="edit_load.tpl"}