Updates and fixes to CoreLibs

- fixed all DEFINE to define in config* files - Updates Login class with missing strict declarations - some fixes in Login class for possible errors - Basic class return array layout updates for all rgb sets plus correct static update - Basic class timestamp method fix for not full set (eg missing seconds) - Basic class add method for getting linecount from a file - DB IO class gets a get settings return value method
Move the convert config setting to config other
2020-01-07 15:45:24 +09:00 · 2019-12-11 18:02:42 +09:00 · 2019-12-11 16:08:00 +09:00 · 2019-12-11 13:54:37 +09:00 · 2019-12-06 15:35:07 +09:00 · 2019-12-06 15:29:06 +09:00
21 changed files with 1866 additions and 394 deletions
--- a/4dev/database/update/edit_tables_missing_columns.sql
+++ b/4dev/database/update/edit_tables_missing_columns.sql
@@ -0,0 +1,14 @@
+-- update missing edit_* table data
+
+ALTER TABLE edit_generic ADD cuid VARCHAR;
+
+ALTER TABLE edit_access ADD enabled SMALLINT DEFAULT 0;
+ALTER TABLE edit_access ADD protected SMALLINT DEFAULT 0;
+
+ALTER TABLE edit_group ADD uid VARCHAR;
+ALTER TABLE edit_group ADD deleted SMALLINT DEFAULT 0;
+
+ALTER TABLE temp_files ADD folder varchar;
+ALTER TABLE edit_page ADD hostname varchar;
+
+ALTER TABLE edit_user ADD deleted SMALLINT DEFAULT 0;
--- a/4dev/update/20190910_page_content/20190910_page_content_updates.sql
+++ b/4dev/update/20190910_page_content/20190910_page_content_updates.sql
@@ -88,3 +88,5 @@ UPDATE edit_query_string SET cuid = random_string(12) WHERE cuid IS NULL;
 UPDATE edit_scheme SET cuid = random_string(12) WHERE cuid IS NULL;
 UPDATE edit_user SET cuid = random_string(12) WHERE cuid IS NULL;
 UPDATE edit_visible_group SET cuid = random_string(12) WHERE cuid IS NULL;
+
+-- update all triggers
--- a/bin/Progress.pm
+++ b/bin/Progress.pm
@@ -0,0 +1,498 @@
+package Progress;
+
+# AUTHOR: Clemens Schwaighofer
+# DATE CREATED: 2009/6/16
+# DESCRIPTION: progress percent class
+
+# METHODS
+# * init
+# my $prg = Progress->new();
+#   will init a new progress class in the var $prg
+#   the following parameters can be set directly during a new call
+#   - verbose (1/0)
+#   - precision (-1~10)
+#   - wide_time (0/1)
+#   - microtime (0/1)
+#   setting is done via
+# my $prg = Progress->new(verbose => 1, microtime = 1);
+# * setting methods
+# verbose($level int)
+#   $level has to be int, if not set there is no output show, at least 1 has to be given to see visible output
+# precision($decimals int)
+#   $decimals has to be int, if set to -1 then the steps are done in 10 increase, else it sets how many decimals are visible, 0 for no decimals
+# wide_time(0/1 int)
+#   sets the flag for wide time, if set to 1 the estimated time to end and time run is left prefixed with 15 chars
+# microtime(0/1 int)
+#   sets the flag to always show microtime (1) or only if the previous time was the same (0)
+# reset()
+#   resets all the internal vars for another new run
+# SetStartTime(optional timestamp)
+#   sets the start times for this progress run, the overall start/end time is set, and the time used for the actual progress
+#   in case there is some processing done before the run starts, it is highly recommended to call SetETAStartTime before the actual processing starts
+#   if no timestamp is given, internal timestamp is used (this is recommended)
+# SetETAStartTime(optional timestamp)
+#   only sets the start/end time for the actual "estimated time" calculation. It is recommended to call this right before the processing loop starts
+#   eg if there is a big query running that takes a lot of time, this method should be called before the reading loop
+#   as with SetStartTime a timestamp can be given, if not then the internal timestamp is used (this is recommended)
+# SetEndTime(optional timestamp)
+#   sets the end time for the overall processing. This should be called at the very end of the script before any final stat data is printed
+# linecount($lines int)
+#   sets the maximum lines that will be processed, used for percentage calculation. If non int is given, will set to 1. This will be only set once, to
+#   reset used reset() method.
+#   Either this or filesize NEED to be set
+# filesize($bytes int)
+#   filesize in bytes, if non valid data is given, then it is set to 1.
+#   filesize() and linecount() can both be set, but at least one of them has to be set.
+#   if filesize is set a byte data output is added, if only linecount is given, only the linecount output will be given (no bytes per second, etc)
+# ShowPosition(optional current byte position int)
+#   this is the main processing and has to be called at the end of the loop where the data is processed. If no bytes are given the internal counter (linecount)
+#   is used.
+#   for bytes it is recommended to use IO::File and $FH->tell to pass on the bytes
+#
+# VARIABLES
+# * internal set
+#   change: flagged 1 if output is given or would be given. can be used for any post processing after the ShowPosition is called
+#   precision_ten_step: flagged 1 if the precision was set to -1
+#   start: overall start time
+#   end: overall end time
+#   count: count of processed lines
+#   [TODO: describe the others too, at the moment only below in %fields]
+
+use strict;
+use warnings;
+use utf8;
+
+BEGIN {
+	use POSIX;
+	use Carp;
+	use Time::HiRes qw(time);
+	use File::Basename;
+	use Number::Format qw(format_number);
+	use vars qw($AUTOLOAD);
+	push(@INC, File::Basename::dirname($0).'/');
+}
+
+# important includes
+use functions;
+
+# variable declarationf or access
+# * can be set
+# = only for read
+# unmarked are internal only, but can be read if they are needed in further processing in the script
+my %fields = (
+	linecount => 0, # * max lines in input
+	filesize => 0, # * max file size
+	precision => 1, # * comma after percent
+	wide_time => 0, # * if flagged 1, then the wide 15 char left bound format is used
+	verbose => 0, # * verbose status from outside
+	microtime => 0, # * microtime output for last run time (1 for enable, 0 for auto, -1 for disable)
+	change => 0, # = flag if output was given
+	start => undef, # = global start for the full script running time
+	start_run => undef, # = for the eta time, can be set after a query or long read in, to not create a wrong ETA time
+	start_time => undef, # loop start
+	end => undef, # = global end
+	end_time => undef, # loop end
+	count_size => undef, # = filesize current
+	count => 0, # = position current
+	current_count => 0, # last count (position)
+	lines_processed => 0, # lines processed in the last run
+	last_group => 0, # time in seconds for the last group run (until percent change)
+	lines_in_last_group => 0, # float value, lines processed per second to the last group run
+	lines_in_global => 0, # float values, lines processed per second to complete run
+	bytes_in_last_group => 0, # flaot value, bytes processes per second in the last group run
+	bytes_in_global => 0, # float value, bytes processed per second to complete run
+	size_in_last_group => 0, # bytes processed in last run (in bytes)
+	current_size => 0, # current file position (size)
+	last_percent => 0, # last percent position
+	precision_ten_step => 0, # if we have normal % or in steps of 10
+	percent_print => 5, # the default size, this is precision + 4
+	percent_precision => 1, # this is 1 if it is 1 or 0 for precision, or precision size
+	eta => undef, # estimated time to finish
+	full_time_needed => undef, # run time since start
+	lg_microtime => 0 # last group microtime, this is auto set during process.
+);
+
+# class init
+sub new
+{
+	my $proto = shift;
+	my $class = ref($proto) || $proto;
+	my %data = @_;
+	my $self = {
+		_permitted => \%fields,
+		%fields,
+	};
+	# vars to init
+	bless ($self, $class);
+	if ($data{'verbose'} && $data{'verbose'} =~ /^\d{1}$/) {
+		$self->{verbose} = $data{'verbose'};
+	}
+	if (exists($data{'precision'}) && (($data{'precision'} || $data{'precision'} == 0) && $data{'precision'} =~ /^\-?\d{1,2}$/)) {
+		$self->precision($data{'precision'});
+	}
+	if ($data{'microtime'} && $data{'microtime'} =~ /^(0|1)$/) {
+		$self->microtime($data{'microtime'});
+	}
+	if ($data{'wide_time'} && $data{'wide_time'} =~ /^(0|1)$/) {
+		$self->wide_time($data{'wide_time'});
+	}
+	return $self;
+}
+
+# auto load for vars
+sub AUTOLOAD
+{
+	my $self = shift;
+	my $type = ref($self) || croak "$self is not an object";
+	my $name = $AUTOLOAD;
+	$name =~ s/.*://;
+
+	unless (exists $self->{_permitted}->{$name}) {
+		croak "Can't access '$name' field in class $type";
+	}
+
+	if (@_) {
+		return $self->{$name} = shift;
+	} else {
+		return $self->{$name};
+	}
+}
+
+# destructor
+sub DESTROY
+{
+	# do nothing, there is nothing to close or finish
+}
+
+# SUB: reset
+# PARAMS: none
+# DESC: resets all the current counters only and current start times
+sub reset
+{
+	my $self = shift;
+	# reset what always gets reset
+	$self->{count} = 0;
+	$self->{count_size} = undef;
+	$self->{current_count} = 0;
+	$self->{linecount} = 0;
+	$self->{lines_processed} = 0;
+	$self->{last_group} = 0;
+	$self->{lines_in_last_group} = 0;
+	$self->{lines_in_global} = 0;
+	$self->{bytes_in_last_group} = 0;
+	$self->{bytes_in_global} = 0;
+	$self->{size_in_last_group} = 0;
+	$self->{filesize} = 0;
+	$self->{current_size} = 0;
+	$self->{last_percent} = 0;
+	$self->{eta} = 0;
+	$self->{full_time_needed} = 0;
+	$self->{start_run} = undef;
+	$self->{start_time} = undef;
+	$self->{end_time} = undef;
+}
+
+# SUB: microtime
+# PARAMS: 1/0
+# DESC: flag to set microtime on or off in the time output
+#       if not 1 or 0, set to 0
+sub microtime
+{
+	my $self = shift;
+	my $microtime;
+	if (@_) {
+		$microtime = shift;
+		if ($microtime == 1 || $microtime == 0) {
+			$self->{microtime} = $microtime;
+		} else {
+			$self->{microtime} = 0;
+		}
+	}
+	return $self->{microtime};
+}
+
+
+# SUB: wide_time
+# PARAMS: 1/0
+# DESC: flag to set wide_time (15 char spacer).
+#       if not 1 or 0, set to 0
+sub wide_time
+{
+	my $self = shift;
+	my $wide;
+	if (@_) {
+		$wide = shift;
+		if ($wide == 1 || $wide == 0) {
+			$self->{wide_time} = $wide;
+		} else {
+			$self->{wide_time} = 0;
+		}
+	}
+	return $self->{wide_time};
+}
+
+# SUB: precision
+# PARAMS: precision in int
+# DESC: sets the output percent precision calculation and printf width
+#       if negative, to ten step, if bigger 10, set to one
+sub precision
+{
+	my $self = shift;
+	my $comma;
+	if (@_) {
+		$comma = shift;
+		$comma = 0 if ($comma !~ /^\-?\d{1,}$/);
+		if ($comma < 0) {
+			# -2 is 5 step
+			# -1 is 10 step
+			if ($comma < -1) {
+				$self->{precision_ten_step} = 5;
+			} else {
+				$self->{precision_ten_step} = 10;
+			}
+			$self->{precision} = 0; # no comma
+			$self->{percent_precision} = 0; # no print precision
+			$self->{percent_print} = 3; # max 3 length
+		} else {
+			$self->{precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
+			$self->{percent_precision} = $comma < 0 || $comma > 10 ? 10 : $comma;
+			$self->{percent_print} = ($comma == 0 ? 3 : 4) + $self->{percent_precision};
+		}
+	}
+	return $self->{precision};
+}
+
+# SUB: linecount
+# PARAMS: max number of lines to be processed
+# DESC: sets the max number for lines for the percent calculation, if negative or not number, set to 1
+#       can only be set ONCE
+sub linecount
+{
+	my $self = shift;
+	my $linecount;
+	if (!$self->{linecount}) {
+		if (@_) {
+			$linecount = shift;
+			$self->{linecount} = $linecount;
+			$self->{linecount} = 1 if ($linecount < 0 || $linecount !~ /\d+/)
+		}
+	}
+	return $self->{linecount};
+}
+
+# SUB: filesize
+# PARAMS: max filesize for the to processed data
+# DESC: sets the max filesize for the to processed data, if negative or not number, set to 1
+#       input data has to be in bytes without any suffix (no b, kb, etc)
+#       can only be set ONCE
+sub filesize
+{
+	my $self = shift;
+	my $filesize;
+	if (!$self->{filesize}) {
+		if (@_) {
+			$filesize = shift;
+			$self->{filesize} = $filesize;
+			$self->{filesize} = 1 if ($filesize < 0 || $filesize !~ /\d+/)
+		}
+	}
+	return $self->{filesize};
+}
+
+# SUB: SetStartTime
+# PARAMS: time, or nothing
+# DESC: sets all the start times
+sub SetStartTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{start} = shift;
+	} else {
+		$self->{start} = time();
+	}
+	$self->{start_time} = $self->{start};
+	$self->{start_run} = $self->{start};
+}
+
+# SUB: SetETAStartTime
+# PARAMS: time, or nothing
+# DESC: sets the loop & run time, for correct ETA callculation
+sub SetETAStartTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{start_time} = shift;
+	} else {
+		$self->{start_time} = time();
+	}
+	$self->{start_run} = $self->{start_time};
+}
+
+# SUB: SetEndTime
+# PARAMS: time, or nothing
+# DESC: sets the end time for running time calculation
+sub SetEndTime
+{
+	my $self = shift;
+	if (@_) {
+		$self->{end} = shift;
+	} else {
+		$self->{end} = time();
+	}
+}
+
+# SUB: ShowPosition
+# PARAMS: optiona; file position (via file pointer)
+# RETURN: string for percent position output
+# DESC: calculates the current percent position based on the passed parameter, if no parameter uses intneral counter
+sub ShowPosition
+{
+	my $self = shift;
+	# set local vars
+	my $percent; # current percent
+	my $full_time_needed; # complete process time
+	my $full_time_per_line; # time per line
+	my $eta; # estimated end time
+	my $string = ''; # percent string that gets output
+	my $show_filesize = 1;
+	# microtime flags
+	my $eta_microtime = 0;
+	my $ftn_microtime = 0;
+	my $lg_microtime = 0;
+	# percent precision calc
+	my $_p_spf = "%.".$self->{precision}."f";
+	# output format for percent
+	my $_pr_p_spf = "%".$self->{percent_print}.".".$self->{percent_precision}."f";
+	# set the linecount precision based on the final linecount, if not, leave it empty
+	my $_pr_lc = "%s";
+	$_pr_lc = "%".length(format_number($self->{linecount}))."s" if ($self->{linecount});
+	# time format, if flag is set, the wide format is used
+	my $_pr_tf = "%s";
+	$_pr_tf = "%-15s" if ($self->{'wide_time'});
+	# do the smae for file size
+	# my $_pr_fs = "%s";
+	# $_pr_fs = "%".length(function::convert_number($self->{filesize}))."s" if ($self->{filesize});
+
+	# increase position by one
+	$self->{count} ++;
+	# see if we get anything from IO tell
+	if (@_) {
+		$self->{file_pos} = shift;
+	} else {
+		# we did not, so we set internal value
+		$self->{file_pos} = $self->{count};
+		# we also check if the filesize was set now
+		if (!$self->{filesize}) {
+			$self->{filesize} = $self->{linecount};
+		}
+		# set ignore filesize output (no data)
+		$show_filesize = 0;
+	}
+	# set the count size based on the file pos, is only used if we have filesize
+	$self->{count_size} = $self->{file_pos};
+
+	# do normal or down to 10 (0, 10, ...) %
+	if ($self->{precision_ten_step}) {
+		# calc 0 comma precision, so just do a floor
+		my $_percent = sprintf("%d", ($self->{file_pos} / $self->{filesize}) * 100);
+		# mod that to 10
+		my $mod = $_percent % $self->{precision_ten_step};
+		# either write this one, or write the previous, old one
+		$percent = $mod == 0 ? $_percent : $self->last_percent;
+		# print "P: $percent, Last: ".$self->last_percent.", Mod: ".$mod.", Calc: ".$_percent."\n";
+	} else {
+		$percent = sprintf($_p_spf, ($self->{file_pos} / $self->{filesize}) * 100);
+	}
+	# print "POS: ".$self->{file_pos}.", PERCENT: $percent / ".$self->last_percent."\n";
+	if ($percent != $self->last_percent) {
+		$self->{end_time} = time();
+		# for from the beginning
+		$full_time_needed = $self->{end_time} - $self->{start_run}; # how long from the start;
+		$self->{last_group} = $self->{end_time} - $self->{start_time};
+		$self->{lines_processed} = $self->{count} - $self->{current_count};
+		# lines in last group
+		$self->{lines_in_last_group} = $self->{'last_group'} ? ($self->{lines_processed} / $self->{last_group}) : 0;
+		# lines in global
+		$self->{lines_in_global} = $full_time_needed ? ($self->{'count'} / $full_time_needed) : 0;
+		# if we have linecount
+		if (!$self->{linecount}) {
+			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count_size}; # how long for all
+			$eta = $full_time_per_line * ($self->{filesize} - $self->{count_size}); # estimate for the rest
+		} else {
+			$full_time_per_line = (($full_time_needed) ? $full_time_needed : 1) / $self->{count}; # how long for all
+			$eta = $full_time_per_line * ($self->{linecount} - $self->{count}); # estimate for the rest
+		}
+
+		# just in case ...
+		$eta = '0' if ($eta < 0);
+		# check if to show microtime
+		# ON: if microtime is flagged as one
+		$eta_microtime = $ftn_microtime = $lg_microtime = 1 if ($self->{microtime} == 1);
+		# AUTO: foir microtime
+		if ($self->{microtime} == 0) {
+			$eta_microtime = 1 if ($eta > 0 && $eta < 1);
+			$ftn_microtime = 1 if ($full_time_needed > 0 && $full_time_needed < 1);
+			# pre check last group: if pre comma part is same add microtime anyway
+			$lg_microtime = 1 if ($self->{last_group} > 0 && $self->{last_group} < 1);
+		}
+		# print out
+		if ($show_filesize) {
+			# last group size
+			$self->{size_in_last_group} = $self->{count_size} - $self->{current_size};
+			# calc kb/s if there is any filesize data
+			# last group
+			$self->{bytes_in_last_group} = $self->{'last_group'} ? ($self->{size_in_last_group} / $self->{last_group}) : 0;
+			# global
+			$self->{bytes_in_global} = $full_time_needed ? ($self->{count_size} / $full_time_needed) : 0;
+			# only used if we run with file size for the next check
+			$self->{current_size} = $self->{count_size};
+
+			$string = sprintf(
+				"Processed ".$_pr_p_spf."%% [%s / %s] | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines (%s) in %s, %s (%s) lines/s, %s (%s) b/s\n",
+				$percent,
+				function::convert_number($self->{count_size}),
+				function::convert_number($self->{filesize}),
+				format_number($self->{count}),
+				format_number($self->{linecount}),
+				function::convert_time($eta, $eta_microtime),
+				function::convert_time($full_time_needed, $ftn_microtime),
+				format_number($self->{lines_processed}),
+				function::convert_number($self->{size_in_last_group}),
+				function::convert_time($self->{last_group}, $lg_microtime),
+				format_number($self->{lines_in_global}, 2, 1),
+				format_number($self->{lines_in_last_group}, 2, 1),
+				function::convert_number($self->{bytes_in_global}),
+				function::convert_number($self->{bytes_in_last_group})
+			) if ($self->{verbose} >= 1);
+		} else {
+			$string = sprintf(
+				"Processed ".$_pr_p_spf."%% | ".$_pr_lc." / ".$_pr_lc." Lines | ETA: ".$_pr_tf." / TR: ".$_pr_tf." / LR: %s lines in %s, %s (%s) lines/s\n",
+				$percent,
+				format_number($self->{count}),
+				format_number($self->{linecount}),
+				function::convert_time($eta, $eta_microtime),
+				function::convert_time($full_time_needed, $ftn_microtime),
+				format_number($self->{lines_processed}),
+				function::convert_time($self->{last_group}, $lg_microtime),
+				format_number($self->{lines_in_global}, 2, 1),
+				format_number($self->{lines_in_last_group}, 2, 1)
+			) if ($self->{verbose} >= 1);
+		}
+		# write back vars
+		$self->{last_percent} = $percent;
+		$self->{eta} = $eta;
+		$self->{full_time_needed} = $full_time_needed;
+		$self->{lg_microtime} = $lg_microtime;
+		# for the next run, check data
+		$self->{start_time} = time();
+		$self->{current_count} = $self->{count};
+		# trigger if this is a change
+		$self->{change} = 1;
+	} else {
+		# trigger if this is a change
+		$self->{change} = 0;
+	}
+	return $string;
+}
+
+1;
--- a/bin/functions.pm
+++ b/bin/functions.pm
@@ -0,0 +1,501 @@
+package function;
+
+# AUTHOR: Clemens Schwaighofer
+# DATE CREATED: 2004/11/09
+# DESCRIPTION: functions collection for Adidas scripts
+# HISTORY:
+# 2005/06/22 (cs) added header key check function
+# 2005/02/10 (cs) added debug flag to print output, added two new functions to format a number into B, KB, etc
+# 2005/01/13 (cs) fixed array problem with the clean up and int function
+
+use strict;
+use warnings;
+use 5.000_000;
+use POSIX qw(floor);
+use File::Copy;
+use Digest::SHA qw(sha1_hex);
+use utf8;
+#require Exporter;
+#our @ISA = qw(Exporter);
+#our @EXPORT = qw();
+
+# depending on the options given to the program, it gets the correct settings
+# to which db it should connect
+sub get_db_user
+{
+	my ($target, $db) = @_;
+
+	# the parts of the hash array (tab seperated)
+	my @array_names = qw{db_name	db_port	db_user	db_pass	db_host	db_type	db_test	db_ssl};
+	my %db_out = ();
+
+	# based on the two parameters find the correct vars
+	# each level can hold data, higher level data overrules lower data
+	# eg $config::db{'test'}{'db_user'} overrules $config::db{'db_user'}
+	for (my $i = 1; $i <= 3; $i ++) {
+		foreach my $name (@array_names) {
+			# depending on the level check the level of data
+			if ($i == 1) {
+				$db_out{$name} = $config::db{$name} if (defined($config::db{$name}));
+			} elsif ($i == 2) {
+				$db_out{$name} = $config::db{$target}{$name} if (defined($config::db{$target}{$name}));
+			} elsif ($i == 3) {
+				$db_out{$name} = $config::db{$target}{$db}{$name} if (defined($config::db{$target}{$db}{$name}));
+			}
+		} # for each db data var
+	} # for each data level in the hash
+
+	return (
+		$db_out{'db_name'},
+		$db_out{'db_port'},
+		$db_out{'db_user'},
+		$db_out{'db_pass'},
+		$db_out{'db_host'},
+		$db_out{'db_type'},
+		$db_out{'db_test'},
+		$db_out{'db_ssl'}
+	);
+}
+
+# get the DSN string for the DB connect
+sub get_db_dsn
+{
+	my (
+		$db_name,
+		$db_port,
+		$db_user,
+		$db_pass,
+		$db_host,
+		$db_type,
+		$db_ssl
+	) = @_;
+	my $dsn = '';
+
+	if ($db_type eq 'mysql' && $db_name && $db_host && $db_user) {
+		$dsn = "DBI:mysql:database=".$db_name.";host=".$db_host.";port=".$db_port;
+	} elsif ($db_type eq 'pgsql' && $db_name && $db_host && $db_user) {
+		$dsn = "DBI:Pg:dbname=".$db_name.";host=".$db_host.";port=".$db_port.";sslmode=".$db_ssl;
+	} else {
+		# invalid db type
+		$dsn = -1;
+	}
+	return $dsn;
+}
+
+sub strip_white_spaces
+{
+	my ($element) = @_;
+	# get rid of spaces at the end and at the beginning of each bloack
+	$element =~ s/^\s+//g;
+	$element =~ s/\s+$//g;
+	return $element;
+}
+
+sub prepare_hash_keys
+{
+	my($csv, $data, $csv_header) = @_;
+
+	# unset value starts at 1000 and goes up ...
+	my $unset_value = 1000;
+	my %keys = ();
+
+	# parse header
+	if ($csv->parse($data)) {
+		my @cols = $csv->fields();
+		for (my $i = 0; $i < @cols; $i ++) {
+			# remove all spaces before and afterward
+			$cols[$i] = function::strip_white_spaces($cols[$i]);
+			# write key - id number
+			$keys{$cols[$i]} = $i;
+			print $::DEBUG "\tPostion [".$i."]: ".$cols[$i]."\n" if ($::debug);
+			print "\tPosition [".$i."]: ".$cols[$i]."\n" if ($::verbose > 1);
+		}
+	} else {
+		die "ERROR[".$csv->error_diag()."]: ".$csv->error_input()."\n";
+	}
+	# add empty values
+	foreach my $csv_header_value (@$csv_header) {
+		if (!defined($keys{$csv_header_value})) {
+			$keys{$csv_header_value} = $unset_value;
+			$unset_value ++;
+			print $::DEBUG "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::debug);
+			print "\tKey [$csv_header_value] gets position [".$keys{$csv_header_value}."]\n" if ($::verbose > 1);
+		}
+	}
+
+	return %keys;
+}
+
+sub error_check_keys
+{
+	my($csv_header, $keys) = @_;
+
+	if ((keys %$keys) != @$csv_header) {
+		print $::ERR "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
+		print "TOTAL WRONG COUNT: CSV header ".(keys %$keys)." vs Needed headers ".@$csv_header.": perhaps your input file is not fitting this?\n";
+
+		# if there are more keys in CSV file, then in the header defined in here
+		if ((keys %$keys) > @$csv_header) {
+			print $::ERR "Listing Perl Header missing\n";
+			print "Listing Perl Header missing\n";
+			foreach my $key (keys %$keys) {
+				print $::ERR "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
+				print "Missing in perl Header list: $key\n" if (!grep {$_ eq $key} @$csv_header);
+			}
+			# if more keys are in the header defined than in the csv file
+		} else {
+			print $::ERR "Listing CSV Header missing\n";
+			print "Listing CSV Header missing\n";
+			for (my $i = 0; $i < @$csv_header; $i ++) {
+				print $::ERR "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
+				print "Missing in CSV file: ".$$csv_header[$i]."\n" if (!defined($$keys{$$csv_header[$i]}));
+			}
+		}
+		return 0;
+	}
+	return 1;
+}
+
+sub clean_up_row
+{
+	my ($row) = @_;
+
+	for (my $i = 0; $i < @$row; $i++) {
+		# get rid of spaces at the end and at the beginning of each bloack
+		$$row[$i] =~ s/^\s+//g;
+		$$row[$i] =~ s/\s+$//g;
+		# convert all half width Katakan to Full width Katakana
+		$$row[$i] = Unicode::Japanese->new($$row[$i])->h2zKana->get;
+		# need to decode the converted string, somehow Unicode::Japanese does not return proper utf8 if use utf8 is on
+		utf8::decode($$row[$i]);
+	}
+
+	return @$row;
+}
+
+sub set_int_fields
+{
+	my ($row, $keys, $int_fields) = @_;
+
+	# check ALL smallint/int/etc rows to be set to a number
+	for (my $i = 0; $i < @$int_fields; $i++) {
+		print "\t\tCheck ".$$int_fields[$i]." {".$$keys{$$int_fields[$i]}."} ... " if ($::verbose > 1);
+		if (!$$row[$$keys{$$int_fields[$i]}]) {
+			$$row[$$keys{$$int_fields[$i]}] = 0;
+		}
+		# if its filled, but not a digit, set to 1
+		if ($$row[$$keys{$$int_fields[$i]}] =~ /\D/) {
+			$$row[$$keys{$$int_fields[$i]}] = 1;
+		}
+		print "[".$$row[$$keys{$$int_fields[$i]}]."] [DONE]\n" if ($::verbose > 1);
+	}
+	return @$row;
+}
+
+# formats a number with dots and ,
+sub format_number
+{
+	my ($number) = @_;
+	# dummy, does nothing now
+	# should put . or , every 3 digits later
+	return $number;
+}
+
+# converts bytes to human readable format
+sub convert_number
+{
+	my ($number) = @_;
+	my $pos; # the original position in the labels array
+	# divied number until its division would be < 1024. count that position for label usage
+	for ($pos = 0; $number > 1024; $pos ++) {
+		$number = $number / 1024;
+	}
+	# before we return it, we format it [rounded to 2 digits, if has decimals, else just int]
+	# we add the right label to it and return
+	return sprintf(!$pos ? '%d' : '%.2f', $number)." ".qw(B KB MB GB TB PB EB)[$pos];
+}
+
+# make time from seconds string
+sub convert_time
+{
+	my ($timestamp, $show_micro) = @_;
+	my $ms = '';
+	# cut of the ms, but first round them up to four
+	$timestamp = sprintf("%.4f", $timestamp);
+	# print "T: ".$timestamp."\n";
+	($timestamp, $ms) = split(/\./, $timestamp);
+	my @timegroups = ("86400", "3600", "60", "1");
+	my @output = ();
+	for (my $i = 0; $i < @timegroups; $i ++) {
+		push(@output, floor($timestamp / $timegroups[$i]));
+		$timestamp = $timestamp % $timegroups[$i];
+	}
+	# output has days|hours|min|sec
+	return (($output[0]) ? $output[0]."d " : "").
+		(($output[1] || $output[0]) ? $output[1]."h " : "").
+		(($output[2] ||$output[1] || $output[0]) ? $output[2]."m " : "").
+		$output[3]."s".
+		(($show_micro) ? " ".((!$ms) ? 0 : $ms)."ms" : "");
+}
+
+# get a timestamp and create a proper formated date/time field
+sub create_time
+{
+	my ($timestamp, $show_micro) = @_;
+	my $ms = '';
+	$timestamp = 0 if (!$timestamp);
+	# round ms to 4 numbers
+	$timestamp = sprintf("%.4f", $timestamp);
+	($timestamp, $ms) = split(/\./, $timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year."-".
+		($month < 10 ? '0'.$month : $month)."-".
+		($day < 10 ? '0'.$day : $day)." ".
+		($hour < 10 ? '0'.$hour : $hour).":".
+		($min < 10 ? '0'.$min : $min).":".
+		($sec < 10 ? '0'.$sec : $sec).
+		(($ms && $show_micro) ? ".".$ms : "");
+}
+
+# create YYYYMMDD data
+sub create_date
+{
+	my ($timestamp, $split_string) = @_;
+	my $split = $split_string ? $split_string : '';
+	$timestamp = time() if (!$timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year.$split.
+		($month < 10 ? '0'.$month : $month).$split.
+		($day < 10 ? '0'.$day : $day);
+}
+
+# create YYYYMMDD_HHMMSS data
+sub create_datetime
+{
+	my ($timestamp, $split_string) = @_;
+	my $split = $split_string ? $split_string : '';
+	$timestamp = time() if (!$timestamp);
+	# array for time
+	my ($sec, $min, $hour, $day, $month, $year, $wday, $yday, $isdst) = localtime($timestamp);
+	# year, month fix
+	$year += 1900;
+	$month += 1;
+	# string for return
+	return $year.$split.
+		($month < 10 ? '0'.$month : $month).$split.
+		($day < 10 ? '0'.$day : $day).'_'.
+		($hour < 10 ? '0'.$hour : $hour).$split.
+		($min < 10 ? '0'.$min : $min).$split.
+		($sec < 10 ? '0'.$sec : $sec);
+}
+
+sub left_fill
+{
+	my($number, $size, $char) = @_;
+	return sprintf($char x ($size - length($number)).$number);
+}
+
+# wrapper to flip the crc32 hex string, so it is like buggy php one (php <= 5.2.6)
+sub crc32b_fix
+{
+	my ($crc) = @_;
+	# left pad with 0 to 8 chars
+	$crc = ('0' x (8 - length($crc))).$crc;
+	# flip two chars (byte hex)
+	$crc =~ s/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/$4$3$2$1/;
+	return $crc;
+}
+
+# short sha1 (9 char) function
+sub sha1_short
+{
+	my ($string) = @_;
+	return substr(sha1_hex($string), 0, 9);
+}
+
+# DEBUG helpers for dumping data
+# from: http://www.perlmonks.org/?node_id=390153
+# alternative use Dump::Dumper and print Dump(VAR);
+sub dump_data
+{
+	my ($level, $base, $data) = @_;
+	my $nextlevel = $level + 1;
+	if (ref($data) eq 'ARRAY') {
+		foreach my $k (0 .. $#{$data}) {
+			my $baseval = $base.'['.$k.']';
+			dump_it($nextlevel, $baseval, $data->[$k]);
+		}
+	} elsif (ref($data) eq 'HASH') {
+		foreach my $k (sort(keys(%{$data}))) {
+			my $baseval = $base.'{'.$k.'}';
+			dump_it($nextlevel, $baseval, $data->{$k});
+		}
+	} elsif (ref($data) eq 'SCALAR') {
+		my $baseval = $base;
+		dump_it($nextlevel, $baseval, ${$data});
+	}
+}
+
+sub dump_it
+{
+	my ($nextlevel, $baseval, $datum) = @_;
+	my $reftype = ref($datum);
+	if ($reftype eq 'HASH') {
+		dump_data($nextlevel, $baseval, \%{$datum});
+	} elsif ($reftype eq 'ARRAY') {
+		dump_data($nextlevel, $baseval, \@{$datum});
+	} else {
+		process_data($nextlevel, $baseval, $datum);
+	}
+}
+
+sub process_data
+{
+	my ($nextlevel, $baseval, $datum) = @_;
+	my $indentation = '  ' x $nextlevel;
+	print $indentation, $baseval, ' = ', $datum, "\n";
+}
+
+# METHOD: lock_run
+# PARAMS: file (plus path) to lock to
+#         the current running pid (if not given will be set in script)
+#         the current name of the script (auto set if not given)
+#         optional write encoding (set to utf8 if not given)
+# RETURN: nothing
+# DESC:   checks if this script is already running based on the lock file, if if yes will abort
+#         if file is there but pid not find it automatically cleans up the stale lock file
+sub lock_run
+{
+	my ($file, $run_pid, $name, $encoding) = @_;
+	# if no encoding, set utf8
+	$encoding = 'utf8' if (!$encoding);
+	# set the run pid if no pid is given
+	$run_pid = $$ if (!$run_pid);
+	# set the script base name
+	$name = File::Basename::fileparse($0) if (!$name);
+	# if lock file exists
+	if (-f $file) {
+		my $exists = 0;
+		my $pid = `cat $file`;
+		chomp($pid);
+		# printDebug("Lock file found for $pid", 1);
+		# check if process excists with this pid
+		# better todo A for ALL processes
+		# ps axu OR short ps a
+		open(PS, 'ps axu|') || die("$!");
+		while (<PS>) {
+			# search for pid and run file name
+			if ($_ =~ /\ $pid\ / && $_ =~ /$name/) {
+				$exists = 1;
+			}
+			last if ($exists);
+		}
+		close(PS);
+		if (!$exists) {
+			# printDebug("Lock file cleaned up for $pid", 1);
+			unlink($file);
+		} else {
+			die("Script is already running with PID $pid\n");
+		}
+	}
+	# write current PID into lock file
+	open(FP, '>:encoding('.$encoding.')', $file) || die ("Cannot open run lock file '$file' for writing\n");
+	print FP $run_pid;
+	close(FP);
+}
+
+# METHOD: printDebug
+# PARAMS: message, verbose level
+# RETURN: nothing
+# DESC:   depeding on the verbose and debug settings it will print out message and or write it to a debug file
+sub printDebug
+{
+	my($msg, $vrb, $dbg) = @_;
+	# print debug only if debug is on and debug file is available
+	print $::DEBUG '['.create_time(time(), 1).'] '.$msg."\n" if ($::debug && $::DEBUG);
+	# print to log if log is accessable and the verbose flag matches, or for debug flag if debug statement is set and not log only, or if log only, if not debug statement
+	print $::LOG $msg."\n" if (($::verbose >= $vrb || (!$::log_only && $dbg && $::debug) || ($::log_only && !$dbg)) && $::LOG);
+	# print to screen if verbose matches, but it is not a log only, or if it is debug statement and debug flag is set
+	print $msg."\n" if (($::verbose >= $vrb && !$::log_only) || ($dbg && $::debug));
+}
+
+# METHOD: waitAbort
+# PARAMS: time in seconds, if not provided set to 5
+# RETURN: nothing
+# DESC:   simple prints out a char while waiting for an abort command
+sub waitAbort
+{
+	my($sleep) = @_;
+	$sleep = 5 if ($sleep !~ /\d/);
+	print "Waiting $sleep seconds (Press CTRL + C to abort)\n";
+	for (my $i = 1; $i <= $sleep; $i ++) {
+		print ".";
+		sleep 1;
+	}
+	print "\n\n";
+}
+
+# METHOD: copyToTemporary
+# PARAMS: file to copy, and target file name
+# RETURN: the target file name
+# DESC  : sets the source to read only and makes a copy, the copy is also set to read only
+sub copyToTemporary
+{
+	my ($source, $target) = @_;
+	# get the current rights
+	my $current_chmod = (stat $source)[2];
+	# set source file ARGV to read only
+	# we skip that, the source might be NOT from the same user as the script read, just copy the file and set the target read only
+	chmod(0444, $source);
+	# create tmp backup file from which we read, data gets removed at the end of an run, or during an abort call
+	copy($source, $target) || die("Copy failed: $!\n");
+	# set read rights to r only for the copied file
+	chmod(0444, $target);
+	# set old access rights for ARGV file
+	chmod($current_chmod, $source);
+	# return target file name
+	return $target;
+}
+
+# METHOD: uniq
+# PARAMS: @array
+# RETURN: array with only unique entries
+# DESC  : used in uniq(@array) to get only unique data back
+sub uniq
+{
+	my %seen;
+	grep !$seen{$_}++, @_;
+}
+
+# METHOD: clean_test
+# PARAMS: array of data
+# RETURN: cleaned up array of data
+# DESC  : sets all undefs to '' for debug output
+sub clean_test
+{
+	my (@data) = @_;
+	# map check for defined, if not, return ''
+	return map { defined($_) ? $_ : '' } @data;
+}
+
+# METHOD: clean_test_string
+# PARAMS: string to be checked
+# RETURN: data or empty for output
+# DESC  : sets all input data to '' if it is undefined
+sub clean_test_string
+{
+	my ($data) = @_;
+	return defined($data) ? $data : '';
+}
+
+1;
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -24,12 +24,10 @@ if (!defined('SET_SESSION_NAME')) {
 }
 // define log file id
 $LOG_FILE_ID = 'classTest';
-// set language for l10n
-$lang = 'en_utf8';

 // init login & backend class
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
-$basic = new CoreLibs\Admin\Backend(DB_CONFIG, $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
+$basic = new CoreLibs\Admin\Backend(DB_CONFIG);
 $basic->dbInfo(true);
 ob_end_flush();

@@ -226,6 +224,13 @@ if (round($timestamp, 4) == $basic->stringToTime($time_string)) {
 } else {
 	print "REVERSE TRIME STRING DO NOT MATCH<br>";
 }
+print "ZERO TIME STRING: ".$basic->timeStringFormat(0, true)."<br>";
+print "ZERO TIME STRING: ".$basic->timeStringFormat(0.0, true)."<br>";
+print "ZERO TIME STRING: ".$basic->timeStringFormat(1.005, true)."<br>";
+
+echo "HTML ENT INT: ".$basic->htmlent(5)."<br>";
+echo "HTML ENT STRING: ".$basic->htmlent('5<<>')."<br>";
+echo "HTML ENT NULL: ".$basic->htmlent(null)."<br>";

 // magic links test
 print $basic->magicLinks('user@bubu.at').'<br>';
@@ -256,6 +261,45 @@ echo "SOURCE ARRAY: ".$basic->printAr($test_array)."<br>";
 echo "FOUND ELEMENTS [base]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array, 'type'))."<br>";
 echo "FOUND ELEMENTS [input]: ".$basic->printAr($basic->arraySearchRecursive('email', $test_array['input'], 'type'))."<br>";

+// *** BYTES TEST ***
+$bytes = array(
+	-123123123,
+	999999, // KB-1
+	999999999, // MB-1
+	254779258, // MB-n
+	999999999999999, // TB-1
+	588795544887632, // TB-n
+	999999999999999999, // PB-1
+	9223372036854775807, // MAX INT
+	999999999999999999999, // EB-1
+);
+print "<b>BYTE FORMAT TESTS</b><br>";
+foreach ($bytes as $byte) {
+	print '<div style="display: flex; border-bottom: 1px dashed gray;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "(".number_format($byte)."/".$byte.") bytes :";
+	print '</div><div style="width: 40%;">';
+	print $basic->humanReadableByteFormat($byte);
+	print "</div>";
+	//
+	print "</div>";
+	//
+	print '<div style="display: flex; border-bottom: 1px dotted red;">';
+	//
+	print '<div style="width: 35%; text-align: right; padding-right: 2px;">';
+	print "bytes [si]:";
+	print '</div><div style="width: 40%;">';
+	// print $basic->byteStringFormat($byte, true, false, true);
+	print $basic->humanReadableByteFormat($byte, $basic::BYTE_FORMAT_SI);
+	print "</div>";
+	//
+	print "</div>";
+}
+
+
+// *** IMAGE TESTS ***
+echo "<hr>";
 // image thumbnail
 $images = array(
 	// height bigger
@@ -274,7 +318,6 @@ $images = array(
 	// Photoshop
 	'photoshop_test.psd',
 );
-echo "<hr>";
 $thumb_width = 250;
 $thumb_height = 300;
 // return mime type ala mimetype
--- a/www/admin/namespace_test.php
+++ b/www/admin/namespace_test.php
@@ -14,16 +14,15 @@ $SET_SESSION_NAME = EDIT_SESSION_NAME;

 echo "DIR: ".DIR."<br>ROOT: ".ROOT."<br>BASE: ".BASE."<br>";

-$lang = 'ja_utf8';
-$base = new CoreLibs\Admin\Backend(DB_CONFIG, $lang);
+$base = new CoreLibs\Admin\Backend(DB_CONFIG);
 ob_end_flush();
 if ($base->getConnectionStatus()) {
 	die("Cannot connect to database");
 }

 print "Start time: ".$base->runningTime()."<br>";
-print "ByteStringFormat: ".$base->ByteStringFormat(1234567.12)."<br>";
-print "byteStringFormat: ".$base->byteStringFormat(1234567.12)."<br>";
+print "HumanReadableByteFormat: ".$base->HumanReadableByteFormat(1234567.12)."<br>";
+print "humanReadableByteFormat: ".$base->humanReadableByteFormat(1234567.12)."<br>";
 // print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
 print "getPageName: ".$base->getPageName()."<br>";

--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -9,143 +9,146 @@

 /************* PATHS *********************/
 // directory seperator
-DEFINE('DS', DIRECTORY_SEPARATOR);
+define('DS', DIRECTORY_SEPARATOR);
 // ** NEW/BETTER DIR DECLARATIONS **
 // path to original file (if symlink)
-DEFINE('DIR', __DIR__.DS);
+define('DIR', __DIR__.DS);
 // base dir root folder level
-DEFINE('BASE', str_replace('/configs', '', __DIR__).DS);
+define('BASE', str_replace('/configs', '', __DIR__).DS);

 // ** OLD DIR DECLARATIONS **
 // path to document root of file called
-DEFINE('ROOT', getcwd().DS);
+define('ROOT', getcwd().DS);
 // libs path
-DEFINE('LIB', 'lib'.DS);
-DEFINE('LIBS', 'lib'.DS);
+define('LIB', 'lib'.DS);
+define('LIBS', 'lib'.DS);
 // configs folder
-DEFINE('CONFIGS', 'configs'.DS);
+define('CONFIGS', 'configs'.DS);
 // includes (strings, arrays for static, etc)
-DEFINE('INCLUDES', 'includes'.DS);
+define('INCLUDES', 'includes'.DS);
 // data folder (mostly in includes)
-DEFINE('DATA', 'data'.DS);
+define('DATA', 'data'.DS);
 // layout base path
-DEFINE('LAYOUT', 'layout'.DS);
+define('LAYOUT', 'layout'.DS);
 // pic-root (compatible to CMS)
-DEFINE('PICTURES', 'images'.DS);
+define('PICTURES', 'images'.DS);
 // images
-DEFINE('IMAGES', 'images'.DS);
+define('IMAGES', 'images'.DS);
 // icons (below the images/ folder)
-DEFINE('ICONS', 'icons'.DS);
+define('ICONS', 'icons'.DS);
 // media
-DEFINE('MEDIA', 'media'.DS);
+define('MEDIA', 'media'.DS);
 // flash-root (below media)
-DEFINE('FLASH', 'flash'.DS);
+define('FLASH', 'flash'.DS);
 // uploads (anything to keep)
-DEFINE('UPLOADS', 'uploads'.DS);
+define('UPLOADS', 'uploads'.DS);
 // files (binaries) (below media)
-DEFINE('BINARIES', 'binaries'.DS);
+define('BINARIES', 'binaries'.DS);
 // files (videos) (below media)
-DEFINE('VIDEOS', 'videos'.DS);
+define('VIDEOS', 'videos'.DS);
 // files (documents) (below media)
-DEFINE('DOCUMENTS', 'documents'.DS);
+define('DOCUMENTS', 'documents'.DS);
 // files (pdfs) (below media)
-DEFINE('PDFS', 'documents'.DS);
+define('PDFS', 'documents'.DS);
 // CSV
-DEFINE('CSV', 'csv'.DS);
+define('CSV', 'csv'.DS);
 // css
-DEFINE('CSS', 'css'.DS);
+define('CSS', 'css'.DS);
+// font (web)
+define('FONT', 'font'.DS);
 // js
-DEFINE('JS', 'javascript'.DS);
+define('JS', 'javascript'.DS);
 // table arrays
-DEFINE('TABLE_ARRAYS', 'table_arrays'.DS);
+define('TABLE_ARRAYS', 'table_arrays'.DS);
 // smarty libs path
-DEFINE('SMARTY', 'Smarty'.DS);
+define('SMARTY', 'Smarty'.DS);
 // po langs
-DEFINE('LANG', 'lang'.DS);
+define('LANG', 'lang'.DS);
 // cache path
-DEFINE('CACHE', 'cache'.DS);
+define('CACHE', 'cache'.DS);
 // temp path
-DEFINE('TMP', 'tmp'.DS);
+define('TMP', 'tmp'.DS);
 // log files
-DEFINE('LOG', 'log'.DS);
+define('LOG', 'log'.DS);
 // compiled template folder
-DEFINE('TEMPLATES_C', 'templates_c'.DS);
+define('TEMPLATES_C', 'templates_c'.DS);
 // template base
-DEFINE('TEMPLATES', 'templates'.DS);
+define('TEMPLATES', 'templates'.DS);

 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
-DEFINE('DEFAULT_HASH', 'sha256');
+define('DEFAULT_HASH', 'sha256');
 // default acl level
-DEFINE('DEFAULT_ACL_LEVEL', 80);
+define('DEFAULT_ACL_LEVEL', 80);
 // SSL host name
-// DEFINE('SSL_HOST', 'ssl.host.name');
+// define('SSL_HOST', 'ssl.host.name');
 // error page strictness, Default is 3
 // 1: only show error page as the last mesure if really no mid & aid can be loaded and found at all
 // 2: if template not found, do not search, show error template
 // 3: if default template is not found, show error template, do not fall back to default tree
 // 4: very strict, even on normal fixable errors through error
-// DEFINE('ERROR_STRICT', 3);
+// define('ERROR_STRICT', 3);
 // allow page caching in general, set to 'FALSE' if you do debugging or development!
-// DEFINE('ALLOW_SMARTY_CACHE', FALSE);
+// define('ALLOW_SMARTY_CACHE', false);
 // cache life time, in second', default here is 2 days (172800s)
 // -1 is never expire cache
-// DEFINE('SMARTY_CACHE_LIFETIME', -1);
+// define('SMARTY_CACHE_LIFETIME', -1);

 /************* LOGOUT ********************/
 // logout target
-DEFINE('LOGOUT_TARGET', '');
+define('LOGOUT_TARGET', '');
 // password change allowed
-DEFINE('PASSWORD_CHANGE', false);
-DEFINE('PASSWORD_FORGOT', false);
+define('PASSWORD_CHANGE', false);
+define('PASSWORD_FORGOT', false);
 // min/max password length
-DEFINE('PASSWORD_MIN_LENGTH', 8);
-DEFINE('PASSWORD_MAX_LENGTH', 255);
+define('PASSWORD_MIN_LENGTH', 8);
+define('PASSWORD_MAX_LENGTH', 255);

 /************* AJAX / ACCESS *************/
 // ajax request type
-DEFINE('AJAX_REQUEST_TYPE', 'POST');
+define('AJAX_REQUEST_TYPE', 'POST');
 // what AJAX type to use
-DEFINE('USE_PROTOTYPE', false);
-DEFINE('USE_SCRIPTACULOUS', false);
-DEFINE('USE_JQUERY', true);
+define('USE_PROTOTYPE', false);
+define('USE_SCRIPTACULOUS', false);
+define('USE_JQUERY', true);

 /************* LAYOUT WIDTHS *************/
-DEFINE('PAGE_WIDTH', 800);
+define('PAGE_WIDTH', 800);
+define('CONTENT_WIDTH', 800);
 // the default template name
-DEFINE('MASTER_TEMPLATE_NAME', 'main_body.tpl');
+define('MASTER_TEMPLATE_NAME', 'main_body.tpl');

 /************* OVERALL CONTROL NAMES *************/
 // BELOW has HAS to be changed
 // base name for all session and log names
-DEFINE('BASE_NAME', 'CoreLibs');
+define('BASE_NAME', 'CoreLibs');

 /************* SESSION NAMES *************/
 // server name HASH
-DEFINE('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
-DEFINE('SERVER_PATH_HASH', hash('crc32b', BASE));
+define('SERVER_NAME_HASH', hash('crc32b', $_SERVER['HTTP_HOST']));
+define('SERVER_PATH_HASH', hash('crc32b', BASE));
 // backend
-DEFINE('EDIT_SESSION_NAME', BASE_NAME.'Admin'.SERVER_NAME_HASH.SERVER_PATH_HASH);
+define('EDIT_SESSION_NAME', BASE_NAME.'Admin'.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // frontend
-DEFINE('SESSION_NAME', BASE_NAME.SERVER_NAME_HASH.SERVER_PATH_HASH);
+define('SESSION_NAME', BASE_NAME.SERVER_NAME_HASH.SERVER_PATH_HASH);
 // SET_SESSION_NAME should be set in the header if a special session name is needed
-DEFINE('SET_SESSION_NAME', SESSION_NAME);
+define('SET_SESSION_NAME', SESSION_NAME);

 /************* CACHE/COMPILE IDS *************/
-DEFINE('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
-DEFINE('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
+define('CACHE_ID', 'CACHE_'.BASE_NAME.'_'.SERVER_NAME_HASH);
+define('COMPILE_ID', 'COMPILE_'.BASE_NAME.'_'.SERVER_NAME_HASH);

 /************* LANGUAGE / ENCODING *******/
-DEFINE('DEFAULT_LANG', 'en_utf8');
+define('DEFAULT_LANG', 'en_utf8');
 // default web page encoding setting
-DEFINE('DEFAULT_ENCODING', 'UTF-8');
+define('DEFAULT_ENCODING', 'UTF-8');

 /************* LOGGING *******************/
 // below two can be defined here, but they should be
 // defined in either the header file or the file itself
 // as $LOG_FILE_ID which takes presence over LOG_FILE_ID
 // see Basic class constructor
-DEFINE('LOG_FILE_ID', BASE_NAME);
+define('LOG_FILE_ID', BASE_NAME);

 /************* CLASS ERRORS *******************/
 // 0 = default all OFF
@@ -158,14 +161,14 @@ define('CLASS_VARIABLE_ERROR_MODE', 3);
 // if we have a dev/live system
 // set_live is a per page/per item
 // live_queue is a global queue system
-// DEFINE('QUEUE', 'live_queue');
+// define('QUEUE', 'live_queue');

 /************* DB PATHS (PostgreSQL) *****************/
 // schema names, can also be defined per <DB INFO>
-DEFINE('PUBLIC_SCHEMA', 'public');
-DEFINE('DEV_SCHEMA', 'public');
-DEFINE('TEST_SCHEMA', 'public');
-DEFINE('LIVE_SCHEMA', 'public');
+define('PUBLIC_SCHEMA', 'public');
+define('DEV_SCHEMA', 'public');
+define('TEST_SCHEMA', 'public');
+define('LIVE_SCHEMA', 'public');

 /************* CORE HOST SETTINGS *****************/
 if (file_exists(BASE.CONFIGS.'config.host.php')) {
@@ -192,7 +195,7 @@ if (file_exists(BASE.CONFIGS.'config.path.php')) {
 // get the name without the port
 list($HOST_NAME) = array_pad(explode(':', $_SERVER['HTTP_HOST'], 2), 2, null);
 // set HOST name
-DEFINE('HOST_NAME', $HOST_NAME);
+define('HOST_NAME', $HOST_NAME);
 // BAIL ON MISSING MASTER SITE CONFIG
 if (!isset($SITE_CONFIG[HOST_NAME]['location'])) {
 	echo 'Missing SITE_CONFIG entry for: "'.HOST_NAME.'". Contact Administrator';
@@ -217,41 +220,41 @@ if ((!isset($SITE_CONFIG[HOST_NAME]['db_host']) && count($DB_CONFIG)) ||
 // set SSL on
 if ((array_key_exists('HTTPS', $_SERVER) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
 	$_SERVER['SERVER_PORT'] == 443) {
-	DEFINE('HOST_SSL', true);
-	DEFINE('HOST_PROTOCOL', 'https://');
+	define('HOST_SSL', true);
+	define('HOST_PROTOCOL', 'https://');
 } else {
-	DEFINE('HOST_SSL', false);
-	DEFINE('HOST_PROTOCOL', 'http://');
+	define('HOST_SSL', false);
+	define('HOST_PROTOCOL', 'http://');
 }
 // define the db config set name, the db config and the db schema
-DEFINE('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
-DEFINE('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
-// DEFINE('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
-// DEFINE('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
+define('DB_CONFIG_NAME', $SITE_CONFIG[HOST_NAME]['db_host']);
+define('DB_CONFIG', isset($DB_CONFIG[DB_CONFIG_NAME]) ? $DB_CONFIG[DB_CONFIG_NAME] : array());
+// define('DB_CONFIG_TARGET', SITE_CONFIG[$HOST_NAME]['db_host_target']);
+// define('DB_CONFIG_OTHER', SITE_CONFIG[$HOST_NAME]['db_host_other']);
 // override for login and global schemas
-// DEFINE('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
-// DEFINE('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
+// define('LOGIN_DB_SCHEMA', PUBLIC_SCHEMA); // where the edit* tables are
+// define('GLOBAL_DB_SCHEMA', PUBLIC_SCHEMA); // where global tables are that are used by all schemas (eg queue tables for online, etc)
 // debug settings, site lang, etc
-DEFINE('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
-DEFINE('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
-DEFINE('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
-DEFINE('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
+define('TARGET', $SITE_CONFIG[HOST_NAME]['location']);
+define('DEBUG', $SITE_CONFIG[HOST_NAME]['debug_flag']);
+define('SITE_LANG', $SITE_CONFIG[HOST_NAME]['site_lang']);
+define('LOGIN_ENABLED', $SITE_CONFIG[HOST_NAME]['login_enabled']);
 // paths
-// DEFINE('CSV_PATH', $PATHS[TARGET]['csv_path']);
-// DEFINE('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
-// DEFINE('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);
+// define('CSV_PATH', $PATHS[TARGET]['csv_path']);
+// define('EXPORT_SCRIPT', $PATHS[TARGET]['perl_bin']);
+// define('REDIRECT_URL', $PATHS[TARGET]['redirect_url']);

 // show all errors if debug_all & show_error_handling are enabled
-DEFINE('SHOW_ALL_ERRORS', true);
+define('SHOW_ALL_ERRORS', true);

 /************* GENERAL PAGE TITLE ********/
-DEFINE('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');
+define('G_TITLE', '<OVERALL FALLBACK PAGE TITLE>');

 /************ STYLE SHEETS / JS **********/
-DEFINE('ADMIN_STYLESHEET', 'edit.css');
-DEFINE('ADMIN_JAVASCRIPT', 'edit.js');
-DEFINE('STYLESHEET', 'frontend.css');
-DEFINE('JAVASCRIPT', 'frontend.js');
+define('ADMIN_STYLESHEET', 'edit.css');
+define('ADMIN_JAVASCRIPT', 'edit.js');
+define('STYLESHEET', 'frontend.css');
+define('JAVASCRIPT', 'frontend.js');

 // anything optional
 /************* INTERNAL ******************/
@@ -260,22 +263,6 @@ if (file_exists(BASE.CONFIGS.'config.other.php')) {
 	require BASE.CONFIGS.'config.other.php';
 }

-/************* CONVERT *******************/
-// this only needed if the external thumbnail create is used
-$paths = array(
-	'/bin',
-	'/usr/bin',
-	'/usr/local/bin'
-);
-// find convert
-foreach ($paths as $path) {
-	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
-		// image magick convert location
-		DEFINE('CONVERT', $path.DS.'convert');
-	}
-}
-unset($paths);
-
 /************* DEBUG *******************/
 // turn off debug if debug flag is OFF
 if (defined('DEBUG') && DEBUG == false) {
--- a/www/configs/config.other.php
+++ b/www/configs/config.other.php
@@ -9,4 +9,20 @@

 // DEFINE('SOME_ID', <SOME VALUE>);

+/************* CONVERT *******************/
+// this only needed if the external thumbnail create is used
+$paths = array(
+	'/bin',
+	'/usr/bin',
+	'/usr/local/bin'
+);
+// find convert
+foreach ($paths as $path) {
+	if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
+		// image magick convert location
+		DEFINE('CONVERT', $path.DS.'convert');
+	}
+}
+unset($paths);
+
 // __END__
--- a/www/includes/admin_header.php
+++ b/www/includes/admin_header.php
@@ -13,7 +13,6 @@ if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
 	include BASE.LIBS."Error.Handling.php";
 }
 // predefine vars
-$LANG = '';
 $messages = array();
 // import all POST vars
 // extract($_POST, EXTR_SKIP);
@@ -38,12 +37,6 @@ if (!isset($ZIP_STREAM)) {
 if (!isset($ENCODING) || !$ENCODING) {
 	$ENCODING = DEFAULT_ENCODING;
 }
-// set the default lang, if not given
-if (session_id() && isset($_SESSION['DEFAULT_LANG']) && $_SESSION['DEFAULT_LANG']) {
-	$LANG = $_SESSION['DEFAULT_LANG'];
-} else {
-	$LANG = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
-}
 // end the stop of the output flow, but only if we didn't request a csv file download
 if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE) {
 	header("Content-type: text/html; charset=".$ENCODING);
@@ -55,15 +48,11 @@ if ($AJAX_PAGE && !$ZIP_STREAM) {

 //------------------------------ class init start
 // login & page access check
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $LANG);
-// post login lang check
-if (isset($_SESSION['DEFAULT_LANG'])) {
-	$LANG = $_SESSION['DEFAULT_LANG'];
-}
+$login = new CoreLibs\ACL\Login(DB_CONFIG);
 // create smarty object
-$smarty = new CoreLibs\Template\SmartyExtend($LANG);
+$smarty = new CoreLibs\Template\SmartyExtend();
 // create new DB class
-$cms = new CoreLibs\Admin\Backend(DB_CONFIG, $LANG);
+$cms = new CoreLibs\Admin\Backend(DB_CONFIG);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
--- a/www/includes/edit_base.php
+++ b/www/includes/edit_base.php
@@ -36,23 +36,19 @@ if (!DEBUG)	{
 	$ECHO_ALL = 0;
 }

-// set default lang if not set otherwise
-if (!isset($lang)) {
-	$lang = DEFAULT_LANG;
-}
 // should be utf8
 header("Content-type: text/html; charset=".DEFAULT_ENCODING);
 ob_end_flush();
-$login = new CoreLibs\ACL\Login(DB_CONFIG, $lang);
+$login = new CoreLibs\ACL\Login(DB_CONFIG);

 // create form class
-$form = new CoreLibs\Output\Form\Generate(DB_CONFIG, $lang);
+$form = new CoreLibs\Output\Form\Generate(DB_CONFIG);
 if ($form->mobile_phone) {
 	echo "I am sorry, but this page cannot be viewed by a mobile phone";
 	exit;
 }
 // smarty template engine (extended Translation version)
-$smarty = new CoreLibs\Template\SmartyExtend($lang);
+$smarty = new CoreLibs\Template\SmartyExtend();

 // $form->debug('POST', $form->printAr($_POST));

@@ -274,38 +270,57 @@ if ($form->my_page_name == 'edit_order') {

 	$position = 0;
 	$menu_data = array();
-	for ($i = 1; $i <= count($menuarray); $i ++) {
+	// for ($i = 1; $i <= count($menuarray); $i ++) {
+	foreach ($menuarray as $i => $data) {
 		// do that for new array
-		$j = $i - 1;
-		$menu_data[$j]['pagename'] = htmlentities($menuarray[($i-1)]['page_name']);
-		$menu_data[$j]['filename'] = $menuarray[($i-1)]['filename'].(isset($menuarray[$j]['query_string']) ? $menuarray[$j]['query_string'] : '');
-		if ($i == 1 || !($j % $SPLIT_FACTOR)) {
-			$menu_data[$j]['splitfactor_in'] = 1;
+		$j = $i + 1;
+		$menu_data[$i]['pagename'] = htmlentities($data['page_name']);
+		$menu_data[$i]['filename'] =
+			// prefix folder or host name
+			(isset($data['hostname']) && $data['hostname'] ?
+				$data['hostname'] :
+				''
+			).
+			// filename
+			$data['filename'].
+			// query string
+			(isset($data['query_string']) && $data['query_string'] ?
+				$data['query_string'] :
+				''
+			);
+		if ($j == 1 || !($i % $SPLIT_FACTOR)) {
+			$menu_data[$i]['splitfactor_in'] = 1;
 		} else {
-			$menu_data[$j]['splitfactor_in'] = 0;
+			$menu_data[$i]['splitfactor_in'] = 0;
 		}
-		if ($menuarray[$j]['filename'] == $form->getPageName()) {
+		// on matching, we also need to check if we are in the same folder
+		if ($data['filename'] == $form->getPageName() &&
+			(!isset($data['hostname']) || (
+				isset($data['hostname']) &&
+					(!$data['hostname'] || strstr($data['hostname'], CONTENT_PATH) !== false)
+			))
+		) {
 			$position = $j;
-			$menu_data[$j]['position'] = 1;
-			$menu_data[$j]['popup'] = 0;
+			$menu_data[$i]['position'] = 1;
+			$menu_data[$i]['popup'] = 0;
 		} else {
 			// add query stuff
 			// HAS TO DONE LATER ... set urlencode, etc ...
 			// check if popup needed
-			if (isset($menuarray[$j]['popup']) && $menuarray[$j]['popup'] == 1) {
-				$menu_data[$j]['popup'] = 1;
-				$menu_data[$j]['rand'] = uniqid((string)rand());
-				$menu_data[$j]['width'] = $menuarray[$j]['popup_x'];
-				$menu_data[$j]['height'] = $menuarray[$j]['popup_y'];
+			if (isset($data['popup']) && $data['popup'] == 1) {
+				$menu_data[$i]['popup'] = 1;
+				$menu_data[$i]['rand'] = uniqid((string)rand());
+				$menu_data[$i]['width'] = $data['popup_x'];
+				$menu_data[$i]['height'] = $data['popup_y'];
 			} else {
-				$menu_data[$j]['popup'] = 0;
+				$menu_data[$i]['popup'] = 0;
 			}
-			$menu_data[$j]['position'] = 0;
+			$menu_data[$i]['position'] = 0;
 		} // highlight or not
-		if (!($i % $SPLIT_FACTOR) || (($i + 1) > count($menuarray))) {
-			$menu_data[$j]['splitfactor_out'] = 1;
+		if (!($j % $SPLIT_FACTOR) || (($j + 1) > count($menuarray))) {
+			$menu_data[$i]['splitfactor_out'] = 1;
 		} else {
-			$menu_data[$j]['splitfactor_out'] = 0;
+			$menu_data[$i]['splitfactor_out'] = 0;
 		}
 	} // for
 	// $form->debug('MENU ARRAY', $form->printAr($menu_data));
@@ -361,14 +376,35 @@ if ($form->my_page_name == 'edit_order') {
 				if (!isset($form->table_array['edit_page_id']['value'])) {
 					$q = "DELETE FROM temp_files";
 					$form->dbExec($q);
-					// gets all files in the current dir ending with .php
-					$crap = exec('ls *.php', $output, $status);
-					// now get all that are NOT in de DB
-					$q = "INSERT INTO temp_files VALUES ";
-					for ($i = 0; $i < count($output); $i ++) {
-						$t_q = "('".$form->dbEscapeString($output[$i])."')";
-						$form->dbExec($q.$t_q, 'NULL');
+					// gets all files in the current dir and dirs given ending with .php
+					$folders = array('../admin/', '../frontend/');
+					$files = array('*.php');
+					$search_glob = array();
+					foreach ($folders as $folder) {
+						// make sure this folder actually exists
+						if (is_dir(ROOT.$folder)) {
+							foreach ($files as $file) {
+								$search_glob[] = $folder.$file;
+							}
+						}
 					}
+					$crap = exec('ls '.join(' ', $search_glob), $output, $status);
+					// now get all that are NOT in de DB
+					$q = "INSERT INTO temp_files (folder, filename) VALUES ";
+					$t_q = '';
+					foreach ($output as $output_file) {
+						// split the ouput into folder and file
+						// eg ../admin/test.php is ../admin/ and test.php
+						preg_match("/([\.\/\w]+\/)+(\w+\.\w{1,})$/", $output_file, $matches);
+						// if named config.php, skip
+						if ($matches[2] != 'config.php') {
+							if ($t_q) {
+								$t_q .= ', ';
+							}
+							$t_q .= "('".$form->dbEscapeString($matches[1])."', '".$form->dbEscapeString($matches[2])."')";
+						}
+					}
+					$form->dbExec($q.$t_q, 'NULL');
 					$elements[] = $form->formCreateElement('filename');
 				} else {
 					// show file menu
@@ -376,6 +412,7 @@ if ($form->my_page_name == 'edit_order') {
 					$DATA['filename_exist'] = 1;
 					$DATA['filename'] = $form->table_array['filename']['value'];
 				} // File Name View IF
+				$elements[] = $form->formCreateElement('hostname');
 				$elements[] = $form->formCreateElement('name');
 				// $elements[] = $form->formCreateElement('tag');
 				// $elements[] = $form->formCreateElement('min_acl');
@@ -453,7 +490,7 @@ if (is_dir(BASE.TEMPLATES_C)) {
 if (is_dir(BASE.CACHE)) {
 	$smarty->setCacheDir(BASE.CACHE);
 }
-$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$lang, 'editAdmin_'.$lang);
+$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$smarty->lang, 'editAdmin_'.$smarty->lang);

 // debug output
 echo $login->printErrorMsg();
--- a/www/includes/table_arrays/array_edit_pages.php
+++ b/www/includes/table_arrays/array_edit_pages.php
@@ -12,11 +12,16 @@ $edit_pages = array(
 			'output_name' => 'Add File ...',
 			'mandatory' => 1,
 			'type' => 'drop_down_db',
-			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.filename AS name ".
+			'query' => "SELECT DISTINCT temp_files.filename AS id, temp_files.folder || temp_files.filename AS name ".
 				"FROM temp_files ".
 				"LEFT JOIN edit_page ep ON temp_files.filename = ep.filename ".
 				"WHERE ep.filename IS NULL"
 		),
+		'hostname' => array(
+			'value' => isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '',
+			'output_name' => 'Hostname or folder',
+			'type' => 'text'
+		),
 		'name' => array(
 			'value' => isset($GLOBALS['name']) ? $GLOBALS['name'] : '',
 			'output_name' => 'Page name',
@@ -107,7 +112,7 @@ $edit_pages = array(
 				// "ORDER BY order_number"
 		)
 	),
-	'load_query' => "SELECT edit_page_id, filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
+	'load_query' => "SELECT edit_page_id, CASE WHEN hostname IS NOT NULL THEN hostname ELSE ''::VARCHAR END || filename AS filename, name, online, menu, popup FROM edit_page ORDER BY order_number",
 	'table_name' => 'edit_page',
 	'show_fields' => array(
 		array(
--- a/www/layout/admin/javascript/firebug.js
+++ b/www/layout/admin/javascript/firebug.js
@@ -3,8 +3,9 @@
 * firebug 1.2+ and the webkit console */

 var ConsoleSetup = function() {
-	if (!window.console)
+	if (!window.console) {
 		window.console = {};
+	}

 	var names = ['log', 'debug', 'info', 'warn', 'error', 'assert', 'dir', 'dirxml', 'group', 'groupEnd', 'time', 'timeEnd', 'count', 'trace', 'profile', 'profileEnd'];

--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -115,10 +115,9 @@ class Login extends \CoreLibs\DB\IO
 	/**
 	 * constructor, does ALL, opens db, works through connection checks, closes itself
 	 * @param array  $db_config        db config array
-	 * @param string $lang             language string (default en_utf8)
 	 * @param int    $set_control_flag class variable check flags
 	 */
-	public function __construct(array $db_config, string $lang = 'en_utf8', int $set_control_flag = 0)
+	public function __construct(array $db_config, int $set_control_flag = 0)
 	{
 		// log login data for this class only
 		$this->log_per_class = 1;
@@ -151,7 +150,13 @@ class Login extends \CoreLibs\DB\IO
 		// set global is ajax page for if we show the data directly, or need to pass it back
 		// to the continue AJAX class for output back to the user
 		$this->login_is_ajax_page = isset($GLOBALS['AJAX_PAGE']) && $GLOBALS['AJAX_PAGE'] ? true : false;
-
+		// set the default lang
+		$lang = 'en_utf8';
+		if (session_id() && isset($_SESSION['DEFAULT_LANG']) && $_SESSION['DEFAULT_LANG']) {
+			$lang = $_SESSION['DEFAULT_LANG'];
+		} else {
+			$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+		}
 		$this->l = new \CoreLibs\Language\L10n($lang);

 		// if we have a search path we need to set it, to use the correct DB to login
@@ -173,44 +178,17 @@ class Login extends \CoreLibs\DB\IO
 		$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
-		if (!isset($_POST['login_login'])) {
-			$_POST['login_login'] = '';
-		}
-		if (!isset($_POST['login_username'])) {
-			$_POST['login_username'] = '';
-		}
-		if (!isset($_POST['login_password'])) {
-			$_POST['login_password'] = '';
-		}
-		if (!isset($_POST['login_logout'])) {
-			$_POST['login_logout'] = '';
-		}
-		if (!isset($_POST['change_password'])) {
-			$_POST['change_password'] = '';
-		}
-		if (!isset($_POST['pw_username'])) {
-			$_POST['pw_username'] = '';
-		}
-		if (!isset($_POST['pw_old_password'])) {
-			$_POST['pw_old_password'] = '';
-		}
-		if (!isset($_POST['pw_new_password'])) {
-			$_POST['pw_new_password'] = '';
-		}
-		if (!isset($_POST['pw_new_password_confirm'])) {
-			$_POST['pw_new_password_confirm'] = '';
-		}
 		// pass on vars to Object vars
-		$this->login = $_POST['login_login'];
-		$this->username = $_POST['login_username'];
-		$this->password = $_POST['login_password'];
-		$this->logout = $_POST['login_logout'];
+		$this->login = isset($_POST['login_login']) ? $_POST['login_login'] : '';
+		$this->username = isset($_POST['login_username']) ? $_POST['login_username'] : '';
+		$this->password = isset($_POST['login_password']) ? $_POST['login_password'] : '';
+		$this->logout = isset($_POST['login_logout']) ? $_POST['login_logout'] : '';
 		// password change vars
-		$this->change_password = $_POST['change_password'];
-		$this->pw_username = $_POST['pw_username'];
-		$this->pw_old_password = $_POST['pw_old_password'];
-		$this->pw_new_password = $_POST['pw_new_password'];
-		$this->pw_new_password_confirm = $_POST['pw_new_password_confirm'];
+		$this->change_password = isset($_POST['change_password']) ? $_POST['change_password'] : '';
+		$this->pw_username = isset($_POST['pw_username']) ? $_POST['pw_username'] : '';
+		$this->pw_old_password = isset($_POST['pw_old_password']) ? $_POST['pw_old_password'] : '';
+		$this->pw_new_password = isset($_POST['pw_new_password']) ? $_POST['pw_new_password'] : '';
+		$this->pw_new_password_confirm = isset($_POST['pw_new_password_confirm']) ? $_POST['pw_new_password_confirm'] : '';
 		// logout target (from config)
 		$this->logout_target = LOGOUT_TARGET;
 		// disallow user list for password change
@@ -367,7 +345,7 @@ class Login extends \CoreLibs\DB\IO
 	 * if user pressed login button this script is called, but only if there is no preview euid set]
 	 * @return void has not return
 	 */
-	private function loginLoginUser()
+	private function loginLoginUser(): void
 	{
 		// have to get the global stuff here for setting it later
 		if (!$this->euid && $this->login) {
@@ -456,7 +434,9 @@ class Login extends \CoreLibs\DB\IO
 							$pages = array();
 							$pages_acl = array();
 							// set pages access
-							$q = "SELECT ep.edit_page_id, ep.cuid, epca.cuid AS content_alias_uid, ep.filename, ep.name AS edit_page_name, ep.order_number AS edit_page_order, ep.menu, ";
+							$q = "SELECT ep.edit_page_id, ep.cuid, epca.cuid AS content_alias_uid, ";
+							$q .= "ep.hostname, ep.filename, ep.name AS edit_page_name, ";
+							$q .= "ep.order_number AS edit_page_order, ep.menu, ";
 							$q .= "ep.popup, ep.popup_x, ep.popup_y, ep.online, ear.level, ear.type ";
 							$q .= "FROM edit_page ep ";
 							$q .= "LEFT JOIN edit_page epca ON (epca.edit_page_id = ep.content_alias_edit_page_id)";
@@ -472,6 +452,7 @@ class Login extends \CoreLibs\DB\IO
 									'edit_page_id' => $res['edit_page_id'],
 									'cuid' => $res['cuid'],
 									'content_alias_uid' => $res['content_alias_uid'], // for reference of content data on a differen page
+									'hostname' => $res['hostname'],
 									'filename' => $res['filename'],
 									'page_name' => $res['edit_page_name'],
 									'order' => $res['edit_page_order'],
@@ -606,7 +587,7 @@ class Login extends \CoreLibs\DB\IO
 	 * for every page the user access this script checks if he is allowed to do so
 	 * @return bool permission okay as true/false
 	 */
-	public function loginCheckPermissions()
+	public function loginCheckPermissions(): bool
 	{
 		if ($this->euid && $this->login_error != 103) {
 			$q = "SELECT filename ";
@@ -632,7 +613,7 @@ class Login extends \CoreLibs\DB\IO
 	 * if a user pressed on logout, destroyes session and unsets all global vars
 	 * @return void has no return
 	 */
-	public function loginLogoutUser()
+	public function loginLogoutUser(): void
 	{
 		if ($this->logout || $this->login_error) {
 			// unregister and destroy session vars
@@ -692,7 +673,7 @@ class Login extends \CoreLibs\DB\IO
 	 * set all base ACL levels as a list keyword -> ACL number
 	 * @return void has no return
 	 */
-	private function loginSetAcl()
+	private function loginSetAcl(): void
 	{
 		// only set acl if we have permission okay
 		if ($this->permission_okay) {
@@ -785,8 +766,8 @@ class Login extends \CoreLibs\DB\IO

 	/**
 	 * checks if this edit access id is valid
-	 * @param  int $edit_access_id access id pk to check
-	 * @return bool                true/false: if the edit access is not in the valid list: false
+	 * @param  int|null $edit_access_id access id pk to check
+	 * @return bool                     true/false: if the edit access is not in the valid list: false
 	 */
 	public function loginCheckEditAccess($edit_access_id): bool
 	{
@@ -802,7 +783,7 @@ class Login extends \CoreLibs\DB\IO
 	 * @param  string $password the new password
 	 * @return bool             true or false if valid password or not
 	 */
-	private function loginPasswordChangeValidPassword($password)
+	private function loginPasswordChangeValidPassword($password): bool
 	{
 		$is_valid_password = true;
 		// check for valid in regex arrays in list
@@ -824,7 +805,7 @@ class Login extends \CoreLibs\DB\IO
 	 * dummy declare for password forget
 	 * @return void has no return
 	 */
-	private function loginPasswordForgot()
+	private function loginPasswordForgot(): void
 	{
 		// will do some password recovert, eg send email
 	}
@@ -850,7 +831,7 @@ class Login extends \CoreLibs\DB\IO
 	 * changes a user password
 	 * @return void has no return
 	 */
-	private function loginPasswordChange()
+	private function loginPasswordChange(): void
 	{
 		if ($this->change_password) {
 			$event = 'Password Change';
@@ -1032,7 +1013,7 @@ class Login extends \CoreLibs\DB\IO
 	 * checks if there are external templates, if not uses internal fallback ones
 	 * @return void has no return
 	 */
-	private function loginSetTemplates()
+	private function loginSetTemplates(): void
 	{
 		$strings = array(
 			'HTML_TITLE' => $this->l->__('LOGIN'),
@@ -1191,7 +1172,7 @@ EOM;
 	 * @param  string     $username login user username
 	 * @return void                 has no return
 	 */
-	private function writeLog(string $event, string $data, $error = '', string $username = '')
+	private function writeLog(string $event, string $data, $error = '', string $username = ''): void
 	{
 		if ($this->login) {
 				$this->action = 'Login';
@@ -1236,28 +1217,33 @@ EOM;
 	}

 	/**
-	 *checks that the given edit access id is valid for this user
-	 * @param  int $edit_access_id edit access id to check
-	 * @return int                 same edit access id if ok, or the default edit access id if given one is not valid
+	 * checks that the given edit access id is valid for this user
+	 * @param  int|null $edit_access_id edit access id to check
+	 * @return int|null                 same edit access id if ok
+	 *                                  or the default edit access id if given one is not valid
 	 */
-	public function loginCheckEditAccessId(int $edit_access_id)
+	public function loginCheckEditAccessId(?int $edit_access_id): ?int
 	{
-		if (!array_key_exists($edit_access_id, $_SESSION["UNIT"])) {
-			return $_SESSION["UNIT_DEFAULT"];
+		if (isset($_SESSION['UNIT']) &&
+			is_array($_SESSION['UNIT']) &&
+			!array_key_exists($edit_access_id, $_SESSION['UNIT'])
+		) {
+			return $_SESSION['UNIT_DEFAULT'];
 		} else {
 			return $edit_access_id;
 		}
 	}

 	/**
-	 * [loginSetEditAccessData description]
+	 * retunrn a set entry from the UNIT session for an edit access_id
+	 * if not found return false
 	 * @param  int        $edit_access_id edit access id
 	 * @param  string|int $data_key       key value to search for
 	 * @return bool|string                false for not found or string for found data
 	 */
 	public function loginSetEditAccessData(int $edit_access_id, $data_key)
 	{
-		if (!$_SESSION['UNIT'][$edit_access_id]['data'][$data_key]) {
+		if (!isset($_SESSION['UNIT'][$edit_access_id]['data'][$data_key])) {
 			return false;
 		} else {
 			return $_SESSION['UNIT'][$edit_access_id]['data'][$data_key];
--- a/www/lib/CoreLibs/Admin/Backend.php
+++ b/www/lib/CoreLibs/Admin/Backend.php
@@ -57,26 +57,25 @@ class Backend extends \CoreLibs\DB\IO
 	public $lang;
 	public $lang_short;
 	public $encoding;
+	// language
+	public $l;
 	// smarty publics [end processing in smarty class]
 	public $DATA;
 	public $HEADER;
 	public $DEBUG_DATA;
 	public $CONTENT_DATA;
-	// language
-	public $l;

 	// CONSTRUCTOR / DECONSTRUCTOR |====================================>
 	/**
 	 * main class constructor
 	 * @param array       $db_config        db config array
-	 * @param string      $lang             language string
 	 * @param int|integer $set_control_flag class variable check flag
 	 */
-	public function __construct(array $db_config, string $lang, int $set_control_flag = 0)
+	public function __construct(array $db_config, int $set_control_flag = 0)
 	{
 		$this->setLangEncoding();
 		// get the language sub class & init it
-		$this->l = new \CoreLibs\Language\L10n($lang);
+		$this->l = new \CoreLibs\Language\L10n($this->lang);

 		// init the database class
 		parent::__construct($db_config, $set_control_flag);
@@ -104,11 +103,9 @@ class Backend extends \CoreLibs\DB\IO

 	// INTERNAL METHODS |===============================================>

-
-	// PUBLIC METHODS |=================================================>
-
 	/**
 	 * set the language encoding and language settings
+	 * use $OVERRIDE_LANG to override all language settings
 	 * the default charset from _SESSION login or from
 	 * config DEFAULT ENCODING
 	 * the lang full name for mo loading from _SESSION login
@@ -116,7 +113,7 @@ class Backend extends \CoreLibs\DB\IO
 	 * creates short lang (only first two chars) from the lang
 	 * @return void
 	 */
-	public function setLangEncoding(): void
+	private function setLangEncoding(): void
 	{
 		// just emergency fallback for language
 		// set encoding
@@ -125,10 +122,14 @@ class Backend extends \CoreLibs\DB\IO
 		} else {
 			$this->encoding = DEFAULT_ENCODING;
 		}
-		// just emergency fallback for language
-		if (isset($_SESSION['DEFAULT_LANG'])) {
+		// gobal override
+		if (isset($GLOBALS['OVERRIDE_LANG'])) {
+			$this->lang = $GLOBALS['OVERRIDE_LANG'];
+		} elseif (isset($_SESSION['DEFAULT_LANG'])) {
+			// session (login)
 			$this->lang = $_SESSION['DEFAULT_LANG'];
 		} else {
+			// mostly default SITE LANG or DEFAULT LANG
 			$this->lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
 		}
 		// create the char lang encoding
@@ -137,6 +138,8 @@ class Backend extends \CoreLibs\DB\IO
 		$this->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH;
 	}

+	// PUBLIC METHODS |=================================================>
+
 	/**
 	 * set internal ACL from login ACL
 	 * @param array $acl login acl array
@@ -184,7 +187,7 @@ class Backend extends \CoreLibs\DB\IO
 		$q .= "VALUES ";
 		$q .= "(".$this->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ? $_SESSION['EUID'] : 'NULL').", ";
 		$q .= "NOW(), ";
-		$q .= "'".$this->dbEscapeString((string)$event)."', '".$data."', '".$data_binary."', '".$this->dbEscapeString($this->page_name)."', ";
+		$q .= "'".$this->dbEscapeString((string)$event)."', '".$data."', '".$data_binary."', '".$this->dbEscapeString((string)$this->page_name)."', ";
 		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
 		$q .= "'".$this->dbEscapeString(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '')."', ";
 		$q .= "'".$this->dbEscapeString(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : '')."', ";
@@ -206,42 +209,6 @@ class Backend extends \CoreLibs\DB\IO
 		$this->dbExec($q, 'NULL');
 	}

-	/**
-	 * helper function for PHP file upload error messgaes to messge string
-	 * @param  int    $error_code integer _FILE upload error code
-	 * @return string                     message string, translated
-	 */
-	public function fileUploadErrorMessage(int $error_code): string
-	{
-		switch ($error_code) {
-			case UPLOAD_ERR_INI_SIZE:
-				$message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini';
-				break;
-			case UPLOAD_ERR_FORM_SIZE:
-				$message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form';
-				break;
-			case UPLOAD_ERR_PARTIAL:
-				$message = 'The uploaded file was only partially uploaded';
-				break;
-			case UPLOAD_ERR_NO_FILE:
-				$message = 'No file was uploaded';
-				break;
-			case UPLOAD_ERR_NO_TMP_DIR:
-				$message = 'Missing a temporary folder';
-				break;
-			case UPLOAD_ERR_CANT_WRITE:
-				$message = 'Failed to write file to disk';
-				break;
-			case UPLOAD_ERR_EXTENSION:
-				$message = 'File upload stopped by extension';
-				break;
-			default:
-				$message = 'Unknown upload error';
-				break;
-		}
-		return $this->l->__($message);
-	}
-
 	/**
 	 * menu creater (from login menu session pages)
 	 * @param  int $flag visible flag trigger
@@ -266,13 +233,14 @@ class Backend extends \CoreLibs\DB\IO
 		// 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 ++) {
+		foreach ($pages as $i => $data) {
+		// for ($i = 0, $iMax = count($pages); $i < $iMax; $i ++) {
 			$show = 0;
 			// is it visible in the menu & is it online
-			if ($pages[$i]['menu'] && $pages[$i]['online']) {
+			if ($data['menu'] && $data['online']) {
 				// check if it falls into our flag if we have a flag
 				if ($flag) {
-					foreach ($pages[$i]['visible'] as $name => $key) {
+					foreach ($data['visible'] as $name => $key) {
 						if ($key == $flag) {
 							$show = 1;
 						}
@@ -284,40 +252,67 @@ class Backend extends \CoreLibs\DB\IO

 				if ($show) {
 					// if it is popup, write popup arrayound
-					if (isset($pages[$i]['popup']) && $pages[$i]['popup']) {
+					if (isset($data['popup']) && $data['popup']) {
 						$type = 'popup';
 					} else {
 						$type = 'normal';
-						$pages[$i]['popup'] = 0;
+						$data['popup'] = 0;
 					}
 					$query_string = '';
-					if (isset($pages[$i]['query']) && count($pages[$i]['query'])) {
-						for ($j = 0, $jMax = count($pages[$i]['query']); $j < $jMax; $j ++) {
-							if (strlen($query_string)) {
-								$query_string .= '&';
-							}
-							$query_string .= $pages[$i]['query'][$j]['name'].'=';
-							if (!$pages[$i]['query'][$j]['dynamic']) {
-								$query_string .= urlencode($pages[$i]['query'][$j]['value']);
-							} else {
-								$query_string .= $_GET[$pages[$i]['query'][$j]['value']] ? urlencode($_GET[$pages[$i]['query'][$j]['value']]) : urlencode($_POST[$pages[$i]['query'][$j]['value']]);
+
+					if (isset($data['query']) &&
+						is_array($data['query']) &&
+						count($data['query'])
+					) {
+						// for ($j = 0, $jMax = count($pages[$i]['query']); $j < $jMax; $j ++) {
+						foreach ($data['query'] as $j => $query) {
+							if (!empty($query['name']) &&
+								!empty($query['value'])
+							) {
+								if (strlen($query_string)) {
+									$query_string .= '&';
+								}
+								$query_string .= $query['name'].'=';
+								if (isset($query['dynamic']) &&
+									$query['dynamic']
+								) {
+									if (isset($_GET[$query['value']])) {
+										$query_string .= urlencode($_GET[$query['value']]);
+									} elseif (isset($_POST[$query['value']])) {
+										$query_string .= urlencode($_POST[$query['value']]);
+									}
+								} else {
+									$query_string .= urlencode($query['value']);
+								}
 							}
 						}
 					}
-					$url = $pages[$i]['filename'];
+					$url = '';
+					if (isset($data['hostname']) && $data['hostname']) {
+						$url .= $data['hostname'];
+					}
+					$url .= isset($data['filename']) ? $data['filename'] : '';
 					if (strlen($query_string)) {
 						$url .= '?'.$query_string;
 					}
-					$name = $pages[$i]['page_name'];
+					$name = isset($data['page_name']) ? $data['page_name'] : '';
 					// if page name matchs -> set selected flag
 					$selected = 0;
-					if ($this->getPageName() == $pages[$i]['filename']) {
+					if (isset($data['filename']) &&
+						$this->getPageName() == $data['filename'] &&
+						(!isset($data['hostname']) || (
+							isset($data['hostname']) &&
+								(!$data['hostname'] || strstr($data['hostname'], CONTENT_PATH) !== false)
+						))
+					) {
 						$selected = 1;
 						$this->page_name = $name;
 					}
 					// last check, is this menu point okay to show
 					$enabled = 0;
-					if ($this->adbShowMenuPoint($pages[$i]['filename'])) {
+					if (isset($data['filename']) &&
+						$this->adbShowMenuPoint($data['filename'])
+					) {
 						$enabled = 1;
 					}
 					// write in to view menu array
@@ -337,12 +332,15 @@ class Backend extends \CoreLibs\DB\IO

 	/**
 	 * checks if this filename is in the current situation (user id, etc) available
-	 * @param  string $filename filename
-	 * @return bool             true for visible/accessable menu point, false for not
+	 * @param  string|null $filename filename
+	 * @return bool                  true for visible/accessable menu point, false for not
 	 */
-	public function adbShowMenuPoint(string $filename): bool
+	public function adbShowMenuPoint(?string $filename): bool
 	{
 		$enabled = false;
+		if ($filename === null) {
+			return $enabled;
+		}
 		switch ($filename) {
 			default:
 				$enabled = true;
@@ -374,7 +372,7 @@ class Backend extends \CoreLibs\DB\IO
 	public function adbByteStringFormat($number): string
 	{
 		trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
-		return $this->byteStringFormat($number);
+		return $this->humanReadableByteFormat($number);
 	}

 	/**
--- a/www/lib/CoreLibs/Basic.php
+++ b/www/lib/CoreLibs/Basic.php
@@ -100,6 +100,10 @@ class Basic
 	// define check vars for the flags we can have
 	const CLASS_STRICT_MODE = 1;
 	const CLASS_OFF_COMPATIBLE_MODE = 2;
+	// define byteFormat
+	const BYTE_FORMAT_NOSPACE = 1;
+	const BYTE_FORMAT_ADJUST = 2;
+	const BYTE_FORMAT_SI = 4;
 	// control vars
 	/** @var bool compatible mode sets variable even if it is not defined */
 	private $set_compatible = true;
@@ -891,6 +895,42 @@ class Basic
 		return "<pre>".print_r($array, true)."</pre>";
 	}

+	/**
+	 * helper function for PHP file upload error messgaes to messge string
+	 * @param  int    $error_code integer _FILE upload error code
+	 * @return string                     message string, translated
+	 */
+	public function fileUploadErrorMessage(int $error_code): string
+	{
+		switch ($error_code) {
+			case UPLOAD_ERR_INI_SIZE:
+				$message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini';
+				break;
+			case UPLOAD_ERR_FORM_SIZE:
+				$message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form';
+				break;
+			case UPLOAD_ERR_PARTIAL:
+				$message = 'The uploaded file was only partially uploaded';
+				break;
+			case UPLOAD_ERR_NO_FILE:
+				$message = 'No file was uploaded';
+				break;
+			case UPLOAD_ERR_NO_TMP_DIR:
+				$message = 'Missing a temporary folder';
+				break;
+			case UPLOAD_ERR_CANT_WRITE:
+				$message = 'Failed to write file to disk';
+				break;
+			case UPLOAD_ERR_EXTENSION:
+				$message = 'File upload stopped by extension';
+				break;
+			default:
+				$message = 'Unknown upload error';
+				break;
+		}
+		return $message;
+	}
+
 	// ****** DEBUG/ERROR FUNCTIONS ******

 	// ****** RANDOM KEY GEN ******
@@ -1100,6 +1140,8 @@ class Basic
 			return "href=##QUOT##$_1$_2$_3##QUOT##";
 		} elseif ($atag) {
 			return $atag.$_2.$_3;
+		} else {
+			return $href;
 		}
 	}

@@ -1174,7 +1216,7 @@ class Basic
 	public static function getFilenameEnding(string $filename): string
 	{
 		$page_temp = pathinfo($filename);
-		return $page_temp['extension'];
+		return isset($page_temp['extension']) ? $page_temp['extension'] : '';
 	}

 	/**
@@ -1200,12 +1242,22 @@ class Basic
 			$path[] = $key_lookin;
 		} else {
 			foreach ($haystack as $key => $val) {
-				if (is_scalar($val) && $val === $needle && empty($key_lookin)) {
-					break;
-				} elseif (is_scalar($val) && !empty($key_lookin) && $key === $key_lookin && $val == $needle) {
+				if (is_scalar($val) &&
+					$val === $needle &&
+					empty($key_lookin)
+				) {
 					$path[] = $key;
 					break;
-				} elseif (is_array($val) && $path = Basic::arraySearchRecursive($needle, $val, $key_lookin)) {
+				} elseif (is_scalar($val) &&
+					!empty($key_lookin) &&
+					$key === $key_lookin &&
+					$val == $needle
+				) {
+					$path[] = $key;
+					break;
+				} elseif (is_array($val) &&
+					$path = Basic::arraySearchRecursive($needle, $val, $key_lookin)
+				) {
 					array_unshift($path, $key);
 					break;
 				}
@@ -1224,16 +1276,27 @@ class Basic
 	 */
 	public static function arraySearchRecursiveAll($needle, array $haystack, $key, $path = null): ?array
 	{
+		// init if not set on null
+		if ($path === null) {
+			$path = array(
+				'level' => 0,
+				'work' => array()
+			);
+		}
+		// init sub sets if not set
 		if (!isset($path['level'])) {
 			$path['level'] = 0;
 		}
 		if (!isset($path['work'])) {
 			$path['work'] = array();
 		}
+		// should not be needed because it would trigger a php mehtod error
 		if (!is_array($haystack)) {
 			$haystack = array();
 		}

+		// @phan HACK
+		$path['level'] = $path['level'] ?? 0;
 		// go through the array,
 		foreach ($haystack as $_key => $_value) {
 			if (is_scalar($_value) && $_value == $needle && !$key) {
@@ -1253,6 +1316,9 @@ class Basic
 				$path = Basic::arraySearchRecursiveAll($needle, $_value, $key, $path);
 			}
 		}
+		// @phan HACK
+		$path['level'] = $path['level'] ?? 0;
+		$path['work'] = $path['work'] ?? array();
 		// cut all that is >= level
 		array_splice($path['work'], $path['level']);
 		// step back a level
@@ -1344,6 +1410,21 @@ class Basic
 		return $merged;
 	}

+	/**
+	 * correct array_diff that does an actualy difference between two arrays.
+	 * array_diff only checks elements from A that are not in B, but not the
+	 * other way around.
+	 * Note that like array_diff this only checks first level values not keys
+	 * @param  array  $a array to compare a
+	 * @param  array  $b array to compare b
+	 * @return array     array with missing elements from a & b
+	 */
+	public static function arrayDiff(array $a, array $b): array
+	{
+		$intersect = array_intersect($a, $b);
+		return array_merge(array_diff($a, $intersect), array_diff($b, $intersect));
+	}
+
 	/**
 	 * search for the needle array elements in haystack and return the ones found as an array,
 	 * is there nothing found, it returns FALSE (boolean)
@@ -1481,6 +1562,31 @@ class Basic
 		return $array;
 	}

+	/**
+	 * get lines in a file
+	 * @param  string $file file for line count read
+	 * @return int          number of lines or -1 for non readable file
+	 */
+	public static function getLinesFromFile(string $file): int
+	{
+		if (is_file($file) &&
+			file_exists($file) &&
+			is_readable($file)
+		) {
+			$f = fopen($file, 'rb');
+			$lines = 0;
+			while (!feof($f)) {
+				$lines += substr_count(fread($f, 8192), "\n");
+			}
+			fclose($f);
+		} else {
+			// if file does not exist or is not readable, return -1
+			$lines = -1;
+		}
+		// return lines in file
+		return $lines;
+	}
+
 	/**
 	 * wrapper function for mb mime convert, for correct conversion with long strings
 	 * @param  string $string   string to encode
@@ -1517,20 +1623,117 @@ class Basic
 	}

 	/**
+	 * WRAPPER call to new humanReadableByteFormat
 	 * converts bytes into formated string with KB, MB, etc
-	 * @param  string|int|float $number bytes as string int or pure int
-	 * @param  bool             $space  true (default) to add space between number and suffix
+	 * @param  string|int|float $bytes  bytes as string int or pure int
+	 * @param  bool             $space  default true, to add space between number and suffix
+	 * @param  bool             $adjust default false, always print two decimals (sprintf)
+	 * @param  bool             $si     default false, if set to true, use 1000 for calculation
 	 * @return string                   converted byte number (float) with suffix
+	 * @deprecated Use humanReadableByteFormat instead
 	 */
-	public static function byteStringFormat($number, bool $space = true): string
+	public static function byteStringFormat($bytes, bool $space = true, bool $adjust = false, bool $si = false): string
 	{
-		if (is_numeric($number) && $number > 0) {
-			// labels in order of size
-			$labels = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB');
-			// calc file size, round down too two digits, add label based max change
-			return round((float)$number / pow(1024, ($i = floor(log((float)$number, 1024)))), 2).($space ? ' ' : '').(isset($labels[(int)$i]) ? $labels[(int)$i] : '>EB');
+		// trigger_error('Method '.__METHOD__.' is deprecated, use humanReadableByteFormat', E_USER_DEPRECATED);
+		$flags = 0;
+		// match over the true/false flags to the new int style flag
+		// if space need to set 1
+		if ($space === false) {
+			$flags |= self::BYTE_FORMAT_NOSPACE;
+		}
+		// if adjust need to set 2
+		if ($adjust === true) {
+			$flags |= self::BYTE_FORMAT_ADJUST;
+		}
+		// if si need to set 3
+		if ($si === true) {
+			$flags |= self::BYTE_FORMAT_SI;
+		}
+
+		// call
+		return self::humanReadableByteFormat($bytes, $flags);
+	}
+
+
+	/**
+	 * This function replaces the old byteStringFormat
+	 *
+	 * Converts any number string to human readable byte format
+	 * Maxium is Exobytes and above that the Exobytes suffix is used for all
+	 * If more are needed only the correct short name for the suffix has to be
+	 * added to the labels array
+	 * On no number string it returns string as is
+	 * Source Idea: SOURCE: https://programming.guide/worlds-most-copied-so-snippet.html
+	 *
+	 * The class itself hast the following defined
+	 * BYTE_FORMAT_NOSPACE [1] turn off spaces between number and extension
+	 * BYTE_FORMAT_ADJUST  [2] use sprintf to always print two decimals
+	 * BYTE_FORMAT_SI      [3] use si standard 1000 instead of bytes 1024
+	 * To use the constant from outside use $class::CONSTANT
+	 * @param  string|int|float $bytes bytes as string int or pure int
+	 * @param  int              $flags bitwise flag with use space turned on
+	 * @return string                  converted byte number (float) with suffix
+	 */
+	public static function humanReadableByteFormat($bytes, int $flags = 0): string
+	{
+		// if not numeric, return as is
+		if (is_numeric($bytes)) {
+			// flags bit wise check
+			// remove space between number and suffix
+			if ($flags & self::BYTE_FORMAT_NOSPACE) {
+				$space = false;
+			} else {
+				$space = true;
+			}
+			// use sprintf instead of round
+			if ($flags & self::BYTE_FORMAT_ADJUST) {
+				$adjust = true;
+			} else {
+				$adjust = false;
+			}
+			// use SI 1000 mod and not 1024 mod
+			if ($flags & self::BYTE_FORMAT_SI) {
+				$si = true;
+			} else {
+				$si = false;
+			}
+
+			// si or normal
+			$unit = $si ? 1000 : 1024;
+			// always positive
+			$abs_bytes = $bytes == PHP_INT_MIN ? PHP_INT_MAX : abs($bytes);
+			// smaller than unit is always B
+			if ($abs_bytes < $unit) {
+				return $bytes.'B';
+			}
+			// labels in order of size [Y, Z]
+			$labels = array('', 'K', 'M', 'G', 'T', 'P', 'E');
+			// exp position calculation
+			$exp = floor(log($abs_bytes, $unit));
+			// avoid printing out anything larger than max labels
+			if ($exp >= count($labels)) {
+				$exp = count($labels) - 1;
+			}
+			// deviation calculation
+			$dev = pow($unit, $exp) * ($unit - 0.05);
+			// shift the exp +1 for on the border units
+			if ($exp < 6 &&
+				$abs_bytes > ($dev - (((int)$dev & 0xfff) == 0xd00 ? 52 : 0))
+			) {
+				$exp ++;
+			}
+			// label name, including leading space if flagged
+			$pre = ($space ? ' ' : '').(isset($labels[$exp]) ? $labels[$exp] : '>E').($si ? 'i' : '').'B';
+			$bytes_calc = $abs_bytes / pow($unit, $exp);
+			if ($adjust) {
+				return sprintf("%.2f%sB", $bytes_calc, $pre);
+			} else {
+				return round($bytes_calc, 2).$pre;
+			}
+		} else {
+			// if anything other return as string
+			return (string)$bytes;
 		}
-		return (string)$number;
 	}

 	/**
@@ -1615,26 +1818,33 @@ class Basic
 	{
 		// check if the timestamp has any h/m/s/ms inside, if yes skip
 		if (!preg_match("/(h|m|s|ms)/", (string)$timestamp)) {
-			$ms = 0;
-			list ($timestamp, $ms) = explode('.', (string)round($timestamp, 4));
+			list ($timestamp, $ms) = array_pad(explode('.', (string)round($timestamp, 4)), 2, null);
 			$timegroups = array(86400, 3600, 60, 1);
 			$labels = array('d', 'h', 'm', 's');
 			$time_string = '';
-			for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i ++) {
-				$output = floor((float)$timestamp / $timegroups[$i]);
-				$timestamp = (float)$timestamp % $timegroups[$i];
-				// output has days|hours|min|sec
-				if ($output || $time_string) {
-					$time_string .= $output.$labels[$i].(($i + 1) != count($timegroups) ? ' ' : '');
+			// if timestamp is zero, return zero string
+			if ($timestamp == 0) {
+				$time_string = '0s';
+			} else {
+				for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i ++) {
+					$output = floor((float)$timestamp / $timegroups[$i]);
+					$timestamp = (float)$timestamp % $timegroups[$i];
+					// output has days|hours|min|sec
+					if ($output || $time_string) {
+						$time_string .= $output.$labels[$i].(($i + 1) != count($timegroups) ? ' ' : '');
+					}
 				}
 			}
-			// if we have ms and it has leading zeros, remove them
-			$ms = preg_replace("/^0+/", '', $ms);
-			// add ms if there
-			if ($show_micro) {
-				$time_string .= ' '.(!$ms ? 0 : $ms).'ms';
-			} elseif (!$time_string) {
-				$time_string .= (!$ms ? 0 : $ms).'ms';
+			// only add ms if we have an ms value
+			if ($ms !== null) {
+				// if we have ms and it has leading zeros, remove them, but only if it is nut just 0
+				$ms = preg_replace("/^0+(\d+)$/", '${1}', $ms);
+				// add ms if there
+				if ($show_micro) {
+					$time_string .= ' '.(!$ms ? 0 : $ms).'ms';
+				} elseif (!$time_string) {
+					$time_string .= (!$ms ? 0 : $ms).'ms';
+				}
 			}
 		} else {
 			$time_string = $timestamp;
@@ -1703,7 +1913,7 @@ class Basic
 		if (!$datetime) {
 			return false;
 		}
-		list ($year, $month, $day, $hour, $min, $sec) = preg_split("/[\/\- :]/", $datetime);
+		list ($year, $month, $day, $hour, $min, $sec) = array_pad(preg_split("/[\/\- :]/", $datetime), 6, null);
 		if (!$year || !$month || !$day) {
 			return false;
 		}
@@ -2743,7 +2953,11 @@ class Basic
 			$HUE += 360;
 		}

-		return array(round($HUE), round((($MAX - $MIN) / $MAX) * 100), round($MAX * 100));
+		return array(
+			(int)round($HUE),
+			(int)round((($MAX - $MIN) / $MAX) * 100),
+			(int)round($MAX * 100)
+		);
 	}

 	/**
@@ -2814,7 +3028,11 @@ class Basic
 				$blue = 0;
 		}

-		return array(round($red * 255), round($green * 255), round($blue * 255));
+		return array(
+			(int)round($red * 255),
+			(int)round($green * 255),
+			(int)round($blue * 255)
+		);
 	}

 	/**
@@ -2861,7 +3079,11 @@ class Basic

 			// H, S, L
 			// S= L <= 0.5 ? C/2L : C/2 - 2L
-			return array(round($HUE), round((($MAX - $MIN) / (($L <= 0.5) ? ($MAX + $MIN) : (2 - $MAX - $MIN))) * 100), $L);
+			return array(
+				(int)round($HUE),
+				(int)round((($MAX - $MIN) / (($L <= 0.5) ? ($MAX + $MIN) : (2 - $MAX - $MIN))) * 100),
+				(int)$L
+			);
 		}
 	}

@@ -2899,7 +3121,11 @@ class Basic
 				return $m1;
 			};

-			return array(round(255 * $hue($h + (1 / 3))), round(255 * $hue($h)), round(255 * $hue($h - (1 / 3))));
+			return array(
+				(int)round(255 * $hue($h + (1 / 3))),
+				(int)round(255 * $hue($h)),
+				(int)round(255 * $hue($h - (1 / 3)))
+			);
 		}
 	}

@@ -3054,10 +3280,10 @@ class Basic

 	/**
 	 * full wrapper for html entities
-	 * @param  string $string string to html encode
-	 * @return mixed  if string, encoded, else as is
+	 * @param  mixed $string string to html encode
+	 * @return mixed         if string, encoded, else as is (eg null)
 	 */
-	public function htmlent(string $string)
+	public function htmlent($string)
 	{
 		if (is_string($string)) {
 			return htmlentities($string, ENT_COMPAT|ENT_HTML401, 'UTF-8', false);
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -321,7 +321,7 @@ class IO extends \CoreLibs\Basic
 		$this->db_user = $db_config['db_user'] ?? '';
 		$this->db_pwd = $db_config['db_pass'] ?? '';
 		$this->db_host = $db_config['db_host'] ?? '';
-		$this->db_port = !empty($db_config['db_port']) ? $db_config['db_port'] : '5432';
+		$this->db_port = !empty($db_config['db_port']) ? $db_config['db_port'] : 5432;
 		$this->db_schema = !empty($db_config['db_schema']) ? $db_config['db_schema'] : ''; // do not set to 'public' if not set, because the default is already public
 		$this->db_encoding = !empty($db_config['db_encoding']) ? $db_config['db_encoding'] : '';
 		$this->db_type = $db_config['db_type'] ?? '';
@@ -957,6 +957,28 @@ class IO extends \CoreLibs\Basic
 		return $this->dbReturnRow('SHOW client_encoding')['client_encoding'];
 	}

+	/**
+	 * get certain settings like username, db name
+	 * @param  string $name what setting to query
+	 * @return mixed        setting value, if not allowed name return false
+	 */
+	public function dbGetSetting(string $name)
+	{
+		$setting = '';
+		switch ($name) {
+			case 'name':
+				$setting = $this->db_name;
+				break;
+			case 'user':
+				$setting = $this->db_user;
+				break;
+			default:
+				$setting = false;
+				break;
+		}
+		return $setting;
+	}
+
 	/**
 	 * prints out status info from the connected DB (might be usefull for debug stuff)
 	 * @param  bool|boolean $show show db connection info, default true
@@ -1462,7 +1484,7 @@ class IO extends \CoreLibs\Basic
 					if (!$pk_name) {
 						// read the primary key from the table, if we do not have one, we get nothing in return
 						list($schema, $table) = $this->__dbReturnTable($query);
-						if (!$this->pk_name_table[$table]) {
+						if (empty($this->pk_name_table[$table])) {
 							$this->pk_name_table[$table] = $this->db_functions->__dbPrimaryKey($table, $schema);
 						}
 						$pk_name = $this->pk_name_table[$table];
@@ -1779,16 +1801,30 @@ class IO extends \CoreLibs\Basic
 				'row' => $table.'_id',
 				'value' => $primary_key
 			);
-		} elseif (!isset($primary_key['value'])) {
-			$primary_key['value'] = '';
+		} else {
+			if (!isset($primary_key['row'])) {
+				$primary_key['row'] = '';
+			}
+			if (!isset($primary_key['value'])) {
+				$primary_key['value'] = '';
+			}
 		}
 		// var set for strings
 		$q_sub_value = '';
 		$q_sub_data = '';
 		// get the table layout and row types
 		$table_data = $this->dbShowTableMetaData(($this->db_schema ? $this->db_schema.'.' : '').$table);
+		// @phan HACK
+		$primary_key['value'] = $primary_key['value'] ?? '';
+		$primary_key['row'] = $primary_key['row'] ?? '';
+		// loop through the write array and each field to build the query
 		foreach ($write_array as $field) {
-			if ((!$primary_key['value'] || ($primary_key['value'] && !in_array($field, $not_write_update_array))) && !in_array($field, $not_write_array)) {
+			if ((!$primary_key['value'] ||
+					($primary_key['value'] &&
+					!in_array($field, $not_write_update_array))
+				) &&
+				!in_array($field, $not_write_array)
+			) {
 				// data from external or data field
 				$_data = null;
 				if (count($data) >= 1 && array_key_exists($field, $data)) {
@@ -1842,7 +1878,7 @@ class IO extends \CoreLibs\Basic
 		}

 		// first work contact itself (we need contact id for everything else)
-		if ($primary_key['value']) {
+		if ($primary_key['value'] && $primary_key['row']) {
 			$q = 'UPDATE '.$table.' SET ';
 			$q .= $q_sub_data.' ';
 			$q .= 'WHERE '.$primary_key['row'].' = '.$primary_key['value'];
@@ -1861,8 +1897,8 @@ class IO extends \CoreLibs\Basic
 		if (!$primary_key['value']) {
 			$primary_key['value'] = $this->insert_id;
 		}
-
-		return $primary_key['value'];
+		// if there is not priamry key value field return false
+		return isset($primary_key['value']) ? $primary_key['value'] : false;
 	}

 	/**
--- a/www/lib/CoreLibs/Output/Form/Generate.php
+++ b/www/lib/CoreLibs/Output/Form/Generate.php
@@ -242,6 +242,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	public $security_level;
 	// layout publics
 	public $table_width;
+	// internal lang & encoding vars
+	public $lang_dir = '';
+	public $lang;
+	public $lang_short;
+	public $encoding;
 	// language
 	public $l;

@@ -251,15 +256,15 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	/**
 	 * construct form generator
 	 * @param array       $db_config        db config array
-	 * @param string      $lang             interface language
 	 * @param int|integer $table_width      table/div width (default 750)
 	 * @param int|integer $set_control_flag basic class set/get variable error flags
 	 */
-	public function __construct(array $db_config, string $lang, int $table_width = 750, int $set_control_flag = 0)
+	public function __construct(array $db_config, int $table_width = 750, int $set_control_flag = 0)
 	{
 		$this->my_page_name = $this->getPageName(1);
+		$this->setLangEncoding();
 		// init the language class
-		$this->l = new \CoreLibs\Language\L10n($lang);
+		$this->l = new \CoreLibs\Language\L10n($this->lang);
 		// load config array
 		// get table array definitions for current page name
 		// WARNING: auto spl load does not work with this as it is an array and not a function/object
@@ -323,18 +328,28 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$this->base_acl_level = isset($_SESSION['BASE_ACL_LEVEL']) ? $_SESSION['BASE_ACL_LEVEL'] : 0;
 		// security levels for buttons/actions
 		// if array does not exists create basic
-		if (!isset($config_array['security_level']) || !is_array($config_array['security_level']) ||
-			(is_array($config_array['security_level']) && count($config_array['security_level']) < 4)
+		if (!isset($config_array['security_level']) ||
+			(isset($config_array['security_level']) &&
+				(!is_array($config_array['security_level']) ||
+				(is_array($config_array['security_level']) && count($config_array['security_level']) < 4))
+			)
 		) {
-			$config_array['security_level'] = array(
+			$this->security_level = array(
 				'load' => 100,
 				'new' => 100,
 				'save' => 100,
 				'delete' => 100
 			);
+		} else {
+			// write array to class var
+			$this->security_level = isset($config_array['security_level']) ?
+				$config_array['security_level'] :
+				array('load' => 100,
+					'new' => 100,
+					'save' => 100,
+					'delete' => 100
+				);
 		}
-		// write array to class var
-		$this->security_level = $config_array['security_level'];
 	}

 	/**
@@ -348,6 +363,45 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		parent::__destruct();
 	}

+	// INTERNAL METHODS |===============================================>
+
+	/**
+	 * ORIGINAL in \CoreLibs\Admin\Backend
+	 * set the language encoding and language settings
+	 * the default charset from _SESSION login or from
+	 * config DEFAULT ENCODING
+	 * the lang full name for mo loading from _SESSION login
+	 * or SITE LANG or DEFAULT LANG from config
+	 * creates short lang (only first two chars) from the lang
+	 * @return void
+	 */
+	private function setLangEncoding(): void
+	{
+		// just emergency fallback for language
+		// set encoding
+		if (isset($_SESSION['DEFAULT_CHARSET'])) {
+			$this->encoding = $_SESSION['DEFAULT_CHARSET'];
+		} else {
+			$this->encoding = DEFAULT_ENCODING;
+		}
+		// gobal override
+		if (isset($GLOBALS['OVERRIDE_LANG'])) {
+			$this->lang = $GLOBALS['OVERRIDE_LANG'];
+		} elseif (isset($_SESSION['DEFAULT_LANG'])) {
+			// session (login)
+			$this->lang = $_SESSION['DEFAULT_LANG'];
+		} else {
+			// mostly default SITE LANG or DEFAULT LANG
+			$this->lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+		}
+		// create the char lang encoding
+		$this->lang_short = substr($this->lang, 0, 2);
+		// set the language folder
+		$this->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH;
+	}
+
+	// PUBLIC METHODS |=================================================>
+
 	/**
 	 * dumps all values into output (for error msg)
 	 * @return string full table array data output as string html formatted
@@ -442,7 +496,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 */
 	public function formProcedureLoad(string $archive_id): void
 	{
-		if ($this->archive && $archive_id && $this->base_acl_level >= $this->security_level['load']) {
+		if (isset($this->security_level['load']) &&
+			$this->archive &&
+			$archive_id &&
+			$this->base_acl_level >= $this->security_level['load']
+		) {
 			$this->formLoadTableArray($archive_id);
 			$this->yes = 1;
 		}
@@ -454,7 +512,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 */
 	public function formProcedureNew(): void
 	{
-		if ($this->new && $this->base_acl_level >= $this->security_level['new']) {
+		if (isset($this->security_level['new']) &&
+			$this->new &&
+			$this->base_acl_level >= $this->security_level['new']
+		) {
 			if ($this->really_new == 'yes') {
 				$this->formUnsetTablearray();
 			} else {
@@ -471,7 +532,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 */
 	public function formProcedureSave(): void
 	{
-		if ($this->save && $this->base_acl_level >= $this->security_level['save']) {
+		if (isset($this->security_level['save']) &&
+			$this->save &&
+			$this->base_acl_level >= $this->security_level['save']
+		) {
 			$this->formErrorCheck();
 			if (!$this->error) {
 				$this->formSaveTableArray();
@@ -487,7 +551,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	public function formProcedureDelete(): void
 	{
 		// delete is also by 'protected'
-		if ($this->delete && $this->base_acl_level >= $this->security_level['delete']) {
+		if (isset($this->security_level['delete']) &&
+			$this->delete &&
+			$this->base_acl_level >= $this->security_level['delete']
+		) {
 			if (isset($this->table_array['protected']['value']) && $this->table_array['protected']['value']) {
 				$this->msg .= $this->l->__('Cannot delete this Dataset, because it is internaly protected!');
 				$this->error = 2;
@@ -510,11 +577,13 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 */
 	public function formProcedureDeleteFromElementList(array $element_list, array $remove_name): void
 	{
+		/** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
 		$this->debug('REMOVE ELEMENT', 'Remove REF ELEMENT: '.$this->base_acl_level.' >= '.$this->security_level['delete']);
 		$this->debug('REMOVE ELEMENT', 'Protected Value set: '.(string)isset($this->table_array['protected']['value']));
 		$this->debug('REMOVE ELEMENT', 'Error: '.$this->error);
 		// only do if the user is allowed to delete
-		if ($this->base_acl_level >= $this->security_level['delete'] &&
+		if (isset($this->security_level['delete']) &&
+			$this->base_acl_level >= $this->security_level['delete'] &&
 			(!isset($this->table_array['protected']['value']) ||
 			(isset($this->table_array['protected']['value']) && !$this->table_array['protected']['value'])) &&
 			!$this->error
@@ -597,7 +666,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$pk_names = array();
 		$pk_ids = array();
 		// when security level is okay ...
-		if ($this->base_acl_level >= $this->security_level['load']) {
+		if (isset($this->security_level['load']) &&
+			$this->base_acl_level >= $this->security_level['load']
+		) {
 			$t_pk_name = $this->archive_pk_name;

 			// load list data
@@ -610,17 +681,24 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					$pk_selected = $res[$this->int_pk_name];
 				}
 				$t_string = '';
-				for ($i = 0, $i_max = count($this->field_array); $i < $i_max; $i ++) {
+				foreach ($this->field_array as $i => $field_array) {
 					if ($t_string) {
 						$t_string .= ', ';
 					}
-					if (isset($this->field_array[$i]['before_value'])) {
-						$t_string .= $this->field_array[$i]['before_value'];
+					if (isset($field_array['before_value'])) {
+						$t_string .= $field_array['before_value'];
 					}
-					if (isset($this->field_array[$i]['binary'])) {
-						$t_string .= ($res[$this->field_array[$i]['name']]) ? $this->field_array[$i]['binary'][0] : $this->field_array[$i]['binary'][1];
-					} else {
-						$t_string .= $res[$this->field_array[$i]['name']];
+					// must have res element set
+					if (isset($res[$field_array['name']])) {
+						if (isset($field_array['binary'])) {
+							if (isset($field_array['binary'][0])) {
+								$t_string .= $field_array['binary'][0];
+							} elseif (isset($field_array['binary'][1])) {
+								$t_string .= $field_array['binary'][1];
+							}
+						} else {
+							$t_string .= $res[$field_array['name']];
+						}
 					}
 				}
 				$pk_names[] = $t_string;
@@ -644,7 +722,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$show_checkbox = 0;
 		$new_name = '';
 		// when security level is okay
-		if ($this->base_acl_level >= $this->security_level['new']) {
+		if (isset($this->security_level['new']) &&
+			$this->base_acl_level >= $this->security_level['new']
+		) {
 			if ($this->yes && !$hide_new_checkbox) {
 				$show_checkbox = 1;
 			}
@@ -675,7 +755,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		$pk_value = '';
 		$show_delete = 0;
 		$old_school_hidden = 0;
-		if ($this->base_acl_level >= $this->security_level['save'] || $this->base_acl_level >= $this->security_level['delete']) {
+		if ((isset($this->security_level['save']) &&
+				$this->base_acl_level >= $this->security_level['save']) ||
+			(isset($this->security_level['delete']) &&
+				$this->base_acl_level >= $this->security_level['delete'])
+		) {
 			$old_school_hidden = 0;
 			if ($this->base_acl_level >= $this->security_level['save']) {
 				$seclevel_okay = 1;
@@ -899,7 +983,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$data['value'] = isset($this->table_array[$element_name]['value']) ? $this->table_array[$element_name]['value'] : 0;
 			$data['col_name'] = $this->col_name;
 			$data['table_name'] = $this->table_name;
-			$data['query'] = urlencode($query);
+			$data['query'] = $query !== null ? urlencode($query) : '';
 		}
 		// file upload
 		if ($this->table_array[$element_name]['type'] == 'file') {
@@ -1590,13 +1674,28 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					$q = '';
 					// skip empty or not fully filled rows
 					if (isset($no_write[$i]) && !$no_write[$i]) {
+						if (!isset($q_begin[$i])) {
+							$q_begin[$i] = '';
+						}
+						if (!isset($q_end[$i])) {
+							$q_end[$i] = '';
+						}
 						// if tpye is update
-						if ($type[$i] == 'update') {
-							$q = $q_begin[$i].$q_data[$i].$q_end[$i];
+						if (isset($type[$i]) && $type[$i] == 'update') {
+							$q = $q_begin[$i].
+								(isset($q_data[$i]) ? $q_data[$i] : '').
+								$q_end[$i];
 						// or if we have block write, then it is insert (new)
 						} elseif (isset($block_write[$i]) && $block_write[$i]) {
-							$q = $q_begin[$i].$q_names[$i].', '.$this->int_pk_name.$q_middle[$i].$q_values[$i].', '.$this->table_array[$this->int_pk_name]['value'].$q_end[$i];
+							$q = $q_begin[$i].
+								(isset($q_names[$i]) ? $q_names[$i] : '').', '.
+								$this->int_pk_name.
+								(isset($q_middle[$i]) ? $q_middle[$i] : '').
+								(isset($q_values[$i]) ? $q_values[$i] : '').', '.
+								$this->table_array[$this->int_pk_name]['value'].
+								$q_end[$i];
 						}
+						/** @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset */
 						$this->debug('edit', 'Pos['.$i.'] => '.$type[$i].' Q: '.$q.'<br>');
 						// write the dataset
 						if ($q) {
@@ -1724,7 +1823,23 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 	 */
 	public function formCreateElementListTable(string $table_name): array
 	{
-		$data = array();
+		// init data rray
+		$data = array(
+			'delete_name' => '',
+			'delete' => 0,
+			'enable_name' => '',
+			'prefix' => '',
+			'pk_name' => '',
+			'fk_name' => '',
+			'type' => array(),
+			'output_name' => array(),
+			'preset' => array(),
+			'element_list' => array(),
+			'output_data' => array(),
+			'content' => array(),
+			'pos' => array(),
+			'table_name' => $table_name // sub table name
+		);
 		// output name for the viewable left table td box, prefixed with * if mandatory
 		$output_name = $this->element_list[$table_name]['output_name'];
 		if (isset($this->element_list[$table_name]['mandatory']) &&
@@ -1735,8 +1850,6 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		// delete button name, if there is one set
 		if (isset($this->element_list[$table_name]['delete_name'])) {
 			$data['delete_name'] = $this->element_list[$table_name]['delete_name'];
-		} else {
-			$data['delete_name'] = '';
 		}
 		// set the enable checkbox for delete, if the delete flag is given if there is one
 		if (isset($this->element_list[$table_name]['enable_name'])) {
@@ -1744,17 +1857,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			if (isset($this->element_list[$table_name]['delete'])) {
 				$data['delete'] = 1;
 			}
-		} else {
-			$data['enable_name'] = '';
 		}
 		// prefix for the elements, to not collide with names in the master set
 		if (isset($this->element_list[$table_name]['prefix'])) {
 			$data['prefix'] = $this->element_list[$table_name]['prefix'].'_';
-		} else {
-			$data['prefix'] = '';
 		}
-		// the sub data table name
-		$data['table_name'] = $table_name;

 		// build the select part
 		if (!isset($this->element_list[$table_name]['elements']) || !is_array($this->element_list[$table_name]['elements'])) {
@@ -1788,10 +1895,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			if (isset($data_array['type']) && $data_array['type'] == 'drop_down_db') {
 				$md_q = md5($data_array['query']);
 				while ($res = $this->dbReturn($data_array['query'])) {
+					/** @phan-suppress-next-line PhanTypeInvalidDimOffset */
 					$this->debug('edit', 'Q['.$md_q.'] pos: '.$this->cursor_ext[$md_q]['pos'].' | want: '.(isset($data_array['preset']) ? $data_array['preset'] : '-').' | set: '.(isset($data['preset'][$el_name]) ? $data['preset'][$el_name] : '-'));
 					// first is default for this element
 					if (isset($data_array['preset']) &&
-						(!isset($data['preset'][$el_name]) || (isset($data['preset'][$el_name]) && !$data['preset'][$el_name])) &&
+						(!isset($data['preset'][$el_name]) || empty($data['preset'][$el_name])) &&
 						($this->cursor_ext[$md_q]['pos'] == $data_array['preset'])
 					) {
 						$data['preset'][$el_name] = $res[0];
@@ -1840,6 +1948,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 					array_unshift($q_select, $read_name);
 				}
 			}
+			// @phan HACK
+			$data['prefix'] = $data['prefix'] ?? '';
 			// set the rest of the data so we can print something out
 			$data['type'][$data['prefix'].$this->element_list[$table_name]['read_data']['name']] = 'string';
 			// build the read query
@@ -1864,7 +1974,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 		} else {
 			// only create query if we have a primary key
 			// reads directly from the reference table
-			if (isset($this->table_array[$this->int_pk_name]['value'])) {
+			if (isset($this->table_array[$this->int_pk_name]['value']) &&
+				$this->table_array[$this->int_pk_name]['value']
+			) {
 				$q = 'SELECT '.implode(', ', $q_select).' FROM '.$table_name.' WHERE '.$this->int_pk_name.' = '.$this->table_array[$this->int_pk_name]['value'];
 			}
 		}
@@ -1875,7 +1987,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			// read out the list and add the selected data if needed
 			while ($res = $this->dbReturn($q)) {
 				$_data = array();
-				$prfx = $data['prefix']; // short
+				$prfx = $data['prefix'] ?? ''; // short
 				// go through each res
 				for ($i = 0, $i_max = count($q_select); $i < $i_max; $i ++) {
 					// query select part, set to the element name
@@ -1923,15 +2035,23 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 			$missing_empty_count = $this->element_list[$table_name]['max_empty'] - $element_count;
 			$this->debug('CFG MAX', 'Max empty: '.$this->element_list[$table_name]['max_empty'].', Missing: '.$missing_empty_count.', Has: '.$element_count);
 			// set if we need more open entries or if we do not have any entries yet
-			if (($missing_empty_count < $this->element_list[$table_name]['max_empty']) || $element_count == 0) {
+			if (($missing_empty_count < $this->element_list[$table_name]['max_empty']) ||
+				$element_count == 0
+			) {
 				for ($pos = $element_count, $pos_max = $this->element_list[$table_name]['max_empty'] + $element_count; $pos <= $pos_max; $pos ++) {
 					$_data = array();
+					// just in case
+					if (!isset($data['type'])) {
+						$data['type'] = array();
+					}
 					// the fields that need to be filled are in data->type array:
 					// pk fields are unfilled
 					// fk fields are filled with the fk_id 'int_pk_name' value
 					foreach ($data['type'] as $el_name => $type) {
 						$_data[$el_name] = '';
-						if ($el_name == $data['pk_name']) {
+						if (isset($data['pk_name']) &&
+							$el_name == $data['pk_name']
+						) {
 							// do nothing for pk name
 						} elseif (isset($data['fk_name']) &&
 							$el_name == $data['fk_name'] &&
@@ -1941,8 +2061,11 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
 						}
 					}
 					$data['content'][] = $_data;
-					$data['pos'][] = array(0 => $pos); // this is for the checkboxes
-					// $this->debug('CFG ELEMENT LIST FILL', 'Pos: '.$pos.'/'.$pos_max.', Content: '.count($data['content']).', Pos: '.count($data['pos']));
+					// this is for the checkboxes
+					$data['pos'][] = array(
+						0 => $pos
+					);
+					$this->debug('CFG ELEMENT LIST FILL', 'Pos: '.$pos.'/'.$pos_max.', Content: '.count($data['content']).', Pos: '.count($data['pos']));
 				}
 			}
 		}
--- a/www/lib/CoreLibs/Output/Progressbar.php
+++ b/www/lib/CoreLibs/Output/Progressbar.php
@@ -110,7 +110,8 @@ class ProgressBar
 			$clear_buffer_size = $this->clear_buffer_size;
 		}
 		echo str_repeat(' ', $clear_buffer_size);
-		ob_flush();
+		// a small hack to avoid warnings about no buffer to flush
+		@ob_flush();
 		flush();
 	}

@@ -541,6 +542,7 @@ class ProgressBar
 		$html = '';
 		$js = '';
 		$html_button = '';
+		$html_percent = '';

 		$this->__setStep($this->step);
 		$this->position = $this->__calculatePosition($this->step);
@@ -636,7 +638,7 @@ class ProgressBar
 					case 'percent':
 						// only one inner percent
 						// print "STYLE[$name]: ".$style_lbl."<br>";
-						if (!isset($html_percent)) {
+						if (empty($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";
 						}
 						break;
--- a/www/lib/CoreLibs/Template/SmartyExtend.php
+++ b/www/lib/CoreLibs/Template/SmartyExtend.php
@@ -46,6 +46,7 @@ class SmartyExtend extends SmartyBC
 	public $USE_TINY_MCE = false;
 	public $JS_DATEPICKR = false;
 	public $JS_FLATPICKR = false;
+	public $JS_FILE_UPLOADER = false;
 	public $DEBUG_TMPL = false;
 	public $USE_INCLUDE_TEMPLATE = false;
 	// cache & compile
@@ -81,6 +82,7 @@ class SmartyExtend extends SmartyBC
 	public $INCLUDES;
 	public $JAVASCRIPT;
 	public $CSS;
+	public $FONT;
 	public $PICTURES;
 	public $CACHE_PICTURES;
 	public $CACHE_PICTURES_ROOT;
@@ -89,10 +91,9 @@ class SmartyExtend extends SmartyBC
 	/**
 	 * constructor class, just sets the language stuff
 	 * calls L10 for pass on internaly in smarty
-	 * also registers the getvar caller pliugin
-	 * @param string $lang language string to set
+	 * also registers the getvar caller plugin
 	 */
-	public function __construct(string $lang)
+	public function __construct()
 	{
 		// call basic smarty
 		parent::__construct();
@@ -121,7 +122,7 @@ class SmartyExtend extends SmartyBC
 	 * creates short lang (only first two chars) from the lang
 	 * @return void
 	 */
-	public function setLangEncoding(): void
+	private function setLangEncoding(): void
 	{
 		// just emergency fallback for language
 		// set encoding
@@ -130,10 +131,14 @@ class SmartyExtend extends SmartyBC
 		} else {
 			$this->encoding = DEFAULT_ENCODING;
 		}
-		// just emergency fallback for language
-		if (isset($_SESSION['DEFAULT_LANG'])) {
+		// gobal override
+		if (isset($GLOBALS['OVERRIDE_LANG'])) {
+			$this->lang = $GLOBALS['OVERRIDE_LANG'];
+		} elseif (isset($_SESSION['DEFAULT_LANG'])) {
+			// session (login)
 			$this->lang = $_SESSION['DEFAULT_LANG'];
 		} else {
+			// mostly default SITE LANG or DEFAULT LANG
 			$this->lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
 		}
 		// create the char lang encoding
@@ -172,6 +177,7 @@ class SmartyExtend extends SmartyBC
 		$this->setTemplateDir($this->TEMPLATE_PATH);
 		$this->JAVASCRIPT = LAYOUT.JS;
 		$this->CSS = LAYOUT.CSS;
+		$this->FONT = LAYOUT.FONT;
 		$this->PICTURES = LAYOUT.IMAGES;
 		$this->CACHE_PICTURES = LAYOUT.CACHE;
 		$this->CACHE_PICTURES_ROOT = ROOT.$this->CACHE_PICTURES;
@@ -331,6 +337,7 @@ class SmartyExtend extends SmartyBC
 		// default CMS settings
 		// define all needed smarty stuff for the general HTML/page building
 		$this->HEADER['CSS'] = CSS;
+		$this->HEADER['FONT'] = FONT;
 		$this->HEADER['JS'] = JS;
 		$this->HEADER['ENCODING'] = $this->encoding;
 		$this->HEADER['DEFAULT_ENCODING'] = DEFAULT_ENCODING;
@@ -377,6 +384,7 @@ class SmartyExtend extends SmartyBC
 		// include flags
 		$this->DATA['JS_DATEPICKR'] = $this->JS_DATEPICKR;
 		$this->DATA['JS_FLATPICKR'] = $this->JS_FLATPICKR;
+		$this->DATA['JS_FILE_UPLOADER'] = $this->JS_FILE_UPLOADER;
 		// user name
 		$this->DATA['USER_NAME'] = !empty($_SESSION['USER_NAME']) ? $_SESSION['USER_NAME'] : '';
 		// the template part to include into the body
@@ -405,7 +413,7 @@ class SmartyExtend extends SmartyBC

 	/**
 	 * render smarty data (can be called sepparate)
-	 * @return [type] [description]
+	 * @return void
 	 */
 	public function renderSmarty(): void
 	{
--- a/www/lib/FileUpload/Core/qqUploadedFileXhr.php
+++ b/www/lib/FileUpload/Core/qqUploadedFileXhr.php
@@ -35,8 +35,8 @@ class qqUploadedFileXhr
 	}
 	public function getSize()
 	{
-		if (isset($_SERVER["CONTENT_LENGTH"])) {
-			return (int)$_SERVER["CONTENT_LENGTH"];
+		if (isset($_SERVER['CONTENT_LENGTH'])) {
+			return (int)$_SERVER['CONTENT_LENGTH'];
 		} else {
 			throw new \Exception('Getting content length is not supported.');
 		}
--- a/www/lib/font
+++ b/www/lib/font
@@ -0,0 +1 @@
+Fonts/
Author	SHA1	Message	Date
Clemens Schwaighofer	d9e13ae14c	Updates and fixes to CoreLibs - fixed all DEFINE to define in config* files - Updates Login class with missing strict declarations - some fixes in Login class for possible errors - Basic class return array layout updates for all rgb sets plus correct static update - Basic class timestamp method fix for not full set (eg missing seconds) - Basic class add method for getting linecount from a file - DB IO class gets a get settings return value method	2020-01-07 15:45:24 +09:00
Clemens Schwaighofer	50db770992	Move the convert config setting to config other the convert constant setting for inmage magick is now in config.other as it is no longer core Also add the base Progress and functions perl modules for central tagging. We will add config.pm, import_functions.pm, layout.pm and a basic test script later too	2019-12-11 18:02:42 +09:00
Clemens Schwaighofer	e439945a54	Add edit_base* with admin/frontend folder file listing Before it only listed files in current directory. Because of the hard split select from both. Add hostname/folder input (optional) to prefix files outside the same folder. Note: If no hostname/folder is set and two files in admin and frontend have the same name they will be both highlighted as the point to the same place.	2019-12-11 16:08:00 +09:00
Clemens Schwaighofer	8223441ca9	Add Front folder for web fonts The font folder is set in the layout folder for frontend and holds web fonts. There is a new symlink folder in the libs directory to match the FONT folder name for backend fonts	2019-12-11 13:54:37 +09:00
Clemens Schwaighofer	0153c9721f	Add missing return in CoreLibs Basic internal url parser Just to fulfill check, is only used internal	2019-12-06 15:35:07 +09:00
Clemens Schwaighofer	b6f6eeac9b	Update byteStringFormat with si units and bitwise mask The old method name byteStringFormat is currently deprecated and it is recommended to move to the new humanReadableByteFormat method. Difference is that the new version uses a bitfield settings mask BYTE_FORMAT_NOSPACE, BYTE_FORMAT_ADJUST, BYTE_FORMAT_SI	2019-12-06 15:29:06 +09:00
Clemens Schwaighofer	beedf629e5	Fixups for phan 2.4.4 run checks Lines with @phan HACK comment are added to supress phan warnings, but do actually no additional work. On newer phan version those lines should be checked and removed if needed	2019-12-05 16:01:44 +09:00
Clemens Schwaighofer	04b47574eb	CoreLibs\Basic arrayDiff for full array diff PHP array_diff only compares missing elements in the second and existing in the first so a full diff is only achieved if compares both ways (a,b) and (b,a) This function uns a full compare and returns difference in an array	2019-12-04 12:12:43 +09:00
Clemens Schwaighofer	ecc52e2dbd	Basic class if layout fixes	2019-11-28 15:44:39 +09:00
Clemens Schwaighofer	12e335c69c	Move fileUploadErrorMessage from Admin\Backend to Basic Also removed the auto translate, return just string. Is also a static method so can be called by Basic::fileUploadErrorMessage too Removed left over LANG settings in admin header	2019-11-15 17:53:21 +09:00
Clemens Schwaighofer	3ae3b1b761	Simplify language calls There are no more lang vars passed on to any class calls The new order is the following $OVERRIDE_LANG > _SESSION > SITE_LANG > DEFAULT_LANG Todo: make the setLang better so we do not have the same method in Backend/Generic/SmartyExtended	2019-11-15 17:07:35 +09:00