Skip to content

Commit 19a68a3

Browse files
committed
fix(ci): fix PHP 8.1 count() TypeErrors and more short tags
1 parent 64de2a4 commit 19a68a3

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

database.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,14 @@
282282
// determine the accessible databases for the login panel
283283
//
284284
$dbfiles = array();
285-
if (isset($ALLOWED_FILES) && count($ALLOWED_FILES) > 0) {
285+
if (isset($ALLOWED_FILES) && is_array($ALLOWED_FILES) && count($ALLOWED_FILES) > 0) {
286286
foreach ($ALLOWED_FILES as $file) {
287287
if ((strpos($file, '/') === false && strpos($file, '\\') === false) ||
288288
is_file($file)) {
289289
$dbfiles[] = $file;
290290
}
291291
}
292-
} elseif (isset($ALLOWED_DIRS) && count($ALLOWED_DIRS) > 0) {
292+
} elseif (isset($ALLOWED_DIRS) && is_array($ALLOWED_DIRS) && count($ALLOWED_DIRS) > 0) {
293293
foreach ($ALLOWED_DIRS as $dir) {
294294
if (!@is_readable($dir)) {
295295
$warning .= sprintf($WARNINGS['CAN_NOT_ACCESS_DIR'], $dir);

inc/functions.inc.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ function is_allowed_db($filename)
681681

682682
$cmp_func = (stristr(php_uname(), 'wind') !== false) ? 'strcasecmp' : 'strcmp';
683683

684-
if (isset($ALLOWED_FILES) && count($ALLOWED_FILES) > 0) {
684+
if (isset($ALLOWED_FILES) && is_array($ALLOWED_FILES) && count($ALLOWED_FILES) > 0) {
685685
foreach ($ALLOWED_FILES as $file) {
686686
if ($cmp_func($filename, $file) == 0) {
687687

@@ -692,7 +692,7 @@ function is_allowed_db($filename)
692692
}
693693

694694
$dirname = dirname($filename);
695-
if (isset($ALLOWED_DIRS) && count($ALLOWED_DIRS) > 0) {
695+
if (isset($ALLOWED_DIRS) && is_array($ALLOWED_DIRS) && count($ALLOWED_DIRS) > 0) {
696696
foreach ($ALLOWED_DIRS as $dir) {
697697
if ($cmp_func($dirname, substr($dir, 0, -1)) == 0) {
698698

@@ -971,13 +971,14 @@ function get_tabmenu($page)
971971
$html = "<ul class=\"nav nav-pills nav-justified\">\n";
972972

973973
foreach ($menuentries as $item => $script) {
974-
if (count($_SESSION['s_' . strtolower($item) . '_panels']) == 1) {
974+
$p_count = (isset($_SESSION['s_' . strtolower($item) . '_panels']) && is_array($_SESSION['s_' . strtolower($item) . '_panels'])) ? count($_SESSION['s_' . strtolower($item) . '_panels']) : 0;
975+
if ($p_count == 1) {
975976
continue;
976977
}
977978
$class = $page == $item ? 'active' : '';
978979

979980
$html .= ' <li class="' . $class . "\">\n"
980-
. ' <a class="menu-link" href="' . $script . '">' . $GLOBALS['menu_strings'][$item] . "</a>\n"
981+
. ' <a class="menu-link" href="' . $script . '">' . (isset($GLOBALS['menu_strings'][$item]) ? $GLOBALS['menu_strings'][$item] : $item) . "</a>\n"
981982
. " </li>\n";
982983
}
983984

@@ -1003,13 +1004,14 @@ function get_tabmenu_top_fixed($page)
10031004
$html = "<ul class=\"nav navbar-nav\">\n";
10041005

10051006
foreach ($menuentries as $item => $script) {
1006-
if (count($_SESSION['s_' . strtolower($item) . '_panels']) == 1) {
1007+
$p_count = (isset($_SESSION['s_' . strtolower($item) . '_panels']) && is_array($_SESSION['s_' . strtolower($item) . '_panels'])) ? count($_SESSION['s_' . strtolower($item) . '_panels']) : 0;
1008+
if ($p_count == 1) {
10071009
continue;
10081010
}
10091011
$class = ($page == $item) ? ' class="active"' : '';
10101012

10111013
$html .= '<li' . $class . '>'
1012-
. ' <a class="menu-link" href="' . $script . '">' . $GLOBALS['menu_strings'][$item] . "</a>\n"
1014+
. ' <a class="menu-link" href="' . $script . '">' . (isset($GLOBALS['menu_strings'][$item]) ? $GLOBALS['menu_strings'][$item] : $item) . "</a>\n"
10131015
. " </li>\n";
10141016
}
10151017

panels/tb_show.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
?>
1515
<form method="post" action="<?php echo url_session($_SERVER['PHP_SELF']); ?>#tb_show_selectableform" name="tb_show_selectableform" class="form-horizontal">
16-
<input type="submit" name="btn_viewselectable" value="<?=$button_strings['OpenSelectableMode']?>" class="btn btn-default btn-xs">
16+
<input type="submit" name="btn_viewselectable" value="<?php echo $button_strings['OpenSelectableMode']; ?>" class="btn btn-default btn-xs">
1717
</form>
1818
<?php
1919

0 commit comments

Comments
 (0)