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

Fixed external link images in meta. Ticket#2827

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-05 16:45:49 +02:00
parent c24fd49536
commit c411c026fa
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_html.php
View File

@ -1775,7 +1775,7 @@ function html_print_checkbox ($name, $value, $checked = false, $return = false,
* @return string HTML code if return parameter is true.
*/
function html_print_image ($src, $return = false, $options = false,
$return_src = false, $relative = false, $no_in_meta = false) {
$return_src = false, $relative = false, $no_in_meta = false, $isExternalLink = false) {
global $config;
@ -1808,8 +1808,13 @@ function html_print_image ($src, $return = false, $options = false,
}
if (!is_readable($working_dir . '/enterprise/meta' . $src)) {
if ($isExternalLink) {
$src = ui_get_full_url($src);
}
else {
$src = ui_get_full_url('../..' . $src);
}
}
else {
$src = ui_get_full_url($src);
}

20
pandora_console/include/functions_visual_map.php
View File

@ -88,7 +88,7 @@ function visual_map_print_user_line_handles($layoutData) {
}
function visual_map_print_item($mode = "read", $layoutData,
$proportion = null, $show_links = true) {
$proportion = null, $show_links = true, $isExternalLink = false) {
global $config;
require_once ($config["homedir"] . '/include/functions_graph.php');
@ -158,7 +158,7 @@ function visual_map_print_item($mode = "read", $layoutData,
$element_enterprise = array();
if (enterprise_installed()) {
$element_enterprise = enterprise_visual_map_print_item(
$mode, $layoutData, $proportion, $show_links);
$mode, $layoutData, $proportion, $show_links, $isExternalLink);
}
@ -873,13 +873,15 @@ function visual_map_print_item($mode = "read", $layoutData,
"width" => "$width",
"height" => "$height",
"title" => $img_style_title,
"style" => $borderStyle));
"style" => $borderStyle), false,
false, false, $isExternalLink);
else
echo html_print_image($img, true,
array("class" => "image",
"id" => "image_" . $id,
"title" => $img_style_title,
"style" => $borderStyle));
"style" => $borderStyle), false,
false, false, $isExternalLink);
echo '<br />';
}
echo io_safe_output($text);
@ -983,10 +985,12 @@ function visual_map_print_item($mode = "read", $layoutData,
array("class" => "image",
"id" => "image_" . $id,
"width" => "$width",
"height" => "$height"));
"height" => "$height"), false,
false, false, $isExternalLink);
else
echo html_print_image($img, true,
array("class" => "image", "id" => "image_" . $id));
array("class" => "image", "id" => "image_" . $id),
false, false, false, $isExternalLink);
echo '<br />';
}
break;
@ -1768,7 +1772,7 @@ function visual_map_print_user_lines($layout_data, $proportion = null) {
* @param bool $draw_lines
*/
function visual_map_print_visual_map ($id_layout, $show_links = true,
$draw_lines = true, $width = null, $height = null, $home_url = '') {
$draw_lines = true, $width = null, $height = null, $home_url = '', $isExternalLink = false) {
enterprise_include_once('include/functions_visual_map.php');
@ -1917,7 +1921,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true,
break;
default:
visual_map_print_item("read", $layout_data,
$proportion, $show_links);
$proportion, $show_links, $isExternalLink);
break;
}
}

2
pandora_console/operation/visual_console/public_console.php
View File

@ -79,7 +79,7 @@ $options = array();
echo '<div style="width: 95%; background: white; margin: 20px auto 20px auto; box-shadow: 10px 10px 5px #000;">';
echo "<h1>" . $layout_name . "</h1>";
visual_map_print_visual_map ($id_layout, true, true, null, null, '../../');
visual_map_print_visual_map ($id_layout, true, true, null, null, '../../', true);
$values = array ();
$values[5] = human_time_description_raw (5);