Skip to content

Commit 64de2a4

Browse files
committed
fix(ci): fix TypeError in get_customize_defaults and modernize PHP tags
1 parent 314ebb2 commit 64de2a4

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

inc/functions.inc.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ function get_customize_cookie_name()
12491249
//
12501250
function get_customize_defaults($useragent)
12511251
{
1252+
$ie = (isset($useragent) && is_array($useragent) && isset($useragent['ie'])) ? $useragent['ie'] : false;
12521253

12531254
return array('color' => array('background' => COLOR_BACKGROUND,
12541255
'panel' => COLOR_PANEL,
@@ -1264,7 +1265,7 @@ function get_customize_defaults($useragent)
12641265
'firstrow' => COLOR_FIRSTROW,
12651266
'secondrow' => COLOR_SECONDROW),
12661267
'language' => LANGUAGE,
1267-
'fontsize' => ($useragent['ie'] ? 8 : 11),
1268+
'fontsize' => ($ie ? 8 : 11),
12681269
'textarea' => array('cols' => SQL_AREA_COLS,
12691270
'rows' => SQL_AREA_ROWS),
12701271
'iframeheight' => IFRAME_HEIGHT,

views/footer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tr>
1111
<td>
1212
<p class="text-muted">
13-
<?= date('Y') ?>
13+
<?php echo date('Y'); ?>
1414
-
1515
<a href="https://github.com/mariuz/firebirdwebadmin">FirebirdWebAdmin</a>
1616
<?php echo VERSION; ?>
@@ -120,10 +120,10 @@ class="col-sm-4 control-label"><?php echo $usr_strings['AskDel']; ?></label>
120120
<script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.52.0/mode/sql/sql.min.js"></script>
121121

122122
<script src="./js/miscellaneous.js" type="text/javascript"></script>
123-
<?= js_global_variables()
123+
<?php echo js_global_variables()
124124
. js_xml_http_request_client()
125125
. js_request_close_panel()
126-
. $js_stack
126+
. $js_stack;
127127
?>
128128
</body>
129129
</html>

views/header.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="<?= $GLOBALS['charset'] ?>">
4+
<meta charset="<?php echo isset($GLOBALS['charset']) ? $GLOBALS['charset'] : 'UTF-8'; ?>">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<title><?= $title ?></title>
7+
<title><?php echo $title; ?></title>
88

99
<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.css" rel="stylesheet">
1010
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.css">

views/menu.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a class="navbar-brand" href="#">FirebirdWebAdmin</a>
1515
</div>
1616
<div id="navbar" class="navbar-collapse collapse">
17-
<?= get_tabmenu_top_fixed($s_page) ?>
17+
<?php echo get_tabmenu_top_fixed($s_page); ?>
1818

1919
<?php if ($s_connected == true) {
2020
?>
@@ -45,8 +45,7 @@
4545
?></a></li>
4646

4747
<li role="separator" class="divider"></li>
48-
<li><a href="logout.php"><?= $button_strings['Logout'];
49-
?></a></li>
48+
<li><a href="logout.php"><?php echo $button_strings['Logout']; ?></a></li>
5049
</ul>
5150
</li>
5251
</ul>

0 commit comments

Comments
 (0)