tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mdtrooper 2013-06-25 10:45:01 +00:00
parent e11dca6754
commit c855e455cf
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -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.

9
pandora_console/extensions/vnc_view.php
View File

@ -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>";
}