diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d1e230cc86..60be03b4da 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-11-20 Miguel de Dios + + * include/functions_ui.php: removed the hack for metaconsole in the + "ui_toggle", now this hack fails because it is fixed the images in + the metaconsole. + + * operation/agentes/alerts_status.php: cleaned source code style. + 2013-11-20 Miguel de Dios * godmode/groups/configure_group.php, godmode/groups/group_list.php: diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 8f178a8dc3..ef881ff3b7 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1524,6 +1524,7 @@ function ui_pagination ($count, $url = false, $offset = 0, $pagination = 0, $ret return false; } + // If exists more registers than I can put in a page, calculate index markers $index_counter = ceil ($count /$pagination); // Number of blocks of block_size with data $index_page = ceil ($offset / $pagination) - (ceil ($block_limit / 2)); // block to begin to show data; @@ -1918,25 +1919,21 @@ function ui_print_status_image ($type, $title = "", $return = false, $options = */ function ui_toggle($code, $name, $title = '', $hidden_default = true, $return = false) { - $hack_metaconsole = ''; - if (defined('METACONSOLE')) - $hack_metaconsole = '../../'; - // Generate unique Id $uniqid = uniqid(''); // Options if ($hidden_default) { $style = 'display:none'; - $image_a = html_print_image($hack_metaconsole . "images/down.png", true, false, true); - $image_b = html_print_image($hack_metaconsole . "images/go.png", true, false, true); - $original = $hack_metaconsole . "images/go.png"; + $image_a = html_print_image("images/down.png", true, false, true); + $image_b = html_print_image("images/go.png", true, false, true); + $original = "images/go.png"; } else { $style = ''; - $image_a = html_print_image($hack_metaconsole . "images/down.png", true, false, true); - $image_b = html_print_image($hack_metaconsole . "images/go.png", true, false, true); - $original = $hack_metaconsole . "images/down.png"; + $image_a = html_print_image("images/down.png", true, false, true); + $image_b = html_print_image("images/go.png", true, false, true); + $original = "images/down.png"; } // Link to toggle diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 332d3c26b4..992927333b 100644 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -96,7 +96,7 @@ if ($idAgent != 0) { echo "

" . __('Full list of alerts') . "

"; } -} +} else { if (!check_acl ($config["id_user"], 0, "AR")) { db_pandora_audit("ACL Violation","Trying to access alert view");