Update CoreLibs with phpstan level 8, add qqFileUploader implementation base, add base Test class for testing

This commit is contained in:
Clemens Schwaighofer
2021-10-26 16:35:26 +09:00
parent 736f822363
commit a6b42f243f
45 changed files with 1198 additions and 593 deletions

View File

@@ -0,0 +1 @@
phan --progress-bar -C --analyze-twice

View File

@@ -0,0 +1 @@
phpstan

View File

@@ -1,9 +1,11 @@
<?php <?php // phpcs:ignore PSR1.Files.SideEffects
// Boostrap file for PHPstand // Boostrap file for PHPstand
// sets the _SERVER['HTTP_HOST'] var so we can have DB detection // sets the _SERVER['HTTP_HOST'] var so we can have DB detection
$_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp'; $_SERVER['HTTP_HOST'] = 'soba.tokyo.tequila.jp';
// so www/includes/edit_base.php works // so www/includes/edit_base.php works
require_once('www/lib/Smarty/SmartyBC.class.php'); require_once('www/lib/Smarty/SmartyBC.class.php');
// for whatever reason it does not load that from the confing.master.php
define('BASE_NAME', '');
// __END__ // __END__

View File

@@ -2,7 +2,7 @@
parameters: parameters:
tmpDir: /tmp/phpstan-corelibs tmpDir: /tmp/phpstan-corelibs
level: 5 level: max
paths: paths:
- %currentWorkingDirectory%/www - %currentWorkingDirectory%/www
bootstrapFiles: bootstrapFiles:
@@ -17,24 +17,17 @@ parameters:
- www/lib/Smarty/Autoloader.php - www/lib/Smarty/Autoloader.php
- www/lib/CoreLibs/Template/SmartyExtend.php - www/lib/CoreLibs/Template/SmartyExtend.php
excludes_analyse: excludes_analyse:
# no check admin # do not check old qq file uploader tests
- www/admin/qq_file_upload_front.php - www/admin/qq_file_upload_*.php
- www/admin/qq_file_upload_ajax.php # ignore all test files
- www/admin/class_test*php - www/admin/class_test*php
- www/admin/error_test.php - www/admin/error_test.php
# admin synlink files # admin synlink files
- www/admin/edit_access.php - www/admin/edit_*.php
- www/admin/edit_groups.php
- www/admin/edit_languages.php
- www/admin/edit_menu_group.php
- www/admin/edit_order.php
- www/admin/edit_pages.php
- www/admin/edit_schemes.php
- www/admin/edit_users.php
- www/admin/edit_visible_group.php
# ignore admin header stuff # ignore admin header stuff
- www/includes/admin_header.php # ignore the admin include stuff # - www/includes/admin_header.php # ignore the admin include stuff
- www/includes/admin_footer.php # ignore the admin include stuff - www/includes/admin_footer.php # ignore the admin include stuff
# deprecated files
- www/includes/admin_set_paths.php # ignore the admin include stuff - www/includes/admin_set_paths.php # ignore the admin include stuff
- www/includes/admin_smarty.php # ignore the admin include stuff - www/includes/admin_smarty.php # ignore the admin include stuff
# folders with data no check needed # folders with data no check needed
@@ -43,10 +36,9 @@ parameters:
- www/log - www/log
- www/media - www/media
- www/tmp - www/tmp
- www/lib/pChart - www/lib/pChart*
- www/lib/pChart2.1.4 - www/lib/Smarty*
- www/lib/Smarty - www/lib/smarty*
- www/lib/smarty-3.1.30
# ignore composer # ignore composer
- www/vendor - www/vendor
# ignore the smartyextend # ignore the smartyextend

View File

@@ -52,13 +52,17 @@ echo "DB_CONFIG_SET constant: <pre>" . print_r(DB_CONFIG, true) . "</pre><br>";
// DB client encoding // DB client encoding
print "DB Client encoding: " . $db->dbGetEncoding() . "<br>"; print "DB Client encoding: " . $db->dbGetEncoding() . "<br>";
while ($res = $db->dbReturn("SELECT * FROM max_test", 0, true)) { while (is_array($res = $db->dbReturn("SELECT * FROM max_test", 0, true))) {
print "TIME: " . $res['time'] . "<br>"; print "TIME: " . $res['time'] . "<br>";
} }
print "CACHED DATA: <pre>" . print_r($db->cursor_ext, true) . "</pre><br>"; print "CACHED DATA: <pre>" . print_r($db->cursor_ext, true) . "</pre><br>";
while ($res = $db->dbReturn("SELECT * FROM max_test")) { while (is_array($res = $db->dbReturn("SELECT * FROM max_test"))) {
print "[CACHED] TIME: " . $res['time'] . "<br>"; print "[CACHED] TIME: " . $res['time'] . "<br>";
} }
// alternate check for valid data
// while (($res = $db->dbReturn("SELECT * FROM max_test")) !== false) {
// print "[CACHED] TIME: " . $res['time'] . "<br>";
// }
print "<pre>"; print "<pre>";
$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");

View File

@@ -33,7 +33,7 @@ if (!defined('DS')) {
} }
// find trigger name "admin/" or "frontend/" in the getcwd() folder // find trigger name "admin/" or "frontend/" in the getcwd() folder
foreach (['admin', 'frontend'] as $folder) { foreach (['admin', 'frontend'] as $folder) {
if (strstr(getcwd(), DS . $folder)) { if (strstr(getcwd() ?: '', DS . $folder)) {
define('CONTENT_PATH', $folder . DS); define('CONTENT_PATH', $folder . DS);
break; break;
} }

View File

@@ -12,7 +12,7 @@ declare(strict_types=1);
//------------------------------ variable init start //------------------------------ variable init start
// for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log // for dev test we set full error reporting; writes everything, except E_ERROR into logs/php_error-<day>.log
if ($DEBUG_ALL && $ENABLE_ERROR_HANDLING) { if (!empty($DEBUG_ALL) && !empty($ENABLE_ERROR_HANDLING)) {
include BASE . LIBS . "Error.Handling.php"; include BASE . LIBS . "Error.Handling.php";
} }
// predefine vars // predefine vars
@@ -82,7 +82,7 @@ if (!$login->login) {
// automatic hide for DEBUG messages on live server // automatic hide for DEBUG messages on live server
// can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only) // can be overridden when setting DEBUG_ALL_OVERRIDE on top of the script (for emergency debugging of one page only)
if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) { if ((TARGET == 'live' || TARGET == 'remote') && !empty($DEBUG_ALL_OVERRIDE)) {
foreach (['debug', 'echo', 'print'] as $target) { foreach (['debug', 'echo', 'print'] as $target) {
$login->log->setLogLevelAll($target, false); $login->log->setLogLevelAll($target, false);
$cms->log->setLogLevelAll($target, false); $cms->log->setLogLevelAll($target, false);

View File

@@ -175,7 +175,7 @@ if ($form->my_page_name == 'edit_order') {
$options_name = []; $options_name = [];
$options_selected = []; $options_selected = [];
// DB read data for menu // DB read data for menu
while ($res = $form->dbReturn($q)) { while (is_array($res = $form->dbReturn($q))) {
$row_data[] = [ $row_data[] = [
"id" => $res[$table_name . "_id"], "id" => $res[$table_name . "_id"],
"name" => $res["name"], "name" => $res["name"],

View File

@@ -72,44 +72,70 @@ use CoreLibs\Check\Password;
class Login extends \CoreLibs\DB\IO class Login extends \CoreLibs\DB\IO
{ {
/** @var string */
private $euid; // the user id var private $euid; // the user id var
// 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
/** @var bool */
private $permission_okay = false; private $permission_okay = false;
/** @var string */
public $login; // pressed login public $login; // pressed login
/** @var string */
private $action; // master action command private $action; // master action command
/** @var string */
private $username; // login name private $username; // login name
/** @var string */
private $password; // login password private $password; // login password
/** @var string */
private $logout; // logout button private $logout; // logout button
// 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
/** @var int */
private $login_error = 0; private $login_error = 0;
/** @var bool */
private $password_change = false; // if this is set to true, the user can change passwords private $password_change = false; // if this is set to true, the user can change passwords
/** @var bool */
private $password_change_ok = false; // password change was successful private $password_change_ok = false; // password change was successful
// 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
/** @var bool */
private $password_forgot = false; private $password_forgot = false;
/** @var bool */
private $password_forgot_ok = false; // password forgot mail send ok private $password_forgot_ok = false; // password forgot mail send ok
/** @var string */
private $change_password; private $change_password;
/** @var string */
private $pw_username; private $pw_username;
/** @var string */
private $pw_old_password; private $pw_old_password;
/** @var string */
private $pw_new_password; private $pw_new_password;
/** @var string */
private $pw_new_password_confirm; private $pw_new_password_confirm;
/** @var array<string> */
private $pw_change_deny_users = []; // array of users for which the password change is forbidden private $pw_change_deny_users = []; // array of users for which the password change is forbidden
/** @var string */
private $logout_target; private $logout_target;
/** @var int */
private $max_login_error_count = -1; private $max_login_error_count = -1;
/** @var array<string> */
private $lock_deny_users = []; private $lock_deny_users = [];
// if we have password change we need to define some rules // if we have password change we need to define some rules
/** @var int */
private $password_min_length = PASSWORD_MIN_LENGTH; private $password_min_length = PASSWORD_MIN_LENGTH;
// max length is fixed as 255 (for input type max), if set highter, it will be set back to 255 // max length is fixed as 255 (for input type max), if set highter, it will be set back to 255
/** @var int */
private $password_max_length = PASSWORD_MAX_LENGTH; private $password_max_length = PASSWORD_MAX_LENGTH;
// can have several regexes, if nothing set, all is ok // can have several regexes, if nothing set, all is ok
/** @var array<string> */
private $password_valid_chars = [ private $password_valid_chars = [
// '^(?=.*\d)(?=.*[A-Za-z])[0-9A-Za-z!@#$%]{8,}$', // '^(?=.*\d)(?=.*[A-Za-z])[0-9A-Za-z!@#$%]{8,}$',
// '^(?.*(\pL)u)(?=.*(\pN)u)(?=.*([^\pL\pN])u).{8,}', // '^(?.*(\pL)u)(?=.*(\pN)u)(?=.*([^\pL\pN])u).{8,}',
]; ];
// all possible login error conditions // all possible login error conditions
/** @var array<mixed> */
private $login_error_msg = []; private $login_error_msg = [];
// this is an array holding all strings & templates passed from the outside (translation) // this is an array holding all strings & templates passed from the outside (translation)
/** @var array<mixed> */
private $login_template = [ private $login_template = [
'strings' => [], 'strings' => [],
'password_change' => '', 'password_change' => '',
@@ -117,18 +143,23 @@ class Login extends \CoreLibs\DB\IO
]; ];
// acl vars // acl vars
/** @var array<mixed> */
public $acl = []; public $acl = [];
/** @var array<mixed> */
public $default_acl_list = []; public $default_acl_list = [];
// login html, if we are on an ajax page // login html, if we are on an ajax page
/** @var string|null */
private $login_html = ''; private $login_html = '';
/** @var bool */
private $login_is_ajax_page = false; private $login_is_ajax_page = false;
// language // language
/** @var \CoreLibs\Language\L10n */
public $l; public $l;
/** /**
* constructor, does ALL, opens db, works through connection checks, closes itself * constructor, does ALL, opens db, works through connection checks, closes itself
* @param array $db_config db config array * @param array<mixed> $db_config db config array
*/ */
public function __construct(array $db_config) public function __construct(array $db_config)
{ {
@@ -225,7 +256,7 @@ class Login extends \CoreLibs\DB\IO
$_SESSION['DEFAULT_ACL_LIST'] = []; $_SESSION['DEFAULT_ACL_LIST'] = [];
// read the current edit_access_right list into an array // read the current edit_access_right list into an array
$q = "SELECT level, type, name FROM edit_access_right WHERE level >= 0 ORDER BY level"; $q = "SELECT level, type, name FROM edit_access_right WHERE level >= 0 ORDER BY level";
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
// level to description format (numeric) // level to description format (numeric)
$this->default_acl_list[$res['level']] = [ $this->default_acl_list[$res['level']] = [
'type' => $res['type'], 'type' => $res['type'],
@@ -387,8 +418,11 @@ class Login extends \CoreLibs\DB\IO
// password match is done in script, against old plain or new blowfish encypted // password match is done in script, against old plain or new blowfish encypted
. "(LOWER(username) = '" . $this->dbEscapeString(strtolower($this->username)) . "') "; . "(LOWER(username) = '" . $this->dbEscapeString(strtolower($this->username)) . "') ";
$res = $this->dbReturn($q); $res = $this->dbReturn($q);
// username is wrong, but we throw for wrong username and wrong password the same error if (!is_array($res)) {
if (!$this->cursor_ext[md5($q)]['num_rows']) { $this->login_error = 1009;
$this->permission_okay = false;
} elseif (!$this->cursor_ext[md5($q)]['num_rows']) {
// username is wrong, but we throw for wrong username and wrong password the same error
$this->login_error = 1010; $this->login_error = 1010;
} else { } else {
// if login errors is half of max errors and the last login error // if login errors is half of max errors and the last login error
@@ -426,7 +460,7 @@ class Login extends \CoreLibs\DB\IO
$_SESSION['EUID'] = $this->euid = $res['edit_user_id']; $_SESSION['EUID'] = $this->euid = $res['edit_user_id'];
// check if user is okay // check if user is okay
$this->loginCheckPermissions(); $this->loginCheckPermissions();
if (!$this->login_error) { if ($this->login_error == 0) {
// now set all session vars and read page permissions // now set all session vars and read page permissions
$GLOBALS['DEBUG_ALL'] = $_SESSION['DEBUG_ALL'] = $res['debug']; $GLOBALS['DEBUG_ALL'] = $_SESSION['DEBUG_ALL'] = $res['debug'];
$GLOBALS['DB_DEBUG'] = $_SESSION['DB_DEBUG'] = $res['db_debug']; $GLOBALS['DB_DEBUG'] = $_SESSION['DB_DEBUG'] = $res['db_debug'];
@@ -470,6 +504,9 @@ class Login extends \CoreLibs\DB\IO
. "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " " . "AND epa.enabled = 1 AND epa.edit_group_id = " . $res["edit_group_id"] . " "
. "ORDER BY ep.order_number"; . "ORDER BY ep.order_number";
while ($res = $this->dbReturn($q)) { while ($res = $this->dbReturn($q)) {
if (!is_array($res)) {
break;
}
// page id array for sub data readout // page id array for sub data readout
$edit_page_ids[$res['edit_page_id']] = $res['cuid']; $edit_page_ids[$res['edit_page_id']] = $res['cuid'];
// create the array for pages // create the array for pages
@@ -496,22 +533,20 @@ class Login extends \CoreLibs\DB\IO
$pages_acl[$res['filename']] = $res['level']; $pages_acl[$res['filename']] = $res['level'];
} // for each page } // for each page
// get the visible groups for all pages and write them to the pages // 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 = "SELECT epvg.edit_page_id, name, flag "
. "FROM edit_visible_group evp, edit_page_visible_group epvg " . "FROM edit_visible_group evp, edit_page_visible_group epvg "
. "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id " . "WHERE evp.edit_visible_group_id = epvg.edit_visible_group_id "
. "AND epvg.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") " . "AND epvg.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
. "ORDER BY epvg.edit_page_id"; . "ORDER BY epvg.edit_page_id";
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
$pages[$edit_page_ids[$res['edit_page_id']]]['visible'][$res['name']] = $res['flag']; $pages[$edit_page_ids[$res['edit_page_id']]]['visible'][$res['name']] = $res['flag'];
} }
// get the same for the query strings // 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 = "SELECT eqs.edit_page_id, name, value, dynamic FROM edit_query_string eqs "
. "WHERE enabled = 1 AND edit_page_id " . "WHERE enabled = 1 AND edit_page_id "
. "IN (" . join(', ', array_keys($edit_page_ids)) . ") " . "IN (" . join(', ', array_keys($edit_page_ids)) . ") "
. "ORDER BY eqs.edit_page_id"; . "ORDER BY eqs.edit_page_id";
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
$pages[$edit_page_ids[$res['edit_page_id']]]['query'][] = [ $pages[$edit_page_ids[$res['edit_page_id']]]['query'][] = [
'name' => $res['name'], 'name' => $res['name'],
'value' => $res['value'], 'value' => $res['value'],
@@ -519,14 +554,13 @@ class Login extends \CoreLibs\DB\IO
]; ];
} }
// get the page content and add them to the page // 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, " $q = "SELECT epc.edit_page_id, epc.name, epc.uid, epc.order_number, "
. "epc.online, ear.level, ear.type " . "epc.online, ear.level, ear.type "
. "FROM edit_page_content epc, edit_access_right ear " . "FROM edit_page_content epc, edit_access_right ear "
. "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND " . "WHERE epc.edit_access_right_id = ear.edit_access_right_id AND "
. "epc.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") " . "epc.edit_page_id IN (" . join(', ', array_keys($edit_page_ids)) . ") "
. "ORDER BY epc.order_number"; . "ORDER BY epc.order_number";
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
$pages[$edit_page_ids[$res['edit_page_id']]]['content'][$res['uid']] = [ $pages[$edit_page_ids[$res['edit_page_id']]]['content'][$res['uid']] = [
'name' => $res['name'], 'name' => $res['name'],
'uid' => $res['uid'], 'uid' => $res['uid'],
@@ -550,13 +584,13 @@ class Login extends \CoreLibs\DB\IO
$unit_access = []; $unit_access = [];
$eauid = []; $eauid = [];
$unit_acl = []; $unit_acl = [];
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
// read edit access data fields and drop them into the unit access array // read edit access data fields and drop them into the unit access array
$q_sub = "SELECT name, value " $q_sub = "SELECT name, value "
. "FROM edit_access_data " . "FROM edit_access_data "
. "WHERE enabled = 1 AND edit_access_id = " . $res['edit_access_id']; . "WHERE enabled = 1 AND edit_access_id = " . $res['edit_access_id'];
$ea_data = []; $ea_data = [];
while ($res_sub = $this->dbReturn($q_sub)) { while (is_array($res_sub = $this->dbReturn($q_sub))) {
$ea_data[$res_sub['name']] = $res_sub['value']; $ea_data[$res_sub['name']] = $res_sub['value'];
} }
// build master unit array // build master unit array
@@ -583,7 +617,7 @@ class Login extends \CoreLibs\DB\IO
$_SESSION['EAID'] = $eauid; $_SESSION['EAID'] = $eauid;
} // user has permission to THIS page } // user has permission to THIS page
} // user was not enabled or other login error } // user was not enabled or other login error
if ($this->login_error) { if ($this->login_error && is_array($res)) {
$login_error_date_first = ''; $login_error_date_first = '';
if ($res['login_error_count'] == 0) { if ($res['login_error_count'] == 0) {
$login_error_date_first = ", login_error_date_first = NOW()"; $login_error_date_first = ", login_error_date_first = NOW()";
@@ -633,6 +667,11 @@ class Login extends \CoreLibs\DB\IO
. "AND filename = '" . $this->page_name . "' " . "AND filename = '" . $this->page_name . "' "
. "AND eg.enabled = 1 AND epa.enabled = 1"; . "AND eg.enabled = 1 AND epa.enabled = 1";
$res = $this->dbReturnRow($q); $res = $this->dbReturnRow($q);
if (!is_array($res)) {
$this->login_error = 109;
$this->permission_okay = false;
return $this->permission_okay;
}
// unset mem limit if debug is set to 1 // unset mem limit if debug is set to 1
// if ( // if (
// ($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] || // ($GLOBALS["DEBUG_ALL"] || $GLOBALS["DB_DEBUG"] ||
@@ -795,10 +834,14 @@ class Login extends \CoreLibs\DB\IO
/** /**
* checks if this edit access id is valid * checks if this edit access id is valid
* @param int|null $edit_access_id access id pk to check * @param int|null $edit_access_id access id pk to check
* @return bool true/false: if the edit access is not in the valid list: false * @return bool true/false: if the edit access is not
* in the valid list: false
*/ */
public function loginCheckEditAccess($edit_access_id): bool public function loginCheckEditAccess($edit_access_id): bool
{ {
if ($edit_access_id === null) {
return false;
}
if (array_key_exists($edit_access_id, $this->acl['unit'])) { if (array_key_exists($edit_access_id, $this->acl['unit'])) {
return true; return true;
} else { } else {
@@ -943,7 +986,7 @@ class Login extends \CoreLibs\DB\IO
/** /**
* prints out login html part if no permission (error) is set * prints out login html part if no permission (error) is set
* @return ?string html data for login page, or null for nothing * @return string|null html data for login page, or null for nothing
*/ */
private function loginPrintLogin() private function loginPrintLogin()
{ {
@@ -958,7 +1001,7 @@ class Login extends \CoreLibs\DB\IO
$LOGOUT_TARGET = ""; $LOGOUT_TARGET = "";
} }
$html_string = $this->login_template['template']; $html_string = (string)$this->login_template['template'];
// if password change is okay // if password change is okay
if ($this->password_change) { if ($this->password_change) {
@@ -1099,6 +1142,8 @@ class Login extends \CoreLibs\DB\IO
$error_msgs = [ $error_msgs = [
// actually obsolete // actually obsolete
'100' => $this->l->__('Fatal Error: <b>[EUID] came in as GET/POST!</b>'), '100' => $this->l->__('Fatal Error: <b>[EUID] came in as GET/POST!</b>'),
// query errors
'1009' => $this->l->__('Fatal Error: <b>Login query reading failed<b>'),
// user not found // user not found
'1010' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'), '1010' => $this->l->__('Fatal Error: <b>Login Failed - Wrong Username or Password</b>'),
// blowfish password wrong // blowfish password wrong
@@ -1111,6 +1156,7 @@ class Login extends \CoreLibs\DB\IO
'103' => $this->l->__('Fatal Error: <b>You do not have the rights to access this Page</b>'), '103' => $this->l->__('Fatal Error: <b>You do not have the rights to access this Page</b>'),
'104' => $this->l->__('Fatal Error: <b>Login Failed - User not enabled</b>'), '104' => $this->l->__('Fatal Error: <b>Login Failed - User not enabled</b>'),
'105' => $this->l->__('Fatal Error: <b>Login Failed - User is locked</b>'), '105' => $this->l->__('Fatal Error: <b>Login Failed - User is locked</b>'),
'109' => $this->l->__('Fatal Error: <b>Check permission query reading failed</b>'),
// 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: <b>Password change - The user could not be found</b>'), '220' => $this->l->__('Fatal Error: <b>Password change - The user could not be found</b>'),
'200' => $this->l->__('Fatal Error: <b>Password change - Please enter username and old password</b>'), '200' => $this->l->__('Fatal Error: <b>Password change - Please enter username and old password</b>'),
@@ -1123,7 +1169,8 @@ class Login extends \CoreLibs\DB\IO
// for OK password change // for OK password change
'300' => $this->l->__('Success: <b>Password change successful</b>'), '300' => $this->l->__('Success: <b>Password change successful</b>'),
// this is bad bad error // this is bad bad error
'9999' => $this->l->__('Fatal Error: <b>necessary crypt engine could not be found</b>. Login is impossible') '9999' => $this->l->__('Fatal Error: <b>necessary crypt engine could not be found</b>. '
. 'Login is impossible'),
]; ];
// if password change is okay // if password change is okay
@@ -1280,7 +1327,7 @@ EOM;
'_FILES' => $_FILES, '_FILES' => $_FILES,
'error' => $this->login_error 'error' => $this->login_error
]; ];
$data_binary = $this->dbEscapeBytea(bzcompress(serialize($_data_binary))); $data_binary = $this->dbEscapeBytea((string)bzcompress(serialize($_data_binary)));
// SQL querie for log entry // SQL querie for log entry
$q = "INSERT INTO edit_log " $q = "INSERT INTO edit_log "
. "(username, password, euid, event_date, event, error, data, data_binary, page, " . "(username, password, euid, event_date, event, error, data, data_binary, page, "
@@ -1327,6 +1374,7 @@ EOM;
public function loginCheckEditAccessId(?int $edit_access_id): ?int public function loginCheckEditAccessId(?int $edit_access_id): ?int
{ {
if ( if (
$edit_access_id !== null &&
isset($_SESSION['UNIT']) && isset($_SESSION['UNIT']) &&
is_array($_SESSION['UNIT']) && is_array($_SESSION['UNIT']) &&
!array_key_exists($edit_access_id, $_SESSION['UNIT']) !array_key_exists($edit_access_id, $_SESSION['UNIT'])

View File

@@ -34,51 +34,80 @@ namespace CoreLibs\Admin;
class Backend extends \CoreLibs\DB\IO class Backend extends \CoreLibs\DB\IO
{ {
// page name // page name
/** @var array<mixed> */
public $menu = []; public $menu = [];
/** @var int|string */
public $menu_show_flag = 0; // top menu flag (mostly string) public $menu_show_flag = 0; // top menu flag (mostly string)
// action ids // action ids
/** @var array<string> */
public $action_list = [ public $action_list = [
'action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag', 'action', 'action_id', 'action_sub_id', 'action_yes', 'action_flag',
'action_menu', 'action_value', 'action_error', 'action_loaded' 'action_menu', 'action_value', 'action_error', 'action_loaded'
]; ];
/** @var string */
public $action; public $action;
/** @var string|int */
public $action_id; public $action_id;
/** @var string|int */
public $action_sub_id; public $action_sub_id;
/** @var string|int|bool */
public $action_yes; public $action_yes;
/** @var string */
public $action_flag; public $action_flag;
/** @var string */
public $action_menu; public $action_menu;
/** @var string */
public $action_loaded; public $action_loaded;
/** @var string */
public $action_value; public $action_value;
/** @var string */
public $action_error; public $action_error;
// ACL array variable if we want to set acl data from outisde // ACL array variable if we want to set acl data from outisde
/** @var array<mixed> */
public $acl = []; public $acl = [];
/** @var int */
public $default_acl; public $default_acl;
// queue key // queue key
/** @var string */
public $queue_key; public $queue_key;
// the current active edit access id // the current active edit access id
/** @var int */
public $edit_access_id; public $edit_access_id;
// error/warning/info messages // error/warning/info messages
/** @var array<mixed> */
public $messages = []; public $messages = [];
/** @var int */
public $error = 0; public $error = 0;
/** @var int */
public $warning = 0; public $warning = 0;
/** @var int */
public $info = 0; public $info = 0;
// internal lang & encoding vars // internal lang & encoding vars
/** @var string */
public $lang_dir = ''; public $lang_dir = '';
/** @var string */
public $lang; public $lang;
/** @var string */
public $lang_short; public $lang_short;
/** @var string */
public $encoding; public $encoding;
// language // language
/** @var \CoreLibs\Language\L10n */
public $l; public $l;
// smarty publics [end processing in smarty class] // smarty publics [end processing in smarty class]
/** @var array<mixed> */
public $DATA; public $DATA;
/** @var array<mixed> */
public $HEADER; public $HEADER;
/** @var array<mixed> */
public $DEBUG_DATA; public $DEBUG_DATA;
/** @var array<mixed> */
public $CONTENT_DATA; public $CONTENT_DATA;
// CONSTRUCTOR / DECONSTRUCTOR |====================================> // CONSTRUCTOR / DECONSTRUCTOR |====================================>
/** /**
* main class constructor * main class constructor
* @param array $db_config db config array * @param array<mixed> $db_config db config array
*/ */
public function __construct(array $db_config) public function __construct(array $db_config)
{ {
@@ -151,7 +180,7 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* set internal ACL from login ACL * set internal ACL from login ACL
* @param array $acl login acl array * @param array<mixed> $acl login acl array
*/ */
public function setACL(array $acl): void public function setACL(array $acl): void
{ {
@@ -160,16 +189,16 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* writes all action vars plus other info into edit_log tabl * writes all action vars plus other info into edit_log tabl
* @param string $event any kind of event description, * @param string $event any kind of event description,
* @param string|array $data any kind of data related to that event * @param string|array<mixed> $data any kind of data related to that event
* @param string $write_type write type can bei STRING or BINARY * @param string $write_type write type can bei STRING or BINARY
* @return void has no return * @return void
*/ */
public function adbEditLog(string $event = '', $data = '', string $write_type = 'STRING'): void public function adbEditLog(string $event = '', $data = '', string $write_type = 'STRING'): void
{ {
$data_binary = ''; $data_binary = '';
if ($write_type == 'BINARY') { if ($write_type == 'BINARY') {
$data_binary = $this->dbEscapeBytea(bzcompress(serialize($data))); $data_binary = $this->dbEscapeBytea((string)bzcompress(serialize($data)));
$data = 'see bzip compressed data_binary field'; $data = 'see bzip compressed data_binary field';
} }
if ($write_type == 'STRING') { if ($write_type == 'STRING') {
@@ -178,16 +207,15 @@ class Backend extends \CoreLibs\DB\IO
} }
// check schema // check schema
$SCHEMA = 'public';
if (defined('LOGIN_DB_SCHEMA') && !empty(LOGIN_DB_SCHEMA)) { if (defined('LOGIN_DB_SCHEMA') && !empty(LOGIN_DB_SCHEMA)) {
$SCHEMA = LOGIN_DB_SCHEMA; $SCHEMA = LOGIN_DB_SCHEMA;
} elseif ($this->dbGetSchema()) { } elseif ($this->dbGetSchema()) {
$SCHEMA = $this->dbGetSchema(); $SCHEMA = $this->dbGetSchema();
} elseif (defined('PUBLIC_SCHEMA')) { } elseif (defined('PUBLIC_SCHEMA')) {
$SCHEMA = PUBLIC_SCHEMA; $SCHEMA = PUBLIC_SCHEMA;
} else {
$SCHEMA = 'public';
} }
/** @phpstan-ignore-next-line for whatever reason $SCHEMA is seen as possible array */
$q = "INSERT INTO " . $SCHEMA . ".edit_log " $q = "INSERT INTO " . $SCHEMA . ".edit_log "
. "(euid, event_date, event, data, data_binary, page, " . "(euid, event_date, event, data, data_binary, page, "
. "ip, user_agent, referer, script_name, query_string, server_name, http_host, " . "ip, user_agent, referer, script_name, query_string, server_name, http_host, "
@@ -225,8 +253,8 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* menu creater (from login menu session pages) * menu creater (from login menu session pages)
* @param int $flag visible flag trigger * @param int $flag visible flag trigger
* @return array menu array for output on page (smarty) * @return array<mixed> menu array for output on page (smarty)
*/ */
public function adbTopMenu(int $flag = 0): array public function adbTopMenu(int $flag = 0): array
{ {
@@ -373,10 +401,10 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* @deprecated * @deprecated
* creates out of a normal db_return array an assoc array * creates out of a normal db_return array an assoc array
* @param array $db_array input array * @param array<mixed> $db_array input array
* @param string|int|bool $key key * @param string|int|bool $key key
* @param string|int|bool $value value * @param string|int|bool $value value
* @return array associative array * @return array<mixed> associative array
* @deprecated \CoreLibs\Combined\ArrayHandler::genAssocArray() * @deprecated \CoreLibs\Combined\ArrayHandler::genAssocArray()
*/ */
public function adbAssocArray(array $db_array, $key, $value): array public function adbAssocArray(array $db_array, $key, $value): array
@@ -407,16 +435,24 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* @deprecated * @deprecated
* converts picture to a thumbnail with max x and max y size * converts picture to a thumbnail with max x and max y size
* @param string $pic source image file with or without path * @param string $pic source image file with or without path
* @param int $size_x maximum size width * @param int $size_x maximum size width
* @param int $size_y maximum size height * @param int $size_y maximum size height
* @param string $dummy empty, or file_type to show an icon instead of nothing if file is not found * @param string $dummy empty, or file_type to show an icon
* @param string $path if source start is not ROOT path, if empty ROOT is choosen * instead of nothing if file is not found
* @return string|bool thumbnail name, or false for error * @param string $path if source start is not ROOT path
* if empty ROOT is choosen
* @return string|bool thumbnail name, or false for error
* @deprecated \CoreLibs\Output\Image::createThumbnail() * @deprecated \CoreLibs\Output\Image::createThumbnail()
*/ */
public function adbCreateThumbnail($pic, $size_x, $size_y, $dummy = '', $path = "", $cache = "") public function adbCreateThumbnail(
{ string $pic,
int $size_x,
int $size_y,
string $dummy = '',
string $path = '',
string $cache = ''
) {
trigger_error( trigger_error(
'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()', 'Method ' . __METHOD__ . ' is deprecated: \CoreLibs\Output\Image::createThumbnail()',
E_USER_DEPRECATED E_USER_DEPRECATED
@@ -426,10 +462,10 @@ class Backend extends \CoreLibs\DB\IO
/** /**
* wrapper function to fill up the mssages array * wrapper function to fill up the mssages array
* @param string $level info/warning/error * @param string $level info/warning/error
* @param string $msg string, can be printf formated * @param string $msg string, can be printf formated
* @param array $vars optional data for a possible printf formated msg * @param array<mixed> $vars optional data for a possible printf formated msg
* @return void has no return * @return void has no return
*/ */
public function adbMsg(string $level, string $msg, array $vars = []): void public function adbMsg(string $level, string $msg, array $vars = []): void
{ {

View File

@@ -57,24 +57,34 @@ namespace CoreLibs;
class Basic class Basic
{ {
// page and host name // page and host name
/** @var string */
public $page_name; public $page_name;
/** @var string */
public $host_name; public $host_name;
/** @var int */
public $host_port; public $host_port;
// logging interface, Debug\Logging class // logging interface, Debug\Logging class
/** @var \CoreLibs\Debug\Logging */
public $log; public $log;
// email valid checks // email valid checks
/** @var array<mixed> */
public $email_regex_check = []; public $email_regex_check = [];
/** @var string */
public $email_regex; // regex var for email check public $email_regex; // regex var for email check
// data path for files // data path for files
/** @var array<mixed> */
public $data_path = []; public $data_path = [];
// session name // session name
/** @var string */
private $session_name = ''; private $session_name = '';
/** @var string */
private $session_id = ''; private $session_id = '';
// ajax flag // ajax flag
/** @var bool */
protected $ajax_page_flag = false; protected $ajax_page_flag = false;
/** /**
@@ -154,7 +164,7 @@ class Basic
// start session // start session
session_start(); session_start();
// set internal session id, we can use that later for protection check // set internal session id, we can use that later for protection check
$this->session_id = session_id(); $this->session_id = session_id() ?: '';
} }
} }
@@ -264,14 +274,14 @@ class Basic
* eg $foo->debugFor('print', 'on', ['LOG', 'DEBUG', 'INFO']); * eg $foo->debugFor('print', 'on', ['LOG', 'DEBUG', 'INFO']);
* @param string $type error, echo, print * @param string $type error, echo, print
* @param string $flag on/off * @param string $flag on/off
* array $array of levels to turn on/off debug * array<mixed> $array of levels to turn on/off debug
* @return void has no return * @return void has no return
* @deprecated Use $basic->log->debugFor() instead * @deprecated Use $basic->log->debugFor() instead
*/ */
public function debugFor(string $type, string $flag): void 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 */ /** @phan-suppress-next-line PhanTypeMismatchArgumentReal @phpstan-ignore-next-line */
$this->log->debugFor(...[func_get_args()]); $this->log->debugFor(...[func_get_args()]);
} }
@@ -350,8 +360,8 @@ class Basic
/** /**
* merges the given error array with the one from this class * merges the given error array with the one from this class
* only merges visible ones * only merges visible ones
* @param array $error_msg error array * @param array<mixed> $error_msg error array
* @return void has no return * @return void
* @deprecated Use $basic->log->mergeErrors() instead * @deprecated Use $basic->log->mergeErrors() instead
*/ */
public function mergeErrors(array $error_msg = []): void public function mergeErrors(array $error_msg = []): void
@@ -391,8 +401,8 @@ class Basic
/** /**
* prints a html formatted (pre) array * prints a html formatted (pre) array
* @param array $array any array * @param array<mixed> $array any array
* @return string formatted array for output with <pre> tag added * @return string formatted array for output with <pre> tag added
* @deprecated Use $this->log->prAr() instead * @deprecated Use $this->log->prAr() instead
*/ */
public function printAr(array $array): string public function printAr(array $array): string
@@ -405,7 +415,8 @@ class Basic
* eg for debugging, this function does this * eg for debugging, this function does this
* call this method in the child method and you get the parent function that called * call this method in the child method and you get the parent function that called
* @param int $level debug level, default 2 * @param int $level debug level, default 2
* @return ?string null or the function that called the function where this method is called * @return ?string null or the function that called the function
* where this method is called
* @deprecated Use \CoreLibs\Debug\Support::getCallerMethod() instead * @deprecated Use \CoreLibs\Debug\Support::getCallerMethod() instead
*/ */
public static function getCallerMethod(int $level = 2): ?string public static function getCallerMethod(int $level = 2): ?string
@@ -471,7 +482,7 @@ class Basic
* returns 'checked' or 'selected' if okay * returns 'checked' or 'selected' if okay
* $needle is a var, $haystack an array or a string * $needle is a var, $haystack an array or a string
* **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT NULL IF NOT FOUND **** * **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT NULL IF NOT FOUND ****
* @param array|string $haystack (search in) haystack can be an array or a string * @param array<mixed>|string $haystack (search in) haystack can be an array or a string
* @param string $needle needle (search for) * @param string $needle needle (search for)
* @param int $type type: 0: returns selected, 1, returns checked * @param int $type type: 0: returns selected, 1, returns checked
* @return ?string returns checked or selected, else returns null * @return ?string returns checked or selected, else returns null
@@ -504,7 +515,7 @@ class Basic
/** /**
* get the host name without the port as given by the SELF var * get the host name without the port as given by the SELF var
* @return array host name/port name * @return array<mixed> host name/port name
* @deprecated Use \CoreLibs\Get\System::getHostName() instead * @deprecated Use \CoreLibs\Get\System::getHostName() instead
*/ */
public function getHostName(): array public function getHostName(): array
@@ -563,9 +574,9 @@ class Basic
* searches key = value in an array / array * searches key = value in an array / array
* only returns the first one found * only returns the first one found
* @param string|int $needle needle (search for) * @param string|int $needle needle (search for)
* @param array $haystack haystack (search in) * @param array<mixed> $haystack haystack (search in)
* @param string|null $key_lookin the key to look out for, default empty * @param string|null $key_lookin the key to look out for, default empty
* @return array array with the elements where the needle can be * @return array<mixed> array with the elements where the needle can be
* found in the haystack array * found in the haystack array
* @deprecated Use \CoreLibs\Combined\ArrayHandler::arraySearchRecursive() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::arraySearchRecursive() instead
*/ */
@@ -577,11 +588,11 @@ class Basic
/** /**
* recursive array search function, which returns all found not only the first one * recursive array search function, which returns all found not only the first one
* @param string|int $needle needle (search for) * @param string|int $needle needle (search for)
* @param array $haystack haystack (search in) * @param array<mixed> $haystack haystack (search in)
* @param string|int $key the key to look for in * @param string|int $key the key to look for in
* @param array|null $path recursive call for previous path * @param array<mixed>|null $path recursive call for previous path
* @return ?array all array elements paths where the element was found * @return ?array<mixed> all array elements paths where the element was found
* @deprecated Use \CoreLibs\Combined\ArrayHandler::arraySearchRecursiveAll() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::arraySearchRecursiveAll() instead
*/ */
public static function arraySearchRecursiveAll($needle, array $haystack, $key, ?array $path = null): ?array public static function arraySearchRecursiveAll($needle, array $haystack, $key, ?array $path = null): ?array
@@ -592,7 +603,7 @@ class Basic
/** /**
* array search simple. looks for key, value Combined, if found, returns true * array search simple. looks for key, value Combined, if found, returns true
* @param array $array array (search in) * @param array<mixed> $array array (search in)
* @param string|int $key key (key to search in) * @param string|int $key key (key to search in)
* @param string|int $value value (what to find) * @param string|int $value value (what to find)
* @return bool true on found, false on not found * @return bool true on found, false on not found
@@ -611,7 +622,7 @@ class Basic
* ... etc * ... etc
* bool key flag: true: handle keys as string or int * bool key flag: true: handle keys as string or int
* default false: all keys are string * default false: all keys are string
* @return array|bool merged array * @return array<mixed>|bool merged array
* @deprecated MUSER BE CONVERTED TO \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive() instead * @deprecated MUSER BE CONVERTED TO \CoreLibs\Combined\ArrayHandler::arrayMergeRecursive() instead
*/ */
public static function arrayMergeRecursive() public static function arrayMergeRecursive()
@@ -625,9 +636,9 @@ class Basic
* array_diff only checks elements from A that are not in B, but not the * array_diff only checks elements from A that are not in B, but not the
* other way around. * other way around.
* Note that like array_diff this only checks first level values not keys * Note that like array_diff this only checks first level values not keys
* @param array $a array to compare a * @param array<mixed> $a array to compare a
* @param array $b array to compare b * @param array<mixed> $b array to compare b
* @return array array with missing elements from a & b * @return array<mixed> array with missing elements from a & b
* @deprecated Use \CoreLibs\Combined\ArrayHandler::arrayDiff() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::arrayDiff() instead
*/ */
public static function arrayDiff(array $a, array $b): array public static function arrayDiff(array $a, array $b): array
@@ -639,9 +650,9 @@ class Basic
/** /**
* search for the needle array elements in haystack and return the ones found as an array, * search for the needle array elements in haystack and return the ones found as an array,
* is there nothing found, it returns FALSE (boolean) * is there nothing found, it returns FALSE (boolean)
* @param array $needle elements to search for * @param array<mixed> $needle elements to search for
* @param array $haystack array where the $needle elements should be searched int * @param array<mixed> $haystack array where the $needle elements should be searched int
* @return array|bool either the found elements or false for nothing found or error * @return array<mixed>|bool either the found elements or false for nothing found or error
* @deprecated Use \CoreLibs\Combined\ArrayHandler::inArrayAny() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::inArrayAny() instead
*/ */
public static function inArrayAny(array $needle, array $haystack) public static function inArrayAny(array $needle, array $haystack)
@@ -652,11 +663,11 @@ class Basic
/** /**
* creates out of a normal db_return array an assoc array * creates out of a normal db_return array an assoc array
* @param array $db_array return array from the database * @param array<mixed> $db_array return array from the database
* @param string|int|bool $key key set, false for not set * @param string|int|bool $key key set, false for not set
* @param string|int|bool $value value set, false for not set * @param string|int|bool $value value set, false for not set
* @param bool $set_only flag to return all (default), or set only * @param bool $set_only flag to return all (default), or set only
* @return array associative array * @return array<mixed> associative array
* @deprecated Use \CoreLibs\Combined\ArrayHandler::genAssocArray() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::genAssocArray() instead
*/ */
public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array
@@ -668,7 +679,7 @@ class Basic
/** /**
* [NOTE]: This is an old function and is deprecated * [NOTE]: This is an old function and is deprecated
* wrapper for join, but checks if input is an array and if not returns null * wrapper for join, but checks if input is an array and if not returns null
* @param array $array array to convert * @param array<mixed> $array array to convert
* @param string $connect_char connection character * @param string $connect_char connection character
* @return string joined string * @return string joined string
* @deprecated use join() instead * @deprecated use join() instead
@@ -685,8 +696,8 @@ class Basic
/** /**
* converts multi dimensional array to a flat array * converts multi dimensional array to a flat array
* does NOT preserve keys * does NOT preserve keys
* @param array $array ulti dimensionial array * @param array<mixed> $array ulti dimensionial array
* @return array flattened array * @return array<mixed> flattened array
* @deprecated Use \CoreLibs\Combined\ArrayHandler::flattenArray() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::flattenArray() instead
*/ */
public static function flattenArray(array $array): array public static function flattenArray(array $array): array
@@ -697,8 +708,8 @@ class Basic
/** /**
* will loop through an array recursivly and write the array keys back * will loop through an array recursivly and write the array keys back
* @param array $array multidemnsional array to flatten * @param array<mixed> $array multidemnsional array to flatten
* @return array flattened keys array * @return array<mixed> flattened keys array
* @deprecated Use \CoreLibs\Combined\ArrayHandler::flattenArrayKey() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::flattenArrayKey() instead
*/ */
public static function flattenArrayKey(array $array/*, array $return = []*/): array public static function flattenArrayKey(array $array/*, array $return = []*/): array
@@ -710,9 +721,9 @@ class Basic
/** /**
* searches for key -> value in an array tree and writes the value one level up * searches for key -> value in an array tree and writes the value one level up
* this will remove this leaf will all other values * this will remove this leaf will all other values
* @param array $array array (nested) * @param array<mixed> $array array (nested)
* @param string|int $search key to find that has no sub leaf and will be pushed up * @param string|int $search key to find that has no sub leaf and will be pushed up
* @return array modified, flattened array * @return array<mixed> modified, flattened array
* @deprecated Use \CoreLibs\Combined\ArrayHandler::arrayFlatForKey() instead * @deprecated Use \CoreLibs\Combined\ArrayHandler::arrayFlatForKey() instead
*/ */
public static function arrayFlatForKey(array $array, $search): array public static function arrayFlatForKey(array $array, $search): array
@@ -923,7 +934,7 @@ class Basic
* @param string $start_date valid start date (y/m/d) * @param string $start_date valid start date (y/m/d)
* @param string $end_date valid end date (y/m/d) * @param string $end_date valid end date (y/m/d)
* @param bool $return_named return array type, false (default), true for named * @param bool $return_named return array type, false (default), true for named
* @return array 0/overall, 1/weekday, 2/weekend * @return array<mixed> 0/overall, 1/weekday, 2/weekend
* @deprecated Use \CoreLibs\Combined\DateTime::calcDaysInterval() instead * @deprecated Use \CoreLibs\Combined\DateTime::calcDaysInterval() instead
*/ */
public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
@@ -1033,7 +1044,7 @@ class Basic
* @param string $string string to test * @param string $string string to test
* @param string $from_encoding encoding of string to test * @param string $from_encoding encoding of string to test
* @param string $to_encoding target encoding * @param string $to_encoding target encoding
* @return bool|array false if no error or array with failed characters * @return bool|array<mixed> false if no error or array with failed characters
* @deprecated use \CoreLibs\Language\Encoding::checkConvertEncoding() instead * @deprecated use \CoreLibs\Language\Encoding::checkConvertEncoding() instead
*/ */
public function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding) public function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding)
@@ -1228,7 +1239,8 @@ class Basic
* @param string $hexStr RGB hexstring * @param string $hexStr RGB hexstring
* @param bool $returnAsString flag to return as string * @param bool $returnAsString flag to return as string
* @param string $seperator string seperator: default: "," * @param string $seperator string seperator: default: ","
* @return string|array|bool false on error or array with RGB or a string with the seperator * @return string|array<mixed>|bool false on error or array with RGB or
* a string with the seperator
* @deprecated use \CoreLibs\Convert\Colors::hex2rgb() instead * @deprecated use \CoreLibs\Convert\Colors::hex2rgb() instead
*/ */
public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',') public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
@@ -1275,7 +1287,7 @@ class Basic
* @param int $red red 0-255 * @param int $red red 0-255
* @param int $green green 0-255 * @param int $green green 0-255
* @param int $blue blue 0-255 * @param int $blue blue 0-255
* @return array Hue, Sat, Brightness/Value * @return array<mixed> Hue, Sat, Brightness/Value
* @deprecated use \CoreLibs\Convert\Colors::rgb2hsb() instead * @deprecated use \CoreLibs\Convert\Colors::rgb2hsb() instead
*/ */
public static function rgb2hsb(int $red, int $green, int $blue): array public static function rgb2hsb(int $red, int $green, int $blue): array
@@ -1289,7 +1301,7 @@ class Basic
* @param int $H hue 0-360 * @param int $H hue 0-360
* @param float $S saturation 0-1 (float) * @param float $S saturation 0-1 (float)
* @param float $V brightness/value 0-1 (float) * @param float $V brightness/value 0-1 (float)
* @return array 0 red/1 green/2 blue array * @return array<mixed> 0 red/1 green/2 blue array
* @deprecated use \CoreLibs\Convert\Colors::hsb2rgb() instead * @deprecated use \CoreLibs\Convert\Colors::hsb2rgb() instead
*/ */
public static function hsb2rgb(int $H, float $S, float $V): array public static function hsb2rgb(int $H, float $S, float $V): array
@@ -1305,7 +1317,7 @@ class Basic
* @param int $r red 0-255 * @param int $r red 0-255
* @param int $g green 0-255 * @param int $g green 0-255
* @param int $b blue 0-255 * @param int $b blue 0-255
* @return array hue/sat/luminance * @return array<mixed> hue/sat/luminance
* @deprecated use \CoreLibs\Convert\Colors::rgb2hsl() instead * @deprecated use \CoreLibs\Convert\Colors::rgb2hsl() instead
*/ */
public static function rgb2hsl(int $r, int $g, int $b): array public static function rgb2hsl(int $r, int $g, int $b): array
@@ -1319,7 +1331,7 @@ class Basic
* @param int $h hue: 0-360 (degrees) * @param int $h hue: 0-360 (degrees)
* @param float $s saturation: 0-1 * @param float $s saturation: 0-1
* @param float $l luminance: 0-1 * @param float $l luminance: 0-1
* @return array red/blue/green 0-255 each * @return array<mixed> red/blue/green 0-255 each
* @deprecated use \CoreLibs\Convert\Colors::hsl2rgb() instead * @deprecated use \CoreLibs\Convert\Colors::hsl2rgb() instead
*/ */
public static function hsl2rgb(int $h, float $s, float $l): array public static function hsl2rgb(int $h, float $s, float $l): array
@@ -1538,7 +1550,7 @@ class Basic
* @param string|null $json a json string, or null data * @param string|null $json a json string, or null data
* @param bool $override if set to true, then on json error * @param bool $override if set to true, then on json error
* set original value as array * set original value as array
* @return array returns an array from the json values * @return array<mixed> returns an array from the json values
* @deprecated use \CoreLibs\Check\Jason::jsonConvertToArray() instead * @deprecated use \CoreLibs\Check\Jason::jsonConvertToArray() instead
*/ */
public function jsonConvertToArray(?string $json, bool $override = false): array public function jsonConvertToArray(?string $json, bool $override = false): array

View File

@@ -7,6 +7,7 @@ namespace CoreLibs\Check;
class Email class Email
{ {
// this is for error check parts in where the email regex failed // this is for error check parts in where the email regex failed
/** @var array<int,string> */
private static $email_regex_check = [ private static $email_regex_check = [
0 => "^[A-Za-z0-9!#$%&'*+\-\/=?^_`{|}~][A-Za-z0-9!#$%:\(\)&'*+\-\/=?^_`{|}~\.]{0,63}@" 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 . "[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]{1,})*\.([a-zA-Z]{2,}){1}$", // MASTER
@@ -19,6 +20,7 @@ class Email
7 => "@.*\.$" // ends with a dot, top level, domain missing 7 => "@.*\.$" // ends with a dot, top level, domain missing
]; ];
// the array with the mobile types that are valid // the array with the mobile types that are valid
/** @var array<string,string> */
private static $mobile_email_type = [ private static $mobile_email_type = [
'.*@docomo\.ne\.jp$' => 'keitai_docomo', '.*@docomo\.ne\.jp$' => 'keitai_docomo',
// correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9] // correct are a[2-4], b2, c[1-9], e[2-9], h[2-4], t[1-9]
@@ -57,6 +59,7 @@ class Email
'.*@emobile-s\.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 // short list for mobile email types
/** @var array<string,string> */
private static $mobile_email_type_short = [ private static $mobile_email_type_short = [
'keitai_docomo' => 'docomo', 'keitai_docomo' => 'docomo',
'keitai_kddi_ezweb' => 'kddi', 'keitai_kddi_ezweb' => 'kddi',
@@ -116,7 +119,7 @@ class Email
* get the full check array * get the full check array
* this will be deprected at some point * this will be deprected at some point
* *
* @return array * @return array<mixed>
*/ */
public static function getEmailRegexCheck(): array public static function getEmailRegexCheck(): array
{ {
@@ -132,9 +135,11 @@ class Email
/** /**
* guesses the email type (mostly for mobile) from the domain * guesses the email type (mostly for mobile) from the domain
* if second is set to true, it will return short naming scheme (only provider) * if second is set to true, it will return short naming scheme (only provider)
* @param string $email email string * @param string $email email string
* @param bool $short default false, if true, returns only short type (pc instead of pc_html) * @param bool $short default false, if true,
* @return string|bool email type, eg "pc", "docomo", etc, false for invalid short type * returns only short type (pc instead of pc_html)
* @return string|bool email type, eg "pc", "docomo", etc,
* false for invalid short type
*/ */
public static function getEmailType(string $email, bool $short = false) public static function getEmailType(string $email, bool $short = false)
{ {

View File

@@ -34,9 +34,12 @@ class File
is_readable($file) is_readable($file)
) { ) {
$f = fopen($file, 'rb'); $f = fopen($file, 'rb');
if (!is_resource($f)) {
return 0;
}
$lines = 0; $lines = 0;
while (!feof($f)) { while (!feof($f)) {
$lines += substr_count(fread($f, 8192), "\n"); $lines += substr_count(fread($f, 8192) ?: '', "\n");
} }
fclose($f); fclose($f);
} else { } else {

View File

@@ -12,6 +12,7 @@ namespace CoreLibs\Check;
class Jason class Jason
{ {
/** @var int */
private static $json_last_error; private static $json_last_error;
/** /**
@@ -23,7 +24,7 @@ class Jason
* @param string|null $json a json string, or null data * @param string|null $json a json string, or null data
* @param bool $override if set to true, then on json error * @param bool $override if set to true, then on json error
* set original value as array * set original value as array
* @return array returns an array from the json values * @return array<mixed> returns an array from the json values
*/ */
public static function jsonConvertToArray(?string $json, bool $override = false): array public static function jsonConvertToArray(?string $json, bool $override = false): array
{ {

View File

@@ -35,7 +35,7 @@ class PhpVersion
} }
// set the php version id // set the php version id
if (!defined('PHP_VERSION_ID')) { if (!defined('PHP_VERSION_ID')) {
$version = explode('.', phpversion()); $version = explode('.', phpversion() ?: '');
// creates something like 50107 // creates something like 50107
define('PHP_VERSION_ID', (int)$version[0] * 10000 + (int)$version[1] * 100 + (int)$version[2]); define('PHP_VERSION_ID', (int)$version[0] * 10000 + (int)$version[1] * 100 + (int)$version[2]);
} }

View File

@@ -13,11 +13,11 @@ class ArrayHandler
/** /**
* searches key = value in an array / array * searches key = value in an array / array
* only returns the first one found * only returns the first one found
* @param string|int $needle needle (search for) * @param string|int $needle needle (search for)
* @param array $haystack haystack (search in) * @param array<mixed> $haystack haystack (search in)
* @param string|null $key_lookin the key to look out for, default empty * @param string|null $key_lookin the key to look out for, default empty
* @return array array with the elements where the needle can be * @return array<mixed> array with the elements where the needle can be
* found in the haystack array * found in the haystack array
*/ */
public static function arraySearchRecursive($needle, array $haystack, ?string $key_lookin = null): array public static function arraySearchRecursive($needle, array $haystack, ?string $key_lookin = null): array
{ {
@@ -68,11 +68,11 @@ class ArrayHandler
/** /**
* recursive array search function, which returns all found not only the first one * recursive array search function, which returns all found not only the first one
* @param string|int $needle needle (search for) * @param string|int $needle needle (search for)
* @param array $haystack haystack (search in) * @param array<mixed> $haystack haystack (search in)
* @param string|int $key the key to look for in * @param string|int $key the key to look for in
* @param array|null $path recursive call for previous path * @param array<mixed>|null $path recursive call for previous path
* @return ?array all array elements paths where the element was found * @return array<mixed>|null all array elements paths where the element was found
*/ */
public static function arraySearchRecursiveAll($needle, array $haystack, $key, ?array $path = null): ?array public static function arraySearchRecursiveAll($needle, array $haystack, $key, ?array $path = null): ?array
{ {
@@ -82,41 +82,40 @@ class ArrayHandler
'level' => 0, 'level' => 0,
'work' => [] 'work' => []
]; ];
} } else {
// init sub sets if not set // init sub sets if not set
if (!isset($path['level'])) { if (!isset($path['level'])) {
$path['level'] = 0; $path['level'] = 0;
} }
if (!isset($path['work'])) { if (!isset($path['work'])) {
$path['work'] = []; $path['work'] = [];
}
} }
// should not be needed because it would trigger a php mehtod error // should not be needed because it would trigger a php mehtod error
if (!is_array($haystack)) { if (!is_array($haystack)) {
$haystack = []; $haystack = [];
} }
// @phan HACK
$path['level'] = $path['level'] ?? 0;
// go through the array, // go through the array,
foreach ($haystack as $_key => $_value) { foreach ($haystack as $_key => $_value) {
if (is_scalar($_value) && $_value == $needle && !$key) { if (is_scalar($_value) && $_value == $needle && !$key) {
// only value matches // only value matches
$path['work'][$path['level']] = $_key; $path['work'][$path['level'] ?? 0] = $_key;
$path['found'][] = $path['work']; $path['found'][] = $path['work'];
} elseif (is_scalar($_value) && $_value == $needle && $_key == $key) { } elseif (is_scalar($_value) && $_value == $needle && $_key == $key) {
// key and value matches // key and value matches
$path['work'][$path['level']] = $_key; $path['work'][$path['level'] ?? 0] = $_key;
$path['found'][] = $path['work']; $path['found'][] = $path['work'];
} elseif (is_array($_value)) { } elseif (is_array($_value)) {
// add position to working // add position to working
$path['work'][$path['level']] = $_key; $path['work'][$path['level'] ?? 0] = $_key;
// we will up a level // we will up a level
$path['level'] += 1; $path['level'] += 1;
// call recursive // call recursive
$path = self::arraySearchRecursiveAll($needle, $_value, $key, $path); $path = self::arraySearchRecursiveAll($needle, $_value, $key, $path);
} }
} }
// @phan HACK // be 100% sure the array elements are set
$path['level'] = $path['level'] ?? 0; $path['level'] = $path['level'] ?? 0;
$path['work'] = $path['work'] ?? []; $path['work'] = $path['work'] ?? [];
// cut all that is >= level // cut all that is >= level
@@ -128,10 +127,10 @@ class ArrayHandler
/** /**
* array search simple. looks for key, value combination, if found, returns true * array search simple. looks for key, value combination, if found, returns true
* @param array $array search in as array * @param array<mixed> $array search in as array
* @param string|int $key key (key to search in) * @param string|int $key key (key to search in)
* @param string|int $value value (what to find) * @param string|int $value value (what to find)
* @return bool true on found, false on not found * @return bool true on found, false on not found
*/ */
public static function arraySearchSimple(array $array, $key, $value): bool public static function arraySearchSimple(array $array, $key, $value): bool
{ {
@@ -160,7 +159,7 @@ class ArrayHandler
* ... etc * ... etc
* bool key flag: true: handle keys as string or int * bool key flag: true: handle keys as string or int
* default false: all keys are string * default false: all keys are string
* @return array|bool merged array * @return array<mixed>|bool merged array
*/ */
public static function arrayMergeRecursive() public static function arrayMergeRecursive()
{ {
@@ -215,9 +214,9 @@ class ArrayHandler
* array_diff only checks elements from A that are not in B, but not the * array_diff only checks elements from A that are not in B, but not the
* other way around. * other way around.
* Note that like array_diff this only checks first level values not keys * Note that like array_diff this only checks first level values not keys
* @param array $a array to compare a * @param array<mixed> $a array to compare a
* @param array $b array to compare b * @param array<mixed> $b array to compare b
* @return array array with missing elements from a & b * @return array<mixed> array with missing elements from a & b
*/ */
public static function arrayDiff(array $a, array $b): array public static function arrayDiff(array $a, array $b): array
{ {
@@ -228,9 +227,9 @@ class ArrayHandler
/** /**
* search for the needle array elements in haystack and return the ones found as an array, * search for the needle array elements in haystack and return the ones found as an array,
* is there nothing found, it returns FALSE (boolean) * is there nothing found, it returns FALSE (boolean)
* @param array $needle elements to search for * @param array<mixed> $needle elements to search for
* @param array $haystack array where the $needle elements should be searched int * @param array<mixed> $haystack array where the $needle elements should be searched int
* @return array|bool either the found elements or false for nothing found or error * @return array<mixed>|bool either the found elements or false for nothing found or error
*/ */
public static function inArrayAny(array $needle, array $haystack) public static function inArrayAny(array $needle, array $haystack)
{ {
@@ -255,11 +254,11 @@ class ArrayHandler
/** /**
* creates out of a normal db_return array an assoc array * creates out of a normal db_return array an assoc array
* @param array $db_array return array from the database * @param array<mixed> $db_array return array from the database
* @param string|int|bool $key key set, false for not set * @param string|int|bool $key key set, false for not set
* @param string|int|bool $value value set, false for not set * @param string|int|bool $value value set, false for not set
* @param bool $set_only flag to return all (default), or set only * @param bool $set_only flag to return all (default), or set only
* @return array associative array * @return array<mixed> associative array
*/ */
public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array public static function genAssocArray(array $db_array, $key, $value, bool $set_only = false): array
{ {
@@ -285,8 +284,8 @@ class ArrayHandler
/** /**
* converts multi dimensional array to a flat array * converts multi dimensional array to a flat array
* does NOT preserve keys * does NOT preserve keys
* @param array $array ulti dimensionial array * @param array<mixed> $array ulti dimensionial array
* @return array flattened array * @return array<mixed> flattened array
*/ */
public static function flattenArray(array $array): array public static function flattenArray(array $array): array
{ {
@@ -302,8 +301,8 @@ class ArrayHandler
/** /**
* will loop through an array recursivly and write the array keys back * will loop through an array recursivly and write the array keys back
* @param array $array multidemnsional array to flatten * @param array<mixed> $array multidemnsional array to flatten
* @return array flattened keys array * @return array<mixed> flattened keys array
*/ */
public static function flattenArrayKey(array $array): array public static function flattenArrayKey(array $array): array
{ {
@@ -320,9 +319,9 @@ class ArrayHandler
/** /**
* searches for key -> value in an array tree and writes the value one level up * searches for key -> value in an array tree and writes the value one level up
* this will remove this leaf will all other values * this will remove this leaf will all other values
* @param array $array nested array * @param array<mixed> $array nested array
* @param string|int $search key to find that has no sub leaf and will be pushed up * @param string|int $search key to find that has no sub leaf and will be pushed up
* @return array modified, flattened array * @return array<mixed> modified, flattened array
*/ */
public static function arrayFlatForKey(array $array, $search): array public static function arrayFlatForKey(array $array, $search): array
{ {

View File

@@ -38,7 +38,7 @@ class DateTime
{ {
// check if the timestamp has any h/m/s/ms inside, if yes skip // check if the timestamp has any h/m/s/ms inside, if yes skip
if (!preg_match("/(h|m|s|ms)/", (string)$timestamp)) { if (!preg_match("/(h|m|s|ms)/", (string)$timestamp)) {
list($timestamp, $ms) = array_pad(explode('.', (string)round($timestamp, 4)), 2, null); list($timestamp, $ms) = array_pad(explode('.', (string)round((float)$timestamp, 4)), 2, null);
// if negative remember // if negative remember
$negative = false; $negative = false;
if ((int)$timestamp < 0) { if ((int)$timestamp < 0) {
@@ -65,11 +65,14 @@ class DateTime
if ($ms !== null) { if ($ms !== null) {
// if we have ms and it has leading zeros, remove them, but only if it is nut just 0 // if we have ms and it has leading zeros, remove them, but only if it is nut just 0
$ms = preg_replace("/^0+(\d+)$/", '${1}', $ms); $ms = preg_replace("/^0+(\d+)$/", '${1}', $ms);
if (!is_string($ms) || empty($ms)) {
$ms = '0';
}
// add ms if there // add ms if there
if ($show_micro) { if ($show_micro) {
$time_string .= ' ' . (!$ms ? 0 : $ms) . 'ms'; $time_string .= ' ' . $ms . 'ms';
} elseif (!$time_string) { } elseif (!$time_string) {
$time_string .= (!$ms ? 0 : $ms) . 'ms'; $time_string .= $ms . 'ms';
} }
} }
if ($negative) { if ($negative) {
@@ -78,7 +81,7 @@ class DateTime
} else { } else {
$time_string = $timestamp; $time_string = $timestamp;
} }
return $time_string; return (string)$time_string;
} }
/** /**
@@ -90,7 +93,8 @@ class DateTime
public static function stringToTime($timestring) public static function stringToTime($timestring)
{ {
$timestamp = 0; $timestamp = 0;
if (preg_match("/(d|h|m|s|ms)/", $timestring)) { if (preg_match("/(d|h|m|s|ms)/", (string)$timestring)) {
$timestring = (string)$timestring;
// pos for preg match read + multiply factor // pos for preg match read + multiply factor
$timegroups = [2 => 86400, 4 => 3600, 6 => 60, 8 => 1]; $timegroups = [2 => 86400, 4 => 3600, 6 => 60, 8 => 1];
$matches = []; $matches = [];
@@ -131,7 +135,11 @@ class DateTime
if (!$date) { if (!$date) {
return false; return false;
} }
list ($year, $month, $day) = array_pad(preg_split("/[\/-]/", $date), 3, null); list ($year, $month, $day) = array_pad(
preg_split("/[\/-]/", $date) ?: [],
3,
null
);
if (!$year || !$month || !$day) { if (!$year || !$month || !$day) {
return false; return false;
} }
@@ -146,12 +154,16 @@ class DateTime
* @param string $datetime date (YYYY-MM-DD) + time (HH:MM:SS), SS can be dropped * @param string $datetime date (YYYY-MM-DD) + time (HH:MM:SS), SS can be dropped
* @return bool true if valid date, false if date not valid * @return bool true if valid date, false if date not valid
*/ */
public static function checkDateTime($datetime): bool public static function checkDateTime(string $datetime): bool
{ {
if (!$datetime) { if (!$datetime) {
return false; return false;
} }
list ($year, $month, $day, $hour, $min, $sec) = array_pad(preg_split("/[\/\- :]/", $datetime), 6, null); list ($year, $month, $day, $hour, $min, $sec) = array_pad(
preg_split("/[\/\- :]/", $datetime) ?: [],
6,
null
);
if (!$year || !$month || !$day) { if (!$year || !$month || !$day) {
return false; return false;
} }
@@ -190,8 +202,16 @@ class DateTime
} }
// splits the data up with / or - // splits the data up with / or -
list ($start_year, $start_month, $start_day) = array_pad(preg_split('/[\/-]/', $start_date), 3, null); list ($start_year, $start_month, $start_day) = array_pad(
list ($end_year, $end_month, $end_day) = array_pad(preg_split('/[\/-]/', $end_date), 3, null); preg_split('/[\/-]/', $start_date) ?: [],
3,
null
);
list ($end_year, $end_month, $end_day) = array_pad(
preg_split('/[\/-]/', $end_date) ?: [],
3,
null
);
// check that month & day are two digits and then combine // check that month & day are two digits and then combine
foreach (['start', 'end'] as $prefix) { foreach (['start', 'end'] as $prefix) {
foreach (['month', 'day'] as $date_part) { foreach (['month', 'day'] as $date_part) {
@@ -256,7 +276,7 @@ class DateTime
* @param string $start_date valid start date (y/m/d) * @param string $start_date valid start date (y/m/d)
* @param string $end_date valid end date (y/m/d) * @param string $end_date valid end date (y/m/d)
* @param bool $return_named return array type, false (default), true for named * @param bool $return_named return array type, false (default), true for named
* @return array 0/overall, 1/weekday, 2/weekend * @return array<mixed> 0/overall, 1/weekday, 2/weekend
*/ */
public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array public static function calcDaysInterval($start_date, $end_date, bool $return_named = false): array
{ {

View File

@@ -125,7 +125,7 @@ class Byte
// detects up to exo bytes // detects up to exo bytes
preg_match( preg_match(
"/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i", "/([\d.,]*)\s?(eib|pib|tib|gib|mib|kib|eb|pb|tb|gb|mb|kb|e|p|t|g|m|k|b)$/i",
strtolower($number), strtolower((string)$number),
$matches $matches
); );
if (isset($matches[1]) && isset($matches[2])) { if (isset($matches[1]) && isset($matches[2])) {
@@ -136,7 +136,7 @@ class Byte
// convert any mb/gb/etc to single m/b // convert any mb/gb/etc to single m/b
$unit = preg_replace('/[^bkmgtpezy]/i', '', $matches[2]); $unit = preg_replace('/[^bkmgtpezy]/i', '', $matches[2]);
if ($unit) { if ($unit) {
$number = $number * pow($si ? 1000 : 1024, stripos($valid_units_, $unit[0])); $number = $number * pow($si ? 1000 : 1024, stripos($valid_units_, $unit[0]) ?: 0);
} }
// convert to INT to avoid +E output // convert to INT to avoid +E output
$number = (int)round($number); $number = (int)round($number);

View File

@@ -18,14 +18,18 @@ class Colors
{ {
/** /**
* converts a hex RGB color to the int numbers * converts a hex RGB color to the int numbers
* @param string $hexStr RGB hexstring * @param string $hexStr RGB hexstring
* @param bool $returnAsString flag to return as string * @param bool $returnAsString flag to return as string
* @param string $seperator string seperator: default: "," * @param string $seperator string seperator: default: ","
* @return string|array|bool false on error or array with RGB or a string with the seperator * @return string|array<string,float|int>|bool false on error or array with RGB
* or a string with the seperator
*/ */
public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',') public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
{ {
$hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string $hexStr = preg_replace("/[^0-9A-Fa-f]/", '', $hexStr); // Gets a proper hex string
if (!is_string($hexStr)) {
return false;
}
$rgbArray = []; $rgbArray = [];
if (strlen($hexStr) == 6) { if (strlen($hexStr) == 6) {
// If a proper hex code, convert using bitwise operation. No overhead... faster // If a proper hex code, convert using bitwise operation. No overhead... faster
@@ -76,10 +80,10 @@ class Colors
* converts RGB to HSB/V values * converts RGB to HSB/V values
* returns: * returns:
* array with hue (0-360), sat (0-100%), brightness/value (0-100%) * array with hue (0-360), sat (0-100%), brightness/value (0-100%)
* @param int $red red 0-255 * @param int $red red 0-255
* @param int $green green 0-255 * @param int $green green 0-255
* @param int $blue blue 0-255 * @param int $blue blue 0-255
* @return array Hue, Sat, Brightness/Value * @return array<int|float> Hue, Sat, Brightness/Value
*/ */
public static function rgb2hsb(int $red, int $green, int $blue): array public static function rgb2hsb(int $red, int $green, int $blue): array
{ {
@@ -119,10 +123,10 @@ class Colors
/** /**
* converts HSB/V to RGB values RGB is full INT * converts HSB/V to RGB values RGB is full INT
* @param int $H hue 0-360 * @param int $H hue 0-360
* @param int $S saturation 0-100 (int) * @param int $S saturation 0-100 (int)
* @param int $V brightness/value 0-100 (int) * @param int $V brightness/value 0-100 (int)
* @return array 0 red/1 green/2 blue array as 0-255 * @return array<int> 0 red/1 green/2 blue array as 0-255
*/ */
public static function hsb2rgb(int $H, int $S, int $V): array public static function hsb2rgb(int $H, int $S, int $V): array
{ {
@@ -199,10 +203,10 @@ class Colors
* converts a RGB (0-255) to HSL * converts a RGB (0-255) to HSL
* return: * return:
* array with hue (0-360), saturation (0-100%) and luminance (0-100%) * array with hue (0-360), saturation (0-100%) and luminance (0-100%)
* @param int $red red 0-255 * @param int $red red 0-255
* @param int $green green 0-255 * @param int $green green 0-255
* @param int $blue blue 0-255 * @param int $blue blue 0-255
* @return array hue/sat/luminance * @return array<float> hue/sat/luminance
*/ */
public static function rgb2hsl(int $red, int $green, int $blue): array public static function rgb2hsl(int $red, int $green, int $blue): array
{ {
@@ -253,7 +257,7 @@ class Colors
* @param int $hue hue: 0-360 (degrees) * @param int $hue hue: 0-360 (degrees)
* @param float $sat saturation: 0-100 * @param float $sat saturation: 0-100
* @param float $lum luminance: 0-100 * @param float $lum luminance: 0-100
* @return array red/blue/green 0-255 each * @return array<int,float|int> red/blue/green 0-255 each
*/ */
public static function hsl2rgb(int $hue, float $sat, float $lum): array public static function hsl2rgb(int $hue, float $sat, float $lum): array
{ {

View File

@@ -39,10 +39,10 @@ class Html
* returns 'checked' or 'selected' if okay * returns 'checked' or 'selected' if okay
* $needle is a var, $haystack an array or a string * $needle is a var, $haystack an array or a string
* **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT NULL IF NOT FOUND **** * **** THE RETURN: VALUE WILL CHANGE TO A DEFAULT NULL IF NOT FOUND ****
* @param array|string $haystack (search in) haystack can be an array or a string * @param array<mixed>|string $haystack (search in) haystack can be an array or a string
* @param string $needle needle (search for) * @param string $needle needle (search for)
* @param int $type type: 0: returns selected, 1, returns checked * @param int $type type: 0: returns selected, 1, returns checked
* @return ?string returns checked or selected, else returns null * @return ?string returns checked or selected, else returns null
*/ */
public static function checked($haystack, $needle, int $type = 0): ?string public static function checked($haystack, $needle, int $type = 0): ?string
{ {

View File

@@ -11,6 +11,7 @@ namespace CoreLibs\Convert;
class MimeAppName class MimeAppName
{ {
/** @var array<string,string> */
private static $mime_apps = []; private static $mime_apps = [];
/** /**

View File

@@ -12,6 +12,9 @@ class Hash
{ {
/** /**
* checks php version and if >=5.2.7 it will flip the string * checks php version and if >=5.2.7 it will flip the string
* can return empty string if none of string sets work
* hash returns false
* preg_replace fails for older php version
* @param string $string string to crc * @param string $string string to crc
* @return string crc32b hash (old type) * @return string crc32b hash (old type)
*/ */
@@ -24,6 +27,9 @@ class Hash
// flip it back to old (two char groups) // flip it back to old (two char groups)
$string = preg_replace("/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/", "$4$3$2$1", $string); $string = preg_replace("/^([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})([a-z0-9]{2})$/", "$4$3$2$1", $string);
} }
if (!is_string($string)) {
$string = '';
}
return $string; return $string;
} }

View File

@@ -11,9 +11,13 @@ namespace CoreLibs\Create;
class RandomKey class RandomKey
{ {
// key generation // key generation
/** @var array<mixed> */
private static $key_range = []; private static $key_range = [];
/** @var int */
private static $one_key_length; private static $one_key_length;
/** @var int */
private static $key_length = 4; // default key length private static $key_length = 4; // default key length
/** @var int */
private static $max_key_length = 256; // max allowed length private static $max_key_length = 256; // max allowed length
/** /**

View File

@@ -38,17 +38,21 @@ namespace CoreLibs\DB\Extended;
class ArrayIO extends \CoreLibs\DB\IO class ArrayIO extends \CoreLibs\DB\IO
{ {
// main calss variables // main calss variables
/** @var array<mixed> */
public $table_array; // the array from the table to work on public $table_array; // the array from the table to work on
/** @var string */
public $table_name; // the table_name public $table_name; // the table_name
/** @var string */
public $pk_name; // the primary key from this table public $pk_name; // the primary key from this table
/** @var int|string|null */
public $pk_id; // the PK id public $pk_id; // the PK id
/** /**
* constructor for the array io class, set the * constructor for the array io class, set the
* primary key name automatically (from array) * primary key name automatically (from array)
* @param array $db_config db connection config * @param array<mixed> $db_config db connection config
* @param array $table_array table array config * @param array<mixed> $table_array table array config
* @param string $table_name table name string * @param string $table_name table name string
*/ */
public function __construct(array $db_config, array $table_array, string $table_name) public function __construct(array $db_config, array $table_array, string $table_name)
{ {
@@ -174,9 +178,9 @@ class ArrayIO extends \CoreLibs\DB\IO
/** /**
* deletes one dataset * deletes one dataset
* @param array $table_array optional override for table array set * @param array<mixed> $table_array optional override for table array set
* set this as new table array too * set this as new table array too
* @return array returns the table array that was deleted * @return array<mixed> returns the table array that was deleted
*/ */
public function dbDelete($table_array = []) public function dbDelete($table_array = [])
{ {
@@ -234,9 +238,9 @@ class ArrayIO extends \CoreLibs\DB\IO
/** /**
* reads one row into the array * reads one row into the array
* @param boolean $edit on true convert data, else as is * @param boolean $edit on true convert data, else as is
* @param array $table_array optional table array, overwrites internal set array * @param array<mixed> $table_array optional table array, overwrites internal set array
* @return array set table array with values * @return array<mixed> set table array with values
*/ */
public function dbRead($edit = false, $table_array = []) public function dbRead($edit = false, $table_array = [])
{ {
@@ -276,7 +280,7 @@ class ArrayIO extends \CoreLibs\DB\IO
// if query was executed okay, else set error // if query was executed okay, else set error
if ($this->dbExec($q)) { if ($this->dbExec($q)) {
if ($res = $this->dbFetchArray()) { if (is_array($res = $this->dbFetchArray())) {
reset($this->table_array); reset($this->table_array);
foreach ($this->table_array as $column => $data_array) { foreach ($this->table_array as $column => $data_array) {
// wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten fr ausgabe // wenn "edit" dann gib daten wie in DB zurück, ansonten aufbereiten fr ausgabe
@@ -309,9 +313,9 @@ class ArrayIO extends \CoreLibs\DB\IO
/** /**
* writes one set into DB or updates one set (if PK exists) * writes one set into DB or updates one set (if PK exists)
* @param boolean $addslashes old convert entities and set set escape * @param boolean $addslashes old convert entities and set set escape
* @param array $table_array optional table array, overwrites internal one * @param array<mixed> $table_array optional table array, overwrites internal one
* @return array table array or null * @return array<mixed> table array or null
*/ */
public function dbWrite($addslashes = false, $table_array = []) public function dbWrite($addslashes = false, $table_array = [])
{ {
@@ -499,11 +503,12 @@ class ArrayIO extends \CoreLibs\DB\IO
if (!$this->table_array[$this->pk_name]['value']) { if (!$this->table_array[$this->pk_name]['value']) {
// max id, falls INSERT // 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 (is_array($res = $this->dbReturnRow($q))) {
if (!isset($res['pk_id'])) { $pk_id = $res['pkd_id'];
$res['pk_id'] = 1; } else {
$pk_id = 1;
} }
$this->table_array[$this->pk_name]['value'] = $res['pk_id']; $this->table_array[$this->pk_name]['value'] = $pk_id;
} }
if (!$insert) { if (!$insert) {
@@ -533,8 +538,13 @@ class ArrayIO extends \CoreLibs\DB\IO
} }
// set primary key // set primary key
if ($insert) { if ($insert) {
$this->table_array[$this->pk_name]['value'] = $this->insert_id; // FIXME: this has to be fixes by fixing DB::IO clas
$this->pk_id = $this->insert_id; $insert_id = $this->dbGetReturning();
if (is_bool($insert_id) || is_array($insert_id)) {
$insert_id = 0;
}
$this->table_array[$this->pk_name]['value'] = $insert_id;
$this->pk_id = $insert_id;
} }
// return the table if needed // return the table if needed
return $this->table_array; return $this->table_array;

View File

@@ -257,66 +257,105 @@ class IO extends \CoreLibs\Basic
// recommend to set private/protected and only allow setting via method // recommend to set private/protected and only allow setting via method
// can bet set from outside // can bet set from outside
// encoding to // encoding to
/** @var string */
public $to_encoding = ''; public $to_encoding = '';
/** @var string */
public $query; // the query string at the moment public $query; // the query string at the moment
// only inside // only inside
// basic vars // basic vars
private $dbh; // the dbh handler /** @var resource|bool|int|null */
public $db_debug; // DB_DEBUG ... (if set prints out debug msgs) private $dbh; // the dbh handler, if disconnected by command is null, bool:false/int:-1 on error,
/** @var int|bool */
public $db_debug; // DB_DEBUG ... (if set prints out debug msgs) [should be bool only]
/** @var string */
private $db_name; // the DB connected to private $db_name; // the DB connected to
/** @var string */
private $db_user; // the username used private $db_user; // the username used
/** @var string */
private $db_pwd; // the password used private $db_pwd; // the password used
/** @var string */
private $db_host; // the hostname private $db_host; // the hostname
/** @var int */
private $db_port; // default db port private $db_port; // default db port
/** @var string */
private $db_schema; // optional DB schema, if not set uses public private $db_schema; // optional DB schema, if not set uses public
/** @var string */
private $db_encoding; // optional auto encoding convert, not used if not set private $db_encoding; // optional auto encoding convert, not used if not set
/** @var string */
private $db_type; // type of db (mysql,postgres,...) private $db_type; // type of db (mysql,postgres,...)
/** @var string */
private $db_ssl; // ssl flag (for postgres only), disable, allow, prefer, require private $db_ssl; // ssl flag (for postgres only), disable, allow, prefer, require
// FOR BELOW: (This should be private and only readable through some method) // FOR BELOW: (This should be private and only readable through some method)
// cursor array for cached readings // cursor array for cached readings
/** @var array<mixed,mixed> */
public $cursor_ext; // hash of hashes public $cursor_ext; // hash of hashes
// per query vars // per query vars
/** @var resource */
public $cursor; // actual cursor (DBH) public $cursor; // actual cursor (DBH)
/** @var int */
public $num_rows; // how many rows have been found public $num_rows; // how many rows have been found
/** @var int */
public $num_fields; // how many fields has the query public $num_fields; // how many fields has the query
/** @var array<mixed> */
public $field_names = []; // array with the field names of the current query public $field_names = []; // array with the field names of the current query
// FIXME: insert_id and insert_id_ext should not be such a mixed mess
/** @var string|int|bool|array<mixed> */
public $insert_id; // last inserted ID public $insert_id; // last inserted ID
/** @var string|int|bool|array<mixed> */
public $insert_id_ext; // extended insert ID (for data outside only primary key) public $insert_id_ext; // extended insert ID (for data outside only primary key)
/** @var array<mixed> */
public $insert_id_arr; // always return as array, even if only one public $insert_id_arr; // always return as array, even if only one
/** @var string */
private $temp_sql; private $temp_sql;
// other vars // other vars
/** @var string */
private $nbsp = ''; // used by print_array recursion function private $nbsp = ''; // used by print_array recursion function
// error & warning id // error & warning id
/** @var int */
protected $error_id; protected $error_id;
/** @var int */
private $had_error = 0; private $had_error = 0;
/** @var int */
private $warning_id; private $warning_id;
/** @var int */
private $had_warning; private $had_warning;
// error thrown on class init if we cannot connect to db // error thrown on class init if we cannot connect to db
/** @var bool */
protected $db_init_error = false; protected $db_init_error = false;
// sub include with the database functions // sub include with the database functions
/** @var \CoreLibs\DB\SQL\PgSQL */
private $db_functions; private $db_functions;
// endless loop protection // endless loop protection
/** @var int */
private $MAX_QUERY_CALL; private $MAX_QUERY_CALL;
/** @var int */
private $DEFAULT_MAX_QUERY_CALL = 20; // default private $DEFAULT_MAX_QUERY_CALL = 20; // default
/** @var array<mixed> */
private $query_called = []; private $query_called = [];
// error string // error string
/** @var array<mixed> */
protected $error_string = []; protected $error_string = [];
// prepared list // prepared list
/** @var array<mixed> */
public $prepare_cursor = []; public $prepare_cursor = [];
// primary key per table list // primary key per table list
// format is 'table' => 'pk_name' // format is 'table' => 'pk_name'
/** @var array<mixed> */
public $pk_name_table = []; public $pk_name_table = [];
// internal primary key name, for cross calls in async // internal primary key name, for cross calls in async
/** @var string */
public $pk_name; public $pk_name;
// if we use RETURNING in the INSERT call // if we use RETURNING in the INSERT call
/** @var bool */
private $returning_id = false; private $returning_id = false;
// if a sync is running holds the md5 key of the query // if a sync is running holds the md5 key of the query
/** @var string */
private $async_running; private $async_running;
/** /**
* main DB concstructor with auto connection to DB and failure set on failed connection * main DB concstructor with auto connection to DB and failure set on failed connection
* @param array $db_config DB configuration array * @param array<mixed> $db_config DB configuration array
*/ */
public function __construct(array $db_config) public function __construct(array $db_config)
{ {
@@ -525,8 +564,8 @@ class IO extends \CoreLibs\Basic
* internal funktion that creates the array * internal funktion that creates the array
* NOTE: * NOTE:
* used in db_dump_data only * used in db_dump_data only
* @param array $array array to print * @param array<mixed> $array array to print
* @return string string with printed and formated array * @return string string with printed and formated array
*/ */
private function __printArray(array $array): string private function __printArray(array $array): string
{ {
@@ -577,14 +616,14 @@ class IO extends \CoreLibs\Basic
* needed to make public so it can be called from DB.Array.IO too * needed to make public so it can be called from DB.Array.IO too
* @param resource|bool $cursor current cursor for pg_result_error, mysql uses dbh, * @param resource|bool $cursor current cursor for pg_result_error, mysql uses dbh,
* pg_last_error too, but pg_result_error is more accurate * pg_last_error too, but pg_result_error is more accurate
* @param string $msg optional message * @param string $msg optional message
* @return void has no return * @return void has no return
*/ */
public function __dbError($cursor = false, string $msg = ''): void public function __dbError($cursor = false, string $msg = ''): void
{ {
$pg_error_string = ''; $pg_error_string = '';
$where_called = (string)\CoreLibs\Debug\Support::getCallerMethod(); $where_called = (string)\CoreLibs\Debug\Support::getCallerMethod();
if ($cursor) { if (is_resource($cursor)) {
$pg_error_string = $this->db_functions->__dbPrintError($cursor); $pg_error_string = $this->db_functions->__dbPrintError($cursor);
} }
if (!$cursor && method_exists($this->db_functions, '__dbPrintError')) { if (!$cursor && method_exists($this->db_functions, '__dbPrintError')) {
@@ -625,11 +664,14 @@ class IO extends \CoreLibs\Basic
/** /**
* if there is the 'to_encoding' var set, and the field is in the wrong encoding converts it to the target * if there is the 'to_encoding' var set, and the field is in the wrong encoding converts it to the target
* @param array|bool|null $row array from fetch_row * @param array<mixed>|bool|null $row array from fetch_row
* @return array|bool|null convert fetch_row array, or false * @return array<mixed>|bool convert fetch_row array, or false
*/ */
private function __dbConvertEncoding($row) private function __dbConvertEncoding($row)
{ {
if ($row === null) {
return false;
}
// only do if array, else pass through row (can be false) // only do if array, else pass through row (can be false)
if ( if (
!is_array($row) || empty($this->to_encoding) || empty($this->db_encoding) !is_array($row) || empty($this->to_encoding) || empty($this->db_encoding)
@@ -640,7 +682,11 @@ class IO extends \CoreLibs\Basic
foreach ($row as $key => $value) { foreach ($row as $key => $value) {
$from_encoding = mb_detect_encoding($value); $from_encoding = mb_detect_encoding($value);
// convert only if encoding doesn't match and source is not pure ASCII // convert only if encoding doesn't match and source is not pure ASCII
if ($from_encoding != $this->to_encoding && $from_encoding != 'ASCII') { if (
$from_encoding !== false &&
$from_encoding != $this->to_encoding &&
$from_encoding != 'ASCII'
) {
$row[$key] = mb_convert_encoding($value, $this->to_encoding, $from_encoding); $row[$key] = mb_convert_encoding($value, $this->to_encoding, $from_encoding);
} }
} }
@@ -649,9 +695,9 @@ class IO extends \CoreLibs\Basic
/** /**
* for debug purpose replaces $1, $2, etc with actual data * for debug purpose replaces $1, $2, etc with actual data
* @param string $stm_name prepared statement name * @param string $stm_name prepared statement name
* @param array $data the data array * @param array<mixed> $data the data array
* @return string string of query with data inside * @return string string of query with data inside
*/ */
private function __dbDebugPrepare(string $stm_name, array $data = []): string private function __dbDebugPrepare(string $stm_name, array $data = []): string
{ {
@@ -667,8 +713,8 @@ class IO extends \CoreLibs\Basic
/** /**
* extracts schema and table from the query, if no schema returns just empty string * extracts schema and table from the query, if no schema returns just empty string
* @param string $query insert/select/update/delete query * @param string $query insert/select/update/delete query
* @return array array with schema and table * @return array<mixed> array with schema and table
*/ */
private function __dbReturnTable(string $query): array private function __dbReturnTable(string $query): array
{ {
@@ -737,7 +783,9 @@ class IO extends \CoreLibs\Basic
} }
if (!preg_match("/ returning /i", $this->query) && $this->pk_name && $this->pk_name != 'NULL') { 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 // check if this query has a ; at the end and remove it
$this->query = preg_replace("/(;\s*)$/", '', $this->query); $__query = preg_replace("/(;\s*)$/", '', $this->query);
// must be query, if preg replace failed, use query as before
$this->query = !is_string($__query) ? $this->query : $query;
$this->query .= " RETURNING " . $this->pk_name; $this->query .= " RETURNING " . $this->pk_name;
$this->returning_id = true; $this->returning_id = true;
} elseif (preg_match("/ returning (.*)/i", $this->query, $matches)) { } elseif (preg_match("/ returning (.*)/i", $this->query, $matches)) {
@@ -794,7 +842,7 @@ class IO extends \CoreLibs\Basic
{ {
// if FALSE returned, set error stuff // if FALSE returned, set error stuff
// if either the cursor is false // if either the cursor is false
if (!$this->cursor || $this->db_functions->__dbLastErrorQuery()) { if (!is_resource($this->cursor) || $this->db_functions->__dbLastErrorQuery()) {
// printout Query if debug is turned on // printout Query if debug is turned on
if ($this->db_debug) { if ($this->db_debug) {
$this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]'); $this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]');
@@ -859,17 +907,24 @@ class IO extends \CoreLibs\Basic
// if only ['foo_id'] and it is the PK then the // if only ['foo_id'] and it is the PK then the
// PK is directly written to the insert_id // PK is directly written to the insert_id
if ( if (
// FIXME: everything should be an array
/** @phpstan-ignore-next-line */
count($this->insert_id[0]) > 1 || count($this->insert_id[0]) > 1 ||
/** @phpstan-ignore-next-line */
!array_key_exists($this->pk_name, $this->insert_id[0]) !array_key_exists($this->pk_name, $this->insert_id[0])
) { ) {
$this->insert_id_ext = $this->insert_id[0]; $this->insert_id_ext = $this->insert_id[0];
/** @phpstan-ignore-next-line */
if (isset($this->insert_id[0][$this->pk_name])) { if (isset($this->insert_id[0][$this->pk_name])) {
$this->insert_id = $this->insert_id[0][$this->pk_name]; $this->insert_id = $this->insert_id[0][$this->pk_name];
} }
} elseif (isset($this->insert_id[0][$this->pk_name])) { } elseif (isset($this->insert_id[0][$this->pk_name])) {
$this->insert_id = $this->insert_id[0][$this->pk_name]; $this->insert_id = $this->insert_id[0][$this->pk_name];
} }
} elseif (count($this->insert_id) == 0) { } elseif (
!is_array($this->insert_id) ||
count($this->insert_id) == 0
) {
// if we have non -> error // if we have non -> error
// failed to get insert id // failed to get insert id
$this->insert_id = ''; $this->insert_id = '';
@@ -922,7 +977,7 @@ class IO extends \CoreLibs\Basic
* with the optional parameter fix sets debug * with the optional parameter fix sets debug
* returns current set stats * returns current set stats
* @param bool|null $debug Flag to turn debug on off * @param bool|null $debug Flag to turn debug on off
* @return bool True for debug is on, False for off * @return bool True for debug is on, False for off
*/ */
public function dbToggleDebug(?bool $debug = null) public function dbToggleDebug(?bool $debug = null)
{ {
@@ -1045,7 +1100,7 @@ class IO extends \CoreLibs\Basic
return false; return false;
} }
$q = "SET search_path TO '" . $this->dbEscapeString($db_schema) . "'"; $q = "SET search_path TO '" . $this->dbEscapeString($db_schema) . "'";
return $this->dbExec($q); return $this->dbExec($q) ? true : false;
} }
/** /**
@@ -1059,7 +1114,8 @@ class IO extends \CoreLibs\Basic
/** /**
* sets the client encoding in the postgres database * sets the client encoding in the postgres database
* @param string $db_encoding valid encoding name, so the the data gets converted to this encoding * @param string $db_encoding valid encoding name,
* so the the data gets converted to this encoding
* @return bool false, or true of db exec encoding set * @return bool false, or true of db exec encoding set
*/ */
public function dbSetEncoding(string $db_encoding = ''): bool public function dbSetEncoding(string $db_encoding = ''): bool
@@ -1071,7 +1127,7 @@ class IO extends \CoreLibs\Basic
return false; return false;
} }
$q = "SET client_encoding TO '" . $this->dbEscapeString($db_encoding) . "'"; $q = "SET client_encoding TO '" . $this->dbEscapeString($db_encoding) . "'";
return $this->dbExec($q); return $this->dbExec($q) ? true : false;
} }
/** /**
@@ -1080,7 +1136,11 @@ class IO extends \CoreLibs\Basic
*/ */
public function dbGetEncoding(): string public function dbGetEncoding(): string
{ {
return $this->dbReturnRow('SHOW client_encoding')['client_encoding']; $client_encoding = $this->dbReturnRow('SHOW client_encoding');
if (!is_array($client_encoding)) {
return '';
}
return $client_encoding['client_encoding'] ?? '';
} }
/** /**
@@ -1159,7 +1219,7 @@ class IO extends \CoreLibs\Basic
{ {
// set start array // set start array
if ($query) { if ($query) {
$array = $this->cursor_ext[md5($query)]; $array = $this->cursor_ext[md5($query)] ?? [];
} else { } else {
$array = $this->cursor_ext; $array = $this->cursor_ext;
} }
@@ -1185,15 +1245,15 @@ class IO extends \CoreLibs\Basic
* (wheres 1 reads cache AND destroys at end of read) * (wheres 1 reads cache AND destroys at end of read)
* - if set to 3, after EACH row, the data will be reset, * - if set to 3, after EACH row, the data will be reset,
* no caching is done except for basic (count, etc) * no caching is done except for basic (count, etc)
* @param string $query Query string * @param string $query Query string
* @param int $reset reset status: * @param int $reset reset status:
* 1: read cache, clean at the end * 1: read cache, clean at the end
* 2: read new, clean at end * 2: read new, clean at end
* 3: never cache * 3: never cache
* @param bool $assoc_only true to only returned the named and not * @param bool $assoc_only true to only returned the named and not
* index position ones * index position ones
* @return array|bool return array data or false on error/end * @return array<mixed>|bool return array data or false on error/end
* @suppress PhanTypeMismatchDimFetch * @#suppress PhanTypeMismatchDimFetch
*/ */
public function dbReturn(string $query, int $reset = 0, bool $assoc_only = false) public function dbReturn(string $query, int $reset = 0, bool $assoc_only = false)
{ {
@@ -1213,7 +1273,8 @@ class IO extends \CoreLibs\Basic
'firstcall' => 0, 'firstcall' => 0,
'num_rows' => 0, 'num_rows' => 0,
'num_fields' => 0, 'num_fields' => 0,
'read_rows' => 0 'read_rows' => 0,
'data' => []
]; ];
} }
// set the query // set the query
@@ -1324,25 +1385,33 @@ class IO extends \CoreLibs\Basic
// unset return value ... // unset return value ...
$return = []; $return = [];
for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) { for ($i = 0; $i < $this->cursor_ext[$md5]['num_fields']; $i++) {
// FIXME: find out why phan throws all those array errors
// create mixed return array // create mixed return array
if ( if (
$assoc_only === false && $assoc_only === false &&
isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i]) isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])
) { ) {
/** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
$return[$i] = $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 // named part
if (isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) { if (!empty($this->cursor_ext[$md5]['field_names'][$i])) {
$return[$this->cursor_ext[$md5]['field_names'][$i]] = if (isset($this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]['pos']][$i])) {
$this->cursor_ext[$md5]['data'] /** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
[$this->cursor_ext[$md5]['pos']][$i]; $return[$this->cursor_ext[$md5]['field_names'][$i]] =
} else { /** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
// throws PhanTypeMismatchDimFetch error, but in this $this->cursor_ext[$md5]['data']
// case we know we will access only named array parts [$this->cursor_ext[$md5]['pos']][$i];
// @suppress PhanTypeMismatchDimFetch } else {
$return[$this->cursor_ext[$md5]['field_names'][$i]] = // throws PhanTypeMismatchDimFetch error, but in this
$this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5] // case we know we will access only named array parts
['pos']][$this->cursor_ext[$md5]['field_names'][$i]]; /** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
$return[$this->cursor_ext[$md5]['field_names'][$i]] =
/** @phan-suppress-next-line PhanTypeMismatchDimFetch,PhanTypeArraySuspiciousNullable */
$this->cursor_ext[$md5]['data'][$this->cursor_ext[$md5]
/** @phan-suppress-next-line PhanTypeArraySuspiciousNullable */
['pos']][$this->cursor_ext[$md5]['field_names'][$i]];
}
} }
} }
$this->cursor_ext[$md5]['pos'] ++; $this->cursor_ext[$md5]['pos'] ++;
@@ -1404,8 +1473,10 @@ class IO extends \CoreLibs\Basic
* additional read from the database for the PK NAME * additional read from the database for the PK NAME
* @param string $query the query, if not given, the query class var will be used * @param string $query the query, if not given, the query class var will be used
* (if this was not set, method will quit with a 0 (failure) * (if this was not set, method will quit with a 0 (failure)
* @param string $pk_name optional primary key name, for insert id return if the pk name is very different * @param string $pk_name optional primary key name, for insert id
* if pk name is table name and _id, pk_name is not needed to be set * return if the pk name is very different
* if pk name is table name and _id, pk_name
* is not needed to be set
* if NULL is given here, no RETURNING will be auto added * if NULL is given here, no RETURNING will be auto added
* @return resource|false cursor for this query or false on error * @return resource|false cursor for this query or false on error
*/ */
@@ -1417,7 +1488,11 @@ class IO extends \CoreLibs\Basic
return false; return false;
} }
// ** actual db exec call // ** actual db exec call
$this->cursor = $this->db_functions->__dbQuery($this->query); $cursor = $this->db_functions->__dbQuery($this->query);
if (!is_resource($cursor)) {
return false;
}
$this->cursor = $cursor;
// if FALSE returned, set error stuff // if FALSE returned, set error stuff
// run the post exec processing // run the post exec processing
if (!$this->__dbPostExec()) { if (!$this->__dbPostExec()) {
@@ -1429,11 +1504,13 @@ class IO extends \CoreLibs\Basic
/** /**
* executres the query async so other methods can be run during this * executres the query async so other methods can be run during this
* for INSERT INTO queries it is highly recommended to set the pk_name to avoid an additional * for INSERT INTO queries it is highly recommended to set the pk_name
* to avoid an additional
* read from the database for the PK NAME * read from the database for the PK NAME
* NEEDS : dbCheckAsync * NEEDS : dbCheckAsync
* @param string $query query to run * @param string $query query to run
* @param string $pk_name optional primary key name, only used with insert for returning call * @param string $pk_name optional primary key name, only used with
* insert for returning call
* @return bool true if async query was sent ok, false if error happened * @return bool true if async query was sent ok, false if error happened
*/ */
public function dbExecAsync(string $query, string $pk_name = ''): bool public function dbExecAsync(string $query, string $pk_name = ''): bool
@@ -1450,7 +1527,7 @@ class IO extends \CoreLibs\Basic
$this->__dbError(); $this->__dbError();
return false; return false;
} else { } else {
$this->async_running = $md5; $this->async_running = (string)$md5;
// all ok, we return true (as would be from the original send query function) // all ok, we return true (as would be from the original send query function)
return true; return true;
} }
@@ -1469,8 +1546,12 @@ class IO extends \CoreLibs\Basic
if ($this->db_functions->__dbConnectionBusy()) { if ($this->db_functions->__dbConnectionBusy()) {
return true; return true;
} else { } else {
$cursor = $this->db_functions->__dbGetResult();
if (!is_resource($cursor)) {
return false;
}
// get the result/or error // get the result/or error
$this->cursor = $this->db_functions->__dbGetResult(); $this->cursor = $cursor;
$this->async_running = ''; $this->async_running = '';
// run the post exec processing // run the post exec processing
if (!$this->__dbPostExec()) { if (!$this->__dbPostExec()) {
@@ -1494,18 +1575,20 @@ class IO extends \CoreLibs\Basic
/** /**
* executes a cursor and returns the data, if no more data 0 will be returned * executes a cursor and returns the data, if no more data 0 will be returned
* @param resource|false $cursor the cursor from db_exec or pg_query/pg_exec/mysql_query * @param resource|false $cursor the cursor from db_exec or
* if not set will use internal cursor, if not found, stops with 0 (error) * pg_query/pg_exec/mysql_query
* @param bool $assoc_only false is default, if true only assoc rows * if not set will use internal cursor,
* @return array|bool row array or false on error * if not found, stops with 0 (error)
* @param bool $assoc_only false is default, if true only assoc rows
* @return array<mixed>|bool row array or false on error
*/ */
public function dbFetchArray($cursor = false, bool $assoc_only = false) public function dbFetchArray($cursor = false, bool $assoc_only = false)
{ {
// return false if no query or cursor set ... // return false if no query or cursor set ...
if (!$cursor) { if (!is_resource($cursor)) {
$cursor = $this->cursor; $cursor = $this->cursor;
} }
if (!$cursor) { if (!is_resource($cursor)) {
$this->error_id = 12; $this->error_id = 12;
$this->__dbError(); $this->__dbError();
return false; return false;
@@ -1522,7 +1605,7 @@ class IO extends \CoreLibs\Basic
* returns the FIRST row of the given query * returns the FIRST row of the given query
* @param string $query the query to be executed * @param string $query the query to be executed
* @param bool $assoc_only if true, only return assoc entry, else both (pgsql) * @param bool $assoc_only if true, only return assoc entry, else both (pgsql)
* @return array|bool row array or false on error * @return array<mixed>|bool row array or false on error
*/ */
public function dbReturnRow(string $query, bool $assoc_only = false) public function dbReturnRow(string $query, bool $assoc_only = false)
{ {
@@ -1546,7 +1629,7 @@ class IO extends \CoreLibs\Basic
* createds an array of hashes of the query (all data) * createds an array of hashes of the query (all data)
* @param string $query the query to be executed * @param string $query the query to be executed
* @param bool $assoc_only if true, only name ref are returned * @param bool $assoc_only if true, only name ref are returned
* @return array|bool array of hashes (row -> fields), false on error * @return array<mixed>|bool array of hashes (row -> fields), false on error
*/ */
public function dbReturnArray(string $query, bool $assoc_only = false) public function dbReturnArray(string $query, bool $assoc_only = false)
{ {
@@ -1563,10 +1646,10 @@ class IO extends \CoreLibs\Basic
} }
$cursor = $this->dbExec($query); $cursor = $this->dbExec($query);
$rows = []; $rows = [];
while ($res = $this->dbFetchArray($cursor, $assoc_only)) { while (is_array($res = $this->dbFetchArray($cursor, $assoc_only))) {
$data = []; $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]]; $data[$this->field_names[$i]] = $res[$this->field_names[$i]] ?? null;
} }
$rows[] = $data; $rows[] = $data;
} }
@@ -1609,7 +1692,7 @@ class IO extends \CoreLibs\Basic
* returns an array of the table with columns and values. FALSE on no table found * returns an array of the table with columns and values. FALSE on no table found
* @param string $table table name * @param string $table table name
* @param string $schema optional schema name * @param string $schema optional schema name
* @return array|bool array of table data, false on error (table not found) * @return array<mixed>|bool array of table data, false on error (table not found)
*/ */
public function dbShowTableMetaData(string $table, string $schema = '') public function dbShowTableMetaData(string $table, string $schema = '')
{ {
@@ -1721,9 +1804,9 @@ class IO extends \CoreLibs\Basic
/** /**
* runs a prepare query * runs a prepare query
* @param string $stm_name statement name for the query to run * @param string $stm_name statement name for the query to run
* @param array $data data to run for this query, empty array for none * @param array<mixed> $data data to run for this query, empty array for none
* @return ?mixed false on error, or result on OK * @return ?mixed false on error, or result on OK
*/ */
public function dbExecute(string $stm_name, array $data = []) public function dbExecute(string $stm_name, array $data = [])
{ {
@@ -1764,7 +1847,7 @@ class IO extends \CoreLibs\Basic
$this->__dbDebug('db', $this->__dbDebugPrepare($stm_name, $data), 'dbExecPrep', 'Q'); $this->__dbDebug('db', $this->__dbDebugPrepare($stm_name, $data), 'dbExecPrep', 'Q');
} }
$result = $this->db_functions->__dbExecute($stm_name, $data); $result = $this->db_functions->__dbExecute($stm_name, $data);
if (!$result) { if (!is_resource($result)) {
$this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|' $this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|'
. $this->prepare_cursor[$stm_name]['result'] . ']: ' . $this->prepare_cursor[$stm_name]['result'] . ']: '
. $this->log->prAr($data)); . $this->log->prAr($data));
@@ -1816,10 +1899,14 @@ class IO extends \CoreLibs\Basic
// if only ['foo_id'] and it is the PK then the PK is directly // if only ['foo_id'] and it is the PK then the PK is directly
// written to the insert_id // written to the insert_id
if ( if (
// FIXME: all return insert_id should be array only
/** @phpstan-ignore-next-line */
count($this->insert_id[0]) > 1 || count($this->insert_id[0]) > 1 ||
/** @phpstan-ignore-next-line */
!array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0]) !array_key_exists($this->prepare_cursor[$stm_name]['pk_name'], $this->insert_id[0])
) { ) {
$this->insert_id_ext = $this->insert_id[0]; $this->insert_id_ext = $this->insert_id[0];
/** @phpstan-ignore-next-line */
$this->insert_id = $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]; $this->insert_id = $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']];
} elseif ($this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]) { } elseif ($this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]) {
$this->insert_id = $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']]; $this->insert_id = $this->insert_id[0][$this->prepare_cursor[$stm_name]['pk_name']];
@@ -1996,12 +2083,12 @@ class IO extends \CoreLibs\Basic
/** /**
* writes into one table based on array of table columns * writes into one table based on array of table columns
* @param array $write_array list of elements to write * @param array<mixed> $write_array list of elements to write
* @param array $not_write_array list of elements not to write * @param array<mixed> $not_write_array list of elements not to write
* @param int $primary_key id key to decide if we write insert or update * @param int $primary_key id key to decide if we write insert or update
* @param string $table name for the target table * @param string $table name for the target table
* @param array $data data array to override _POST data * @param array<mixed> $data data array to override _POST data
* @return int|bool primary key * @return int|bool primary key
*/ */
public function dbWriteData( public function dbWriteData(
array $write_array, array $write_array,
@@ -2032,13 +2119,15 @@ class IO extends \CoreLibs\Basic
* PARAM INFO: $primary key * PARAM INFO: $primary key
* this can be a plain string/int and will be internal transformed into the array form * this can be a plain string/int and will be internal transformed into the array form
* or it takes the array form of array [row => column, value => pk value] * or it takes the array form of array [row => column, value => pk value]
* @param array $write_array list of elements to write * @param array<mixed> $write_array list of elements to write
* @param int|string|array $primary_key primary key string or array set * @param int|string|array<mixed> $primary_key primary key string or array set
* @param string $table name for the target table * @param string $table name for the target table
* @param array $not_write_array list of elements not to write (optional) * @param array<mixed> $not_write_array list of elements not to write (optional)
* @param array $not_write_update_array list of elements not to write during update (optional) * @param array<mixed> $not_write_update_array list of elements not
* @param array $data optional array with data, if not _POST vars are used * to write during update (optional)
* @return int|bool primary key * @param array<mixed> $data optional array with data
* if not _POST vars are used
* @return int|bool primary key
*/ */
public function dbWriteDataExt( public function dbWriteDataExt(
array $write_array, array $write_array,
@@ -2066,6 +2155,9 @@ class IO extends \CoreLibs\Basic
$q_sub_data = ''; $q_sub_data = '';
// get the table layout and row types // 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);
if (!is_array($table_data)) {
return false;
}
// @phan HACK // @phan HACK
$primary_key['value'] = $primary_key['value'] ?? ''; $primary_key['value'] = $primary_key['value'] ?? '';
$primary_key['row'] = $primary_key['row'] ?? ''; $primary_key['row'] = $primary_key['row'] ?? '';
@@ -2186,21 +2278,22 @@ class IO extends \CoreLibs\Basic
$milliseconds = $matches[6]; $milliseconds = $matches[6];
return $prefix return $prefix
. ($hour ? $hour . 'h ' : '') . (!empty($hour) && is_string($hour) ? $hour . 'h ' : '')
. ($minutes ? $minutes . 'm ' : '') . (!empty($minutes) && is_string($minutes) ? $minutes . 'm ' : '')
. ($seconds ? $seconds . 's' : '') . (!empty($seconds) && is_string($seconds) ? $seconds . 's' : '')
. ($show_micro && $milliseconds ? ' ' . $milliseconds . 'ms' : ''); . ($show_micro && !empty($milliseconds) ? ' ' . $milliseconds . 'ms' : '');
} }
/** /**
* this is only needed for Postgresql. Converts postgresql arrays to PHP * this is only needed for Postgresql. Converts postgresql arrays to PHP
* @param string $text input text to parse to an array * @param string $text input text to parse to an array
* @return array PHP array of the parsed data * @return array<mixed> PHP array of the parsed data
*/ */
public function dbArrayParse(string $text): array public function dbArrayParse(string $text): array
{ {
$output = []; $output = [];
return $this->db_functions->__dbArrayParse($text, $output); $__db_array_parse = $this->db_functions->__dbArrayParse($text, $output);
return is_array($__db_array_parse) ? $__db_array_parse : [];
} }
/** /**
@@ -2228,7 +2321,7 @@ class IO extends \CoreLibs\Basic
$value = $value === '' ? 0 : intval($value); $value = $value === '' ? 0 : intval($value);
break; break;
} }
return $value; return (string)$value;
} }
// *************************** // ***************************
@@ -2237,42 +2330,48 @@ class IO extends \CoreLibs\Basic
/** /**
* return current set insert_id as is * return current set insert_id as is
* @return array|string|int|null Primary key value, most likely int * @return array<mixed>|string|int|bool|null Primary key value, most likely int
* Array for multiple return set * Array for multiple return set
* Empty string for unset * Empty string for unset
* Null for error * Null for error
*/ */
public function dbGetReturning() public function dbGetReturning()
{ {
// FIXME: this should be only an array
return $this->insert_id; return $this->insert_id;
} }
/** /**
* alternative name, returns insert_id * alternative name, returns insert_id
* @return array|string|int|null Primary key value, most likely int * @return array<mixed>|string|int|bool|null Primary key value, most likely int
* Array for multiple return set * Array for multiple return set
* Empty string for unset * Empty string for unset
* Null for error * Null for error
*/ */
public function dbGetInsertPK() public function dbGetInsertPK()
{ {
// FIXME: this should be only an array
return $this->dbGetReturning(); return $this->dbGetReturning();
} }
/** /**
* return the extended insert return string set * return the extended insert return string set
* Most likely Array * Most likely Array
* @param string|null $key Optional key for insert_id_ext array * @param string|null $key Optional key for insert_id_ext array
* if found will return only this element, * if found will return only this element,
* else will return null * else will return null
* @return array|string|null RETURNING values as array * @return array<mixed>|string|int|bool|null RETURNING values as array
* Empty string for unset * Empty string for unset
* Null for error * Null for error
*/ */
public function dbGetReturningExt($key = null) public function dbGetReturningExt($key = null)
{ {
// FIXME: this has to be better as in return
if ($key !== null) { if ($key !== null) {
if (isset($this->insert_id_ext[$key])) { if (
is_array($this->insert_id_ext) &&
isset($this->insert_id_ext[$key])
) {
return $this->insert_id_ext[$key]; return $this->insert_id_ext[$key];
} else { } else {
return null; return null;
@@ -2283,7 +2382,7 @@ class IO extends \CoreLibs\Basic
/** /**
* Always returns the returning block as an array * Always returns the returning block as an array
* @return array All returning data as array. even if one row only * @return array<mixed> All returning data as array. even if one row only
*/ */
public function dbGetReturningArray(): array public function dbGetReturningArray(): array
{ {
@@ -2292,17 +2391,20 @@ class IO extends \CoreLibs\Basic
/** /**
* returns the full array for cursor ext * returns the full array for cursor ext
* @param string|null $q Query string, if not null convert to md5 * @param string|null $q Query string, if not null convert to md5
* and return set cursor ext for only this * and return set cursor ext for only this
* if not found or null return null * if not found or null return null
* @return array|null Cursor Extended array * @return array<mixed>|null Cursor Extended array
* Key is md5 string from query run * Key is md5 string from query run
*/ */
public function dbGetCursorExt($q = null) public function dbGetCursorExt($q = null)
{ {
if ($q !== null) { if ($q !== null) {
$q_md5 = md5($q); $q_md5 = md5($q);
if (isset($this->cursor_ext[$q_md5])) { if (
is_array($this->cursor_ext) &&
isset($this->cursor_ext[$q_md5])
) {
return $this->cursor_ext[$q_md5]; return $this->cursor_ext[$q_md5];
} else { } else {
return null; return null;
@@ -2326,8 +2428,8 @@ class IO extends \CoreLibs\Basic
/** /**
* old call for getInserReturnExt * old call for getInserReturnExt
* @param string|null $key See above * @param string|null $key See above
* @return array|string|null See above * @return array<mixed>|string|int|bool|null See above
* @deprecated use getReturningExt($key = null) instead * @deprecated use getReturningExt($key = null) instead
*/ */
public function getInsertReturn($key = null) public function getInsertReturn($key = null)
@@ -2338,7 +2440,7 @@ class IO extends \CoreLibs\Basic
/** /**
* DEPRECATED: getReturning * DEPRECATED: getReturning
* @return array|string|int|null [DEPRECATED] * @return array<mixed>|string|int|bool|null [DEPRECATED]
* @deprecated use dbGetReturning() instead * @deprecated use dbGetReturning() instead
*/ */
public function getReturning() public function getReturning()
@@ -2349,7 +2451,7 @@ class IO extends \CoreLibs\Basic
/** /**
* DEPRECATED: getInsertPK * DEPRECATED: getInsertPK
* @return array|string|int|null [DEPRECATED] * @return array<mixed>|string|int|bool|null [DEPRECATED]
* @deprecated use dbGetInsertPK() instead * @deprecated use dbGetInsertPK() instead
*/ */
public function getInsertPK() public function getInsertPK()
@@ -2361,7 +2463,7 @@ class IO extends \CoreLibs\Basic
/** /**
* DEPRECATED: getReturningExt * DEPRECATED: getReturningExt
* @param string|null $key [DEPRECATED] * @param string|null $key [DEPRECATED]
* @return array|string|null [DEPRECATED] * @return array<mixed>|string|bool|int|null [DEPRECATED]
* @deprecated use dbGetReturningExt($key = null) instead * @deprecated use dbGetReturningExt($key = null) instead
*/ */
public function getReturningExt($key = null) public function getReturningExt($key = null)
@@ -2373,7 +2475,7 @@ class IO extends \CoreLibs\Basic
/** /**
* DEPRECATED: getCursorExt * DEPRECATED: getCursorExt
* @param string|null $q [DEPRECATED] * @param string|null $q [DEPRECATED]
* @return array|null [DEPRECATED] * @return array<mixed>|null [DEPRECATED]
* @deprecated use dbGetCursorExt($q = null) instead * @deprecated use dbGetCursorExt($q = null) instead
*/ */
public function getCursorExt($q = null) public function getCursorExt($q = null)

View File

@@ -50,7 +50,9 @@ namespace CoreLibs\DB\SQL;
class PgSQL class PgSQL
{ {
/** @var string */
private $last_error_query; private $last_error_query;
/** @var resource|bool */
private $dbh; private $dbh;
/** /**
@@ -81,6 +83,9 @@ class PgSQL
public function __dbQuery(string $query) public function __dbQuery(string $query)
{ {
$this->last_error_query = ''; $this->last_error_query = '';
if (!is_resource($this->dbh)) {
return false;
}
// read out the query status and save the query if needed // read out the query status and save the query if needed
$result = pg_query($this->dbh, $query); $result = pg_query($this->dbh, $query);
if (!$result) { if (!$result) {
@@ -96,7 +101,11 @@ class PgSQL
*/ */
public function __dbSendQuery(string $query): bool public function __dbSendQuery(string $query): bool
{ {
return pg_send_query($this->dbh, $query); if (!is_resource($this->dbh)) {
return false;
}
$result = pg_send_query($this->dbh, $query);
return $result ? true : false;
} }
/** /**
@@ -106,7 +115,13 @@ class PgSQL
public function __dbGetResult() public function __dbGetResult()
{ {
$this->last_error_query = ''; $this->last_error_query = '';
if (!is_resource($this->dbh)) {
return false;
}
$result = pg_get_result($this->dbh); $result = pg_get_result($this->dbh);
if (!is_resource($result)) {
return false;
}
if ($error = pg_result_error($result)) { if ($error = pg_result_error($result)) {
$this->last_error_query = $error; $this->last_error_query = $error;
} }
@@ -119,10 +134,11 @@ class PgSQL
*/ */
public function __dbClose(): void public function __dbClose(): void
{ {
if (is_resource($this->dbh)) { if (!is_resource($this->dbh)) {
if (pg_connection_status($this->dbh) === PGSQL_CONNECTION_OK) { return;
pg_close($this->dbh); }
} if (pg_connection_status($this->dbh) === PGSQL_CONNECTION_OK) {
pg_close($this->dbh);
} }
} }
@@ -134,6 +150,9 @@ class PgSQL
*/ */
public function __dbPrepare(string $name, string $query) public function __dbPrepare(string $name, string $query)
{ {
if (!is_resource($this->dbh)) {
return false;
}
$result = pg_prepare($this->dbh, $name, $query); $result = pg_prepare($this->dbh, $name, $query);
if (!$result) { if (!$result) {
$this->last_error_query = $query; $this->last_error_query = $query;
@@ -144,11 +163,14 @@ class PgSQL
/** /**
* wrapper for pg_execute for running a prepared statement * wrapper for pg_execute for running a prepared statement
* @param string $name statement name * @param string $name statement name
* @param array $data data array * @param array<mixed> $data data array
* @return resource|bool returns status or false for error * @return resource|bool returns status or false for error
*/ */
public function __dbExecute(string $name, array $data) public function __dbExecute(string $name, array $data)
{ {
if (!is_resource($this->dbh)) {
return false;
}
$result = pg_execute($this->dbh, $name, $data); $result = pg_execute($this->dbh, $name, $data);
if (!$result) { if (!$result) {
$this->last_error_query = $name; $this->last_error_query = $name;
@@ -192,7 +214,7 @@ class PgSQL
* if through/true false, use __dbResultType(true) * if through/true false, use __dbResultType(true)
* @param resource $cursor cursor resource * @param resource $cursor cursor resource
* @param int $result_type result type as int number * @param int $result_type result type as int number
* @return array|bool array result data or false on end/error * @return array<mixed>|bool array result data or false on end/error
*/ */
public function __dbFetchArray($cursor, int $result_type = PGSQL_BOTH) public function __dbFetchArray($cursor, int $result_type = PGSQL_BOTH)
{ {
@@ -217,7 +239,7 @@ class PgSQL
/** /**
* wrapper for pg_fetch_all * wrapper for pg_fetch_all
* @param resource $cursor cursor resource * @param resource $cursor cursor resource
* @return array|bool data array or false for end/error * @return array<mixed>|bool data array or false for end/error
*/ */
public function __dbFetchAll($cursor) public function __dbFetchAll($cursor)
{ {
@@ -269,7 +291,11 @@ class PgSQL
$q = "SELECT CURRVAL('$seq') AS insert_id"; $q = "SELECT CURRVAL('$seq') AS insert_id";
// I have to do manually or I overwrite the original insert internal vars ... // I have to do manually or I overwrite the original insert internal vars ...
if ($q = $this->__dbQuery($q)) { if ($q = $this->__dbQuery($q)) {
list($id) = $this->__dbFetchArray($q); // abort if this is not an resource
if (!is_resource($q)) {
return false;
}
list($id) = $this->__dbFetchArray($q) ?: [];
} else { } else {
$id = [-1, $q]; $id = [-1, $q];
} }
@@ -294,7 +320,14 @@ class PgSQL
if ($schema) { if ($schema) {
$q = "SHOW search_path"; $q = "SHOW search_path";
$cursor = $this->__dbQuery($q); $cursor = $this->__dbQuery($q);
$search_path = $this->__dbFetchArray($cursor)['search_path']; if (!is_resource($cursor)) {
return false;
}
$__db_fetch_array = $this->__dbFetchArray($cursor);
if (!is_array($__db_fetch_array)) {
return false;
}
$search_path = $__db_fetch_array['search_path'] ?? '';
if ($search_path != $schema) { if ($search_path != $schema) {
$table_prefix = $schema . '.'; $table_prefix = $schema . '.';
} }
@@ -319,8 +352,12 @@ class PgSQL
. "pg_attribute.attnum = any(pg_index.indkey) " . "pg_attribute.attnum = any(pg_index.indkey) "
. "AND indisprimary"; . "AND indisprimary";
$cursor = $this->__dbQuery($q); $cursor = $this->__dbQuery($q);
if ($cursor) { if (is_resource($cursor)) {
return $this->__dbFetchArray($cursor)['column_name'] ?? false; $__db_fetch_array = $this->__dbFetchArray($cursor);
if (!is_array($__db_fetch_array)) {
return false;
}
return $__db_fetch_array['column_name'] ?? false;
} else { } else {
return false; return false;
} }
@@ -331,13 +368,13 @@ class PgSQL
/** /**
* wrapper for pg_connect, writes out failure to screen if error occurs (hidden var) * wrapper for pg_connect, writes out failure to screen if error occurs (hidden var)
* @param string $db_host host name * @param string $db_host host name
* @param string $db_user user name * @param string $db_user user name
* @param string $db_pass password * @param string $db_pass password
* @param string $db_name databse name * @param string $db_name databse name
* @param integer $db_port port (int, 5432 is default) * @param integer $db_port port (int, 5432 is default)
* @param string $db_ssl SSL (allow is default) * @param string $db_ssl SSL (allow is default)
* @return ?resource db handler resource or null on error * @return resource|bool db handler resource or false on error
*/ */
public function __dbConnect( public function __dbConnect(
string $db_host, string $db_host,
@@ -353,9 +390,9 @@ class PgSQL
} }
$this->dbh = pg_connect("host=" . $db_host . " port=" . $db_port . " user=" $this->dbh = pg_connect("host=" . $db_host . " port=" . $db_port . " user="
. $db_user . " password=" . $db_pass . " dbname=" . $db_name . " sslmode=" . $db_ssl); . $db_user . " password=" . $db_pass . " dbname=" . $db_name . " sslmode=" . $db_ssl);
if (!$this->dbh) { // if (!$this->dbh) {
die("<!-- Can't connect to database //-->"); // die("<!-- Can't connect to database //-->");
} // }
return $this->dbh; return $this->dbh;
} }
@@ -367,6 +404,9 @@ class PgSQL
*/ */
public function __dbPrintError($cursor = null): string public function __dbPrintError($cursor = null): string
{ {
if (!is_resource($this->dbh)) {
return '';
}
// run the query again for the error result here // run the query again for the error result here
if (!$cursor && $this->last_error_query) { if (!$cursor && $this->last_error_query) {
pg_send_query($this->dbh, $this->last_error_query); pg_send_query($this->dbh, $this->last_error_query);
@@ -382,12 +422,15 @@ class PgSQL
/** /**
* wrapper for pg_meta_data * wrapper for pg_meta_data
* @param string $table table name * @param string $table table name
* @param bool $extended show extended info (default false) * @param bool $extended show extended info (default false)
* @return array|bool array data for the table info or false on error * @return array<mixed>|bool array data for the table info or false on error
*/ */
public function __dbMetaData(string $table, $extended = false) public function __dbMetaData(string $table, $extended = false)
{ {
if (!is_resource($this->dbh)) {
return false;
}
// needs to prefixed with @ or it throws a warning on not existing table // needs to prefixed with @ or it throws a warning on not existing table
return @pg_meta_data($this->dbh, $table, $extended); return @pg_meta_data($this->dbh, $table, $extended);
} }
@@ -399,6 +442,9 @@ class PgSQL
*/ */
public function __dbEscapeString($string): string public function __dbEscapeString($string): string
{ {
if (!is_resource($this->dbh)) {
return '';
}
return pg_escape_string($this->dbh, (string)$string); return pg_escape_string($this->dbh, (string)$string);
} }
@@ -411,6 +457,9 @@ class PgSQL
*/ */
public function __dbEscapeLiteral($string): string public function __dbEscapeLiteral($string): string
{ {
if (!is_resource($this->dbh)) {
return '';
}
return pg_escape_string($this->dbh, (string)$string); return pg_escape_string($this->dbh, (string)$string);
} }
@@ -421,6 +470,9 @@ class PgSQL
*/ */
public function __dbEscapeBytea($bytea): string public function __dbEscapeBytea($bytea): string
{ {
if (!is_resource($this->dbh)) {
return '';
}
return pg_escape_bytea($this->dbh, $bytea); return pg_escape_bytea($this->dbh, $bytea);
} }
@@ -430,6 +482,9 @@ class PgSQL
*/ */
public function __dbConnectionBusy(): bool public function __dbConnectionBusy(): bool
{ {
if (!is_resource($this->dbh)) {
return false;
}
return pg_connection_busy($this->dbh); return pg_connection_busy($this->dbh);
} }
@@ -441,6 +496,9 @@ class PgSQL
*/ */
public function __dbVersion(): string public function __dbVersion(): string
{ {
if (!is_resource($this->dbh)) {
return '';
}
// array has client, protocol, server // array has client, protocol, server
// we just need the server // we just need the server
$v = pg_version($this->dbh); $v = pg_version($this->dbh);
@@ -449,11 +507,12 @@ class PgSQL
/** /**
* postgresql array to php array * postgresql array to php array
* @param string $text array text from PostgreSQL * @param string $text array text from PostgreSQL
* @param array $output (internal) recursive pass on for nested arrays * @param array<mixed> $output (internal) recursive pass on for nested arrays
* @param bool|int $limit (internal) max limit to not overshoot the end, start with false * @param bool|int $limit (internal) max limit to not overshoot
* @param integer $offset (internal) shift offset for {} * the end, start with false
* @return array|int converted PHP array, interal recusrive int position * @param integer $offset (internal) shift offset for {}
* @return array<mixed>|int converted PHP array, interal recusrive int position
*/ */
public function __dbArrayParse($text, &$output, $limit = false, $offset = 1) public function __dbArrayParse($text, &$output, $limit = false, $offset = 1)
{ {

View File

@@ -27,38 +27,65 @@ namespace CoreLibs\Debug;
class Logging class Logging
{ {
// page and host name // page and host name
/** @var string */
private $page_name; private $page_name;
/** @var string */
private $host_name; private $host_name;
/** @var int */
private $host_port; private $host_port;
// internal error reporting vars // internal error reporting vars
/** @var array<mixed> */
private $error_msg = []; // the "connection" to the outside errors private $error_msg = []; // the "connection" to the outside errors
// debug output prefix // debug output prefix
/** @var string */
private $error_msg_prefix = ''; // prefix to the error string (the class name) private $error_msg_prefix = ''; // prefix to the error string (the class name)
// debug flags // debug flags
/** @var array<mixed> */
private $debug_output = []; // if this is true, show debug on desconstructor private $debug_output = []; // if this is true, show debug on desconstructor
/** @var array<mixed> */
private $debug_output_not = []; private $debug_output_not = [];
/** @var bool */
private $debug_output_all = false; private $debug_output_all = false;
/** @var array<mixed> */
private $echo_output = []; // errors: echo out, default is 1 private $echo_output = []; // errors: echo out, default is 1
/** @var array<mixed> */
private $echo_output_not = []; private $echo_output_not = [];
/** @var bool */
private $echo_output_all = false; private $echo_output_all = false;
/** @var array<mixed> */
private $print_output = []; // errors: print to file, default is 0 private $print_output = []; // errors: print to file, default is 0
/** @var array<mixed> */
private $print_output_not = []; private $print_output_not = [];
/** @var bool */
private $print_output_all = false; private $print_output_all = false;
// debug flags/settings // debug flags/settings
/** @var string */
private $running_uid = ''; // unique ID set on class init and used in logging as prefix private $running_uid = ''; // unique ID set on class init and used in logging as prefix
// log file name // log file name
/** @var string */
private $log_folder = ''; private $log_folder = '';
/** @var string */
private $log_file_name_ext = 'log'; // use this for date rotate private $log_file_name_ext = 'log'; // use this for date rotate
/** @var int */
private $log_max_filesize = 0; // set in kilobytes private $log_max_filesize = 0; // set in kilobytes
/** @var string */
private $log_print_file = 'error_msg##LOGID####LEVEL####CLASS####PAGENAME####DATE##'; private $log_print_file = 'error_msg##LOGID####LEVEL####CLASS####PAGENAME####DATE##';
/** @var string */
private $log_file_unique_id; // a unique ID set only once for call derived from this class private $log_file_unique_id; // a unique ID set only once for call derived from this class
/** @var bool */
private $log_print_file_date = true; // if set add Y-m-d and do automatic daily rotation private $log_print_file_date = true; // if set add Y-m-d and do automatic daily rotation
/** @var string */
private $log_file_id = ''; // a alphanumeric name that has to be set as global definition private $log_file_id = ''; // a alphanumeric name that has to be set as global definition
/** @var bool */
private $log_per_level = false; // set, it will split per level (first parameter in debug call) private $log_per_level = false; // set, it will split per level (first parameter in debug call)
/** @var bool */
private $log_per_class = false; // set, will split log per class private $log_per_class = false; // set, will split log per class
/** @var bool */
private $log_per_page = false; // set, will split log per called file private $log_per_page = false; // set, will split log per called file
/** @var bool */
private $log_per_run = false; // create a new log file per run (time stamp + unique ID) private $log_per_run = false; // create a new log file per run (time stamp + unique ID)
// script running time // script running time
/** @var float */
private $script_starttime; private $script_starttime;
public function __construct() public function __construct()
@@ -282,7 +309,8 @@ class Logging
{ {
// get the last class entry and wrie that // get the last class entry and wrie that
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) ?? [['class' => get_class($this)]]; $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) ?? [['class' => get_class($this)]];
return end($backtrace)['class']; // make sure if false it is an array and then check if not class set return empty string
return (end($backtrace) ?: [])['class'] ?? '';
} }
// *** PUBLIC *** // *** PUBLIC ***
@@ -381,7 +409,7 @@ class Logging
* @param string $flag on/off * @param string $flag on/off
* @param string|null $level if not null then check if this array entry is set * @param string|null $level if not null then check if this array entry is set
* else return false * else return false
* @return bool|array if $level is null, return array, else boolean true/false * @return bool|array<mixed> if $level is null, return array, else boolean true/false
*/ */
public function getLogLevel(string $type, string $flag, ?string $level = null) public function getLogLevel(string $type, string $flag, ?string $level = null)
{ {
@@ -439,8 +467,8 @@ class Logging
* It uses some special code sets so we can convert that to pre flags * It uses some special code sets so we can convert that to pre flags
* for echo output {##HTMLPRE##} ... {##/HTMLPRE##} * for echo output {##HTMLPRE##} ... {##/HTMLPRE##}
* Do not use this without using it in a string in debug function * Do not use this without using it in a string in debug function
* @param array $a Array to format * @param array<mixed> $a Array to format
* @return string print_r formated * @return string print_r formated
*/ */
public function prAr(array $a): string public function prAr(array $a): string
{ {
@@ -486,9 +514,13 @@ class Logging
($strip ? ($strip ?
// find any <br> and replace them with \n // find any <br> and replace them with \n
// strip rest of html elements (base only) // strip rest of html elements (base only)
preg_replace("/(<\/?)(\w+)([^>]*>)/", '', str_replace('<br>', "\n", $prefix . $string)) : preg_replace(
"/(<\/?)(\w+)([^>]*>)/",
'',
str_replace('<br>', "\n", $prefix . $string)
) :
$prefix . $string $prefix . $string
) ) ?: ''
) )
. "\n" . "\n"
); );
@@ -522,8 +554,8 @@ class Logging
/** /**
* merges the given error array with the one from this class * merges the given error array with the one from this class
* only merges visible ones * only merges visible ones
* @param array $error_msg error array * @param array<mixed> $error_msg error array
* @return void has no return * @return void has no return
*/ */
public function mergeErrors(array $error_msg = []): void public function mergeErrors(array $error_msg = []): void
{ {
@@ -593,7 +625,7 @@ class Logging
/** /**
* Get current error message array * Get current error message array
* *
* @return array error messages collected * @return array<mixed> error messages collected
*/ */
public function getErrorMsg(): array public function getErrorMsg(): array
{ {

View File

@@ -11,12 +11,18 @@ namespace CoreLibs\Debug;
class RunningTime class RunningTime
{ {
// hr // hr
/** @var float */
private static $hr_starttime; private static $hr_starttime;
/** @var float */
private static $hr_runtime; private static $hr_runtime;
/** @var float */
private static $hr_endtime; private static $hr_endtime;
// normal // normal
/** @var float */
private static $starttime; private static $starttime;
/** @var float */
private static $endtime; private static $endtime;
/** @var string */
private static $runningtime_string; private static $runningtime_string;
/** /**
@@ -77,8 +83,8 @@ class RunningTime
* on second call it sends the end time and then also prints the running time * on second call it sends the end time and then also prints the running time
* Sets the internal runningtime_string variable with Start/End/Run time string * Sets the internal runningtime_string variable with Start/End/Run time string
* NOTE: for pure running time check it is recommended to use hrRunningTime method * NOTE: for pure running time check it is recommended to use hrRunningTime method
* @param bool|boolean $simple if true prints HTML strings, default text only * @param bool $simple if true prints HTML strings, default text only
* @return float running time as float number * @return float running time as float number
*/ */
public static function runningTime(bool $simple = false): float public static function runningTime(bool $simple = false): float
{ {

View File

@@ -31,8 +31,8 @@ class Support
/** /**
* prints a html formatted (pre) array * prints a html formatted (pre) array
* @param array $array any array * @param array<mixed> $array any array
* @return string formatted array for output with <pre> tag added * @return string formatted array for output with <pre> tag added
*/ */
public static function printAr(array $array): string public static function printAr(array $array): string
{ {

View File

@@ -48,7 +48,7 @@ class System
/** /**
* get the host name without the port as given by the SELF var * get the host name without the port as given by the SELF var
* @return array host name/port name * @return array<mixed> host name/port name
*/ */
public static function getHostName(): array public static function getHostName(): array
{ {
@@ -86,7 +86,7 @@ class System
/** /**
* similar to getPageName, but it retuns the raw array * similar to getPageName, but it retuns the raw array
* *
* @return array pathinfo array from PHP SELF * @return array<string> pathinfo array from PHP SELF
*/ */
public static function getPageNameArray(): array public static function getPageNameArray(): array
{ {

View File

@@ -28,21 +28,27 @@ namespace CoreLibs\Language\Core;
// over it (it assumes knowledge of StringReader internals) // over it (it assumes knowledge of StringReader internals)
class CachedFileReader extends \CoreLibs\Language\Core\StringReader class CachedFileReader extends \CoreLibs\Language\Core\StringReader
{ {
/** @var int */
public $error = 0; public $error = 0;
/** @var string */
public $fd_str = ''; public $fd_str = '';
public function __construct($filename) /**
* Undocumented function
*
* @param string $filename
*/
public function __construct(string $filename)
{ {
parent::__construct(); parent::__construct();
if (file_exists($filename)) { if (file_exists($filename)) {
$length = filesize($filename);
$fd = fopen($filename, 'rb'); $fd = fopen($filename, 'rb');
if (!is_resource($fd)) {
if (!$fd) {
$this->error = 3; // Cannot read file, probably permissions $this->error = 3; // Cannot read file, probably permissions
} else {
$this->fd_str = fread($fd, filesize($filename) ?: 0) ?: '';
fclose($fd);
} }
$this->fd_str = fread($fd, $length);
fclose($fd);
} else { } else {
$this->error = 2; // File doesn't exist $this->error = 2; // File doesn't exist
} }

View File

@@ -26,9 +26,13 @@ namespace CoreLibs\Language\Core;
class FileReader class FileReader
{ {
/** @var int */
public $fr_pos; public $fr_pos;
/** @var resource|bool */
public $fr_fd; public $fr_fd;
/** @var int */
public $fr_length; public $fr_length;
/** @var int */
public $error = 0; public $error = 0;
/** /**
@@ -38,10 +42,10 @@ class FileReader
public function __construct($filename) public function __construct($filename)
{ {
if (file_exists($filename)) { if (file_exists($filename)) {
$this->fr_length = filesize($filename); $this->fr_length = filesize($filename) ?: 0;
$this->fr_pos = 0; $this->fr_pos = 0;
$this->fr_fd = fopen($filename, 'rb'); $this->fr_fd = fopen($filename, 'rb');
if (!$this->fr_fd) { if (!is_resource($this->fr_fd)) {
$this->error = 3; // Cannot read file, probably permissions $this->error = 3; // Cannot read file, probably permissions
} }
} else { } else {
@@ -56,23 +60,25 @@ class FileReader
*/ */
public function read($bytes) public function read($bytes)
{ {
if ($bytes) { if (!$bytes || !is_resource($this->fr_fd)) {
fseek($this->fr_fd, $this->fr_pos);
// PHP 5.1.1 does not read more than 8192 bytes in one fread()
// the discussions at PHP Bugs suggest it's the intended behaviour
$data = '';
while ($bytes > 0) {
$chunk = fread($this->fr_fd, $bytes);
$data .= $chunk;
$bytes -= strlen($chunk);
}
$this->fr_pos = ftell($this->fr_fd);
return $data;
} else {
return ''; return '';
} }
fseek($this->fr_fd, $this->fr_pos);
// PHP 5.1.1 does not read more than 8192 bytes in one fread()
// the discussions at PHP Bugs suggest it's the intended behaviour
$data = '';
while ($bytes > 0) {
$chunk = fread($this->fr_fd, $bytes);
if ($chunk === false) {
break;
}
$data .= $chunk;
$bytes -= strlen($chunk);
}
$this->fr_pos = ftell($this->fr_fd) ?: 0;
return $data;
} }
/** /**
@@ -82,8 +88,11 @@ class FileReader
*/ */
public function seekto($pos) public function seekto($pos)
{ {
if (!is_resource($this->fr_fd)) {
return 0;
}
fseek($this->fr_fd, $pos); fseek($this->fr_fd, $pos);
$this->fr_pos = ftell($this->fr_fd); $this->fr_pos = ftell($this->fr_fd) ?: 0;
return $this->fr_pos; return $this->fr_pos;
} }
@@ -111,7 +120,9 @@ class FileReader
*/ */
public function close(): void public function close(): void
{ {
fclose($this->fr_fd); if (is_resource($this->fr_fd)) {
fclose($this->fr_fd);
}
} }
} }

View File

@@ -40,19 +40,31 @@ namespace CoreLibs\Language\Core;
class GetTextReader class GetTextReader
{ {
// public: // public:
/** @var int */
public $error = 0; // public variable that holds error code (0 if no error) public $error = 0; // public variable that holds error code (0 if no error)
// private: // private:
/** @var int */
private $BYTEORDER = 0; // 0: low endian, 1: big endian private $BYTEORDER = 0; // 0: low endian, 1: big endian
private $STREAM = null; /** @var FileReader */
private $STREAM;
/** @var bool */
private $short_circuit = false; private $short_circuit = false;
/** @var bool */
private $enable_cache = false; private $enable_cache = false;
private $originals = null; // offset of original table /** @var int */
private $translations = null; // offset of translation table private $originals = 0; // offset of original table
private $pluralheader = null; // cache header field for plural forms /** @var int */
private $translations = 0; // offset of translation table
/** @var string */
private $pluralheader = ''; // cache header field for plural forms
/** @var int */
private $total = 0; // total string count private $total = 0; // total string count
/** @var array<mixed>|null */
private $table_originals = null; // table for original strings (offsets) private $table_originals = null; // table for original strings (offsets)
/** @var array<mixed>|null */
private $table_translations = null; // table for translated strings (offsets) private $table_translations = null; // table for translated strings (offsets)
/** @var array<mixed> */
private $cache_translations = []; // original -> translation mapping private $cache_translations = []; // original -> translation mapping
@@ -69,13 +81,12 @@ class GetTextReader
{ {
if ($this->BYTEORDER == 0) { if ($this->BYTEORDER == 0) {
// low endian // low endian
$input = unpack('V', $this->STREAM->read(4)); $input = unpack('V', $this->STREAM->read(4)) ?: [];
return array_shift($input);
} else { } else {
// big endian // big endian
$input = unpack('N', $this->STREAM->read(4)); $input = unpack('N', $this->STREAM->read(4)) ?: [];
return array_shift($input);
} }
return array_shift($input);
} }
/** /**
@@ -92,24 +103,24 @@ class GetTextReader
* Reads an array of Integers from the Stream * Reads an array of Integers from the Stream
* *
* @param int $count How many elements should be read * @param int $count How many elements should be read
* @return array Array of Integers * @return array<mixed> Array of Integers
*/ */
public function readintarray($count) public function readintarray($count)
{ {
if ($this->BYTEORDER == 0) { if ($this->BYTEORDER == 0) {
// low endian // low endian
return unpack('V' . $count, $this->STREAM->read(4 * $count)); return unpack('V' . $count, $this->STREAM->read(4 * $count)) ?: [];
} else { } else {
// big endian // big endian
return unpack('N' . $count, $this->STREAM->read(4 * $count)); return unpack('N' . $count, $this->STREAM->read(4 * $count)) ?: [];
} }
} }
/** /**
* Constructor * Constructor
* *
* @param object|bool $Reader the StreamReader object * @param FileReader|bool $Reader the StreamReader object
* @param bool $enable_cache Enable or disable caching of strings (default on) * @param bool $enable_cache Enable or disable caching of strings (default on)
*/ */
public function __construct($Reader, $enable_cache = true) public function __construct($Reader, $enable_cache = true)
{ {
@@ -118,6 +129,11 @@ class GetTextReader
$this->short_circuit = true; $this->short_circuit = true;
return; return;
} }
// bail out for sure if this is not an objet here
if (!is_object($Reader)) {
$this->short_circuit = true;
return;
}
// Caching can be turned off // Caching can be turned off
$this->enable_cache = $enable_cache; $this->enable_cache = $enable_cache;
@@ -125,7 +141,7 @@ class GetTextReader
$MAGIC1 = "\x95\x04\x12\xde"; $MAGIC1 = "\x95\x04\x12\xde";
$MAGIC2 = "\xde\x12\x04\x95"; $MAGIC2 = "\xde\x12\x04\x95";
$this->STREAM = (object)$Reader; $this->STREAM = $Reader;
$magic = $this->read(4); $magic = $this->read(4);
if ($magic == $MAGIC1) { if ($magic == $MAGIC1) {
$this->BYTEORDER = 1; $this->BYTEORDER = 1;
@@ -149,8 +165,9 @@ class GetTextReader
* to speed up translation lookups * to speed up translation lookups
* *
* @access private * @access private
* @return void
*/ */
private function load_tables() private function loadTables(): void
{ {
if ( if (
is_array($this->cache_translations) && is_array($this->cache_translations) &&
@@ -190,10 +207,10 @@ class GetTextReader
* @param int $num Offset number of original string * @param int $num Offset number of original string
* @return string Requested string if found, otherwise '' * @return string Requested string if found, otherwise ''
*/ */
private function get_original_string($num) private function getOriginalString($num)
{ {
$length = $this->table_originals[$num * 2 + 1]; $length = $this->table_originals[$num * 2 + 1] ?? 0;
$offset = $this->table_originals[$num * 2 + 2]; $offset = $this->table_originals[$num * 2 + 2] ?? 0;
if (!$length) { if (!$length) {
return ''; return '';
} }
@@ -209,10 +226,10 @@ class GetTextReader
* @param int $num Offset number of original string * @param int $num Offset number of original string
* @return string Requested string if found, otherwise '' * @return string Requested string if found, otherwise ''
*/ */
private function get_translation_string($num) private function getTranslationString($num)
{ {
$length = $this->table_translations[$num * 2 + 1]; $length = $this->table_translations[$num * 2 + 1] ?? 0;
$offset = $this->table_translations[$num * 2 + 2]; $offset = $this->table_translations[$num * 2 + 2] ?? 0;
if (!$length) { if (!$length) {
return ''; return '';
} }
@@ -228,18 +245,18 @@ class GetTextReader
* @param string $string string to find * @param string $string string to find
* @param int $start (internally used in recursive function) * @param int $start (internally used in recursive function)
* @param int $end (internally used in recursive function) * @param int $end (internally used in recursive function)
* @return int|string|float (offset in originals table) * @return int (offset in originals table)
*/ */
private function find_string($string, $start = -1, $end = -1) private function findString($string, $start = -1, $end = -1)
{ {
if (($start == -1) or ($end == -1)) { if (($start == -1) or ($end == -1)) {
// find_string is called with only one parameter, set start end end // findString is called with only one parameter, set start end end
$start = 0; $start = 0;
$end = $this->total; $end = $this->total;
} }
if (abs($start - $end) <= 1) { if (abs($start - $end) <= 1) {
// We're done, now we either found the string, or it doesn't exist // We're done, now we either found the string, or it doesn't exist
$txt = $this->get_original_string($start); $txt = $this->getOriginalString($start);
if ($string == $txt) { if ($string == $txt) {
return $start; return $start;
} else { } else {
@@ -247,20 +264,20 @@ class GetTextReader
} }
} elseif ($start > $end) { } elseif ($start > $end) {
// start > end -> turn around and start over // start > end -> turn around and start over
return $this->find_string($string, $end, $start); return $this->findString($string, $end, $start);
} else { } else {
// Divide table in two parts // Divide table in two parts
$half = (int)(($start + $end) / 2); $half = (int)(($start + $end) / 2);
$cmp = strcmp($string, $this->get_original_string($half)); $cmp = strcmp($string, $this->getOriginalString($half));
if ($cmp == 0) { if ($cmp == 0) {
// string is exactly in the middle => return it // string is exactly in the middle => return it
return $half; return $half;
} elseif ($cmp < 0) { } elseif ($cmp < 0) {
// The string is in the upper half // The string is in the upper half
return $this->find_string($string, $start, $half); return $this->findString($string, $start, $half);
} else { } else {
// Translateshe string is in the lower half // Translateshe string is in the lower half
return $this->find_string($string, $half, $end); return $this->findString($string, $half, $end);
} }
} }
} }
@@ -277,7 +294,7 @@ class GetTextReader
if ($this->short_circuit) { if ($this->short_circuit) {
return $string; return $string;
} }
$this->load_tables(); $this->loadTables();
if ($this->enable_cache) { if ($this->enable_cache) {
// Caching enabled, get translated string from cache // Caching enabled, get translated string from cache
@@ -288,11 +305,11 @@ class GetTextReader
} }
} else { } else {
// Caching not enabled, try to find string // Caching not enabled, try to find string
$num = $this->find_string($string); $num = $this->findString($string);
if ($num == -1) { if ($num == -1) {
return $string; return $string;
} else { } else {
return $this->get_translation_string($num); return $this->getTranslationString($num);
} }
} }
} }
@@ -304,7 +321,7 @@ class GetTextReader
* @param string $expr an expression to match * @param string $expr an expression to match
* @return string sanitized plural form expression * @return string sanitized plural form expression
*/ */
private function sanitize_plural_expression($expr) private function sanitizePluralExpression($expr)
{ {
// Get rid of disallowed characters. // Get rid of disallowed characters.
$expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr); $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
@@ -341,7 +358,7 @@ class GetTextReader
* @param string $header header search in plurals * @param string $header header search in plurals
* @return string verbatim plural form header field * @return string verbatim plural form header field
*/ */
private function extract_plural_forms_header_from_po_header($header) private function extractPluralFormsHeaderFromPoHeader($header)
{ {
if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) { if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
$expr = $regs[2]; $expr = $regs[2];
@@ -357,21 +374,21 @@ class GetTextReader
* @access private * @access private
* @return string plural form header * @return string plural form header
*/ */
private function get_plural_forms() private function getPluralForms()
{ {
// lets assume message number 0 is header // lets assume message number 0 is header
// this is true, right? // this is true, right?
$this->load_tables(); $this->loadTables();
// cache header field for plural forms // cache header field for plural forms
if (! is_string($this->pluralheader)) { if (! is_string($this->pluralheader)) {
if ($this->enable_cache) { if ($this->enable_cache) {
$header = $this->cache_translations['']; $header = $this->cache_translations[''];
} else { } else {
$header = $this->get_translation_string(0); $header = $this->getTranslationString(0);
} }
$expr = $this->extract_plural_forms_header_from_po_header($header); $expr = $this->extractPluralFormsHeaderFromPoHeader($header);
$this->pluralheader = $this->sanitize_plural_expression($expr); $this->pluralheader = $this->sanitizePluralExpression($expr);
} }
return $this->pluralheader; return $this->pluralheader;
} }
@@ -383,9 +400,9 @@ class GetTextReader
* @param string $n count * @param string $n count
* @return int array index of the right plural form * @return int array index of the right plural form
*/ */
private function select_string($n) private function selectString($n)
{ {
$string = $this->get_plural_forms(); $string = $this->getPluralForms();
$string = str_replace('nplurals', "\$total", $string); $string = str_replace('nplurals', "\$total", $string);
$string = str_replace("n", $n, $string); $string = str_replace("n", $n, $string);
$string = str_replace('plural', "\$plural", $string); $string = str_replace('plural', "\$plural", $string);
@@ -421,7 +438,7 @@ class GetTextReader
} }
// find out the appropriate form // find out the appropriate form
$select = $this->select_string($number); $select = $this->selectString($number);
// this should contains all strings separated by NULLs // this should contains all strings separated by NULLs
$key = $single . chr(0) . $plural; $key = $single . chr(0) . $plural;
@@ -435,11 +452,11 @@ class GetTextReader
return $list[$select]; return $list[$select];
} }
} else { } else {
$num = $this->find_string($key); $num = $this->findString($key);
if ($num == -1) { if ($num == -1) {
return ($number != 1) ? $plural : $single; return ($number != 1) ? $plural : $single;
} else { } else {
$result = $this->get_translation_string($num); $result = $this->getTranslationString($num);
$list = explode(chr(0), $result); $list = explode(chr(0), $result);
return $list[$select]; return $list[$select];
} }

View File

@@ -26,7 +26,9 @@ namespace CoreLibs\Language\Core;
class StringReader class StringReader
{ {
/** @var int */
public $sr_pos; public $sr_pos;
/** @var string */
public $sr_str; public $sr_str;
/** /**

View File

@@ -10,6 +10,7 @@ namespace CoreLibs\Language;
class Encoding class Encoding
{ {
/** @var string */
private static $mb_error_char = ''; private static $mb_error_char = '';
/** /**
@@ -82,7 +83,7 @@ class Encoding
* @param string $string string to test * @param string $string string to test
* @param string $from_encoding encoding of string to test * @param string $from_encoding encoding of string to test
* @param string $to_encoding target encoding * @param string $to_encoding target encoding
* @return bool|array false if no error or array with failed characters * @return bool|array<string> false if no error or array with failed characters
*/ */
public static function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding) public static function checkConvertEncoding(string $string, string $from_encoding, string $to_encoding)
{ {

View File

@@ -33,9 +33,13 @@ use CoreLibs\Language\Core\GetTextReader;
class L10n extends \CoreLibs\Basic class L10n extends \CoreLibs\Basic
{ {
/** @var string */
private $lang = ''; private $lang = '';
/** @var string */
private $mofile = ''; private $mofile = '';
/** @var FileReader|bool */
private $input; private $input;
/** @var GetTextReader */
private $l10n; private $l10n;
/** /**

View File

@@ -59,7 +59,10 @@ class Elements
$hour = !$hour ? date('H', $timestamp) : $hour; $hour = !$hour ? date('H', $timestamp) : $hour;
$min = !$min ? date('i', $timestamp) : $min; // add to five min? $min = !$min ? date('i', $timestamp) : $min; // add to five min?
// max days in selected month // 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') ?: null
);
$string = ''; $string = '';
// from now to ? // from now to ?
if ($name_pos_back === false) { if ($name_pos_back === false) {
@@ -93,7 +96,7 @@ class Elements
// set weekday text based on current month ($month) and year ($year) // set weekday text based on current month ($month) and year ($year)
$string .= '<option value="' . ($i < 10 ? '0' . $i : $i) . '" ' $string .= '<option value="' . ($i < 10 ? '0' . $i : $i) . '" '
. ($day == $i ? 'selected' : '') . '>' . $i . ($day == $i ? 'selected' : '') . '>' . $i
. ' (' . date('D', mktime(0, 0, 0, $month, $i, $year)) . ')</option>'; . ' (' . date('D', mktime(0, 0, 0, (int)$month, $i, (int)$year) ?: null) . ')</option>';
} }
$string .= '</select> '; $string .= '</select> ';
if ($name_pos_back === true) { if ($name_pos_back === true) {
@@ -142,8 +145,8 @@ class Elements
$protList = ["http", "https", "ftp", "news", "nntp"]; $protList = ["http", "https", "ftp", "news", "nntp"];
// find urls w/o protocol // find urls w/o protocol
$output = preg_replace("/([^\/])www\.([\w\.-]+)\.([a-zA-Z]{2,4})/", "\\1http://www.\\2.\\3", $output); $output = preg_replace("/([^\/])www\.([\w\.-]+)\.([a-zA-Z]{2,4})/", "\\1http://www.\\2.\\3", $output) ?: '';
$output = preg_replace("/([^\/])ftp\.([\w\.-]+)\.([a-zA-Z]{2,4})/", "\\1ftp://ftp.\\2.\\3", $output); $output = preg_replace("/([^\/])ftp\.([\w\.-]+)\.([a-zA-Z]{2,4})/", "\\1ftp://ftp.\\2.\\3", $output) ?: '';
// remove doubles, generate protocol-regex // remove doubles, generate protocol-regex
// DIRTY HACK // DIRTY HACK
@@ -181,7 +184,7 @@ class Elements
); );
}, },
$output $output
); ) ?: '';
// find email-addresses, but not mailto prefix ones // find email-addresses, but not mailto prefix ones
$output = preg_replace_callback( $output = preg_replace_callback(
"/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/", "/(mailto:)?(\>)?\b([\w\.-]+)@([\w\.\-]+)\.([a-zA-Z]{2,4})\b(\|([^\||^#]+)(#([^\|]+))?\|)?/",
@@ -197,7 +200,7 @@ class Elements
); );
}, },
$output $output
); ) ?: '';
// we have one slashes after the Protocol -> internal link no domain, strip out the proto // we have one slashes after the Protocol -> internal link no domain, strip out the proto
// $output = preg_replace("/($protRegex)\/(.*)/e", "\\2", $ouput); // $output = preg_replace("/($protRegex)\/(.*)/e", "\\2", $ouput);

View File

@@ -222,48 +222,78 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
{ {
// for the load statetment describes which elements from // for the load statetment describes which elements from
// the load query should be shown and i which format // the load query should be shown and i which format
/** @var array<mixed> */
public $field_array = []; public $field_array = [];
/** @var string */
public $load_query; // the query needed for loading a data set (one row in the table) public $load_query; // the query needed for loading a data set (one row in the table)
/** @var string */
public $col_name; // the name of the columen (before _<type>) [used for order button] public $col_name; // the name of the columen (before _<type>) [used for order button]
/** @var int */
public $yes; // the yes flag that triggers the template to show ALL and not only new/load public $yes; // the yes flag that triggers the template to show ALL and not only new/load
/** @var string */
public $msg; // the error msg public $msg; // the error msg
/** @var int */
public $error; // the error flag set for printing red error msg public $error; // the error flag set for printing red error msg
/** @var int */
public $warning; // warning flag, for information (saved, loaded, etc) public $warning; // warning flag, for information (saved, loaded, etc)
/** @var string */
public $archive_pk_name; // the pk name for the load select form public $archive_pk_name; // the pk name for the load select form
/** @var string */
private $int_pk_name; // primary key, only internal usage private $int_pk_name; // primary key, only internal usage
/** @var array<mixed> */
public $reference_array = []; // reference arrays -> stored in $this->reference_array[$table_name] => []; public $reference_array = []; // reference arrays -> stored in $this->reference_array[$table_name] => [];
/** @var array<mixed> */
public $element_list; // element list for elements next to each other as a special sub group public $element_list; // element list for elements next to each other as a special sub group
/** @var array<mixed> */
public $table_array = []; public $table_array = [];
/** @var string */
public $my_page_name; // the name of the page without .php extension public $my_page_name; // the name of the page without .php extension
/** @var bool */
public $mobile_phone = false; public $mobile_phone = false;
// buttons and checkboxes // buttons and checkboxes
/** @var string */
public $archive; public $archive;
/** @var string */
public $new; public $new;
/** @var string */
public $really_new; public $really_new;
/** @var string */
public $delete; public $delete;
/** @var string */
public $really_delete; public $really_delete;
/** @var string */
public $save; public $save;
/** @var string */
public $remove_button; public $remove_button;
// security publics // security publics
/** @var int */
public $base_acl_level; public $base_acl_level;
/** @var array<mixed> */
public $security_level; public $security_level;
// layout publics // layout publics
/** @var int */
public $table_width; public $table_width;
// internal lang & encoding vars // internal lang & encoding vars
/** @var string */
public $lang_dir = ''; public $lang_dir = '';
/** @var string */
public $lang; public $lang;
/** @var string */
public $lang_short; public $lang_short;
/** @var string */
public $encoding; public $encoding;
// language // language
/** @var \CoreLibs\Language\L10n */
public $l; public $l;
// now some default error msgs (english) // now some default error msgs (english)
/** @var array<mixed> */
public $language_array = []; public $language_array = [];
/** /**
* construct form generator * construct form generator
* @param array $db_config db config array * @param array<mixed> $db_config db config array
* @param int|integer $table_width table/div width (default 750) * @param int|integer $table_width table/div width (default 750)
*/ */
public function __construct(array $db_config, int $table_width = 750) public function __construct(array $db_config, int $table_width = 750)
{ {
@@ -478,7 +508,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
* array of fields * array of fields
* @param string $want_key the key where you want the data from * @param string $want_key the key where you want the data from
* @param string|null $key_value if set searches for special right value * @param string|null $key_value if set searches for special right value
* @return array found key fields * @return array<mixed> found key fields
*/ */
public function formGetColNameArrayFromKey(string $want_key, ?string $key_value = null): array public function formGetColNameArrayFromKey(string $want_key, ?string $key_value = null): array
{ {
@@ -500,7 +530,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* formated output for the error && warning msg * formated output for the error && warning msg
* @return array error message with msg, width, clas * @return array<string,string|int> error message with msg, width, clas
*/ */
public function formPrintMsg(): array public function formPrintMsg(): array
{ {
@@ -605,9 +635,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* default delete procedure * default delete procedure
* @param array $element_list element array that should be removed * @param array<mixed> $element_list element array that should be removed
* @param array $remove_name key names that should be removed * @param array<mixed> $remove_name key names that should be removed
* @return void has no return * @return void has no return
*/ */
public function formProcedureDeleteFromElementList(array $element_list, array $remove_name): void public function formProcedureDeleteFromElementList(array $element_list, array $remove_name): void
{ {
@@ -704,7 +734,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* create the load list and return it as an array * create the load list and return it as an array
* @return array load list array with primary key, name and selected entry * @return array<string,mixed> load list array with primary key, name and selected entry
*/ */
public function formCreateLoad(): array public function formCreateLoad(): array
{ {
@@ -721,7 +751,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
// load list data // load list data
$this->dbExec($this->load_query); $this->dbExec($this->load_query);
while ($res = $this->dbFetchArray()) { while (is_array($res = $this->dbFetchArray())) {
$pk_ids[] = $res[$this->int_pk_name]; $pk_ids[] = $res[$this->int_pk_name];
if ( if (
isset($this->table_array[$this->int_pk_name]['value']) && isset($this->table_array[$this->int_pk_name]['value']) &&
@@ -766,8 +796,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* Create new entry element for HTML output * Create new entry element for HTML output
* @param bool $hide_new_checkbox show or hide the new checkbox, default is false * @param bool $hide_new_checkbox show or hide the new checkbox, default is false
* @return array return the new create array with name & checkbox show flag * @return array<string,string|int> return the new create array with name & checkbox show flag
*/ */
public function formCreateNew($hide_new_checkbox = false): array public function formCreateNew($hide_new_checkbox = false): array
{ {
@@ -798,7 +828,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
* create the save and delete element html group data * create the save and delete element html group data
* @param bool $hide_delete hide the delete button (default false) * @param bool $hide_delete hide the delete button (default false)
* @param bool $hide_delete_checkbox hide the delete checkbox (default false) * @param bool $hide_delete_checkbox hide the delete checkbox (default false)
* @return array return the hide/show delete framework for html creation * @return array<string,mixed> return the hide/show delete framework
* for html creation
*/ */
public function formCreateSaveDelete($hide_delete = false, $hide_delete_checkbox = false): array public function formCreateSaveDelete($hide_delete = false, $hide_delete_checkbox = false): array
{ {
@@ -853,8 +884,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
* @param string $element_name the name from the array, you want to have build * @param string $element_name the name from the array, you want to have build
* @param string|null $query can overrule internal query data, * @param string|null $query can overrule internal query data,
* for drop down, as data comes from a reference table * for drop down, as data comes from a reference table
* for drop_down_text it has to be an array with $key->$valu * for drop_down_text it has to be an
* @return array html settings array * array with $key->$value
* @return array<string,mixed> html settings array
*/ */
public function formCreateElement(string $element_name, ?string $query = null): array public function formCreateElement(string $element_name, ?string $query = null): array
{ {
@@ -993,7 +1025,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$data['name'] = $element_name; $data['name'] = $element_name;
$data['value'][] = ''; $data['value'][] = '';
$data['output'][] = $this->l->__('Please choose .. . '); $data['output'][] = $this->l->__('Please choose .. . ');
while ($res = $this->dbReturn($query)) { while (is_array($res = $this->dbReturn($query))) {
$data['value'][] = $res[0]; $data['value'][] = $res[0];
$data['output'][] = $res[1]; $data['output'][] = $res[1];
if ( if (
@@ -1309,22 +1341,18 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
} }
} // while } // while
// do check for reference tables // do check for reference tables
if (is_array($this->reference_array)) { reset($this->reference_array);
reset($this->reference_array); foreach ($this->reference_array as $key => $value) {
foreach ($this->reference_array as $key => $value) { if (
if ( isset($this->reference_array[$key]['mandatory']) &&
isset($this->reference_array[$key]['mandatory']) && $this->reference_array[$key]['mandatory'] &&
$this->reference_array[$key]['mandatory'] && !$this->reference_array[$key]['selected'][0]
!$this->reference_array[$key]['selected'][0] ) {
) { $this->msg .= sprintf(
$this->msg .= sprintf( $this->l->__('Please select at least one Element from field <b>%s</b>!<br>'),
$this->l->__('Please select at least one Element from field <b>%s</b>!<br>'), $this->reference_array[$key]['output_name']
$this->reference_array[$key]['output_name'] );
);
}
} }
} else {
$this->reference_array = [];
} }
// $this->log->debug('edit_error', 'QS: <pre>' . print_r($_POST, true) . '</pre>'); // $this->log->debug('edit_error', 'QS: <pre>' . print_r($_POST, true) . '</pre>');
if (is_array($this->element_list)) { if (is_array($this->element_list)) {
@@ -1502,7 +1530,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* sets the order to the maximum, if order flag is set in array * sets the order to the maximum, if order flag is set in array
* @return array table array with set order number * @return array<mixed> table array with set order number
*/ */
public function formSetOrder(): array public function formSetOrder(): array
{ {
@@ -1593,7 +1621,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$q = 'SELECT ' . $this->reference_array[$key]['other_table_pk'] $q = 'SELECT ' . $this->reference_array[$key]['other_table_pk']
. ' FROM ' . $this->reference_array[$key]['table_name'] . ' FROM ' . $this->reference_array[$key]['table_name']
. ' WHERE ' . $this->int_pk_name . ' = ' . $this->table_array[$this->int_pk_name]['value']; . ' WHERE ' . $this->int_pk_name . ' = ' . $this->table_array[$this->int_pk_name]['value'];
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
$this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']]; $this->reference_array[$key]['selected'][] = $res[$this->reference_array[$key]['other_table_pk']];
} }
} }
@@ -1646,7 +1674,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
. ' (' . $this->table_array[$key]['input_name'] . ') VALUES (' . ' (' . $this->table_array[$key]['input_name'] . ') VALUES ('
. "'" . $this->dbEscapeString($this->table_array[$key]['input_value']) . "')"; . "'" . $this->dbEscapeString($this->table_array[$key]['input_value']) . "')";
$this->dbExec($q); $this->dbExec($q);
if (!empty($this->table_array[$key]['where'])) { if (!empty($this->table_array[$key]['where']) && is_numeric($this->insert_id)) {
// make an update on the just inseted data with the where data als update values // make an update on the just inseted data with the where data als update values
$q = 'UPDATE ' . $this->table_array[$key]['table_name'] . ' SET '; $q = 'UPDATE ' . $this->table_array[$key]['table_name'] . ' SET ';
$q .= $this->table_array[$key]['where'] . ' '; $q .= $this->table_array[$key]['where'] . ' ';
@@ -2039,8 +2067,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* creates HTML hidden input fields out of an hash array * creates HTML hidden input fields out of an hash array
* @param array $hidden_array The list of fields to be added as hidden * @param array<mixed> $hidden_array The list of fields to be added as hidden
* @return array key -> value list of hidden fileds data * @return array<mixed> key -> value list of hidden fileds data
*/ */
public function formCreateHiddenFields(array $hidden_array = []): array public function formCreateHiddenFields(array $hidden_array = []): array
{ {
@@ -2072,8 +2100,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* creates the multiple select part for a reference_table * creates the multiple select part for a reference_table
* @param string $table_name Table name for reference array lookup * @param string $table_name Table name for reference array lookup
* @return array Reference table output array * @return array<string,mixed> Reference table output array
*/ */
public function formCreateElementReferenceTable(string $table_name): array public function formCreateElementReferenceTable(string $table_name): array
{ {
@@ -2087,7 +2115,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
} }
$data['name'] = $this->reference_array[$table_name]['other_table_pk']; $data['name'] = $this->reference_array[$table_name]['other_table_pk'];
$data['size'] = $this->reference_array[$table_name]['select_size']; $data['size'] = $this->reference_array[$table_name]['select_size'];
while ($res = $this->dbReturn($this->reference_array[$table_name]['query'])) { while (is_array($res = $this->dbReturn($this->reference_array[$table_name]['query']))) {
$data['value'][] = $res[0]; $data['value'][] = $res[0];
$data['output'][] = $res[1]; $data['output'][] = $res[1];
$data['selected'][] = (\CoreLibs\Convert\Html::checked( $data['selected'][] = (\CoreLibs\Convert\Html::checked(
@@ -2109,8 +2137,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
* this currently only works for a list that is filled from a sub table and creates * this currently only works for a list that is filled from a sub table and creates
* only a connection to this one new version will allow a sub list with free input * only a connection to this one new version will allow a sub list with free input
* fields to directly fill a sub table to a master table * fields to directly fill a sub table to a master table
* @param string $table_name which element entry to create * @param string $table_name Which element entry to create
* @return array element for html creation * @return array<string,mixed> Element for html creation
*/ */
public function formCreateElementListTable(string $table_name): array public function formCreateElementListTable(string $table_name): array
{ {
@@ -2189,7 +2217,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
// only two elements are allowed: pos 0 is key, pso 1 is visible output name // only two elements are allowed: pos 0 is key, pso 1 is visible output name
if (isset($data_array['type']) && $data_array['type'] == 'drop_down_db') { if (isset($data_array['type']) && $data_array['type'] == 'drop_down_db') {
$md_q = md5($data_array['query']); $md_q = md5($data_array['query']);
while ($res = $this->dbReturn($data_array['query'])) { while (is_array($res = $this->dbReturn($data_array['query']))) {
/** @phan-suppress-next-line PhanTypeInvalidDimOffset */ /** @phan-suppress-next-line PhanTypeInvalidDimOffset */
$this->log->debug('edit', 'Q[' . $md_q . '] pos: ' . $this->cursor_ext[$md_q]['pos'] $this->log->debug('edit', 'Q[' . $md_q . '] pos: ' . $this->cursor_ext[$md_q]['pos']
. ' | want: ' . ($data_array['preset'] ?? '-') . ' | want: ' . ($data_array['preset'] ?? '-')
@@ -2332,7 +2360,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
if (isset($q)) { if (isset($q)) {
$pos = 0; // position in while for overwrite if needed $pos = 0; // position in while for overwrite if needed
// read out the list and add the selected data if needed // read out the list and add the selected data if needed
while ($res = $this->dbReturn($q)) { while (is_array($res = $this->dbReturn($q))) {
$_data = []; $_data = [];
$prfx = $data['prefix'] ?? ''; // short $prfx = $data['prefix'] ?? ''; // short
// go through each res // go through each res

View File

@@ -127,7 +127,7 @@ class Image
$return_data = $thumb; $return_data = $thumb;
// if we have a delete filename, delete here with glob // if we have a delete filename, delete here with glob
if ($delete_filename) { if ($delete_filename) {
array_map('unlink', glob($delete_filename . '*')); array_map('unlink', glob($delete_filename . '*') ?: []);
} }
} else { } else {
if (!empty($dummy) && strstr($dummy, '/') === false) { if (!empty($dummy) && strstr($dummy, '/') === false) {
@@ -255,11 +255,18 @@ class Image
) { ) {
// image, copy source image, offset in image, source x/y, new size, source image size // image, copy source image, offset in image, source x/y, new size, source image size
$thumb = imagecreatetruecolor($thumb_width_r, $thumb_height_r); $thumb = imagecreatetruecolor($thumb_width_r, $thumb_height_r);
if ($thumb === false) {
return false;
}
if ($img_type == IMAGETYPE_PNG) { if ($img_type == IMAGETYPE_PNG) {
$imagecolorallocatealpha = imagecolorallocatealpha($thumb, 0, 0, 0, 127);
if ($imagecolorallocatealpha === false) {
return false;
}
// preservere transaprency // preservere transaprency
imagecolortransparent( imagecolortransparent(
$thumb, $thumb,
imagecolorallocatealpha($thumb, 0, 0, 0, 127) $imagecolorallocatealpha
); );
imagealphablending($thumb, false); imagealphablending($thumb, false);
imagesavealpha($thumb, true); imagesavealpha($thumb, true);
@@ -274,7 +281,7 @@ class Image
break; break;
} }
// check that we have a source image resource // check that we have a source image resource
if ($source !== null) { if ($source !== null && $source !== false) {
// resize no shift // resize no shift
if ($high_quality === true) { if ($high_quality === true) {
imagecopyresized( imagecopyresized(
@@ -356,10 +363,16 @@ class Image
$thumb_width = 250; $thumb_width = 250;
} }
$thumb = imagecreatetruecolor($thumb_width, $thumb_height); $thumb = imagecreatetruecolor($thumb_width, $thumb_height);
if ($thumb === false) {
return false;
}
// add outside border px = 5% (rounded up) // add outside border px = 5% (rounded up)
// eg 50px -> 2.5px // eg 50px -> 2.5px
$gray = imagecolorallocate($thumb, 200, 200, 200); $gray = imagecolorallocate($thumb, 200, 200, 200);
$white = imagecolorallocate($thumb, 255, 255, 255); $white = imagecolorallocate($thumb, 255, 255, 255);
if ($gray === false || $white === false) {
return false;
}
// fill gray background // fill gray background
imagefill($thumb, 0, 0, $gray); imagefill($thumb, 0, 0, $gray);
// now create rectangle // now create rectangle
@@ -407,55 +420,66 @@ class Image
*/ */
public static function correctImageOrientation($filename): void public static function correctImageOrientation($filename): void
{ {
if (function_exists('exif_read_data') && is_writeable($filename)) { // function exists & file is writeable, else do nothing
list($inc_width, $inc_height, $img_type) = getimagesize($filename); if (!function_exists('exif_read_data') || !is_writeable($filename)) {
// add @ to avoid "file not supported error" return;
$exif = @exif_read_data($filename); }
$orientation = null; list($inc_width, $inc_height, $img_type) = getimagesize($filename);
$img = null; // add @ to avoid "file not supported error"
if ($exif && isset($exif['Orientation'])) { $exif = @exif_read_data($filename);
$orientation = $exif['Orientation']; $orientation = null;
} $img = null;
if ($orientation != 1) { if ($exif && isset($exif['Orientation'])) {
switch ($img_type) { $orientation = $exif['Orientation'];
case IMAGETYPE_JPEG: }
$img = imagecreatefromjpeg($filename); // only if we need to rotate, if 1 it is already upright
break; if ($orientation === null || $orientation == 1) {
case IMAGETYPE_PNG: return;
$img = imagecreatefrompng($filename); }
break; switch ($img_type) {
} case IMAGETYPE_JPEG:
$deg = 0; $img = imagecreatefromjpeg($filename);
// 1 top, 6: left, 8: right, 3: bottom break;
switch ($orientation) { case IMAGETYPE_PNG:
case 3: $img = imagecreatefrompng($filename);
$deg = 180; break;
break; }
case 6: // no image loaded (wrong type)
$deg = -90; if ($img === null || $img === false) {
break; return;
case 8: }
$deg = 90; $deg = 0;
break; // 1 top, 6: left, 8: right, 3: bottom
} switch ($orientation) {
if ($img !== null) { case 3:
if ($deg) { $deg = 180;
$img = imagerotate($img, $deg, 0); break;
} case 6:
// then rewrite the rotated image back to the disk as $filename $deg = -90;
switch ($img_type) { break;
case IMAGETYPE_JPEG: case 8:
imagejpeg($img, $filename); $deg = 90;
break; break;
case IMAGETYPE_PNG: }
imagepng($img, $filename); // rotate if needed
break; if ($deg) {
} $img = imagerotate($img, $deg, 0);
// clean up image if we have an image }
imagedestroy($img); // rotate failed
} if ($img === false) {
} // only if we need to rotate return;
} // function exists & file is writeable, else do nothing }
// then rewrite the rotated image back to the disk as $filename
switch ($img_type) {
case IMAGETYPE_JPEG:
imagejpeg($img, $filename);
break;
case IMAGETYPE_PNG:
imagepng($img, $filename);
break;
}
// clean up image if we have an image
imagedestroy($img);
} }
} }

View File

@@ -26,7 +26,7 @@ class ProgressBar
public $code; // unique code public $code; // unique code
/** @var string */ /** @var string */
public $status = 'new'; // current status (new,show,hide) public $status = 'new'; // current status (new,show,hide)
/** @var int */ /** @var float|int */
public $step = 0; // current step public $step = 0; // current step
/** @var array<string,?int> */ /** @var array<string,?int> */
public $position = [ // current bar position public $position = [ // current bar position
@@ -223,8 +223,8 @@ class ProgressBar
/** /**
* set the step * set the step
* @param float $step percent step to do * @param float $step percent step to do
* @return void has no return * @return void
*/ */
private function __setStep(float $step): void private function __setStep(float $step): void
{ {
@@ -242,7 +242,7 @@ class ProgressBar
* set frame layout * set frame layout
* @param integer $width bar width * @param integer $width bar width
* @param integer $height bar height * @param integer $height bar height
* @return void has no return * @return void
*/ */
public function setFrame(int $width = 0, int $height = 0): void public function setFrame(int $width = 0, int $height = 0): void
{ {
@@ -271,7 +271,7 @@ class ProgressBar
* @param string $type label type * @param string $type label type
* @param string $name label name (internal) * @param string $name label name (internal)
* @param string $value label output name (optional) * @param string $value label output name (optional)
* @return void has no return * @return void
*/ */
public function addLabel(string $type, string $name, string $value = '&nbsp;'): void public function addLabel(string $type, string $name, string $value = '&nbsp;'): void
{ {
@@ -377,7 +377,7 @@ class ProgressBar
* @param string $value button text (output) * @param string $value button text (output)
* @param string $action button action (link) * @param string $action button action (link)
* @param string $target button action target (default self) * @param string $target button action target (default self)
* @return void has no return * @return void
*/ */
public function addButton(string $name, string $value, string $action, string $target = 'self'): void public function addButton(string $name, string $value, string $action, string $target = 'self'): void
{ {
@@ -394,7 +394,7 @@ class ProgressBar
* @param int $width width px * @param int $width width px
* @param int $height height px * @param int $height height px
* @param string $align alignment (left/right/etc), default empty * @param string $align alignment (left/right/etc), default empty
* @return void has no return * @return void
*/ */
public function setLabelPosition( public function setLabelPosition(
string $name, string $name,
@@ -440,7 +440,7 @@ class ProgressBar
* set label color * set label color
* @param string $name label name to set * @param string $name label name to set
* @param string $color color value in rgb html hex * @param string $color color value in rgb html hex
* @return void has no return * @return void
*/ */
public function setLabelColor(string $name, string $color): void public function setLabelColor(string $name, string $color): void
{ {
@@ -456,7 +456,7 @@ class ProgressBar
* set the label background color * set the label background color
* @param string $name label name to set * @param string $name label name to set
* @param string $color background color to set in rgb html hex * @param string $color background color to set in rgb html hex
* @return void has no return * @return void
*/ */
public function setLabelBackground(string $name, string $color): void public function setLabelBackground(string $name, string $color): void
{ {
@@ -474,7 +474,7 @@ class ProgressBar
* @param int $size font size in px * @param int $size font size in px
* @param string $family font family (default empty) * @param string $family font family (default empty)
* @param string $weight font weight (default empty) * @param string $weight font weight (default empty)
* @return void has no return * @return void
*/ */
public function setLabelFont(string $name, int $size, string $family = '', string $weight = ''): void public function setLabelFont(string $name, int $size, string $family = '', string $weight = ''): void
{ {
@@ -523,7 +523,7 @@ class ProgressBar
* set the label valeu * set the label valeu
* @param string $name label name to set * @param string $name label name to set
* @param string $value label value (output) * @param string $value label value (output)
* @return void has no return * @return void
*/ */
public function setLabelValue(string $name, string $value): void public function setLabelValue(string $name, string $value): void
{ {
@@ -539,7 +539,7 @@ class ProgressBar
/** /**
* set the bar color * set the bar color
* @param string $color color for the progress bar in rgb html hex * @param string $color color for the progress bar in rgb html hex
* @return void has no return * @return void
*/ */
public function setBarColor(string $color): void public function setBarColor(string $color): void
{ {
@@ -554,7 +554,7 @@ class ProgressBar
/** /**
* set the progress bar background color * set the progress bar background color
* @param string $color background color in rgb html hex * @param string $color background color in rgb html hex
* @return void has no return * @return void
*/ */
public function setBarBackground(string $color): void public function setBarBackground(string $color): void
{ {
@@ -569,7 +569,7 @@ class ProgressBar
/** /**
* progress bar direct (left/right) * progress bar direct (left/right)
* @param string $direction set direction as left/right * @param string $direction set direction as left/right
* @return void has no return * @return void
*/ */
public function setBarDirection(string $direction): void public function setBarDirection(string $direction): void
{ {

View File

@@ -0,0 +1,32 @@
<?php
namespace FileUpload\Core;
interface qqUploadedFile // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
{
/**
* Save the file to the specified path
*
* @param string $path
* @return boolean TRUE on success
*/
public function save(string $path): bool;
/**
* get qqfile name from _GET array
*
* @return string
*/
public function getName(): string;
/**
* Get file size from _SERVERa array, throws an error if not possible
*
* @return int
*
* @throws \Exception
*/
public function getSize(): int;
}
// __END__

View File

@@ -5,26 +5,40 @@ namespace FileUpload\Core;
/** /**
* Handle file uploads via regular form post (uses the $_FILES array) * Handle file uploads via regular form post (uses the $_FILES array)
*/ */
class qqUploadedFileForm class qqUploadedFileForm implements qqUploadedFile // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
{ {
/** /**
* Save the file to the specified path * Save the file to the specified path
*
* @param string $path
* @return boolean TRUE on success * @return boolean TRUE on success
*/ */
public function save($path) public function save(string $path): bool
{ {
if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) { if (!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
return false; return false;
} }
return true; return true;
} }
public function getName()
/**
* get qqfile name from _FILES array
*
* @return string
*/
public function getName(): string
{ {
return $_FILES['qqfile']['name']; return $_FILES['qqfile']['name'] ?? '';
} }
public function getSize()
/**
* get files size from _FILES array
*
* @return int
*/
public function getSize(): int
{ {
return $_FILES['qqfile']['size']; return (int)$_FILES['qqfile']['size'] ?? 0;
} }
} }

View File

@@ -5,16 +5,22 @@ namespace FileUpload\Core;
/** /**
* Handle file uploads via XMLHttpRequest * Handle file uploads via XMLHttpRequest
*/ */
class qqUploadedFileXhr class qqUploadedFileXhr implements qqUploadedFile // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
{ {
/** /**
* Save the file to the specified path * Save the file to the specified path
*
* @param string $path
* @return boolean TRUE on success * @return boolean TRUE on success
*/ */
public function save($path) public function save(string $path): bool
{ {
$input = fopen("php://input", "r"); $input = fopen("php://input", "r");
$temp = tmpfile(); $temp = tmpfile();
// abort if not resources
if (!is_resource($input) || !is_resource($temp)) {
return false;
}
$realSize = stream_copy_to_stream($input, $temp); $realSize = stream_copy_to_stream($input, $temp);
fclose($input); fclose($input);
@@ -23,17 +29,34 @@ class qqUploadedFileXhr
} }
$target = fopen($path, "w"); $target = fopen($path, "w");
if (!is_resource($target)) {
return false;
}
fseek($temp, 0, SEEK_SET); fseek($temp, 0, SEEK_SET);
stream_copy_to_stream($temp, $target); stream_copy_to_stream($temp, $target);
fclose($target); fclose($target);
return true; return true;
} }
public function getName()
/**
* get qqfile name from _GET array
*
* @return string
*/
public function getName(): string
{ {
return $_GET['qqfile']; return $_GET['qqfile'] ?? '';
} }
public function getSize()
/**
* Get file size from _SERVERa array, throws an error if not possible
*
* @return int
*
* @throws \Exception
*/
public function getSize(): int
{ {
if (isset($_SERVER['CONTENT_LENGTH'])) { if (isset($_SERVER['CONTENT_LENGTH'])) {
return (int)$_SERVER['CONTENT_LENGTH']; return (int)$_SERVER['CONTENT_LENGTH'];

View File

@@ -2,17 +2,29 @@
namespace FileUpload; namespace FileUpload;
// use \FileUpload\Core; use FileUpload\Core;
class qqFileUploader // TODO: find all usages from qqFileUploader and name to Qq
class qqFileUploader // phpcs:ignore Squiz.Classes.ValidClassName.NotCamelCaps
{ {
private $allowedExtensions = array(); /** @var array<mixed> */
private $allowedExtensions = [];
/** @var int */
private $sizeLimit = 10485760; private $sizeLimit = 10485760;
/** @var null|Core\qqUploadedFileXhr|Core\qqUploadedFileForm */
private $file; private $file;
/** @var string */
public $uploadFileName; public $uploadFileName;
/** @var string */
public $uploadFileExt; public $uploadFileExt;
public function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760) /**
* Undocumented function
*
* @param array<mixed> $allowedExtensions
* @param integer $sizeLimit
*/
public function __construct(array $allowedExtensions = [], int $sizeLimit = 10485760)
{ {
$allowedExtensions = array_map("strtolower", $allowedExtensions); $allowedExtensions = array_map("strtolower", $allowedExtensions);
@@ -22,18 +34,23 @@ class qqFileUploader
$this->checkServerSettings(); $this->checkServerSettings();
if (isset($_GET['qqfile'])) { if (isset($_GET['qqfile'])) {
$this->file = new \FileUpload\Core\qqUploadedFileXhr(); $this->file = new Core\qqUploadedFileXhr();
} elseif (isset($_FILES['qqfile'])) { } elseif (isset($_FILES['qqfile'])) {
$this->file = new \FileUpload\Core\qqUploadedFileForm(); $this->file = new Core\qqUploadedFileForm();
} else { } else {
$this->file = false; $this->file = null;
} }
} }
private function checkServerSettings() /**
* Undocumented function
*
* @return void
*/
private function checkServerSettings(): void
{ {
$postSize = $this->toBytes(ini_get('post_max_size')); $postSize = $this->toBytes(ini_get('post_max_size') ?: '');
$uploadSize = $this->toBytes(ini_get('upload_max_filesize')); $uploadSize = $this->toBytes(ini_get('upload_max_filesize') ?: '');
if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) { if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M'; $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
@@ -41,10 +58,16 @@ class qqFileUploader
} }
} }
private function toBytes($str) /**
* Undocumented function
*
* @param string $str
* @return integer
*/
private function toBytes(string $str): int
{ {
$val = (int)trim($str); $val = (int)trim($str);
$last = strtolower($str[strlen($str)-1]); $last = strtolower($str[strlen($str) - 1]);
switch ($last) { switch ($last) {
case 'g': case 'g':
$val *= 1024; $val *= 1024;
@@ -59,36 +82,42 @@ class qqFileUploader
} }
/** /**
* Returns array('success'=>true) or array('error'=>'error message') * Undocumented function
*
* @param string $uploadDirectory
* @param boolean $replaceOldFile
* @return array<string,string|bool> Returns ['success'=>true] or
* ['error'=>'error message']
*/ */
public function handleUpload($uploadDirectory, $replaceOldFile = false) public function handleUpload(string $uploadDirectory, bool $replaceOldFile = false): array
{ {
if (!is_writable($uploadDirectory)) { if (!is_writable($uploadDirectory)) {
return array('error' => "Server error. Upload directory isn't writable."); return ['error' => "Server error. Upload directory isn't writable."];
} }
if (!$this->file) { if (!is_object($this->file)) {
return array('error' => 'No files were uploaded.'); return ['error' => 'No files were uploaded.'];
} }
$size = 0;
$size = $this->file->getSize(); $size = $this->file->getSize();
if ($size == 0) { if ($size == 0) {
return array('error' => 'File is empty'); return ['error' => 'File is empty'];
} }
if ($size > $this->sizeLimit) { if ($size > $this->sizeLimit) {
return array('error' => 'File is too large'); return ['error' => 'File is too large'];
} }
$pathinfo = pathinfo($this->file->getName()); $pathinfo = pathinfo($this->file->getName());
$filename = $pathinfo['filename']; $filename = $pathinfo['filename'] ?? '';
//$filename = md5(uniqid()); //$filename = md5(uniqid());
$ext = $pathinfo['extension'] ?? ''; $ext = $pathinfo['extension'] ?? '';
if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) { if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) {
$these = implode(', ', $this->allowedExtensions); $these = implode(', ', $this->allowedExtensions);
return array('error' => 'File has an invalid extension, it should be one of '. $these . '.'); return ['error' => 'File has an invalid extension, it should be one of ' . $these . '.'];
} }
if (!$replaceOldFile) { if (!$replaceOldFile) {
@@ -102,10 +131,12 @@ class qqFileUploader
$this->uploadFileExt = $ext; $this->uploadFileExt = $ext;
if ($this->file->save($uploadDirectory . $filename . '.' . $ext)) { if ($this->file->save($uploadDirectory . $filename . '.' . $ext)) {
return array('success' => true); return ['success' => true];
} else { } else {
return array('error' => 'Could not save uploaded file.' . return [
'The upload was cancelled, or server error encountered'); 'error' => 'Could not save uploaded file.' .
'The upload was cancelled, or server error encountered'
];
} }
} }
} }

61
www/lib/Test/Test.php Normal file
View File

@@ -0,0 +1,61 @@
<?php
/*
* TEST sets only
*/
declare(strict_types=1);
namespace Test;
class Test
{
public function __construct()
{
// calls all tests
$this->testPrivate();
$this->testProtected();
$this->testPublic();
}
public function __destruct()
{
// calls all close tests
}
/**
* Undocumented function
*
* @return string
*/
protected function testPrivate(): string
{
$string = 'TEST Private';
return $string;
}
/**
* Undocumented function
*
* @return string
*/
protected function testProtected(): string
{
$string = 'TEST Protected';
return $string;
}
/**
* Undocumented function
*
* @return string
*/
public function testPublic(): string
{
$string = 'TEST Public';
return $string;
}
}
// __END__