Backport Login changes

Password change backport

4dev/database/ORDER

@@ -1,7 +1,5 @@
 # functions
 function/update_function.sql
-function/random_string.sql
-function/edit_set_access_uid.sql
 # generic tables
 table/edit_temp_files.sql
 table/edit_generic.sql
@@ -20,11 +18,9 @@ table/edit_user.sql
 table/edit_log.sql
 table/edit_access.sql
 table/edit_access_user.sql
-table/edit_access_data.sql
 # all triggers (after all tables have been created)
 trigger/trg_edit_access_right.sql
 trigger/trg_edit_access.sql
-trigger/trg_edit_access_data.sql
 trigger/trg_edit_access_user.sql
 trigger/trg_edit_generic.sql
 trigger/trg_edit_group.sql
@@ -37,6 +33,3 @@ trigger/trg_edit_scheme.sql
 trigger/trg_edit_user.sql
 trigger/trg_edit_visible_group.sql
 trigger/trg_edit_menu_group.sql
-trigger/trg_set_edit_access_uid.sql
-# insert data
-data/edit_tables.sql

4dev/database/data/edit_tables.sql

@@ -1,141 +0,0 @@
--- edit tables insert data in order
-
--- edit visible group
-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);
-
--- 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 page menu group
-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);
-
--- 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
-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
-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
-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
-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'),
-	1,
-	(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'),
-	2,
-	(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'),
-	3,
-	(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'),
-	4,
-	(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'),
-	5,
-	(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'),
-	6,
-	(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'),
-	7,
-	(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'),
-	8,
-	(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'),
-	9,
-	(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', 't', 1);
-INSERT INTO edit_access (name, enabled, protected) VALUES ('User Access', 't', 1);
-
--- edit access user
-DELETE FROM edit_access_user;
-INSERT INTO edit_access_user (edit_default, edit_access_id, edit_user_id, edit_access_right_id) VALUES (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_set_access_uid.sql

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

4dev/database/function/random_string.sql

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

4dev/database/function/set_edit_generic.sql

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

4dev/database/function/set_generic.sql

@@ -3,7 +3,7 @@
 CREATE OR REPLACE FUNCTION set_generic() RETURNS TRIGGER AS '
 	BEGIN
 		IF TG_OP = ''INSERT'' THEN
-			NEW.cuid := random_string(random_length);
+			NEW.date_created := ''now'';
 		ELSIF TG_OP = ''UPDATE'' THEN
 			NEW.date_updated := ''now'';
 		END IF;

4dev/database/table/edit_access.sql

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

4dev/database/table/edit_access_data.sql

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

4dev/database/table/edit_access_right.sql

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

4dev/database/table/edit_access_user.sql

@@ -17,3 +17,6 @@ CREATE TABLE edit_access_user (
 	FOREIGN KEY (edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+DELETE FROM edit_access_user;
+INSERT INTO edit_access_user (edit_default, edit_access_id, edit_user_id, edit_access_right_id) VALUES (1, 1, 1, 8);

4dev/database/table/edit_generic.sql

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

4dev/database/table/edit_group.sql

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

4dev/database/table/edit_menu_group.sql

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

4dev/database/table/edit_page.sql

@@ -8,8 +8,8 @@
 -- DROP TABLE edit_page;
 CREATE TABLE edit_page (
 	edit_page_id	SERIAL PRIMARY KEY,
-	filename	VARCHAR,
-	name	VARCHAR UNIQUE,
+	filename	VARCHAR(70),
+	name	VARCHAR(255) UNIQUE,
 	order_number INT NOT NULL,
 	online	SMALLINT NOT NULL DEFAULT 0,
 	menu	SMALLINT NOT NULL DEFAULT 0,
@@ -17,3 +17,14 @@ 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,4 +17,12 @@ CREATE TABLE edit_page_access (
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
 
-
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 1, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 2, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 3, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 4, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 5, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 6, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 7, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 8, 8);
+INSERT INTO edit_page_access (enabled, edit_group_id, edit_page_id, edit_access_right_id) VALUES (1, 1, 9, 8);

4dev/database/table/edit_page_menu_group.sql

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

4dev/database/table/edit_page_visible_group.sql

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

4dev/database/table/edit_query_string.sql

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

4dev/database/table/edit_scheme.sql

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

4dev/database/table/edit_temp_files.sql

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

4dev/database/table/edit_user.sql

@@ -8,13 +8,8 @@
 -- 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,
@@ -32,9 +27,12 @@ CREATE TABLE edit_user (
 	locked	SMALLINT DEFAULT 0,
 	password_change_date	TIMESTAMP WITHOUT TIME ZONE, -- only when password is first set or changed
 	password_change_interval	INTERVAL, -- null if no change is needed, or d/m/y time interval
-	FOREIGN KEY (connect_edit_user_id) REFERENCES edit_user (edit_user_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_language_id) REFERENCES edit_language (edit_language_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_group_id) REFERENCES edit_group (edit_group_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_scheme_id) REFERENCES edit_scheme (edit_scheme_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE,
 	FOREIGN KEY (edit_access_right_id) REFERENCES edit_access_right (edit_access_right_id) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE
 ) INHERITS (edit_generic) WITHOUT OIDS;
+
+-- inserts admin user so basic users can be created
+DELETE FROM edit_user;
+INSERT INTO edit_user (username, password, enabled, debug, db_debug, email, protected, admin, edit_language_id, edit_group_id, edit_scheme_id, edit_access_right_id) VALUES ('admin', 'admin', 1, 1, 1, '', 1, 1, 1, 1, 2, 8);

4dev/database/table/edit_visible_group.sql

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

4dev/database/trigger/trg_edit_access.sql

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

4dev/database/trigger/trg_edit_access_data.sql

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

4dev/database/trigger/trg_edit_access_right.sql

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

4dev/database/trigger/trg_edit_access_user.sql

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

4dev/database/trigger/trg_edit_group.sql

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

4dev/database/trigger/trg_edit_language.sql

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

4dev/database/trigger/trg_edit_log.sql

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

4dev/database/trigger/trg_edit_menu_group.sql

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

4dev/database/trigger/trg_edit_page.sql

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

4dev/database/trigger/trg_edit_page_access.sql

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

4dev/database/trigger/trg_edit_query_string.sql

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

4dev/database/trigger/trg_edit_scheme.sql

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

4dev/database/trigger/trg_edit_user.sql

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

4dev/database/trigger/trg_edit_visible_group.sql

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

4dev/sync/sync_template.sh

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

4dev/update/20180323_namespace/comp_func.sh

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

4dev/update/20180323_namespace/rpl_old_method_in_file.sh

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

README.md

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

www/Smarty

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

www/admin/Smarty

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

www/admin/cache

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

www/admin/class_test.php

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

www/admin/edit_base.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 /********************************************************************
 * AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
@@ -24,19 +24,26 @@ extract($_POST, EXTR_SKIP);
 
 $table_width = 750;
 // this is for certain CMS modules that set a relative path
-define('REL_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;
+//		$DEBUG_TMPL = 0;
 }
+// set session name here
+define('SET_SESSION_NAME', EDIT_SESSION_NAME);
+// login class
+require(LIBS."Class.Login.inc");
+// form generate for edit interface
+require(LIBS."Class.Form.Generate.inc");
+// Smarty: and the small extend for l10n calls
+require(LIBS.'Class.Smarty.Extend.inc');
 
 // set default lang if not set otherwise
 if (!$lang) {
@@ -45,17 +52,17 @@ if (!$lang) {
 // should be utf8
 header("Content-type: text/html; charset=".DEFAULT_ENCODING);
 ob_end_flush();
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new 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);
+$form = new form($DB_CONFIG[MAIN_DB], $lang);
+$form->db_exec("SET search_path TO ".LOGIN_DB_SCHEMA);
 if ($form->mobile_phone) {
 	echo "I am sorry, but this page cannot be viewed by a mobile phone";
 	exit;
 }
 // smarty template engine (extended Translation version)
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new SmartyML($lang);
 
 if (TARGET == 'live' || TARGET == 'remote') {
 	// login
@@ -91,7 +98,7 @@ 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()."')";
+	$q .= "VALUES (".$_SESSION['EUID'].", NOW(), '".$_SERVER["REMOTE_ADDR"]."', '".$GLOBALS['form']->db_escape_string($event)."', '".$GLOBALS['form']->db_escape_string($data)."', '".$GLOBALS['form']->get_page_name()."')";
 }
 
 // log backend data
@@ -105,11 +112,11 @@ $data = array (
 // 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);
+$form->form_procedure_load(${$form->archive_pk_name});
+$form->form_procedure_new();
+$form->form_procedure_save();
+$form->form_procedure_delete();
+$form->form_procedure_delete_from_element_list($element_list, $remove_name);
 
 // define all needed smarty stuff for the general HTML/page building
 $HEADER['CSS'] = CSS;
@@ -121,7 +128,7 @@ $HEADER['JAVASCRIPT'] = $EDIT_JAVASCRIPT;
 $DATA['table_width'] = $table_width;
 
 // write out error / status messages
-$messages[] = $form->formPrintMsg();
+$messages[] = $form->form_error_msg();
 $DATA['form_error_msg'] = $messages;
 
 // MENU START
@@ -137,13 +144,10 @@ $DATA['GROUP_NAME'] = $_SESSION["GROUP_NAME"];
 $DATA['GROUP_LEVEL'] = $_SESSION["GROUP_LEVEL"];
 $PAGES = $_SESSION["PAGES"];
 
-//$form->debug('menu', $form->printAr($PAGES));
+//$form->debug('menu', $form->print_ar($PAGES));
 
-// build nav from $PAGES ...
-if (!is_array($PAGES)) {
-	$PAGES = array ();
-}
-for ($i = 0, $i_max = count($PAGES); $i < $i_max; $i ++) {
+// baue nav aus $PAGES ...
+for ($i = 0; $i < count($PAGES); $i ++) {
 	if ($PAGES[$i]["menu"] && $PAGES[$i]["online"]) {
 		$menuarray[] = $PAGES[$i];
 	}
@@ -168,7 +172,7 @@ for ($i = 1; $i <= count($menuarray); $i ++) {
 	if ($i == 1 || !(($i - 1) % $SPLIT_FACTOR)) {
 		$menu_data[$j]['splitfactor_in'] = 1;
 	}
-	if ($menuarray[($i - 1)]["filename"] == $form->getPageName()) {
+	if ($menuarray[($i - 1)]["filename"] == $form->get_page_name()) {
 		$position = $i - 1;
 		$menu_data[$j]['position'] = 1;
 	} else {
@@ -193,115 +197,112 @@ $L_TITLE = $DATA['page_name'];
 $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();
+$DATA['load'] = $form->form_create_load();
+$DATA['new'] = $form->form_create_new();
 // SHOW DATA PART
 if ($form->yes) {
 	$DATA['form_yes'] = $form->yes;
 	$DATA['form_my_page_name'] = $form->my_page_name;
 
-	// depending on the "getPageName()" I show different stuff
+	// depending on the "get_page_name()" 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");
+			$elements[] = $form->form_create_element("login_error_count");
+			$elements[] = $form->form_create_element("login_error_date_last");
+			$elements[] = $form->form_create_element("login_error_date_first");
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("username");
+			$elements[] = $form->form_create_element("password");
+			$elements[] = $form->form_create_element("password_change_interval");
+			$elements[] = $form->form_create_element("email");
+			$elements[] = $form->form_create_element("last_name");
+			$elements[] = $form->form_create_element("first_name");
+			$elements[] = $form->form_create_element("edit_group_id");
+			$elements[] = $form->form_create_element("edit_access_right_id");
+			$elements[] = $form->form_create_element("strict");
+			$elements[] = $form->form_create_element("locked");
+			$elements[] = $form->form_create_element("admin");
+			$elements[] = $form->form_create_element("debug");
+			$elements[] = $form->form_create_element("db_debug");
+			$elements[] = $form->form_create_element("edit_language_id");
+			$elements[] = $form->form_create_element("edit_scheme_id");
+			$elements[] = $form->form_show_list_table("edit_access_user");
 			break;
 		case "edit_schemes":
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("header_color");
-			$elements[] = $form->formCreateElement("template");
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("header_color");
+			$elements[] = $form->form_create_element("template");
 			break;
 		case "edit_pages":
 			if (!$form->table_array["edit_page_id"]["value"]) {
 				$q = "DELETE FROM temp_files";
-				$form->dbExec($q);
+				$form->db_exec($q);
 				// gets all files in the current dir ending with .php
 				$crap = exec("ls *.php", $output, $status);
 				// now get all that are NOT in de DB
 				$q = "INSERT INTO temp_files VALUES ";
 				for ($i = 0; $i < count($output); $i ++) {
-					$t_q = "('".$form->dbEscapeString($output[$i])."')";
-					$form->dbExec($q.$t_q, 'NULL');
+					$t_q = "('".$form->db_escape_string($output[$i])."')";
+					$form->db_exec($q.$t_q, 'NULL');
 				}
-				$elements[] = $form->formCreateElement("filename");
+				$elements[] = $form->form_create_element("filename");
 			} else {
 				// show file menu
 				// just show name of file ...
 				$DATA['filename_exist'] = 1;
 				$DATA['filename'] = $form->table_array["filename"]["value"];
 			} // File Name View IF
-			$elements[] = $form->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");
+			$elements[] = $form->form_create_element("name");
+			// $elements[] = $form->form_create_element("tag");
+			// $elements[] = $form->form_create_element("min_acl");
+			$elements[] = $form->form_create_element("order_number");
+			$elements[] = $form->form_create_element("online");
+			$elements[] = $form->form_create_element("menu");
+			$elements[] = $form->form_show_list_table("edit_query_string");
+			$elements[] = $form->form_create_element("popup");
+			$elements[] = $form->form_create_element("popup_x");
+			$elements[] = $form->form_create_element("popup_y");
+			$elements[] = $form->form_show_reference_table("edit_visible_group");
+			$elements[] = $form->form_show_reference_table("edit_menu_group");
 			break;
 		case "edit_languages":
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("short_name");
-			$elements[] = $form->formCreateElement("long_name");
-			$elements[] = $form->formCreateElement("iso_name");
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("short_name");
+			$elements[] = $form->form_create_element("long_name");
+			$elements[] = $form->form_create_element("iso_name");
 			break;
 		case "edit_groups":
-			$elements[] = $form->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");
+			$elements[] = $form->form_create_element("enabled");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("edit_access_right_id");
+			$elements[] = $form->form_create_element("edit_scheme_id");
+			$elements[] = $form->form_show_list_table("edit_page_access");
 			break;
 		case "edit_visible_group":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("flag");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("flag");
 			break;
 		case "edit_menu_group":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("flag");
-			$elements[] = $form->formCreateElement("order_number");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("flag");
+			$elements[] = $form->form_create_element("order_number");
 			break;
 		case "edit_access":
-			$elements[] = $form->formCreateElement("name");
-			$elements[] = $form->formCreateElement("enabled");
-			$elements[] = $form->formCreateElement("protected");
-			$elements[] = $form->formCreateElement("color");
-			$elements[] = $form->formCreateElement("description");
+			$elements[] = $form->form_create_element("name");
+			$elements[] = $form->form_create_element("color");
+			$elements[] = $form->form_create_element("description");
 			// add name/value list here
-			$elements[] = $form->formCreateElementListTable("edit_access_data");
+			$elements[] = $form->form_show_list_table("edit_access_data");
 			break;
 		default:
 			print "[No valid page definition given]";
 			break;
 	}
-//		$form->debug('edit', "Elements: <pre>".$form->printAr($elements));
+//		$form->debug('edit', "Elements: <pre>".$form->print_ar($elements));
 	$DATA['elements'] = $elements;
-	$DATA['hidden'] = $form->formCreateHiddenFields();
-	$DATA['save_delete'] = $form->formCreateSaveDelete();
+	$DATA['hidden'] = $form->form_create_hidden_fields();
+	$DATA['save_delete'] = $form->form_create_save_delete();
 }
 
 // debug data, if DEBUG flag is on, this data is print out
@@ -310,19 +311,14 @@ $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) {
+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->assign('popup_page', 'mt_popup_'.$body_part.'.tpl');
+
 $smarty->display('edit_body.tpl');
 
 // debug output
-echo $login->printErrorMsg();
-echo $form->printErrorMsg();
-
-# __END__
+echo $login->print_error_msg();
+echo $form->print_error_msg();

www/admin/edit_order.php

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

www/admin/error_test.php

@@ -11,8 +11,7 @@ if ($DEBUG_ALL) {
 
 // sample config
 require("config.inc");
-echo "FILE: ".BASE.LIB."Error.Handling.inc<br>";
-require(BASE.LIB."Error.Handling.inc");
+require(LIBS."Error.Handling.inc");
 
 if ($var) {
 	echo "OUT<br>";

www/admin/files.php

@@ -1,4 +1,4 @@
-<?php
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/13
@@ -52,9 +52,6 @@ if (!$show_type) {
 	$show_type = 'P';
 }
 
-// set edit access array
-$edit_access_ids = array_keys($cms->user_unit);
-
 // yes no list (online)
 $yesno_list['f'] = 'No';
 $yesno_list['t'] = 'Yes';
@@ -205,10 +202,10 @@ if ($cms->action == 'save') {
 		$file = DEV_SCHEMA."_".$file_uid;
 		// now upload the file
 		if ($_FILES['file_up']['name']) {
-			$upload_file = BASE.MEDIA.$cms->data_path[$file_type].$file;
+			$upload_file = ROOT.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) {
+			if (is_array(glob(ROOT.TMP."thumb_".$file."*"))) {
+				foreach (glob(ROOT.TMP."thumb_".$file."*") as $filename) {
 					@unlink($filename);
 				}
 			}
@@ -216,7 +213,7 @@ if ($cms->action == 'save') {
 			$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']));
+			$cms->debug('file_upload', "Orig: ".$cms->print_ar($_FILES['file_up']));
 
 			// because I get bogus error info from move_uploaded_file ...
 			$error = 0;
@@ -245,7 +242,7 @@ if ($cms->action == 'save') {
 			}
 			$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 .= ", '".ROOT.MEDIA.$cms->data_path[$file_type].$file."#".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'";
 			}
 			$q .= ")";
 			$cms->db_exec($q);
@@ -265,16 +262,9 @@ if ($cms->action == 'delete' && $cms->action_yes == 'true') {
 	}
 	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."', '".
-		$q .= BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
-	}
-	@unlink(BASE.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid);
-	// wipe out any old cache data for this new upload
-	if (is_array(glob($cms->cache_pictures."thumb_".TEST_SCHEMA."_".$file_uid."*"))) {
-		foreach (glob($cms->cache_pictures."thumb_".TEST_SCHEMA."_".$file_uid."*") as $filename) {
-			@unlink($filename);
-		}
+		$q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')";
 	}
+	@unlink(ROOT.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid);
 	unset($file_uid);
 	unset($file_id);
 	$delete_done = 1;
@@ -306,13 +296,7 @@ if ($cms->action_flag == 'set_live' && $cms->action = 'set_delete') {
 	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']);
-		// wipe out any old cache data for this new upload
-		if (is_array(glob($cms->cache_pictures."thumb_".LIVE_SCHEMA."_".$file_uid."*"))) {
-			foreach (glob($cms->cache_pictures."thumb_".LIVE_SCHEMA."_".$file_uid."*") as $filename) {
-				@unlink($filename);
-			}
-		}
+		@unlink(ROOT.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']);
 	}
 	$q = "DELETE FROM ".LOGIN_DB_SCHEMA.".set_live WHERE table_name = '".$cms->page_name."' AND delete_flag = 't'";
 	$cms->db_exec($q);
@@ -320,21 +304,13 @@ if ($cms->action_flag == 'set_live' && $cms->action = 'set_delete') {
 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'";
-	if ($cms->access_rights['base_acl'] < 90) {
-		$q .= "AND edit_access_id IN (".join(',', $edit_access_ids).") ";
-	}
 	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 ";
-// only for current edit_access id, unless it is an admin user, then he can see all of them
-if ($cms->access_rights['base_acl'] < 90) {
-	$q_search_where .= "edit_access_id IN (".join(',', $edit_access_ids).") AND ";
-}
-$q_search_where .= "type in ('".str_replace(',', "','", $show_type)."') ";
+$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))."%' ";
 }

www/admin/footer.inc

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

www/admin/header.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2008/08/01
@@ -23,6 +23,11 @@ extract($_POST, EXTR_SKIP);
 // set output to quiet for load of classes & session settings
 ob_start();
 require("config.inc");
+
+// login class, DB connections & Admin class, Smarty extension
+foreach (array ('Login', 'Admin.Backend', 'Smarty.Extend') as $class) {
+	_spl_autoload('Class.'.$class.'.inc');
+}
 //------------------------------ library include end
 
 //------------------------------ basic variable settings start
@@ -45,19 +50,21 @@ if (array_key_exists('action', $_POST) && $_POST['action'] != 'download_csv') {
 
 //------------------------------ class init start
 // login & page access check
-$login = new CoreLibs\ACL\Login($DB_CONFIG[LOGIN_DB], $lang);
+$login = new login($DB_CONFIG[LOGIN_DB], $lang);
 // post login lang check
 if ($_SESSION['DEFAULT_LANG']) {
 	$lang = $_SESSION['DEFAULT_LANG'];
 }
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new SmartyML($lang);
 // create new DB class
-$cms = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
+$cms = new AdminBackend($DB_CONFIG[MAIN_DB], $lang);
+// set search path to the default DB schema
+$cms->db_exec("SET search_path TO ".DB_SCHEMA);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
-$cms->dbInfo();
+$cms->db_info();
 // set acl
 $cms->acl = $login->acl;
 //------------------------------ class init end

www/admin/libs

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

www/admin/log

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

www/admin/namespace_test.php

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

www/admin/other_test.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Foo;
-
-class FooBar
-{
-	public $foo = '';
-
-	public function __construct()
-	{
-		$this->foo = 'BAR';
-	}
-
-	public function otherBarBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-
-	public function barBar($wrong)
-	{
-		echo "B: $wrong<br>";
-	}
-}

www/admin/set_paths.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2007/09/03
@@ -15,7 +15,7 @@ if ($_SESSION['TEMPLATE']) {
 } else {
 	$TEMPLATE = DEFAULT_TEMPLATE;
 }
-$TEMPLATE_DIR = $TEMPLATE;
+$TEMPLATE_DIR = $TEMPLATE.'/';
 // master template
 if (!$MASTER_TEMPLATE_NAME) {
 	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
@@ -41,7 +41,7 @@ $lang_short = substr($lang, 0, 2);
 $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;
+$L_TITLE = ucfirst(str_replace('_', ' ', $cms->get_page_name(1))).' - '.$G_TITLE;
 // strip tpl and replace it with inc
 // php include file per page
 $cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
@@ -55,13 +55,13 @@ $cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
 $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;
+$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);
@@ -69,13 +69,13 @@ if (!is_dir($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;
+if (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".MASTER_TEMPLATE_NAME)) {
+	if (file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
+		$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME;
 	}
 	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
 	$template_set = DEFAULT_TEMPLATE;
-} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0]."/".$TEMPLATE_NAME)) {
 	// check if the template exists in the template path, if not, set path to to default
 	$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
 	$template_set = DEFAULT_TEMPLATE;
@@ -85,25 +85,25 @@ if (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.MASTER_TEMPLATE_NAME)) {
 
 // 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;
+	$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;
+	$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;
+	$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;
+	$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS."/";
 }
 if (!is_dir($cms->pictures)) {
-	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES;
+	$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES.'/';
 }
 if (!is_dir($cms->cache_pictures)) {
-	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE.IMAGES;
+	$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE.IMAGES.'/';
 }
 
 // if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
@@ -117,5 +117,3 @@ if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) || strcasecmp
 //	$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]);
-
-# __END__

www/admin/smarty.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 /********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2005/07/12
@@ -84,21 +84,13 @@ $cms->DATA['LANG'] = $lang;
 $cms->DATA['TINYMCE_LANG'] = $lang_short;
 
 // debug data, if DEBUG flag is on, this data is print out
-$cms->DEBUG_DATA['debug_error_msg'] = $cms->runningTime();
+$cms->DEBUG_DATA['debug_error_msg'] = $cms->running_time();
 $cms->DEBUG_DATA['DEBUG'] = @$DEBUG_TMPL;
 
 // create main data array
 $cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA);
 // data is 1:1 mapping (all vars, values, etc)
-foreach ($cms->CONTENT_DATA as $key => $value) {
+while (list($key, $value) = each($cms->CONTENT_DATA)) {
 	$smarty->assign($key, $value);
 }
-if (is_dir(BASE.TEMPLATES_C)) {
-	$smarty->setCompileDir(BASE.TEMPLATES_C);
-}
-if (is_dir(BASE.CACHE)) {
-	$smarty->setCacheDir(BASE.CACHE);
-}
 $smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang);
-
-# __END__

www/admin/smarty_test.php

@@ -1,4 +1,4 @@
-<?php
+<?
 $ENABLE_ERROR_HANDLING = 0;
 $DEBUG_ALL_OVERRIDE = 0; // set to 1 to debug on live/remote server locations
 $DEBUG_ALL = 1;

www/admin/table_arrays/array_edit_access.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 $edit_access = array (
 	"table_array" => array (
 		"edit_access_id" => array (
@@ -28,26 +28,6 @@ $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,
-			"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",
@@ -94,5 +74,3 @@ $edit_access = array (
 		)
 	)
 );
-
-# __END__

www/admin/table_arrays/array_edit_groups.inc

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

www/admin/table_arrays/array_edit_languages.inc

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

www/admin/table_arrays/array_edit_menu_group.inc

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

www/admin/table_arrays/array_edit_pages.inc

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

www/admin/table_arrays/array_edit_schemes.inc

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

www/admin/table_arrays/array_edit_users.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 $edit_users = array (
 	"table_array" => array (
 		"edit_user_id" => array (
@@ -29,7 +29,6 @@ $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',
@@ -39,6 +38,7 @@ $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,15 +163,10 @@ $edit_users = array (
 			"type" => "view",
 			"empty" => "-"
 		),
+		// planned delete lock flag
 		"protected" => array (
 			"value" => $GLOBALS["protected"],
-			"output_name" => "Protected",
-			"type" => "binary",
-			"int" => 1,
-			"element_list" => array (
-				"1" => "Yes",
-				"0" => "No"
-			)
+			"int" => 1
 		)
 	),
 	"load_query" => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
@@ -256,5 +251,3 @@ $edit_users = array (
 		) // edit pages ggroup
 	)
 );
-
-# __END__

www/admin/table_arrays/array_edit_visible_group.inc

@@ -1,32 +1,30 @@
-<?php
-$edit_visible_group = array (
-	"table_array" => array (
-		"edit_visible_group_id" => array (
-			"value" => $GLOBALS["edit_visible_group_id"],
-			"type" => "hidden",
-			"pk" => 1
+<?
+	$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"
+			)
 		),
-		"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"
+			)
 		)
-	),
-	"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/admin/templates_c

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

www/admin/tmp

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

www/configs/config.inc

@@ -1,6 +1,6 @@
 <?
 /********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
 * SHORT DESCRIPTION:
 *   configuration file
@@ -9,82 +9,79 @@
 
 /************* SESSION NAMES *************/
 // backend
-DEFINE('EDIT_SESSION_NAME', '<ADMIN SESSION NAME>');
+DEFINE('EDIT_SESSION_NAME', "<ADMIN SESSION NAME>");
 // frontend
-DEFINE('SESSION_NAME', '<SESSION NAME>');
+DEFINE('SESSION_NAME', "<SESSION NAME>");
 // set the session name
 define('SET_SESSION_NAME', EDIT_SESSION_NAME);
 
 /************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', 'en_utf8');
+DEFINE('DEFAULT_LANG', "en_utf8");
 // default web page encoding setting
-DEFINE('DEFAULT_ENCODING', 'UTF-8');
+DEFINE('DEFAULT_ENCODING', "UTF-8");
 
 /************* 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__));
+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/');
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd().DS);
+DEFINE('ROOT', getcwd()."/");
 // libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
+DEFINE('LIBS', "libs/");
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
+DEFINE('INCLUDES', "includes/");
 // layout base path
-DEFINE('LAYOUT', 'layout'.DS);
+DEFINE('LAYOUT', 'layout/');
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', 'images'.DS);
+DEFINE('PICTURES', "images/");
 // images
-DEFINE('IMAGES', 'images'.DS);
+DEFINE('IMAGES', "images/");
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
+DEFINE('ICONS', 'icons/');
 // media
-DEFINE('MEDIA', 'media'.DS);
+DEFINE('MEDIA', "media/");
 // flash-root (below media)
-DEFINE('FLASH', 'flash'.DS);
+DEFINE('FLASH', "flash/");
 // uploads (anything to keep)
-DEFINE('UPLOADS', 'uploads'.DS);
+DEFINE('UPLOADS', "uploads/");
 // files (binaries) (below media)
-DEFINE('BINARIES', 'binaries'.DS);
+DEFINE('BINARIES', "binaries/");
 // files (videos) (below media)
-DEFINE('VIDEOS', 'videos'.DS);
+DEFINE('VIDEOS', "videos/");
 // files (documents) (below media)
-DEFINE('DOCUMENTS', 'documents'.DS);
+DEFINE('DOCUMENTS', "documents/");
 // files (pdfs) (below media)
-DEFINE('PDFS', 'documents'.DS);
-// CSV
-DEFINE('CSV', 'csv'.DS);
+DEFINE('PDFS', "documents/");
 // css
-DEFINE('CSS', 'css'.DS);
+DEFINE('CSS', "css/");
 // js
-DEFINE('JS', 'javascript'.DS);
+DEFINE('JS', "javascript/");
 // table arrays
-DEFINE('TABLE_ARRAYS', 'table_arrays'.DS);
+DEFINE('TABLE_ARRAYS', "table_arrays/");
 // smarty libs path
-DEFINE('SMARTY', 'Smarty'.DS);
+DEFINE('SMARTY', "Smarty/");
 // po langs
-DEFINE('LANG', 'lang'.DS);
+DEFINE('LANG', "lang/");
 // cache path
-DEFINE('CACHE', 'cache'.DS);
+DEFINE('CACHE', "cache/");
 // temp path
-DEFINE('TMP', 'tmp'.DS);
+DEFINE('TMP', "tmp/");
 // log files
-DEFINE('LOG', 'log'.DS);
-// compiled template folder
-DEFINE('TEMPLATES_C', 'templates_c'.DS);
+DEFINE('LOG', 'log/');
 // template base
-DEFINE('TEMPLATES', 'templates'.DS);
+DEFINE('TEMPLATES', "templates/");
 // frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', 'templates_frontend'.DS);
+DEFINE('TEMPLATES_FRONTEND', "templates_frontend/");
 // default template
-DEFINE('DEFAULT_TEMPLATE', 'default'.DS);
+DEFINE('DEFAULT_TEMPLATE', "default/");
 // default template file
 DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
 
@@ -102,14 +99,14 @@ 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)
 // -1 is never expire cache
@@ -134,11 +131,6 @@ DEFINE('PAGE_WIDTH', 800);
 // the default template name
 DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
 
-// 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
@@ -150,38 +142,37 @@ 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
+	"<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'] = '';
+//	$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>';
+$DB_HOST['<host>'] = "<db id>";
 // target host (live)
-//	$DB_TARGET_HOST['<host>'] = '<DB ID>';
+//	$DB_TARGET_HOST['<host>'] = "<DB ID>";
 // url redirect database
-//	$DB_URL_REDIRECT_HOST['<host>'] = '<DB ID>';
+//	$DB_URL_REDIRECT_HOST['<host>'] = "<DB ID>";
 // location flagging
 // test/dev/live
 $LOCATION['<host>'] = '<test|live|remote|etc>';
@@ -197,9 +188,9 @@ $USE_DATABASE = defined('USE_DATABASE') ? USE_DATABASE : true;
 // live frontend pages
 // ** missing live domains **
 // get the name without the port
-list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
+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>';
+	echo "No matching DB config found. Contact Admin<br>";
 	exit -1;
 }
 
@@ -226,11 +217,11 @@ DEFINE('SHOW_ALL_ERRORS', false); // show all errors if debug_all & show_error_h
 $G_TITLE = '<OVERALL PAGE TITLE>';
 
 /************ STYLE SHEETS / JS **********/
-$EDIT_STYLESHEET = 'edit.css';
-$EDIT_JAVASCRIPT = 'edit.js';
+$EDIT_STYLESHEET = "edit.css";
+$EDIT_JAVASCRIPT = "edit.js";
 
-$STYLESHEET = 'frontend.css';
-$JAVASCRIPT = 'frontend.js';
+$STYLESHEET = "frontend.css";
+$JAVASCRIPT = "frontend.js";
 
 /************* CONVERT *******************/
 $paths = array (
@@ -240,14 +231,14 @@ $paths = array (
 );
 // find convert
 foreach ($paths as $path) {
-	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
+	if (file_exists($path."/convert") && is_file($path."/convert")) {
 		// image magick convert location
-		DEFINE('CONVERT', $path.DS.'convert');
+		DEFINE('CONVERT', $path."/convert");
 	}
 }
 
 // turn off debug if debug flag is OFF
-if (defined('DEBUG') && DEBUG == false) {
+if (DEBUG == false) {
 	$ECHO_ALL = 0;
 	$DEBUG_ALL = 0;
 	$PRINT_ALL = 0;
@@ -258,7 +249,27 @@ if (defined('DEBUG') && DEBUG == false) {
 // any other global definitons here
 //	DEFINE('SOME_ID', <SOME VALUE>);
 
-// read auto loader
-require BASE.LIB.'autoloader.php';
-
-# __END__
+// 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;
+}

www/configs/config.template.inc

@@ -1,6 +1,6 @@
-<?php
+<?
 /********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2003/06/10
 * SHORT DESCRIPTION:
 *   configuration file
@@ -21,70 +21,67 @@ DEFINE('DEFAULT_LANG', "en_utf8");
 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__));
+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/');
 
 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd().DS);
+DEFINE('ROOT', getcwd()."/");
 // libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
+DEFINE('LIBS', "libs/");
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
+DEFINE('INCLUDES', "includes/");
 // layout base path
-DEFINE('LAYOUT', 'layout'.DS);
+DEFINE('LAYOUT', 'layout/');
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', "images".DS);
+DEFINE('PICTURES', "images/");
 // images
-DEFINE('IMAGES', "images".DS);
+DEFINE('IMAGES', "images/");
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
+DEFINE('ICONS', 'icons/');
 // media
-DEFINE('MEDIA', "media".DS);
+DEFINE('MEDIA', "media/");
 // flash-root (below media)
-DEFINE('FLASH', "flash".DS);
+DEFINE('FLASH', "flash/");
 // uploads (anything to keep)
-DEFINE('UPLOADS', "uploads".DS);
+DEFINE('UPLOADS', "uploads/");
 // files (binaries) (below media)
-DEFINE('BINARIES', "binaries".DS);
+DEFINE('BINARIES', "binaries/");
 // files (videos) (below media)
-DEFINE('VIDEOS', "videos".DS);
+DEFINE('VIDEOS', "videos/");
 // files (documents) (below media)
-DEFINE('DOCUMENTS', "documents".DS);
+DEFINE('DOCUMENTS', "documents/");
 // files (pdfs) (below media)
-DEFINE('PDFS', "documents".DS);
-// CSV
-DEFINE('CSV', 'csv'.DS);
+DEFINE('PDFS', "documents/");
 // css
-DEFINE('CSS', "css".DS);
+DEFINE('CSS', "css/");
 // js
-DEFINE('JS', "javascript".DS);
+DEFINE('JS', "javascript/");
 // table arrays
-DEFINE('TABLE_ARRAYS', "table_arrays".DS);
+DEFINE('TABLE_ARRAYS', "table_arrays/");
 // smarty libs path
-DEFINE('SMARTY', "Smarty".DS);
+DEFINE('SMARTY', "Smarty/");
 // po langs
-DEFINE('LANG', "lang".DS);
+DEFINE('LANG', "lang/");
 // cache path
-DEFINE('CACHE', "cache".DS);
+DEFINE('CACHE', "cache/");
 // temp path
-DEFINE('TMP', "tmp".DS);
+DEFINE('TMP', "tmp/");
 // log files
-DEFINE('LOG', 'log'.DS);
-// compiled template folder
-DEFINE('TEMPLATES_C', 'templates_c'.DS);
+DEFINE('LOG', 'log/');
 // template base
-DEFINE('TEMPLATES', "templates".DS);
+DEFINE('TEMPLATES', "templates/");
 // frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', "templates_frontend".DS);
+DEFINE('TEMPLATES_FRONTEND', "templates_frontend/");
 // default template
-DEFINE('DEFAULT_TEMPLATE', "default".DS);
+DEFINE('DEFAULT_TEMPLATE', "default/");
 // default template file
 DEFINE('DEFAULT_TEMPLATE_FILE', 'default.tpl');
 
@@ -145,7 +142,6 @@ 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 *****************/
@@ -253,7 +249,27 @@ if (DEBUG == false) {
 // any other global definitons here
 //	DEFINE('SOME_ID', <SOME VALUE>);
 
-// read auto loader
-require BASE.LIB.'autoloader.php';
-
-# __END__
+// 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;
+}

www/layout/admin/default/css/edit.css

@@ -272,7 +272,7 @@ input[type="text"]:focus, textarea:focus, select:focus {
 }
 
 /* spacer for line break in float elements */
-.clr, .spacer {
+.spacer {
 	clear: both;
 }
 
@@ -367,30 +367,6 @@ input[type="text"]:focus, textarea:focus, select:focus {
 	font-size: 8px;
 }
 
-/* NEW VERSION with CSS key frame animation */
-.progress {
-	width: 100px;
-	height: 100px;
-	background: rgba(255, 255, 255, 0.6);
-	border: 20px solid rgba(255, 255, 255 ,0.25);
-	border-left-color: rgba(3, 155, 229 ,1);
-	border-top-color: rgba(3, 155, 229 ,1);
-	border-radius: 50%;
-	display: inline-block;
-	animation: rotate 600ms infinite linear;
-	/* align */
-	left: 0;
-	top: 0;
-	position: absolute;
-	z-index: 100;
-}
-/* Animation for above progress */
-@keyframes rotate {
-	to {
-		transform: rotate(1turn)
-	}
-}
-
 /* ***************************** ADMIN EDIT INTERFACE COLORS ********************************* */
 /* set all colors here and not in the config file */
 /* for edit interface */

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

@@ -2,8 +2,6 @@
 	code is taken and adapted from dokuwiki
 */
 
-/* jshint esversion: 6 */
-
 /**
  * Some browser detection
  */
@@ -209,196 +207,3 @@ function formatBytes(bytes)
 
 	return parseFloat(Math.round(bytes * Math.pow(10, 2)) / Math.pow(10, 2)) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
 }
-
-// *** DOM MANAGEMENT FUNCTIONS
-// METHOD: cel [create element]
-// PARAMS: tag: must set tag (div, span, etc)
-//         id: optional set for id, if input, select will be used for name
-//         content: text content inside, is skipped if sub elements exist
-//         css: array for css tags
-//         options: anything else (value, placeholder, OnClick, style)
-// RETURN: object
-// DESC  : creates object for DOM element creation flow
-const cel = (tag, id = '', content = '', css = [], options = {}) =>
-	element = {
-		tag: tag,
-		id: id,
-		name: options.name, // override name if set [name gets ignored in tree build anyway]
-		content: content,
-		css: css,
-		options: options,
-		sub: []
-	};
-
-// METHOD: ael [attach element]
-// PARAMS: base: object where to attach/search
-//         attach: the object to be attached
-//         id: optional id, if given search in base for this id and attach there
-// RETURN: "none", technically there is no return needed
-// DESC  : attach a cel created object to another to create a basic DOM tree
-function ael(base, attach, id = '')
-{
-	if (id) {
-		// base id match already
-		if (base.id == id) {
-			base.sub.push(attach);
-		} else {
-			// sub check
-			if (base.sub.length > 0) {
-				base.sub.each(function(t) {
-					// recursive call to sub element
-					ael(t, attach, id);
-				});
-			}
-		}
-	} else {
-		base.sub.push(attach);
-	}
-	return base;
-}
-
-// METHOD: rel [rese element]
-// PARAMS: cel created element
-// RETURN: "none", is self change, but returns base.sub
-// DESC  : resets the sub elements of the base element given
-const rel = (base) => base.sub = [];
-
-// METHOD: rcssel [remove a css from the element]
-// PARAMS: element, style sheet to remove
-// RETURN: "none", in place because of reference
-// DESC  : searches and removes style from css array
-function rcssel(element, css)
-{
-	let css_index = element.css.indexOf(css);
-	if (css_index > -1) {
-		element.css.splice(css_index, 1);
-	}
-}
-
-// METHOD acssel [add css element]
-// PARAMS: element, style sheet to add
-// RETURN: "none", in place add because of reference
-// DESC  : adds a new style sheet to the element given
-function acssel(element, css)
-{
-	let css_index = element.css.indexOf(css);
-	if (css_index > -1) {
-		element.css.push(css);
-	}
-}
-
-// METHOD: phfo [produce html from object]
-// PARAMS: object tree with dom element declarations
-// RETURN: HTML string that can be used as innerHTML
-// DESC  : parses the object tree created with cel/ael
-//         and converts it into an HTML string that can
-//         be inserted into the page
-function phfo(tree)
-{
-	// holds the elements
-	let content = [];
-	// main part line
-	let line = '<' + tree.tag;
-	// first id, if set
-	if (tree.id) {
-		line += ' id="' + tree.id + '"';
-		// if anything input (input, textarea, select then add name too)
-		if (['input', 'textarea', 'select'].includes(tree.tag)) {
-			line += ' name="' + (tree.name ? tree.name : tree.id) + '"';
-		}
-	}
-	// second CSS
-	if (tree.css.length > 0) {
-		line += ' class="';
-		tree.css.each(function(t) {
-			line += t + ' ';
-		});
-		// strip last space
-		line = line.slice(0, -1);
-		line += '"';
-	}
-	// options is anything key = "data"
-	if (tree.options) {
-		// ignores id, name, class as key
-		for (const [key, item] of Object.entries(tree.options)) {
-			if (!['id', 'name', 'class'].includes(key)) {
-				line += ' ' + key + '="' + item + '"';
-			}
-		}
-	}
-	// finish open tag
-	line += '>';
-	// push finished line
-	content.push(line);
-	// dive into sub tree to attach sub nodes
-	// NOTES: we cannot have content (text) AND sub nodes at the same level
-	// NODE takes preference over content
-	if (tree.sub.length > 0) {
-		tree.sub.each(function(t) {
-			content.push(phfo(t));
-		});
-	} else if (tree.content) {
-		content.push(tree.content);
-	}
-	// if not input close
-	if (tree.tag != 'input') {
-		content.push('</' + tree.tag + '>');
-	}
-	// combine to string
-	return content.join('');
-}
-
-// BLOCK: html wrappers for quickly creating html data blocks
-// METHOD: html_options
-// PARAMS: name/id, array for the options, selected item uid
-//         options_only: if this is true, it will not print the select part
-//         return_string, return as string and not as element
-// RETURN: html with build options block
-// DESC  : creates an select/options drop down block.
-//         the array needs to be key -> value format. key is for the option id and value is for the data output
-function html_options(name, data, selected = '', options_only = false, return_string = false)
-{
-	let content = [];
-	let element_select;
-	let element_option;
-	// set outside select, gets stripped on return if options only is true
-	element_select = cel('select', name);
-	// console.log('Call for %s, options: %s', name, options_only);
-	$H(data).each(function(t) {
-		console.log('options: key: %s, value: %s', t.key, t.value);
-		// basic options init
-		let options = {
-			'label': t.value,
-			'value': t.key
-		};
-		// add selected if matching
-		if (selected == t.key) {
-			options.selected = '';
-		}
-		// create the element option
-		element_option = cel('option', '', t.value, '', options);
-		// attach it to the select element
-		ael(element_select, element_option);
-	});
-	// if with select part, convert to text
-	if (!options_only) {
-		if (return_string) {
-			content.push(phfo(element_select));
-			return content.join('');
-		} else {
-			return element_select;
-		}
-	} else {
-		// strip select part
-		if (return_string) {
-			element.sub.each(function(t) {
-				content.push(phfo(t));
-			});
-			return content.join('');
-		} else {
-			return element_select.sub;
-		}
-	}
-}
-
-/* END */

www/layout/admin/default/lang/messages_en_utf8.po

@@ -10,11 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Project Version\n"
-"Report-Msgid-Bugs-To: clemens.schwaighofer@egplusww.com\n"
-"POT-Creation-Date: 2018-03-28 10:40+0900\n"
+"Report-Msgid-Bugs-To: clemens.schwaighofer@e-graphics.com\n"
+"POT-Creation-Date: 2005-08-09 09:26+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
-"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@egplusww.com>\n"
+"Language-Team: E-GRAPHICS COMMUNICATIONS Japan <info.jp@e-graphics.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

www/layout/admin/default/lang/messages_ja_utf8.po

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

www/layout/frontend/default/css/frontend.css

@@ -3,27 +3,3 @@
 	color: #a4a4a4;
 	font-size: 8px;
 }
-
-/* NEW VERSION with CSS key frame animation */
-.progress {
-	width: 100px;
-	height: 100px;
-	background: rgba(255, 255, 255, 0.6);
-	border: 20px solid rgba(255, 255, 255 ,0.25);
-	border-left-color: rgba(3, 155, 229 ,1);
-	border-top-color: rgba(3, 155, 229 ,1);
-	border-radius: 50%;
-	display: inline-block;
-	animation: rotate 600ms infinite linear;
-	/* align */
-	left: 0;
-	top: 0;
-	position: absolute;
-	z-index: 100;
-}
-/* Animation for above progress */
-@keyframes rotate {
-	to {
-		transform: rotate(1turn)
-	}
-}

www/lib/CoreLibs/Language/Core/CachedFileReader.inc

@@ -1,48 +0,0 @@
-<?php
-
-/*
-	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-	This file is part of PHP-gettext.
-
-	PHP-gettext is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	PHP-gettext is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with PHP-gettext; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-namespace CoreLibs\Language\Core;
-
-// Preloads entire file in memory first, then creates a StringReader
-// over it (it assumes knowledge of StringReader internals)
-class CachedFileReader extends CoreLibs\Language\Core\StringReader
-{
-	public function __construct($filename)
-	{
-		if (file_exists($filename)) {
-			$length = filesize($filename);
-			$fd = fopen($filename, 'rb');
-
-			if (!$fd) {
-				$this->error = 3; // Cannot read file, probably permissions
-				return false;
-			}
-			$this->_str = fread($fd, $length);
-			fclose($fd);
-		} else {
-			$this->error = 2; // File doesn't exist
-			return false;
-		}
-	}
-}
-
-# __END__

www/lib/CoreLibs/Language/Core/FileReader.inc

@@ -1,91 +0,0 @@
-<?php
-
-/*
-	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-	This file is part of PHP-gettext.
-
-	PHP-gettext is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	PHP-gettext is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with PHP-gettext; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-namespace CoreLibs\Language\Core;
-
-class FileReader
-{
-	public $fr_pos;
-	public $fr_fd;
-	public $fr_length;
-
-	public function __construct($filename)
-	{
-		if (file_exists($filename)) {
-			$this->fr_length = filesize($filename);
-			$this->fr_pos = 0;
-			$this->fr_fd = fopen($filename, 'rb');
-			if (!$this->fr_fd) {
-				$this->error = 3; // Cannot read file, probably permissions
-				return false;
-			}
-		} else {
-			$this->error = 2; // File doesn't exist
-			return false;
-		}
-	}
-
-	public function read($bytes)
-	{
-		if ($bytes) {
-			fseek($this->fr_fd, $this->fr_pos);
-
-			// PHP 5.1.1 does not read more than 8192 bytes in one fread()
-			// the discussions at PHP Bugs suggest it's the intended behaviour
-			$data = '';
-			while ($bytes > 0) {
-				$chunk = fread($this->fr_fd, $bytes);
-				$data .= $chunk;
-				$bytes -= strlen($chunk);
-			}
-			$this->fr_pos = ftell($this->fr_fd);
-
-			return $data;
-		} else {
-			return '';
-		}
-	}
-
-	public function seekto($pos)
-	{
-		fseek($this->fr_fd, $pos);
-		$this->fr_pos = ftell($this->fr_fd);
-		return $this->fr_pos;
-	}
-
-	public function currentpos()
-	{
-		return $this->fr_pos;
-	}
-
-	public function length()
-	{
-		return $this->fr_length;
-	}
-
-	public function close()
-	{
-		fclose($this->fr_fd);
-	}
-}
-
-# __END__

www/lib/CoreLibs/Language/Core/StreamReader.inc

@@ -1,54 +0,0 @@
-<?php
-
-/*
-	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-	This file is part of PHP-gettext.
-
-	PHP-gettext is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	PHP-gettext is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with PHP-gettext; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-namespace CoreLibs\Language\Core;
-
-// Simple class to wrap file streams, string streams, etc.
-// seek is essential, and it should be byte stream
-class StreamReader
-{
-	// should return a string [FIXME: perhaps return array of bytes?]
-	public function read($bytes)
-	{
-		return false;
-	}
-
-	// should return new position
-	public function seekto($position)
-	{
-		return false;
-	}
-
-	// returns current position
-	public function currentpos()
-	{
-		return false;
-	}
-
-	// returns length of entire stream (limit for seekto()s)
-	public function length()
-	{
-		return false;
-	}
-}
-
-# __END__

www/lib/CoreLibs/Language/Core/StringReader.inc

@@ -1,67 +0,0 @@
-<?php
-
-/*
-	Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-	This file is part of PHP-gettext.
-
-	PHP-gettext is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	PHP-gettext is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with PHP-gettext; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-namespace CoreLibs\Language\Core;
-
-class StringReader
-{
-	public $sr_pos;
-	public $sr_str;
-
-	public function __construct($str = '')
-	{
-		$this->sr_str = $str;
-		$this->sr_pos = 0;
-	}
-
-	public function read($bytes)
-	{
-		$data = substr($this->sr_str, $this->sr_pos, $bytes);
-		$this->sr_pos += $bytes;
-		if (strlen($this->sr_str) < $this->sr_pos) {
-			$this->sr_pos = strlen($this->sr_str);
-		}
-
-		return $data;
-	}
-
-	public function seekto($pos)
-	{
-		$this->sr_pos = $pos;
-		if (strlen($this->sr_str) < $this->sr_pos) {
-			$this->sr_pos = strlen($this->sr_str);
-		}
-		return $this->sr_pos;
-	}
-
-	public function currentpos()
-	{
-		return $this->sr_pos;
-	}
-
-	public function length()
-	{
-		return strlen($this->sr_str);
-	}
-}
-
-# __END__

www/lib/CoreLibs/Upload/Core/qqUploadedFileForm.inc

@@ -1,31 +0,0 @@
-<?php
-
-namespace CoreLibs\Upload\Core;
-
-/**
- * Handle file uploads via regular form post (uses the $_FILES array)
- */
-class qqUploadedFileForm
-{
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save($path)
-	{
-		if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
-			return false;
-		}
-		return true;
-	}
-	public function getName()
-	{
-		return $_FILES['qqfile']['name'];
-	}
-	public function getSize()
-	{
-		return $_FILES['qqfile']['size'];
-	}
-}
-
-# __END__

www/lib/CoreLibs/Upload/Core/qqUploadedFileXhr.inc

@@ -1,46 +0,0 @@
-<?php
-
-namespace CoreLibs\Upload\Core;
-
-/**
- * Handle file uploads via XMLHttpRequest
- */
-class qqUploadedFileXhr
-{
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save($path)
-	{
-		$input = fopen("php://input", "r");
-		$temp = tmpfile();
-		$realSize = stream_copy_to_stream($input, $temp);
-		fclose($input);
-
-		if ($realSize != $this->getSize()) {
-			return false;
-		}
-
-		$target = fopen($path, "w");
-		fseek($temp, 0, SEEK_SET);
-		stream_copy_to_stream($temp, $target);
-		fclose($target);
-
-		return true;
-	}
-	public function getName()
-	{
-		return $_GET['qqfile'];
-	}
-	public function getSize()
-	{
-		if (isset($_SERVER["CONTENT_LENGTH"])) {
-			return (int)$_SERVER["CONTENT_LENGTH"];
-		} else {
-			throw new Exception('Getting content length is not supported.');
-		}
-	}
-}
-
-# __END__

www/lib/SMARTY_UPDATE

@@ -1,6 +0,0 @@
-* copy
-plugins/block.t.php
-plugins/function.popup*.php
-* check & copy
-plugins/function.html_checkboxes.php
-plugins/function.html_options.php

www/lib/Smarty

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

www/lib/autoloader.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace Autoloader;
-
-// shall implement an auto loader
-
-if (class_exists('Autoload', false) === false) {
-	// define the auto loader class
-	class Autoload
-	{
-		// we do it simple here
-		// passes on the class to load and we search here in namespace
-		// to load that class
-		public static function load($class)
-		{
-			// print "(1) Class: $class / DIR: ".__DIR__."<br>";
-			// set directory seperator (we need to replace from namespace)
-			$ds = DS ?? DIRECTORY_SEPARATOR;
-			// base lib
-			$LIB = LIB ?? 'lib';
-			// if lib is in path, do not add lib again
-			if (strpos(__DIR__, $LIB) !== false) {
-				$LIB .= DS;
-			} else {
-				$LIB = '';
-			}
-			// default path is unset
-			$path = false;
-			// set path on full dir
-			// if we have the namespace in the class, strip it out
-			$len = 0;
-			if (strpos($class, __NAMESPACE__) !== false) {
-				$len = strlen(__NAMESPACE__);
-			}
-			// set default extension
-			$extension = '.inc';
-			// set full include path
-			$path = __DIR__.$ds.$LIB.substr($class, $len);
-			// replace namespace \ with dir sepeator
-			$path = str_replace('\\', $ds, $path).$extension;
-			// print "(2) Class clean: $path<br>";
-			// if path is set and a valid file
-			if ($path !== false && is_file($path)) {
-				// echo "<b>(3)</b> Load Path: $path<br>";
-				// we should sub that
-				// self::loadFile($path);
-				include $path;
-				return true;
-			}
-			return false;
-		}
-	} // end class define
-
-	spl_autoload_register('Autoloader\Autoload::load', true, true);
-} // end check for already defined
-
-# __END__

www/libs/Class.Admin.Backend.inc

@@ -1,8 +1,8 @@
-<?php
+<?
 /*********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2006/08/15
-* VERSION: 1.0.0
+* VERSION: 0.1.0
 * RELEASED LICENSE: GNU GPL 3
 * DESCRIPTION
 * Basic Admin interface backend
@@ -22,9 +22,10 @@
 *
 *********************************************************************/
 
-namespace CoreLibs\Admin;
+// try to include file from LIBS path, or from normal path
+_spl_autoload('Class.DB.IO.inc');
 
-class Backend extends \CoreLibs\DB\IO
+class AdminBackend extends db_io
 {
 	// page name
 	public $page_name; // the name of the current page
@@ -60,21 +61,24 @@ class Backend extends \CoreLibs\DB\IO
 	public function __construct($db_config, $lang, $debug = 0, $db_debug = 0, $echo = 1, $print = 0)
 	{
 		// get the language sub class & init it
-		$this->l = new \CoreLibs\Language\L10n($lang);
+		_spl_autoload('Class.l10n.inc');
+
+		$this->l = new l10n($lang);
 
 		// init the database class
+//			$this->db_io($db_config, $debug, $db_debug, $echo, $print);
 		parent::__construct($db_config, $debug, $db_debug, $echo, $print);
 
 		// internal
 		$this->class_info["adbBackend"] = array(
 			"class_name" => "Admin Interface Backend",
-			"class_version" => "1.0.0",
+			"class_version" => "0.1.0",
 			"class_created" => "2006/08/15",
-			"class_author" => "Clemens Schwaighofer"
+			"class_author" => "cs/gullevek/jp"
 		);
 
 		// set page name
-		$this->page_name = $this->getPageName();
+		$this->page_name = $this->get_page_name();
 
 		// set the action ids
 		foreach ($this->action_list as $_action) {
@@ -118,15 +122,15 @@ class Backend extends \CoreLibs\DB\IO
 	// METHOD: adbEditLog()
 	// 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
+	// DESC:   writes all action vars plus other info into edit_log table
 	public function adbEditLog($event = '', $data = '', $write_type = 'STRING')
 	{
 		if ($write_type == 'BINARY') {
-			$data_binary = $this->dbEscapeBytea(bzcompress(serialize($data)));
+			$data_binary = $this->db_escape_bytea(bzcompress(serialize($data)));
 			$data = 'see bzip compressed data_binary field';
 		}
 		if ($write_type == 'STRING') {
-			$data = $this->dbEscapeString(serialize($data));
+			$data = $this->db_escape_string(serialize($data));
 		}
 
 		$q = "INSERT INTO ".LOGIN_DB_SCHEMA.".edit_log ";
@@ -134,24 +138,31 @@ class Backend extends \CoreLibs\DB\IO
 		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
 		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
 		$q .= "VALUES ";
-		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->dbEscapeString($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
-		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
-		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_REFERER'])."', '".$this->dbEscapeString(@$_SERVER['SCRIPT_FILENAME'])."', ";
-		$q .= "'".$this->dbEscapeString(@$_SERVER['QUERY_STRING'])."', '".$this->dbEscapeString(@$_SERVER['SERVER_NAME'])."', ";
-		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_HOST'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT'])."', ";
-		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
+		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->db_escape_string($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
+		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->db_escape_string(@$_SERVER['HTTP_USER_AGENT'])."', ";
+		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_REFERER'])."', '".$this->db_escape_string(@$_SERVER['SCRIPT_FILENAME'])."', ";
+		$q .= "'".$this->db_escape_string(@$_SERVER['QUERY_STRING'])."', '".$this->db_escape_string(@$_SERVER['SERVER_NAME'])."', ";
+		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_HOST'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT'])."', ";
+		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
 		$q .= "'".session_id()."', ";
-		$q .= "'".$this->dbEscapeString($this->action)."', '".$this->dbEscapeString($this->action_id)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_yes)."', '".$this->dbEscapeString($this->action_flag)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_menu)."', '".$this->dbEscapeString($this->action_loaded)."', ";
-		$q .= "'".$this->dbEscapeString($this->action_value)."', '".$this->dbEscapeString($this->action_error)."')";
-		$this->dbExec($q, 'NULL');
+		$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->action_id)."', ";
+		$q .= "'".$this->db_escape_string($this->action_yes)."', '".$this->db_escape_string($this->action_flag)."', ";
+		$q .= "'".$this->db_escape_string($this->action_menu)."', '".$this->db_escape_string($this->action_loaded)."', ";
+		$q .= "'".$this->db_escape_string($this->action_value)."', '".$this->db_escape_string($this->action_error)."')";
+		$this->db_exec($q, 'NULL');
 	}
 
+
+	// ==================================
+	// ALL THE PAGE RIGHTS/USER RIGHTS/ETC need to fixed and put into one
+	// proper settings have to be done with the defined top down rights flow
+	// ==================================
+	// all ACLs are set in the login class
+
 	// METHOD: adbTopMenu
 	// PARAMS: level
 	// RETURN: returns an array for the top menu with all correct settings
-	// DESC  : menu creater
+	// DESC:   menu creater
 	public function adbTopMenu($flag = 0)
 	{
 		if ($this->menu_show_flag) {
@@ -163,11 +174,13 @@ class Backend extends \CoreLibs\DB\IO
 		if (!is_array($pages)) {
 			$pages = array ();
 		}
-		// $this->debug('pages', $this->print_ar($pages));
+
+//$this->debug('pages', $this->print_ar($pages));
+
 		// if flag is 0, then we show all, else, we show only the matching flagges array points
 		// array is already sorted after correct order
 		reset($pages);
-		for ($i = 0, $iMax = count($pages); $i < $iMax; $i ++) {
+		for ($i = 0; $i < count($pages); $i ++) {
 			$show = 0;
 			// is it visible in the menu & is it online
 			if ($pages[$i]["menu"] && $pages[$i]["online"]) {
@@ -192,7 +205,7 @@ class Backend extends \CoreLibs\DB\IO
 					}
 					$query_string = '';
 					if (count($pages[$i]["query"])) {
-						for ($j = 0, $jMax = count($pages[$i]["query"]); $j < $jMax; $j ++) {
+						for ($j = 0; $j < count($pages[$i]["query"]); $j ++) {
 							if (strlen($query_string)) {
 								$query_string .= "&";
 							}
@@ -211,7 +224,7 @@ class Backend extends \CoreLibs\DB\IO
 					$name = $pages[$i]["page_name"];
 					// if page name matchs -> set selected flag
 					$selected = 0;
-					if ($this->getPageName() == $pages[$i]["filename"]) {
+					if ($this->get_page_name() == $pages[$i]["filename"]) {
 						$selected = 1;
 						$this->page_name = $name;
 					}
@@ -231,7 +244,7 @@ class Backend extends \CoreLibs\DB\IO
 	// METHOD: adbShowMenuPoint
 	// PARAMS: filename
 	// RETURN: returns boolean true/false
-	// DESC  : checks if this filename is in the current situation (user id, etc) available
+	// DESC:   checks if this filename is in the current situation (user id, etc) available
 	public function adbShowMenuPoint($filename)
 	{
 		$enabled = 0;
@@ -247,20 +260,20 @@ class Backend extends \CoreLibs\DB\IO
 	// METHOD: adbAssocArray
 	// PARAMS: db array, key, value part
 	// RETURN: returns and associative array
-	// DESC  : creates out of a normal db_return array an assoc array
+	// DESC:   creates out of a normal db_return array an assoc array
 	public function adbAssocArray($db_array, $key, $value)
 	{
-		return $this->genAssocArray($db_array, $key, $value);
+		return $this->GenAssocArray($db_array, $key, $value);
 	}
 
 	// REMARK: below function has moved to "Class.Basic"
 	// METHOD: adbByteStringFormat
 	// PARAMS: int
 	// RETURN: string
-	// DESC  : converts bytes into formated string with KB, MB, etc
+	// DESC:   converts bytes into formated string with KB, MB, etc
 	public function adbByteStringFormat($number)
 	{
-		return $this->byteStringFormat($number);
+		return $this->ByteStringFormat($number);
 	}
 
 	// REMARK: below function has moved to "Class.Basic"
@@ -272,10 +285,10 @@ class Backend extends \CoreLibs\DB\IO
 	//         path -> if source start is not ROOT path, if empty ROOT is choosen
 	//         cache -> cache path, if not given TMP is used
 	// RETURN: thumbnail name
-	// DESC  : converts picture to a thumbnail with max x and max y size
+	// DESC:   converts picture to a thumbnail with max x and max y size
 	public function adbCreateThumbnail($pic, $size_x, $size_y, $dummy = false, $path = "", $cache = "")
 	{
-		return $this->createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
+		return $this->CreateThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
 	}
 
 	// METHOD: adbMsg
@@ -283,7 +296,7 @@ class Backend extends \CoreLibs\DB\IO
 	//         msg -> string, can be printf formated
 	//         var array -> optional data for a possible printf formated msg
 	// RETURN: none
-	// DESC  : wrapper function to fill up the mssages array
+	// DESC:   wrapper function to fill up the mssages array
 	public function adbMsg($level, $msg, $vars = array ())
 	{
 		if (!preg_match("/^info|warning|error$/", $level)) {
@@ -316,47 +329,82 @@ class Backend extends \CoreLibs\DB\IO
 	//         associate -> NULL for free, LOCK for first insert, group key for reference to first entry
 	//         file      -> string for special file copy actions; mostyle "test#live;..."
 	// RETURN: none
-	// DESC  : writes live queue
+	// DESC:   writes live queue
 	public function adbLiveQueue($queue_key, $type, $target, $data, $key_name, $key_value, $associate = null, $file = null)
 	{
 		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (";
 		$q .= "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file";
 		$q .= ") VALUES (";
-		$q .= "'".$this->dbEscapeString($queue_key)."', '".$this->dbEscapeString($key_value)."', ";
-		$q .= "'".$this->dbEscapeString($key_name)."', '".$this->dbEscapeString($type)."', ";
-		$q .= "'".$this->dbEscapeString($target)."', '".$this->dbEscapeString($data)."', ";
-		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->dbEscapeString($associate)."', ";
-		$q .= "'".$this->dbEscapeString($file)."')";
+		$q .= "'".$this->db_escape_string($queue_key)."', '".$this->db_escape_string($key_value)."', ";
+		$q .= "'".$this->db_escape_string($key_name)."', '".$this->db_escape_string($type)."', ";
+		$q .= "'".$this->db_escape_string($target)."', '".$this->db_escape_string($data)."', ";
+		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->db_escape_string($associate)."', ";
+		$q .= "'".$this->db_escape_string($file)."')";
 		$this->db_exec($q);
 	}
 
 	// METHOD: adbPrintDateTime
 	// PARAMS: year, month, day, hour, min: the date and time values
-	//         suffix: additional info printed after the date time variable in the drop down,
-	//         also used for ID in the on change JS call
-	//         minute steps: can be 1 (default), 5, 10, etc, if invalid (outside 1h range,
-	//         it falls back to 1min)
-	//         name pos back: default false, if set to true, the name will be printend
-	//                        after the drop down and not before the drop down
+	//         suffix: additional info printed after the date time variable in the drop down, also used for ID in the on change JS call
+	//         minute steps, can be 1 (default), 5, 10, etc, if invalid (outside 1h range, it falls back to 1min)
 	// RETURN: HTML formated strings for drop down lists of date and time
-	// DESC  : print the date/time drop downs, used in any queue/send/insert at date/time place
-	// NOTE  : Basic class holds exact the same, except the Year/Month/Day/etc strings
-	//         are translated in this call
-	public function adbPrintDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1, $name_pos_back = false)
+	// DESC:   print the date/time drop downs, used in any queue/send/insert at date/time place
+	public function adbPrintDateTime($year, $month, $day, $hour, $min, $suffix = '', $min_steps = 1)
 	{
-		// get the build layout
-		$html_time = $this->printDateTime($year, $month, $day, $hour, $min, $suffix, $min_steps, $name_pos_back);
-		// translate the strings inside
-		foreach (array('Year ', 'Month ', 'Day ', 'Hour ', 'Minute ') as $_time) {
-			$html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)).' ', $html_time);
+		// if suffix given, add _ before
+		if ($suffix) {
+			$suffix = '_'.$suffix;
 		}
-		// replace week days in short
-		foreach (array('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun') as $_date) {
-			$html_time = str_replace('('.$_date.')', '('.$this->l->__($_date).')', $html_time);
+		if ($min_steps < 1 || $min_steps > 59) {
+			$min_steps = 1;
 		}
-		// return the datetime select string with strings translated
-		return $html_time;
+
+		$on_change_call = 'dt_list(\''.$suffix.'\');';
+
+		// always be 1h ahead (for safety)
+		$timestamp = time() + 3600; // in seconds
+
+		// the max year is this year + 1;
+		$max_year = date("Y", $timestamp) + 1;
+
+		// preset year, month, ...
+		$year = (!$year) ? date("Y", $timestamp) : $year;
+		$month = (!$month) ? date("m", $timestamp) : $month;
+		$day = (!$day) ? date("d", $timestamp) : $day;
+		$hour = (!$hour) ? date("H", $timestamp) : $hour;
+		$min = (!$min) ? date("i", $timestamp) : $min; // add to five min?
+		// max days in selected month
+		$days_in_month = date("t", strtotime($year."-".$month."-".$day." ".$hour.":".$min.":0"));
+
+		// from now to ?
+		$string = $this->l->__('Year').' ';
+		$string .= '<select id="year'.$suffix.'" name="year'.$suffix.'" onChange="'.$on_change_call.'">';
+		for ($i = date("Y"); $i <= $max_year; $i ++) {
+			$string .= '<option value="'.$i.'" '.(($year == $i) ? 'selected' : '').'>'.$i.'</option>';
+		}
+		$string .= '</select> '.$this->l->__('Month').' ';
+		$string .= '<select id="month'.$suffix.'" name="month'.$suffix.'" onChange="'.$on_change_call.'">';
+		for ($i = 1; $i <= 12; $i ++) {
+			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($month == $i) ? 'selected' : '').'>'.$i.'</option>';
+		}
+		$string .= '</select> '.$this->l->__('Day').' ';
+		$string .= '<select id="day'.$suffix.'" name="day'.$suffix.'" onChange="'.$on_change_call.'">';
+		for ($i = 1; $i <= $days_in_month; $i ++) {
+			// set weekday text based on current month ($month) and year ($year)
+			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($day == $i) ? 'selected' : '').'>'.$i.' ('.$this->l->__(date('D', mktime(0, 0, 0, $month, $i, $year))).')</option>';
+		}
+		$string .= '</select> '.$this->l->__('Hour').' ';
+		$string .= '<select id="hour'.$suffix.'" name="hour'.$suffix.'" onChange="'.$on_change_call.'">';
+		for ($i = 0; $i <= 23; $i ++) {
+			$string .= '<option value="'.(($i < 10) ? '0'.$i : $i).'" '.(($hour == $i) ? 'selected' : '').'>'.$i.'</option>';
+		}
+		$string .= '</select> '.$this->l->__('Minute').' ';
+		$string .= '<select id="min'.$suffix.'" name="min'.$suffix.'" onChange="'.$on_change_call.'">';
+		for ($i = 0; $i <= 59; $i += $min_steps) {
+			$string .= '<option value="'.(( $i < 10) ? '0'.$i : $i).'" '.(($min == $i) ? 'selected' : '').'>'.$i.'</option>';
+		}
+		$string .= '</select>';
+		// return the datetime select string
+		return $string;
 	}
 }
-
-# __END__

www/libs/Class.DB.Array.IO.inc

@@ -1,10 +1,10 @@
-<?php
+<?
 /*********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2002/12/17
-* VERSION: 1.0.0
+* VERSION: 0.4.0
 * RELEASED LICENSE: GNU GPL 3
-* SHORT DESC  :RIPTION:
+* SHORT DESCRIPTION:
 *   DB Array IO Class:
 *   writes, reads or deletes a complete array (one data set) in/out a
 *   table from the connected DB.
@@ -14,9 +14,9 @@
 *
 *   PRIVATE VARIABLES
 *
-*   PUBLIC METHOD:S
+*   PUBLIC METHODS
 *
-*   PRIVATE METHOD:S
+*   PRIVATE METHODS
 *
 * HISTORY:
 * 2005/07/07 (cs) updated array class for postgres: set 0 & NULL if int field given, insert uses () values () syntax
@@ -36,10 +36,11 @@
 // as it actually has nothing to do with this one here ? (or at least
 // put into separete function in this class)
 
-namespace CoreLibs\DB\Extended;
+// try to include file from LIBS path, or from normal path
+_spl_autoload('Class.DB.IO.inc');
 
 // subclass for one array handling
-class ArrayIO extends \CoreLibs\DB\IO
+class db_array_io extends db_io
 {
 	// main calss variables
 	public $table_array; // the array from the table to work on
@@ -47,14 +48,14 @@ class ArrayIO extends \CoreLibs\DB\IO
 	public $pk_name; // the primary key from this table
 	public $pk_id; // the PK id
 
-	// METHOD: db_array_io
-	// PARAMS: db_config -> db_io class init vars
-	//         table_array -> the array from the table
-	//         table_name -> name of the table (for the array)
-	//         db_debug -> turn on db_io debug output (DB_DEBUG as global var does the same)
-	// RETURN: none
-	// DESC  : constructor for the array io class, set the
-	//         primary key name automatically (from array)
+	// METHOD db_array_io
+	// PARAMS db_config -> db_io class init vars
+	//        table_array -> the array from the table
+	//        table_name -> name of the table (for the array)
+	//        db_debug -> turn on db_io debug output (DB_DEBUG as global var does the same)
+	// RETURN none
+	// DESC   constructor for the array io class, set the
+	//        primary key name automatically (from array)
 	public function __construct($db_config, $table_array, $table_name, $debug = 0, $db_debug = 0, $echo = 1, $print = 0)
 	{
 		// instance db_io class
@@ -68,7 +69,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 
 		// set primary key for given table_array
 		if ($this->table_array) {
-			foreach ($table_array as $key => $value) {
+			while (list($key, $value) = each($table_array)) {
 				if ($value["pk"]) {
 					$this->pk_name = $key;
 				}
@@ -77,9 +78,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 		// internal
 		$this->class_info["db_array_io"] = array(
 			"class_name" => "DB Array IO",
-			"class_version" => "1.0.0",
+			"class_version" => "0.4.0",
 			"class_created" => "2002/12/17",
-			"class_author" => "Clemens Schwaighofer"
+			"class_author" => "cs/gullevek/at"
 		);
 	}
 
@@ -89,15 +90,14 @@ class ArrayIO extends \CoreLibs\DB\IO
 		parent::__destruct();
 	}
 
-	// METHOD: convertData
-	// WAS   : convert_data
-	// PARAMS: string -> the string that should be changed
-	// RETURN: string -> the altered string
-	// DESC  : changes all previously alterd HTML code into visible one,
-	//         works for <b>,<i>, and <a> (thought <a> can be / or should
-	//         be handled with the magic links functions
-	//         used with the read function
-	public function convertData($text)
+	// METHOD convert_data
+	// PARAMS string -> the string that should be changed
+	// RETURN string -> the altered string
+	// DESC   changes all previously alterd HTML code into visible one,
+	//        works for <b>,<i>, and <a> (thought <a> can be / or should
+	//        be handled with the magic links functions
+	//        used with the read function
+	public function convert_data($text)
 	{
 		$text = str_replace('&lt;b&gt;', '<b>', $text);
 		$text = str_replace('&lt;/b&gt;', '</b>', $text);
@@ -110,12 +110,11 @@ class ArrayIO extends \CoreLibs\DB\IO
 		return $text;
 	}
 
-	// METHOD: convertEntities
-	// WAS   : convert_entities
-	// PARAMS: string -> string to be changed
-	// RETURN: string -> altered string
-	// DESC  : changeds all HTML entities into non HTML ones
-	public function convertEntities($text)
+	// METHOD convert_entities
+	// PARAMS string -> string to be changed
+	// RETURN string -> altered string
+	// DESC   changeds all HTML entities into non HTML ones
+	public function convert_entities($text)
 	{
 		$text = str_replace('&lt;', '<', $text);
 		$text = str_replace('&gt;', '>', $text);
@@ -125,15 +124,14 @@ class ArrayIO extends \CoreLibs\DB\IO
 		return $text;
 	}
 
-	// METHOD: dbDumpArray
-	// WAS   : db_dump_array
-	// PARAMS: none
-	// RETURN: returns the current array
-	// DESC  : dumps the current data
-	public function dbDumpArray($write = 0)
+	// METHOD db_dump_array
+	// PARAMS none
+	// RETURN returns the current array
+	// DESC   dumps the current data
+	public function db_dump_array($write = 0)
 	{
 		reset($this->table_array);
-		foreach ($this->table_array as $column => $data_array) {
+		while (list($column, $data_array) = each($this->table_array)) {
 			$string .= "<b>".$column."</b> -> ".$data_array["value"]."<br>";
 		}
 		// add output to internal error_msg
@@ -143,12 +141,24 @@ class ArrayIO extends \CoreLibs\DB\IO
 		return $string;
 	}
 
-	// METHOD: dbCheckPkSet
-	// WAS   : db_check_pk_set
-	// PARAMS: none
-	// RETURN: none
-	// DESC  : checks if pk is set and if not, set from pk_id and if this also not set return 0
-	public function dbCheckPkSet()
+	// METHOD _db_error
+	// PARAMS none
+	// RETURN none
+	// DESC   writes errors to internal error string
+/*     function _db_error()
+	{
+		// if error occured
+		if ($this->error_id)
+		{
+			$this->error_msg['db'] .= "<b>-DB_ARRAY-error-></b> ".$this->error_id.": ".$this->error_string[$this->error_id]." <br>";
+		}
+	} */
+
+	// METHOD db_check_pk_set
+	// PARAMS none
+	// RETURN none
+	// DESC   checks if pk is set and if not, set from pk_id and if this also not set return 0
+	public function db_check_pk_set()
 	{
 		// if pk_id is set, overrule ...
 		if ($this->pk_id) {
@@ -158,22 +168,21 @@ class ArrayIO extends \CoreLibs\DB\IO
 		if (!$this->table_array[$this->pk_name]["value"]) {
 			// if no PK found, error ...
 			$this->error_id = 21;
-			$this->__dbError();
+			$this->_db_error();
 			return 0;
 		} else {
 			return 1;
 		}
 	}
 
-	// METHOD: dbResetArray
-	// WAS   : db_reset_array
-	// PARAMS: reset_pk -> if set reset the pk too
-	// RETURN: none
-	// DESC  : resets the whole array
-	public function dbResetArray($reset_pk = 0)
+	// METHOD db_reset_array
+	// PARAMS reset_pk -> if set reset the pk too
+	// RETURN none
+	// DESC   resets the whole array
+	public function db_reset_array($reset_pk = 0)
 	{
 		reset($this->table_array);
-		foreach ($this->table_array as $column => $data_array) {
+		while (list($column, $data_array) = each($this->table_array)) {
 			if (!$this->table_array[$column]["pk"]) {
 				unset($this->table_array[$column]["value"]);
 			} elseif ($reset_pk) {
@@ -182,17 +191,16 @@ class ArrayIO extends \CoreLibs\DB\IO
 		}
 	}
 
-	// METHOD: dbDelete
-	// WAS   : db_delete
-	// PARAMS: optional the table_array, if not given uses class var
-	// RETURN: 1 for successfull delete or 0 for error
-	// DESC  : deletes one dataset
-	public function dbDelete($table_array = 0)
+	// METHOD db_delete
+	// PARAMS optional the table_array, if not given uses class var
+	// RETURN 1 for successfull delete or 0 for error
+	// DESC   deletes one dataset
+	public function db_delete($table_array = 0)
 	{
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
 		}
-		if (!$this->dbCheckPkSet()) {
+		if (!$this->db_check_pk_set()) {
 			return $this->table_array;
 		}
 		// delete query
@@ -200,8 +208,8 @@ class ArrayIO extends \CoreLibs\DB\IO
 		$q .= $this->pk_name." = ".$this->table_array[$this->pk_name]["value"]." ";
 		// delete files and build FK query
 		reset($this->table_array);
-		foreach ($this->table_array as $column => $data_array) {
-			// suchen nach bildern und lschen ...
+		while (list($column, $data_array) = each($this->table_array)) {
+			// suchen nach bildern und löschen ...
 			if ($this->table_array[$column]["file"] && file_exists($this->table_array[$column]["url"].$this->table_array[$column]["value"])) {
 				if (file_exists($this->table_array[$column]["path"].$this->table_array[$column]["value"])) {
 					unlink($this->table_array[$column]["path"].$this->table_array[$column]["value"]);
@@ -219,7 +227,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 				}
 				$q_where .= $column." = ".$this->table_array[$column]["value"];
 			}
-			// allgemeines zurcksetzen des arrays
+			// allgemeines zurücksetzen des arrays
 			unset($this->table_array[$column]["value"]);
 		}
 
@@ -229,30 +237,29 @@ class ArrayIO extends \CoreLibs\DB\IO
 		}
 		// if 0, error
 		unset($this->pk_id);
-		if (!$this->dbExec($q)) {
+		if (!$this->db_exec($q)) {
 			$this->error_id=22;
-			$this->__dbError();
+			$this->_db_error();
 		}
 		return $this->table_array;
 	}
 
-	// METHOD: dbRead
-	// WAS   : db_read
-	// PARAMS: edit -> if 1 data will not be altered for output, optional the table_array, if not given uses class var
-	// RETURN: true or false for reading
-	// DESC  : reads one row into the array
-	public function dbRead($edit = 0, $table_array = 0)
+	// METHOD db_read
+	// PARAMS edit -> if 1 data will not be altered for output, optional the table_array, if not given uses class var
+	// RETURN true or false for reading
+	// DESC   reads one row into the array
+	public function db_read($edit = 0, $table_array = 0)
 	{
 		// if array give, overrules internal array
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
 		}
-		if (!$this->dbCheckPkSet()) {
+		if (!$this->db_check_pk_set()) {
 			return $this->table_array;
 		}
 		reset($this->table_array);
 		// create select part & addition FK part
-		foreach ($this->table_array as $column => $data_array) {
+		while (list($column, $data_array)=each($this->table_array)) {
 			if ($q_select) {
 				$q_select .= ", ";
 			}
@@ -276,12 +283,12 @@ class ArrayIO extends \CoreLibs\DB\IO
 		}
 
 		// if query was executed okay, else set error
-		if ($this->dbExec($q)) {
-			if ($res = $this->dbFetchArray()) {
+		if ($this->db_exec($q)) {
+			if ($res = $this->db_fetch_array()) {
 				reset($this->table_array);
-				foreach ($this->table_array as $column => $data_array) {
-					// wenn "edit" dann gib daten wie in DB zurck, ansonten aufbereiten fr ausgabe
-					// ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen
+				while (list($column, $data_array) = each($this->table_array)) {
+					// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten für ausgabe
+					// ?? sollte das nicht draußen ??? man weis ja net was da drin steht --> is noch zu überlegen
 					// echo "EDIT: $edit | Spalte: $column | type: ".$this->table_array[$column]["type"]." | Res: ".$res[$column]."<br>";
 					if ($edit) {
 						$this->table_array[$column]["value"] = $res[$column];
@@ -290,26 +297,25 @@ class ArrayIO extends \CoreLibs\DB\IO
 							$this->table_array[$column]["HIDDEN_value"] = $res[$column];
 						}
 					} else {
-						$this->table_array[$column]["value"] = $this->convertData(nl2br($res[$column]));
+						$this->table_array[$column]["value"] = $this->convert_data(nl2br($res[$column]));
 						// had to put out the htmlentities from the line above as it breaks japanese characters
 					}
 				}
 			}
-			// possible dbFetchArray errors ...
+			// possible db_fetch_array errors ...
 			$this->pk_id = $this->table_array[$this->pk_name]["value"];
 		} else {
 			$this->error_id = 22;
-			$this->__dbError();
+			$this->_db_error();
 		}
 		return $this->table_array;
 	}
 
-	// METHOD: dbWrite
-	// WAS   : db_write
-	// PARAMS: addslashes -> if 1 will make an addslashes for each array field, optional the table_array, if not given uses class var
-	// RETURN: true or false on write
-	// DESC  : writes on set into DB or updates one set (if PK exists)
-	public function dbWrite($addslashes = 0, $table_array = 0)
+	// METHOD db_write
+	// PARAMS addslashes -> if 1 will make an addslashes for each array field, optional the table_array, if not given uses class var
+	// RETURN true or false on write
+	// DESC   writes on set into DB or updates one set (if PK exists)
+	public function db_write($addslashes = 0, $table_array = 0)
 	{
 		if (is_array($table_array)) {
 			$this->table_array = $table_array;
@@ -326,7 +332,8 @@ class ArrayIO extends \CoreLibs\DB\IO
 		}
 
 		reset($this->table_array);
-		foreach ($this->table_array as $column => $data_array) {
+		while (list($column, $data_array) = each($this->table_array)) {
+
 /********************************* START FILE *************************************/
 			// file upload
 			if ($this->table_array[$column]["file"]) {
@@ -420,9 +427,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 					$q_data .= "'";
 					// if add slashes do convert & add slashes else write AS is
 					if ($addslashes) {
-						$q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]["value"]));
+						$q_data .= $this->db_escape_string($this->convert_entities($this->table_array[$column]["value"]));
 					} else {
-						$q_data .= $this->dbEscapeString($this->table_array[$column]["value"]);
+						$q_data .= $this->db_escape_string($this->table_array[$column]["value"]);
 					}
 					$q_data .= "'";
 				}
@@ -433,7 +440,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 		// get it at the end, cause now we can be more sure of no double IDs, etc
 		reset($this->table_array);
 		// create select part & addition FK part
-		foreach ($this->table_array as $column => $data_array) {
+		while (list($column, $data_array) = each($this->table_array)) {
 			// check FK ...
 			if ($this->table_array[$column]["fk"] && $this->table_array[$column]["value"]) {
 				if ($q_where) {
@@ -447,7 +454,7 @@ class ArrayIO extends \CoreLibs\DB\IO
 		if (!$this->table_array[$this->pk_name]["value"]) {
 			// max id, falls INSERT
 			$q = "SELECT MAX(".$this->pk_name.") + 1 AS pk_id FROM ".$this->table_name;
-			$res = $this->dbReturnRow($q);
+			$res = $this->db_return_row($q);
 			if (!$res["pk_id"]) {
 				$res["pk_id"] = 1;
 			}
@@ -475,9 +482,9 @@ class ArrayIO extends \CoreLibs\DB\IO
 			// $this->pk_id = $this->table_array[$this->pk_name]["value"];
 		}
 		// return success or not
-		if (!$this->dbExec($q)) {
+		if (!$this->db_exec($q)) {
 			$this->error_id = 22;
-			$this->__dbError();
+			$this->_db_error();
 		}
 		// set primary key
 		if ($insert) {
@@ -487,60 +494,4 @@ class ArrayIO extends \CoreLibs\DB\IO
 		// return the table if needed
 		return $this->table_array;
 	}
-
-	// *************************************************************
-	// COMPATIBILITY METHODS
-	// those methods are deprecated function call names
-	// they exist for backwards compatibility only
-	// *************************************************************
-
-	public function convert_data($text)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->convertData($text);
-	}
-
-	public function convert_entities($text)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->convertEntities($text);
-	}
-
-	public function db_dump_array($write = 0)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbDumpArray($write);
-	}
-
-	public function db_check_pk_set()
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbCheckPkSet();
-	}
-
-	public function db_reset_array($reset_pk = 0)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbResetArray($reset_pk);
-	}
-
-	public function db_delete($table_array = 0)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbDelete($table_array);
-	}
-
-	public function db_read($edit = 0, $table_array = 0)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbRead($edit, $table_array);
-	}
-
-	public function db_write($addslashes = 0, $table_array = 0)
-	{
-		error_log('DEPRECATED CALL: '.__METHOD__.', '.__FILE__.':'.__LINE__.', '.debug_backtrace()[0]['file'].':'.debug_backtrace()[0]['line']);
-		return $this->dbWrite($addslashes, $table_array);
-	}
 } // end of class
-
-# __END__

www/libs/Class.Login.inc

@@ -1,8 +1,8 @@
-<?php
+<?
 /*********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2000/06/01
-* VERSION: 5.0.0
+* VERSION: 4.0.0
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTON:
 *   ~ 2003/03/03: change the whole include file into one class
@@ -57,9 +57,10 @@
 *   2000-06-01: created basic idea and functions
 *********************************************************************/
 
-namespace CoreLibs\ACL;
+// try to include file from LIBS path, or from normal path
+_spl_autoload('Class.DB.IO.inc');
 
-class Login extends \CoreLibs\DB\IO
+class login extends db_io
 {
 	private $euid; // the user id var
 	private $permission_okay = 0; // is set to one if login okay, or EUID is set and user is okay to access this page
@@ -70,14 +71,10 @@ class Login extends \CoreLibs\DB\IO
 	private $login_error; // login error code, can be matched to the array login_error_msg, which holds the string
 	private $password_change = false; // if this is set to true, the user can change passwords
 	private $password_change_ok = false; // password change was successful
-	private $password_forgot = false; // can we reset password and mail to user with new password set screen
-	private $password_forgot_ok = false; // password forgot mail send ok
 	private $pw_change_deny_users = array (); // array of users for which the password change is forbidden
 
 	// if we have password change we need to define some rules
-	private $password_min_length = PASSWORD_MIN_LENGTH;
-	// max length is fixed as 255 (for input type max), if set highter, it will be set back to 255
-	private $password_max_length = PASSWORD_MAX_LENGTH;
+	private $password_min_length = 8;
 	// can have several regexes, if nothing set, all is ok
 	private $password_valid_chars = array (
 		// '^(?=.*\d)(?=.*[A-Za-z])[0-9A-Za-z!@#$%]{8,}$',
@@ -87,11 +84,7 @@ class Login extends \CoreLibs\DB\IO
 	// all possible login error conditions
 	private $login_error_msg = array ();
 	// this is an array holding all strings & templates passed from the outside (translation)
-	private $login_template = array (
-		'strings' => array (),
-		'password_change' => '',
-		'template' => ''
-	);
+	private $login_template = array ('strings' => array (), 'password_change' => '', 'template' => '');
 
 	// acl vars
 	public $acl = array ();
@@ -108,46 +101,22 @@ class Login extends \CoreLibs\DB\IO
 		$this->log_per_class = 1;
 
 		// create db connection and init base class
-		if (!parent::__construct($db_config, $debug, $db_debug, $echo, $print)) {
-			echo "Could not connect to DB<br>";
-			// if I can't connect to the DB to auth exit hard. No access allowed
-			exit;
-		}
+		parent::__construct($db_config, $debug, $db_debug, $echo, $print);
 
 		// no session could be found at all
 		if (!session_id()) {
-			echo "<b>Session not started!</b><br>Use 'session_start();'.<br>";
-			echo "For less problems with other session, you can set a session name with 'session_name(\"name\");'.<br>";
+			echo "<b>Session not started!</b><br>Use 'session_start();'.<br>For less problems with other session, you can set a session name with 'session_name(\"name\");'.<br>";
 			exit;
 		}
 
-		// pre-check that password min/max lengths are inbetween 1 and 255;
-		if ($this->password_max_length > 255) {
-			echo "<b>Settings problem</b> PMaL<br>";
-			exit;
-		}
-		if ($this->password_min_length < 1) {
-			echo "<b>Settings problem</b> PMiL<br>";
-			exit;
-		}
-
-		$this->l = new \CoreLibs\Language\L10n($lang);
+		// get the language sub class & init it
+		_spl_autoload('Class.l10n.inc');
+		$this->l = new l10n($lang);
 
 		// if we have a search path we need to set it, to use the correct DB to login
 		// check what schema to use. if there is a login schema use this, else check if there is a schema set in the config, or fall back to DB_SCHEMA if this exists, if this also does not exists use public schema
-		if (defined('LOGIN_DB_SCHEMA')) {
-			$SCHEMA = LOGIN_DB_SCHEMA;
-		} elseif ($db_config['db_schema']) {
-			$SCHEMA = $db_config['db_schema'];
-		} elseif (defined('DB_SCHEMA')) {
-			$SCHEMA = DB_SCHEMA;
-		} else {
-			$SCHEMA = 'public';
-		}
-		// set schema if schema differs to schema set in db conneciton
-		if ($this->dbGetSchema() && $this->dbGetSchema() != $SCHEMA) {
-			$this->dbExec("SET search_path TO ".$SCHEMA);
-		}
+		$SCHEMA = defined('LOGIN_DB_SCHEMA') ? LOGIN_DB_SCHEMA : ($db_config['db_schema'] ? $db_config['db_schema'] : (defined('DB_SCHEMA') ? DB_SCHEMA : 'public'));
+		$this->db_exec("SET search_path TO ".$SCHEMA);
 		$this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0; // if there is none, there is none, saves me POST/GET check
 		// get login vars, are so, can't be changed
 		// prepare
@@ -197,10 +166,6 @@ class Login extends \CoreLibs\DB\IO
 		if (defined('PASSWORD_CHANGE')) {
 			$this->password_change = PASSWORD_CHANGE;
 		}
-		// NOTE: forgot password flow with email
-		if (defined('PASSWORD_FORGOT')) {
-			$this->password_forgot = PASSWORD_FORGOT;
-		}
 		// max login counts before error reporting
 		$this->max_login_error_count = 10;
 		// users that never get locked, even if they are set strict
@@ -209,16 +174,16 @@ class Login extends \CoreLibs\DB\IO
 		// internal
 		$this->class_info["login"] = array(
 			"class_name" => "Login",
-			"class_version" => "5.0.0",
+			"class_version" => "4.0.0",
 			"class_created" => "2000-06-01",
-			"class_author" => "Clemens Schwaighofer"
+			"class_author" => "cs/gullevek/at"
 		);
 
 		// init default ACL list array
 		$_SESSION['DEFAULT_ACL_LIST'] = array ();
 		// read the current edit_access_right list into an array
 		$q = "SELECT level, type, name FROM edit_access_right WHERE level >= 0 ORDER BY level";
-		while ($res = $this->dbReturn($q)) {
+		while ($res = $this->db_return($q)) {
 			// level to description format (numeric)
 			$this->default_acl_list[$res['level']] = array (
 				'type' => $res['type'],
@@ -229,23 +194,19 @@ class Login extends \CoreLibs\DB\IO
 		$_SESSION['DEFAULT_ACL_LIST'] = $this->default_acl_list;
 
 		// if username & password & !$euid start login
-		$this->loginLoginUser();
+		$this->login_login_user();
 		// checks if $euid given check if user is okay for that side
-		$this->loginCheckPermissions();
+		$this->login_check_permissions();
 		// logsout user
-		$this->loginLogoutUser();
+		$this->login_logout_user();
 		// if the password change flag is okay, run the password change method
 		if ($this->password_change) {
-			$this->loginPasswordChange();
-		}
-		// password forgot
-		if ($this->password_forgot) {
-			$this->loginPasswordForgot();
+			$this->login_password_change();
 		}
 		// if !$euid || permission not okay, print login screan
-		echo $this->loginPrintLogin();
+		echo $this->login_print_login();
 		// closing all connections, depending on error status, exit
-		if (!$this->loginCloseClass()) {
+		if (!$this->login_close_class()) {
 			// do not go anywhere, quit processing here
 			// do something with possible debug data?
 			if (TARGET == 'live' || TARGET == 'remote')	{
@@ -254,14 +215,14 @@ class Login extends \CoreLibs\DB\IO
 				$this->echo_output_all = 0;
 				$this->print_output_all = DEBUG ? 1 : 0;
 			}
-			$status_msg = $this->printErrorMsg();
+			$status_msg = $this->print_error_msg();
 			if ($this->echo_output_all) {
 				echo $status_msg;
 			}
 			exit;
 		}
 		// set acls for this user/group and this page
-		$this->loginSetAcl();
+		$this->login_set_acl();
 	}
 
 	// METHOD: _login
@@ -279,12 +240,6 @@ class Login extends \CoreLibs\DB\IO
 	// DESC  : checks if password is valid, sets internal error login variable
 	private function loginPasswordCheck($hash, $password = '')
 	{
-		// check with what kind of prefix the password begins:
-		// $2a$ or $2y$: BLOWFISCH
-		// $1$: MD5
-		// $ and one alphanumeric letter, 13 chars long, but nor $ at the end: STD_DESC
-		// if no $ => normal password
-		// NOW, if we have a password encoded, but not the correct encoder available, throw special error
 		$password_ok = false;
 		if (!$password) {
 			$password = $this->password;
@@ -318,7 +273,7 @@ class Login extends \CoreLibs\DB\IO
 			!preg_match("/^\\$[0-9A-Za-z.]{12}$/", $hash) &&
 			$hash != $password
 		) {
-			// check old plain password, case sensitive
+			// check old plain password, non case sensitive
 			$this->login_error = 1012;
 			$password_ok = false;
 		} else {
@@ -328,12 +283,11 @@ class Login extends \CoreLibs\DB\IO
 		return $password_ok;
 	}
 
-	// METHOD: loginLoginUser
-	// WAS   : login_login_user
+	// METHOD: login_login_user
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : if user pressed login button this script is called, but only if there is no preview euid set
-	private function loginLoginUser()
+	private function login_login_user()
 	{
 		// have to get the global stuff here for setting it later
 		if (!$this->euid && $this->login) {
@@ -341,13 +295,11 @@ class Login extends \CoreLibs\DB\IO
 				$this->login_error = 102;
 			} else {
 				// we have to get the themes in here too
-				$q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, eg.name AS edit_group_name, admin, ";
-				$q .= "eu.login_error_count, eu.login_error_date_last, eu.login_error_date_first, eu.strict, eu.locked, ";
+				$q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, eg.name AS edit_group_name, admin, eu.login_error_count, eu.login_error_date_last, eu.login_error_date_first, eu.strict, eu.locked, ";
 				$q .= "debug, db_debug, ";
 				$q .= "eareu.level AS user_level, eareu.type AS user_type, ";
 				$q .= "eareg.level AS group_level, eareg.type AS group_type, ";
-				$q .= "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, first.header_color AS first_header_color, ";
-				$q .= "second.header_color AS second_header_color, second.template ";
+				$q .= "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, first.header_color AS first_header_color, second.header_color AS second_header_color, second.template ";
 				$q .= "FROM edit_user eu ";
 				$q .= "LEFT JOIN edit_scheme second ON (second.edit_scheme_id = eu.edit_scheme_id AND second.enabled = 1), ";
 				$q .= "edit_language el, edit_group eg, ";
@@ -358,14 +310,21 @@ class Login extends \CoreLibs\DB\IO
 				$q .= "eu.edit_access_right_id = eareu.edit_access_right_id AND ";
 				$q .= "eg.edit_access_right_id = eareg.edit_access_right_id AND ";
 				// password match is done in script, against old plain or new blowfish encypted
-				$q .= "(LOWER(username) = '".$this->dbEscapeString(strtolower($this->username))."') ";
-				$res = $this->dbReturn($q);
+				$q .= "(LOWER(username) = '".strtolower($this->username)."') ";
+				$res = $this->db_return($q);
 				// username is wrong, but we throw for wrong username and wrong password the same error
 				if (!$this->cursor_ext[md5($q)]["num_rows"]) {
 					$this->login_error = 1010;
 				} else {
 					// if login errors is half of max errors and the last login error was less than 10s ago, forbid any new login try
 
+					// check with what kind of prefix the password begins:
+					// $2a$ or $2y$: BLOWFISCH
+					// $1$: MD5
+					// $ and one alphanumeric letter, 13 chars long, but nor $ at the end: STD_DESC
+					// if no $ => normal password
+					// NOW, if we have a password encoded, but not the correct encoder available, throw special error
+
 					// check flow
 					// - user is enabled
 					// - user is not locked
@@ -385,15 +344,16 @@ class Login extends \CoreLibs\DB\IO
 						// check if the current password is an invalid hash and do a rehash and set password
 						// $this->debug('LOGIN', 'Hash: '.$res['password'].' -> VERIFY: '.($this->passwordVerify($this->password, $res['password']) ? 'OK' : 'FAIL').' => HASH: '.($this->passwordRehashCheck($res['password']) ? 'NEW NEEDED' : 'OK'));
 						if ($this->passwordRehashCheck($res['password'])) {
+							$new_hash = $this->passwordSet($this->password);
 							// update password hash to new one now
-							$q = "UPDATE edit_user SET password = '".$this->dbEscapeString($this->passwordSet($this->password))."' WHERE edit_user_id = ".$res['edit_user_id'];
+							$q = "UPDATE edit_user SET password = '".$this->dbEscapeString($new_hash)."' WHERE edit_user_id = ".$res['edit_user_id'];
 							$this->dbExec($q);
 						}
 						// normal user processing
 						// set class var and session var
 						$_SESSION["EUID"] = $this->euid = $res["edit_user_id"];
 						// check if user is okay
-						$this->loginCheckPermissions();
+						$this->login_check_permissions();
 						if (!$this->login_error) {
 							// now set all session vars and read page permissions
 							$GLOBALS["DEBUG_ALL"] = $_SESSION["DEBUG_ALL"] = $res["debug"];
@@ -412,21 +372,18 @@ class Login extends \CoreLibs\DB\IO
 							$_SESSION["DEFAULT_LANG"] = $res["lang_short"].'_'.strtolower(str_replace('-', '', $res["lang_iso"]));
 							// reset any login error count for this user
 							if ($res['login_error_count'] > 0) {
-								$q = "UPDATE edit_user ";
-								$q .= "SET login_error_count = 0, login_error_date_last = NULL, login_error_date_first = NULL ";
-								$q .= "WHERE edit_user_id = ".$res['edit_user_id'];
-								$this->dbExec($q);
+								$q = "UPDATE edit_user SET login_error_count = 0, login_error_date_last = NULL, login_error_date_first = NULL WHERE edit_user_id = ".$res['edit_user_id'];
+								$this->db_exec($q);
 							}
 							$pages = array();
 							$edit_page_ids = array();
 							// set pages access
-							$q = "SELECT ep.edit_page_id, filename, ep.name AS edit_page_name, ep.order_number AS edit_page_order, menu, ";
-							$q .= "popup, popup_x, popup_y, online, ear.level, ear.type ";
+							$q = "SELECT ep.edit_page_id, filename, ep.name AS edit_page_name, ep.order_number AS edit_page_order, menu, popup, popup_x, popup_y, online, ear.level, ear.type ";
 							$q .= "FROM edit_page ep, edit_page_access epa, edit_access_right ear ";
 							$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND ear.edit_access_right_id = epa.edit_access_right_id ";
 							$q .= "AND epa.enabled = 1 AND epa.edit_group_id = ".$res["edit_group_id"]." ";
 							$q .= "ORDER BY ep.order_number";
-							while ($res = $this->dbReturn($q)) {
+							while ($res = $this->db_return($q)) {
 								// page id array for sub data readout
 								$edit_page_ids[] = $res['edit_page_id'];
 								// create the array for pages
@@ -450,26 +407,22 @@ class Login extends \CoreLibs\DB\IO
 							} // for each page
 							// get the visible groups for all pages and write them to the pages
 							$_edit_page_id = 0;
-							$q = "SELECT epvg.edit_page_id, name, flag ";
-							$q .= "FROM edit_visible_group evp, edit_page_visible_group epvg ";
-							$q .= "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', $edit_page_ids).") ";
-							$q .= "ORDER BY epvg.edit_page_id";
-							while ($res = $this->dbReturn($q)) {
+							$q = "SELECT epvg.edit_page_id, name, flag FROM edit_visible_group evp, edit_page_visible_group epvg WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY epvg.edit_page_id";
+							while ($res = $this->db_return($q)) {
 								if ($res['edit_page_id'] != $_edit_page_id) {
 									// search the pos in the array push
-									$pos = $this->arraySearchRecursive($res['edit_page_id'], $pages, 'edit_page_id');
+									$pos = $this->array_search_recursive($res['edit_page_id'], $pages, 'edit_page_id');
 									$_edit_page_id = $res['edit_page_id'];
 								}
 								$pages[$pos[0]]['visible'][$res['name']] = $res['flag'];
 							}
 							// get the same for the query strings
 							$_edit_page_id = 0;
-							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs ";
-							$q .= "WHERE enabled = 1 AND edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY eqs.edit_page_id";
-							while ($res = $this->dbReturn($q)) {
+							$q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs WHERE enabled = 1 AND edit_page_id IN (".join(', ', $edit_page_ids).") ORDER BY eqs.edit_page_id";
+							while ($res = $this->db_return($q))	{
 								if ($res['edit_page_id'] != $_edit_page_id)	{
 									// search the pos in the array push
-									$pos = $this->arraySearchRecursive($res['edit_page_id'], $pages, 'edit_page_id');
+									$pos = $this->array_search_recursive($res['edit_page_id'], $pages, 'edit_page_id');
 									$_edit_page_id = $res['edit_page_id'];
 								}
 								$pages[$pos[0]]['query'][] = array (
@@ -484,17 +437,16 @@ class Login extends \CoreLibs\DB\IO
 							// load the edit_access user rights
 							$q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default ";
 							$q .= "FROM edit_access_user eau, edit_access_right ear, edit_access ea ";
-							$q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id ";
-							$q .= "AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
+							$q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
 							$q .= "ORDER BY ea.name";
 							$unit_access = array();
 							$eauid = array();
 							$unit_acl = array();
-							while ($res = $this->dbReturn($q)) {
+							while ($res = $this->db_return($q))	{
 								// read edit access data fields and drop them into the unit access array
 								$q_sub ="SELECT name, value FROM edit_access_data WHERE enabled = 1 AND edit_access_id = ".$res['edit_access_id'];
 								$ea_data = array ();
-								while ($res_sub = $this->dbReturn($q_sub)) {
+								while ($res_sub = $this->db_return($q_sub)) {
 									$ea_data[$res_sub['name']] = $res_sub['value'];
 								}
 								// build master unit array
@@ -526,10 +478,8 @@ class Login extends \CoreLibs\DB\IO
 							$login_error_date_first = ', login_error_date_first = NOW()';
 						}
 						// update login error count for this user
-						$q = "UPDATE edit_user ";
-						$q .= "SET login_error_count = login_error_count + 1, login_error_date_last = NOW() $login_error_date_first ";
-						$q .= "WHERE edit_user_id = ".$res['edit_user_id'];
-						$this->dbExec($q);
+						$q = "UPDATE edit_user SET login_error_count = login_error_count + 1, login_error_date_last = NOW() $login_error_date_first WHERE edit_user_id = ".$res['edit_user_id'];
+						$this->db_exec($q);
 						// totally lock the user if error max is reached
 						if ($res['login_error_count'] + 1 > $this->max_login_error_count) {
 							// do some alert reporting in case this error is too big
@@ -550,22 +500,21 @@ class Login extends \CoreLibs\DB\IO
 		} // if he pressed login at least and is not yet loggined in
 	}
 
-	// METHOD: loginCheckPermissions
-	// WAS   : login_check_permission
+	// METHOD: login_check_permission
 	// PARAMS: none
 	// RETUNR none
 	// DESC  : for every page the user access this script checks if he is allowed to do so
-	public function loginCheckPermissions()
+	public function login_check_permissions()
 	{
 		if ($this->euid && $this->login_error != 103) {
 			$q = "SELECT filename ";
 			$q .= "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu ";
 			$q .= "WHERE ep.edit_page_id = epa.edit_page_id AND eg.edit_group_id = epa.edit_group_id AND eg.edit_group_id = eu.edit_group_id ";
 			$q .= "AND eu.edit_user_id = ".$this->euid." AND filename = '".$this->page_name."' AND eg.enabled = 1 AND epa.enabled = 1";
-			$res = $this->dbReturnRow($q);
+			$res = $this->db_return_row($q);
 			// unset mem limit if debug is set to 1
-			// if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
-			// 	ini_set('memory_limit', -1);
+//				if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
+//					ini_set('memory_limit', -1);
 			if ($res["filename"] == $this->page_name) {
 				$this->permission_okay = 1;
 			} else {
@@ -577,12 +526,11 @@ class Login extends \CoreLibs\DB\IO
 		return $this->permission_okay;
 	}
 
-	// METHOD: loginLogoutUser
-	// WAS   : login_logout_user
+	// METHOD: login_logout_user
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : if a user pressed on logout, destroyes session and unsets all global vars
-	public function loginLogoutUser()
+	public function login_logout_user()
 	{
 		if ($this->logout || $this->login_error) {
 			// unregister and destroy session vars
@@ -601,13 +549,12 @@ class Login extends \CoreLibs\DB\IO
 			unset($_SESSION["GROUP_NAME"]);
 			unset($_SESSION["HEADER_COLOR"]);
 			session_destroy();
-			// then prints the login screen again
+			// he prints the login screen again
 			$this->permission_okay = 0;
 		}
 	}
 
-	// METHOD: loginSetAcl
-	// WAS   : login_set_acl
+	// METHOD: login_set_acl
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : sets all the basic ACLs
@@ -624,99 +571,94 @@ class Login extends \CoreLibs\DB\IO
 	//         * if an account ACL is set, set this parallel, account ACL overrides user ACL if it applies
 	//         * if edit access ACL level is set, use this, else use page
 	//         set all base ACL levels as a list keyword -> ACL number
-	private function loginSetAcl()
+	public function login_set_acl()
 	{
-		// only set acl if we have permission okay
-		if ($this->permission_okay) {
-			// we start with the default acl
-			$this->acl['base'] = DEFAULT_ACL_LEVEL;
+		// we start with the default acl
+		$this->acl['base'] = DEFAULT_ACL_LEVEL;
 
-			// set admin flag and base to 100
-			if ($_SESSION['ADMIN']) {
-				$this->acl['admin'] = 1;
-				$this->acl['base'] = 100;
-			} else {
-				$this->acl['admin'] = 0;
-				// now go throw the flow and set the correct ACL
-				// user > page > group
-				// group ACL 0
-				if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
-					$this->acl['base'] = $_SESSION['GROUP_ACL_LEVEL'];
-				}
-				// page ACL 1
-				if ($_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
-					$this->acl['base'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
-				}
-				// user ACL 2
-				if ($_SESSION['USER_ACL_LEVEL'] != -1) {
-					$this->acl['base'] = $_SESSION['USER_ACL_LEVEL'];
-				}
-			}
-
-			// set the current page acl
-			// start with default acl
-			// set group if not -1, overrides default
-			// set page if not -1, overrides group set
-			$this->acl['page'] = DEFAULT_ACL_LEVEL;
+		// set admin flag and base to 100
+		if ($_SESSION['ADMIN']) {
+			$this->acl['admin'] = 1;
+			$this->acl['base'] = 100;
+		} else {
+			// now go throw the flow and set the correct ACL
+			// user > page > group
+			// group ACL 0
 			if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
-				$this->acl['page'] = $_SESSION['GROUP_ACL_LEVEL'];
+				$this->acl['base'] = $_SESSION['GROUP_ACL_LEVEL'];
 			}
-			if (isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) && $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
-				$this->acl['page'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
+			// page ACL 1
+			if ($_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
+				$this->acl['base'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
 			}
-
-			// PER ACCOUNT (UNIT/edit access)->
-			foreach ($_SESSION['UNIT'] as $ea_id => $unit) {
-				// if admin flag is set, all units are set to 100
-				if ($this->acl['admin']) {
-					$this->acl['unit'][$ea_id] = $this->acl['base'];
-				} else {
-					if ($unit['acl_level'] != -1) {
-						$this->acl['unit'][$ea_id] = $unit['acl_level'];
-					} else {
-						$this->acl['unit'][$ea_id] = $this->acl['base'];
-					}
-				}
-				// detail name/level set
-				$this->acl['unit_detail'][$ea_id] = array (
-					'name' => $unit['name'],
-					'uid' => $unit['uid'],
-					'level' => $this->default_acl_list[$this->acl['unit'][$ea_id]]['name'],
-					'default' => $unit['default'],
-					'data' => $unit['data']
-				);
-				// set default
-				if ($unit['default']) {
-					$this->acl['unit_id'] = $unit['id'];
-					$this->acl['unit_name'] = $unit['name'];
-					$this->acl['unit_uid'] = $unit['uid'];
-				}
+			// user ACL 2
+			if ($_SESSION['USER_ACL_LEVEL'] != -1) {
+				$this->acl['base'] = $_SESSION['USER_ACL_LEVEL'];
 			}
-			// flag if to show extra edit access drop downs (because user has multiple groups assigned)
-			if (count($_SESSION['UNIT']) > 1) {
-				$this->acl['show_ea_extra'] = 1;
-			} else {
-				$this->acl['show_ea_extra'] = 0;
-			}
-			// set the default edit access
-			$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'];
-			// integrate the type acl list, but only for the keyword -> level
-			foreach ($this->default_acl_list as $level => $data) {
-				$this->acl['min'][$data['type']] = $level;
-			}
-			// set the full acl list too
-			$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'];
-			// debug
-			// $this->debug('ACL', $this->print_ar($this->acl));
 		}
+
+		// set the current page acl
+		// start with default acl
+		// set group if not -1, overrides default
+		// set page if not -1, overrides group set
+		$this->acl['page'] = DEFAULT_ACL_LEVEL;
+		if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
+			$this->acl['page'] = $_SESSION['GROUP_ACL_LEVEL'];
+		}
+		if (isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) && $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
+			$this->acl['page'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
+		}
+
+		// PER ACCOUNT (UNIT/edit access)->
+		foreach ($_SESSION['UNIT'] as $ea_id => $unit) {
+			// if admin flag is set, all units are set to 100
+			if ($this->acl['admin']) {
+				$this->acl['unit'][$ea_id] = $this->acl['base'];
+			} else {
+				if ($unit['acl_level'] != -1) {
+					$this->acl['unit'][$ea_id] = $unit['acl_level'];
+				} else {
+					$this->acl['unit'][$ea_id] = $this->acl['base'];
+				}
+			}
+			// detail name/level set
+			$this->acl['unit_detail'][$ea_id] = array (
+				'name' => $unit['name'],
+				'uid' => $unit['uid'],
+				'level' => $this->default_acl_list[$this->acl['unit'][$ea_id]]['name'],
+				'default' => $unit['default'],
+				'data' => $unit['data']
+			);
+			// set default
+			if ($unit['default']) {
+				$this->acl['unit_id'] = $unit['id'];
+				$this->acl['unit_name'] = $unit['name'];
+				$this->acl['unit_uid'] = $unit['uid'];
+			}
+		}
+		// flag if to show extra edit access drop downs (because user has multiple groups assigned)
+		if (count($_SESSION['UNIT']) > 1) {
+			$this->acl['show_ea_extra'] = 1;
+		} else {
+			$this->acl['show_ea_extra'] = 0;
+		}
+		// set the default edit access
+		$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'];
+		// integrate the type acl list, but only for the keyword -> level
+		foreach ($this->default_acl_list as $level => $data) {
+			$this->acl['min'][$data['type']] = $level;
+		}
+		// set the full acl list too
+		$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'];
+		// debug
+//			$this->debug('ACL', $this->print_ar($this->acl));
 	}
 
-	// METHOD: loginCheckEditAccess
-	// WAS   : login_check_edit_access
+	// METHOD: login_check_edit_access
 	// PARAMS: edit_access_id to check
 	// RETURN: true/false: if the edit access is not in the valid list: false
 	// DESC  : checks if this edit access id is valid
-	public function loginCheckEditAccess($edit_access_id)
+	public function login_check_edit_access($edit_access_id)
 	{
 		if (array_key_exists($edit_access_id, $this->acl['unit'])) {
 			return true;
@@ -741,47 +683,30 @@ class Login extends \CoreLibs\DB\IO
 			}
 		}
 		// check for min length
-		if (strlen($password) < $this->password_min_length || strlen($password) > $this->password_max_length) {
+		if (strlen($password) < $this->password_min_length) {
 			$is_valid_password = false;
 		}
 		return $is_valid_password;
 	}
 
-	// METHOD: loginSetPasswordMinLength
-	// PARAMS: set the minimum length
-	// RETURN: true/false on success
-	// DESC  : sets the minium length and checks on valid
-	public function loginSetPasswordMinLength($length)
-	{
-		// check that numeric, positive numeric, not longer than max input string lenght
-		// and not short than min password length
-		if (is_numeric($length) && $length >= PASSWORD_MIN_LENGTH && $length <= $this->password_max_length) {
-			$this->password_min_length = $length;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	// METHOD: loginPasswordChange
-	// WAS   : login_password_change
+	// METHOD: login_password_change
 	// PARAMS: none
 	// RETURN: none
 	// DESC  : changes a user password
-	private function loginPasswordChange()
+	private function login_password_change()
 	{
 		if ($this->change_password) {
 			$event = 'Password Change';
 			// check that given username is NOT in the deny list, else silent skip (with error log)
 			if (!in_array($this->pw_username, $this->pw_change_deny_users)) {
-				if (!$this->pw_username || !$this->pw_old_password) {
+				if (!$this->pw_username || !$this->pw_password) {
 					$this->login_error = 200;
 					$data = 'Missing username or old password.';
 				}
 				// check user exist, if not -> error
 				if (!$this->login_error) {
-					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
-					list ($edit_user_id) = $this->dbReturnRow($q);
+					$q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->db_escape_string($this->pw_username)."'";
+					list ($edit_user_id) = $this->db_return_row($q);
 					if (!$edit_user_id) {
 						// username wrong
 						$this->login_error = 201;
@@ -814,7 +739,7 @@ class Login extends \CoreLibs\DB\IO
 				}
 				// password shall match to something in minimum length or form
 				if (!$this->login_error) {
-					if (!$this->loginPasswordChangeValidPassword($this->pw_new_password)) {
+					if (!$this->loingPasswordChangeValidPassword($this->pw_new_password)) {
 						$this->login_error = 205;
 						$data = 'The new password string is not valid';
 					}
@@ -822,8 +747,8 @@ class Login extends \CoreLibs\DB\IO
 				// no error change this users password
 				if (!$this->login_error) {
 					// update the user (edit_user_id) with the new password
-					$q = "UPDATE edit_user SET password = '".$this->dbEscapeString($this->passwordSet($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
-					$this->dbExec($q);
+					$q = "UPDATE edit_user SET password = '".$this->db_escape_string($this->passwordSet($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
+					$this->db_exec($q);
 					$data = 'Password change for user "'.$this->pw_username.'"';
 					$this->password_change_ok = true;
 				}
@@ -833,20 +758,19 @@ class Login extends \CoreLibs\DB\IO
 				$data = 'Illegal user for password change: '.$this->pw_username;
 			}
 			// log this password change attempt
-			$this->writeLog($event, $data, $this->login_error, $this->pw_username);
+			$this->write_log($event, $data, $this->login_error, $pw_username);
 		} // button pressed
 	}
 
-	// METHOD: loginPrintLogin
-	// WAS   : login_print_login
+	// METHOD: login_print_login
 	// PARAMS: none
-	// RETURN: html data for login page
+	// RETURN: none
 	// DESC  : prints out login html part if no permission (error) is set
-	private function loginPrintLogin()
+	private function login_print_login()
 	{
 		if (!$this->permission_okay) {
 			// set the templates now
-			$this->loginSetTemplates();
+			$this->login_set_templates();
 			// if there is a global logout target ...
 			if (file_exists($this->logout_target) && $this->logout_target) {
 				$LOGOUT_TARGET = $this->logout_target;
@@ -863,14 +787,14 @@ class Login extends \CoreLibs\DB\IO
 				// pre change the data in the PASSWORD_CHANGE_DIV first
 				foreach ($this->login_template['strings'] as $string => $data) {
 					if ($data) {
-						$html_string_password_change = str_replace('{'.$string.'}', $data, $html_string_password_change);
+						$html_string_password_change = str_replace("{".$string."}", $data, $html_string_password_change);
 					}
 				}
 				// print error messagae
 				if ($this->login_error) {
-					$html_string_password_change = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'<br>', $html_string_password_change);
+					$html_string_password_change = str_replace("{ERROR_MSG}", $this->login_error_msg[$this->login_error]."<br>", $html_string_password_change);
 				} else {
-					$html_string_password_change = str_replace('{ERROR_MSG}', '<br>', $html_string_password_change);
+					$html_string_password_change = str_replace("{ERROR_MSG}", "<br>", $html_string_password_change);
 				}
 				// if pw change action, show the float again
 				if ($this->change_password && !$this->password_change_ok) {
@@ -883,23 +807,23 @@ class Login extends \CoreLibs\DB\IO
 
 			// put in the logout redirect string
 			if ($this->logout && $LOGOUT_TARGET) {
-				$html_string = str_replace('{LOGOUT_TARGET}', '<meta http-equiv="refresh" content="0; URL='.$LOGOUT_TARGET.'">', $html_string);
+				$html_string = str_replace("{LOGOUT_TARGET}", '<meta http-equiv="refresh" content="0; URL='.$LOGOUT_TARGET.'">', $html_string);
 			} else {
-				$html_string = str_replace('{LOGOUT_TARGET}', '', $html_string);
+				$html_string = str_replace("{LOGOUT_TARGET}", '', $html_string);
 			}
 
 			// print error messagae
 			if ($this->login_error) {
-				$html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'<br>', $html_string);
+				$html_string = str_replace("{ERROR_MSG}", $this->login_error_msg[$this->login_error]."<br>", $html_string);
 			} elseif ($this->password_change_ok && $this->password_change) {
 				$html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[300].'<br>', $html_string);
 			} else {
-				$html_string = str_replace('{ERROR_MSG}', '<br>', $html_string);
+				$html_string = str_replace("{ERROR_MSG}", "<br>", $html_string);
 			}
 
 			// create the replace array context
 			foreach ($this->login_template['strings'] as $string => $data) {
-				$html_string = str_replace('{'.$string.'}', $data, $html_string);
+				$html_string = str_replace("{".$string."}", $data, $html_string);
 			}
 
 			// return the created HTML here
@@ -907,12 +831,11 @@ class Login extends \CoreLibs\DB\IO
 		} // if permission is 0 then print out login
 	}
 
-	// METHOD: loginCloseClass
-	// WAS   : login_close_class
+	// METHOD: login_close_class
 	// PARAMS: none
-	// RETURN: true on permission ok, false on permission wrong
+	// RETURN: none
 	// DESC  : last function called, writes log and prints out error msg and exists script if permission 0
-	private function loginCloseClass()
+	private function login_close_class()
 	{
 		// write to LOG table ...
 		if ($this->login_error || $this->login || $this->logout) {
@@ -929,13 +852,13 @@ class Login extends \CoreLibs\DB\IO
 			// prepare for log
 			if ($this->euid) {
 				// get user from user table
-				$q = "SELECT username FROM edit_user WHERE edit_user_id = ".$this->euid;
-				list($username) = $this->dbReturnRow($q);
+				$q = "SELECT username, password FROM edit_user WHERE edit_user_id = ".$this->euid;
+				list($username, $password) = $this->db_return_row($q);
 			} // if euid is set, get username (or try)
-			$this->writeLog($event, '', $this->login_error, $username);
+			$this->write_log($event, '', $this->login_error, $username);
 		} // write log under certain settings
 		// now close DB connection
-		// $this->error_msg = $this->_login();
+//			$this->error_msg = $this->_login();
 		if (!$this->permission_okay) {
 			return false;
 		} else {
@@ -943,52 +866,50 @@ class Login extends \CoreLibs\DB\IO
 		}
 	}
 
-	// METHOD: loginSetTemplates
-	// WAS   : login_set_templates
-	// PARAMS: none
+	// METHOD: login_set_templates
+	// PARAMS:
 	// RETURN: none
 	// DESC  : checks if there are external templates, if not uses internal fallback ones
-	private function loginSetTemplates()
+	private function login_set_templates()
 	{
 		$strings = array (
-			'HTML_TITLE' => $this->l->__('LOGIN'),
-			'TITLE' => $this->l->__('LOGIN'),
-			'USERNAME' => $this->l->__('Username'),
-			'PASSWORD' => $this->l->__('Password'),
-			'LOGIN' => $this->l->__('Login'),
+			'HTML_TITLE' => $this->l->__("LOGIN"),
+			'TITLE' => $this->l->__("LOGIN"),
+			'USERNAME' => $this->l->__("Username"),
+			'PASSWORD' => $this->l->__("Password"),
+			'LOGIN' => $this->l->__("Login"),
 			'ERROR_MSG' => '',
 			'LOGOUT_TARGET' => '',
 			'PASSWORD_CHANGE_BUTTON_VALUE' => $this->l->__('Change Password')
 		);
 
 		$error_msgs = array (
-			'100' => $this->l->__('Fatal Error: <b>[EUID] came in as GET/POST!</b>'), // actually obsolete
-			'1010' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // user not found
-			'1011' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // blowfish password wrong
-			'1012' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // fallback md5 password wrong
-			'1013' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), // new password_hash wrong
-			'102' => $this->l->__('Fatal Error: <b>Login Failed - Please enter username and password</b>'),
-			'103' => $this->l->__('Fatal Error: <b>You do not have the rights to access this Page</b>'),
-			'104' => $this->l->__('Fatal Error: <b>Login Failed - User not enabled</b>'),
-			'105' => $this->l->__('Fatal Error: <b>Login Failed - User is locked</b>'),
-			'220' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'), // actually this is an illegal user, but I mask it
-			'200' => $this->l->__('Fatal Error: <b>Password change - Please enter username and old password</b>'),
-			'201' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'),
-			'202' => $this->l->__('Fatal Error: <b>Password change - The old password is not correct</b>'),
-			'203' => $this->l->__('Fatal Error: <b>Password change - Please fill out both new password fields</b>'),
-			'204' => $this->l->__('Fatal Error: <b>Password change - The new passwords do not match</b>'),
-			'205' => $this->l->__('Fatal Error: <b>Password change - The new password is not in a valid format</b>'), // we should also not here WHAT is valid
-			'300' => $this->l->__('Success: <b>Password change successful</b>'), // for OK password change
-			'9999' => $this->l->__('Fatal Error: <b>necessary crypt engine could not be found</b>. Login is impossible') // this is bad bad error
+			"100" => $this->l->__("Fatal Error: <b>[EUID] came in as GET/POST!</b>"), // actually obsolete
+			"1010" => $this->l->__("Fatal Error: <b>Login Failed - Wrong Username or Password</b>"), // user not found
+			"1011" => $this->l->__("Fatal Error: <b>Login Failed - Wrong Username or Password</b>"), // blowfish password wrong
+			"1012" => $this->l->__("Fatal Error: <b>Login Failed - Wrong Username or Password</b>"), // fallback md5 password wrong
+			"102" => $this->l->__("Fatal Error: <b>Login Failed - Please enter username and password</b>"),
+			"103" => $this->l->__("Fatal Error: <b>You do not have the rights to access this Page</b>"),
+			"104" => $this->l->__("Fatal Error: <b>Login Failed - User not enabled</b>"),
+			"105" => $this->l->__("Fatal Error: <b>Login Failed - User is locked</b>"),
+			"220" => $this->l->__("Fatal Error: <b>Password change - The user could not be found</b>"), // actually this is an illegal user, but I mask it
+			'200' => $this->l->__("Fatal Error: <b>Password change - Please enter username and old password</b>"),
+			"201" => $this->l->__("Fatal Error: <b>Password change - The user could not be found</b>"),
+			"202" => $this->l->__("Fatal Error: <b>Password change - The old password is not correct</b>"),
+			"203" => $this->l->__("Fatal Error: <b>Password change - Please fill out both new password fields</b>"),
+			"204" => $this->l->__("Fatal Error: <b>Password change - The new passwords do not match</b>"),
+			"205" => $this->l->__("Fatal Error: <b>Password change - The new password is not in a valid format</b>"), // we should also not here WHAT is valid
+			"300" => $this->l->__("Success: <b>Password change successful</b>"), // for OK password change
+			"9999" => $this->l->__("Fatal Error: <b>necessary crypt engine could not be found</b>. Login is impossible") // this is bad bad error
 		);
 
 		// if password change is okay
 		if ($this->password_change) {
 			$strings = array_merge($strings, array (
 				'TITLE_PASSWORD_CHANGE' => 'Change Password for User',
-				'OLD_PASSWORD' => $this->l->__('Old Password'),
-				'NEW_PASSWORD' => $this->l->__('New Password'),
-				'NEW_PASSWORD_CONFIRM' => $this->l->__('New Password confirm'),
+				'OLD_PASSWORD' => $this->l->__("Old Password"),
+				'NEW_PASSWORD' => $this->l->__("New Password"),
+				'NEW_PASSWORD_CONFIRM' => $this->l->__("New Password confirm"),
 				'CLOSE' => $this->l->__('Close'),
 				'JS_SHOW_HIDE' => "function ShowHideDiv(id) { element = document.getElementById(id); if (element.className == 'visible' || !element.className) element.className = 'hidden'; else element.className = 'visible'; }",
 				'PASSWORD_CHANGE_BUTTON' => '<input type="button" name="pw_change" value="'.$strings['PASSWORD_CHANGE_BUTTON_VALUE'].'" OnClick="ShowHideDiv(\'pw_change_div\');">'
@@ -1007,10 +928,7 @@ class Login extends \CoreLibs\DB\IO
 </div>
 {PASSWORD_CHANGE_SHOW}
 EOM;
-		}
-		if ($this->password_forgot) {
-		}
-		if (!$this->password_change && !$this->password_forgot) {
+		} else {
 			$strings = array_merge($strings, array (
 				'JS_SHOW_HIDE' => '',
 				'PASSWORD_CHANGE_BUTTON' => '',
@@ -1019,14 +937,14 @@ EOM;
 		}
 
 		// first check if all strings are set from outside, if not, set with default ones
-		foreach ($strings as $string => $data) {
+		while (list($string, $data) = each($strings)) {
 			if (!array_key_exists($string, $this->login_template['strings'])) {
 				$this->login_template['strings'][$string] = $data;
 			}
 		}
 
 		// error msgs the same
-		foreach ($error_msgs as $code => $data) {
+		while (list($code, $data) = each($error_msgs)) {
 			if (!array_key_exists($code, $this->login_error_msg)) {
 				$this->login_error_msg[$code] = $data;
 			}
@@ -1099,14 +1017,13 @@ EOM;
 		}
 	}
 
-	// METHOD: writeLog
-	// WAS   : write_log
+	// METHOD: write_log
 	// PARAMS: event -> string of what has been done
 	//        data -> data information (id, etc)
 	//        error -> if error, write error string (not enougth data, etc)
 	// RETURN: none
 	// DESC  : writes detailed data into the edit user log table (keep log what user does)
-	private function writeLog($event, $data, $error = '', $username = '')
+	private function write_log($event, $data, $error = '', $username = '')
 	{
 		if ($this->login) {
 				$this->action = 'Login';
@@ -1122,34 +1039,31 @@ EOM;
 				'_FILES' => $_FILES,
 				'error' => $this->login_error
 		);
-		$data_binary = $this->dbEscapeBytea(bzcompress(serialize($_data_binary)));
+		$data_binary = $this->db_escape_bytea(bzcompress(serialize($_data_binary)));
 		// SQL querie for log entry
 		$q = "INSERT INTO edit_log ";
 		$q .= "(username, password, euid, event_date, event, error, data, data_binary, page, ";
 		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
 		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
-		$q .= "VALUES ('".$this->dbEscapeString($username)."', 'PASSWORD', ".(($this->euid) ? $this->euid : 'NULL').", ";
-		$q .= "NOW(), '".$this->dbEscapeString($event)."', '".$this->dbEscapeString($error)."', '".$this->dbEscapeString($data)."', '".$data_binary."', '".$this->page_name."', ";
-		foreach (array(
-			'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME', 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
-		) as $server_code) {
+		$q .= "VALUES ('".$this->db_escape_string($username)."', 'PASSWORD', ".(($this->euid) ? $this->euid : 'NULL').", ";
+		$q .= "NOW(), '".$this->db_escape_string($event)."', '".$this->db_escape_string($error)."', '".$this->db_escape_string($data)."', '".$data_binary."', '".$this->page_name."', ";
+		foreach (array('REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME', 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING') as $server_code) {
 			if (array_key_exists($server_code, $_SERVER)) {
-				$q .= "'".$this->dbEscapeString($_SERVER[$server_code])."', ";
+				$q .= "'".$this->db_escape_string($_SERVER[$server_code])."', ";
 			} else {
 				$q .= "NULL, ";
 			}
 		}
 		$q .= "'".session_id()."', ";
-		$q .= "'".$this->dbEscapeString($this->action)."', '".$this->dbEscapeString($this->username)."', NULL, '".$this->dbEscapeString($this->login_error)."', NULL, NULL, '".$this->dbEscapeString($this->permission_okay)."', NULL)";
-		$this->dbExec($q, 'NULL');
+		$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->username)."', NULL, '".$this->db_escape_string($this->login_error)."', NULL, NULL, '".$this->db_escape_string($this->permission_okay)."', NULL)";
+		$this->db_exec($q, 'NULL');
 	}
 
-	// METHOD: loginCheckEditAccessId
-	// WAS   : login_check_edit_access_id
+	// METHOD: login_check_edit_access_id
 	// PARAMS: edit access id to check
 	// RETURN: same edit access id if ok, or the default edit access id if given one is not valud
 	// DESC  : checks that the given edit access id is valid for this user
-	public function loginCheckEditAccessId($edit_access_id)
+	public function login_check_edit_access_id($edit_access_id)
 	{
 		if (!array_key_exists($edit_access_id, $_SESSION["UNIT"])) {
 			return $_SESSION["UNIT_DEFAULT"];
@@ -1158,12 +1072,11 @@ EOM;
 		}
 	}
 
-	// METHOD: loginSetEditAccessData
-	// WAS   : login_set_edit_access_data
+	// METHOD: login_set_edit_access_data
 	// PARAMS: edit access id, key value to search for
 	// RETURN: false for not found or string for found data
 	// DESC  : searchs in the data set for the unit for the data key and returns the value asociated with it
-	public function loginSetEditAccessData($edit_access_id, $data_key)
+	public function login_set_edit_access_data($edit_access_id, $data_key)
 	{
 		if (!$_SESSION['UNIT'][$edit_access_id]['data'][$data_key]) {
 			return false;
@@ -1172,5 +1085,3 @@ EOM;
 		}
 	}
 } // close class
-
-# __END__

www/libs/Class.Progressbar.inc

@@ -8,13 +8,9 @@
 *	Update:		Clemens Schwaighofer
 *	Date:		2012.9.5 [stacked output]
 *	Date:		2013.2.21 [proper class formatting]
-*	Date:       2017.4.13 [no output fix with cache overload]
-*	Date:       2018.3.28 [PHPCS + namespace]
 *
 */
 
-namespace CoreLibs\Output;
-
 class ProgressBar
 {
 	// private vars
@@ -84,13 +80,13 @@ class ProgressBar
 			$this->height = $height;
 		}
 		// needs to be called twice or I do not get any output
-		$this->__flushCache($this->clear_buffer_size_init);
-		$this->__flushCache($this->clear_buffer_size_init);
+		$this->_flushCache($this->clear_buffer_size_init);
+		$this->_flushCache($this->clear_buffer_size_init);
 	}
 
 	// private functions
 
-	private function __flushCache($clear_buffer_size = 0)
+	private function _flushCache($clear_buffer_size = 0)
 	{
 		if (!$clear_buffer_size) {
 			$clear_buffer_size = $this->clear_buffer_size;
@@ -100,7 +96,7 @@ class ProgressBar
 		flush();
 	}
 
-	private function __calculatePercent($step)
+	private function _calculatePercent($step)
 	{
 		// avoid divison through 0
 		if ($this->max - $this->min == 0) {
@@ -113,7 +109,7 @@ class ProgressBar
 		return $percent;
 	}
 
-	private function __calculatePosition($step)
+	private function _calculatePosition($step)
 	{
 		switch ($this->direction) {
 			case 'right':
@@ -166,7 +162,7 @@ class ProgressBar
 		return $position;
 	}
 
-	private function __setStep($step)
+	private function _setStep($step)
 	{
 		if ($step > $this->max) {
 			$step = $this->max;
@@ -304,7 +300,7 @@ class ProgressBar
 
 	public function setLabelPosition($name, $left, $top, $width, $height, $align = '')
 	{
-		// print "SET POSITION[$name]: $left<br>";
+//		print "SET POSITION[$name]: $left<br>";
 		// if this is percent, we ignore anything, it is auto positioned
 		if ($this->label[$name]['type'] != 'percent') {
 			foreach (array('top', 'left', 'width', 'height') as $pos_name) {
@@ -327,7 +323,7 @@ class ProgressBar
 			$output .= 'document.getElementById("plbl'.$name.$this->code.'").style.align="'.$this->label[$name]['align'].'";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -336,7 +332,7 @@ class ProgressBar
 		$this->label[$name]['color'] = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("plbl'.$name.$this->code.'").style.color="'.$color.'";</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -345,7 +341,7 @@ class ProgressBar
 		$this->label[$name]['bgr_color'] = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("plbl'.$name.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -363,7 +359,7 @@ class ProgressBar
 		if ($this->label[$name]['type'] == 'percent') {
 			$this->label[$name]['top'] = round(($this->height - intval($size)) / log($this->height - intval($size), 7), 0) - $this->pedding;
 		}
-		// print "HEIGHT: ".$this->height.", Size: ".intval($size).", Pedding: ".$this->pedding.", Calc: ".round($this->height - intval($size)).", Log: ".log($this->height - intval($size), 7)."<br>";
+//		print "HEIGHT: ".$this->height.", Size: ".intval($size).", Pedding: ".$this->pedding.", Calc: ".round($this->height - intval($size)).", Log: ".log($this->height - intval($size), 7)."<br>";
 		// then set like usual
 		$this->label[$name]['font-size'] = intval($size);
 		if ($family != '') {
@@ -380,17 +376,17 @@ class ProgressBar
 			$output .= 'document.getElementById("plbl'.$name.$this->code.'").style.font-weight="'.$this->label[$name]['font-weight'].'";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
 	public function setLabelValue($name, $value)
 	{
 		$this->label[$name]['value'] = $value;
-		// print "NAME[$name], Status: ".$this->status.": ".$value."<Br>";
+//		print "NAME[$name], Status: ".$this->status.": ".$value."<Br>";
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">PBlabelText'.$this->code.'("'.$name.'","'.$this->label[$name]['value'].'");</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -399,7 +395,7 @@ class ProgressBar
 		$this->color = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("pbar'.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -408,7 +404,7 @@ class ProgressBar
 		$this->bgr_color = $color;
 		if ($this->status != 'new') {
 			echo '<script type="text/JavaScript">document.getElementById("pbrd'.$this->code.'").style.background="'.$color.'";</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -417,7 +413,7 @@ class ProgressBar
 		$this->direction = $direction;
 
 		if ($this->status != 'new') {
-			$this->position = $this->__calculatePosition($this->step);
+			$this->position = $this->_calculatePosition($this->step);
 
 			echo '<script type="text/JavaScript">';
 			echo 'PBposition'.$this->code.'("left",'.$this->position['left'].');';
@@ -425,7 +421,7 @@ class ProgressBar
 			echo 'PBposition'.$this->code.'("width",'.$this->position['width'].');';
 			echo 'PBposition'.$this->code.'("height",'.$this->position['height'].');';
 			echo '</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -435,8 +431,8 @@ class ProgressBar
 		$js = '';
 		$html_button = '';
 
-		$this->__setStep($this->step);
-		$this->position = $this->__calculatePosition($this->step);
+		$this->_setStep($this->step);
+		$this->position = $this->_calculatePosition($this->step);
 
 		if ($this->top || $this->left) {
 			$style_master = 'position:relative;top:'.$this->top.'px;left:'.$this->left.'px;width:'.($this->width + 10).'px;';
@@ -481,7 +477,7 @@ class ProgressBar
 		$js .= ' }'."\n";
 		$js .= '}'."\n";
 
-		// print "DUMP LABEL: <br><pre>".print_r($this->label, 1)."</pre><br>";
+//print "DUMP LABEL: <br><pre>".print_r($this->label, 1)."</pre><br>";
 		foreach ($this->label as $name => $data) {
 			// set what type of move we do
 			$move_prefix = $data['type'] == 'button' ? 'margin' : 'padding';
@@ -526,13 +522,13 @@ class ProgressBar
 						break;
 					case 'percent':
 						// only one inner percent
-						// print "STYLE[$name]: ".$style_lbl."<br>";
+//						print "STYLE[$name]: ".$style_lbl."<br>";
 						if (!$html_percent) {
-							$html_percent = '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;line-height:1;text-shadow: 0 0 .2em white, 0 0 .5em white;">'.$this->__calculatePercent($this->step).'%</div>'."\n";
+							$html_percent = '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;line-height:1;text-shadow: 0 0 .2em white, 0 0 .5em white;">'.$this->_calculatePercent($this->step).'%</div>'."\n";
 						}
 						break;
 					case 'percentlbl':
-						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;">'.$this->__calculatePercent($this->step).'%</div>'."\n";
+						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'width:'.$data['width'].'px;">'.$this->_calculatePercent($this->step).'%</div>'."\n";
 						break;
 					case 'crossbar':
 						$html .= '<div id="plbl'.$name.$this->code.'" style="'.$style_lbl.'">'.$data['value'].'</div>'."\n";
@@ -582,16 +578,16 @@ class ProgressBar
 	{
 		$this->status = 'show';
 		echo $this->getHtml();
-		$this->__flushCache();
+		$this->_flushCache();
 	}
 
 	public function moveStep($step)
 	{
 		$last_step = $this->step;
-		$this->__setStep($step);
+		$this->_setStep($step);
 
 		$js = '';
-		$new_position = $this->__calculatePosition($this->step);
+		$new_position = $this->_calculatePosition($this->step);
 		if ($new_position['width'] != $this->position['width'] && ($this->direction == 'right' || $this->direction == 'left')) {
 			if ($this->direction=='left') {
 				$js .= 'PBposition'.$this->code.'("left",'.$new_position['left'].');';
@@ -607,7 +603,7 @@ class ProgressBar
 		$this->position = $new_position;
 		foreach ($this->label as $name => $data) {
 			if (array_key_exists('type', $data)) {
-				switch ($data['type']) {
+				switch($data['type']) {
 					case 'step':
 						if ($this->step != $last_step) {
 							$js .= 'PBlabelText'.$this->code.'("'.$name.'","'.$this->step.'/'.$this->max.'");';
@@ -615,8 +611,8 @@ class ProgressBar
 						break;
 					case 'percentlbl':
 					case 'percent':
-						$percent = $this->__calculatePercent($this->step);
-						if ($percent != $this->__calculatePercent($last_step)) {
+						$percent = $this->_calculatePercent($this->step);
+						if ($percent != $this->_calculatePercent($last_step)) {
 							$js .= 'PBlabelText'.$this->code.'("'.$name.'","'.$percent.'%");';
 						}
 						break;
@@ -628,7 +624,7 @@ class ProgressBar
 		}
 		if ($js != '') {
 			echo '<script type="text/JavaScript">'.$js.'</script>'."\n";
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -651,7 +647,7 @@ class ProgressBar
 			$output .= 'document.getElementById("pbm'.$this->code.'").style.visibility="hidden";document.getElementById("pbm'.$this->code.'").style.display="none";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 
@@ -664,9 +660,7 @@ class ProgressBar
 			$output .= 'document.getElementById("pbm'.$this->code.'").style.visibility="visible";document.getElementById("pbm'.$this->code.'").style.visibility="block";';
 			$output .= '</script>'."\n";
 			echo $output;
-			$this->__flushCache();
+			$this->_flushCache();
 		}
 	}
 }
-
-# __END__

www/libs/Class.Smarty.Extend.inc

@@ -1,6 +1,6 @@
-<?php
+<?
 /********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2004/12/21
 * SHORT DESCRIPTION:
 *	extends smarty with the l10n class so I can use __(, etc calls
@@ -8,14 +8,12 @@
 * 2005/06/22 (cs) include smarty class here, so there is no need to include it in the main file
 *********************************************************************/
 
-namespace CoreLibs\Template;
+// read in the Smarty class for definition
+// use smarty BC for backwards compability
+// try to include file from LIBS path, or from normal path
+_spl_autoload('SmartyBC.class.php');
 
-// I need to manually load Smarty BC here (it is not namespaced)
-require_once(BASE.LIB.SMARTY.'SmartyBC.class.php');
-// So it doesn't start looking around in the wrong naemspace as smarty doesn't have one
-use SmartyBC;
-
-class SmartyExtend extends SmartyBC
+class SmartyML extends SmartyBC
 {
 	public $l10n;
 
@@ -23,10 +21,9 @@ class SmartyExtend extends SmartyBC
 	public function __construct($lang)
 	{
 		SmartyBC::__construct();
-		$this->l10n = new \CoreLibs\Language\L10n($lang);
+		_spl_autoload('Class.l10n.inc');
+		$this->l10n = new l10n($lang);
 		// variable variable register
 		$this->register_modifier('getvar', array(&$this, 'get_template_vars'));
 	}
 }
-
-# __END__

www/libs/Class.l10n.inc

@@ -1,8 +1,8 @@
-<?php
+<?
 /*********************************************************************
-* AUTHOR: Clemens Schwaighofer
+* AUTHOR: Clemens "Gullevek" Schwaighofer (www.gullevek.org)
 * CREATED: 2004/11/18
-* VERSION: 1.0.0
+* VERSION: 0.1.1
 * RELEASED LICENSE: GNU GPL 3
 * SHORT DESCRIPTION:
 * 	init class for gettext. Original was just a function & var setting include for wordpress.
@@ -14,7 +14,7 @@
 *
 * PUBLIC METHODS
 *	__:	returns string (translated or original if not found)
-*	__e: echos out string (translated or original if not found)
+*	_e:	echos out string (translated or original if not found)
 *	__ngettext:	should return plural. never tested this.
 *
 *   PRIVATE METHODS
@@ -23,12 +23,10 @@
 * 2005/10/17 (cs) made an on the fly switch method (reload of lang)
 *********************************************************************/
 
-namespace CoreLibs\Language;
+// try to include file from LIBS path, or from normal path
+_spl_autoload('Class.Basic.inc');
 
-use \CoreLibs\Language\Core\FileReader;
-use \CoreLibs\Language\Core\GetTextReader;
-
-class L10n extends \CoreLibs\Basic
+class l10n extends basic
 {
 	private $lang = '';
 	private $mofile = '';
@@ -37,6 +35,10 @@ class L10n extends \CoreLibs\Basic
 
 	public function __construct($lang = '', $path = DEFAULT_TEMPLATE)
 	{
+		foreach (array('streams.php', 'gettext.php') as $include_file) {
+			_spl_autoload($include_file);
+		}
+
 		if (!$lang) {
 			$this->lang = 'en';
 		} else {
@@ -58,7 +60,7 @@ class L10n extends \CoreLibs\Basic
 			$this->input = false;
 		}
 
-		$this->l10n = new GetTextReader($this->input);
+		$this->l10n = new gettext_reader($this->input);
 	}
 
 	// reloads the mofile, if the location of the lang file changes
@@ -80,7 +82,7 @@ class L10n extends \CoreLibs\Basic
 		// check if get a readable mofile
 		if (is_readable($this->mofile)) {
 			$this->input = new FileReader($this->mofile);
-			$this->l10n = new GetTextReader($this->input);
+			$this->l10n = new gettext_reader($this->input);
 		} else {
 			// else fall back to the old ones
 			$this->mofile = $old_mofile;
@@ -93,7 +95,7 @@ class L10n extends \CoreLibs\Basic
 		return $this->l10n->translate($text);
 	}
 
-	public function __e($text)
+	public function _e($text)
 	{
 		echo $this->l10n->translate($text);
 	}
@@ -104,12 +106,12 @@ class L10n extends \CoreLibs\Basic
 		return $this->l10n->ngettext($single, $plural, $number);
 	}
 
-	public function __getLang()
+	public function __get_lang()
 	{
 		return $this->lang;
 	}
 
-	public function __getMoFile()
+	public function __get_mofile()
 	{
 		return $this->mofile;
 	}

www/libs/Error.Handling.inc

@@ -1,4 +1,4 @@
-<?php
+<?
 /*********************************************************************
 * AUTHOR: Clemens Schwaighofer
 * CREATED: 2011/2/8
@@ -8,13 +8,7 @@
 *********************************************************************/
 
 // define the base working directory outside because in the function it might return undefined
-// if we have config set BASE use this
-if (defined('BASE')) {
-	DEFINE('CURRENT_WORKING_DIR', BASE);
-} else {
-	// else we set. We fully assuem that Error.Handling is where it should be, in lib dir
-	DEFINE('CURRENT_WORKING_DIR', str_replace('lib', '', __DIR__));
-}
+DEFINE('CURRENT_WORKING_DIR', getcwd().'/');
 
 // METHOD: MyErrorHandler
 // PARAMS: $type: the error code from PHP

www/libs/FileUploader.inc

@@ -1,9 +1,71 @@
 <?php
 
-namespace CoreLibs\Upload;
+/**
+ * Handle file uploads via XMLHttpRequest
+ */
+class qqUploadedFileXhr
+{
+	/**
+	 * Save the file to the specified path
+	 * @return boolean TRUE on success
+	 */
+	public function save($path)
+	{
+		$input = fopen("php://input", "r");
+		$temp = tmpfile();
+		$realSize = stream_copy_to_stream($input, $temp);
+		fclose($input);
 
-use \CoreLibs\Upload\Core\qqUploadedFileForm;
-use \CoreLibs\Upload\Core\qqUploadedFileXhr;
+		if ($realSize != $this->getSize()) {
+			return false;
+		}
+
+		$target = fopen($path, "w");
+		fseek($temp, 0, SEEK_SET);
+		stream_copy_to_stream($temp, $target);
+		fclose($target);
+
+		return true;
+	}
+	public function getName()
+	{
+		return $_GET['qqfile'];
+	}
+	public function getSize()
+	{
+		if (isset($_SERVER["CONTENT_LENGTH"])) {
+			return (int)$_SERVER["CONTENT_LENGTH"];
+		} else {
+			throw new Exception('Getting content length is not supported.');
+		}
+	}
+}
+
+/**
+ * Handle file uploads via regular form post (uses the $_FILES array)
+ */
+class qqUploadedFileForm
+{
+	/**
+	 * Save the file to the specified path
+	 * @return boolean TRUE on success
+	 */
+	public function save($path)
+	{
+		if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
+			return false;
+		}
+		return true;
+	}
+	public function getName()
+	{
+		return $_FILES['qqfile']['name'];
+	}
+	public function getSize()
+	{
+		return $_FILES['qqfile']['size'];
+	}
+}
 
 class qqFileUploader
 {
@@ -108,5 +170,3 @@ class qqFileUploader
 		}
 	}
 }
-
-# __END__