tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-05-25 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* operation/menu.php, operation/snmpconsole/snmp_view: Updated year.
	Clean Code.
	* godmode/agentes/agent_conf_gis.php: Improved usability.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2800 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-05-25 21:29:14 +00:00
parent a11856ca5a
commit f519b5ec7e
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-05-25 Raúl Mateos <raulofpandora@gmail.com>
* operation/menu.php, operation/snmpconsole/snmp_view: Updated year.
Clean Code.
* godmode/agentes/agent_conf_gis.php: Improved usability.
2010-05-25 Raúl Mateos <raulofpandora@gmail.com> 2010-05-25 Raúl Mateos <raulofpandora@gmail.com>
* extensions/update_manager/lib/*.php: Updated year, clean code. * extensions/update_manager/lib/*.php: Updated year, clean code.

9
pandora_console/godmode/agentes/agent_conf_gis.php
View File

@ -30,7 +30,7 @@ $updateGisData = get_db_value('update_gis_data','tagente', 'id_agente', $id_agen
$agent_name = get_agent_name($id_agente); $agent_name = get_agent_name($id_agente);
/* Map with the current position */ /* Map with the current position */
echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>"; echo "<div id=\"" . $agent_name . "_agent_map\" style=\"border:1px solid black; width:98%; height: 30em;\"></div>";
if (!getAgentMap($id_agente, "500px", "98%", false)) { if (!getAgentMap($id_agente, "500px", "98%", false)) {
echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>"; echo "<br /><div class='nf'>" . __("There is no default map.") . "</div>";
@ -45,9 +45,8 @@ echo "<h4>" . __("Warning: When you change the position the agent automatily ena
$table->width = '60%'; $table->width = '60%';
$table->data = array(); $table->data = array();
$table->colspan[0][0] = 2; $table->head[0] =__('Agent position');
$table->head_colspan[0] = 2;
$table->data[0][0] = __('Agent position:');
$table->data[1][0] = __('Longitude: '); $table->data[1][0] = __('Longitude: ');
$table->data[1][1] = print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '', $table->data[1][1] = print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '',
@ -71,7 +70,7 @@ print_input_hidden('update_gis', 1);
print_table($table); print_table($table);
echo '<div class="action-buttons" style="clear: left; width: ' . $table->width . '; float: left;">'; echo '<div class="action-buttons" style="clear: left; width: ' . $table->width . '; float: left;">';
print_submit_button (__('Update'), '', false, 'class="sub update"'); print_submit_button (__('Update'), '', false, 'class="sub upd"');
echo '</div>'; echo '</div>';
echo "</form>"; echo "</form>";
?> ?>

2
pandora_console/operation/menu.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com // 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 // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or

28
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com // 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 // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
@ -92,7 +92,7 @@ if (isset ($_POST["updatebt"])) {
foreach ($trap_ids as $id_trap) { foreach ($trap_ids as $id_trap) {
$sql = sprintf ("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config["id_user"], $id_trap); $sql = sprintf ("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config["id_user"], $id_trap);
process_sql ($sql); process_sql ($sql);
} }
} else { } else {
audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation",
"Trying to mass-delete SNMP Trap ID"); "Trying to mass-delete SNMP Trap ID");
@ -100,14 +100,14 @@ if (isset ($_POST["updatebt"])) {
} }
if ($config["pure"]) { if ($config["pure"]) {
$link = '<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/normalscreen.png" title="'.__('Normal screen').'" /></a>'; $link = '<a target="_top" href="'.$url.'&pure=0&refr=30"><img src="images/normalscreen.png" title="'.__('Normal screen').'" /></a>';
} else { } else {
// Fullscreen // Fullscreen
$link = '<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/fullscreen.png" title="'.__('Full screen').'"/></a>'; $link = '<a target="_top" href="'.$url.'&pure=1&refr=0"><img src="images/fullscreen.png" title="'.__('Full screen').'"/></a>';
} }
// Header // Header
print_page_header (__("SNMP console"), "images/computer_error.png", false, "", false, $link); print_page_header (__("SNMP Console"), "images/computer_error.png", false, "", false, $link);
$sql = sprintf ("SELECT * FROM ttrap ORDER BY timestamp DESC LIMIT %d,%d",$offset,$config['block_size']); $sql = sprintf ("SELECT * FROM ttrap ORDER BY timestamp DESC LIMIT %d,%d",$offset,$config['block_size']);
@ -320,8 +320,8 @@ if ($traps !== false) {
// } // }
// //
// if ($search_string != '' && ereg ($search_string, $trap["value"]) == 0 && // if ($search_string != '' && ereg ($search_string, $trap["value"]) == 0 &&
// ereg ($search_string, $trap["value_custom"]) == 0) { // ereg ($search_string, $trap["value_custom"]) == 0) {
// continue; // continue;
// } // }
//Status //Status
@ -438,13 +438,13 @@ echo '<img src="images/pixel_red.png" width="20" height="20" /> - ' . __('Not va
echo '</div>'; echo '</div>';
echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">'; echo '<div style="float:left; padding-left:30px; line-height: 17px; vertical-align: top; width:120px;">';
echo '<h3>' . __('Alert') . '</h3>'; echo '<h3>' . __('Alert') . '</h3>';
echo '<img src="images/pixel_yellow.png" width="20" height="20" /> - ' .__('Fired'); echo '<img src="images/pixel_yellow.png" width="20" height="20" /> - ' .__('Fired');
echo '<br />'; echo '<br />';
echo '<img src="images/pixel_gray.png" width="20" height="20" /> - ' . __('Not fired'); echo '<img src="images/pixel_gray.png" width="20" height="20" /> - ' . __('Not fired');
echo '</div>'; echo '</div>';
echo '<div style="float:left; padding-left:30px; line-height: 19px; vertical-align: top; width:120px;">'; echo '<div style="float:left; padding-left:30px; line-height: 19px; vertical-align: top; width:120px;">';
echo '<h3>' . __('Action') . '</h3>'; echo '<h3>' . __('Action') . '</h3>';
echo '<img src="images/ok.png" width="18" height="18" /> - ' .__('Validate'); echo '<img src="images/ok.png" width="18" height="18" /> - ' .__('Validate');
echo '<br />'; echo '<br />';
echo '<img src="images/cross.png" width="18" height="18" /> - ' . __('Delete'); echo '<img src="images/cross.png" width="18" height="18" /> - ' . __('Delete');
echo '</div>'; echo '</div>';
@ -461,11 +461,11 @@ echo '<div style="clear:both;">&nbsp;</div>';
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- <!--
function CheckAll() { function CheckAll() {
for (var i = 0; i < document.eventtable.elements.length; i++) { for (var i = 0; i < document.eventtable.elements.length; i++) {
var e = document.eventtable.elements[i]; var e = document.eventtable.elements[i];
if (e.type == 'checkbox' && e.name != 'allbox') if (e.type == 'checkbox' && e.name != 'allbox')
e.checked = !e.checked; e.checked = !e.checked;
} }
} }
function toggleDiv (divid){ function toggleDiv (divid){