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

2012-01-12 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit.php: Added column group
	to report list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-01-12 15:05:25 +00:00
parent 4a50f43217
commit bea6859e36
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
godmode/netflow/nf_edit.php: Added column group
to report list.
2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
include/functions_netflow.php: translate netflow titles.

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

@ -106,18 +106,21 @@ $filters = db_get_all_rows_sql($sql);
if ($filters === false)
$filters = array ();
$table->width = '70%';
$table->width = '90%';
$table->head = array ();
$table->head[0] = __('Name');
$table->head[1] = __('Action') .
$table->head[1] = __('Group');
$table->head[2] = __('Action') .
html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();');
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->align = array ();
$table->align[1] = 'center';
$table->align[2] = 'center';
$table->size = array ();
$table->size[0] = '90%';
$table->size[1] = '80px';
$table->size[0] = '60%';
$table->size[1] = '30%';
$table->size[2] = '80px';
$table->data = array ();
$total_filters = db_get_all_rows_filter ('tnetflow_filter', false, 'COUNT(*) AS total');
@ -129,8 +132,12 @@ foreach ($filters as $filter) {
$data = array ();
$data[0] = '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&id='.$filter['id_sg'].'">'.$filter['id_name'].'</a>';
$data[1] = "<a onclick='if(confirm(\"" . __('Are you sure?') . "\")) return true; else return false;'
$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='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);

20
pandora_console/godmode/netflow/nf_report.php
View File

@ -93,21 +93,24 @@ $reports = db_get_all_rows_sql($sql);
if ($reports === false)
$reports = array();
$table->width = '80%';
$table->width = '90%';
$table->head = array ();
$table->head[0] = __('Report name');
$table->head[1] = __('Description');
$table->head[2] = __('Action') .
$table->head[2] = __('Group');
$table->head[3] = __('Action') .
html_print_checkbox('all_delete', 0, false, true, false, 'check_all_checkboxes();');
$table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->align = array ();
$table->align[2] = 'center';
$table->align[3] = 'center';
$table->size = array ();
$table->size[0] = '50%';
$table->size[1] = '40%';
$table->size[2] = '50px';
$table->size[0] = '40%';
$table->size[1] = '30%';
$table->size[2] = '20%';
$table->size[3] = '50px';
$table->data = array ();
$total_reports = db_get_all_rows_filter ('tnetflow_report', false, 'COUNT(*) AS total');
@ -123,7 +126,12 @@ $total_reports = $total_reports[0]['total'];
$data[1] = $report['description'];
$data[2] = "<a onclick='if(confirm(\"" . __('Are you sure?') . "\")) return true; else return false;'
$group = db_get_value('nombre','tgrupo', 'id_grupo', $report['id_group']);
if ($group == '')
$group = 'All';
$data[2] = $group;
$data[3] = "<a onclick='if(confirm(\"" . __('Are you sure?') . "\")) return true; else return false;'
href='index.php?sec=netf&sec2=godmode/netflow/nf_report&delete=1&id=".$report['id_report']."&offset=0'>" .
html_print_image('images/cross.png', true, array('title' => __('Delete'))) . "</a>" .
html_print_checkbox_extended ('delete_multiple[]', $report['id_report'], false, false, '', 'class="check_delete"', true);