From 0c2edfef4a5fda8b99a571dc939e0be341c1258a Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Mon, 1 Sep 2008 14:03:52 +0000
Subject: [PATCH] Corrected selection of LinkedMonitors.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2619 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/skins/classic/views/js/monitor.js.php | 12 ++++++++++++
 web/skins/classic/views/monitor.php       |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 0310a5348..bca3e12c6 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -104,6 +104,18 @@ function validateForm( form )
             errors[errors.length] = "<?= $SLANG['BadSignalCheckColour'] ?>";
     if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
         errors[errors.length] = "<?= $SLANG['BadWebColour'] ?>";
+
+    if ( form.elements['monitorIds'] )
+    {
+        var monitorIds = new Array();
+        for ( var i = 0; i < form.elements['monitorIds'].options.length; i++ )
+        {
+            if ( form.elements['monitorIds'].options[i].selected )
+                monitorIds[monitorIds.length] = form.elements['monitorIds'].options[i].value;
+        }
+        form.elements['newMonitor[LinkedMonitors]'].value = monitorIds.join( ',' );
+    }
+
     if ( errors.length )
     {
         alert( errors.join( "\n" ) );
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index b0740c1db..8fc86bfcd 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -249,6 +249,7 @@ foreach ( $tabs as $name=>$value )
         <input type="hidden" name="tab" value="<?= $_REQUEST['tab'] ?>"/>
         <input type="hidden" name="action" value="monitor"/>
         <input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"/>
+        <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?= isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
 <?php
 if ( $_REQUEST['tab'] != 'general' )
 {
@@ -257,7 +258,7 @@ if ( $_REQUEST['tab'] != 'general' )
         <input Type="hidden" name="newMonitor[Type]" value="<?= $newMonitor['Type'] ?>"/>
         <input type="hidden" name="newMonitor[Function]" value="<?= $newMonitor['Function'] ?>"/>
         <input type="hidden" name="newMonitor[Enabled]" value="<?= $newMonitor['Enabled'] ?>"/>
-        <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?= isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
+        <input type="hidden" name="monitorIds" value="<?= isset($_REQUEST['monitorIds'])?$_REQUEST['monitorIds']:'' ?>"/>
         <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?= $newMonitor['RefBlendPerc'] ?>"/>
         <input type="hidden" name="newMonitor[MaxFPS]" value="<?= $newMonitor['MaxFPS'] ?>"/>
         <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?= $newMonitor['AlarmMaxFPS'] ?>"/>
@@ -390,7 +391,7 @@ switch ( $_REQUEST['tab'] )
             <tr>
               <td><?= $SLANG['LinkedMonitors'] ?></td>
               <td>
-                <select name="newMonitor[LinkedMonitors]" size="4" multiple="multiple">
+                <select name="monitorIds" size="4" multiple="multiple">
 <?php
     $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
     if ( !empty($newMonitor['LinkedMonitors']) )
@@ -399,7 +400,7 @@ switch ( $_REQUEST['tab'] )
         $monitorIds = array();
     foreach ( $monitors as $monitor )
     {
-        if ( visibleMonitor( $monitor['Id'] ) )
+        if ( ($monitor['Id'] != $newMonitor['Id']) && visibleMonitor( $monitor['Id'] ) )
         {
 ?>
                   <option value="<?= $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?= htmlentities($monitor['Name']) ?></option>