From c855e455cf7248274f3d7ef2142997725b49db28 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 25 Jun 2013 10:45:01 +0000
Subject: [PATCH] 2013-06-25 Miguel de Dios <miguel.dedios@artica.es>

	* extensions/vnc_view.php: added the changes from the branch of
	pandora_4 made for Sancho.

	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog               | 11 +++++++++--
 pandora_console/extensions/vnc_view.php |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 810e105719..195b702f60 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,11 +1,18 @@
-2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
+2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
+
+	* extensions/vnc_view.php: added the changes from the branch of
+	pandora_4 made for Sancho.
+	
+	MERGED FROM THE BRANCH PANDORA_4.0
+
+2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
 
 	* operation/visual_console/render_view.php: fixed the javascript
 	draw lines when there is any error in the map.
 	
 	MERGED FROM THE BRANCH PANDORA_4.0
 
-2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
+2013-06-25 Miguel de Dios <miguel.dedios@artica.es>
 
 	* include/functions_visual_map.php: added more changes for to make
 	more easy the merges from the branch.
diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php
index 20ed151478..130d422344 100644
--- a/pandora_console/extensions/vnc_view.php
+++ b/pandora_console/extensions/vnc_view.php
@@ -18,7 +18,14 @@ function vnc_view() {
 	$idAgent = (int)get_parameter('id_agente', 0);
 	$ipAgent = db_get_value('direccion', 'tagente', 'id_agente', $idAgent);
 
-	echo "<iframe src='http://$ipAgent:5800' width='100%' height=550>";
+	$display = get_parameter("display", 0);
+	echo "<form method=post>";
+	echo __("VNC Display (:0 by default)");
+	echo "<input type=text name=display value=$display>";
+	echo "<input type=submit value='".__("Send")."'>";
+	echo "</form>";
+	$port = 5800 + $display;
+	echo "<iframe src='http://$ipAgent:$port' width='100%' height=600>";
 	echo "</iframe>";
 }