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

2012-03-08 Sancho Lerena <slerena@artica.es> 

* include/functions_visual_map.php
	operation/visual_console/public_console.php
	operation/visual_console/render_view.php: Changes for new feature
	"Public Visual Console".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5728 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-03-08 17:55:31 +00:00
parent 91eda84092
commit 93e51b8144
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-03-08 Sancho Lerena <slerena@artica.es>
* include/functions_visual_map.php
operation/visual_console/public_console.php
operation/visual_console/render_view.php: Changes for new feature
"Public Visual Console".
2012-03-08 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql

8
pandora_console/include/functions_visual_map.php
View File

@ -554,13 +554,13 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$proportion = $width / $layout["width"];
$mapHeight = $proportion * $layout["height"];
}
$backgroundImage = 'include/Image/image_functions.php?getFile=1&thumb=1&thumb_size=' . $mapWidth . 'x' . $mapHeight . '&file=' .
$backgroundImage = $config['homeurl'].'/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size=' . $mapWidth . 'x' . $mapHeight . '&file=' .
$config['homeurl'] . '/' . 'images/console/background/'.io_safe_input ($layout["background"]);
}
else {
$mapWidth = $layout["width"];
$mapHeight = $layout["height"];
$backgroundImage = 'images/console/background/'.io_safe_input ($layout["background"]);
$backgroundImage = $config['homeurl'].'/images/console/background/'.io_safe_input ($layout["background"]);
}
echo '<div id="layout_map"
@ -690,12 +690,12 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
if ($id_service != 0) {
//Link to an service page
echo '<a href="index.php?sec=services&sec2=enterprise/operation/services/services&id_service=' .
echo '<a href="'.$config['homeurl'].'/index.php?sec=services&sec2=enterprise/operation/services/services&id_service=' .
$id_service . '&offset=0">';
}
else {
// Link to an agent
echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agent.'">';
echo '<a href="'.$config['homeurl'].'/index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agent.'">';
}
}
elseif ($layout_data['id_layout_linked'] > 0) {

7
pandora_console/operation/visual_console/render_view.php
View File

@ -57,6 +57,13 @@ if (! check_acl ($config["id_user"], $id_group, "AR")) {
$options = array();
if (check_acl ($config["id_user"], $id_group, "AW")) {
$hash = md5($config["dbpass"]. $id_layout. $config["id_user"]);
$options['public_link']['text'] = '<a href="'.$config["homeurl"].'/operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"].'">'.
html_print_image ("images/camera.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>';
$options['setup']['text'] = '<a href="index.php?sec=gmap&sec2=godmode/reporting/visual_console_builder&tab=data&action=edit&id_visual_console='.$id_layout.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
$options['setup']['active'] = false;
}