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

2012-11-26 Sergio Martin <sergio.martin@artica.es> 

* 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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-11-26 10:27:16 +00:00
parent cf9b9dcb15
commit 9a355f5090
6 changed files with 22 additions and 19 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 @@
2012-11-26 Sergio Martin <sergio.martin@artica.es>
* 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 <dario.rodriguez@artica.es>
* operation/integria_incidents/incident.php: Fixed a bug in integration

10
pandora_console/godmode/netflow/nf_edit.php
View File

@ -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] = '<a href="' . $config['homeurl'] . 'index.php?sec=netf&sec2=' . $config ['homedir'] . '/godmode/netflow/nf_edit_form&id='.$filter['id_sg'].'">'.$filter['id_name'].'</a>';
$data[0] = '<a href="' . $config['homeurl'] . 'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&id='.$filter['id_sg'].'">'.$filter['id_name'].'</a>';
$group = db_get_value('nombre','tgrupo', 'id_grupo', $filter['id_group']);
if ($group == '')
$group = 'All';
$data[1] = $group;
$data[2] = "<a onclick='if(confirm(\"" . __('Are you sure?') . "\")) return true; else return false;'
href='" . $config['homeurl'] . "index.php?sec=netf&sec2=" . $config['homedir'] . "/godmode/netflow/nf_edit&delete=1&id=".$filter['id_sg']."&offset=0'>" .
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'))) . "</a>" .
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 "<form method='post' action='" . $config['homeurl'] . "index.php?sec=netf&sec2=" . $config['homedir'] . "/godmode/netflow/nf_edit'>";
echo "<form method='post' action='" . $config['homeurl'] . "index.php?sec=netf&sec2=godmode/netflow/nf_edit'>";
html_print_input_hidden('multiple_delete', 1);
html_print_table ($table);
echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
@ -155,7 +155,7 @@ else {
echo "<div class='nf'>".__('There are no defined filters')."</div>";
}
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=' . $config['homedir'] . '/godmode/netflow/nf_edit_form">';
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form">';
echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
html_print_submit_button (__('Create filter'), 'crt', false, 'class="sub wand"');
echo "</div>";

9
pandora_console/include/functions_ui.php
View File

@ -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;
}

6
pandora_console/operation/events/events.php
View File

@ -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;
}
}

6
pandora_console/operation/events/events_list.php
View File

@ -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');

2
pandora_console/operation/search_results.php
View File

@ -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');