From 62991be0db02ecc4c9e8be2324f4aaa779bedeb5 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Mon, 27 Oct 2003 17:08:40 +0000
Subject: [PATCH] Changed to handle return value from buildSelect

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@667 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_html_view_event.php      |  4 ++--
 web/zm_html_view_filter.php     | 16 ++++++++--------
 web/zm_html_view_filtersave.php |  2 +-
 web/zm_html_view_video.php      |  4 ++--
 web/zm_html_view_watchfeed.php  |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/zm_html_view_event.php b/web/zm_html_view_event.php
index 527b5a684..726f18913 100644
--- a/web/zm_html_view_event.php
+++ b/web/zm_html_view_event.php
@@ -98,8 +98,8 @@ Learn Pref:&nbsp;<select name="learn_state" class="form" onChange="learn_form.su
 <input type="hidden" name="view" value="<?= $view ?>">
 <input type="hidden" name="mid" value="<?= $mid ?>">
 <input type="hidden" name="eid" value="<?= $eid ?>">
-Rate: <?php buildSelect( "rate", $rates, "document.view_form.submit();" ); ?>&nbsp;&nbsp;
-Scale: <?php buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
+Rate: <?= buildSelect( "rate", $rates, "document.view_form.submit();" ); ?>&nbsp;&nbsp;
+Scale: <?= buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
 </form>
 </td>
 </tr>
diff --git a/web/zm_html_view_filter.php b/web/zm_html_view_filter.php
index 518139edc..87af567e2 100644
--- a/web/zm_html_view_filter.php
+++ b/web/zm_html_view_filter.php
@@ -154,7 +154,7 @@ window.focus();
 <td valign="top"><table border="0" cellspacing="0" cellpadding="0" width="100%">
 <tr>
 <td align="left" class="text">Use&nbsp;<select name="trms" class="form" onChange="submitToFilter( document.filter_form );"><?php for ( $i = 0; $i <= 8; $i++ ) { ?><option value="<?= $i ?>"<?php if ( $i == $trms ) { echo " selected"; } ?>><?= $i ?></option><?php } ?></select>&nbsp;filter&nbsp;expressions</td>
-<td align="center" class="text">Use filter:&nbsp;<?php if ( count($filter_names) > 1 ) { buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form );" ); } else { ?><select class="form" disabled><option>No Saved Filters</option></select><?php } ?></td>
+<td align="center" class="text">Use filter:&nbsp;<?php if ( count($filter_names) > 1 ) { echo buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form );" ); } else { ?><select class="form" disabled><option>No Saved Filters</option></select><?php } ?></td>
 <?php if ( canEdit( 'Events' ) ) { ?>
 <td align="center" class="text"><a href="javascript: saveFilter( document.filter_form );">Save</a></td>
 <?php } else { ?>
@@ -194,23 +194,23 @@ window.focus();
 		else
 		{
 ?>
-<td class="text"><?php buildSelect( $conjunction_name, $conjunction_types ); ?></td>
+<td class="text"><?= buildSelect( $conjunction_name, $conjunction_types ); ?></td>
 <?php
 		}
 ?>
-<td class="text"><?php if ( $trms > 2 ) { buildSelect( $obracket_name, $obracket_types ); } else { ?>&nbsp;<?php } ?></td>
-<td class="text"><?php buildSelect( $attr_name, $attr_types, "$value_name.value = ''; submitToFilter( document.filter_form );" ); ?></td>
+<td class="text"><?php if ( $trms > 2 ) { echo buildSelect( $obracket_name, $obracket_types ); } else { ?>&nbsp;<?php } ?></td>
+<td class="text"><?= buildSelect( $attr_name, $attr_types, "$value_name.value = ''; submitToFilter( document.filter_form );" ); ?></td>
 <?php if ( $$attr_name == "Archived" ) { ?>
 <td class="text"><center>is equal to</center></td>
-<td class="text"><?php buildSelect( $value_name, $archive_types ); ?></td>
+<td class="text"><?= buildSelect( $value_name, $archive_types ); ?></td>
 <?php } elseif ( $$attr_name ) { ?>
-<td class="text"><?php buildSelect( $op_name, $op_types ); ?></td>
+<td class="text"><?= buildSelect( $op_name, $op_types ); ?></td>
 <td class="text"><input name="<?= $value_name ?>" value="<?= $$value_name ?>" class="form" size="16"></td>
 <?php } else { ?>
-<td class="text"><?php buildSelect( $op_name, $op_types ); ?></td>
+<td class="text"><?= buildSelect( $op_name, $op_types ); ?></td>
 <td class="text"><input name="<?= $value_name ?>" value="<?= $$value_name ?>" class="form" size="16"></td>
 <?php } ?>
-<td class="text"><?php if ( $trms > 2 ) { buildSelect( $cbracket_name, $cbracket_types ); } else { ?>&nbsp;<?php } ?></td>
+<td class="text"><?php if ( $trms > 2 ) { echo buildSelect( $cbracket_name, $cbracket_types ); } else { ?>&nbsp;<?php } ?></td>
 </tr>
 <?php
 	}
diff --git a/web/zm_html_view_filtersave.php b/web/zm_html_view_filtersave.php
index dc3ea88c4..bedfaff65 100644
--- a/web/zm_html_view_filtersave.php
+++ b/web/zm_html_view_filtersave.php
@@ -72,7 +72,7 @@ window.focus();
 	}
 ?>
 <?php if ( count($filter_names) ) { ?>
-<td align="left" colspan="2" class="text">Save as:&nbsp;<?php buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form );" ); ?>&nbsp;or enter new name:&nbsp;<input type="text" size="32" name="new_<?= $select_name ?>" value="<?= $filter ?>" class="form"></td>
+<td align="left" colspan="2" class="text">Save as:&nbsp;<?= buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form );" ); ?>&nbsp;or enter new name:&nbsp;<input type="text" size="32" name="new_<?= $select_name ?>" value="<?= $filter ?>" class="form"></td>
 <?php } else { ?>
 <td align="left" colspan="2" class="text">Enter new filter name:&nbsp;<input type="text" size="32" name="new_<?= $select_name ?>" value="" class="form"></td>
 <?php } ?>
diff --git a/web/zm_html_view_video.php b/web/zm_html_view_video.php
index ba0790d83..de36afbc6 100644
--- a/web/zm_html_view_video.php
+++ b/web/zm_html_view_video.php
@@ -30,8 +30,8 @@
 <table align="center" border="0" cellspacing="0" cellpadding="2" width="250">
 <tr><td colspan="2" class="head" align="center">Video Generation Parameters</td></tr>
 <tr><td colspan="2">&nbsp;</td></tr>
-<tr><td class="text" align="right">Frame Rate</td><td><?php buildSelect( "rate", $rates ) ?></td></tr>
-<tr><td class="text" align="right">Video Size</td><td><?php buildSelect( "scale", $scales ) ?></td></tr>
+<tr><td class="text" align="right">Frame Rate</td><td><?= buildSelect( "rate", $rates ) ?></td></tr>
+<tr><td class="text" align="right">Video Size</td><td><?= buildSelect( "scale", $scales ) ?></td></tr>
 <tr><td class="text" align="right">Overwite Existing</td><td><input type="checkbox" class="form-noborder" name="overwrite" value="1"<?php if ( $overwrite ) { ?> checked<?php } ?>></td></tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr><td colspan="2" align="center"><input type="submit" class="form" value="Generate Video"></td></tr>
diff --git a/web/zm_html_view_watchfeed.php b/web/zm_html_view_watchfeed.php
index 43c48d853..2b5c8acdf 100644
--- a/web/zm_html_view_watchfeed.php
+++ b/web/zm_html_view_watchfeed.php
@@ -67,7 +67,7 @@ window.setTimeout( "window.location.reload(true)", <?= REFRESH_IMAGE*1000 ?> );
 <form name="view_form" method="get" action="<?= $PHP_SELF ?>">
 <input type="hidden" name="view" value="<?= $view ?>">
 <input type="hidden" name="mid" value="<?= $mid ?>">
-Scale: <?php buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
+Scale: <?= buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
 </td>
 <?php } else { ?>
 <td align="center" class="text">&nbsp;</td>