ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move validateForm

pull/2077/head
digital-gnome 2017-12-13 22:19:25 -05:00
parent 04efff699a
commit a2c785f7eb
2 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/skins/classic/views/js/filter.js
View File

@ -1,3 +1,24 @@
function validateForm ( form ) {
let rows = $j(form).find('tbody').eq(0).find('tr');
let obrCount = 0;
let cbrCount = 0;
for ( let i = 0; i < rows.length; i++ ) {
if (rows.length > 2) {
obrCount += parseInt(form.elements['filter[Query][terms][' + i + '][obr]'].value);
cbrCount += parseInt(form.elements['filter[Query][terms][' + i + '][cbr]'].value);
}
if (form.elements['filter[Query][terms][' + i + '][val]'].value == '') {
alert( errorValue );
return false;
}
}
if (obrCount - cbrCount != 0) {
alert( errorBrackets );
return false;
}
return true;
}
function updateButtons( element ) {
var form = element.form;

49
web/skins/classic/views/js/filter.js.php
View File

@ -2,52 +2,3 @@ var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_de
var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
var deleteSavedFilterString = "<?php echo translate('DeleteSavedFilter') ?>";
function validateForm( form ) {
<?php
if ( isset ($_REQUEST['filter']) && isset($_REQUEST['filter']['terms']) ) {
if ( count($_REQUEST['filter']['terms']) > 2 ) {
?>
var bracket_count = 0;
<?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) {
?>
var obr = form.elements['filter[terms][<?php echo $i ?>][obr]'];
var cbr = form.elements['filter[terms][<?php echo $i ?>][cbr]'];
bracket_count += parseInt(obr.options[obr.selectedIndex].value);
bracket_count -= parseInt(cbr.options[cbr.selectedIndex].value);
<?php
}
?>
if ( bracket_count ) {
alert( "<?php echo translate('ErrorBrackets') ?>" );
return( false );
}
<?php
}
?>
<?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) {
?>
var val = form.elements['filter[terms][<?php echo $i ?>][val]'];
if ( val.value == '' ) {
alert( "<?php echo translate('ErrorValidValue') ?>" );
return( false );
}
<?php
}
} // end if isset ($_REQUEST['filter']) && isset($_REQUEST['filter']['terms'])
?>
return( true );
}
<?php
if ( !empty($hasCal) ) {
?>
</script>
<style type="text/css">@import url(tools/jscalendar/calendar-win2k-1.css);</style>
<script type="text/javascript" src="tools/jscalendar/calendar.js"></script>
<script type="text/javascript" src="tools/jscalendar/lang/calendar-en.js"></script>
<script type="text/javascript" src="tools/jscalendar/calendar-setup.js"></script>
<script type="text/javascript">
// Empty
<?php
}