diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f5d26e5802..bb7d01ce51 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2012-11-26 Sergio Martin + + * include/functions_ui.php + operation/events/events_list.php + operation/events/events.php + operation/search_results.php + godmode/netflow/nf_edit.php: Fix paths problems + 2012-11-21 Dario Rodriguez * operation/integria_incidents/incident.php: Fixed a bug in integration diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index 9a7ae1bfca..d28864f898 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -35,7 +35,7 @@ if (! defined ('METACONSOLE')) { ui_print_page_header (__('Manage Netflow Filter'), "images/networkmap/so_cisco_new.png", false, "", true); } else { $nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')), - array('link' => 'index.php?sec=netf&sec2=' . $config['homedir'] . '/godmode/netflow/nf_edit', 'text' => __('Netflow filters'))); + array('link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit', 'text' => __('Netflow filters'))); ui_meta_print_page_header($nav_bar); } @@ -129,13 +129,13 @@ $total_filters = $total_filters[0]['total']; foreach ($filters as $filter) { $data = array (); - $data[0] = ''.$filter['id_name'].''; + $data[0] = ''.$filter['id_name'].''; $group = db_get_value('nombre','tgrupo', 'id_grupo', $filter['id_group']); if ($group == '') $group = 'All'; $data[1] = $group; $data[2] = "" . + href='" . $config['homeurl'] . "index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id=".$filter['id_sg']."&offset=0'>" . html_print_image('images/cross.png', true, array('title' => __('Delete'))) . "" . html_print_checkbox_extended ('delete_multiple[]', $filter['id_sg'], false, false, '', 'class="check_delete"', true); @@ -143,7 +143,7 @@ foreach ($filters as $filter) { } if(isset($data)) { - echo "
"; + echo ""; html_print_input_hidden('multiple_delete', 1); html_print_table ($table); echo "
"; @@ -155,7 +155,7 @@ else { echo "
".__('There are no defined filters')."
"; } - echo ''; + echo ''; echo "
"; html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"'); echo "
"; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 2372d56fe3..0d3d3f81ee 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1093,13 +1093,8 @@ function ui_require_jquery_file ($name, $path = 'include/javascript/') { /* We checks two paths because it may fails on enterprise */ if (! file_exists ($filename) && ! file_exists ($config['homedir'].'/'.$filename)) return false; - - if (defined('METACONSOLE')) { - $config['jquery'][$name] = "../../" . $filename; - } - else { - $config['jquery'][$name] = $filename; - } + + $config['jquery'][$name] = $filename; return true; } diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 814d1a9547..dc4471e4ad 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -16,8 +16,8 @@ // Load global vars global $config; -require_once ("include/functions_events.php"); //Event processing functions -require_once ("include/functions_alerts.php"); //Alerts processing functions +require_once ($config['homedir']."/include/functions_events.php"); //Event processing functions +require_once ($config['homedir']."/include/functions_alerts.php"); //Alerts processing functions require_once ($config['homedir'].'/include/functions_agents.php'); //Agents functions require_once ($config['homedir'].'/include/functions_users.php'); //Users functions require_once ($config['homedir'].'/include/functions_graph.php'); @@ -361,7 +361,7 @@ if ($delete) { else { switch ($section) { case 'list': - require_once('operation/events/events_list.php'); + require_once($config['homedir'].'/operation/events/events_list.php'); break; } } diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 663600125b..bed8c33d89 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -17,9 +17,9 @@ // Load global vars global $config; -require_once ("include/functions_events.php"); //Event processing functions -require_once ("include/functions_alerts.php"); //Alerts processing functions -require_once ("include/functions.php"); +require_once ($config['homedir']. "/include/functions_events.php"); //Event processing functions +require_once ($config['homedir']. "/include/functions_alerts.php"); //Alerts processing functions +require_once ($config['homedir']. "/include/functions.php"); require_once($config['homedir'] . "/include/functions_agents.php"); //Agents funtions require_once($config['homedir'] . "/include/functions_users.php"); //Users functions require_once ($config['homedir'] . '/include/functions_groups.php'); diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php index 27d53df7b6..02e40bde18 100644 --- a/pandora_console/operation/search_results.php +++ b/pandora_console/operation/search_results.php @@ -15,7 +15,7 @@ // GNU General Public License for more details. global $config; -require_once ("include/functions_reporting.php"); +require_once ($config['homedir']."/include/functions_reporting.php"); // Load enterprise extensions enterprise_include ('operation/reporting/custom_reporting.php');