From e5bf2d245cbdc1cc3bcc05cf71b47b83eeb07566 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 10 Apr 2016 15:33:55 -0500
Subject: [PATCH] quit the stream in zones.php when zone.php is called

---
 web/includes/config.php.in              | 1 +
 web/skins/classic/views/js/zones.js     | 9 +++++++++
 web/skins/classic/views/js/zones.js.php | 4 ++++
 web/skins/classic/views/zones.php       | 6 ++++--
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 web/skins/classic/views/js/zones.js
 create mode 100644 web/skins/classic/views/js/zones.js.php

diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 2ca819210..ba96d9a54 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -104,6 +104,7 @@ define( "CMD_PREV", 12 );
 define( "CMD_NEXT", 13 );
 define( "CMD_SEEK", 14 );
 define( "CMD_VARPLAY", 15 );
+define( "CMD_QUIT", 17 );
 define( "CMD_QUERY", 99 );
 
 //
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
new file mode 100644
index 000000000..2ae6e8b5e
--- /dev/null
+++ b/web/skins/classic/views/js/zones.js
@@ -0,0 +1,9 @@
+var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel' } );
+var streamCmdTimer = null;
+
+function streamCmdQuit( action ) {
+    if ( action )
+        streamCmdReq.send( streamCmdParms+"&command="+CMD_QUIT );
+}
+
diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
new file mode 100644
index 000000000..ca234085e
--- /dev/null
+++ b/web/skins/classic/views/js/zones.js.php
@@ -0,0 +1,4 @@
+var connKey = '<?php echo $connkey ?>';
+var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
+var CMD_QUIT = <?php echo CMD_QUIT ?>;
+
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 940cce72a..3aa776c6b 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -37,6 +37,8 @@ foreach( dbFetchAll( 'select * from Zones where MonitorId = ? order by Area desc
     }
 }
 
+$connkey = generateConnKey();
+
 xhtmlHeaders(__FILE__, translate('Zones') );
 ?>
 <body>
@@ -51,7 +53,7 @@ xhtmlHeaders(__FILE__, translate('Zones') );
 <?php
       foreach( array_reverse($zones) as $zone ) {
 ?>
-        <polygon points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type']?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width ?>, <?php echo $monitor->Height ?> ); return( false );"/>
+        <polygon points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type']?>" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width ?>, <?php echo $monitor->Height ?> ); return( false );"/>
 <?php
       } // end foreach zone
 ?>
@@ -76,7 +78,7 @@ foreach( $zones as $zone )
 {
 ?>
             <tr>
-              <td class="colName"><a href="#" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> ); return( false );"><?php echo $zone['Name'] ?></a></td>
+              <td class="colName"><a href="#" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> ); return( false );"><?php echo $zone['Name'] ?></a></td>
               <td class="colType"><?php echo $zone['Type'] ?></td>
               <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf( "%.2f", ($zone['Area']*100)/($monitor->Width()*$monitor->Height()) ) ?></td>
               <td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>