diff --git a/.phan/config.php b/.phan/config.php
index 900f9ef8..848e87e9 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -1,7 +1,5 @@
";
print '';
// set acl, from eg login acl
-print "SETACL[]: ".$backend->setACL([])."
";
-print "ADBEDITLOG: ".$backend->adbEditLog('CLASSTEST-ADMIN', 'Some info stirng')."
";
-print "ADBTOPMENU(0): ".\CoreLibs\Debug\Support::printAr($backend->adbTopMenu())."
";
-print "ADBMSG: ".$backend->adbMsg('info', 'Message: %1$d', [1])."
";
-print "Messaes: ".\CoreLibs\Debug\Support::printAr($this->messages)."
";
-print "ADBPRINTDATETIME:
".$backend->adbPrintDateTime(2021, 6, 21, 6, 38, '_test')."
";
+print "SETACL[]: " . $backend->setACL([]) . "
";
+print "ADBEDITLOG: " . $backend->adbEditLog('CLASSTEST-ADMIN', 'Some info stirng') . "
";
+print "ADBTOPMENU(0): " . \CoreLibs\Debug\Support::printAr($backend->adbTopMenu()) . "
";
+print "ADBMSG: " . $backend->adbMsg('info', 'Message: %1$d', [1]) . "
";
+print "Messaes: " . \CoreLibs\Debug\Support::printAr($this->messages) . "
";
+print "ADBPRINTDATETIME:
" . $backend->adbPrintDateTime(2021, 6, 21, 6, 38, '_test') . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.array.php b/www/admin/class_test.array.php
index b9d986b6..e2088369 100644
--- a/www/admin/class_test.array.php
+++ b/www/admin/class_test.array.php
@@ -1,9 +1,11 @@
";
+echo "SOURCE ARRAY: " . DgS::printAr($test_array) . "
";
// frist return
-echo "ARRAYSEARCHRECURSIVE(email, [array], type): ".DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array, 'type'))."
";
-echo "ARRAYSEARCHRECURSIVE(email, [array]['input'], type): ".DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array['input'], 'type'))."
";
+echo "ARRAYSEARCHRECURSIVE(email, [array], type): "
+ . DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array, 'type')) . "
";
+echo "ARRAYSEARCHRECURSIVE(email, [array]['input'], type): "
+ . DgS::printAr(ArrayHandler::arraySearchRecursive('email', $test_array['input'], 'type')) . "
";
// all return
-echo "ARRAYSEARCHRECURSIVEALL(email, [array], type): ".Dgs::printAr((array)ArrayHandler::arraySearchRecursiveAll('email', $test_array, 'type'))."
";
+echo "ARRAYSEARCHRECURSIVEALL(email, [array], type): "
+ . Dgs::printAr((array)ArrayHandler::arraySearchRecursiveAll('email', $test_array, 'type')) . "
";
// simple search
-echo "ARRAYSEARCHSIMPLE([array], type, email): ".(string)ArrayHandler::arraySearchSimple($test_array, 'type', 'email')."
";
+echo "ARRAYSEARCHSIMPLE([array], type, email): "
+ . (string)ArrayHandler::arraySearchSimple($test_array, 'type', 'email') . "
";
$array_1 = [
'foo' => 'bar'
@@ -76,7 +82,7 @@ $array_3 = [
]
];
// recusrice merge
-print "ARRAYMERGERECURSIVE: ".DgS::printAr(ArrayHandler::arrayMergeRecursive($array_1, $array_2, $array_3))."
";
+print "ARRAYMERGERECURSIVE: " . DgS::printAr(ArrayHandler::arrayMergeRecursive($array_1, $array_2, $array_3)) . "
";
// array difference
$array_left = [
'same' => 'data',
@@ -86,14 +92,14 @@ $array_right = [
'same' => 'data',
'right' => 'has R'
];
-print "ARRAYDIFF: ".DgS::printAr(ArrayHandler::arrayDiff($array_left, $array_right))."
";
+print "ARRAYDIFF: " . DgS::printAr(ArrayHandler::arrayDiff($array_left, $array_right)) . "
";
// in array check
-print "INARRAYANY([1,3], [array]): ".DgS::printAr(ArrayHandler::inArrayAny([1, 3], $array_2))."
";
+print "INARRAYANY([1,3], [array]): " . DgS::printAr(ArrayHandler::inArrayAny([1, 3], $array_2)) . "
";
// flatten array
-print "FLATTENARRAY: ".DgS::printAr(ArrayHandler::flattenArray($test_array))."
";
-print "FLATTENARRAYKEY: ".DgS::printAr(ArrayHandler::flattenArrayKey($test_array))."
";
+print "FLATTENARRAY: " . DgS::printAr(ArrayHandler::flattenArray($test_array)) . "
";
+print "FLATTENARRAYKEY: " . DgS::printAr(ArrayHandler::flattenArrayKey($test_array)) . "
";
// flatten for key set
-print "ARRAYFLATFORKEY: ".DgS::printAr(ArrayHandler::arrayFlatForKey($test_array, 'type'))."
";
+print "ARRAYFLATFORKEY: " . DgS::printAr(ArrayHandler::arrayFlatForKey($test_array, 'type')) . "
";
// DEPRECATED
// print "ARRAYMERGERECURSIVE: ".DgS::printAr($basic->arrayMergeRecursive($array_1, $array_2, $array_3))."
";
@@ -111,18 +117,19 @@ function rec(string $pre, string $cur, array $node = [])
if (!is_array($node)) {
$node = [];
}
- print "#### PRE: ".$pre.", CUR: ".$cur.", N-c: ".count($node)." [".join('|', array_keys($node))."]
";
+ print "#### PRE: " . $pre . ", CUR: " . $cur . ", N-c: "
+ . count($node) . " [" . join('|', array_keys($node)) . "]
";
if (!$pre) {
print "** NEW
";
$node[$cur] = [];
} else {
if (array_key_exists($pre, $node)) {
- print "+ KEY FOUND: ".$pre.", add: ".$cur."
";
+ print "+ KEY FOUND: " . $pre . ", add: " . $cur . "
";
$node[$pre][$cur] = [];
} else {
print "- NOT FOUND: loop
";
foreach ($node as $_pre => $_cur) {
- print "> TRY: ".$_pre." => ".count($_cur)." [".join('|', array_keys($_cur))."]
";
+ print "> TRY: " . $_pre . " => " . count($_cur) . " [" . join('|', array_keys($_cur)) . "]
";
if (count($_cur) > 0) {
$node[$_pre] = rec($pre, $cur, $_cur);
}
@@ -185,8 +192,8 @@ $test = rec('C', 'U', $test);
$test = rec('F', 'U', $test);
$test = rec('', 'Al', $test);
$test = rec('B', 'B1', $test);
-print "ORIGINAL: ".\CoreLibs\Debug\Support::printAr($test)."
";
-print "FLATTEN: ".\CoreLibs\Debug\Support::printAr(flattenArrayKey($test))."
";
+print "ORIGINAL: " . \CoreLibs\Debug\Support::printAr($test) . "
";
+print "FLATTEN: " . \CoreLibs\Debug\Support::printAr(flattenArrayKey($test)) . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.byte.php b/www/admin/class_test.byte.php
index b0f1a320..7cbacf84 100644
--- a/www/admin/class_test.byte.php
+++ b/www/admin/class_test.byte.php
@@ -1,8 +1,11 @@
-Class Test Master';
$byte = 254779258;
$string = '242.98 MB';
// static
-print "S::BYTE TO: $byte: ".$byte_class::humanReadableByteFormat($byte)."
";
-print "S::BYTE FROM: $string: ".$byte_class::stringByteFormat($string)."
";
+print "S::BYTE TO: $byte: " . $byte_class::humanReadableByteFormat($byte) . "
";
+print "S::BYTE FROM: $string: " . $byte_class::stringByteFormat($string) . "
";
// *** BYTES TEST ***
$bytes = array(
@@ -59,9 +62,9 @@ foreach ($bytes as $byte) {
print '';
//
print '
';
- print "(".number_format($byte)."/".$byte.") bytes :";
+ print "(" . number_format($byte) . "/" . $byte . ") bytes :";
$_bytes = Byte::humanReadableByteFormat($byte);
- print '
'.$_bytes;
+ print '
' . $_bytes;
print '
';
print Byte::stringByteFormat($_bytes);
print "
";
@@ -73,7 +76,7 @@ foreach ($bytes as $byte) {
print '
';
print "bytes [si]:";
$_bytes = Byte::humanReadableByteFormat($byte, Byte::BYTE_FORMAT_SI);
- print '
'.$_bytes;
+ print '
' . $_bytes;
print '
';
print Byte::stringByteFormat($_bytes);
print "
";
diff --git a/www/admin/class_test.colors.php b/www/admin/class_test.colors.php
index f28768a2..54d35d19 100644
--- a/www/admin/class_test.colors.php
+++ b/www/admin/class_test.colors.php
@@ -1,9 +1,11 @@
Class Test Master
";
-print "\$C::S/COLOR invalid rgb->hex (gary 125): -1, -1, -1: ".$color_class::rgb2hex(-1, -1, -1)."
";
+print "C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: " . CoreLibs\Convert\Colors::rgb2hex(-1, -1, -1) . "
";
+print "\$C::S/COLOR invalid rgb->hex (gary 125): -1, -1, -1: " . $color_class::rgb2hex(-1, -1, -1) . "
";
// B(valid)
$rgb = [10, 20, 30];
$hex = '#0a141e';
$hsb = [210, 67, 12];
$hsl = [210, 50, 7.8];
-print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: ".Colors::rgb2hex($rgb[0], $rgb[1], $rgb[2])."
";
-print "S::COLOR hex->rgb: $hex: ".DgS::printAr(Colors::hex2rgb($hex))."
";
-print "C::S/COLOR rgb->hext: $hex: ".DgS::printAr(CoreLibs\Convert\Colors::hex2rgb($hex))."
";
+print "S::COLOR rgb->hex: $rgb[0], $rgb[1], $rgb[2]: " . Colors::rgb2hex($rgb[0], $rgb[1], $rgb[2]) . "
";
+print "S::COLOR hex->rgb: $hex: " . DgS::printAr(Colors::hex2rgb($hex)) . "
";
+print "C::S/COLOR rgb->hext: $hex: " . DgS::printAr(CoreLibs\Convert\Colors::hex2rgb($hex)) . "
";
// C(to hsb/hsl)
-print "S::COLOR rgb->hsb: $rgb[0], $rgb[1], $rgb[2]: ".DgS::printAr(Colors::rgb2hsb($rgb[0], $rgb[1], $rgb[2]))."
";
-print "S::COLOR rgb->hsl: $rgb[0], $rgb[1], $rgb[2]: ".DgS::printAr(Colors::rgb2hsl($rgb[0], $rgb[1], $rgb[2]))."
";
+print "S::COLOR rgb->hsb: $rgb[0], $rgb[1], $rgb[2]: "
+ . DgS::printAr(Colors::rgb2hsb($rgb[0], $rgb[1], $rgb[2])) . "
";
+print "S::COLOR rgb->hsl: $rgb[0], $rgb[1], $rgb[2]: "
+ . DgS::printAr(Colors::rgb2hsl($rgb[0], $rgb[1], $rgb[2])) . "
";
// D(from hsb/hsl) Note that param 2 + 3 is always 0-100 divided
-print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: ".DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2]))."
";
-print "S::COLOR hsl->rgb: $hsl[0], $hsl[1], $hsl[2]: ".DgS::printAr(Colors::hsl2rgb($hsl[0], $hsl[1], $hsl[2]))."
";
+print "S::COLOR hsb->rgb: $hsb[0], $hsb[1], $hsb[2]: "
+ . DgS::printAr(Colors::hsb2rgb($hsb[0], $hsb[1], $hsb[2])) . "
";
+print "S::COLOR hsl->rgb: $hsl[0], $hsl[1], $hsl[2]: "
+ . DgS::printAr(Colors::hsl2rgb($hsl[0], $hsl[1], $hsl[2])) . "
";
// TODO: run compare check input must match output
diff --git a/www/admin/class_test.datetime.php b/www/admin/class_test.datetime.php
index ce3e485d..f9244282 100644
--- a/www/admin/class_test.datetime.php
+++ b/www/admin/class_test.datetime.php
@@ -1,8 +1,11 @@
-Class Test Master';
// class
$timestamp = 1622788315.123456;
// static
-print "S::DATESTRINGFORMAT(sm:0): $timestamp: ".$datetime_class::dateStringFormat($timestamp)."
";
+print "S::DATESTRINGFORMAT(sm:0): $timestamp: " . $datetime_class::dateStringFormat($timestamp) . "
";
// time string thest
$timestamp = 5887998.33445;
$time_string = DateTime::timeStringFormat($timestamp);
-print "PLANE TIME STRING: ".$timestamp."
";
-print "TIME STRING TEST: ".$time_string."
";
-print "REVERSE TIME STRING: ".DateTime::stringToTime($time_string)."
";
+print "PLANE TIME STRING: " . $timestamp . "
";
+print "TIME STRING TEST: " . $time_string . "
";
+print "REVERSE TIME STRING: " . DateTime::stringToTime($time_string) . "
";
if (round($timestamp, 4) == DateTime::stringToTime($time_string)) {
print "REVERSE TIME STRING MATCH
";
} else {
print "REVERSE TRIME STRING DO NOT MATCH
";
}
-print "ZERO TIME STRING: ".DateTime::timeStringFormat(0, true)."
";
-print "ZERO TIME STRING: ".DateTime::timeStringFormat(0.0, true)."
";
-print "ZERO TIME STRING: ".DateTime::timeStringFormat(1.005, true)."
";
+print "ZERO TIME STRING: " . DateTime::timeStringFormat(0, true) . "
";
+print "ZERO TIME STRING: " . DateTime::timeStringFormat(0.0, true) . "
";
+print "ZERO TIME STRING: " . DateTime::timeStringFormat(1.005, true) . "
";
$timestamps = [
1622788315.123456,
-1622788315.456789
];
foreach ($timestamps as $timestamp) {
- print "DATESTRINGFORMAT(sm:0): $timestamp: ".DateTime::dateStringFormat($timestamp)."
";
- print "DATESTRINGFORMAT(sm:1): $timestamp: ".DateTime::dateStringFormat($timestamp, true)."
";
+ print "DATESTRINGFORMAT(sm:0): $timestamp: " . DateTime::dateStringFormat($timestamp) . "
";
+ print "DATESTRINGFORMAT(sm:1): $timestamp: " . DateTime::dateStringFormat($timestamp, true) . "
";
}
$intervals = [
788315.123456,
-123.456
];
foreach ($intervals as $interval) {
- print "TIMESTRINGFORMAT(sm:0): $interval: ".DateTime::timeStringFormat($interval, false)."
";
+ print "TIMESTRINGFORMAT(sm:0): $interval: " . DateTime::timeStringFormat($interval, false) . "
";
$reverse_interval = DateTime::timeStringFormat($interval);
- print "TIMESTRINGFORMAT(sm:1): $interval: ".$reverse_interval."
";
- print "STRINGTOTIME: $reverse_interval: ".DateTime::stringToTime($reverse_interval)."
";
+ print "TIMESTRINGFORMAT(sm:1): $interval: " . $reverse_interval . "
";
+ print "STRINGTOTIME: $reverse_interval: " . DateTime::stringToTime($reverse_interval) . "
";
}
$check_dates = [
'2021-05-01',
'2021-05-40'
];
foreach ($check_dates as $check_date) {
- print "CHECKDATE: $check_date: ".(string)DateTime::checkDate($check_date)."
";
+ print "CHECKDATE: $check_date: " . (string)DateTime::checkDate($check_date) . "
";
}
$check_datetimes = [
'2021-05-01',
@@ -89,7 +92,7 @@ $check_datetimes = [
'2021-05-01 25:13:14',
];
foreach ($check_datetimes as $check_datetime) {
- print "CHECKDATETIME: $check_datetime: ".(string)DateTime::checkDateTime($check_datetime)."
";
+ print "CHECKDATETIME: $check_datetime: " . (string)DateTime::checkDateTime($check_datetime) . "
";
}
$compare_dates = [
[ '2021-05-01', '2021-05-02', ],
@@ -99,7 +102,8 @@ $compare_dates = [
];
// compareDate
foreach ($compare_dates as $compare_date) {
- print "COMPAREDATE: $compare_date[0] = $compare_date[1]: ".(string)DateTime::compareDate($compare_date[0], $compare_date[1])."
";
+ print "COMPAREDATE: $compare_date[0] = $compare_date[1]: "
+ . (string)DateTime::compareDate($compare_date[0], $compare_date[1]) . "
";
}
$compare_datetimes = [
[ '2021-05-01', '2021-05-02', ],
@@ -110,7 +114,8 @@ $compare_datetimes = [
[ '2021-05-01 10:00:00', '2021-05-01 10:00:00', ],
];
foreach ($compare_datetimes as $compare_datetime) {
- print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: ".(string)DateTime::compareDateTime($compare_datetime[0], $compare_datetime[1])."
";
+ print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: "
+ . (string)DateTime::compareDateTime($compare_datetime[0], $compare_datetime[1]) . "
";
}
$compare_dates = [
[ '2021-05-01', '2021-05-10', ],
@@ -119,8 +124,10 @@ $compare_dates = [
[ '2021-05-02', '2021-05-02', ],
];
foreach ($compare_dates as $compare_date) {
- print "CALCDAYSINTERVAL: $compare_date[0] = $compare_date[1]: ".DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1]))."
";
- print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: ".DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true))."
";
+ print "CALCDAYSINTERVAL: $compare_date[0] = $compare_date[1]: "
+ . DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1])) . "
";
+ print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: "
+ . DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true)) . "
";
}
// DEPRECATED
@@ -135,11 +142,14 @@ print "CHECKDATE: $check_date: ".(string)$basic->checkDate($check_date)."
";
$check_datetime = '2021-05-01 12:13:14';
print "CHECKDATETIME: $check_datetime: ".(string)$basic->checkDateTime($check_datetime)."
";
$compare_date = ['2021-05-01', '2021-05-02'];
-print "COMPAREDATE: $compare_date[0] = $compare_date[1]: ".(string)$basic->compareDate($compare_date[0], $compare_date[1])."
";
+print "COMPAREDATE: $compare_date[0] = $compare_date[1]: "
+ . (string)$basic->compareDate($compare_date[0], $compare_date[1])."
";
$compare_datetime = ['2021-05-01 10:00:00', '2021-05-01 11:00:00'];
-print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: ".(string)$basic->compareDateTime($compare_datetime[0], $compare_datetime[1])."
";
+print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: "
+ . (string)$basic->compareDateTime($compare_datetime[0], $compare_datetime[1])."
";
$compare_date = ['2021-05-01', '2021-05-10'];
-print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: ".DgS::printAr($basic->calcDaysInterval($compare_date[0], $compare_date[1], true))."
"; */
+print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: "
+ . DgS::printAr($basic->calcDaysInterval($compare_date[0], $compare_date[1], true))."
"; */
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.db.php b/www/admin/class_test.db.php
index a496ac9a..994a3886 100644
--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -1,9 +1,11 @@
TEST CLASS: DB";
print "";
print '';
-print "DBINFO: ".$db->dbInfo()."
";
-echo "DB_CONFIG_SET constant: ".print_r(DB_CONFIG, true)."
";
+print "DBINFO: " . $db->dbInfo() . "
";
+echo "DB_CONFIG_SET constant: " . print_r(DB_CONFIG, true) . "
";
// DB client encoding
-print "DB Client encoding: ".$db->dbGetEncoding()."
";
+print "DB Client encoding: " . $db->dbGetEncoding() . "
";
while ($res = $db->dbReturn("SELECT * FROM max_test", 0, true)) {
- print "TIME: ".$res['time']."
";
+ print "TIME: " . $res['time'] . "
";
}
-print "CACHED DATA: ".print_r($db->cursor_ext, true)."
";
+print "CACHED DATA: " . print_r($db->cursor_ext, true) . "
";
while ($res = $db->dbReturn("SELECT * FROM max_test")) {
- print "[CACHED] TIME: ".$res['time']."
";
+ print "[CACHED] TIME: " . $res['time'] . "
";
}
print "";
-$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST ".time()."') RETURNING test");
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO TEST " . time() . "') RETURNING test");
print "DIRECT INSERT STATUS: $status | "
- ."PRIMARY KEY: ".$db->dbGetInsertPK()." | "
- ."RETURNING EXT: ".print_r($db->dbGetReturningExt(), true)." | "
- ."RETURNING ARRAY: ".print_r($db->dbGetReturningArray(), true)."
";
+ . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+ . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+ . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
";
// should throw deprecated error
// $db->getReturningExt();
-print "DIRECT INSERT PREVIOUS INSERTED: ".print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$db->dbGetInsertPK()), true)."
";
+print "DIRECT INSERT PREVIOUS INSERTED: "
+ . print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "
";
$db->dbPrepare("ins_foo", "INSERT INTO foo (test) VALUES ($1)");
-$status = $db->dbExecute("ins_foo", array('BAR TEST '.time()));
+$status = $db->dbExecute("ins_foo", array('BAR TEST ' . time()));
print "PREPARE INSERT STATUS: $status | "
- ."PRIMARY KEY: ".$db->dbGetInsertPK()." | "
- ."RETURNING EXT: ".print_r($db->dbGetReturningExt(), true)." | "
- ."RETURNING RETURN: ".print_r($db->dbGetReturningArray(), true)."
";
+ . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+ . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+ . "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "
";
-print "PREPARE INSERT PREVIOUS INSERTED: ".print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$db->dbGetInsertPK()), true)."
";
+print "PREPARE INSERT PREVIOUS INSERTED: "
+ . print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->dbGetInsertPK()), true) . "
";
// returning test with multiple entries
-// $status = $db->db_exec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id");
-$status = $db->dbExec("INSERT INTO foo (test) values ('BAR 1 ".time()."'), ('BAR 2 ".time()."'), ('BAR 3 ".time()."') RETURNING foo_id, test");
+// $status = $db->db_exec(
+// "INSERT INTO foo (test) VALUES "
+// . "('BAR 1 " . time() . "'), "
+// . "('BAR 2 " . time() . "'), "
+// . "('BAR 3 " . time() . "') "
+// . "RETURNING foo_id"
+// );
+$status = $db->dbExec(
+ "INSERT INTO foo (test) VALUES "
+ . "('BAR 1 " . time() . "'), "
+ . "('BAR 2 " . time() . "'), "
+ . "('BAR 3 " . time() . "') "
+ . "RETURNING foo_id, test"
+);
print "DIRECT MULTIPLE INSERT STATUS: $status | "
- ."PRIMARY KEYS: ".print_r($db->dbGetInsertPK(), true)." | "
- ."RETURNING EXT: ".print_r($db->dbGetReturningExt(), true)." | "
- ."RETURNING ARRAY: ".print_r($db->dbGetReturningArray(), true)."
";
+ . "PRIMARY KEYS: " . print_r($db->dbGetInsertPK(), true) . " | "
+ . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+ . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
";
// no returning, but not needed ;
-$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST ".time()."');");
+$status = $db->dbExec("INSERT INTO foo (test) VALUES ('FOO; TEST " . time() . "');");
print "DIRECT INSERT STATUS: $status | "
- ."PRIMARY KEY: ".$db->dbGetInsertPK()." | "
- ."RETURNING EXT: ".print_r($db->dbGetReturningExt(), true)." | "
- ."RETURNING ARRAY: ".print_r($db->dbGetReturningArray(), true)."
";
+ . "PRIMARY KEY: " . $db->dbGetInsertPK() . " | "
+ . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+ . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
";
// UPDATE WITH RETURNING
$status = $db->dbExec("UPDATE foo SET test = 'SOMETHING DIFFERENT' WHERE foo_id = 3688452 RETURNING test");
print "UPDATE STATUS: $status | "
- ."RETURNING EXT: ".print_r($db->dbGetReturningExt(), true)." | "
- ."RETURNING ARRAY: ".print_r($db->dbGetReturningArray(), true)."
";
+ . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+ . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
";
print "";
// REEAD PREPARE
-if ($db->dbPrepare('sel_foo', "SELECT foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time FROM foo ORDER BY foo_id DESC LIMIT 5") === false) {
+if (
+ $db->dbPrepare(
+ 'sel_foo',
+ "SELECT foo_id, test, some_bool, string_a, number_a, number_a_numeric, some_time "
+ . "FROM foo ORDER BY foo_id DESC LIMIT 5"
+ ) === false
+) {
print "Error in sel_foo prepare
";
} else {
$max_rows = 6;
@@ -109,37 +131,65 @@ if ($db->dbPrepare('sel_foo', "SELECT foo_id, test, some_bool, string_a, number_
$cursor = $db->dbExecute('sel_foo', []);
$i = 1;
while (($res = $db->dbFetchArray($cursor, true)) !== false) {
- print "DB PREP EXEC FETCH ARR: ".$i.": ".print_r($res, true)."
";
- $i ++;
+ print "DB PREP EXEC FETCH ARR: " . $i . ": " . print_r($res, true) . "
";
+ $i++;
}
}
# db write class test
$table = 'foo';
-print "TABLE META DATA: ".DgS::printAr($db->dbShowTableMetaData($table))."
";
+print "TABLE META DATA: " . DgS::printAr($db->dbShowTableMetaData($table)) . "
";
$primary_key = ''; # unset
$db_write_table = array('test', 'string_a', 'number_a', 'some_bool');
// $db_write_table = array('test');
$object_fields_not_touch = array();
$object_fields_not_update = array();
-$data = array('test' => 'BOOL TEST SOMETHING '.time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
-$primary_key = $db->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$data = array('test' => 'BOOL TEST SOMETHING ' . time(), 'string_a' => 'SOME TEXT', 'number_a' => 5);
+$primary_key = $db->dbWriteDataExt(
+ $db_write_table,
+ $primary_key,
+ $table,
+ $object_fields_not_touch,
+ $object_fields_not_update,
+ $data
+);
print "Wrote to DB tabel $table and got primary key $primary_key
";
-$data = array('test' => 'BOOL TEST ON '.time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
-$primary_key = $db->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$data = array('test' => 'BOOL TEST ON ' . time(), 'string_a' => '', 'number_a' => 0, 'some_bool' => 1);
+$primary_key = $db->dbWriteDataExt(
+ $db_write_table,
+ $primary_key,
+ $table,
+ $object_fields_not_touch,
+ $object_fields_not_update,
+ $data
+);
print "Wrote to DB tabel $table and got primary key $primary_key
";
-$data = array('test' => 'BOOL TEST OFF '.time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
-$primary_key = $db->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$data = array('test' => 'BOOL TEST OFF ' . time(), 'string_a' => null, 'number_a' => null, 'some_bool' => 0);
+$primary_key = $db->dbWriteDataExt(
+ $db_write_table,
+ $primary_key,
+ $table,
+ $object_fields_not_touch,
+ $object_fields_not_update,
+ $data
+);
print "Wrote to DB tabel $table and got primary key $primary_key
";
-$data = array('test' => 'BOOL TEST UNSET '.time());
-$primary_key = $db->dbWriteDataExt($db_write_table, $primary_key, $table, $object_fields_not_touch, $object_fields_not_update, $data);
+$data = array('test' => 'BOOL TEST UNSET ' . time());
+$primary_key = $db->dbWriteDataExt(
+ $db_write_table,
+ $primary_key,
+ $table,
+ $object_fields_not_touch,
+ $object_fields_not_update,
+ $data
+);
print "Wrote to DB tabel $table and got primary key $primary_key
";
// return Array Test
$query = "SELECT type, sdate, integer FROM foobar";
$data = $db->dbReturnArray($query, true);
-print "Full foobar list:
".print_r($data, true)."
";
+print "Full foobar list:
" . print_r($data, true) . "
";
# async test queries
/* $db->dbExecAsync("SELECT test FROM foo, (SELECT pg_sleep(10)) as sub WHERE foo_id IN (27, 50, 67, 44, 10)");
@@ -156,36 +206,37 @@ while (($ret = $db->dbCheckAsync()) === true)
sleep(1);
flush();
}
-print "
END STATUS: ".$ret."
";
+print "
END STATUS: " . $ret . "
";
// while ($res = $db->dbFetchArray($ret))
while ($res = $db->dbFetchArray())
{
- echo "RES: ".$res['test']."
";
+ echo "RES: " . $res['test'] . "
";
}
# test async insert
-$db->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST ".time()."')");
+$db->dbExecAsync("INSERT INTO foo (Test) VALUES ('ASYNC TEST " . time() . "')");
echo "WAITING FOR ASYNC INSERT: ";
while (($ret = $db->dbCheckAsync()) === true)
{
- print ".";
+ print " . ";
sleep(1);
flush();
}
-print "
END STATUS: ".$ret." | PK: ".$db->insert_id."
";
-print "ASYNC PREVIOUS INSERTED: ".print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = ".$db->insert_id), true)."
"; */
+print "
END STATUS: " . $ret . " | PK: " . $db->insert_id . "
";
+print "ASYNC PREVIOUS INSERTED: "
+ . print_r($db->dbReturnRow("SELECT foo_id, test FROM foo WHERE foo_id = " . $db->insert_id), true) . "
"; */
$to_db_version = '9.1.9';
-print "VERSION DB: ".$db->dbVersion()."
";
-print "DB Version smaller $to_db_version: ".$db->dbCompareVersion('<'.$to_db_version)."
";
-print "DB Version smaller than $to_db_version: ".$db->dbCompareVersion('<='.$to_db_version)."
";
-print "DB Version equal $to_db_version: ".$db->dbCompareVersion('='.$to_db_version)."
";
-print "DB Version bigger than $to_db_version: ".$db->dbCompareVersion('>='.$to_db_version)."
";
-print "DB Version bigger $to_db_version: ".$db->dbCompareVersion('>'.$to_db_version)."
";
+print "VERSION DB: " . $db->dbVersion() . "
";
+print "DB Version smaller $to_db_version: " . $db->dbCompareVersion('<' . $to_db_version) . "
";
+print "DB Version smaller than $to_db_version: " . $db->dbCompareVersion('<=' . $to_db_version) . "
";
+print "DB Version equal $to_db_version: " . $db->dbCompareVersion('=' . $to_db_version) . "
";
+print "DB Version bigger than $to_db_version: " . $db->dbCompareVersion('>=' . $to_db_version) . "
";
+print "DB Version bigger $to_db_version: " . $db->dbCompareVersion('>' . $to_db_version) . "
";
/* $q = "SELECT FOO FRO BAR";
// $q = "Select * from foo";
$foo = $db->dbExecAsync($q);
-print "[ERR] Query: ".$q."
";
+print "[ERR] Query: " . $q . "
";
print "[ERR] RESOURCE: $foo
";
while (($ret = $db->dbCheckAsync()) === true)
{
@@ -197,19 +248,23 @@ while (($ret = $db->dbCheckAsync()) === true)
$q = "SHOW search_path";
$cursor = $db->dbExec($q);
$data = $db->dbFetchArray($cursor)['search_path'];
-print "RETURN DATA FOR search_path: ".$data."
";
-// print "RETURN DATA FOR search_path: ".DgS::printAr($data)."
";
+print "RETURN DATA FOR search_path: " . $data . "
";
+// print "RETURN DATA FOR search_path: " . DgS::printAr($data) . "
";
// insert something into test.schema_test and see if we get the PK back
-$status = $db->dbExec("INSERT INTO test.schema_test (contents, id) VALUES ('TIME: ".time()."', ".rand(1, 10).")");
-print "OTHER SCHEMA INSERT STATUS: ".$status." | PK NAME: ".$db->pk_name.", PRIMARY KEY: ".$db->insert_id."
";
+$status = $db->dbExec(
+ "INSERT INTO test.schema_test (contents, id) VALUES "
+ . "('TIME: " . time() . "', " . rand(1, 10) . ")"
+);
+print "OTHER SCHEMA INSERT STATUS: "
+ . $status . " | PK NAME: " . $db->pk_name . ", PRIMARY KEY: " . $db->insert_id . "
";
print "NULL TEST DB READ
";
$q = "SELECT uid, null_varchar, null_int FROM test_null_data WHERE uid = 'A'";
$res = $db->dbReturnRow($q);
var_dump($res);
-print "RES: ".DgS::printAr($res)."
";
-print "ISSET: ".isset($res['null_varchar'])."
";
-print "EMPTY: ".empty($res['null_varchar'])."
";
+print "RES: " . DgS::printAr($res) . "
";
+print "ISSET: " . isset($res['null_varchar']) . "
";
+print "EMPTY: " . empty($res['null_varchar']) . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.debug.php b/www/admin/class_test.debug.php
index 624cc86e..f427aa7f 100644
--- a/www/admin/class_test.debug.php
+++ b/www/admin/class_test.debug.php
@@ -1,9 +1,11 @@
";
-print "S::GETCALLERMETHOD: ".test()."
";
-print "S::PRINTAR: ".DebugSupport::printAr(['Foo', 'Bar'])."
";
-print "V-S::PRINTAR: ".$debug_support_class::printAr(['Foo', 'Bar'])."
";
-print "S::DEBUSTRING(s): ".DebugSupport::debugString('SET')."
";
-print "S::DEBUSTRING(''): ".DebugSupport::debugString('')."
";
-print "S::DEBUSTRING(,s): ".DebugSupport::debugString(null, '{-}')."
";
+print "S::GETCALLERMETHOD: " . DebugSupport::getCallerMethod(0) . "
";
+print "S::GETCALLERMETHOD: " . test() . "
";
+print "S::PRINTAR: " . DebugSupport::printAr(['Foo', 'Bar']) . "
";
+print "V-S::PRINTAR: " . $debug_support_class::printAr(['Foo', 'Bar']) . "
";
+print "S::DEBUSTRING(s): " . DebugSupport::debugString('SET') . "
";
+print "S::DEBUSTRING(''): " . DebugSupport::debugString('') . "
";
+print "S::DEBUSTRING(,s): " . DebugSupport::debugString(null, '{-}') . "
";
// debug
-print "C->DEBUG: ".$debug->debug('CLASS-TEST-DEBUG', 'Class Test Debug')."
";
-print "C->DEBUG(html): ".$debug->debug('CLASS-TEST-DEBUG', 'HTML TAG
BOLD')."
";
-print "C->DEBUG(html,strip): ".$debug->debug('CLASS-TEST-DEBUG', 'HTML TAG
BOLD', true)."
";
-print "C->PRINTERRORMSG:
".$debug->printErrorMsg()."
";
+print "C->DEBUG: " . $debug->debug('CLASS-TEST-DEBUG', 'Class Test Debug') . "
";
+print "C->DEBUG(html): " . $debug->debug('CLASS-TEST-DEBUG', 'HTML TAG
BOLD') . "
";
+print "C->DEBUG(html,strip): " . $debug->debug('CLASS-TEST-DEBUG', 'HTML TAG
BOLD', true) . "
";
+print "C->PRINTERRORMSG:
" . $debug->printErrorMsg() . "
";
echo "CLASS DEBUG CALL
";
// @codingStandardsIgnoreLine
@@ -73,8 +75,8 @@ class TestL
}
public function test(string $ts = null)
{
- print "* GETCALLERCLASS(INSIDE CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."
";
- $this->log->debug('TESTL', 'Logging in class testL'.($ts !== null ? ': '.$ts : ''));
+ print "* GETCALLERCLASS(INSIDE CLASS): " . \CoreLibs\Debug\Support::getCallerClass() . "
";
+ $this->log->debug('TESTL', 'Logging in class testL' . ($ts !== null ? ': ' . $ts : ''));
$this->log->debug('TESTL', 'Some other message');
return true;
}
@@ -89,22 +91,23 @@ class TestR extends TestL
}
public function subTest()
{
- print "** GETCALLERCLASS(INSIDE EXTND CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."
";
+ print "** GETCALLERCLASS(INSIDE EXTND CLASS): " . \CoreLibs\Debug\Support::getCallerClass() . "
";
$this->log->debug('TESTR', 'Logging in class testR (extends testL)');
$this->test('TESTR INSIDE');
- $this->log->debug('TESTR', 'Array: '.$this->log->prAr(['a', 'b']).', Other: '.$this->log->prAr(['a', 'b']));
+ $this->log->debug('TESTR', 'Array: '
+ . $this->log->prAr(['a', 'b']) . ', Other: ' . $this->log->prAr(['a', 'b']));
return true;
}
}
$tl = new TestL();
-print "CLASS: LOG ECHO: ".(string)$tl->log->getLogLevelAll('echo')."
";
-print "CLASS: DEBUG: ".$tl->test()."
";
-print "CLASS: PRINTERRORMSG:
".$tl->log->printErrorMsg()."
";
+print "CLASS: LOG ECHO: " . (string)$tl->log->getLogLevelAll('echo') . "
";
+print "CLASS: DEBUG: " . $tl->test() . "
";
+print "CLASS: PRINTERRORMSG:
" . $tl->log->printErrorMsg() . "
";
$tr = new TestR();
-print "CLASS: LOG ECHO: ".(string)$tr->log->getLogLevelAll('echo')."
";
-print "CLASS EXTEND: DEBUG/tl: ".$tr->test('TESTR OUTSIDE')."
";
-print "CLASS EXTEND: DEBUG/tr: ".$tr->subTest()."
";
-print "CLASS EXTEND: PRINTERRORMSG:
".$tr->log->printErrorMsg()."
";
+print "CLASS: LOG ECHO: " . (string)$tr->log->getLogLevelAll('echo') . "
";
+print "CLASS EXTEND: DEBUG/tl: " . $tr->test('TESTR OUTSIDE') . "
";
+print "CLASS EXTEND: DEBUG/tr: " . $tr->subTest() . "
";
+print "CLASS EXTEND: PRINTERRORMSG:
" . $tr->log->printErrorMsg() . "
";
// test attaching a logger from outside
// @codingStandardsIgnoreLine
@@ -122,7 +125,7 @@ class AttachOutside
}
}
$ao = new AttachOutside($basic->log);
-print "AO-CLASS: DEBUG: ".$ao->test()."
";
+print "AO-CLASS: DEBUG: " . $ao->test() . "
";
// @codingStandardsIgnoreLine
class AttachFull
@@ -141,20 +144,20 @@ class AttachFull
$af = new AttachFull($basic);
// should trigger deprecated
-print "DEPREACTEDTEST: ".$af->test()."
";
+print "DEPREACTEDTEST: " . $af->test() . "
";
-print "GETCALLERCLASS(NON CLASS): ".\CoreLibs\Debug\Support::getCallerClass()."
";
+print "GETCALLERCLASS(NON CLASS): " . \CoreLibs\Debug\Support::getCallerClass() . "
";
// fdebug
-print "S::FSETFILENAME: ".FileWriter::fsetFilename('class_test_debug_file.log')."
";
-print "S::FDEBUG: ".FileWriter::fdebug('CLASS TEST DEBUG FILE: '.date('Y-m-d H:i:s'))."
";
+print "S::FSETFILENAME: " . FileWriter::fsetFilename('class_test_debug_file.log') . "
";
+print "S::FDEBUG: " . FileWriter::fdebug('CLASS TEST DEBUG FILE: ' . date('Y-m-d H:i:s')) . "
";
// error message
// future DEPRECATED
// $basic->debug('BASIC CLASS', 'Debug test');
$basic->log->debug('BASIC CLASS', 'Debug test');
-print "BASIC PRINTERRORMSG:
".$basic->log->printErrorMsg();
+print "BASIC PRINTERRORMSG:
" . $basic->log->printErrorMsg();
print "";
diff --git a/www/admin/class_test.email.php b/www/admin/class_test.email.php
index f40927aa..1443a014 100644
--- a/www/admin/class_test.email.php
+++ b/www/admin/class_test.email.php
@@ -1,8 +1,11 @@
-";
print '';
// regex get
-print "S::GETEMAILREGEX(0): ".Email::getEmailRegex(0)."
";
-print "S::GETEMAILREGEX(2): ".Email::getEmailRegex(2)."
";
-print "S::GETEMAILREGEX(7): ".Email::getEmailRegex(7)."
";
-print "S::GETEMAILREGEX(8 invalid): ".Email::getEmailRegex(8)."
";
-print "S::GETEMAILREGEXCHECK: ".DgS::printAr(Email::getEmailRegexCheck())."
";
+print "S::GETEMAILREGEX(0): " . Email::getEmailRegex(0) . "
";
+print "S::GETEMAILREGEX(2): " . Email::getEmailRegex(2) . "
";
+print "S::GETEMAILREGEX(7): " . Email::getEmailRegex(7) . "
";
+print "S::GETEMAILREGEX(8 invalid): " . Email::getEmailRegex(8) . "
";
+print "S::GETEMAILREGEXCHECK: " . DgS::printAr(Email::getEmailRegexCheck()) . "
";
$email = [
'foo@bar.org',
'foo@i.softbank.ne.jp'
];
foreach ($email as $s_email) {
- print "S::EMAIL: $s_email: ".Email::getEmailType($s_email)."
";
- print "S::EMAIL SHORT: $s_email: ".Email::getEmailType($s_email, true)."
";
+ print "S::EMAIL: $s_email: " . Email::getEmailType($s_email) . "
";
+ print "S::EMAIL SHORT: $s_email: " . Email::getEmailType($s_email, true) . "
";
}
// DEPRECATED
/* foreach ($email as $s_email) {
diff --git a/www/admin/class_test.encoding.php b/www/admin/class_test.encoding.php
index 92a85468..561d2ac7 100644
--- a/www/admin/class_test.encoding.php
+++ b/www/admin/class_test.encoding.php
@@ -1,8 +1,11 @@
-";
+ print "__MBMIMEENCODE: $mime_encode[0]: " . Encoding::__mbMimeEncode($mime_encode[0], $mime_encode[1]) . "
";
}
$enc_strings = [
@@ -59,26 +62,29 @@ $enc_strings = [
$_encoding->setErrorChar('∴');
foreach ($enc_strings as $_string) {
$string = $_encoding->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
- print "ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."
";
- print "CONV ENCODING: $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP')."
";
- print "CONV ENCODING (s): $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8')."
";
- print "CONV ENCODING (s,a-false): $_string: ".$_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false)."
";
+ print "ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "
";
+ print "CONV ENCODING: $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP') . "
";
+ print "CONV ENCODING (s): $_string: " . $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "
";
+ print "CONV ENCODING (s,a-false): $_string: "
+ . $_encoding->convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "
";
}
-print "ERROR CHAR: ".$_encoding->getErrorChar()."
";
+print "ERROR CHAR: " . $_encoding->getErrorChar() . "
";
// static
$encoding_class::setErrorChar('∴');
foreach ($enc_strings as $_string) {
$string = $encoding_class::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
- print "S::ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."
";
- print "S::CONV ENCODING: $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP')."
";
- print "S::CONV ENCODING (s): $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8')."
";
- print "S::CONV ENCODING (s,a-false): $_string: ".$encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false)."
";
+ print "S::ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "
";
+ print "S::CONV ENCODING: $_string: " . $encoding_class::convertEncoding($_string, 'ISO-2022-JP') . "
";
+ print "S::CONV ENCODING (s): $_string: "
+ . $encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8') . "
";
+ print "S::CONV ENCODING (s,a-false): $_string: "
+ . $encoding_class::convertEncoding($_string, 'ISO-2022-JP', 'UTF-8', false) . "
";
}
-print "S::ERROR CHAR: ".$encoding_class::getErrorChar()."
";
+print "S::ERROR CHAR: " . $encoding_class::getErrorChar() . "
";
// static use
$_string = $enc_strings[1];
$string = Encoding::checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
-print "S::ENC CHECK: $_string: ".($string === false ? '-OK-' : $string)."
";
+print "S::ENC CHECK: $_string: " . ($string === false ? '-OK-' : $string) . "
";
// DEPRECATED
/* $string = $basic->checkConvertEncoding($_string, 'UTF-8', 'ISO-2022-JP-MS');
diff --git a/www/admin/class_test.file.php b/www/admin/class_test.file.php
index 4f929652..07f44833 100644
--- a/www/admin/class_test.file.php
+++ b/www/admin/class_test.file.php
@@ -1,8 +1,11 @@
-";
print '';
$file = '/some/path/to/some/file.txt';
-print "GETFILENAMEENDING: $file: ".File::getFilenameEnding($file)."
";
-$file = getcwd().DIRECTORY_SEPARATOR.'class_test.file.php';
-print "GETLINESFROMFILE: $file: ".File::getLinesFromFile($file)."
";
+print "GETFILENAMEENDING: $file: " . File::getFilenameEnding($file) . "
";
+$file = getcwd() . DIRECTORY_SEPARATOR . 'class_test.file.php';
+print "GETLINESFROMFILE: $file: " . File::getLinesFromFile($file) . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.hash.php b/www/admin/class_test.hash.php
index a84ed069..aec85b70 100644
--- a/www/admin/class_test.hash.php
+++ b/www/admin/class_test.hash.php
@@ -1,8 +1,11 @@
-Class Test Master';
$to_crc = 'Some text block';
// static
-print "S::__CRC32B: $to_crc: ".$hash_class::__crc32b($to_crc)."
";
-print "S::__SHA1SHORT(off): $to_crc: ".$hash_class::__sha1short($to_crc)."
";
-print "S::__SHA1SHORT(on): $to_crc: ".$hash_class::__sha1short($to_crc, true)."
";
-print "S::__hash(d): $to_crc: ".$hash_class::__hash($to_crc)."
";
+print "S::__CRC32B: $to_crc: " . $hash_class::__crc32b($to_crc) . "
";
+print "S::__SHA1SHORT(off): $to_crc: " . $hash_class::__sha1short($to_crc) . "
";
+print "S::__SHA1SHORT(on): $to_crc: " . $hash_class::__sha1short($to_crc, true) . "
";
+print "S::__hash(d): $to_crc: " . $hash_class::__hash($to_crc) . "
";
foreach (['adler32', 'fnv132', 'fnv1a32', 'joaat'] as $__hash_c) {
- print "S::__hash($__hash_c): $to_crc: ".$hash_class::__hash($to_crc, $__hash_c)."
";
+ print "S::__hash($__hash_c): $to_crc: " . $hash_class::__hash($to_crc, $__hash_c) . "
";
}
// static use
-print "U-S::__CRC32B: $to_crc: ".Hash::__crc32b($to_crc)."
";
+print "U-S::__CRC32B: $to_crc: " . Hash::__crc32b($to_crc) . "
";
// DEPRECATED
/* print "D/__CRC32B: $to_crc: ".$basic->__crc32b($to_crc)."
";
diff --git a/www/admin/class_test.html.php b/www/admin/class_test.html.php
index b7190046..93be8ac5 100644
--- a/www/admin/class_test.html.php
+++ b/www/admin/class_test.html.php
@@ -1,9 +1,11 @@
";
print '';
$string = "Something < = > Other
Next line";
-print "HTMLENT: ".Html::htmlent($string).": ".$_html->htmlent($string)."
";
-print "REMOVELB: ".Html::htmlent($string).": ".$_html->removeLB($string)."
";
+print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . "
";
+print "REMOVELB: " . Html::htmlent($string) . ": " . $_html->removeLB($string) . "
";
$date_str = [2021, 5, 1, 11, 10];
-print "PRINTDATETIME: ".$_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."
";
+print "PRINTDATETIME: "
+ . $_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "
";
// STATIC
$string = "Something < = > Other
Next line";
-print "S::HTMLENT: ".Html::htmlent($string).": ".$html_class::htmlent($string)."
";
-print "S::REMOVELB: ".Html::htmlent($string).": ".$html_class::removeLB($string)."
";
+print "S::HTMLENT: " . Html::htmlent($string) . ": " . $html_class::htmlent($string) . "
";
+print "S::REMOVELB: " . Html::htmlent($string) . ": " . $html_class::removeLB($string) . "
";
$date_str = [2021, 5, 1, 11, 10];
-print "S::PRINTDATETIME: ".$elements_class::printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."
";
+print "S::PRINTDATETIME: "
+ . $elements_class::printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "
";
// STATIC use
-echo "U-S::HTML ENT INT: ".Html::htmlent(5)."
";
-echo "U-S::HTML ENT STRING: ".Html::htmlent('5<<>')."
";
-echo "U-S::HTML ENT NULL: ".Html::htmlent(null)."
";
+echo "U-S::HTML ENT INT: " . Html::htmlent(5) . "
";
+echo "U-S::HTML ENT STRING: " . Html::htmlent('5<<>') . "
";
+echo "U-S::HTML ENT NULL: " . Html::htmlent(null) . "
";
// check convert
$checked_list = [
@@ -67,8 +71,8 @@ $checked_list = [
['foo', ['bar']],
];
foreach ($checked_list as $check) {
- print "CHECKED(0): $check[0]: ".Html::checked($check[1], $check[0])."
";
- print "CHECKED(1): $check[0]: ".Html::checked($check[1], $check[0], 1)."
";
+ print "CHECKED(0): $check[0]: " . Html::checked($check[1], $check[0]) . "
";
+ print "CHECKED(1): $check[0]: " . Html::checked($check[1], $check[0], 1) . "
";
}
// magic link creation test
@@ -81,7 +85,7 @@ $magic_links = [
'http://www.somelink.com/?with=1234
Some Title',
];
foreach ($magic_links as $magic_link) {
- print "MAGICLINK: ".Html::htmlent($magic_link).": ".Html::htmlent(Elements::magicLinks($magic_link))."
";
+ print "MAGICLINK: " . Html::htmlent($magic_link) . ": " . Html::htmlent(Elements::magicLinks($magic_link)) . "
";
}
// DEPREACTED
@@ -89,7 +93,8 @@ foreach ($magic_links as $magic_link) {
print "D/HTMLENT: $string: ".$basic->htmlent($string)."
";
print "D/REMOVELB: $string: ".$basic->removeLB($string)."
";
$date_str = [2021, 5, 1, 11, 10];
-print "D/PRINTDATETIME: ".$basic->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."
";
+print "D/PRINTDATETIME: "
+ . $basic->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4])."
";
$magic_link = 'http://www.somelink.com/?with=1234|Some Title|';
print "D/MAGICLINK: ".Html::htmlent($basic->magicLinks($magic_link))."
";
*/
@@ -100,8 +105,8 @@ line breaks
in there. Theis
is sucky';
-print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text)."
";
-print "LB remove: ".\CoreLibs\Convert\Html::removeLB($text, '##BR##')."
";
+print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text) . "
";
+print "LB remove: " . \CoreLibs\Convert\Html::removeLB($text, '##BR##') . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.image.php b/www/admin/class_test.image.php
index 4c778c6b..61888392 100644
--- a/www/admin/class_test.image.php
+++ b/www/admin/class_test.image.php
@@ -1,8 +1,11 @@
-Class Test Master';
$thumb_width = 250;
$thumb_height = 300;
// class
-$image = BASE.LAYOUT.CONTENT_PATH.IMAGES.'no_picture_square.jpg';
+$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . 'no_picture_square.jpg';
// rotate image first
$_image->correctImageOrientation($image);
// thumbnail tests
-echo "CLASS->CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width
.)
CLASS->CREATETHUMBNAILSIMPLE: "
+ . basename($image) . ": WIDTH: $thumb_width
 . )
S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width
.)
S::CREATETHUMBNAILSIMPLE: "
+ . basename($image) . ": WIDTH: $thumb_width
 . )
";
// image thumbnail
@@ -76,17 +83,22 @@ $images = array(
// return mime type ala mimetype
$finfo = new finfo(FILEINFO_MIME_TYPE);
foreach ($images as $image) {
- $image = BASE.LAYOUT.CONTENT_PATH.IMAGES.$image;
+ $image = BASE . LAYOUT . CONTENT_PATH . IMAGES . $image;
list ($height, $width, $img_type) = getimagesize($image);
- echo "IMAGE INFO: ".$height."x".$width.", TYPE: ".$img_type." [".$finfo->file($image)."]
";
+ echo "IMAGE INFO: " . $height . "x" . $width . ", TYPE: "
+ . $img_type . " [" . $finfo->file($image) . "]
";
// rotate image first
Image::correctImageOrientation($image);
// thumbnail tests
- echo "".basename($image).": WIDTH: $thumb_width
.)
".basename($image).": HEIGHT: $thumb_height
.)
".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height
.)
" . basename($image) . ": WIDTH: $thumb_width
 . )
" . basename($image) . ": HEIGHT: $thumb_height
 . )
" . basename($image) . ": WIDTH/HEIGHT: $thumb_width x $thumb_height
 . )
".basename($image).": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)
.)
" . basename($image) . ": WIDTH/HEIGHT: $thumb_width x $thumb_height (+DUMMY)
 . )
";
}
@@ -96,7 +108,8 @@ foreach ($images as $image) {
// rotate image first
$basic->correctImageOrientation($image);
// thumbnail tests
-echo "S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width
.)
S::CREATETHUMBNAILSIMPLE: ".basename($image).": WIDTH: $thumb_width
.)
";
-print "S::JSON ERROR: ".Jason::jsonGetLastError().": ".Jason::jsonGetLastError(true)."
";
+print "S::JSON: $json: " . DgS::printAr($output) . "
";
+print "S::JSON ERROR: " . Jason::jsonGetLastError() . ": " . Jason::jsonGetLastError(true) . "
";
$json = '["f: {b"""ar}]';
$output = Jason::jsonConvertToArray($json);
-print "S::E-JSON: $json: ".DgS::printAr($output)."
";
-print "S::E-JSON ERROR: ".Jason::jsonGetLastError().": ".Jason::jsonGetLastError(true)."
";
+print "S::E-JSON: $json: " . DgS::printAr($output) . "
";
+print "S::E-JSON ERROR: " . Jason::jsonGetLastError() . ": " . Jason::jsonGetLastError(true) . "
";
// direct
$json = '{"direct": "static function call"}';
$output = $json_class::jsonConvertToArray($json);
-print "J/S::JSON: $json: ".DgS::printAr($output)."
";
-print "J/S::JSON ERROR: ".$json_class::jsonGetLastError().": ".$json_class::jsonGetLastError(true)."
";
+print "J/S::JSON: $json: " . DgS::printAr($output) . "
";
+print "J/S::JSON ERROR: " . $json_class::jsonGetLastError() . ": " . $json_class::jsonGetLastError(true) . "
";
$json = '["f: {b"""ar}]';
$output = $json_class::jsonConvertToArray($json);
-print "J/S::E-JSON: $json: ".DgS::printAr($output)."
";
-print "J/S::E-JSON ERROR: ".$json_class::jsonGetLastError().": ".$json_class::jsonGetLastError(true)."
";
+print "J/S::E-JSON: $json: " . DgS::printAr($output) . "
";
+print "J/S::E-JSON ERROR: " . $json_class::jsonGetLastError() . ": " . $json_class::jsonGetLastError(true) . "
";
// DEPRECATE TEST
/* $json = '["f: {b"""ar}]';
diff --git a/www/admin/class_test.lang.php b/www/admin/class_test.lang.php
index 71ead5c5..5e3d27d9 100644
--- a/www/admin/class_test.lang.php
+++ b/www/admin/class_test.lang.php
@@ -1,9 +1,11 @@
Class Test Master';
$string = 'INPUT TEST';
-echo "LANGUAGE SET: ".$l->__getLang()."
";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."
";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."
";
+echo "LANGUAGE SET: " . $l->__getLang() . "
";
+echo "LANGUAGE FILE: " . $l->__getMoFile() . "
";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "
";
// switch to other language
$lang = 'ja_utf8';
$l->l10nReloadMOfile($lang);
-echo "LANGUAGE SET: ".$l->__getLang()."
";
-echo "LANGUAGE FILE: ".$l->__getMoFile()."
";
-echo "INPUT TEST: ".$string." => ".$l->__($string)."
";
+echo "LANGUAGE SET: " . $l->__getLang() . "
";
+echo "LANGUAGE FILE: " . $l->__getMoFile() . "
";
+echo "INPUT TEST: " . $string . " => " . $l->__($string) . "
";
// TODO: run compare check input must match output
// error message
diff --git a/www/admin/class_test.math.php b/www/admin/class_test.math.php
index 1378228e..b73ce4bb 100644
--- a/www/admin/class_test.math.php
+++ b/www/admin/class_test.math.php
@@ -1,8 +1,11 @@
-TEST CLASS: MATH";
print "";
print '';
-print "FCEIL: ".$_math->fceil(5.1234567890, 5)."
";
-print "FLOORP: ".$_math->floorp(5123456, -3)."
";
-print "INITNUMERIC: ".$_math->initNumeric('123')."
";
+print "FCEIL: " . $_math->fceil(5.1234567890, 5) . "
";
+print "FLOORP: " . $_math->floorp(5123456, -3) . "
";
+print "INITNUMERIC: " . $_math->initNumeric('123') . "
";
-print "S-FCEIL: ".$math_class::fceil(5.1234567890, 5)."
";
-print "S-FLOORP: ".$math_class::floorp(5123456, -3)."
";
-print "S-INITNUMERIC: ".$math_class::initNumeric('123')."
";
+print "S-FCEIL: " . $math_class::fceil(5.1234567890, 5) . "
";
+print "S-FLOORP: " . $math_class::floorp(5123456, -3) . "
";
+print "S-INITNUMERIC: " . $math_class::initNumeric('123') . "
";
// DEPRECATED
/* print "FCEIL: ".$basic->fceil(5.1234567890, 5)."
";
diff --git a/www/admin/class_test.mime.php b/www/admin/class_test.mime.php
index ebca3092..e7726f12 100644
--- a/www/admin/class_test.mime.php
+++ b/www/admin/class_test.mime.php
@@ -1,8 +1,11 @@
-";
print '';
$mime = 'application/illustrator';
-print "MIME $mime: ".$_mime->mimeGetAppName($mime)."
";
+print "MIME $mime: " . $_mime->mimeGetAppName($mime) . "
";
$mime = 'fake/mime';
$_mime->mimeSetAppName($mime, 'This is a fake mime');
-print "MIME $mime: ".$_mime->mimeGetAppName($mime)."
";
+print "MIME $mime: " . $_mime->mimeGetAppName($mime) . "
";
// mime test
$mime = 'application/vnd.ms-excel';
-print "App for mime $mime: ".$_mime->mimeGetAppName($mime)."
";
+print "App for mime $mime: " . $_mime->mimeGetAppName($mime) . "
";
$_mime->mimeSetAppName($mime, 'Microsoft (better) Excel');
-print "App for mime changed $mime: ".$_mime->mimeGetAppName($mime)."
";
+print "App for mime changed $mime: " . $_mime->mimeGetAppName($mime) . "
";
// static call test
$mime = 'application/x-indesign';
-print "S::App for mime $mime: ".\CoreLibs\Convert\MimeAppName::mimeGetAppName($mime)."
";
+print "S::App for mime $mime: " . \CoreLibs\Convert\MimeAppName::mimeGetAppName($mime) . "
";
$mime = 'application/vnd.ms-excel';
-print "S::App for mime $mime: ".\CoreLibs\Convert\MimeAppName::mimeGetAppName($mime)."
";
+print "S::App for mime $mime: " . \CoreLibs\Convert\MimeAppName::mimeGetAppName($mime) . "
";
// DEPRECATED
/* $mime = 'application/illustrator';
diff --git a/www/admin/class_test.output.form.php b/www/admin/class_test.output.form.php
index 3646e90f..c7c8ef8a 100644
--- a/www/admin/class_test.output.form.php
+++ b/www/admin/class_test.output.form.php
@@ -1,9 +1,11 @@
TEST CLASS: FORM GENERATE";
print "";
print '';
-print "MOBILE PHONE: ".$form->mobile_phone."
";
-print "MY PAGE NAME: ".$form->my_page_name."
"; // sets table array to include
+print "MOBILE PHONE: " . $form->mobile_phone . "
";
+// sets table array to include
+print "MY PAGE NAME: " . $form->my_page_name . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.password.php b/www/admin/class_test.password.php
index 5872bd67..787e5a78 100644
--- a/www/admin/class_test.password.php
+++ b/www/admin/class_test.password.php
@@ -1,8 +1,11 @@
-Class Test Master';
$password = 'something1234';
$enc_password = $_password->passwordSet($password);
-print "PASSWORD: $password: ".$enc_password."
";
-print "PASSWORD VERIFY: ".(string)$_password->passwordVerify($password, $enc_password)."
";
-print "PASSWORD REHASH: ".(string)$_password->passwordRehashCheck($enc_password)."
";
+print "PASSWORD: $password: " . $enc_password . "
";
+print "PASSWORD VERIFY: " . (string)$_password->passwordVerify($password, $enc_password) . "
";
+print "PASSWORD REHASH: " . (string)$_password->passwordRehashCheck($enc_password) . "
";
// static verify
$password = 'othername7890';
$enc_password = $password_class::passwordSet($password);
-print "PASSWORD: $password: ".$enc_password."
";
-print "S-PASSWORD VERIFY: ".(string)$password_class::passwordVerify($password, $enc_password)."
";
-print "PASSWORD REHASH: ".(string)$password_class::passwordRehashCheck($enc_password)."
";
+print "PASSWORD: $password: " . $enc_password . "
";
+print "S-PASSWORD VERIFY: " . (string)$password_class::passwordVerify($password, $enc_password) . "
";
+print "PASSWORD REHASH: " . (string)$password_class::passwordRehashCheck($enc_password) . "
";
// direct static
-print "S::PASSWORD VERFIY: ".(string)PwdChk::passwordVerify($password, $enc_password)."
";
+print "S::PASSWORD VERFIY: " . (string)PwdChk::passwordVerify($password, $enc_password) . "
";
// DEPRECATED
/* $password = 'deprecated4567';
diff --git a/www/admin/class_test.php b/www/admin/class_test.php
index 66e75369..97574db4 100644
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -1,9 +1,11 @@
Class Test: SMARTY';
// set + check edit access id
$edit_access_id = 3;
if (is_object($login) && isset($login->acl['unit'])) {
- print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), true)."
";
- print "ACCESS CHECK: ".(string)$login->loginCheckEditAccess($edit_access_id)."
";
+ print "ACL UNIT: " . print_r(array_keys($login->acl['unit']), true) . "
";
+ print "ACCESS CHECK: " . (string)$login->loginCheckEditAccess($edit_access_id) . "
";
if ($login->loginCheckEditAccess($edit_access_id)) {
$basic->edit_access_id = $edit_access_id;
} else {
@@ -79,7 +81,8 @@ if (is_object($login) && isset($login->acl['unit'])) {
// $basic->log->debug('SESSION', \CoreLibs\Debug\Support::printAr($_SESSION));
print '';
@@ -87,38 +90,48 @@ print '';
foreach (['on', 'off'] as $flag) {
foreach (['debug', 'echo', 'print'] as $type) {
$prefix = $flag == 'off' ? 'NOT ' : '';
- print $prefix.strtoupper($type).' OUT: '.\CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)).'
';
+ print $prefix . strtoupper($type) . ' OUT: '
+ . \CoreLibs\Debug\Support::printAr($basic->log->getLogLevel($type, $flag)) . '
';
}
}
foreach (['debug', 'echo', 'print'] as $type) {
- print strtoupper($type).' OUT ALL: '.$basic->log->getLogLevelAll($type).'
';
+ print strtoupper($type) . ' OUT ALL: ' . $basic->log->getLogLevelAll($type) . '
';
}
$basic->log->debug('SOME MARK', 'Some error output');
// INTERNAL SET
-print "EDIT ACCESS ID: ".$basic->edit_access_id."
";
+print "EDIT ACCESS ID: " . $basic->edit_access_id . "
";
if (is_object($login)) {
// print "ACL:
".$basic->print_ar($login->acl)."
";
- $basic->log->debug('ACL', "ACL: ".\CoreLibs\Debug\Support::printAr($login->acl));
+ $basic->log->debug('ACL', "ACL: " . \CoreLibs\Debug\Support::printAr($login->acl));
// print "DEFAULT ACL:
".$basic->print_ar($login->default_acl_list)."
";
// print "DEFAULT ACL:
".$basic->print_ar($login->default_acl_list)."
";
- // $result = array_flip(array_filter(array_flip($login->default_acl_list), function ($key) { if (is_numeric($key)) return $key; }));
+ // $result = array_flip(
+ // array_filter(
+ // array_flip($login->default_acl_list),
+ // function ($key) {
+ // if (is_numeric($key)) {
+ // return $key;
+ // }
+ // }
+ // )
+ // );
// print "DEFAULT ACL:
".$basic->print_ar($result)."
";
// DEPRICATED CALL
// $basic->adbSetACL($login->acl);
}
-print "THIS HOST: ".HOST_NAME.", with PROTOCOL: ".HOST_PROTOCOL." is running SSL: ".HOST_SSL."
";
-print "DIR: ".DIR."
";
-print "BASE: ".BASE."
";
-print "ROOT: ".ROOT."
";
-print "HOST: ".HOST_NAME." => DB HOST: ".DB_CONFIG_NAME." => ".print_r(DB_CONFIG, true)."
";
+print "THIS HOST: " . HOST_NAME . ", with PROTOCOL: " . HOST_PROTOCOL . " is running SSL: " . HOST_SSL . "
";
+print "DIR: " . DIR . "
";
+print "BASE: " . BASE . "
";
+print "ROOT: " . ROOT . "
";
+print "HOST: " . HOST_NAME . " => DB HOST: " . DB_CONFIG_NAME . " => " . print_r(DB_CONFIG, true) . "
";
$ds = defined('DS') ? DS : DIRECTORY_SEPARATOR;
$du = DS ?? DIRECTORY_SEPARATOR;
-print "DS is: ".$ds."
";
-print "SERVER HOST: ".$_SERVER['HTTP_HOST']."
";
+print "DS is: " . $ds . "
";
+print "SERVER HOST: " . $_SERVER['HTTP_HOST'] . "
";
// print error messages
// print $login->log->printErrorMsg();
diff --git a/www/admin/class_test.phpv.php b/www/admin/class_test.phpv.php
index 190eb639..280432da 100644
--- a/www/admin/class_test.phpv.php
+++ b/www/admin/class_test.phpv.php
@@ -1,8 +1,11 @@
-checkPHPVersion($min_version)."
";
-print "MIN/MAX: $min_version/$max_version: ".(string)$_phpv->checkPHPVersion($min_version, $max_version)."
";
-print "MIN/S: $min_version_s: ".(string)$_phpv->checkPHPVersion($min_version_s)."
";
-print "MIN/SS: $min_version_ss: ".(string)$_phpv->checkPHPVersion($min_version_ss)."
";
+print "MIN: $min_version: " . (string)$_phpv->checkPHPVersion($min_version) . "
";
+print "MIN/MAX: $min_version/$max_version: " . (string)$_phpv->checkPHPVersion($min_version, $max_version) . "
";
+print "MIN/S: $min_version_s: " . (string)$_phpv->checkPHPVersion($min_version_s) . "
";
+print "MIN/SS: $min_version_ss: " . (string)$_phpv->checkPHPVersion($min_version_ss) . "
";
// static
-print "S::MIN: $min_version: ".(string)$phpv_class::checkPHPVersion($min_version)."
";
-print "S::MIN/MAX: $min_version/$max_version: ".(string)$phpv_class::checkPHPVersion($min_version, $max_version)."
";
-print "S::MIN/S: $min_version_s: ".(string)$phpv_class::checkPHPVersion($min_version_s)."
";
-print "S::MIN/SS: $min_version_ss: ".(string)$phpv_class::checkPHPVersion($min_version_ss)."
";
+print "S::MIN: $min_version: " . (string)$phpv_class::checkPHPVersion($min_version) . "
";
+print "S::MIN/MAX: $min_version/$max_version: "
+ . (string)$phpv_class::checkPHPVersion($min_version, $max_version) . "
";
+print "S::MIN/S: $min_version_s: " . (string)$phpv_class::checkPHPVersion($min_version_s) . "
";
+print "S::MIN/SS: $min_version_ss: " . (string)$phpv_class::checkPHPVersion($min_version_ss) . "
";
// use stats
-print "U-S::MIN: $min_version: ".(string)PhpVersion::checkPHPVersion($min_version)."
";
+print "U-S::MIN: $min_version: " . (string)PhpVersion::checkPHPVersion($min_version) . "
";
// DEPRECATED
// print "MIN: $min_version: ".(string)$basic->checkPHPVersion($min_version)."
";
diff --git a/www/admin/class_test.randomkey.php b/www/admin/class_test.randomkey.php
index 94330536..ef555541 100644
--- a/www/admin/class_test.randomkey.php
+++ b/www/admin/class_test.randomkey.php
@@ -1,8 +1,11 @@
-Class Test Master';
$key_length = 10;
$key_length_b = 5;
-print "S::RANDOMKEYGEN(auto): ".RandomKey::randomKeyGen()."
";
-print "S::SETRANDOMKEYLENGTH($key_length): ".RandomKey::setRandomKeyLength($key_length)."
";
-print "S::RANDOMKEYGEN($key_length): ".RandomKey::randomKeyGen()."
";
-print "S::RANDOMKEYGEN($key_length_b): ".RandomKey::randomKeyGen($key_length_b)."
";
-print "S::RANDOMKEYGEN($key_length): ".RandomKey::randomKeyGen()."
";
-$_array= new CoreLibs\Create\RandomKey();
-print "C->RANDOMKEYGEN(auto): ".$_array->randomKeyGen()."
";
+print "S::RANDOMKEYGEN(auto): " . RandomKey::randomKeyGen() . "
";
+print "S::SETRANDOMKEYLENGTH($key_length): " . RandomKey::setRandomKeyLength($key_length) . "
";
+print "S::RANDOMKEYGEN($key_length): " . RandomKey::randomKeyGen() . "
";
+print "S::RANDOMKEYGEN($key_length_b): " . RandomKey::randomKeyGen($key_length_b) . "
";
+print "S::RANDOMKEYGEN($key_length): " . RandomKey::randomKeyGen() . "
";
+$_array = new CoreLibs\Create\RandomKey();
+print "C->RANDOMKEYGEN(auto): " . $_array->randomKeyGen() . "
";
// DEPRECATED
// print "D\RANDOMKEYGEN(auto): ".$basic->randomKeyGen()."
";
diff --git a/www/admin/class_test.runningtime.php b/www/admin/class_test.runningtime.php
index 733b3340..d4f265dd 100644
--- a/www/admin/class_test.runningtime.php
+++ b/www/admin/class_test.runningtime.php
@@ -1,8 +1,11 @@
-Class Test Master';
RunningTime::hrRunningTime();
RunningTime::runningTime();
-echo "RANDOM KEY [50]: ".\CoreLibs\Create\RandomKey::randomKeyGen(50)."
";
-echo "TIMED [hr]: ".RunningTime::hrRunningTime()."
";
-echo "TIMED [def]: ".RunningTime::runningTime()."
";
-echo "TIMED [string]: ".RunningTime::runningTimeString()."
";
+echo "RANDOM KEY [50]: " . \CoreLibs\Create\RandomKey::randomKeyGen(50) . "
";
+echo "TIMED [hr]: " . RunningTime::hrRunningTime() . "
";
+echo "TIMED [def]: " . RunningTime::runningTime() . "
";
+echo "TIMED [string]: " . RunningTime::runningTimeString() . "
";
RunningTime::hrRunningTime();
-echo "RANDOM KEY [default]: ".\CoreLibs\Create\RandomKey::randomKeyGen()."
";
-echo "TIMED [hr]: ".RunningTime::hrRunningTime()."
";
+echo "RANDOM KEY [default]: " . \CoreLibs\Create\RandomKey::randomKeyGen() . "
";
+echo "TIMED [hr]: " . RunningTime::hrRunningTime() . "
";
// DEPRECATED
/* $basic->hrRunningTime();
diff --git a/www/admin/class_test.smarty.php b/www/admin/class_test.smarty.php
index ea337dea..c82b6bd1 100644
--- a/www/admin/class_test.smarty.php
+++ b/www/admin/class_test.smarty.php
@@ -1,9 +1,11 @@
TEST CLASS: SYSTEM";
print "";
print '';
-print "GETHOSTNAME: ".DgS::printAr(System::getHostName())."
";
-print "GETPAGENAME(0): ".System::getPageName()."
";
-print "GETPAGENAME(1): ".System::getPageName(1)."
";
-print "GETPAGENAME(2): ".System::getPageName(2)."
";
-print "GETPAGENAMEARRAY: ".\CoreLibs\Debug\Support::printAr(System::getPageNameArray())."
";
+print "GETHOSTNAME: " . DgS::printAr(System::getHostName()) . "
";
+print "GETPAGENAME(0): " . System::getPageName() . "
";
+print "GETPAGENAME(1): " . System::getPageName(1) . "
";
+print "GETPAGENAME(2): " . System::getPageName(2) . "
";
+print "GETPAGENAMEARRAY: " . \CoreLibs\Debug\Support::printAr(System::getPageNameArray()) . "
";
// seting errro codes file upload
-print "FILEUPLOADERRORMESSAGE(): ".System::fileUploadErrorMessage(-1)."
";
-print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): ".System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE)."
";
+print "FILEUPLOADERRORMESSAGE(): " . System::fileUploadErrorMessage(-1) . "
";
+print "FILEUPLOADERRORMESSAGE(UPLOAD_ERR_CANT_WRITE): "
+ . System::fileUploadErrorMessage(UPLOAD_ERR_CANT_WRITE) . "
";
// error message
print $basic->log->printErrorMsg();
diff --git a/www/admin/class_test.token.php b/www/admin/class_test.token.php
index 78e818bd..7d6e763a 100644
--- a/www/admin/class_test.token.php
+++ b/www/admin/class_test.token.php
@@ -1,8 +1,11 @@
-Class Test Master';
$token = 'test_form_token';
$token_id = $_token->setFormToken($token);
-print "TOKEN: $token: (ID) ".$token_id." => (S) ".$_SESSION[$token]."
";
-print "VALIDATE: $token: ".(string)$_token->validateFormToken($token_id, $token)."
";
+print "TOKEN: $token: (ID) " . $token_id . " => (S) " . $_SESSION[$token] . "
";
+print "VALIDATE: $token: " . (string)$_token->validateFormToken($token_id, $token) . "
";
$token = 'test_form_token_static';
$token_id = $token_class::setFormToken($token);
-print "S-TOKEN: $token: (ID) ".$token_id." => (S) ".$_SESSION[$token]."
";
-print "S-VALIDATE: $token: ".(string)$token_class::validateFormToken($token_id, $token)."
";
+print "S-TOKEN: $token: (ID) " . $token_id . " => (S) " . $_SESSION[$token] . "
";
+print "S-VALIDATE: $token: " . (string)$token_class::validateFormToken($token_id, $token) . "
";
// DEPRECATED
/* $token = 'test_form_token_deprecated';
diff --git a/www/admin/class_test.uids.php b/www/admin/class_test.uids.php
index 74fec0bb..f1f20b47 100644
--- a/www/admin/class_test.uids.php
+++ b/www/admin/class_test.uids.php
@@ -1,8 +1,11 @@
-";
print '';
// class
-print "UUIDV4: ".$_uids->uuidv4()."
";
-print "UNIQID (d): ".$_uids->uniqId()."
";
-print "UNIQID (md5): ".$_uids->uniqId('md5')."
";
-print "UNIQID (sha256): ".$_uids->uniqId('sha256')."
";
+print "UUIDV4: " . $_uids->uuidv4() . "
";
+print "UNIQID (d): " . $_uids->uniqId() . "
";
+print "UNIQID (md5): " . $_uids->uniqId('md5') . "
";
+print "UNIQID (sha256): " . $_uids->uniqId('sha256') . "
";
// statc
-print "S::UUIDV4: ".$uids_class::uuidv4()."
";
-print "S::UNIQID (d): ".$uids_class::uniqId()."
";
-print "S::UNIQID (md5): ".$uids_class::uniqId('md5')."
";
-print "S::UNIQID (sha256): ".$uids_class::uniqId('sha256')."
";
+print "S::UUIDV4: " . $uids_class::uuidv4() . "
";
+print "S::UNIQID (d): " . $uids_class::uniqId() . "
";
+print "S::UNIQID (md5): " . $uids_class::uniqId('md5') . "
";
+print "S::UNIQID (sha256): " . $uids_class::uniqId('sha256') . "
";
// DEPRECATED
/* print "D/UUIDV4: ".$basic->uuidv4()."
";
print "/DUNIQID (d): ".$basic->uniqId()."
"; */
diff --git a/www/admin/error_test.php b/www/admin/error_test.php
index 8844ff45..02e2c0dc 100644
--- a/www/admin/error_test.php
+++ b/www/admin/error_test.php
@@ -1,4 +1,6 @@
-";
-require(BASE.LIB."Error.Handling.php");
+echo "FILE: " . BASE . LIB . "Error.Handling.php
";
+require(BASE . LIB . "Error.Handling.php");
if ($var) {
echo "OUT
";
diff --git a/www/admin/phan_test.php b/www/admin/phan_test.php
index 90b8e0e3..cdd5e311 100755
--- a/www/admin/phan_test.php
+++ b/www/admin/phan_test.php
@@ -1,7 +1,9 @@
-StringByteFormat(ini_get('upload_max_filesize'));
// test for qqFileUploader (AJAX side)
$allowedExtensions = array ('csv', 'zip', 'jpg', 'pdf', 'bz2');
$sizeLimit = $MAX_UPLOAD_SIZE; // as set in php ini
-$base->debug('AJAX UPLOAD', 'Size: '.$sizeLimit.', Memory Limit: '.ini_get('memory_limit'));
+$base->debug('AJAX UPLOAD', 'Size: ' . $sizeLimit . ', Memory Limit: ' . ini_get('memory_limit'));
$uploader = new FileUpload\qqFileUploader($allowedExtensions, $sizeLimit);
// either in post or get
-$_action= $_POST['action'] ? $_POST['action'] : $_GET['action'];
+$_action = $_POST['action'] ? $_POST['action'] : $_GET['action'];
$_task_uid = $_POST['task_uid'] ? $_POST['task_uid'] : $_GET['task_uid'];
$get_post['start'] = microtime(true);
-$base->debug('AJAX UPLOAD', 'Action: '.$_action.', Task UID: '.$_task_uid.' => '.$base->dateStringFormat($get_post['start']));
+$base->debug('AJAX UPLOAD', 'Action: ' . $_action . ', Task UID: '
+ . $_task_uid . ' => ' . $base->dateStringFormat($get_post['start']));
-$upload_path = ROOT.MEDIA.UPLOADS;
+$upload_path = ROOT . MEDIA . UPLOADS;
$get_post['result'] = $uploader->handleUpload($upload_path, false);
-$base->debug('AJAX UPLOAD', 'Memory peak: '.$base->ByteStringFormat(memory_get_usage()).' | '.$base->ByteStringFormat(memory_get_peak_usage()));
+$base->debug('AJAX UPLOAD', 'Memory peak: ' . $base->ByteStringFormat(memory_get_usage())
+ . ' | ' . $base->ByteStringFormat(memory_get_peak_usage()));
// set file name
$get_post['filename'] = $uploader->uploadFileName;
diff --git a/www/admin/qq_file_upload_front.php b/www/admin/qq_file_upload_front.php
index cbb5eb3e..cb21033a 100755
--- a/www/admin/qq_file_upload_front.php
+++ b/www/admin/qq_file_upload_front.php
@@ -10,7 +10,7 @@ require 'config.php';
$base = new CoreLibs\Basic();
// set max upload size
$MAX_UPLOAD_SIZE = $base->StringByteFormat(ini_get('upload_max_filesize'));
-$base->debug('UPLOADED FRONT', 'With max size: '.$MAX_UPLOAD_SIZE);
+$base->debug('UPLOADED FRONT', 'With max size: ' . $MAX_UPLOAD_SIZE);
// very basic template output with super basic div for two file upload
?>
diff --git a/www/configs/config.db.php b/www/configs/config.db.php
index b5f51467..012c1195 100755
--- a/www/configs/config.db.php
+++ b/www/configs/config.db.php
@@ -1,4 +1,5 @@
- [
diff --git a/www/configs/config.host.php b/www/configs/config.host.php
index c9f4b09e..beaadab1 100755
--- a/www/configs/config.host.php
+++ b/www/configs/config.host.php
@@ -1,4 +1,5 @@
- '',
diff --git a/www/configs/config.master.php b/www/configs/config.master.php
index d0c49679..81891cec 100644
--- a/www/configs/config.master.php
+++ b/www/configs/config.master.php
@@ -1,4 +1,5 @@
-);
/************* CONVERT *******************/
@@ -18,9 +21,9 @@ $paths = [
];
// find convert
foreach ($paths as $path) {
- if (file_exists($path.DS.'convert') && is_file($path.DS.'convert')) {
+ if (file_exists($path . DS . 'convert') && is_file($path . DS . 'convert')) {
// image magick convert location
- define('CONVERT', $path.DS.'convert');
+ define('CONVERT', $path . DS . 'convert');
}
}
unset($paths);
diff --git a/www/configs/config.path.php b/www/configs/config.path.php
index 50e9fb4d..82740f4e 100755
--- a/www/configs/config.path.php
+++ b/www/configs/config.path.php
@@ -1,4 +1,5 @@
- bail
$CONFIG_PATH_PREFIX = '';
-for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos ++) {
- $CONFIG_PATH_PREFIX .= '..'.DIRECTORY_SEPARATOR;
- if (file_exists($CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php')) {
- require $CONFIG_PATH_PREFIX.CONFIG_PATH.'config.master.php';
+for ($dir_pos = 0, $dir_max = count(explode(DIRECTORY_SEPARATOR, __DIR__)); $dir_pos <= $dir_max; $dir_pos++) {
+ $CONFIG_PATH_PREFIX .= '..' . DIRECTORY_SEPARATOR;
+ if (file_exists($CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php')) {
+ require $CONFIG_PATH_PREFIX . CONFIG_PATH . 'config.master.php';
break;
}
}
@@ -24,8 +26,8 @@ if (!defined('DS')) {
}
// find trigger name "admin/" or "frontend/" in the getcwd() folder
foreach (['admin', 'frontend'] as $folder) {
- if (strstr(getcwd(), DS.$folder)) {
- define('CONTENT_PATH', $folder.DS);
+ if (strstr(getcwd(), DS . $folder)) {
+ define('CONTENT_PATH', $folder . DS);
break;
}
}
diff --git a/www/frontend/index.php b/www/frontend/index.php
index 78cd824c..c4441331 100644
--- a/www/frontend/index.php
+++ b/www/frontend/index.php
@@ -1,3 +1,5 @@
- 'Mon',
2 => 'Tue',
diff --git a/www/includes/admin_footer.php b/www/includes/admin_footer.php
index 96c50d9e..c88b5a5f 100644
--- a/www/includes/admin_footer.php
+++ b/www/includes/admin_footer.php
@@ -1,4 +1,5 @@
-log->printErrorMsg();
echo $cms->log->printErrorMsg();
diff --git a/www/includes/admin_header.php b/www/includes/admin_header.php
index 395e32b1..f34f1219 100644
--- a/www/includes/admin_header.php
+++ b/www/includes/admin_header.php
@@ -1,4 +1,5 @@
-.log
if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) {
- include BASE.LIBS."Error.Handling.php";
+ include BASE . LIBS . "Error.Handling.php";
}
// predefine vars
$messages = array();
@@ -21,7 +24,7 @@ $messages = array();
ob_start();
// set the session name
$SET_SESSION_NAME = EDIT_SESSION_NAME;
-$LOG_FILE_ID = BASE_NAME.'Admin';
+$LOG_FILE_ID = BASE_NAME . 'Admin';
//------------------------------ library include end
//------------------------------ basic variable settings start
@@ -37,7 +40,7 @@ if (!isset($ENCODING) || !$ENCODING) {
}
// end the stop of the output flow, but only if we didn't request a csv file download
if (isset($_POST['action']) && $_POST['action'] != 'download_csv' && !$AJAX_PAGE) {
- header("Content-type: text/html; charset=".$ENCODING);
+ header("Content-type: text/html; charset=" . $ENCODING);
}
if ($AJAX_PAGE && !$ZIP_STREAM) {
header("Content-Type: application/json; charset=UTF-8");
diff --git a/www/includes/admin_set_paths.php b/www/includes/admin_set_paths.php
index 760c725f..9ebc58ff 100644
--- a/www/includes/admin_set_paths.php
+++ b/www/includes/admin_set_paths.php
@@ -1,4 +1,5 @@
-setSmartyVarsAdmin(); or setSmartyVarsFrontend();', E_USER_DEPRECATED);
+trigger_error(
+ 'admin_smarty.php is deprecated. Use SmartyExtended->setSmartyVarsAdmin(); or setSmartyVarsFrontend();',
+ E_USER_DEPRECATED
+);
$smarty->setSmartyVarsAdmin();
// __END__
diff --git a/www/includes/edit_base.php b/www/includes/edit_base.php
index 9127bde3..17b3c464 100644
--- a/www/includes/edit_base.php
+++ b/www/includes/edit_base.php
@@ -1,4 +1,5 @@
-setTemplateDir(BASE.INCLUDES.TEMPLATES.CONTENT_PATH);
- $DATA['css'] = LAYOUT.CSS;
- $DATA['js'] = LAYOUT.JS;
+ $smarty->setTemplateDir(BASE . INCLUDES . TEMPLATES . CONTENT_PATH);
+ $DATA['css'] = LAYOUT . CSS;
+ $DATA['js'] = LAYOUT . JS;
} else {
$smarty->setTemplateDir(TEMPLATES);
$DATA['css'] = CSS;
@@ -115,17 +121,22 @@ if ($form->my_page_name == 'edit_order') {
// this gets temp, id before that, gets actual (moves one "down")
// this gets the old before (moves one "up")
// is done for every element in row
- // echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")
";
+ // echo "A: ".$row_data_id[$position[$i]]
+ // ." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]
+ // ." (".$row_data_order[$position[$i]-1].")
";
$temp_id = $row_data_id[$position[$i]] ?? null;
$row_data_id[$position[$i]] = $row_data_id[$position[$i] - 1] ?? null;
$row_data_id[$position[$i] - 1] = $temp_id;
- // echo "A: ".$row_data_id[$position[$i]]." (".$row_data_order[$position[$i]].") -- ".$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")
";
+ // echo "A: ".$row_data_id[$position[$i]]
+ // ." (".$row_data_order[$position[$i]].") -- "
+ // .$row_data_id[$position[$i]-1]." (".$row_data_order[$position[$i]-1].")
";
} // for
} // if up
- // the last position id from position array is not to be the count-1 of row_data_id array, or it is the last element
+ // the last position id from position array is not to be the count - 1 of
+ // row_data_id array, or it is the last element
if (isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1))) {
- for ($i = count($position) - 1; $i >= 0; $i --) {
+ for ($i = count($position) - 1; $i >= 0; $i--) {
// same as up, just up in other way, starts from bottom (last element) and moves "up"
// element before actuel gets temp, this element, becomes element after this,
// element after this, gets this
@@ -136,12 +147,15 @@ if ($form->my_page_name == 'edit_order') {
} // if down
// write data ... (which has to be abstrackt ...)
- if ((isset($up) && $position[0] > 0) ||
+ if (
+ (isset($up) && $position[0] > 0) ||
(isset($down) && ($position[count($position) - 1] != (count($row_data_id) - 1)))
) {
- for ($i = 0; $i < count($row_data_id); $i ++) {
+ for ($i = 0; $i < count($row_data_id); $i++) {
if (isset($row_data_order[$i]) && isset($row_data_id[$i])) {
- $q = "UPDATE ".$table_name." SET order_number = ".$row_data_order[$i]." WHERE ".$table_name."_id = ".$row_data_id[$i];
+ $q = "UPDATE " . $table_name
+ . " SET order_number = " . $row_data_order[$i]
+ . " WHERE " . $table_name . "_id = " . $row_data_id[$i];
$q = $form->dbExec($q);
}
} // for all article ids ...
@@ -149,7 +163,7 @@ if ($form->my_page_name == 'edit_order') {
} // if there is something to move
// get ...
- $q = "SELECT ".$table_name."_id, name, order_number FROM ".$table_name." ";
+ $q = "SELECT " . $table_name . "_id, name, order_number FROM " . $table_name . " ";
if (!empty($where_string)) {
$q .= "WHERE $where_string ";
}
@@ -163,7 +177,7 @@ if ($form->my_page_name == 'edit_order') {
// DB read data for menu
while ($res = $form->dbReturn($q)) {
$row_data[] = [
- "id" => $res[$table_name."_id"],
+ "id" => $res[$table_name . "_id"],
"name" => $res["name"],
"order" => $res["order_number"]
];
@@ -187,13 +201,14 @@ if ($form->my_page_name == 'edit_order') {
$DATA['form_error_msg'] = $messages;
// all the row data
- for ($i = 0; $i < count($row_data); $i ++) {
+ for ($i = 0; $i < count($row_data); $i++) {
$options_id[] = $i;
$options_name[] = $row_data[$i]['name'];
// list of points to order
for ($j = 0; $j < count($position); $j++) {
// if matches, put into select array
- if (isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
+ if (
+ isset($original_id[$position[$j]]) && isset($row_data[$i]['id']) &&
$original_id[$position[$j]] == $row_data[$i]['id']
) {
$options_selected[] = $i;
@@ -288,11 +303,11 @@ if ($form->my_page_name == 'edit_order') {
(isset($data['hostname']) && $data['hostname'] ?
$data['hostname'] :
''
- ).
+ )
// filename
- ($data['filename'] ?? '').
+ . ($data['filename'] ?? '')
// query string
- (isset($data['query_string']) && $data['query_string'] ?
+ . (isset($data['query_string']) && $data['query_string'] ?
$data['query_string'] :
''
);
@@ -302,7 +317,8 @@ if ($form->my_page_name == 'edit_order') {
$menu_data[$i]['splitfactor_in'] = 0;
}
// on matching, we also need to check if we are in the same folder
- if (isset($data['filename']) &&
+ if (
+ isset($data['filename']) &&
$data['filename'] == \CoreLibs\Get\System::getPageName() &&
(!isset($data['hostname']) || (
isset($data['hostname']) &&
@@ -334,7 +350,7 @@ if ($form->my_page_name == 'edit_order') {
} // for
// $form->log->debug('MENU ARRAY', $form->log->prAr($menu_data));
$DATA['menu_data'] = $menu_data;
- $DATA['page_name'] = $menuarray[$position]['page_name'] ?? '-Undefined ['.$position.'] -';
+ $DATA['page_name'] = $menuarray[$position]['page_name'] ?? '-Undefined [' . $position . '] -';
$L_TITLE = $DATA['page_name'];
// html title
$HEADER['HTML_TITLE'] = $form->l->__($L_TITLE);
@@ -391,13 +407,13 @@ if ($form->my_page_name == 'edit_order') {
$search_glob = [];
foreach ($folders as $folder) {
// make sure this folder actually exists
- if (is_dir(ROOT.$folder)) {
+ if (is_dir(ROOT . $folder)) {
foreach ($files as $file) {
- $search_glob[] = $folder.$file;
+ $search_glob[] = $folder . $file;
}
}
}
- $crap = exec('ls '.join(' ', $search_glob), $output, $status);
+ $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 = '';
@@ -410,10 +426,11 @@ if ($form->my_page_name == 'edit_order') {
if ($t_q) {
$t_q .= ', ';
}
- $t_q .= "('".$form->dbEscapeString($matches[1])."', '".$form->dbEscapeString($matches[2])."')";
+ $t_q .= "('" . $form->dbEscapeString($matches[1]) . "', '"
+ . $form->dbEscapeString($matches[2]) . "')";
}
}
- $form->dbExec($q.$t_q, 'NULL');
+ $form->dbExec($q . $t_q, 'NULL');
$elements[] = $form->formCreateElement('filename');
} else {
// show file menu
@@ -493,13 +510,13 @@ $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA);
foreach ($CONTENT_DATA as $key => $value) {
$smarty->assign($key, $value);
}
-if (is_dir(BASE.TEMPLATES_C)) {
- $smarty->setCompileDir(BASE.TEMPLATES_C);
+if (is_dir(BASE . TEMPLATES_C)) {
+ $smarty->setCompileDir(BASE . TEMPLATES_C);
}
-if (is_dir(BASE.CACHE)) {
- $smarty->setCacheDir(BASE.CACHE);
+if (is_dir(BASE . CACHE)) {
+ $smarty->setCacheDir(BASE . CACHE);
}
-$smarty->display($EDIT_TEMPLATE, 'editAdmin_'.$smarty->lang, 'editAdmin_'.$smarty->lang);
+$smarty->display($EDIT_TEMPLATE, 'editAdmin_' . $smarty->lang, 'editAdmin_' . $smarty->lang);
// debug output
echo $login->log->printErrorMsg();
diff --git a/www/includes/table_arrays/array_edit_access.php b/www/includes/table_arrays/array_edit_access.php
index f129332e..c3c483a8 100644
--- a/www/includes/table_arrays/array_edit_access.php
+++ b/www/includes/table_arrays/array_edit_access.php
@@ -1,4 +1,6 @@
- [
diff --git a/www/includes/table_arrays/array_edit_groups.php b/www/includes/table_arrays/array_edit_groups.php
index 09cb1fb5..ac7d29f1 100644
--- a/www/includes/table_arrays/array_edit_groups.php
+++ b/www/includes/table_arrays/array_edit_groups.php
@@ -1,4 +1,6 @@
- [
diff --git a/www/includes/table_arrays/array_edit_languages.php b/www/includes/table_arrays/array_edit_languages.php
index eb2658e6..7f4632e0 100644
--- a/www/includes/table_arrays/array_edit_languages.php
+++ b/www/includes/table_arrays/array_edit_languages.php
@@ -1,6 +1,8 @@
- [
'edit_language_id' => [
'value' => $GLOBALS['edit_language_id'] ?? '',
diff --git a/www/includes/table_arrays/array_edit_menu_group.php b/www/includes/table_arrays/array_edit_menu_group.php
index 074e04c1..c45e8c74 100644
--- a/www/includes/table_arrays/array_edit_menu_group.php
+++ b/www/includes/table_arrays/array_edit_menu_group.php
@@ -1,4 +1,6 @@
- [
diff --git a/www/includes/table_arrays/array_edit_pages.php b/www/includes/table_arrays/array_edit_pages.php
index a52f434e..ca6c7704 100644
--- a/www/includes/table_arrays/array_edit_pages.php
+++ b/www/includes/table_arrays/array_edit_pages.php
@@ -1,4 +1,6 @@
- [
@@ -13,9 +15,9 @@ $edit_pages = [
'mandatory' => 1,
'type' => 'drop_down_db',
'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"
+ . "FROM temp_files "
+ . "LEFT JOIN edit_page ep ON temp_files.filename = ep.filename "
+ . "WHERE ep.filename IS NULL"
],
'hostname' => [
'value' => $GLOBALS['hostname'] ?? '',
@@ -112,7 +114,11 @@ $edit_pages = [
// "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",
+ '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' => [
[
@@ -124,17 +130,17 @@ $edit_pages = [
],
[
'name' => 'online',
- 'binary' => ['Yes','No'],
+ 'binary' => ['Yes', 'No'],
'before_value' => 'Online: '
],
[
'name' => 'menu',
- 'binary' => ['Yes','No'],
+ 'binary' => ['Yes', 'No'],
'before_value' => 'Menu: '
],
[
'name' => 'popup',
- 'binary' => ['Yes','No'],
+ 'binary' => ['Yes', 'No'],
'before_value' => 'Popup: '
],
],
@@ -146,7 +152,8 @@ $edit_pages = [
'mandatory' => 1,
'select_size' => 10,
'selected' => $GLOBALS['edit_visible_group_id'] ?? '',
- 'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_visible_group ORDER BY name"
+ 'query' => "SELECT edit_visible_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
+ . "FROM edit_visible_group ORDER BY name"
],
'edit_menu_group' => [
'table_name' => 'edit_page_menu_group',
@@ -155,7 +162,8 @@ $edit_pages = [
'mandatory' => 1,
'select_size' => 10,
'selected' => $GLOBALS['edit_menu_group_id'] ?? '',
- 'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag FROM edit_menu_group ORDER BY order_number"
+ 'query' => "SELECT edit_menu_group_id, 'Name: ' || name || ', ' || 'Flag: ' || flag "
+ . "FROM edit_menu_group ORDER BY order_number"
],
],
diff --git a/www/includes/table_arrays/array_edit_schemes.php b/www/includes/table_arrays/array_edit_schemes.php
index 2fde4668..fa137469 100644
--- a/www/includes/table_arrays/array_edit_schemes.php
+++ b/www/includes/table_arrays/array_edit_schemes.php
@@ -1,4 +1,6 @@
- [
diff --git a/www/includes/table_arrays/array_edit_users.php b/www/includes/table_arrays/array_edit_users.php
index 48501dda..94abbe10 100644
--- a/www/includes/table_arrays/array_edit_users.php
+++ b/www/includes/table_arrays/array_edit_users.php
@@ -1,4 +1,6 @@
- [
@@ -34,7 +36,8 @@ $edit_users = [
'password_change_interval' => [
'value' => $GLOBALS['password_change_interval'] ?? '',
'output_name' => 'Password change interval',
- 'error_check' => 'intervalshort', // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
+ // can be any date length format. n Y/M/D [not H/M/S], only one set, no combination
+ 'error_check' => 'intervalshort',
'type' => 'text',
'interval' => 1, // interval needs NULL write for empty
'size' => 5, // make it 5 chars long
@@ -184,7 +187,8 @@ $edit_users = [
'cols' => 60
],
],
- 'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count FROM edit_user ORDER BY username",
+ 'load_query' => "SELECT edit_user_id, username, enabled, debug, db_debug, strict, locked, login_error_count "
+ . "FROM edit_user ORDER BY username",
'table_name' => 'edit_user',
'show_fields' => [
[
diff --git a/www/includes/table_arrays/array_edit_visible_group.php b/www/includes/table_arrays/array_edit_visible_group.php
index c4b4c14d..80492f6a 100644
--- a/www/includes/table_arrays/array_edit_visible_group.php
+++ b/www/includes/table_arrays/array_edit_visible_group.php
@@ -1,4 +1,6 @@
- [
diff --git a/www/lib/CoreLibs/ACL/Login.php b/www/lib/CoreLibs/ACL/Login.php
index 79c291c7..55b89785 100644
--- a/www/lib/CoreLibs/ACL/Login.php
+++ b/www/lib/CoreLibs/ACL/Login.php
@@ -1,4 +1,5 @@
- unset the session vars
* 2005/07/04 (cs) add a function to write into the edit log file
* 2005/07/01 (cs) start adepting login class to new edit interface layout
* 2005/03/31 (cs) fixed the class call with all debug vars
* 2004/11/17 (cs) unused var cleanup
-* 2004/11/16 (cs) rewrite login so it uses a template and not just plain html. prepare it, so it will be able to use external stuff later (some interface has to be designed for that
-* 2004/11/16 (cs) removed the mobile html part from login * 2004/09/30 (cs) layout fix
-* 2003-11-11: if user has debug 1 unset memlimit, because there can be serious problems with the query logging
+* 2004/11/16 (cs) rewrite login so it uses a template and not just plain html.
+* prepare it, so it will be able to use external stuff later
+* (some interface has to be designed for that
+* 2004/11/16 (cs) removed the mobile html part from login
+* 2004/09/30 (cs) layout fix
+* 2003-11-11: if user has debug 1 unset memlimit, because there can be serious
+* problems with the query logging
* 2003-06-12: added flag to PAGES array
* changed the get vars from GLOBALS to _POST
* changed the session registration. no more GLOBAL vars are registered
@@ -57,6 +64,8 @@
* 2000-06-01: created basic idea and functions
*********************************************************************/
+declare(strict_types=1);
+
namespace CoreLibs\ACL;
use CoreLibs\Check\Password;
@@ -64,16 +73,19 @@ use CoreLibs\Check\Password;
class Login extends \CoreLibs\DB\IO
{
private $euid; // the user id var
- private $permission_okay = false; // is set to one if login okay, or EUID is set and user is okay to access this page
+ // is set to one if login okay, or EUID is set and user is okay to access this page
+ private $permission_okay = false;
public $login; // pressed login
private $action; // master action command
private $username; // login name
private $password; // login password
private $logout; // logout button
- private $login_error = 0; // login error code, can be matched to the array login_error_msg, which holds the string
+ // login error code, can be matched to the array login_error_msg, which holds the string
+ private $login_error = 0;
private $password_change = false; // if this is set to true, the user can change passwords
private $password_change_ok = false; // password change was successful
- private $password_forgot = false; // can we reset password and mail to user with new password set screen
+ // can we reset password and mail to user with new password set screen
+ private $password_forgot = false;
private $password_forgot_ok = false; // password forgot mail send ok
private $change_password;
private $pw_username;
@@ -161,7 +173,9 @@ class Login extends \CoreLibs\DB\IO
$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
- // check what schema to use. if there is a login schema use this, else check if there is a schema set in the config, or fall back to DB_SCHEMA if this exists, if this also does not exists use public schema
+ // check what schema to use. if there is a login schema use this, else check
+ // if there is a schema set in the config, or fall back to DB_SCHEMA
+ // if this exists, if this also does not exists use public schema
if (defined('LOGIN_DB_SCHEMA') && LOGIN_DB_SCHEMA) {
$SCHEMA = LOGIN_DB_SCHEMA;
} elseif (isset($db_config['db_schema']) && $db_config['db_schema']) {
@@ -173,9 +187,10 @@ class Login extends \CoreLibs\DB\IO
}
// set schema if schema differs to schema set in db conneciton
if ($this->dbGetSchema() && $this->dbGetSchema() != $SCHEMA) {
- $this->dbExec("SET search_path TO ".$SCHEMA);
+ $this->dbExec("SET search_path TO " . $SCHEMA);
}
- $this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0; // if there is none, there is none, saves me POST/GET check
+ // if there is none, there is none, saves me POST/GET check
+ $this->euid = array_key_exists('EUID', $_SESSION) ? $_SESSION['EUID'] : 0;
// get login vars, are so, can't be changed
// prepare
// pass on vars to Object vars
@@ -303,21 +318,24 @@ class Login extends \CoreLibs\DB\IO
$password = $this->password;
}
// first, errors on missing encryption
- if ((preg_match("/^\\$2(a|y)\\$/", $hash) && CRYPT_BLOWFISH != 1) ||
+ if (
+ (preg_match("/^\\$2(a|y)\\$/", $hash) && CRYPT_BLOWFISH != 1) ||
(preg_match("/^\\$1\\$/", $hash) && CRYPT_MD5 != 1) ||
(preg_match("/^\\$[0-9A-Za-z.]{12}$/", $hash) && CRYPT_STD_DES != 1)
) {
// this means password cannot be decrypted because of missing crypt methods
$this->login_error = 9999;
$password_ok = false;
- } elseif (preg_match("/^\\$2y\\$/", $hash) &&
+ } elseif (
+ preg_match("/^\\$2y\\$/", $hash) &&
!Password::passwordVerify($password, $hash)
) {
// this is the new password hash methid, is only $2y$
// all others are not valid anymore
$this->login_error = 1013;
$password_ok = false;
- } elseif (!preg_match("/^\\$2(a|y)\\$/", $hash) &&
+ } elseif (
+ !preg_match("/^\\$2(a|y)\\$/", $hash) &&
!preg_match("/^\\$1\\$/", $hash) &&
!preg_match("/^\\$[0-9A-Za-z.]{12}$/", $hash) &&
$hash != $password
@@ -344,30 +362,37 @@ class Login extends \CoreLibs\DB\IO
$this->login_error = 102;
} else {
// we have to get the themes in here too
- $q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, eg.name AS edit_group_name, admin, ";
- $q .= "eu.login_error_count, eu.login_error_date_last, eu.login_error_date_first, eu.strict, eu.locked, ";
- $q .= "debug, db_debug, ";
- $q .= "eareu.level AS user_level, eareu.type AS user_type, ";
- $q .= "eareg.level AS group_level, eareg.type AS group_type, ";
- $q .= "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, first.header_color AS first_header_color, ";
- $q .= "second.header_color AS second_header_color, second.template ";
- $q .= "FROM edit_user eu ";
- $q .= "LEFT JOIN edit_scheme second ON (second.edit_scheme_id = eu.edit_scheme_id AND second.enabled = 1), ";
- $q .= "edit_language el, edit_group eg, ";
- $q .= "edit_access_right eareu, ";
- $q .= "edit_access_right eareg, ";
- $q .= "edit_scheme first ";
- $q .= "WHERE first.edit_scheme_id = eg.edit_scheme_id AND eu.edit_group_id = eg.edit_group_id AND eu.edit_language_id = el.edit_language_id AND ";
- $q .= "eu.edit_access_right_id = eareu.edit_access_right_id AND ";
- $q .= "eg.edit_access_right_id = eareg.edit_access_right_id AND ";
- // password match is done in script, against old plain or new blowfish encypted
- $q .= "(LOWER(username) = '".$this->dbEscapeString(strtolower($this->username))."') ";
+ $q = "SELECT eu.edit_user_id, username, password, eu.edit_group_id, "
+ . "eg.name AS edit_group_name, admin, "
+ . "eu.login_error_count, eu.login_error_date_last, "
+ . "eu.login_error_date_first, eu.strict, eu.locked, "
+ . "debug, db_debug, "
+ . "eareu.level AS user_level, eareu.type AS user_type, "
+ . "eareg.level AS group_level, eareg.type AS group_type, "
+ . "eu.enabled, el.short_name AS lang_short, el.iso_name AS lang_iso, "
+ . "firstheader_color AS first_header_color, "
+ . "second.header_color AS second_header_color, second.template "
+ . "FROM edit_user eu "
+ . "LEFT JOIN edit_scheme second ON "
+ . "(second.edit_scheme_id = eu.edit_scheme_id AND second.enabled = 1), "
+ . "edit_language el, edit_group eg, "
+ . "edit_access_right eareu, "
+ . "edit_access_right eareg, "
+ . "edit_scheme first "
+ . "WHERE first.edit_scheme_id = eg.edit_scheme_id "
+ . "AND eu.edit_group_id = egedit_group_id "
+ . "AND eu.edit_language_id = el.edit_language_id AND "
+ . "eu.edit_access_right_id = eareu.edit_access_right_id AND "
+ . "eg.edit_access_right_id = eareg.edit_access_right_id AND "
+ // password match is done in script, against old plain or new blowfish encypted
+ . "(LOWER(username) = '" . $this->dbEscapeString(strtolower($this->username)) . "') ";
$res = $this->dbReturn($q);
// username is wrong, but we throw for wrong username and wrong password the same error
if (!$this->cursor_ext[md5($q)]['num_rows']) {
$this->login_error = 1010;
} else {
- // if login errors is half of max errors and the last login error was less than 10s ago, forbid any new login try
+ // if login errors is half of max errors and the last login error
+ // was less than 10s ago, forbid any new login try
// check flow
// - user is enabled
@@ -386,10 +411,14 @@ class Login extends \CoreLibs\DB\IO
// none to be set, set in login password check
} else {
// check if the current password is an invalid hash and do a rehash and set password
- // $this->debug('LOGIN', 'Hash: '.$res['password'].' -> VERIFY: '.($Password::passwordVerify($this->password, $res['password']) ? 'OK' : 'FAIL').' => HASH: '.(Password::passwordRehashCheck($res['password']) ? 'NEW NEEDED' : 'OK'));
+ // $this->debug('LOGIN', 'Hash: '.$res['password'].' -> VERIFY: '
+ // .($Password::passwordVerify($this->password, $res['password']) ? 'OK' : 'FAIL')
+ // .' => HASH: '.(Password::passwordRehashCheck($res['password']) ? 'NEW NEEDED' : 'OK'));
if (Password::passwordRehashCheck($res['password'])) {
// update password hash to new one now
- $q = "UPDATE edit_user SET password = '".$this->dbEscapeString(Password::passwordSet($this->password))."' WHERE edit_user_id = ".$res['edit_user_id'];
+ $q = "UPDATE edit_user "
+ . "SET password = '" . $this->dbEscapeString(Password::passwordSet($this->password))
+ . "' WHERE edit_user_id = " . $res['edit_user_id'];
$this->dbExec($q);
}
// normal user processing
@@ -410,31 +439,36 @@ class Login extends \CoreLibs\DB\IO
$_SESSION['GROUP_ACL_TYPE'] = $res['group_type'];
// deprecated TEMPLATE setting
$_SESSION['TEMPLATE'] = $res['template'] ? $res['template'] : '';
- $_SESSION['HEADER_COLOR'] = $res['second_header_color'] ? $res['second_header_color'] : $res['first_header_color'];
+ $_SESSION['HEADER_COLOR'] = $res['second_header_color'] ?
+ $res['second_header_color'] :
+ $res['first_header_color'];
$_SESSION['LANG'] = $res['lang_short'];
$_SESSION['DEFAULT_CHARSET'] = $res['lang_iso'];
- $_SESSION['DEFAULT_LANG'] = $res['lang_short'].'_'.strtolower(str_replace('-', '', $res['lang_iso']));
+ $_SESSION['DEFAULT_LANG'] = $res['lang_short'] . '_'
+ . strtolower(str_replace('-', '', $res['lang_iso']));
// reset any login error count for this user
if ($res['login_error_count'] > 0) {
- $q = "UPDATE edit_user ";
- $q .= "SET login_error_count = 0, login_error_date_last = NULL, login_error_date_first = NULL ";
- $q .= "WHERE edit_user_id = ".$res['edit_user_id'];
+ $q = "UPDATE edit_user "
+ . "SET login_error_count = 0, login_error_date_last = NULL, "
+ . "login_error_date_first = NULL "
+ . "WHERE edit_user_id = " . $res['edit_user_id'];
$this->dbExec($q);
}
$edit_page_ids = [];
$pages = [];
$pages_acl = [];
// set pages access
- $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)";
- $q .= ", edit_page_access epa, edit_access_right ear ";
- $q .= "WHERE ep.edit_page_id = epa.edit_page_id AND ear.edit_access_right_id = epa.edit_access_right_id ";
- $q .= "AND epa.enabled = 1 AND epa.edit_group_id = ".$res["edit_group_id"]." ";
- $q .= "ORDER BY ep.order_number";
+ $q = "SELECT ep.edit_page_id, ep.cuid, epca.cuid AS content_alias_uid, "
+ . "ep.hostname, ep.filename, ep.name AS edit_page_name, "
+ . "ep.order_number AS edit_page_order, ep.menu, "
+ . "ep.popup, ep.popup_x, ep.popup_y, ep.online, ear.level, ear.type "
+ . "FROM edit_page ep "
+ . "LEFT JOIN edit_page epca ON (epca.edit_page_id = ep.content_alias_edit_page_id)"
+ . ", edit_page_access epa, edit_access_right ear "
+ . "WHERE ep.edit_page_id = epa.edit_page_id "
+ . "AND ear.edit_access_right_id = epa.edit_access_right_id "
+ . "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " "
+ . "ORDER BY ep.order_number";
while ($res = $this->dbReturn($q)) {
// page id array for sub data readout
$edit_page_ids[$res['edit_page_id']] = $res['cuid'];
@@ -442,7 +476,8 @@ class Login extends \CoreLibs\DB\IO
$pages[$res['cuid']] = [
'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
+ // for reference of content data on a differen page
+ 'content_alias_uid' => $res['content_alias_uid'],
'hostname' => $res['hostname'],
'filename' => $res['filename'],
'page_name' => $res['edit_page_name'],
@@ -462,18 +497,20 @@ class Login extends \CoreLibs\DB\IO
} // for each page
// get the visible groups for all pages and write them to the pages
$_edit_page_id = 0;
- $q = "SELECT epvg.edit_page_id, name, flag ";
- $q .= "FROM edit_visible_group evp, edit_page_visible_group epvg ";
- $q .= "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id AND epvg.edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
- $q .= "ORDER BY epvg.edit_page_id";
+ $q = "SELECT epvg.edit_page_id, name, flag "
+ . "FROM edit_visible_group evp, edit_page_visible_group epvg "
+ . "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id "
+ . "AND epvg.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+ . "ORDER BY epvg.edit_page_id";
while ($res = $this->dbReturn($q)) {
$pages[$edit_page_ids[$res['edit_page_id']]]['visible'][$res['name']] = $res['flag'];
}
// get the same for the query strings
$_edit_page_id = 0;
- $q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs ";
- $q .= "WHERE enabled = 1 AND edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
- $q .= "ORDER BY eqs.edit_page_id";
+ $q = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs "
+ . "WHERE enabled = 1 AND edit_page_id "
+ . "IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+ . "ORDER BY eqs.edit_page_id";
while ($res = $this->dbReturn($q)) {
$pages[$edit_page_ids[$res['edit_page_id']]]['query'][] = [
'name' => $res['name'],
@@ -483,11 +520,12 @@ class Login extends \CoreLibs\DB\IO
}
// get the page content and add them to the page
$_edit_page_id = 0;
- $q = "SELECT epc.edit_page_id, epc.name, epc.uid, epc.order_number, epc.online, ear.level, ear.type ";
- $q .= "FROM edit_page_content epc, edit_access_right ear ";
- $q .= "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND ";
- $q .= "epc.edit_page_id IN (".join(', ', array_keys($edit_page_ids)).") ";
- $q .= "ORDER BY epc.order_number";
+ $q = "SELECT epc.edit_page_id, epc.name, epc.uid, epc.order_number, "
+ . "epc.online, ear.level, ear.type "
+ . "FROM edit_page_content epc, edit_access_right ear "
+ . "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND "
+ . "epc.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
+ . "ORDER BY epc.order_number";
while ($res = $this->dbReturn($q)) {
$pages[$edit_page_ids[$res['edit_page_id']]]['content'][$res['uid']] = [
'name' => $res['name'],
@@ -503,17 +541,20 @@ class Login extends \CoreLibs\DB\IO
$_SESSION['PAGES'] = $pages;
$_SESSION['PAGES_ACL_LEVEL'] = $pages_acl;
// load the edit_access user rights
- $q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default ";
- $q .= "FROM edit_access_user eau, edit_access_right ear, edit_access ea ";
- $q .= "WHERE eau.edit_access_id = ea.edit_access_id AND eau.edit_access_right_id = ear.edit_access_right_id ";
- $q .= "AND eau.enabled = 1 AND edit_user_id = ".$this->euid." ";
- $q .= "ORDER BY ea.name";
+ $q = "SELECT ea.edit_access_id, level, type, ea.name, ea.color, ea.uid, edit_default "
+ . "FROM edit_access_user eau, edit_access_right ear, edit_access ea "
+ . "WHERE eau.edit_access_id = ea.edit_access_id "
+ . "AND eau.edit_access_right_id = ear.edit_access_right_id "
+ . "AND eau.enabled = 1 AND edit_user_id = " . $this->euid . " "
+ . "ORDER BY ea.name";
$unit_access = [];
$eauid = [];
$unit_acl = [];
while ($res = $this->dbReturn($q)) {
// read edit access data fields and drop them into the unit access array
- $q_sub ="SELECT name, value FROM edit_access_data WHERE enabled = 1 AND edit_access_id = ".$res['edit_access_id'];
+ $q_sub = "SELECT name, value "
+ . "FROM edit_access_data "
+ . "WHERE enabled = 1 AND edit_access_id = " . $res['edit_access_id'];
$ea_data = [];
while ($res_sub = $this->dbReturn($q_sub)) {
$ea_data[$res_sub['name']] = $res_sub['value'];
@@ -548,19 +589,21 @@ class Login extends \CoreLibs\DB\IO
$login_error_date_first = ", login_error_date_first = NOW()";
}
// update login error count for this user
- $q = "UPDATE edit_user ";
- $q .= "SET login_error_count = login_error_count + 1, login_error_date_last = NOW() ".$login_error_date_first." ";
- $q .= "WHERE edit_user_id = ".$res['edit_user_id'];
+ $q = "UPDATE edit_user "
+ . "SET login_error_count = login_error_count + 1, "
+ . "login_error_date_last = NOW() " . $login_error_date_first . " "
+ . "WHERE edit_user_id = " . $res['edit_user_id'];
$this->dbExec($q);
// totally lock the user if error max is reached
- if ($this->max_login_error_count != -1 &&
+ if (
+ $this->max_login_error_count != -1 &&
$res['login_error_count'] + 1 > $this->max_login_error_count
) {
// do some alert reporting in case this error is too big
// if strict is set, lock this user
// this needs manual unlocking by an admin user
if ($res['strict'] && !in_array($this->username, $this->lock_deny_users)) {
- $q = "UPDATE edit_user SET locked = 1 WHERE edit_user_id = ".$res['edit_user_id'];
+ $q = "UPDATE edit_user SET locked = 1 WHERE edit_user_id = " . $res['edit_user_id'];
}
}
}
@@ -581,14 +624,23 @@ class Login extends \CoreLibs\DB\IO
public function loginCheckPermissions(): bool
{
if ($this->euid && $this->login_error != 103) {
- $q = "SELECT filename ";
- $q .= "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu ";
- $q .= "WHERE ep.edit_page_id = epa.edit_page_id AND eg.edit_group_id = epa.edit_group_id AND eg.edit_group_id = eu.edit_group_id ";
- $q .= "AND eu.edit_user_id = ".$this->euid." AND filename = '".$this->page_name."' AND eg.enabled = 1 AND epa.enabled = 1";
+ $q = "SELECT filename "
+ . "FROM edit_page ep, edit_page_access epa, edit_group eg, edit_user eu "
+ . "WHERE ep.edit_page_id = epa.edit_page_id "
+ . "AND eg.edit_group_id = epa.edit_group_id "
+ . "AND eg.edit_group_id = eu.edit_group_id "
+ . "AND eu.edit_user_id = " . $this->euid . " "
+ . "AND filename = '" . $this->page_name . "' "
+ . "AND eg.enabled = 1 AND epa.enabled = 1";
$res = $this->dbReturnRow($q);
// unset mem limit if debug is set to 1
- // if (($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) && ini_get('memory_limit') != -1)
- // ini_set('memory_limit', -1);
+ // if (
+ // ($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] ||
+ // $_SESSION["DEBUG_ALL"] || $_SESSION["DB_DEBUG"]) &&
+ // ini_get('memory_limit') != -1
+ // ) {
+ // ini_set('memory_limit', '-1');
+ // }
if (isset($res['filename']) && $res['filename'] == $this->page_name) {
$this->permission_okay = true;
} else {
@@ -687,7 +739,10 @@ class Login extends \CoreLibs\DB\IO
if ($_SESSION['GROUP_ACL_LEVEL'] != -1) {
$this->acl['page'] = $_SESSION['GROUP_ACL_LEVEL'];
}
- if (isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) && $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1) {
+ if (
+ isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) &&
+ $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1
+ ) {
$this->acl['page'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name];
}
@@ -820,7 +875,10 @@ class Login extends \CoreLibs\DB\IO
}
// check user exist, if not -> error
if (!$this->login_error) {
- $q = "SELECT edit_user_id FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
+ $q = "SELECT edit_user_id "
+ . "FROM edit_user "
+ . "WHERE enabled = 1 "
+ . "AND username = '" . $this->dbEscapeString($this->pw_username) . "'";
list ($edit_user_id) = $this->dbReturnRow($q);
if (!$edit_user_id) {
// username wrong
@@ -830,7 +888,10 @@ class Login extends \CoreLibs\DB\IO
}
// check old passwords match -> error
if (!$this->login_error) {
- $q = "SELECT edit_user_id, password FROM edit_user WHERE enabled = 1 AND username = '".$this->dbEscapeString($this->pw_username)."'";
+ $q = "SELECT edit_user_id, password "
+ . "FROM edit_user "
+ . "WHERE enabled = 1 "
+ . "AND username = '" . $this->dbEscapeString($this->pw_username) . "'";
list ($edit_user_id, $old_password_hash) = $this->dbReturnRow($q);
if (!$edit_user_id || !$this->loginPasswordCheck($old_password_hash, $this->pw_old_password)) {
// old password wrong
@@ -862,15 +923,18 @@ class Login extends \CoreLibs\DB\IO
// no error change this users password
if (!$this->login_error && $edit_user_id) {
// update the user (edit_user_id) with the new password
- $q = "UPDATE edit_user SET password = '".$this->dbEscapeString(Password::passwordSet($this->pw_new_password))."' WHERE edit_user_id = ".$edit_user_id;
+ $q = "UPDATE edit_user "
+ . "SET password = "
+ . "'" . $this->dbEscapeString(Password::passwordSet($this->pw_new_password)) . "' "
+ . "WHERE edit_user_id = " . $edit_user_id;
$this->dbExec($q);
- $data = 'Password change for user "'.$this->pw_username.'"';
+ $data = 'Password change for user "' . $this->pw_username . '"';
$this->password_change_ok = true;
}
} else {
// illegal user error
$this->login_error = 220;
- $data = 'Illegal user for password change: '.$this->pw_username;
+ $data = 'Illegal user for password change: ' . $this->pw_username;
}
// log this password change attempt
$this->writeLog($event, $data, $this->login_error, $this->pw_username);
@@ -903,43 +967,76 @@ class Login extends \CoreLibs\DB\IO
// pre change the data in the PASSWORD_CHANGE_DIV first
foreach ($this->login_template['strings'] as $string => $data) {
if ($data) {
- $html_string_password_change = str_replace('{'.$string.'}', $data, $html_string_password_change);
+ $html_string_password_change = str_replace(
+ '{' . $string . '}',
+ $data,
+ $html_string_password_change
+ );
}
}
// print error messagae
if ($this->login_error) {
- $html_string_password_change = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'
', $html_string_password_change);
+ $html_string_password_change = str_replace(
+ '{ERROR_MSG}',
+ $this->login_error_msg[$this->login_error] . '
',
+ $html_string_password_change
+ );
} else {
- $html_string_password_change = str_replace('{ERROR_MSG}', '
', $html_string_password_change);
+ $html_string_password_change = str_replace(
+ '{ERROR_MSG}',
+ '
',
+ $html_string_password_change
+ );
}
// if pw change action, show the float again
if ($this->change_password && !$this->password_change_ok) {
- $html_string_password_change = str_replace('{PASSWORD_CHANGE_SHOW}', '', $html_string_password_change);
+ $html_string_password_change = str_replace(
+ '{PASSWORD_CHANGE_SHOW}',
+ '',
+ $html_string_password_change
+ );
} else {
- $html_string_password_change = str_replace('{PASSWORD_CHANGE_SHOW}', '', $html_string_password_change);
+ $html_string_password_change = str_replace(
+ '{PASSWORD_CHANGE_SHOW}',
+ '',
+ $html_string_password_change
+ );
}
$this->login_template['strings']['PASSWORD_CHANGE_DIV'] = $html_string_password_change;
}
// put in the logout redirect string
if ($this->logout && $LOGOUT_TARGET) {
- $html_string = str_replace('{LOGOUT_TARGET}', '', $html_string);
+ $html_string = str_replace(
+ '{LOGOUT_TARGET}',
+ '',
+ $html_string
+ );
} else {
$html_string = str_replace('{LOGOUT_TARGET}', '', $html_string);
}
// print error messagae
if ($this->login_error) {
- $html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[$this->login_error].'
', $html_string);
+ $html_string = str_replace(
+ '{ERROR_MSG}',
+ $this->login_error_msg[$this->login_error] . '
',
+ $html_string
+ );
} elseif ($this->password_change_ok && $this->password_change) {
- $html_string = str_replace('{ERROR_MSG}', $this->login_error_msg[300].'
', $html_string);
+ $html_string = str_replace(
+ '{ERROR_MSG}',
+ $this->login_error_msg[300] . '
',
+ $html_string
+ );
} else {
$html_string = str_replace('{ERROR_MSG}', '
', $html_string);
}
// create the replace array context
foreach ($this->login_template['strings'] as $string => $data) {
- $html_string = str_replace('{'.$string.'}', $data, $html_string);
+ $html_string = str_replace('{' . $string . '}', $data, $html_string);
}
} // if permission is 0 then print out login
// return the created HTML here or null for nothing
@@ -968,7 +1065,7 @@ class Login extends \CoreLibs\DB\IO
// prepare for log
if ($this->euid) {
// get user from user table
- $q = "SELECT username FROM edit_user WHERE edit_user_id = ".$this->euid;
+ $q = "SELECT username FROM edit_user WHERE edit_user_id = " . $this->euid;
list($username) = $this->dbReturnRow($q);
} // if euid is set, get username (or try)
$this->writeLog($event, '', $this->login_error, $username);
@@ -1000,24 +1097,33 @@ class Login extends \CoreLibs\DB\IO
];
$error_msgs = [
- '100' => $this->l->__('Fatal Error: [EUID] came in as GET/POST!'), // actually obsolete
- '1010' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'), // user not found
- '1011' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'), // blowfish password wrong
- '1012' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'), // fallback md5 password wrong
- '1013' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'), // new password_hash wrong
+ // actually obsolete
+ '100' => $this->l->__('Fatal Error: [EUID] came in as GET/POST!'),
+ // user not found
+ '1010' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'),
+ // blowfish password wrong
+ '1011' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'),
+ // fallback md5 password wrong
+ '1012' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'),
+ // new password_hash wrong
+ '1013' => $this->l->__('Fatal Error: Login Failed - Wrong Username or Password'),
'102' => $this->l->__('Fatal Error: Login Failed - Please enter username and password'),
'103' => $this->l->__('Fatal Error: You do not have the rights to access this Page'),
'104' => $this->l->__('Fatal Error: Login Failed - User not enabled'),
'105' => $this->l->__('Fatal Error: Login Failed - User is locked'),
- '220' => $this->l->__('Fatal Error: Password change - The user could not be found'), // actually this is an illegal user, but I mask it
+ // actually this is an illegal user, but I mask it
+ '220' => $this->l->__('Fatal Error: Password change - The user could not be found'),
'200' => $this->l->__('Fatal Error: Password change - Please enter username and old password'),
'201' => $this->l->__('Fatal Error: Password change - The user could not be found'),
'202' => $this->l->__('Fatal Error: Password change - The old password is not correct'),
'203' => $this->l->__('Fatal Error: Password change - Please fill out both new password fields'),
'204' => $this->l->__('Fatal Error: Password change - The new passwords do not match'),
- '205' => $this->l->__('Fatal Error: Password change - The new password is not in a valid format'), // we should also not here WHAT is valid
- '300' => $this->l->__('Success: Password change successful'), // for OK password change
- '9999' => $this->l->__('Fatal Error: necessary crypt engine could not be found. Login is impossible') // this is bad bad error
+ // we should also not here WHAT is valid
+ '205' => $this->l->__('Fatal Error: Password change - The new password is not in a valid format'),
+ // for OK password change
+ '300' => $this->l->__('Success: Password change successful'),
+ // this is bad bad error
+ '9999' => $this->l->__('Fatal Error: necessary crypt engine could not be found. Login is impossible')
];
// if password change is okay
@@ -1028,23 +1134,36 @@ class Login extends \CoreLibs\DB\IO
'NEW_PASSWORD' => $this->l->__('New Password'),
'NEW_PASSWORD_CONFIRM' => $this->l->__('New Password confirm'),
'CLOSE' => $this->l->__('Close'),
- 'JS_SHOW_HIDE' => "function ShowHideDiv(id) { element = document.getElementById(id); if (element.className == 'visible' || !element.className) element.className = 'hidden'; else element.className = 'visible'; }",
- 'PASSWORD_CHANGE_BUTTON' => ''
+ 'JS_SHOW_HIDE' => "function ShowHideDiv(id) { "
+ . "element = document.getElementById(id); "
+ . "if (element.className == 'visible' || !element.className) element.className = 'hidden'; "
+ . "else element.className = 'visible'; }",
+ 'PASSWORD_CHANGE_BUTTON' => ''
]);
+ // NOTE: for the HTML block I ignore line lengths
+ // phpcs:disable
$this->login_template['password_change'] = <<
{PASSWORD_CHANGE_SHOW}
EOM;
+ // phpcs:enable
}
if ($this->password_forgot) {
}
@@ -1163,28 +1282,38 @@ EOM;
];
$data_binary = $this->dbEscapeBytea(bzcompress(serialize($_data_binary)));
// SQL querie for log entry
- $q = "INSERT INTO edit_log ";
- $q .= "(username, password, euid, event_date, event, error, data, data_binary, page, ";
- $q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
- $q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
- $q .= "VALUES ('".$this->dbEscapeString($username)."', 'PASSWORD', ".($this->euid ? $this->euid : 'NULL').", ";
- $q .= "NOW(), '".$this->dbEscapeString($event)."', '".$this->dbEscapeString((string)$error)."', '".$this->dbEscapeString($data)."', '".$data_binary."', '".$this->page_name."', ";
- foreach ([
- 'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME', 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
- ] as $server_code) {
+ $q = "INSERT INTO edit_log "
+ . "(username, password, euid, event_date, event, error, data, data_binary, page, "
+ . "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
+ . "http_accept, http_accept_charset, http_accept_encoding, session_id, "
+ . "action, action_id, action_yes, action_flag, action_menu, action_loaded, "
+ . "action_value, action_error) "
+ . "VALUES ('" . $this->dbEscapeString($username) . "', 'PASSWORD', "
+ . ($this->euid ? $this->euid : 'NULL') . ", "
+ . "NOW(), '" . $this->dbEscapeString($event) . "', "
+ . "'" . $this->dbEscapeString((string)$error) . "', "
+ . "'" . $this->dbEscapeString($data) . "', '" . $data_binary . "', "
+ . "'" . $this->page_name . "', ";
+ foreach (
+ [
+ 'REMOTE_ADDR', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'SCRIPT_FILENAME',
+ 'QUERY_STRING', 'SERVER_NAME', 'HTTP_HOST', 'HTTP_ACCEPT',
+ 'HTTP_ACCEPT_CHARSET', 'HTTP_ACCEPT_ENCODING'
+ ] as $server_code
+ ) {
if (array_key_exists($server_code, $_SERVER)) {
- $q .= "'".$this->dbEscapeString($_SERVER[$server_code])."', ";
+ $q .= "'" . $this->dbEscapeString($_SERVER[$server_code]) . "', ";
} else {
$q .= "NULL, ";
}
}
- $q .= "'".session_id()."', ";
- $q .= "'".$this->dbEscapeString($this->action)."', ";
- $q .= "'".$this->dbEscapeString($this->username)."', ";
+ $q .= "'" . session_id() . "', ";
+ $q .= "'" . $this->dbEscapeString($this->action) . "', ";
+ $q .= "'" . $this->dbEscapeString($this->username) . "', ";
$q .= "NULL, ";
- $q .= "'".$this->dbEscapeString((string)$this->login_error)."', ";
+ $q .= "'" . $this->dbEscapeString((string)$this->login_error) . "', ";
$q .= "NULL, NULL, ";
- $q .= "'".$this->dbEscapeString((string)$this->permission_okay)."', ";
+ $q .= "'" . $this->dbEscapeString((string)$this->permission_okay) . "', ";
$q .= "NULL)";
$this->dbExec($q, 'NULL');
}
@@ -1197,7 +1326,8 @@ EOM;
*/
public function loginCheckEditAccessId(?int $edit_access_id): ?int
{
- if (isset($_SESSION['UNIT']) &&
+ if (
+ isset($_SESSION['UNIT']) &&
is_array($_SESSION['UNIT']) &&
!array_key_exists($edit_access_id, $_SESSION['UNIT'])
) {
@@ -1222,6 +1352,7 @@ EOM;
return $_SESSION['UNIT'][$edit_access_id]['data'][$data_key];
}
}
-} // close class
+ // close class
+}
// __END__
diff --git a/www/lib/CoreLibs/Admin/Backend.php b/www/lib/CoreLibs/Admin/Backend.php
index bce0072f..1c2dd9b8 100644
--- a/www/lib/CoreLibs/Admin/Backend.php
+++ b/www/lib/CoreLibs/Admin/Backend.php
@@ -1,4 +1,5 @@
-lang_short = substr($this->lang, 0, 2);
// set the language folder
- $this->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH;
+ $this->lang_dir = BASE . INCLUDES . LANG . CONTENT_PATH;
}
// PUBLIC METHODS |=================================================>
@@ -182,32 +188,38 @@ class Backend extends \CoreLibs\DB\IO
$SCHEMA = 'public';
}
- $q = "INSERT INTO ".$SCHEMA.".edit_log ";
- $q .= "(euid, event_date, event, data, data_binary, page, ";
- $q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
- $q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
- $q .= "VALUES ";
- $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((string)$this->page_name)."', ";
- $q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['QUERY_STRING'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['SERVER_NAME'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['HTTP_HOST'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '')."', ";
- $q .= "'".$this->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '')."', ";
- $q .= "'".session_id()."', ";
- $q .= "'".$this->dbEscapeString($this->action)."', ";
- $q .= "'".$this->dbEscapeString($this->action_id)."', ";
- $q .= "'".$this->dbEscapeString($this->action_yes)."', ";
- $q .= "'".$this->dbEscapeString($this->action_flag)."', ";
- $q .= "'".$this->dbEscapeString($this->action_menu)."', ";
- $q .= "'".$this->dbEscapeString($this->action_loaded)."', ";
- $q .= "'".$this->dbEscapeString($this->action_value)."', ";
- $q .= "'".$this->dbEscapeString($this->action_error)."')";
+ $q = "INSERT INTO " . $SCHEMA . ".edit_log "
+ . "(euid, event_date, event, data, data_binary, page, "
+ . "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
+ . "http_accept, http_accept_charset, http_accept_encoding, session_id, "
+ . "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) "
+ . "VALUES "
+ . "(" . $this->dbEscapeString(isset($_SESSION['EUID']) && is_numeric($_SESSION['EUID']) ?
+ $_SESSION['EUID'] :
+ 'NULL')
+ . ", "
+ . "NOW(), "
+ . "'" . $this->dbEscapeString((string)$event) . "', '" . $data . "', "
+ . "'" . $data_binary . "', '" . $this->dbEscapeString((string)$this->page_name) . "', "
+ . "'" . @$_SERVER["REMOTE_ADDR"] . "', "
+ . "'" . $this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT']) . "', "
+ . "'" . $this->dbEscapeString($_SERVER['HTTP_REFERER'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['SCRIPT_FILENAME'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['QUERY_STRING'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['SERVER_NAME'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['HTTP_HOST'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT_CHARSET'] ?? '') . "', "
+ . "'" . $this->dbEscapeString($_SERVER['HTTP_ACCEPT_ENCODING'] ?? '') . "', "
+ . "'" . session_id() . "', "
+ . "'" . $this->dbEscapeString($this->action) . "', "
+ . "'" . $this->dbEscapeString($this->action_id) . "', "
+ . "'" . $this->dbEscapeString($this->action_yes) . "', "
+ . "'" . $this->dbEscapeString($this->action_flag) . "', "
+ . "'" . $this->dbEscapeString($this->action_menu) . "', "
+ . "'" . $this->dbEscapeString($this->action_loaded) . "', "
+ . "'" . $this->dbEscapeString($this->action_value) . "', "
+ . "'" . $this->dbEscapeString($this->action_error) . "')";
$this->dbExec($q, 'NULL');
}
@@ -262,20 +274,23 @@ class Backend extends \CoreLibs\DB\IO
}
$query_string = '';
- if (isset($data['query']) &&
+ 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']) &&
+ if (
+ !empty($query['name']) &&
!empty($query['value'])
) {
if (strlen($query_string)) {
$query_string .= '&';
}
- $query_string .= $query['name'].'=';
- if (isset($query['dynamic']) &&
+ $query_string .= $query['name'] . '=';
+ if (
+ isset($query['dynamic']) &&
$query['dynamic']
) {
if (isset($_GET[$query['value']])) {
@@ -295,12 +310,13 @@ class Backend extends \CoreLibs\DB\IO
}
$url .= $data['filename'] ?? '';
if (strlen($query_string)) {
- $url .= '?'.$query_string;
+ $url .= '?' . $query_string;
}
$name = $data['page_name'] ?? '';
// if page name matchs -> set selected flag
$selected = 0;
- if (isset($data['filename']) &&
+ if (
+ isset($data['filename']) &&
\CoreLibs\Get\System::getPageName() == $data['filename'] &&
(!isset($data['hostname']) || (
isset($data['hostname']) &&
@@ -312,7 +328,8 @@ class Backend extends \CoreLibs\DB\IO
}
// last check, is this menu point okay to show
$enabled = 0;
- if (isset($data['filename']) &&
+ if (
+ isset($data['filename']) &&
$this->adbShowMenuPoint($data['filename'])
) {
$enabled = 1;
@@ -364,7 +381,10 @@ class Backend extends \CoreLibs\DB\IO
*/
public function adbAssocArray(array $db_array, $key, $value): array
{
- trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray', E_USER_DEPRECATED);
+ trigger_error(
+ 'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Combined\ArrayHandler::genAssocArray',
+ E_USER_DEPRECATED
+ );
return \CoreLibs\Combined\ArrayHandler::genAssocArray($db_array, $key, $value);
}
@@ -377,7 +397,10 @@ class Backend extends \CoreLibs\DB\IO
*/
public function adbByteStringFormat($number): string
{
- trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
+ trigger_error(
+ 'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Convert\Byte::humanReadableByteFormat()',
+ E_USER_DEPRECATED
+ );
return \CoreLibs\Convert\Byte::humanReadableByteFormat($number);
}
@@ -394,7 +417,10 @@ class Backend extends \CoreLibs\DB\IO
*/
public function adbCreateThumbnail($pic, $size_x, $size_y, $dummy = '', $path = "", $cache = "")
{
- trigger_error('Method '.__METHOD__.' is deprecated: \CoreLibs\Output\Image::createThumbnail()', E_USER_DEPRECATED);
+ trigger_error(
+ 'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()',
+ E_USER_DEPRECATED
+ );
return \CoreLibs\Output\Image::createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache);
}
@@ -458,14 +484,15 @@ class Backend extends \CoreLibs\DB\IO
} else {
$SCHEMA = 'public';
}
- $q = "INSERT INTO ".$SCHEMA.".live_queue (";
- $q .= "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file";
- $q .= ") VALUES (";
- $q .= "'".$this->dbEscapeString($queue_key)."', '".$this->dbEscapeString($key_value)."', ";
- $q .= "'".$this->dbEscapeString($key_name)."', '".$this->dbEscapeString($type)."', ";
- $q .= "'".$this->dbEscapeString($target)."', '".$this->dbEscapeString($data)."', ";
- $q .= "'".$this->queue_key."', '".$this->action."', '".$this->dbEscapeString((string)$associate)."', ";
- $q .= "'".$this->dbEscapeString((string)$file)."')";
+ $q = "INSERT INTO " . $SCHEMA . ".live_queue ("
+ . "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file"
+ . ") VALUES ("
+ . "'" . $this->dbEscapeString($queue_key) . "', '" . $this->dbEscapeString($key_value) . "', "
+ . "'" . $this->dbEscapeString($key_name) . "', '" . $this->dbEscapeString($type) . "', "
+ . "'" . $this->dbEscapeString($target) . "', '" . $this->dbEscapeString($data) . "', "
+ . "'" . $this->queue_key . "', '" . $this->action . "', "
+ . "'" . $this->dbEscapeString((string)$associate) . "', "
+ . "'" . $this->dbEscapeString((string)$file) . "')";
$this->dbExec($q);
}
@@ -495,14 +522,23 @@ class Backend extends \CoreLibs\DB\IO
bool $name_pos_back = false
) {
// get the build layout
- $html_time = \CoreLibs\Output\Form\Elements::printDateTime($year, $month, $day, $hour, $min, $suffix, $min_steps, $name_pos_back);
+ $html_time = \CoreLibs\Output\Form\Elements::printDateTime(
+ $year,
+ $month,
+ $day,
+ $hour,
+ $min,
+ $suffix,
+ $min_steps,
+ $name_pos_back
+ );
// translate the strings inside
foreach (['Year ', 'Month ', 'Day ', 'Hour ', 'Minute '] as $_time) {
- $html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)).' ', $html_time);
+ $html_time = str_replace($_time, $this->l->__(str_replace(' ', '', $_time)) . ' ', $html_time);
}
// replace week days in short
foreach (['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] as $_date) {
- $html_time = str_replace('('.$_date.')', '('.$this->l->__($_date).')', $html_time);
+ $html_time = str_replace('(' . $_date . ')', '(' . $this->l->__($_date) . ')', $html_time);
}
// return the datetime select string with strings translated
return $html_time;
diff --git a/www/lib/CoreLibs/Basic.php b/www/lib/CoreLibs/Basic.php
index 8fbb2c0d..2a18fef8 100644
--- a/www/lib/CoreLibs/Basic.php
+++ b/www/lib/CoreLibs/Basic.php
@@ -1,4 +1,7 @@
-";
$abort = true;
@@ -167,7 +181,7 @@ class Basic
*/
public function basicSetLogId(string $string): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use $basic->log->basicSetLogId() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->basicSetLogId() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
return $this->log->basicSetLogId($string);
}
@@ -190,7 +204,7 @@ class Basic
*/
public function hrRunningTime(string $out_time = 'ms'): float
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Debug\RunningTime::hrRunningTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Debug\RunningTime::hrRunningTime()', E_USER_DEPRECATED);
return \CoreLibs\Debug\RunningTime::hrRunningTime($out_time);
}
@@ -205,7 +219,7 @@ class Basic
*/
public function runningTime(bool $simple = false): float
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Debug\RunningTime::runningTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Debug\RunningTime::runningTime()', E_USER_DEPRECATED);
return \CoreLibs\Debug\RunningTime::runningTime($simple);
}
@@ -221,7 +235,7 @@ class Basic
*/
public static function printTime(int $set_microtime = -1): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Debug\Support::printTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Debug\Support::printTime()', E_USER_DEPRECATED);
return \CoreLibs\Debug\Support::printTime($set_microtime);
}
@@ -238,7 +252,7 @@ class Basic
*/
public function fdebug(string $string, bool $enter = true): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Debug\FileWriter::fdebug()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Debug\FileWriter::fdebug()', E_USER_DEPRECATED);
return \CoreLibs\Debug\FileWriter::fdebug($string, $enter);
}
@@ -256,7 +270,7 @@ class Basic
*/
public function debugFor(string $type, string $flag): void
{
- trigger_error('Method '.__METHOD__.' is deprecated, use $basic->log->debugFor() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->debugFor() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
/** @phan-suppress-next-line PhanTypeMismatchArgumentReal */
$this->log->debugFor(...[func_get_args()]);
}
@@ -342,7 +356,7 @@ class Basic
*/
public function mergeErrors(array $error_msg = []): void
{
- trigger_error('Method '.__METHOD__.' is deprecated, use $basic->log->mergeErrors() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->mergeErrors() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
$this->log->mergeErrors($error_msg);
}
@@ -357,74 +371,6 @@ class Basic
return $this->log->printErrorMsg($string);
}
- /**
- * writes error msg data to file for current level
- * @param string $level the level to write
- * @param string $error_string error string to write
- * @return void has no return
- */
- /* private function writeErrorMsg(string $level, string $error_string): void
- {
- // only write if write is requested
- if ($this->doDebugTrigger('debug', $level) &&
- $this->doDebugTrigger('print', $level)
- ) {
- // replace all html tags
- // $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "##\\2##", $error_string);
- // $error_string = preg_replace("/(<\/?)(\w+)([^>]*>)/", "", $error_string);
- // replace special line break tag
- // $error_string = str_replace('', "\n", $error_string);
-
- // init output variable
- $output = $error_string; // output formated error string to output file
- // init base file path
- $fn = BASE.LOG.$this->log_print_file.'.'.$this->log_file_name_ext;
- // log ID prefix settings, if not valid, replace with empty
- if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
- $rpl_string = '_'.$this->log_file_id;
- } else {
- $rpl_string = '';
- }
- $fn = str_replace('##LOGID##', $rpl_string, $fn); // log id (like a log file prefix)
-
- if ($this->log_per_run) {
- if (isset($GLOBALS['LOG_FILE_UNIQUE_ID'])) {
- $this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
- }
- if (!$this->log_file_unique_id) {
- $GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
- }
- $rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
- } else {
- $rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d'); // add date to file
- }
- $fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename
-
- $rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file
- $fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
-
- $rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', get_class($this)); // set sub class settings
- $fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename
-
- $rpl_string = !$this->log_per_page ? '' : '_'.\CoreLibs\Get\System::getPageName(1); // if request to write to one file
- $fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename
-
- // write to file
- // first check if max file size is is set and file is bigger
- if ($this->log_max_filesize > 0 && ((filesize($fn) / 1024) > $this->log_max_filesize)) {
- // for easy purpose, rename file only to attach timestamp, nur sequence numbering
- rename($fn, $fn.'.'.date("YmdHis"));
- }
- $fp = fopen($fn, 'a');
- if ($fp !== false) {
- fwrite($fp, $output);
- fclose($fp);
- } else {
- echo "";
- }
- } // do write to file
- } */
-
/**
* unsests the error message array
* can be used if writing is primary to file
@@ -435,7 +381,7 @@ class Basic
*/
public function resetErrorMsg(string $level = ''): void
{
- trigger_error('Method '.__METHOD__.' is deprecated, use $basic->log->resetErrorMsg() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->resetErrorMsg() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
$this->log->resetErrorMsg($level);
}
@@ -464,7 +410,7 @@ class Basic
*/
public static function getCallerMethod(int $level = 2): ?string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Debug\Support::getCallerMethod()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Debug\Support::getCallerMethod()', E_USER_DEPRECATED);
return \CoreLibs\Debug\Support::getCallerMethod($level);
}
@@ -480,7 +426,7 @@ class Basic
*/
public function fileUploadErrorMessage(int $error_code): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Get\System::fileUploadErrorMessage()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Get\System::fileUploadErrorMessage()', E_USER_DEPRECATED);
return \CoreLibs\Get\System::fileUploadErrorMessage($error_code);
}
@@ -499,7 +445,7 @@ class Basic
*/
public function initRandomKeyLength(int $key_length): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\RandomKey::setRandomKeyLength()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\RandomKey::setRandomKeyLength()', E_USER_DEPRECATED);
return \CoreLibs\Create\RandomKey::setRandomKeyLength($key_length);
}
@@ -513,7 +459,7 @@ class Basic
*/
public function randomKeyGen(int $key_length = -1): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\RandomKey::randomKeyGen()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\RandomKey::randomKeyGen()', E_USER_DEPRECATED);
return \CoreLibs\Create\RandomKey::randomKeyGen($key_length);
}
@@ -533,7 +479,7 @@ class Basic
*/
public static function checked($haystack, $needle, int $type = 0): ?string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Html::checked()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Html::checked()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Html::checked($haystack, $needle, $type);
}
@@ -548,7 +494,7 @@ class Basic
*/
public function magicLinks(string $string, string $target = "_blank"): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Form\Elements::magicLinks()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Form\Elements::magicLinks()', E_USER_DEPRECATED);
return \CoreLibs\Output\Form\Elements::magicLinks($string, $target);
}
@@ -563,7 +509,7 @@ class Basic
*/
public function getHostName(): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Get\System::getHostName()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Get\System::getHostName()', E_USER_DEPRECATED);
return \CoreLibs\Get\System::getHostName();
}
@@ -577,7 +523,7 @@ class Basic
*/
public static function getPageName(int $strip_ext = 0): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Get\System::getPageName()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Get\System::getPageName()', E_USER_DEPRECATED);
return \CoreLibs\Get\System::getPageName($strip_ext);
}
@@ -593,7 +539,7 @@ class Basic
*/
public static function getFilenameEnding(string $filename): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\File::getFilenameEnding()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\File::getFilenameEnding()', E_USER_DEPRECATED);
return \CoreLibs\Check\File::getFilenameEnding($filename);
}
@@ -605,7 +551,7 @@ class Basic
*/
public static function getLinesFromFile(string $file): int
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\File::getLinesFromFile()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\File::getLinesFromFile()', E_USER_DEPRECATED);
return \CoreLibs\Check\File::getLinesFromFile($file);
}
@@ -625,7 +571,7 @@ class Basic
*/
public static function arraySearchRecursive($needle, array $haystack, ?string $key_lookin = null): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchRecursive()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchRecursive()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arraySearchRecursive($needle, $haystack, $key_lookin);
}
@@ -640,7 +586,7 @@ class Basic
*/
public static function arraySearchRecursiveAll($needle, array $haystack, $key, ?array $path = null): ?array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchRecursiveAll()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchRecursiveAll()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arraySearchRecursiveAll($needle, $haystack, $key, $path);
}
@@ -654,7 +600,7 @@ class Basic
*/
public static function arraySearchSimple(array $array, $key, $value): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchSimple()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arraySearchSimple()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arraySearchSimple($array, $key, $value);
}
@@ -670,7 +616,7 @@ class Basic
*/
public static function arrayMergeRecursive()
{
- trigger_error('MUST CHANGE: Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive()', E_USER_DEPRECATED);
+ trigger_error('MUST CHANGE: Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive(...func_get_args());
}
@@ -686,7 +632,7 @@ class Basic
*/
public static function arrayDiff(array $a, array $b): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayDiff()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayDiff()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arrayDiff($a, $b);
}
@@ -700,7 +646,7 @@ class Basic
*/
public static function inArrayAny(array $needle, array $haystack)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::inArrayAny()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::inArrayAny()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::inArrayAny($needle, $haystack);
}
@@ -715,7 +661,7 @@ class Basic
*/
public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArray()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArray()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::genAssocArray($db_array, $key, $value, $set_only);
}
@@ -729,7 +675,7 @@ class Basic
*/
public static function arrayToString(array $array, string $connect_char): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use join()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use join()', E_USER_DEPRECATED);
if (!is_array($array)) {
$array = [];
}
@@ -745,7 +691,7 @@ class Basic
*/
public static function flattenArray(array $array): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArray()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArray()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::flattenArray($array);
}
@@ -757,7 +703,7 @@ class Basic
*/
public static function flattenArrayKey(array $array/*, array $return = []*/): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArrayKey()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::flattenArrayKey()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::flattenArrayKey($array);
}
@@ -771,7 +717,7 @@ class Basic
*/
public static function arrayFlatForKey(array $array, $search): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayFlatForKey()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\ArrayHandler::arrayFlatForKey()', E_USER_DEPRECATED);
return \CoreLibs\Combined\ArrayHandler::arrayFlatForKey($array, $search);
}
@@ -789,7 +735,7 @@ class Basic
public static function __mbMimeEncode(string $string, string $encoding): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Language\Encoding::__mbMimeEncode()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::__mbMimeEncode()', E_USER_DEPRECATED);
return \CoreLibs\Language\Encoding::__mbMimeEncode($string, $encoding);
}
@@ -809,7 +755,7 @@ class Basic
*/
public static function byteStringFormat($bytes, bool $space = true, bool $adjust = false, bool $si = false): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
$flags = 0;
// match over the true/false flags to the new int style flag
// if space need to set 1
@@ -851,7 +797,7 @@ class Basic
*/
public static function humanReadableByteFormat($bytes, int $flags = 0): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Byte::humanReadableByteFormat()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Byte::humanReadableByteFormat($bytes, $flags);
}
@@ -863,7 +809,7 @@ class Basic
*/
public static function stringByteFormat($number)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Byte::stringByteFormat()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Byte::stringByteFormat()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Byte::stringByteFormat($number);
}
@@ -880,7 +826,7 @@ class Basic
*/
public static function dateStringFormat($timestamp, bool $show_micro = false): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::dateStringFormat()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::dateStringFormat()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::dateStringFormat($timestamp, $show_micro);
}
@@ -893,7 +839,7 @@ class Basic
*/
public static function timeStringFormat($timestamp, bool $show_micro = true): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::timeStringFormat()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::timeStringFormat()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::timeStringFormat($timestamp, $show_micro);
}
@@ -906,7 +852,7 @@ class Basic
*/
public static function stringToTime($timestring)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::stringToTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::stringToTime()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::stringToTime($timestring);
}
@@ -918,7 +864,7 @@ class Basic
*/
public static function checkDate($date): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::checkDate()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::checkDate()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::checkDate($date);
}
@@ -930,7 +876,7 @@ class Basic
*/
public static function checkDateTime($datetime): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::checkDateTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::checkDateTime()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::checkDateTime($datetime);
}
@@ -948,7 +894,7 @@ class Basic
*/
public static function compareDate($start_date, $end_date)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::compareDate()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::compareDate()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::compareDate($start_date, $end_date);
}
@@ -966,7 +912,7 @@ class Basic
*/
public static function compareDateTime($start_datetime, $end_datetime)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::compareDateTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::compareDateTime()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::compareDateTime($start_datetime, $end_datetime);
}
@@ -982,7 +928,7 @@ class Basic
*/
public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Combined\DateTime::calcDaysInterval()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Combined\DateTime::calcDaysInterval()', E_USER_DEPRECATED);
return \CoreLibs\Combined\DateTime::calcDaysInterval($start_date, $end_date, $return_named);
}
@@ -1013,7 +959,7 @@ class Basic
string $cache_source = '',
bool $clear_cache = false
) {
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Image::createThumbnail()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Image::createThumbnail()', E_USER_DEPRECATED);
return \CoreLibs\Output\Image::createThumbnail($pic, $size_x, $size_y, $dummy, $path, $cache_source, $clear_cache);
}
@@ -1049,7 +995,7 @@ class Basic
bool $high_quality = true,
int $jpeg_quality = 80
) {
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Image::createThumbnailSimple()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Image::createThumbnailSimple()', E_USER_DEPRECATED);
return \CoreLibs\Output\Image::createThumbnailSimple($filename, $thumb_width, $thumb_height, $thumbnail_path, $create_dummy, $use_cache, $high_quality, $jpeg_quality);
}
@@ -1063,7 +1009,7 @@ class Basic
*/
public function correctImageOrientation($filename): void
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Image::correctImageOrientation()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Image::correctImageOrientation()', E_USER_DEPRECATED);
\CoreLibs\Output\Image::correctImageOrientation($filename);
}
@@ -1092,7 +1038,7 @@ class Basic
*/
public function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Language\Encoding::checkConvertEncoding()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::checkConvertEncoding()', E_USER_DEPRECATED);
return \CoreLibs\Language\Encoding::checkConvertEncoding($string, $from_encoding, $to_encoding);
}
@@ -1113,7 +1059,7 @@ class Basic
*/
public static function convertEncoding(string $string, string $to_encoding, string $source_encoding = '', bool $auto_check = true): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Language\Encoding::convertEncoding()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Language\Encoding::convertEncoding()', E_USER_DEPRECATED);
return \CoreLibs\Language\Encoding::convertEncoding($string, $to_encoding, $source_encoding, $auto_check);
}
@@ -1131,7 +1077,7 @@ class Basic
*/
public function __crc32b(string $string): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\Hash::__crc32b()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::__crc32b()', E_USER_DEPRECATED);
return \CoreLibs\Create\Hash::__crc32b($string);
}
@@ -1144,7 +1090,7 @@ class Basic
*/
public function __sha1Short(string $string, bool $use_sha = false): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\Hash::__sha1Short()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::__sha1Short()', E_USER_DEPRECATED);
return \CoreLibs\Create\Hash::__sha1Short($string, $use_sha);
}
@@ -1160,7 +1106,7 @@ class Basic
*/
public function __hash(string $string, string $hash_type = 'adler32'): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\Hash::__hash()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Hash::__hash()', E_USER_DEPRECATED);
return \CoreLibs\Create\Hash::__hash($string, $hash_type);
}
@@ -1178,7 +1124,7 @@ class Basic
*/
public static function checkPHPVersion(string $min_version, string $max_version = ''): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\PhpVersion::checkPHPVersion()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\PhpVersion::checkPHPVersion()', E_USER_DEPRECATED);
return \CoreLibs\Check\PhpVersion::checkPHPVersion($min_version, $max_version);
}
@@ -1195,7 +1141,7 @@ class Basic
*/
public static function uuidv4(): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\Uids::uuidv4()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Uids::uuidv4()', E_USER_DEPRECATED);
return \CoreLibs\Create\Uids::uuidv4();
}
@@ -1210,7 +1156,7 @@ class Basic
*/
public function uniqId(string $type = ''): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Create\Uids::uniqId()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Create\Uids::uniqId()', E_USER_DEPRECATED);
return \CoreLibs\Create\Uids::uniqId($type);
}
@@ -1227,7 +1173,7 @@ class Basic
*/
private function passwordInit(): void
{
- trigger_error('Method '.__METHOD__.' has been removed', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' has been removed', E_USER_DEPRECATED);
/* // set default password cost: use default set automatically
$this->password_options = [
// 'cost' => PASSWORD_BCRYPT_DEFAULT_COST
@@ -1242,7 +1188,7 @@ class Basic
*/
public function passwordSet(string $password): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Password::passwordSet()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Password::passwordSet()', E_USER_DEPRECATED);
return \CoreLibs\Check\Password::passwordSet($password);
}
@@ -1255,7 +1201,7 @@ class Basic
*/
public function passwordVerify(string $password, string $hash): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Password::passwordVerify()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Password::passwordVerify()', E_USER_DEPRECATED);
return \CoreLibs\Check\Password::passwordVerify($password, $hash);
}
@@ -1267,7 +1213,7 @@ class Basic
*/
public function passwordRehashCheck(string $hash): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Password::passwordRehashCheck()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Password::passwordRehashCheck()', E_USER_DEPRECATED);
return \CoreLibs\Check\Password::passwordRehashCheck($hash);
}
@@ -1287,7 +1233,7 @@ class Basic
*/
public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::hex2rgb()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hex2rgb()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::hex2rgb($hexStr, $returnAsString, $seperator);
}
@@ -1303,7 +1249,7 @@ class Basic
*/
public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, $hex_prefix);
}
@@ -1317,7 +1263,7 @@ class Basic
*/
public static function rgb2html(int $red, int $green, int $blue): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
// check that each color is between 0 and 255
return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, true);
}
@@ -1334,7 +1280,7 @@ class Basic
*/
public static function rgb2hsb(int $red, int $green, int $blue): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsb()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsb()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::rgb2hsb($red, $green, $blue);
}
@@ -1348,7 +1294,7 @@ class Basic
*/
public static function hsb2rgb(int $H, float $S, float $V): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::hsb2rgb()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsb2rgb()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::hsb2rgb($H, (int)round($S * 100), (int)round($V * 100));
}
@@ -1364,7 +1310,7 @@ class Basic
*/
public static function rgb2hsl(int $r, int $g, int $b): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsl()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsl()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::rgb2hsb($r, $g, $b);
}
@@ -1378,7 +1324,7 @@ class Basic
*/
public static function hsl2rgb(int $h, float $s, float $l): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Colors::hsl2rgb()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsl2rgb()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Colors::hsl2rgb($h, $s * 100, $l * 100);
}
@@ -1398,7 +1344,7 @@ class Basic
*/
public function getEmailType(string $email, bool $short = false)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Email::getEmailType()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Email::getEmailType()', E_USER_DEPRECATED);
return \CoreLibs\Check\Email::getEmailType($email, $short);
}
@@ -1410,7 +1356,7 @@ class Basic
*/
public function getShortEmailType(string $email_type)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Email::getShortEmailType()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Email::getShortEmailType()', E_USER_DEPRECATED);
return \CoreLibs\Check\Email::getShortEmailType($email_type);
}
@@ -1437,7 +1383,7 @@ class Basic
*/
public static function printDateTime($year, $month, $day, $hour, $min, string $suffix = '', int $min_steps = 1, bool $name_pos_back = false)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Form\Elements::printDateTime()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Form\Elements::printDateTime()', E_USER_DEPRECATED);
return \CoreLibs\Output\Form\Elements::printDateTime($year, $month, $day, $hour, $min, $suffix, $min_steps, $name_pos_back);
}
@@ -1451,7 +1397,7 @@ class Basic
*/
public static function htmlent($string)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Html::htmlent()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Html::htmlent()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Html::htmlent($string);
}
@@ -1464,7 +1410,7 @@ class Basic
*/
public static function removeLB(string $string, string $replace = ' '): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Html::removeLB()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Html::removeLB()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Html::removeLB($string, $replace);
}
@@ -1484,7 +1430,7 @@ class Basic
*/
public static function fceil(float $number, int $precision = 10): float
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Math::fceil()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Math::fceil()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Math::fceil($number, $precision);
}
@@ -1498,7 +1444,7 @@ class Basic
*/
public static function floorp(float $number, int $precision = -2): float
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Math::floorp()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Math::floorp()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Math::floorp($number, $precision);
}
@@ -1510,7 +1456,7 @@ class Basic
*/
public static function initNumeric($number): float
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\Math::initNumeric()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Math::initNumeric()', E_USER_DEPRECATED);
return \CoreLibs\Convert\Math::initNumeric($number);
}
@@ -1528,7 +1474,7 @@ class Basic
*/
public static function setFormToken(string $name = 'form_token'): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Form\Token::setFormToken()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Form\Token::setFormToken()', E_USER_DEPRECATED);
return \CoreLibs\Output\Form\Token::setFormToken($name);
}
@@ -1541,7 +1487,7 @@ class Basic
*/
public static function validateFormToken(string $token, string $name = 'form_token'): bool
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Output\Form\Token::validateFormToken()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Output\Form\Token::validateFormToken()', E_USER_DEPRECATED);
return \CoreLibs\Output\Form\Token::validateFormToken($token, $name);
}
@@ -1560,7 +1506,7 @@ class Basic
*/
public function mimeSetAppName(string $mime, string $app): void
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\MimeAppName()->mimeSetAppName()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\MimeAppName()->mimeSetAppName()', E_USER_DEPRECATED);
\CoreLibs\Convert\MimeAppName::mimeSetAppName($mime, $app);
}
@@ -1573,7 +1519,7 @@ class Basic
*/
public function mimeGetAppName(string $mime): string
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Convert\MimeAppName()->mimeGetAppName()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\MimeAppName()->mimeGetAppName()', E_USER_DEPRECATED);
return \CoreLibs\Convert\MimeAppName::mimeGetAppName($mime);
}
@@ -1597,7 +1543,7 @@ class Basic
*/
public function jsonConvertToArray(?string $json, bool $override = false): array
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Jason::jsonConvertToArray()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Jason::jsonConvertToArray()', E_USER_DEPRECATED);
return \CoreLibs\Check\Jason::jsonConvertToArray($json, $override);
}
@@ -1612,11 +1558,13 @@ class Basic
*/
public function jsonGetLastError(bool $return_string = false)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use \CoreLibs\Check\Jason::jsonGetLastError()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Check\Jason::jsonGetLastError()', E_USER_DEPRECATED);
return \CoreLibs\Check\Jason::jsonGetLastError($return_string);
}
// *** JSON END ***
}
+// phpcs:enable
+
// __END__
diff --git a/www/lib/CoreLibs/Check/Email.php b/www/lib/CoreLibs/Check/Email.php
index 28ebf6d4..c0b3b9f0 100644
--- a/www/lib/CoreLibs/Check/Email.php
+++ b/www/lib/CoreLibs/Check/Email.php
@@ -1,4 +1,6 @@
- "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
+ 0 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@"
+ . "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
1 => "@(.*)@(.*)", // double @
2 => "^[A-Za-z0-9!#$%&'*+-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+-\/=?^_`{|}~\.]{0,63}@", // wrong part before @
3 => "@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]{1,})*\.([a-zA-Z]{2,}){1}$", // wrong part after @
@@ -18,27 +21,39 @@ class Email
// the array with the mobile types that are valid
private static $mobile_email_type = [
'.*@docomo\.ne\.jp$' => 'keitai_docomo',
- '.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb', # correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
- '.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido', # ez[a-j] or nothing
- '.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka', # (sky group)
- '.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky', # (sky group) [tkk,tkc only]
- '.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg', # dtg (sky group)
- '.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone', # old vodafone [t,k,d,h,c,r,n,s,q]
- '.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone', # very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
- '.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank', # add i for iphone also as keitai, others similar to the vodafone group
- '.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone', # add iPhone also as keitai and not as pc
- '.*@disney\.ne\.jp$' => 'keitai_softbank_disney', # (kids)
+ // correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
+ '.*@([a-z0-9]{2}\.)?ezweb\.ne\.jp$' => 'keitai_kddi_ezweb',
+ // ez[a-j] or nothing
+ '.*@(ez[a-j]{1}\.)?ido\.ne\.jp$' => 'keitai_kddi_ido',
+ // (sky group)
+ '.*@([a-z]{2}\.)?sky\.tu-ka\.ne\.jp$' => 'keitai_kddi_tu-ka',
+ // (sky group) [tkk,tkc only]
+ '.*@([a-z]{2}\.)?sky\.tk[kc]{1}\.ne\.jp$' => 'keitai_kddi_sky',
+ // dtg (sky group)
+ '.*@([a-z]{2}\.)?sky\.dtg\.ne\.jp$' => 'keitai_kddi_dtg',
+ // old vodafone [t,k,d,h,c,r,n,s,q]
+ '.*@[tkdhcrnsq]{1}\.vodafone\.ne\.jp$' => 'keitai_softbank_vodafone',
+ // very old j-phone (pre vodafone) [d,h,t,k,r,s,n,q,c]
+ '.*@jp-[dhtkrsnqc]{1}\.ne\.jp$' => 'keitai_softbank_j-phone',
+ // add i for iphone also as keitai, others similar to the vodafone group
+ '.*@([dhtcrknsq]{1}\.)?softbank\.ne\.jp$' => 'keitai_softbank',
+ // add iPhone also as keitai and not as pc
+ '.*@i{1}\.softbank(\.ne)?\.jp$' => 'smartphone_softbank_iphone',
+ '.*@disney\.ne\.jp$' => 'keitai_softbank_disney', // (kids)
'.*@willcom\.ne\.jp$' => 'keitai_willcom',
- '.*@willcom\.com$' => 'keitai_willcom', # new for pdx.ne.jp address
- '.*@wcm\.ne\.jp$' => 'keitai_willcom', # old willcom wcm.ne.jp
- '.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', # old pdx address for willcom
- '.*@bandai\.jp$' => 'keitai_willcom_bandai', # willcom paipo! (kids)
- '.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', # willcom paipo! (kids)
- '.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx', # actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
- '.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile', # ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
- '.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile', # y-mobile techincally not willcom, but I group them there (softbank sub)
- '.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
- '.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', # e-mobile, group will willcom
+ '.*@willcom\.com$' => 'keitai_willcom', // new for pdx.ne.jp address
+ '.*@wcm\.ne\.jp$' => 'keitai_willcom', // old willcom wcm.ne.jp
+ '.*@pdx\.ne\.jp$' => 'keitai_willcom_pdx', // old pdx address for willcom
+ '.*@bandai\.jp$' => 'keitai_willcom_bandai', // willcom paipo! (kids)
+ '.*@pipopa\.ne\.jp$' => 'keitai_willcom_pipopa', // willcom paipo! (kids)
+ // actually only di,dj,dk,wm -> all others are "wrong", but none also allowed?
+ '.*@([a-z0-9]{2,4}\.)?pdx\.ne\.jp$' => 'keitai_willcom_pdx',
+ // ymobile, ymobile1 techincally not willcom, but I group them there (softbank sub)
+ '.*@ymobile([1]{1})?\.ne\.jp$' => 'keitai_willcom_ymobile',
+ // y-mobile techincally not willcom, but I group them there (softbank sub)
+ '.*@y-mobile\.ne\.jp$' => 'keitai_willcom_ymobile',
+ '.*@emnet\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
+ '.*@emobile\.ne\.jp$' => 'keitai_willcom_emnet', // e-mobile, group will willcom
'.*@emobile-s\.ne\.jp$' => 'keitai_willcom_emnet' # e-mobile, group will willcom
];
// short list for mobile email types
diff --git a/www/lib/CoreLibs/Check/File.php b/www/lib/CoreLibs/Check/File.php
index 0f06fa62..c4e9ce5b 100644
--- a/www/lib/CoreLibs/Check/File.php
+++ b/www/lib/CoreLibs/Check/File.php
@@ -1,9 +1,11 @@
- $val) {
- if (is_scalar($val) &&
+ if (
+ is_scalar($val) &&
$val === $needle &&
empty($key_lookin)
) {
$path[] = $key;
break;
- } elseif (is_scalar($val) &&
+ } elseif (
+ is_scalar($val) &&
!empty($key_lookin) &&
$key === $key_lookin &&
$val == $needle
) {
$path[] = $key;
break;
- } elseif (is_array($val) &&
+ } elseif (
+ is_array($val) &&
$path = self::arraySearchRecursive(
$needle,
(array)$val,
@@ -160,7 +166,7 @@ class ArrayHandler
{
// croak on not enough arguemnts (we need at least two)
if (func_num_args() < 2) {
- trigger_error(__FUNCTION__ .' needs two or more array arguments', E_USER_WARNING);
+ trigger_error(__FUNCTION__ . ' needs two or more array arguments', E_USER_WARNING);
return false;
}
// default key is not string
@@ -174,14 +180,14 @@ class ArrayHandler
}
// check that arrays count is at least two, else we don't have enough to do anything
if (count($arrays) < 2) {
- trigger_error(__FUNCTION__.' needs two or more array arguments', E_USER_WARNING);
+ trigger_error(__FUNCTION__ . ' needs two or more array arguments', E_USER_WARNING);
return false;
}
$merged = [];
while ($arrays) {
$array = array_shift($arrays);
if (!is_array($array)) {
- trigger_error(__FUNCTION__ .' encountered a non array argument', E_USER_WARNING);
+ trigger_error(__FUNCTION__ . ' encountered a non array argument', E_USER_WARNING);
return false;
}
if (!$array) {
@@ -259,9 +265,10 @@ class ArrayHandler
{
$ret_array = [];
// do this to only run count once
- for ($i = 0, $iMax = count($db_array); $i < $iMax; $i ++) {
+ for ($i = 0, $iMax = count($db_array); $i < $iMax; $i++) {
// if no key then we make an order reference
- if ($key !== false &&
+ if (
+ $key !== false &&
$value !== false &&
(($set_only && $db_array[$i][$value]) || (!$set_only))
) {
diff --git a/www/lib/CoreLibs/Combined/DateTime.php b/www/lib/CoreLibs/Combined/DateTime.php
index a2899b15..1684ca77 100644
--- a/www/lib/CoreLibs/Combined/DateTime.php
+++ b/www/lib/CoreLibs/Combined/DateTime.php
@@ -1,9 +1,11 @@
- 24) ||
+ if (
+ ($hour < 0 || $hour > 24) ||
($min < 0 || $min > 60) ||
(is_numeric($sec) && ($sec < 0 || $sec > 60))
) {
@@ -192,15 +195,15 @@ class DateTime
// check that month & day are two digits and then combine
foreach (['start', 'end'] as $prefix) {
foreach (['month', 'day'] as $date_part) {
- $_date = $prefix.'_'.$date_part;
+ $_date = $prefix . '_' . $date_part;
if (isset($$_date) && $$_date < 10 && !preg_match("/^0/", $$_date)) {
- $$_date = '0'.$$_date;
+ $$_date = '0' . $$_date;
}
}
- $_date = $prefix.'_date';
+ $_date = $prefix . '_date';
$$_date = '';
foreach (['year', 'month', 'day'] as $date_part) {
- $_sub_date = $prefix.'_'.$date_part;
+ $_sub_date = $prefix . '_' . $date_part;
$$_date .= $$_sub_date;
}
}
diff --git a/www/lib/CoreLibs/Convert/Byte.php b/www/lib/CoreLibs/Convert/Byte.php
index 86e8aa42..11aa6ebf 100644
--- a/www/lib/CoreLibs/Convert/Byte.php
+++ b/www/lib/CoreLibs/Convert/Byte.php
@@ -1,17 +1,19 @@
- ($dev - (((int)$dev & 0xfff) == 0xd00 ? 52 : 0))
) {
- $exp ++;
+ $exp++;
}
// label name, including leading space if flagged
- $pre = ($space ? ' ' : '').($labels[$exp] ?? '>E').($si ? 'i' : '').'B';
+ $pre = ($space ? ' ' : '') . ($labels[$exp] ?? '>E') . ($si ? 'i' : '') . 'B';
$bytes_calc = $abs_bytes / pow($unit, $exp);
// if original is negative, reverse
if ($bytes < 0) {
@@ -90,7 +93,7 @@ class Byte
if ($adjust) {
return sprintf("%.2f%s", $bytes_calc, $pre);
} else {
- return round($bytes_calc, 2).$pre;
+ return round($bytes_calc, 2) . $pre;
}
} else {
// if anything other return as string
@@ -120,7 +123,11 @@ class Byte
// all valid units
$valid_units_ = 'bkmgtpezy';
// detects up to exo bytes
- preg_match("/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i", strtolower($number), $matches);
+ preg_match(
+ "/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i",
+ strtolower($number),
+ $matches
+ );
if (isset($matches[1]) && isset($matches[2])) {
// remove all non valid characters from the number
$number = preg_replace('/[^0-9\.]/', '', $matches[1]);
diff --git a/www/lib/CoreLibs/Convert/Colors.php b/www/lib/CoreLibs/Convert/Colors.php
index 267f3c77..dab60651 100644
--- a/www/lib/CoreLibs/Convert/Colors.php
+++ b/www/lib/CoreLibs/Convert/Colors.php
@@ -1,4 +1,4 @@
- 0 &&
$key_length <= self::$max_key_length
) {
@@ -98,7 +101,7 @@ class RandomKey
}
$pieces = [];
- for ($i = 1; $i <= $use_key_length; $i ++) {
+ for ($i = 1; $i <= $use_key_length; $i++) {
$pieces[] = self::$key_range[random_int(0, self::$one_key_length - 1)];
}
return join('', $pieces);
diff --git a/www/lib/CoreLibs/Create/Uids.php b/www/lib/CoreLibs/Create/Uids.php
index 6b6cabb4..6b02438e 100644
--- a/www/lib/CoreLibs/Create/Uids.php
+++ b/www/lib/CoreLibs/Create/Uids.php
@@ -1,4 +1,6 @@
-table_array);
$string = '';
foreach ($this->table_array as $column => $data_array) {
- $string .= ''.$column.' -> '.$data_array['value'].'
';
+ $string .= '' . $column . ' -> ' . $data_array['value'] . '
';
}
// add output to internal error_msg
if ($write === true) {
@@ -185,22 +188,23 @@ class ArrayIO extends \CoreLibs\DB\IO
return $this->table_array;
}
// delete query
- $q = 'DELETE FROM '.$this->table_name.' WHERE ';
- $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' ';
+ $q = 'DELETE FROM ' . $this->table_name . ' WHERE ';
+ $q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
// delete files and build FK query
reset($this->table_array);
$q_where = '';
foreach ($this->table_array as $column => $data_array) {
// suchen nach bildern und lschen ...
- if (!empty($this->table_array[$column]['file']) &&
- file_exists($this->table_array[$column]['url'].$this->table_array[$column]['value'])
+ if (
+ !empty($this->table_array[$column]['file']) &&
+ file_exists($this->table_array[$column]['url'] . $this->table_array[$column]['value'])
) {
- if (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) {
- unlink($this->table_array[$column]['path'].$this->table_array[$column]['value']);
+ if (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
+ unlink($this->table_array[$column]['path'] . $this->table_array[$column]['value']);
}
$file_name = str_replace('_tn', '', $this->table_array[$column]['value']);
- if (file_exists($this->table_array[$column]['path'].$file_name)) {
- unlink($this->table_array[$column]['path'].$file_name);
+ if (file_exists($this->table_array[$column]['path'] . $file_name)) {
+ unlink($this->table_array[$column]['path'] . $file_name);
}
}
// if we have a foreign key
@@ -209,7 +213,7 @@ class ArrayIO extends \CoreLibs\DB\IO
if ($q_where) {
$q_where .= ' AND ';
}
- $q_where .= $column.' = '.$this->table_array[$column]['value'];
+ $q_where .= $column . ' = ' . $this->table_array[$column]['value'];
}
// allgemeines zurcksetzen des arrays
unset($this->table_array[$column]['value']);
@@ -217,7 +221,7 @@ class ArrayIO extends \CoreLibs\DB\IO
// attach fk row if there ...
if ($q_where) {
- $q .= ' AND '.$q_where;
+ $q .= ' AND ' . $q_where;
}
// if 0, error
$this->pk_id = null;
@@ -258,16 +262,16 @@ class ArrayIO extends \CoreLibs\DB\IO
if ($q_where) {
$q_where .= ' AND ';
}
- $q_where .= $column .= ' = '.$this->table_array[$column]['value'];
+ $q_where .= $column .= ' = ' . $this->table_array[$column]['value'];
}
}
$q = 'SELECT ';
$q .= $q_select;
- $q .= ' FROM '.$this->table_name.' WHERE ';
- $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' ';
+ $q .= ' FROM ' . $this->table_name . ' WHERE ';
+ $q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
if ($q_where) {
- $q .= ' AND '.$q_where;
+ $q .= ' AND ' . $q_where;
}
// if query was executed okay, else set error
@@ -277,11 +281,13 @@ class ArrayIO extends \CoreLibs\DB\IO
foreach ($this->table_array as $column => $data_array) {
// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten fr ausgabe
// ?? sollte das nicht drauen ??? man weis ja net was da drin steht --> is noch zu berlegen
- // echo 'EDIT: $edit | Spalte: $column | type: '.$this->table_array[$column]['type'].' | Res: '.$res[$column].'
';
+ // $this->log->debug('DB READ', 'EDIT: $edit | Spalte: $column | type: '
+ // .$this->table_array[$column]['type'].' | Res: '.$res[$column]);
if ($edit) {
$this->table_array[$column]['value'] = $res[$column];
// if password, also write to hidden
- if (isset($this->table_array[$column]['type']) &&
+ if (
+ isset($this->table_array[$column]['type']) &&
$this->table_array[$column]['type'] == 'password'
) {
$this->table_array[$column]['HIDDEN_value'] = $res[$column];
@@ -336,12 +342,12 @@ class ArrayIO extends \CoreLibs\DB\IO
// falls in 'delete' 'ja' dann loeschen (und gibts eh nur beim update)
if ($this->table_array[$column]['delete']) {
unset($this->table_array[$column]['delete']);
- if (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) {
- unlink($this->table_array[$column]['path'].$this->table_array[$column]['value']);
+ if (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
+ unlink($this->table_array[$column]['path'] . $this->table_array[$column]['value']);
}
$file_name = str_replace('_tn', '', $this->table_array[$column]['value']);
- if (file_exists($this->table_array[$column]['path'].$file_name)) {
- unlink($this->table_array[$column]['path'].$file_name);
+ if (file_exists($this->table_array[$column]['path'] . $file_name)) {
+ unlink($this->table_array[$column]['path'] . $file_name);
}
$this->table_array[$column]['value'] = '';
} else {
@@ -351,26 +357,26 @@ class ArrayIO extends \CoreLibs\DB\IO
// mozilla, patch
$fn_name = explode('/', $this->table_array[$column]['dn']);
- $this->table_array[$column]['dn'] = $fn_name[count($fn_name)-1];
+ $this->table_array[$column]['dn'] = $fn_name[count($fn_name) - 1];
$filename_parts = explode('.', $this->table_array[$column]['dn']);
$ext = end($filename_parts);
array_splice($filename_parts, -1, 1);
$name = str_replace(' ', '_', implode('.', $filename_parts));
- $file_name = $name.'.'.$ext;
+ $file_name = $name . '.' . $ext;
//echo 'Dn: $file_name';
- copy($this->table_array[$column]['tmp'], $this->table_array[$column]['path'].$file_name);
+ copy($this->table_array[$column]['tmp'], $this->table_array[$column]['path'] . $file_name);
// automatisch thumbnail generieren, geht nur mit convert (ImageMagic!!!), aber nur bei bild ..
- if (strtolower($ext) == 'jpeg' || strtolower($ext) == 'jpg' || strtolower($ext) == 'gif' || strtolower($ext) == 'png') {
- $file_name_tn = $name.'_tn.'.$ext;
- $input = $this->table_array[$column]['path'].$file_name;
- $output = $this->table_array[$column]['path'].$file_name_tn;
- $com = 'convert -geometry 115 '.$input.' '.$output;
+ if (in_array(strtolower($ext), ['jpeg', 'jpg', 'gif', 'png'])) {
+ $file_name_tn = $name . '_tn.' . $ext;
+ $input = $this->table_array[$column]['path'] . $file_name;
+ $output = $this->table_array[$column]['path'] . $file_name_tn;
+ $com = 'convert -geometry 115 ' . $input . ' ' . $output;
exec($com);
$this->table_array[$column]['value'] = $file_name_tn;
} else {
$this->table_array[$column]['value'] = $file_name;
}
- } elseif (file_exists($this->table_array[$column]['path'].$this->table_array[$column]['value'])) {
+ } elseif (file_exists($this->table_array[$column]['path'] . $this->table_array[$column]['value'])) {
// mach gar nix, wenn bild schon da ???
}
} // delete or upload
@@ -378,13 +384,15 @@ class ArrayIO extends \CoreLibs\DB\IO
/********************************* END FILE **************************************/
// do not write 'pk' (primary key) or 'view' values
- if (!isset($this->table_array[$column]['pk']) &&
+ if (
+ !isset($this->table_array[$column]['pk']) &&
isset($this->table_array[$column]['type']) &&
$this->table_array[$column]['type'] != 'view' &&
strlen($column) > 0
) {
// for password use hidden value if main is not set
- if (isset($this->table_array[$column]['type']) &&
+ if (
+ isset($this->table_array[$column]['type']) &&
$this->table_array[$column]['type'] == 'password' &&
empty($this->table_array[$column]['value'])
) {
@@ -394,7 +402,7 @@ class ArrayIO extends \CoreLibs\DB\IO
if (strlen($q_data)) {
$q_data .= ', ';
}
- $q_data .= $column.' = ';
+ $q_data .= $column . ' = ';
} else {
// this is insert
if (strlen($q_data)) {
@@ -407,15 +415,18 @@ class ArrayIO extends \CoreLibs\DB\IO
}
// integer is different
if (isset($this->table_array[$column]['int']) || isset($this->table_array[$column]['int_null'])) {
- $this->log->debug('write_check', '['.$column.']['.$this->table_array[$column]['value'].']['.$this->table_array[$column]['type'].'] '.
- 'VALUE SET: '.(string)isset($this->table_array[$column]['value']).
- ' | INT NULL: '.(string)isset($this->table_array[$column]['int_null']));
- if (isset($this->table_array[$column]['value']) &&
+ $this->log->debug('WRITE CHECK', '[' . $column . '][' . $this->table_array[$column]['value'] . ']'
+ . '[' . $this->table_array[$column]['type'] . '] '
+ . 'VALUE SET: ' . (string)isset($this->table_array[$column]['value'])
+ . ' | INT NULL: ' . (string)isset($this->table_array[$column]['int_null']));
+ if (
+ isset($this->table_array[$column]['value']) &&
!$this->table_array[$column]['value'] &&
isset($this->table_array[$column]['int_null'])
) {
$_value = 'NULL';
- } elseif (!isset($this->table_array[$column]['value']) ||
+ } elseif (
+ !isset($this->table_array[$column]['value']) ||
(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
) {
$_value = 0;
@@ -425,10 +436,11 @@ class ArrayIO extends \CoreLibs\DB\IO
$q_data .= $_value;
} elseif (isset($this->table_array[$column]['bool'])) {
// boolean storeage (reverse check on ifset)
- $q_data .= "'".$this->dbBoolean($this->table_array[$column]['value'], true)."'";
+ $q_data .= "'" . $this->dbBoolean($this->table_array[$column]['value'], true) . "'";
} elseif (isset($this->table_array[$column]['interval'])) {
// for interval we check if no value, then we set null
- if (!isset($this->table_array[$column]['value']) ||
+ if (
+ !isset($this->table_array[$column]['value']) ||
(isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value'])
) {
$_value = 'NULL';
@@ -442,9 +454,14 @@ class ArrayIO extends \CoreLibs\DB\IO
} else {
// if the error check is json, we set field to null if NOT set
// else normal string write
- if (isset($this->table_array[$column]['error_check']) &&
+ if (
+ isset($this->table_array[$column]['error_check']) &&
$this->table_array[$column]['error_check'] == 'json' &&
- (!isset($this->table_array[$column]['value']) || (isset($this->table_array[$column]['value']) && !$this->table_array[$column]['value']))
+ (
+ !isset($this->table_array[$column]['value']) ||
+ (isset($this->table_array[$column]['value']) &&
+ !$this->table_array[$column]['value'])
+ )
) {
$q_data .= 'NULL';
} else {
@@ -452,7 +469,9 @@ class ArrayIO extends \CoreLibs\DB\IO
$q_data .= "'";
// if add slashes do convert & add slashes else write AS is
if ($addslashes) {
- $q_data .= $this->dbEscapeString($this->convertEntities($this->table_array[$column]['value']));
+ $q_data .= $this->dbEscapeString(
+ $this->convertEntities($this->table_array[$column]['value'])
+ );
} else {
$q_data .= $this->dbEscapeString($this->table_array[$column]['value']);
}
@@ -472,14 +491,14 @@ class ArrayIO extends \CoreLibs\DB\IO
if (!empty($q_where)) {
$q_where .= ' AND ';
}
- $q_where .= $column .= ' = '.$this->table_array[$column]['value'];
+ $q_where .= $column .= ' = ' . $this->table_array[$column]['value'];
}
}
// if no PK set, then get max ID from DB
if (!$this->table_array[$this->pk_name]['value']) {
// max id, falls INSERT
- $q = 'SELECT MAX('.$this->pk_name.') + 1 AS pk_id FROM '.$this->table_name;
+ $q = 'SELECT MAX(' . $this->pk_name . ') + 1 AS pk_id FROM ' . $this->table_name;
$res = $this->dbReturnRow($q);
if (!isset($res['pk_id'])) {
$res['pk_id'] = 1;
@@ -488,19 +507,19 @@ class ArrayIO extends \CoreLibs\DB\IO
}
if (!$insert) {
- $q = 'UPDATE '.$this->table_name.' SET ';
+ $q = 'UPDATE ' . $this->table_name . ' SET ';
$q .= $q_data;
$q .= ' WHERE ';
- $q .= $this->pk_name.' = '.$this->table_array[$this->pk_name]['value'].' ';
+ $q .= $this->pk_name . ' = ' . $this->table_array[$this->pk_name]['value'] . ' ';
if (!empty($q_where)) {
- $q .= ' AND '.$q_where;
+ $q .= ' AND ' . $q_where;
}
// set pk_id ... if it has changed or so
$this->pk_id = $this->table_array[$this->pk_name]['value'];
} else {
- $q = 'INSERT INTO '.$this->table_name.' ';
- $q .= '('.$q_vars.') ';
- $q .= 'VALUES ('.$q_data.')';
+ $q = 'INSERT INTO ' . $this->table_name . ' ';
+ $q .= '(' . $q_vars . ') ';
+ $q .= 'VALUES (' . $q_data . ')';
// write primary key too
// if ($q_data)
// $q .= ", ";
@@ -520,6 +539,7 @@ class ArrayIO extends \CoreLibs\DB\IO
// return the table if needed
return $this->table_array;
}
-} // end of class
+ // end of class
+}
// __END__
diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php
index d916c8dd..626f5d89 100644
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -1,4 +1,5 @@
-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_schema = !empty($db_config['db_schema']) ? $db_config['db_schema'] : ''; // do not set to 'public' if not set, because the default is already public
+ // do not set to 'public' if not set, because the default is already public
+ $this->db_schema = !empty($db_config['db_schema']) ? $db_config['db_schema'] : '';
$this->db_encoding = !empty($db_config['db_encoding']) ? $db_config['db_encoding'] : '';
$this->db_type = $db_config['db_type'] ?? '';
$this->db_ssl = !empty($db_config['db_ssl']) ? $db_config['db_ssl'] : 'allow';
@@ -343,16 +353,19 @@ class IO extends \CoreLibs\Basic
$this->error_string['14'] = 'Can\'t connect to DB server';
$this->error_string['15'] = 'Can\'t select DB';
$this->error_string['16'] = 'No DB Handler found / connect or reconnect failed';
- $this->error_string['17'] = 'All dbReturn* methods work only with SELECT statements, please use dbExec for everything else';
+ $this->error_string['17'] = 'All dbReturn* methods work only with SELECT statements, '
+ . 'please use dbExec for everything else';
$this->error_string['18'] = 'Query not found in cache. Nothing has been reset';
$this->error_string['19'] = 'Wrong PK name given or no PK name given at all, can\'t get Insert ID';
- $this->error_string['20'] = 'Found given Prepare Statement Name in array, Query not prepared, will use existing one';
+ $this->error_string['20'] = 'Found given Prepare Statement Name in array, '
+ . 'Query not prepared, will use existing one';
$this->error_string['21'] = 'Query Prepare failed';
$this->error_string['22'] = 'Query Execute failed';
$this->error_string['23'] = 'Query Execute failed, data array does not match placeholders';
$this->error_string['24'] = 'Missing prepared query entry for execute.';
$this->error_string['25'] = 'Prepare query data is not in array format.';
- $this->error_string['30'] = 'Query call in a possible endless loop. Was called more than '.$this->MAX_QUERY_CALL.' times';
+ $this->error_string['30'] = 'Query call in a possible endless loop. '
+ . 'Was called more than ' . $this->MAX_QUERY_CALL . ' times';
$this->error_string['31'] = 'Could not fetch PK after query insert';
$this->error_string['32'] = 'Multiple PK return as array';
$this->error_string['33'] = 'Returning PK was not found';
@@ -412,7 +425,14 @@ class IO extends \CoreLibs\Basic
private function __connectToDB(): bool
{
// generate connect string
- $this->dbh = $this->db_functions->__dbConnect($this->db_host, $this->db_user, $this->db_pwd, $this->db_name, $this->db_port, $this->db_ssl);
+ $this->dbh = $this->db_functions->__dbConnect(
+ $this->db_host,
+ $this->db_user,
+ $this->db_pwd,
+ $this->db_name,
+ $this->db_port,
+ $this->db_ssl
+ );
// if no dbh here, we couldn't connect to the DB itself
if (!$this->dbh) {
$this->error_id = 14;
@@ -515,13 +535,13 @@ class IO extends \CoreLibs\Basic
$array = [];
}
foreach ($array as $key => $value) {
- $string .= $this->nbsp.''.$key.' => ';
+ $string .= $this->nbsp . '' . $key . ' => ';
if (is_array($value)) {
$this->nbsp .= ' ';
$string .= '
';
$string .= $this->__printArray($value);
} else {
- $string .= $value.'
';
+ $string .= $value . '
';
}
}
$this->nbsp = substr_replace($this->nbsp, '', -18, 18);
@@ -540,10 +560,10 @@ class IO extends \CoreLibs\Basic
{
$prefix = '';
if ($id) {
- $prefix .= '['.$id.'] ';
+ $prefix .= '[' . $id . '] ';
}
if ($type) {
- $prefix .= '{'.$type.'} ';
+ $prefix .= '{' . $type . '} ';
}
if ($prefix) {
$prefix .= '- ';
@@ -576,12 +596,26 @@ class IO extends \CoreLibs\Basic
// okay, an error occured
if ($this->error_id) {
// write error msg ...
- $this->__dbDebug('db', 'DB-Error '.$this->error_id.': '.$this->error_string[$this->error_id].($msg ? ', '.$msg : '').'', 'DB_ERROR', $where_called);
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $this->error_id . ': '
+ . $this->error_string[$this->error_id] . ($msg ? ', ' . $msg : '')
+ . '',
+ 'DB_ERROR',
+ $where_called
+ );
$this->had_error = $this->error_id;
// write detailed error log
}
if ($this->warning_id) {
- $this->__dbDebug('db', 'DB-Warning '.$this->warning_id.': '.$this->error_string[$this->warning_id].($msg ? ', '.$msg : '').'', 'DB_WARNING', $where_called);
+ $this->__dbDebug(
+ 'db',
+ 'DB-Warning ' . $this->warning_id . ': '
+ . $this->error_string[$this->warning_id]
+ . ($msg ? ', ' . $msg : '') . '',
+ 'DB_WARNING',
+ $where_called
+ );
$this->had_warning = $this->warning_id;
}
// unset the error/warning vars
@@ -597,7 +631,8 @@ class IO extends \CoreLibs\Basic
private function __dbConvertEncoding($row)
{
// only do if array, else pass through row (can be false)
- if (!is_array($row) || empty($this->to_encoding) || empty($this->db_encoding)
+ if (
+ !is_array($row) || empty($this->to_encoding) || empty($this->db_encoding)
) {
return $row;
}
@@ -623,8 +658,8 @@ class IO extends \CoreLibs\Basic
// get the keys from data array
$keys = array_keys($data);
// because the placeholders start with $ and at 1, we need to increase each key and prefix it with a $ char
- for ($i = 0, $iMax = count($keys); $i < $iMax; $i ++) {
- $keys[$i] = '$'.($keys[$i] + 1);
+ for ($i = 0, $iMax = count($keys); $i < $iMax; $i++) {
+ $keys[$i] = '$' . ($keys[$i] + 1);
}
// simply replace the $1, $2, ... with the actual data and return it
return str_replace(array_reverse($keys), array_reverse($data), $this->prepare_cursor[$stm_name]['query']);
@@ -660,7 +695,7 @@ class IO extends \CoreLibs\Basic
*/
private function __dbPrepareExec(string $query, string $pk_name)
{
- $matches= [];
+ $matches = [];
// to either use the returning method or the guess method for getting primary keys
$this->returning_id = false;
// set the query
@@ -702,13 +737,13 @@ class IO extends \CoreLibs\Basic
if (!preg_match("/ returning /i", $this->query) && $this->pk_name && $this->pk_name != 'NULL') {
// check if this query has a ; at the end and remove it
$this->query = preg_replace("/(;\s*)$/", '', $this->query);
- $this->query .= " RETURNING ".$this->pk_name;
+ $this->query .= " RETURNING " . $this->pk_name;
$this->returning_id = true;
} elseif (preg_match("/ returning (.*)/i", $this->query, $matches)) {
if ($this->pk_name && $this->pk_name != 'NULL') {
// add the primary key if it is not in the returning set
if (!preg_match("/$this->pk_name/", $matches[1])) {
- $this->query .= " , ".$this->pk_name;
+ $this->query .= " , " . $this->pk_name;
}
}
$this->returning_id = true;
@@ -736,7 +771,8 @@ class IO extends \CoreLibs\Basic
}
// count up the run, if this is run more than the max_run then exit with error
// if set to -1, then ignore it
- if ($this->MAX_QUERY_CALL != -1 &&
+ if (
+ $this->MAX_QUERY_CALL != -1 &&
$this->query_called[$md5] > $this->MAX_QUERY_CALL
) {
$this->error_id = 30;
@@ -775,14 +811,15 @@ class IO extends \CoreLibs\Basic
$this->num_fields = $this->db_functions->__dbNumFields($this->cursor);
// set field names
$this->field_names = [];
- for ($i = 0; $i < $this->num_fields; $i ++) {
+ for ($i = 0; $i < $this->num_fields; $i++) {
$this->field_names[] = $this->db_functions->__dbFieldName($this->cursor, $i);
}
} elseif ($this->__checkQueryForInsert($this->query)) {
// if not select do here
// count affected rows
$this->num_rows = $this->db_functions->__dbAffectedRows($this->cursor);
- if (($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
+ if (
+ ($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
($this->__checkQueryForUpdate($this->query) && $this->returning_id)
) {
// set insert_id
@@ -798,22 +835,30 @@ class IO extends \CoreLibs\Basic
// echo "** PREPARE RETURNING FOR CURSOR: ".$this->cursor."
";
// we have returning, now we need to check if we get one or many returned
// we'll need to loop this, if we have multiple insert_id returns
- while ($_insert_id = $this->db_functions->__dbFetchArray(
- $this->cursor,
- $this->db_functions->__dbResultType(true)
- )) {
+ while (
+ $_insert_id = $this->db_functions->__dbFetchArray(
+ $this->cursor,
+ $this->db_functions->__dbResultType(true)
+ )
+ ) {
// echo "*** RETURNING: ".print_r($_insert_id, true)."
";
$this->insert_id[] = $_insert_id;
$this->insert_id_arr[] = $_insert_id;
}
// if we have only one, revert from array to single
if (count($this->insert_id) == 1) {
- // echo "* SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->pk_name, $this->insert_id[0])."
";
- // echo "* PK DIRECT: ".(isset($this->insert_id[0][$this->pk_name]) ? $this->insert_id[0][$this->pk_name] : '[NO PK NAME SET]' )."
";
- // if this has only the pk_name, then only return this, else array of all data (but without the position)
- // example if insert_id[0]['foo'] && insert_id[0]['bar'] it will become insert_id['foo'] & insert_id['bar']
- // if only ['foo_id'] and it is the PK then the PK is directly written to the insert_id
- if (count($this->insert_id[0]) > 1 ||
+ // $this->log->debug('SINGLE DATA CONVERT', count($this->insert_id[0])." => "
+ // .array_key_exists($this->pk_name, $this->insert_id[0]));
+ // $this->log->debug('PK DIRECT', (isset($this->insert_id[0][$this->pk_name]) ?
+ // $this->insert_id[0][$this->pk_name] : '[NO PK NAME SET]' ));
+ // if this has only the pk_name, then only return this,
+ // else array of all data (but without the position)
+ // example if insert_id[0]['foo'] && insert_id[0]['bar']
+ // it will become insert_id['foo'] & insert_id['bar']
+ // if only ['foo_id'] and it is the PK then the
+ // PK is directly written to the insert_id
+ if (
+ count($this->insert_id[0]) > 1 ||
!array_key_exists($this->pk_name, $this->insert_id[0])
) {
$this->insert_id_ext = $this->insert_id[0];
@@ -916,7 +961,8 @@ class IO extends \CoreLibs\Basic
return false;
}
// ok entry, set
- if ($max_calls == -1 ||
+ if (
+ $max_calls == -1 ||
$max_calls > 0
) {
$this->MAX_QUERY_CALL = $max_calls;
@@ -997,7 +1043,7 @@ class IO extends \CoreLibs\Basic
if (!$db_schema) {
return false;
}
- $q = "SET search_path TO '".$this->dbEscapeString($db_schema)."'";
+ $q = "SET search_path TO '" . $this->dbEscapeString($db_schema) . "'";
return $this->dbExec($q);
}
@@ -1023,7 +1069,7 @@ class IO extends \CoreLibs\Basic
if (!$db_encoding) {
return false;
}
- $q = "SET client_encoding TO '".$this->dbEscapeString($db_encoding)."'";
+ $q = "SET client_encoding TO '" . $this->dbEscapeString($db_encoding) . "'";
return $this->dbExec($q);
}
@@ -1067,18 +1113,18 @@ class IO extends \CoreLibs\Basic
public function dbInfo(bool $show = true): string
{
$string = '';
- $string .= '{b}-DB-info->{/b} Connected to db {b}\''.$this->db_name.'\'{/b} ';
- $string .= 'with schema {b}\''.$this->db_schema.'\'{/b} ';
- $string .= 'as user {b}\''.$this->db_user.'\'{/b} ';
- $string .= 'at host {b}\''.$this->db_host.'\'{/b} ';
- $string .= 'on port {b}\''.$this->db_port.'\'{/b} ';
- $string .= 'with ssl mode {b}\''.$this->db_ssl.'\'{/b}{br}';
- $string .= '{b}-DB-info->{/b} DB IO Class debug output: {b}'.($this->db_debug ? 'Yes' : 'No').'{/b}';
+ $string .= '{b}-DB-info->{/b} Connected to db {b}\'' . $this->db_name . '\'{/b} ';
+ $string .= 'with schema {b}\'' . $this->db_schema . '\'{/b} ';
+ $string .= 'as user {b}\'' . $this->db_user . '\'{/b} ';
+ $string .= 'at host {b}\'' . $this->db_host . '\'{/b} ';
+ $string .= 'on port {b}\'' . $this->db_port . '\'{/b} ';
+ $string .= 'with ssl mode {b}\'' . $this->db_ssl . '\'{/b}{br}';
+ $string .= '{b}-DB-info->{/b} DB IO Class debug output: {b}' . ($this->db_debug ? 'Yes' : 'No') . '{/b}';
if ($show === true) {
// if debug, remove / change b
$this->__dbDebug('db', str_replace(['{b}', '{/b}', '{br}'], ['', '', ' **** '], $string), 'dbInfo');
} else {
- $string = $string.'{br}';
+ $string = $string . '{br}';
}
// for direct print, change to html
return str_replace(['{b}', '{/b}', '{br}'], ['', '', '
'], $string);
@@ -1120,8 +1166,12 @@ class IO extends \CoreLibs\Basic
* - if set to 3, after EACH row, the data will be reset,
* no caching is done except for basic (count, etc)
* @param string $query Query string
- * @param int $reset reset status: 1: read cache, clean at the end, 2: read new, clean at end, 3: never cache
- * @param bool $assoc_only true to only returned the named and not index position ones
+ * @param int $reset reset status:
+ * 1: read cache, clean at the end
+ * 2: read new, clean at end
+ * 3: never cache
+ * @param bool $assoc_only true to only returned the named and not
+ * index position ones
* @return array|bool return array data or false on error/end
* @suppress PhanTypeMismatchDimFetch
*/
@@ -1161,7 +1211,9 @@ class IO extends \CoreLibs\Basic
if ($reset && !$this->cursor_ext[$md5]['pos']) {
$this->cursor_ext[$md5]['cursor'] = null;
}
- // $this->debug('MENU', 'Reset: '.$reset.', Cursor: '.$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos'].', Query: '.$query);
+ // $this->debug('MENU', 'Reset: '.$reset.', Cursor: '
+ // .$this->cursor_ext[$md5]['cursor'].', Pos: '.$this->cursor_ext[$md5]['pos']
+ // .', Query: '.$query);
// if no cursor yet, execute
if (!$this->cursor_ext[$md5]['cursor']) {
@@ -1203,12 +1255,18 @@ class IO extends \CoreLibs\Basic
if ($this->cursor_ext[$md5]['cursor']) {
if ($this->cursor_ext[$md5]['firstcall'] == 1) {
// count the rows returned (if select)
- $this->cursor_ext[$md5]['num_rows'] = $this->db_functions->__dbNumRows($this->cursor_ext[$md5]['cursor']);
+ $this->cursor_ext[$md5]['num_rows'] =
+ $this->db_functions->__dbNumRows($this->cursor_ext[$md5]['cursor']);
// count the fields
- $this->cursor_ext[$md5]['num_fields'] = $this->db_functions->__dbNumFields($this->cursor_ext[$md5]['cursor']);
+ $this->cursor_ext[$md5]['num_fields'] =
+ $this->db_functions->__dbNumFields($this->cursor_ext[$md5]['cursor']);
// set field names
- for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i ++) {
- $this->cursor_ext[$md5]['field_names'][] = $this->db_functions->__dbFieldName($this->cursor_ext[$md5]['cursor'], $i);
+ for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) {
+ $this->cursor_ext[$md5]['field_names'][] =
+ $this->db_functions->__dbFieldName(
+ $this->cursor_ext[$md5]['cursor'],
+ $i
+ );
}
// reset first call vars
$this->cursor_ext[$md5]['firstcall'] = 0;
@@ -1237,24 +1295,34 @@ class IO extends \CoreLibs\Basic
// check if end of output ...
if ($this->cursor_ext[$md5]['pos'] >= $this->cursor_ext[$md5]['num_rows']) {
$this->cursor_ext[$md5]['pos'] = 0;
- # if not reset given, set the cursor to true, so in a cached call on a different page we don't get problems from DB connection (as those will be LOST)
+ // if not reset given, set the cursor to true, so in a cached
+ // call on a different page we don't get problems from
+ // DB connection (as those will be LOST)
$this->cursor_ext[$md5]['cursor'] = 1;
$return = false;
} else {
// unset return value ...
$return = [];
- for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i ++) {
+ for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) {
// create mixed return array
- if ($assoc_only === false && isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) {
+ if (
+ $assoc_only === false &&
+ isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])
+ ) {
$return[$i] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i];
}
// named part
if (isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) {
- $return[$this->cursor_ext[$md5]['field_names'][$i]] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i];
+ $return[$this->cursor_ext[$md5]['field_names'][$i]] =
+ $this->cursor_ext[$md5]['data']
+ [$this->cursor_ext[$md5]['pos']][$i];
} else {
- // throws PhanTypeMismatchDimFetch error, but in this case we know we will access only named array parts
+ // throws PhanTypeMismatchDimFetch error, but in this
+ // case we know we will access only named array parts
// @suppress PhanTypeMismatchDimFetch
- $return[$this->cursor_ext[$md5]['field_names'][$i]] = $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$this->cursor_ext[$md5]['field_names'][$i]];
+ $return[$this->cursor_ext[$md5]['field_names'][$i]] =
+ $this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]
+ ['pos']][$this->cursor_ext[$md5]['field_names'][$i]];
}
}
$this->cursor_ext[$md5]['pos'] ++;
@@ -1393,7 +1461,12 @@ class IO extends \CoreLibs\Basic
} else {
// if no async running print error
$this->error_id = 42;
- $this->__dbDebug('db', 'DB-Error No async query has been started yet.', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error No async query '
+ . 'has been started yet.',
+ 'DB_ERROR'
+ );
return false;
}
}
@@ -1471,7 +1544,7 @@ class IO extends \CoreLibs\Basic
$rows = [];
while ($res = $this->dbFetchArray($cursor, $assoc_only)) {
$data = [];
- for ($i = 0; $i < $this->num_fields; $i ++) {
+ for ($i = 0; $i < $this->num_fields; $i++) {
$data[$this->field_names[$i]] = $res[$this->field_names[$i]];
}
$rows[] = $data;
@@ -1519,7 +1592,7 @@ class IO extends \CoreLibs\Basic
*/
public function dbShowTableMetaData(string $table, string $schema = '')
{
- $table = ($schema ? $schema.'.' : '').$table;
+ $table = ($schema ? $schema . '.' : '') . $table;
$array = $this->db_functions->__dbMetaData($table);
if (!is_array($array)) {
@@ -1580,12 +1653,15 @@ class IO extends \CoreLibs\Basic
}
// if no returning, then add it
if (!preg_match("/ returning /i", $query) && $this->prepare_cursor[$stm_name]['pk_name']) {
- $query .= " RETURNING ".$this->prepare_cursor[$stm_name]['pk_name'];
+ $query .= " RETURNING " . $this->prepare_cursor[$stm_name]['pk_name'];
$this->prepare_cursor[$stm_name]['returning_id'] = true;
- } elseif (preg_match("/ returning (.*)/i", $query, $matches) && $this->prepare_cursor[$stm_name]['pk_name']) {
+ } elseif (
+ preg_match("/ returning (.*)/i", $query, $matches) &&
+ $this->prepare_cursor[$stm_name]['pk_name']
+ ) {
// if returning exists but not pk_name, add it
if (!preg_match("/{$this->prepare_cursor[$stm_name]['pk_name']}/", $matches[1])) {
- $query .= " , ".$this->prepare_cursor[$stm_name]['pk_name'];
+ $query .= " , " . $this->prepare_cursor[$stm_name]['pk_name'];
}
$this->prepare_cursor[$stm_name]['returning_id'] = true;
}
@@ -1606,7 +1682,13 @@ class IO extends \CoreLibs\Basic
} else {
$this->error_id = 21;
$this->__dbError();
- $this->__dbDebug('db', 'DB-Error '.$stm_name.': Prepare field with: '.$stm_name.' | '.$query.'', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $stm_name
+ . ': Prepare field with: ' . $stm_name . ' | '
+ . $query . '',
+ 'DB_ERROR'
+ );
return $result;
}
} else {
@@ -1627,17 +1709,34 @@ class IO extends \CoreLibs\Basic
// if we do not have no prepare cursor array entry for this statement name, abort
if (!is_array($this->prepare_cursor[$stm_name])) {
$this->error_id = 24;
- $this->__dbDebug('db', 'DB-Error '.$stm_name.': We do not have a prepared query entry for this statement name.', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $stm_name
+ . ': We do not have a prepared query entry for this statement name.',
+ 'DB_ERROR'
+ );
return false;
}
if (!is_array($data)) {
$this->error_id = 25;
- $this->__dbDebug('db', 'DB-Error '.$stm_name.': Prepared query Data has to be given in array form.', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $stm_name
+ . ': Prepared query Data has to be given in array form.',
+ 'DB_ERROR'
+ );
return false;
}
if ($this->prepare_cursor[$stm_name]['count'] != count($data)) {
$this->error_id = 23;
- $this->__dbDebug('db', 'DB-Error '.$stm_name.': Array data count does not match prepared fields. Need: '.$this->prepare_cursor[$stm_name]['count'].', has: '.count($data).'', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $stm_name
+ . ': Array data count does not match prepared fields. Need: '
+ . $this->prepare_cursor[$stm_name]['count'] . ', has: '
+ . count($data) . '',
+ 'DB_ERROR'
+ );
return false;
}
if ($this->db_debug) {
@@ -1645,17 +1744,28 @@ class IO extends \CoreLibs\Basic
}
$result = $this->db_functions->__dbExecute($stm_name, $data);
if (!$result) {
- $this->log->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[$stm_name]['result'].']: '.$this->log->prAr($data));
+ $this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|'
+ . $this->prepare_cursor[$stm_name]['result'] . ']: '
+ . $this->log->prAr($data));
$this->error_id = 22;
$this->__dbError($this->prepare_cursor[$stm_name]['result']);
- $this->__dbDebug('db', 'DB-Error '.$stm_name.': Execution failed', 'DB_ERROR');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Error ' . $stm_name
+ . ': Execution failed',
+ 'DB_ERROR'
+ );
return false;
}
- if ($this->__checkQueryForInsert($this->prepare_cursor[$stm_name]['query'], true) &&
+ if (
+ $this->__checkQueryForInsert($this->prepare_cursor[$stm_name]['query'], true) &&
$this->prepare_cursor[$stm_name]['pk_name'] != 'NULL'
) {
if (!$this->prepare_cursor[$stm_name]['returning_id']) {
- $this->insert_id = $this->db_functions->__dbInsertId($this->prepare_cursor[$stm_name]['query'], $this->prepare_cursor[$stm_name]['pk_name']);
+ $this->insert_id = $this->db_functions->__dbInsertId(
+ $this->prepare_cursor[$stm_name]['query'],
+ $this->prepare_cursor[$stm_name]['pk_name']
+ );
$this->insert_id_ext = $this->insert_id;
$this->insert_id_arr[] = $this->insert_id;
} elseif ($result) {
@@ -1664,21 +1774,28 @@ class IO extends \CoreLibs\Basic
$this->insert_id_arr = [];
// we have returning, now we need to check if we get one or many returned
// we'll need to loop this, if we have multiple insert_id returns
- while ($_insert_id = $this->db_functions->__dbFetchArray(
- $result,
- $this->db_functions->__dbResultType(true)
- )) {
+ while (
+ $_insert_id = $this->db_functions->__dbFetchArray(
+ $result,
+ $this->db_functions->__dbResultType(true)
+ )
+ ) {
$this->insert_id[] = $_insert_id;
$this->insert_id_arr[] = $_insert_id;
}
// if we have only one, revert from arry to single
if (count($this->insert_id) == 1) {
- // echo "+ SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0])."
";
- // echo "+ PK DIRECT: ".$this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]."
";
- // if this has only the pk_name, then only return this, else array of all data (but without the position)
- // example if insert_id[0]['foo'] && insert_id[0]['bar'] it will become insert_id['foo'] & insert_id['bar']
- // if only ['foo_id'] and it is the PK then the PK is directly written to the insert_id
- if (count($this->insert_id[0]) > 1 ||
+ // $this->log->debug('SINGLE DATA CONVERT', count($this->insert_id[0])." => "
+ // .array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0]));
+ // $this->log->debug('PK DIRECT', $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]);
+ // if this has only the pk_name, then only return this,
+ // else array of all data (but without the position)
+ // example if insert_id[0]['foo'] && insert_id[0]['bar']
+ // it will become insert_id['foo'] & insert_id['bar']
+ // if only ['foo_id'] and it is the PK then the PK is directly
+ // written to the insert_id
+ if (
+ count($this->insert_id[0]) > 1 ||
!array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0])
) {
$this->insert_id_ext = $this->insert_id[0];
@@ -1691,19 +1808,34 @@ class IO extends \CoreLibs\Basic
$this->insert_id = '';
$this->warning_id = 33;
$this->__dbError();
- $this->__dbDebug('db', 'DB-Warning '.$stm_name.': insert id returned no data', 'DB_WARNING');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Warning ' . $stm_name
+ . ': insert id returned no data',
+ 'DB_WARNING'
+ );
}
}
// this error handling is only for pgsql
if (is_array($this->insert_id)) {
$this->warning_id = 32;
$this->__dbError();
- $this->__dbDebug('db', 'DB-Warning '.$stm_name.': insert id data returned as array', 'DB_WARNING');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Warning ' . $stm_name
+ . ': insert id data returned as array',
+ 'DB_WARNING'
+ );
} elseif (!$this->insert_id) {
// NOTE should we keep this inside
$this->warning_id = 31;
$this->__dbError();
- $this->__dbDebug('db', 'DB-Warning '.$stm_name.': Could not get insert id', 'DB_WARNING');
+ $this->__dbDebug(
+ 'db',
+ 'DB-Warning ' . $stm_name
+ . ': Could not get insert id',
+ 'DB_WARNING'
+ );
}
}
return $result;
@@ -1765,14 +1897,14 @@ class IO extends \CoreLibs\Basic
if (!$compare || !$to_master || !$to_minor) {
return false;
} else {
- $to_version = $to_master.($to_minor < 10 ? '0' : '').$to_minor;
+ $to_version = $to_master . ($to_minor < 10 ? '0' : '') . $to_minor;
}
// db_version can return X.Y.Z
// we only compare the first two
preg_match("/^(\d{1,})\.(\d{1,})\.?(\d{1,})?/", $this->dbVersion(), $matches);
$master = $matches[1];
$minor = $matches[2];
- $version = $master.($minor < 10 ? '0' : '').$minor;
+ $version = $master . ($minor < 10 ? '0' : '') . $minor;
$return = false;
// compare
switch ($compare) {
@@ -1852,8 +1984,13 @@ class IO extends \CoreLibs\Basic
* @param array $data data array to override _POST data
* @return int|bool primary key
*/
- public function dbWriteData(array $write_array, array $not_write_array, $primary_key, string $table, $data = [])
- {
+ public function dbWriteData(
+ array $write_array,
+ array $not_write_array,
+ int $primary_key,
+ string $table,
+ array $data = []
+ ) {
if (!is_array($write_array)) {
$write_array = [];
}
@@ -1864,7 +2001,14 @@ class IO extends \CoreLibs\Basic
return false;
}
$not_write_update_array = [];
- return $this->dbWriteDataExt($write_array, $primary_key, $table, $not_write_array, $not_write_update_array, $data);
+ return $this->dbWriteDataExt(
+ $write_array,
+ $primary_key,
+ $table,
+ $not_write_array,
+ $not_write_update_array,
+ $data
+ );
}
/**
@@ -1890,7 +2034,7 @@ class IO extends \CoreLibs\Basic
) {
if (!is_array($primary_key)) {
$primary_key = [
- 'row' => $table.'_id',
+ 'row' => $table . '_id',
'value' => $primary_key
];
} else {
@@ -1905,13 +2049,14 @@ class IO extends \CoreLibs\Basic
$q_sub_value = '';
$q_sub_data = '';
// get the table layout and row types
- $table_data = $this->dbShowTableMetaData(($this->db_schema ? $this->db_schema.'.' : '').$table);
+ $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'] ||
+ if (
+ (!$primary_key['value'] ||
($primary_key['value'] &&
!in_array($field, $not_write_update_array))
) &&
@@ -1936,8 +2081,11 @@ class IO extends \CoreLibs\Basic
}
// we detect bool, so we can force a write on "false"
$is_bool = $table_data[$field]['type'] == 'bool' ? true : false;
- // write if the field has to be not null, or if there is no data and the field has no default values or if there is data or if this is an update and there is no data (set null)
- if (($not_null && $_data) ||
+ // write if the field has to be not null, or if there is
+ // no data and the field has no default values or if there
+ // is data or if this is an update and there is no data (set null)
+ if (
+ ($not_null && $_data) ||
(!$has_default && !$_data) ||
(is_numeric($_data) && $_data) ||
($primary_key['value'] && !$_data) ||
@@ -1946,11 +2094,13 @@ class IO extends \CoreLibs\Basic
if ($q_sub_value && !$primary_key['value']) {
$q_sub_value .= ', ';
}
- if ($q_sub_data) { // && (!$primary_key || ($primary_key && !in_array($field, $not_write_array))))
+ if ($q_sub_data) {
+ // && (!$primary_key ||
+ // ($primary_key && !in_array($field, $not_write_array))))
$q_sub_data .= ', ';
}
if ($primary_key['value']) {
- $q_sub_data .= $field.' = ';
+ $q_sub_data .= $field . ' = ';
} else {
$q_sub_value .= $field;
}
@@ -1963,7 +2113,13 @@ class IO extends \CoreLibs\Basic
$q_sub_data .= is_numeric($_data) ? $_data : 'NULL';
} else {
// if bool -> set bool, else write data
- $q_sub_data .= isset($_data) ? "'".($is_bool ? $this->dbBoolean($_data, true) : $this->dbEscapeString($_data))."'" : 'NULL';
+ $q_sub_data .= isset($_data) ?
+ "'" . (
+ $is_bool ?
+ $this->dbBoolean($_data, true) :
+ $this->dbEscapeString($_data)
+ ) . "'" :
+ 'NULL';
}
}
}
@@ -1971,12 +2127,12 @@ class IO extends \CoreLibs\Basic
// first work contact itself (we need contact id for everything else)
if ($primary_key['value'] && $primary_key['row']) {
- $q = 'UPDATE '.$table.' SET ';
- $q .= $q_sub_data.' ';
- $q .= 'WHERE '.$primary_key['row'].' = '.$primary_key['value'];
+ $q = 'UPDATE ' . $table . ' SET ';
+ $q .= $q_sub_data . ' ';
+ $q .= 'WHERE ' . $primary_key['row'] . ' = ' . $primary_key['value'];
$this->temp_sql = $q_sub_data;
} else {
- $q = 'INSERT INTO '.$table.' (';
+ $q = 'INSERT INTO ' . $table . ' (';
$q .= $q_sub_value;
$q .= ') VALUES (';
$q .= $q_sub_data;
@@ -2013,7 +2169,11 @@ class IO extends \CoreLibs\Basic
$seconds = $matches[4] != '00' ? preg_replace('/^0/', '', $matches[4]) : '';
$milliseconds = $matches[6];
- return $prefix.($hour ? $hour.'h ' : '').($minutes ? $minutes.'m ' : '').($seconds ? $seconds.'s' : '').($show_micro && $milliseconds? ' '.$milliseconds.'ms' : '');
+ return $prefix
+ . ($hour ? $hour . 'h ' : '')
+ . ($minutes ? $minutes . 'm ' : '')
+ . ($seconds ? $seconds . 's' : '')
+ . ($show_micro && $milliseconds ? ' ' . $milliseconds . 'ms' : '');
}
/**
@@ -2043,10 +2203,10 @@ class IO extends \CoreLibs\Basic
$value = $value === '' ? "NULL" : floatval($value);
break;
case 't':
- $value = $value === '' ? "NULL" : "'".$this->dbEscapeString($value)."'";
+ $value = $value === '' ? "NULL" : "'" . $this->dbEscapeString($value) . "'";
break;
case 'd':
- $value = $value === '' ? "NULL" : "'".$this->dbEscapeString($value)."'";
+ $value = $value === '' ? "NULL" : "'" . $this->dbEscapeString($value) . "'";
break;
case 'i2':
$value = $value === '' ? 0 : intval($value);
@@ -2156,7 +2316,7 @@ class IO extends \CoreLibs\Basic
*/
public function getInsertReturn($key = null)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use getReturningExt($key = null)', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use getReturningExt($key = null)', E_USER_DEPRECATED);
return $this->dbGetReturningExt($key);
}
@@ -2167,7 +2327,7 @@ class IO extends \CoreLibs\Basic
*/
public function getReturning()
{
- trigger_error('Method '.__METHOD__.' is deprecated, use dbGetReturning()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetReturning()', E_USER_DEPRECATED);
return $this->dbGetReturning();
}
@@ -2178,7 +2338,7 @@ class IO extends \CoreLibs\Basic
*/
public function getInsertPK()
{
- trigger_error('Method '.__METHOD__.' is deprecated, use dbGetInsertPK()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetInsertPK()', E_USER_DEPRECATED);
return $this->dbGetReturning();
}
@@ -2190,7 +2350,7 @@ class IO extends \CoreLibs\Basic
*/
public function getReturningExt($key = null)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use dbGetReturningExt($key = null)', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetReturningExt($key = null)', E_USER_DEPRECATED);
return $this->dbGetReturningExt($key);
}
@@ -2202,7 +2362,7 @@ class IO extends \CoreLibs\Basic
*/
public function getCursorExt($q = null)
{
- trigger_error('Method '.__METHOD__.' is deprecated, use dbGetCursorExt($q = null)', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetCursorExt($q = null)', E_USER_DEPRECATED);
return $this->dbGetCursorExt($q);
}
@@ -2213,9 +2373,10 @@ class IO extends \CoreLibs\Basic
*/
public function getNumRows()
{
- trigger_error('Method '.__METHOD__.' is deprecated, use dbGetNumRows()', E_USER_DEPRECATED);
+ trigger_error('Method ' . __METHOD__ . ' is deprecated, use dbGetNumRows()', E_USER_DEPRECATED);
return $this->dbGetNumRows();
}
-} // end if db class
+ // end if db class
+}
// __END__
diff --git a/www/lib/CoreLibs/DB/SQL/PgSQL.php b/www/lib/CoreLibs/DB/SQL/PgSQL.php
index f476ffa8..bd0ad478 100644
--- a/www/lib/CoreLibs/DB/SQL/PgSQL.php
+++ b/www/lib/CoreLibs/DB/SQL/PgSQL.php
@@ -1,4 +1,5 @@
-__dbQuery($q)) {
@@ -288,27 +293,28 @@ class PgSQL
$cursor = $this->__dbQuery($q);
$search_path = $this->__dbFetchArray($cursor)['search_path'];
if ($search_path != $schema) {
- $table_prefix = $schema.'.';
+ $table_prefix = $schema . '.';
}
}
// read from table the PK name
// faster primary key get
- $q = "SELECT pg_attribute.attname AS column_name, format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type ";
- $q .= "FROM pg_index, pg_class, pg_attribute ";
+ $q = "SELECT pg_attribute.attname AS column_name, "
+ . "format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS type "
+ . "FROM pg_index, pg_class, pg_attribute ";
if ($schema) {
$q .= ", pg_namespace ";
}
- $q .= "WHERE ";
- // regclass translates the OID to the name
- $q .= "pg_class.oid = '".$table_prefix.$table."'::regclass AND ";
- $q .= "indrelid = pg_class.oid AND ";
+ $q .= "WHERE "
+ // regclass translates the OID to the name
+ . "pg_class.oid = '" . $table_prefix . $table . "'::regclass AND "
+ . "indrelid = pg_class.oid AND ";
if ($schema) {
- $q .= "nspname = '".$schema."' AND ";
- $q .= "pg_class.relnamespace = pg_namespace.oid AND ";
+ $q .= "nspname = '" . $schema . "' AND "
+ . "pg_class.relnamespace = pg_namespace.oid AND ";
}
- $q .= "pg_attribute.attrelid = pg_class.oid AND ";
- $q .= "pg_attribute.attnum = any(pg_index.indkey) ";
- $q .= "AND indisprimary";
+ $q .= "pg_attribute.attrelid = pg_class.oid AND "
+ . "pg_attribute.attnum = any(pg_index.indkey) "
+ . "AND indisprimary";
$cursor = $this->__dbQuery($q);
if ($cursor) {
return $this->__dbFetchArray($cursor)['column_name'] ?? false;
@@ -330,15 +336,23 @@ class PgSQL
* @param string $db_ssl SSL (allow is default)
* @return ?resource db handler resource or null on error
*/
- public function __dbConnect(string $db_host, string $db_user, string $db_pass, string $db_name, int $db_port = 5432, string $db_ssl = 'allow')
- {
+ public function __dbConnect(
+ string $db_host,
+ string $db_user,
+ string $db_pass,
+ string $db_name,
+ int $db_port = 5432,
+ string $db_ssl = 'allow'
+ ) {
// to avoid empty db_port
if (!$db_port) {
$db_port = 5432;
}
- $this->dbh = pg_connect("host=".$db_host." port=".$db_port." user=".$db_user." password=".$db_pass." dbname=".$db_name." sslmode=".$db_ssl);
+ $this->dbh = pg_connect("host=" . $db_host . " port=" . $db_port . " user="
+ . $db_user . " password=" . $db_pass . " dbname=" . $db_name . " sslmode=" . $db_ssl);
if (!$this->dbh) {
- die("");
+ die("");
return null;
}
return $this->dbh;
@@ -359,7 +373,7 @@ class PgSQL
$cursor = pg_get_result($this->dbh);
}
if ($cursor && pg_result_error($cursor)) {
- return "-PostgreSQL-Error-> ".pg_result_error($cursor)."
";
+ return "-PostgreSQL-Error-> " . pg_result_error($cursor) . "
";
} else {
return '';
}
diff --git a/www/lib/CoreLibs/Debug/FileWriter.php b/www/lib/CoreLibs/Debug/FileWriter.php
index f2f98303..25bfeea7 100644
--- a/www/lib/CoreLibs/Debug/FileWriter.php
+++ b/www/lib/CoreLibs/Debug/FileWriter.php
@@ -1,10 +1,12 @@
-log_folder = BASE.LOG;
+ $this->log_folder = BASE . LOG;
} else {
// fallback + warning
trigger_error('constant BASE or LOG are not defined, fallback to getcwd()', E_USER_WARNING);
- $this->log_folder = getcwd().DS;
+ $this->log_folder = getcwd() . DS;
}
// running time start for script
$this->script_starttime = microtime(true);
@@ -79,7 +81,7 @@ class Logging
list($this->host_name , $this->host_port) = \CoreLibs\Get\System::getHostName();
// add port to host name if not port 80
if ($this->host_port != 80) {
- $this->host_name .= ':'.$this->host_port;
+ $this->host_name .= ':' . $this->host_port;
}
// can be overridden with basicSetLogFileId
if (isset($GLOBALS['LOG_FILE_ID'])) {
@@ -152,7 +154,8 @@ class Logging
// check if we do debug, echo or print
switch ($target) {
case 'debug':
- if ((
+ if (
+ (
(isset($this->debug_output[$level]) && $this->debug_output[$level]) ||
$this->debug_output_all
) &&
@@ -164,7 +167,8 @@ class Logging
}
break;
case 'echo':
- if ((
+ if (
+ (
(isset($this->echo_output[$level]) && $this->echo_output[$level]) ||
$this->echo_output_all
) &&
@@ -176,7 +180,8 @@ class Logging
}
break;
case 'print':
- if ((
+ if (
+ (
(isset($this->print_output[$level]) && $this->print_output[$level]) ||
$this->print_output_all
) &&
@@ -200,7 +205,8 @@ class Logging
private function writeErrorMsg(string $level, string $error_string): bool
{
// only write if write is requested
- if (!($this->doDebugTrigger('debug', $level) &&
+ if (
+ !($this->doDebugTrigger('debug', $level) &&
$this->doDebugTrigger('print', $level))
) {
return false;
@@ -214,10 +220,10 @@ class Logging
// init output variable
$output = $error_string; // output formated error string to output file
// init base file path
- $fn = $this->log_folder.$this->log_print_file.'.'.$this->log_file_name_ext;
+ $fn = $this->log_folder . $this->log_print_file . '.' . $this->log_file_name_ext;
// log ID prefix settings, if not valid, replace with empty
if (preg_match("/^[A-Za-z0-9]+$/", $this->log_file_id)) {
- $rpl_string = '_'.$this->log_file_id;
+ $rpl_string = '_' . $this->log_file_id;
} else {
$rpl_string = '';
}
@@ -228,28 +234,33 @@ class Logging
$this->log_file_unique_id = $GLOBALS['LOG_FILE_UNIQUE_ID'];
}
if (!$this->log_file_unique_id) {
- $GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id = date('Y-m-d_His').'_U_'.substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
+ $GLOBALS['LOG_FILE_UNIQUE_ID'] = $this->log_file_unique_id =
+ date('Y-m-d_His') . '_U_'
+ . substr(hash('sha1', uniqid((string)mt_rand(), true)), 0, 8);
}
- $rpl_string = '_'.$this->log_file_unique_id; // add 8 char unique string
+ $rpl_string = '_' . $this->log_file_unique_id; // add 8 char unique string
} else {
- $rpl_string = !$this->log_print_file_date ? '' : '_'.date('Y-m-d'); // add date to file
+ $rpl_string = !$this->log_print_file_date ? '' : '_' . date('Y-m-d'); // add date to file
}
$fn = str_replace('##DATE##', $rpl_string, $fn); // create output filename
- $rpl_string = !$this->log_per_level ? '' : '_'.$level; // if request to write to one file
+ $rpl_string = !$this->log_per_level ? '' : '_' . $level; // if request to write to one file
$fn = str_replace('##LEVEL##', $rpl_string, $fn); // create output filename
// set per class, but don't use get_class as we will only get self
- $rpl_string = !$this->log_per_class ? '' : '_'.str_replace('\\', '-', \CoreLibs\Debug\Support::getCallerClass()); // set sub class settings
+ $rpl_string = !$this->log_per_class ? '' : '_'
+ // set sub class settings
+ . str_replace('\\', '-', \CoreLibs\Debug\Support::getCallerClass());
$fn = str_replace('##CLASS##', $rpl_string, $fn); // create output filename
- $rpl_string = !$this->log_per_page ? '' : '_'.\CoreLibs\Get\System::getPageName(1); // if request to write to one file
+ // if request to write to one file
+ $rpl_string = !$this->log_per_page ? '' : '_' . \CoreLibs\Get\System::getPageName(1);
$fn = str_replace('##PAGENAME##', $rpl_string, $fn); // create output filename
// write to file
// first check if max file size is is set and file is bigger
if ($this->log_max_filesize > 0 && ((filesize($fn) / 1024) > $this->log_max_filesize)) {
// for easy purpose, rename file only to attach timestamp, nur sequence numbering
- rename($fn, $fn.'.'.date("YmdHis"));
+ rename($fn, $fn . '.' . date("YmdHis"));
}
$fp = fopen($fn, 'a');
if ($fp !== false) {
@@ -302,7 +313,7 @@ class Logging
if (!in_array($type, ['debug', 'echo', 'print'])) {
return false;
}
- return $this->{$type.'_output_all'};
+ return $this->{$type . '_output_all'};
}
/**
@@ -318,7 +329,7 @@ class Logging
if (!in_array($type, ['debug', 'echo', 'print'])) {
return;
}
- $this->{$type.'_output_all'} = $set;
+ $this->{$type . '_output_all'} = $set;
}
/**
@@ -358,7 +369,7 @@ class Logging
array_shift($debug_on); // kick out flag (on/off)
if (count($debug_on) >= 1) {
foreach ($debug_on as $level) {
- $switch = $type.'_output'.($flag == 'off' ? '_not' : '');
+ $switch = $type . '_output' . ($flag == 'off' ? '_not' : '');
$this->{$switch}[$level] = true;
}
}
@@ -382,7 +393,7 @@ class Logging
if (!in_array($flag, ['on', 'off'])) {
return false;
}
- $switch = $type.'_output'.($flag == 'off' ? '_not' : '');
+ $switch = $type . '_output' . ($flag == 'off' ? '_not' : '');
// bool
if ($level !== null) {
return $this->{$switch}[$level] ?? false;
@@ -406,7 +417,7 @@ class Logging
if (!in_array($type, ['level', 'class', 'page', 'run'])) {
return;
}
- $this->{'log_per_'.$type} = $set;
+ $this->{'log_per_' . $type} = $set;
}
/**
@@ -419,7 +430,7 @@ class Logging
if (!in_array($type, ['level', 'class', 'page', 'run'])) {
return false;
}
- return $this->{'log_per_'.$type};
+ return $this->{'log_per_' . $type};
}
/**
@@ -433,7 +444,7 @@ class Logging
*/
public function prAr(array $a): string
{
- return '##HTMLPRE##'.print_r($a, true).'##/HTMLPRE##';
+ return '##HTMLPRE##' . print_r($a, true) . '##/HTMLPRE##';
}
/**
@@ -461,25 +472,25 @@ class Logging
// write to file if set
$this->writeErrorMsg(
$level,
- '['.$timestamp.'] '
- .'['.$this->host_name.'] '
- .'['.\CoreLibs\Get\System::getPageName(2).'] '
- .'['.$this->running_uid.'] '
- .'{'.$class.'} '
- .'<'.$level.'> - '
+ '[' . $timestamp . '] '
+ . '[' . $this->host_name . '] '
+ . '[' . \CoreLibs\Get\System::getPageName(2) . '] '
+ . '[' . $this->running_uid . '] '
+ . '{' . $class . '} '
+ . '<' . $level . '> - '
// strip the htmlpre special tags if exist
- .str_replace(
+ . str_replace(
['##HTMLPRE##', '##/HTMLPRE##'],
'',
// if stripping all html, etc is requested, only for write error msg
($strip ?
// find any
and replace them with \n
// strip rest of html elements (base only)
- preg_replace("/(<\/?)(\w+)([^>]*>)/", '', str_replace('
', "\n", $prefix.$string)) :
- $prefix.$string
+ preg_replace("/(<\/?)(\w+)([^>]*>)/", '', str_replace('
', "\n", $prefix . $string)) :
+ $prefix . $string
)
)
- ."\n"
+ . "\n"
);
// write to error level msg array if there is an echo request
if ($this->doDebugTrigger('echo', $level)) {
@@ -489,21 +500,21 @@ class Logging
}
// HTML string
$this->error_msg[$level][] = ''
- .'[
'.$timestamp.'] '
- .'[
'.$level.'] '
- .'[
'.$this->host_name.'] '
- .'[
'.$this->page_name.'] '
- .'[
'.$this->running_uid.'] '
- .'{
'.$class.'} - '
+ . '[
' . $timestamp . '] '
+ . '[
' . $level . '] '
+ . '[
' . $this->host_name . '] '
+ . '[
' . $this->page_name . '] '
+ . '[
' . $this->running_uid . '] '
+ . '{
' . $class . '} - '
// as is prefix, allow HTML
- .$prefix
+ . $prefix
// we replace special HTMLPRE with
entries
- .str_replace(
+ . str_replace(
['##HTMLPRE##', '##/HTMLPRE##'],
['', '
'],
\CoreLibs\Convert\Html::htmlent($string)
)
- ."
'
- .'['.$level.'] '
- .($string ? "**** ".\CoreLibs\Convert\Html::htmlent($string)." ****\n" : "")
- .'
'
- .join('', $temp_debug_output);
+ . '[' . $level . '] '
+ . ($string ? "**** " . \CoreLibs\Convert\Html::htmlent($string) . " ****\n" : "")
+ . ''
+ . join('', $temp_debug_output);
} // echo it out
} // do printout
} // for each level
// create the output wrapper around, so we have a nice formated output per class
if ($string_output) {
- $string_prefix = ''
- .'
{'.\CoreLibs\Debug\Support::getCallerClass().'}
';
- $string_output = $string_prefix.$string_output
- .'
Script Run Time: '.$script_end.'
'
- .'
'
+ . '
{'
+ . \CoreLibs\Debug\Support::getCallerClass() . '}
';
+ $string_output = $string_prefix . $string_output
+ . '
Script Run Time: '
+ . $script_end . '
'
+ . '
');
+ self::$runningtime_string .= ' ' . $micro . ($simple ? ', ' : '
');
// if both are set
if (self::$starttime && self::$endtime) {
$running_time = self::$endtime - self::$starttime;
- self::$runningtime_string .= ($simple ? 'Run: ' : "Script running time: ").$running_time." s";
+ self::$runningtime_string .= ($simple ? 'Run: ' : "Script running time: ") . $running_time . " s";
// reset start & end time after run
self::$starttime = 0;
self::$endtime = 0;
diff --git a/www/lib/CoreLibs/Debug/Support.php b/www/lib/CoreLibs/Debug/Support.php
index e77fc5c3..241b97e2 100644
--- a/www/lib/CoreLibs/Debug/Support.php
+++ b/www/lib/CoreLibs/Debug/Support.php
@@ -1,9 +1,11 @@
-".print_r($array, true)."";
+ return "" . print_r($array, true) . "
";
}
/**
diff --git a/www/lib/CoreLibs/Get/System.php b/www/lib/CoreLibs/Get/System.php
index 283cbc10..f36fa62a 100644
--- a/www/lib/CoreLibs/Get/System.php
+++ b/www/lib/CoreLibs/Get/System.php
@@ -1,9 +1,11 @@
-.
@@ -20,6 +20,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+declare(strict_types=1);
+
namespace CoreLibs\Language\Core;
// Preloads entire file in memory first, then creates a StringReader
@@ -27,7 +29,7 @@ namespace CoreLibs\Language\Core;
class CachedFileReader extends \CoreLibs\Language\Core\StringReader
{
public $error = 0;
- public $_str = '';
+ public $fd_str = '';
public function __construct($filename)
{
@@ -39,7 +41,7 @@ class CachedFileReader extends \CoreLibs\Language\Core\StringReader
if (!$fd) {
$this->error = 3; // Cannot read file, probably permissions
}
- $this->_str = fread($fd, $length);
+ $this->fd_str = fread($fd, $length);
fclose($fd);
} else {
$this->error = 2; // File doesn't exist
diff --git a/www/lib/CoreLibs/Language/Core/FileReader.php b/www/lib/CoreLibs/Language/Core/FileReader.php
index 03fee4ff..5b5688e7 100755
--- a/www/lib/CoreLibs/Language/Core/FileReader.php
+++ b/www/lib/CoreLibs/Language/Core/FileReader.php
@@ -1,4 +1,4 @@
-.
@@ -20,6 +20,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+declare(strict_types=1);
+
namespace CoreLibs\Language\Core;
class FileReader
diff --git a/www/lib/CoreLibs/Language/Core/GetTextReader.php b/www/lib/CoreLibs/Language/Core/GetTextReader.php
index 5bc79e1d..ae5d9dd3 100755
--- a/www/lib/CoreLibs/Language/Core/GetTextReader.php
+++ b/www/lib/CoreLibs/Language/Core/GetTextReader.php
@@ -1,4 +1,5 @@
-.
Copyright (c) 2005 Nico Kaiser
@@ -20,6 +21,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+declare(strict_types=1);
+
namespace CoreLibs\Language\Core;
/**
@@ -95,10 +98,10 @@ class GetTextReader
{
if ($this->BYTEORDER == 0) {
// low endian
- return unpack('V'.$count, $this->STREAM->read(4 * $count));
+ return unpack('V' . $count, $this->STREAM->read(4 * $count));
} else {
// big endian
- return unpack('N'.$count, $this->STREAM->read(4 * $count));
+ return unpack('N' . $count, $this->STREAM->read(4 * $count));
}
}
@@ -149,9 +152,11 @@ class GetTextReader
*/
private function load_tables()
{
- if (is_array($this->cache_translations) &&
+ if (
+ is_array($this->cache_translations) &&
is_array($this->table_originals) &&
- is_array($this->table_translations)) {
+ is_array($this->table_translations)
+ ) {
return;
}
@@ -319,7 +324,7 @@ class GetTextReader
$res .= ') : (';
break;
case ';':
- $res .= str_repeat(')', $p).';';
+ $res .= str_repeat(')', $p) . ';';
$p = 0;
break;
default:
@@ -448,7 +453,7 @@ class GetTextReader
*/
public function pgettext($context, $msgid)
{
- $key = $context.chr(4).$msgid;
+ $key = $context . chr(4) . $msgid;
$ret = $this->translate($key);
if (strpos($ret, "\004") !== false) {
return $msgid;
@@ -467,7 +472,7 @@ class GetTextReader
*/
public function npgettext($context, $singular, $plural, $number)
{
- $key = $context.chr(4).$singular;
+ $key = $context . chr(4) . $singular;
$ret = $this->ngettext($key, $plural, $number);
if (strpos($ret, "\004") !== false) {
return $singular;
diff --git a/www/lib/CoreLibs/Language/Core/StreamReader.php b/www/lib/CoreLibs/Language/Core/StreamReader.php
index 08bd2d4a..a02450e6 100755
--- a/www/lib/CoreLibs/Language/Core/StreamReader.php
+++ b/www/lib/CoreLibs/Language/Core/StreamReader.php
@@ -1,4 +1,4 @@
-.
@@ -20,6 +20,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+declare(strict_types=1);
+
namespace CoreLibs\Language\Core;
// Simple class to wrap file streams, string streams, etc.
diff --git a/www/lib/CoreLibs/Language/Core/StringReader.php b/www/lib/CoreLibs/Language/Core/StringReader.php
index 6329b877..cbee6d15 100755
--- a/www/lib/CoreLibs/Language/Core/StringReader.php
+++ b/www/lib/CoreLibs/Language/Core/StringReader.php
@@ -1,4 +1,4 @@
-.
@@ -20,6 +20,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+declare(strict_types=1);
+
namespace CoreLibs\Language\Core;
class StringReader
diff --git a/www/lib/CoreLibs/Language/Encoding.php b/www/lib/CoreLibs/Language/Encoding.php
index 03f7fd26..ae914650 100644
--- a/www/lib/CoreLibs/Language/Encoding.php
+++ b/www/lib/CoreLibs/Language/Encoding.php
@@ -1,9 +1,11 @@
-mofile = $path.$this->lang.".mo";
+ $this->mofile = $path . $this->lang . ".mo";
// check if get a readable mofile
if (is_readable($this->mofile)) {
@@ -81,10 +84,10 @@ class L10n extends \CoreLibs\Basic
// override path check
if (!is_dir($path)) {
- $path = BASE.INCLUDES.LANG.CONTENT_PATH;
+ $path = BASE . INCLUDES . LANG . CONTENT_PATH;
}
- $this->mofile = $path.$this->lang.".mo";
+ $this->mofile = $path . $this->lang . ".mo";
// check if get a readable mofile
if (is_readable($this->mofile)) {
diff --git a/www/lib/CoreLibs/Output/Form/Elements.php b/www/lib/CoreLibs/Output/Form/Elements.php
index 250d1954..25406a70 100644
--- a/www/lib/CoreLibs/Output/Form/Elements.php
+++ b/www/lib/CoreLibs/Output/Form/Elements.php
@@ -1,9 +1,11 @@
- 59) {
$min_steps = 1;
}
- $on_change_call = 'dt_list(\''.$suffix.'\');';
+ $on_change_call = 'dt_list(\'' . $suffix . '\');';
// always be 1h ahead (for safety)
$timestamp = time() + 3600; // in seconds
@@ -47,15 +59,15 @@ class Elements
$hour = !$hour ? date('H', $timestamp) : $hour;
$min = !$min ? date('i', $timestamp) : $min; // add to five min?
// max days in selected month
- $days_in_month = date('t', strtotime($year.'-'.$month.'-'.$day.' '.$hour.':'.$min.':0'));
+ $days_in_month = date('t', strtotime($year . '-' . $month . '-' . $day . ' ' . $hour . ':' . $min . ':0'));
$string = '';
// from now to ?
if ($name_pos_back === false) {
$string = 'Year ';
}
- $string .= '