diff --git a/phpstan.neon b/phpstan.neon index 4e172ff1..a6b37d14 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -12,6 +12,7 @@ parameters: - %currentWorkingDirectory%/phpstan-bootstrap.php - www/configs/config.master.php - www/lib/autoloader.php + - www/vendor/autoload.php excludes_analyse: # no check admin - www/admin/qq_file_upload_front.php diff --git a/www/configs/config.host.php b/www/configs/config.host.php index 2669343a..683bb6e6 100755 --- a/www/configs/config.host.php +++ b/www/configs/config.host.php @@ -12,6 +12,15 @@ * HISTORY: *********************************************************************/ +// other master config to attach +// $LOCAL_CONFIG = array( +// 'db_host' => '', +// 'location' => '', +// 'debug_flag' => true, +// 'site_lang' => 'en_utf8', +// 'login_enabled' => true +// ) + // each host has a different db_host $SITE_CONFIG = array( // development host @@ -29,7 +38,8 @@ $SITE_CONFIG = array( 'site_lang' => 'en_utf8', // enable/disable login override 'login_enabled' => true - ) + ), + // 'other.host.com' => $LOCAL_CONFIG ); // __END__ diff --git a/www/includes/admin_header.php b/www/includes/admin_header.php index 45032728..73ba338c 100644 --- a/www/includes/admin_header.php +++ b/www/includes/admin_header.php @@ -92,12 +92,12 @@ $cms->DATA['show_ea_extra'] = $login->acl['show_ea_extra']; // 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) if ((TARGET == 'live' || TARGET == 'remote') && !$DEBUG_ALL_OVERRIDE) { - $login->debug_output_all = 0; - $login->echo_output_all = 0; - $login->print_output_all = 0; - $cms->debug_output_all = 0; - $cms->echo_output_all = 0; - $cms->print_output_all = 0; + $login->debug_output_all = false; + $login->echo_output_all = false; + $login->print_output_all = false; + $cms->debug_output_all = false; + $cms->echo_output_all = false; + $cms->print_output_all = false; } $cms->DATA['JS_DEBUG'] = DEBUG; diff --git a/www/includes/admin_set_paths.php b/www/includes/admin_set_paths.php index 423c12f0..edb32f9c 100644 --- a/www/includes/admin_set_paths.php +++ b/www/includes/admin_set_paths.php @@ -45,9 +45,9 @@ $cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE); // css per page $cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE); // special CSS file -$cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME; +$cms->CSS_SPECIAL_TEMPLATE_NAME = isset($CSS_NAME) ? $CSS_NAME : ''; // special JS file -$cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME; +$cms->JS_SPECIAL_TEMPLATE_NAME = isset($JS_NAME) ? $JS_NAME : ''; // compile & cache id $cms->CACHE_ID = isset($CACHE_ID) ? $CACHE_ID : CACHE_ID; $cms->COMPILE_ID = isset($COMPILE_ID) ? $COMPILE_ID : CACHE_ID; diff --git a/www/lib/CoreLibs/ACL/Login.php b/www/lib/CoreLibs/ACL/Login.php index 67ab77f3..99eb6eda 100644 --- a/www/lib/CoreLibs/ACL/Login.php +++ b/www/lib/CoreLibs/ACL/Login.php @@ -152,7 +152,7 @@ class Login extends \CoreLibs\DB\IO if (defined('LOGIN_DB_SCHEMA')) { /** @phan-suppress-next-line PhanUndeclaredConstant */ $SCHEMA = LOGIN_DB_SCHEMA; - } elseif ($db_config['db_schema']) { + } elseif (isset($db_config['db_schema']) && $db_config['db_schema']) { $SCHEMA = $db_config['db_schema']; } elseif (defined('PUBLIC_SCHEMA')) { $SCHEMA = PUBLIC_SCHEMA; diff --git a/www/lib/CoreLibs/Basic.php b/www/lib/CoreLibs/Basic.php index 3ff04422..913a52c3 100644 --- a/www/lib/CoreLibs/Basic.php +++ b/www/lib/CoreLibs/Basic.php @@ -94,7 +94,6 @@ namespace CoreLibs; - /** Basic core class declaration */ class Basic {