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

2013-11-14 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_html.php: fixed the images of metaconsole,
	again.
	
	* include/functions_visual_map_editor.php: fixed the disabled
	agents only show their modules when it is selected in the editor.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9079 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-14 13:59:38 +00:00
parent 7e3c95c61b
commit 4b3b4f0ea8
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-11-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php: fixed the images of metaconsole,
again.
* include/functions_visual_map_editor.php: fixed the disabled
agents only show their modules when it is selected in the editor.
2013-11-14 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Change

20
pandora_console/include/functions_html.php
View File

@ -1644,12 +1644,22 @@ function html_print_image ($src, $return = false, $options = false, $return_src
if (defined('METACONSOLE')) {
if (!$relative) {
if (!is_readable("enterprise/meta/" . $src)) {
$src = ui_get_full_url('../../' . $src);
html_debug_print($src, true);
if (strstr(getcwd(), 'enterprise/meta') === false) {
if ($src[0] !== '/') {
$src = '/' . $src;
}
if (!is_readable(getcwd() . '/enterprise/meta' . $src)) {
$src = ui_get_full_url('../..' . $src);
}
else {
$src = ui_get_full_url($src);
}
}
else {
html_debug_print("###### " . $src, true);
if (!is_readable($src)) {
$src = ui_get_full_url('../../' . $src);
}
}
}
else {
@ -1662,7 +1672,7 @@ function html_print_image ($src, $return = false, $options = false, $return_src
$src = ui_get_full_url($src);
}
}
// Only return src field of image
if ($return_src) {

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -123,6 +123,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
$params['size'] = 30;
$params['selectbox_id'] = 'module';
$params['javascript_is_function_select'] = true;
$params['use_hidden_input_idagent'] = true;
$params['print_hidden_input_idagent'] = true;
if (defined('METACONSOLE')) {
$params['javascript_ajax_page'] = '../../ajax.php';
$params['disabled_javascript_on_blur_function'] = true;