ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix buttons in shutdown modal

This commit is contained in:
Andrew Bauer 2020-10-12 14:51:33 -05:00
parent 49fec5142c
commit c4ea27db8d
3 changed files with 19 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/ajax/modals/shutdown.php
View File

@ -1,4 +1,6 @@
<?php
global $view;
$error='';
if ( !canEdit('System') ) {
@ -40,7 +42,11 @@ if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel
</button>
</div>
<div class="modal-body">
<form name="contentForm" id="contentForm" method="post" action="?">
<form name="contentForm" id="shutdownForm" method="post" action="?">
<?php
// We have to manually insert the csrf key into the form when using a modal generated via ajax call
echo getCSRFinputHTML();
?>
<input type="hidden" name="view" value="shutdown"/>
<?php echo $output_str ?>
<?php echo $cancel_str ?>
@ -54,8 +60,8 @@ if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel
</div>
<div class="modal-footer">
<?php echo $cancel_btn ?>
<button type="submit" class="btn btn-primary" name="action" value="restart"><?php echo translate('Restart') ?></button>
<button type="submit" class="btn btn-primary" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
<button type="submit" id="restartBtn" class="btn btn-primary" name="action" value="restart"><?php echo translate('Restart') ?></button>
<button type="submit" id="shutdownBtn" class="btn btn-primary" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
</div>
</form>

10
web/skins/classic/js/skin.js
View File

@ -830,6 +830,16 @@ function getShutdownModal() {
}
// Manage the Shutdown modal
$j('#shutdownModal').modal('show');
// Redirect to the current view after the form is submitted - avoids a blank screen
$j('#shutdownForm').append('<input type="hidden" name="redirect" value="'+ currentView +'" />');
$j('#restartBtn').click(function(evt) {
evt.preventDefault();
$j('#shutdownForm').submit();
});
$j('#shutdownBtn').click(function(evt) {
evt.preventDefault();
$j('#shutdownForm').submit();
});
})
.fail(logAjaxFail);
}

79
web/skins/classic/views/shutdown.php
View File

@ -1,79 +0,0 @@
<?php
//
// ZoneMinder web shutdown view file
// Copyright (C) 2019 ZoneMinder LLC
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//
if ( !canEdit('System') ) {
$view = 'error';
return;
}
$focusWindow = true;
xhtmlHeaders(__FILE__, translate('Shutdown').' '.translate('Restart'));
?>
<body>
<div id="page">
<div id="header">
<h2><?php echo translate('Shutdown').' '.translate('Restart') ?></h2>
</div>
<div id="content">
<?php
if ( !defined('ZM_PATH_SHUTDOWN') or ZM_PATH_SHUTDOWN == '' ) {
echo '<div class="error">ZM_PATH_SHUTDOWN is not defined. This is normally configured in /etc/zm/conf.d/01-system-paths.conf</div>';
} else if ( !file_exists(ZM_PATH_SHUTDOWN) ) {
echo '<div class="error">Path does not exist for ZM_PATH_SHUTDOWN. Current value is '.ZM_PATH_SHUTDOWN.'</div>';
} else {
?>
<form name="contentForm" id="contentForm" method="post" action="?">
<input type="hidden" name="view" value="shutdown"/>
<?php
if ( isset($output) ) {
echo '<p>'.implode('<br/>', $output).'</p>';
}
if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
echo '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>';
}
?>
<p class="warning"><h2>Warning</h2>
This command will either shutdown or restart all ZoneMinder Servers<br/>
</p>
<p>
<input type="radio" name="when" value="now" id="whennow"/><label for="whennow">Now</label>
<input type="radio" name="when" value="1min" id="when1min" checked="checked"/><label for="when1min">1 Minute</label>
</p>
<div id="contentButtons">
<?php
if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
?>
<button type="submit" name="action" value="cancel"><?php echo translate('Cancel') ?></button>
<?php
}
?>
<button type="submit" name="action" value="restart"><?php echo translate('Restart') ?></button>
<button type="submit" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
<button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
</div>
</form>
<?php
} # end if PATH_SHUTDOWN looks value
?>
</div>
</div>
<?php xhtmlFooter() ?>