Skip to content

Fix: Call "getBodyTopHTML" instead of the <body> tag (video, stats, controlcap, export, error, login, optionhelp, files, privacy, control, monitorpreset, frames, timeline, postlogin, cycle, bandwidth, plugin) #4264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 17, 2025
Merged

Fix: Call "getBodyTopHTML" instead of the <body> tag (video, stats, controlcap, export, error, login, optionhelp, files, privacy, control, monitorpreset, frames, timeline, postlogin, cycle, bandwidth, plugin) #4264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a898fb2
Fix: Call "getBodyTopHTML" instead of the <body> tag (video.php)
IgorA100 Mar 16, 2025
39137bb
Fix: Call "getBodyTopHTML" instead of the <body> tag (stats.php)
IgorA100 Mar 16, 2025
a0effce
Fix: Call "getBodyTopHTML" instead of the <body> tag (controlcap.php)
IgorA100 Mar 17, 2025
50c964f
Fix: Removed extra closing tags </body></html> (stats.php)
IgorA100 Mar 17, 2025
e82e74c
Fix: Call "getBodyTopHTML" instead of the <body> tag (export.php)
IgorA100 Mar 17, 2025
7fa3fac
Fix: Call "getBodyTopHTML" instead of the <body> tag (error.php)
IgorA100 Mar 17, 2025
74bb40e
Fix: Call "getBodyTopHTML" instead of the <body> tag & replacing tab…
IgorA100 Mar 17, 2025
d69b1f2
Fix: Call "getBodyTopHTML" instead of the <body> tag (optionhelp.php)
IgorA100 Mar 17, 2025
4b4367e
Fix: Call "getBodyTopHTML" instead of the <body> tag (files.php)
IgorA100 Mar 17, 2025
a70bbcf
Fix: Call "getBodyTopHTML" instead of the <body> tag (privacy.php)
IgorA100 Mar 17, 2025
4da7aad
Fix: Call "getBodyTopHTML" instead of the <body> tag (control.php)
IgorA100 Mar 17, 2025
e36cf8d
Fix: Call "getBodyTopHTML" instead of the <body> tag (monitorpreset.php)
IgorA100 Mar 17, 2025
a2a2c48
Fix: Call "getBodyTopHTML" instead of the <body> tag (frames.php)
IgorA100 Mar 17, 2025
22d56e5
Fix: Call "getBodyTopHTML" instead of the <body> tag (timeline.php)
IgorA100 Mar 17, 2025
dc42f58
Fix: Call "getBodyTopHTML" instead of the <body> tag (postlogin.php)
IgorA100 Mar 17, 2025
77d905f
Fix: Call "getBodyTopHTML" instead of the <body> tag (cycle.php)
IgorA100 Mar 17, 2025
fb122e0
Fix: Call "getBodyTopHTML" instead of the <body> tag (bandwidth.php)
IgorA100 Mar 17, 2025
e74e713
Fix: Call "getBodyTopHTML" instead of the <body> tag (plugin.php)
IgorA100 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions web/skins/classic/views/bandwidth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Bandwidth'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<h2><?php echo translate('Bandwidth') ?></h2>
Expand All @@ -52,5 +53,4 @@
</form>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
6 changes: 3 additions & 3 deletions web/skins/classic/views/control.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Control'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<div id="headerButtons">
Expand All @@ -72,5 +73,4 @@
</div>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
4 changes: 2 additions & 2 deletions web/skins/classic/views/controlcap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
}

xhtmlHeaders(__FILE__, translate('ControlCap').' - '.$Control['Name']);
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page" class="container-fluid">
<div class="row flex-nowrap">
<nav> <!-- BEGIN PILL LIST -->
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/cycle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@

noCacheHeaders();
xhtmlHeaders(__FILE__, translate('CycleWatch'));
getBodyTopHTML();
echo $navbar = getNavBarHTML();
?>
<body>
<div id="page">
<?php echo $navbar = getNavBarHTML(); ?>
<div id="header">
<div id="headerButtons">
<?php if ( $options['mode'] == 'stream' ) { ?>
Expand Down
7 changes: 3 additions & 4 deletions web/skins/classic/views/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Error') );
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<div id="header">
<h1>ZoneMinder <?php echo translate('Error') ?></h1>
Expand All @@ -37,5 +37,4 @@
</p>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
4 changes: 2 additions & 2 deletions web/skins/classic/views/export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();

xhtmlHeaders(__FILE__, translate('Export'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<?php echo getNavBarHTML() ?>
<div class="w-100 py-1">
<div class="float-left pl-3">
<button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ function guess_material_icon($file) {
}

xhtmlHeaders(__FILE__, translate('Files'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<?php echo $navbar = getNavBarHTML(); ?>
<div id="content">
<form id="filesForm" name="filesForm" method="post" action="?view=files&path=<?php echo urlencode($path); ?>">
<?php
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/frames.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
$Event = new ZM\Event($eid);

xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page" class="container-fluid p-3">
<!-- Toolbar button placement and styling handled by bootstrap-tables -->
<div id="toolbar">
Expand Down
39 changes: 19 additions & 20 deletions web/skins/classic/views/login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
<?php
xhtmlHeaders(__FILE__, translate('Login'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML(); ?>
<div class="container">
<div class="container">
<?php
if ( defined('ZM_OPT_USE_AUTH') and ZM_OPT_USE_AUTH ) {
?>
<form class="center-block" name="loginForm" id="loginForm" method="post" action="?view=login">
<input type="hidden" name="action" value="login"/>
<form class="center-block" name="loginForm" id="loginForm" method="post" action="?view=login">
<input type="hidden" name="action" value="login"/>
<input type="hidden" name="postLoginQuery" value="<?php echo isset($_SESSION['postLoginQuery']) ? validHtmlStr($_SESSION['postLoginQuery']) : ''; ?>" />

<div id="loginError" class="hidden alarm" role="alert">
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
Invalid username or password.
</div>
<div id="loginError" class="hidden alarm" role="alert">
<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
Invalid username or password.
</div>

<div id="loginform">
<div id="loginform">

<h1><i class="material-icons md-36">account_circle</i> <?php echo validHtmlStr(ZM_WEB_TITLE) . ' ' . translate('Login') ?></h1>

<label for="inputUsername" class="sr-only"><?php echo translate('Username') ?></label>
<input type="text" id="inputUsername" name="username" class="form-control" autocapitalize="none" placeholder="Username" required autofocus autocomplete="username"/>

<label for="inputPassword" class="sr-only"><?php echo translate('Password') ?></label>
<input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required autocomplete="current-password"/>
<label for="inputUsername" class="sr-only"><?php echo translate('Username') ?></label>
<input type="text" id="inputUsername" name="username" class="form-control" autocapitalize="none" placeholder="Username" required autofocus autocomplete="username"/>

<label for="inputPassword" class="sr-only"><?php echo translate('Password') ?></label>
<input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required autocomplete="current-password"/>
<?php
if (
defined('ZM_OPT_USE_GOOG_RECAPTCHA')
Expand All @@ -35,9 +34,9 @@
echo '<div class="g-recaptcha" data-sitekey="'.ZM_OPT_GOOG_RECAPTCHA_SITEKEY.'"></div>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>';
} ?>
<button class="btn btn-lg btn-primary btn-block" type="submit"><?php echo translate('Login') ?></button>
</div>
</form>
<button class="btn btn-lg btn-primary btn-block" type="submit"><?php echo translate('Login') ?></button>
</div>
</form>
<?php
} else {
?>
Expand All @@ -52,5 +51,5 @@
<?php
} # end if ZM_OPT_AUTH
?>
</div>
</div>
<?php xhtmlFooter() ?>
4 changes: 2 additions & 2 deletions web/skins/classic/views/monitorpreset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('MonitorPreset') );
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<h2><?php echo translate('MonitorPreset') ?></h2>
<div id="content">
Expand Down
6 changes: 3 additions & 3 deletions web/skins/classic/views/optionhelp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('OptionHelp'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<div id="headerButtons">
Expand All @@ -45,5 +46,4 @@
<p class="textblock"><?php echo $optionHelpText ?></p>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
8 changes: 4 additions & 4 deletions web/skins/classic/views/plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ function pLang($name)
return $name;
}


xhtmlHeaders(__FILE__, translate('Plugin'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<h2><?php echo translate('Monitor') ?> <?php echo $monitor->Name() ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?> - <?php echo translate('Plugin') ?> <?php echo validHtmlStr($plugin) ?></h2>
Expand Down Expand Up @@ -161,5 +162,4 @@ function pLang($name)
</form>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
3 changes: 2 additions & 1 deletion web/skins/classic/views/postlogin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
//

xhtmlHeaders(__FILE__, translate('LoggingIn'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<h1><?php echo validHtmlStr(ZM_WEB_TITLE) . ' ' . translate('Login') ?></h1>
Expand Down
3 changes: 2 additions & 1 deletion web/skins/classic/views/privacy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Privacy'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<div id="page">
<div id="header">
<h2><?php echo translate('Privacy') ?></h2>
Expand Down
6 changes: 2 additions & 4 deletions web/skins/classic/views/stats.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Stats').' - '.$eid.' - '.$fid);
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<!-- Toolbar button placement and styling handled by bootstrap-tables -->
<div id="toolbar">
Expand All @@ -48,6 +48,4 @@
</form>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>
4 changes: 2 additions & 2 deletions web/skins/classic/views/timeline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,9 @@ function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass ) {
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Timeline'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page p-0">
<div class="d-flex p-1">
<div class="mr-auto" id="toolbar" >
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/video.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@
$focusWindow = true;

xhtmlHeaders(__FILE__, translate('Video'));
getBodyTopHTML();
echo getNavBarHTML();
?>
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<div class="w-100 py-1">
<div class="float-left pl-3">
Expand Down