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

2010-10-22 Raul Mateos <raulofpandora@gmail.com> 

* godmode/db/db_refine.php, godmode/agentes/manage_config_remote.php,
	godmode/admin_access_logs.php, godmode/snmpconsole/snmp_filters.php,
	godmode/snmpconsole/snmp_alert.php: Updated year, close html tags, put pixel
	in tables, center some icons, small cosmetics changes.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-10-22 13:01:25 +00:00
parent 72c99d331a
commit 55a163cd6f
6 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-10-22 Raúl Mateos <raulofpandora@gmail.com>
* godmode/db/db_refine.php, godmode/agentes/manage_config_remote.php,
godmode/admin_access_logs.php, godmode/snmpconsole/snmp_filters.php,
godmode/snmpconsole/snmp_alert.php: Updated year, close html tags, put pixel
in tables, center some icons, small cosmetics changes.
2010-10-22 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_standby_alerts.php: Improved template
@ -193,8 +200,6 @@
Pending tasks: #3083123
* include/functions_modules.php: cleaned source code style in function
"update_agent_module".

38
pandora_console/godmode/admin_access_logs.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -33,40 +33,35 @@ print_page_header (__('Pandora audit')." &raquo; ".__('Review Logs'), "", false,
$offset = get_parameter ("offset", 0);
$tipo_log = get_parameter ("tipo_log", 'all');
echo '<table width=100% border=0>';
echo "<tr><td colspan=2>";
echo '<b>'.__('Filter').'</b>';
echo "<td rowspan=2>";
if ($config['flash_charts']) {
echo graphic_user_activity (300, 140);
} else {
echo '<img src="include/fgraph.php?tipo=user_activity&width=300&height=140" />';
}
echo "<table width='750px' border='0' cellspacing='4' cellpadding='4' class='databox'>";
echo '<tr><td class="datost">';
echo '<div style="float: left; width: 250px;">';
echo '<b>'.__('Filter').'</b><br><br>';
$rows = get_db_all_rows_sql ("SELECT DISTINCT(accion) FROM tsesion");
if (empty ($rows)) {
$rows = array ();
}
$actions = array ();
foreach ($rows as $row) {
$actions[$row["accion"]] = $row["accion"];
}
echo "</td></td></tr>";
echo "<tr><td>";
echo '<form name="query_sel" method="post" action="index.php?sec=godmode&sec2=godmode/admin_access_logs">';
echo __('Action').': ';
echo "</td><td>";
print_select ($actions, 'tipo_log', $tipo_log, 'this.form.submit();', __('All'), 'all');
echo '<br /><noscript><input name="uptbutton" type="submit" class="sub" value="'.__('Show').'"></noscript>';
echo '</form>';
echo "</td></td></tr>";
echo '</div>';
echo '<div style="float: left; width: 250px;">';
if ($config['flash_charts']) {
echo graphic_user_activity (300, 140);
} else {
echo '<img src="include/fgraph.php?tipo=user_activity&width=300&height=140" />';
}
echo '</div>';
echo '<div style="clear:both;">&nbsp;</div>';
echo '</td></tr></table>';
$filter = '';
if ($tipo_log != 'all') {
$filter = sprintf (" WHERE accion = '%s'", $tipo_log);
@ -76,10 +71,7 @@ $sql = "SELECT COUNT(*) FROM tsesion ".$filter;
$count = get_db_sql ($sql);
$url = "index.php?sec=godmode&sec2=godmode/admin_access_logs&tipo_log=".$tipo_log;
echo "<tr><td colspan=3>";
pagination ($count, $url);
echo "</td></td></tr></table>";
$sql = sprintf ("SELECT * FROM tsesion%s ORDER BY fecha DESC LIMIT %d, %d", $filter, $offset, $config["block_size"]);
$result = get_db_all_rows_sql ($sql);

8
pandora_console/godmode/agentes/manage_config_remote.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -131,6 +131,7 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
}
}
echo '</select>';
echo '</td></tr>';
// Destination agent
echo '<tr><td class="datost">';
@ -147,12 +148,11 @@ if ((isset($_GET["operacion"])) AND ($update_group == -1) ) {
echo "<option value=".$row["id_agente"].">".$row["nombre"]."</option>";
}
echo '</select>';
echo '</td>';
// Form buttons
echo '<td align="right" class="datosb">';
echo '<input type="submit" name="copy" class="sub next" value="'.__('Replicate configuration').'" onClick="if (!confirm("'.__('Are you sure?').'")) return false;>';
echo '<tr><td colspan=2>';
echo '</div></td></tr>';
echo '</td></tr>';
echo '</table>';
}

22
pandora_console/godmode/db/db_refine.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -57,8 +57,11 @@ if ((isset ($_GET["operacion"])) && (!isset ($_POST["update_agent"]))) {
echo '<br /><br /><h3 class="suc">'.__('Filtering completed').'</h3>';
}
echo '<form method="post" action="index.php?sec=gdbman&sec2=godmode/db/db_refine&operacion=1">';
echo "<table width='650' border='0' cellspacing='4' cellpadding='4' class='databox'>";
echo '<tr><td class="datost">';
echo '<div style="float:left; width: 250px;">';
echo '<b>'.__('Source agent').'</b><br />';
echo '<b>'.__('Source agent').'</b><br /><br />';
$agent_selected = get_parameter_post ("origen", 0);
$agents = get_group_agents (array_keys (get_user_groups ($config["id_user"], "AW")));
@ -80,13 +83,20 @@ print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false,
echo '</div>'; //Left div
echo '<div style="float:left; width:250px;"><b>'.__('Purge data out of these limits').'</b><br /><br />';
echo '<table><tr><td>';
echo __('Minimum').': ';
echo '</td><td>';
print_input_text ("min", 0, __('Minimum'), 4, 0, false);
echo '<br />';
echo '</td></tr>';
echo '<tr><td>';
echo __('Maximum').': ';
echo '</td><td>';
print_input_text ("max", 0, __('Maximum'), 4, 0, false);
echo '<br />';
echo '</td></tr>';
echo '</table>';
echo '</div>';
echo '<div style="clear:both;">&nbsp;</div>';
print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"');
echo '</div><div style="clear:both;">&nbsp;</div>';
echo '</td></tr></table>';
?>

8
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -254,14 +254,14 @@ if (isset ($_GET["update_alert"])) {
$table->size = array ();
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->width = 750;
$table->width = "750 px";
$table->class= "databox";
$table->align = array ();
$table->head[0] = __('Alert action');
$table->head[1] = __('SNMP Agent');
$table->size[1] = 75;
$table->size[1] = "90px";
$table->align[1] = 'center';
$table->head[2] = __('OID');
@ -279,8 +279,8 @@ if (isset ($_GET["update_alert"])) {
$table->align[6] = 'center';
$table->head[7] = __('Action');
$table->size[7] = 50;
$table->align[7] = 'right';
$table->size[7] = "50px";
$table->align[7] = 'center';
foreach ($result as $row) {
$data = array ();

6
pandora_console/godmode/snmpconsole/snmp_filters.php
View File

@ -110,15 +110,15 @@ if ($edit_filter > -2) {
$table->size = array ();
$table->cellpadding = 4;
$table->cellspacing = 4;
$table->width = 750;
$table->width = "750px";
$table->class= "databox";
$table->align = array ();
$table->head[0] = __('Description');
$table->head[1] = __('Filter');
$table->head[2] = __('Action');
$table->size[2] = 50;
$table->align[2] = 'right';
$table->size[2] = "50px";
$table->align[2] = 'center';
foreach ($result as $row) {
$data = array ();