diff --git a/lam/templates/tools/multiEdit.php b/lam/templates/tools/multiEdit.php index f6a0bcc21..0ed519d0d 100644 --- a/lam/templates/tools/multiEdit.php +++ b/lam/templates/tools/multiEdit.php @@ -483,16 +483,18 @@ function dryRun(): array { * @param string $errstr error message * @param string $errfile error file * @param int $errline error line + * @return bool stop internal error handler */ -function multiEditLdapErrorHandler($errno, $errstr, $errfile, $errline): void { - if ($errno === E_USER_ERROR) { +function multiEditLdapErrorHandler($errno, $errstr, $errfile, $errline): bool { + if (($errno === E_USER_ERROR) || ($errno === E_ERROR)) { logNewMessage(LOG_ERR, 'Error occurred: ' . $errstr . " ($errfile: $errline)"); $_REQUEST['multiEdit_error'] = true; } - elseif ($errno === E_USER_WARNING) { + elseif (($errno === E_USER_WARNING) || ($errno === E_WARNING)) { logNewMessage(LOG_WARNING, 'Error occurred: ' . $errstr . " ($errfile: $errline)"); $_REQUEST['multiEdit_error'] = true; } + return true; } /** diff --git a/lam/templates/tools/serverInfo.php b/lam/templates/tools/serverInfo.php index 09dbc59a3..47798bd9f 100644 --- a/lam/templates/tools/serverInfo.php +++ b/lam/templates/tools/serverInfo.php @@ -343,7 +343,7 @@ elseif (isset($monitorEntries['cn=monitor']['opsinitiated'])) { $container->addLabel(new htmlOutputText('' . _("Bind") . '', false)); $binds = $monitorEntries['cn=snmp,cn=monitor']['anonymousbinds'][0] + $monitorEntries['cn=snmp,cn=monitor']['unauthbinds'][0] + $monitorEntries['cn=snmp,cn=monitor']['simpleauthbinds'][0] + $monitorEntries['cn=snmp,cn=monitor']['strongauthbinds'][0]; - $container->addField(new htmlOutputText($binds)); + $container->addField(new htmlOutputText((string) $binds)); $container->addLabel(new htmlOutputText('' . _("Search") . '', false)); $searches = $monitorEntries['cn=snmp,cn=monitor']['searchops'][0]; $container->addField(new htmlOutputText($searches)); diff --git a/phpstan.neon b/phpstan.neon index 496b3863a..73974ccb7 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,5 @@ parameters: - level: 4 + level: 5 scanDirectories: - lam/lib - lam/templates