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

Merge pull request #373 from m-bene/filterTermsUndefined 

Fix 'Undefined index: filter' php warnings for filter view when
pull/374/head
Andrew Bauer 2014-04-07 15:24:54 -05:00
parent 329f6ae5c4 9a714f8d6d
commit 221f9afa6c
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/views/filter.php
View File

@ -160,7 +160,7 @@ xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
<table id="fieldsTable" class="filterTable" cellspacing="0"> <table id="fieldsTable" class="filterTable" cellspacing="0">
<tbody> <tbody>
<?php <?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
<tr> <tr>

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

@ -1,9 +1,8 @@
var deleteSavedFilterString = "<?= $SLANG['DeleteSavedFilter'] ?>"; var deleteSavedFilterString = "<?= $SLANG['DeleteSavedFilter'] ?>";
function validateForm( form ) function validateForm( form )
{ {
<?php <?php
if ( count($_REQUEST['filter']['terms']) > 2 ) if ( isset ($_REQUEST['filter']) && count($_REQUEST['filter']['terms']) > 2 )
{ {
?> ?>
var bracket_count = 0; var bracket_count = 0;
@ -27,7 +26,7 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
} }
?> ?>
<?php <?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
var val = form.elements['filter[terms][<?= $i ?>][val]']; var val = form.elements['filter[terms][<?= $i ?>][val]'];

2
web/skins/flat/views/filter.php
View File

@ -160,7 +160,7 @@ xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
<table id="fieldsTable" class="filterTable" cellspacing="0"> <table id="fieldsTable" class="filterTable" cellspacing="0">
<tbody> <tbody>
<?php <?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
<tr> <tr>

4
web/skins/flat/views/js/filter.js.php
View File

@ -3,7 +3,7 @@ var deleteSavedFilterString = "<?= $SLANG['DeleteSavedFilter'] ?>";
function validateForm( form ) function validateForm( form )
{ {
<?php <?php
if ( count($_REQUEST['filter']['terms']) > 2 ) if ( isset ($_REQUEST['filter']) && count($_REQUEST['filter']['terms']) > 2 )
{ {
?> ?>
var bracket_count = 0; var bracket_count = 0;
@ -27,7 +27,7 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
} }
?> ?>
<?php <?php
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
var val = form.elements['filter[terms][<?= $i ?>][val]']; var val = form.elements['filter[terms][<?= $i ?>][val]'];