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

2013-04-25 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* extensions/agents_alerts.php, extensions/snmp_explorer.php,
	extensions/insert_data.php, extensions/net_tools.php,
	extensions/resource_exportation.php, extensions/system_info.php,
	extensions/pandora_logs.php, extensions/agents_modules.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/servers/manage_recontask_form.php,
	godmode/setup/gis_step_2.php,
	godmode/massive/massive_standby_alerts.php,
	godmode/massive/massive_operations.php,
	godmode/massive/massive_add_action_alerts.php,
	godmode/massive/massive_add_alerts.php,
	godmode/massive/massive_delete_agents.php,
	godmode/massive/massive_delete_action_alerts.php,
	operation/users/user_edit.php, operation/events/events_list.php,
	operation/integria_incidents/incident.list.php,
	operation/integria_incidents/incident.workunits.php,
	operation/tree.php, general/shortcut_bar.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8054 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-25 09:08:54 +00:00
parent b7de933a23
commit 9c3bd51fcc
24 changed files with 122 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/ChangeLog
View File

@ -1,3 +1,24 @@
2013-04-25 Miguel de Dios <miguel.dedios@artica.es>
* extensions/agents_alerts.php, extensions/snmp_explorer.php,
extensions/insert_data.php, extensions/net_tools.php,
extensions/resource_exportation.php, extensions/system_info.php,
extensions/pandora_logs.php, extensions/agents_modules.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/servers/manage_recontask_form.php,
godmode/setup/gis_step_2.php,
godmode/massive/massive_standby_alerts.php,
godmode/massive/massive_operations.php,
godmode/massive/massive_add_action_alerts.php,
godmode/massive/massive_add_alerts.php,
godmode/massive/massive_delete_agents.php,
godmode/massive/massive_delete_action_alerts.php,
operation/users/user_edit.php, operation/events/events_list.php,
operation/integria_incidents/incident.list.php,
operation/integria_incidents/incident.workunits.php,
operation/tree.php, general/shortcut_bar.php: cleaned source code
style.
2013-04-25 Miguel de Dios <miguel.dedios@artica.es>
* general/shortcut_bar.php, general/main_menu.php,

4
pandora_console/extensions/snmp_explorer.php
View File

@ -446,6 +446,7 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
$('#module').fadeIn ('normal');
c++;
});
if (c == 0) {
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#module').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
@ -469,8 +470,7 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
$('#module').attr ('value', selected);
$('#module').removeAttr('disabled');
},
"json"
);
"json");
}
/* ]]> */

3
pandora_console/general/shortcut_bar.php
View File

@ -326,7 +326,8 @@ echo "</div>";
var id_user = $('#hidden-shortcut_id_user').val();
function shortcut_check_alerts() {
jQuery.post ("ajax.php",
{"page" : "operation/agentes/alerts_status",
{
"page" : "operation/agentes/alerts_status",
"get_alert_fired": 1
},
function (data) {

1
pandora_console/godmode/setup/gis_step_2.php
View File

@ -141,6 +141,7 @@ switch ($action) {
require_once('gis.php');
return;
break;
}
$table->width = '90%';

4
pandora_console/operation/tree.php
View File

@ -336,7 +336,9 @@ if (is_ajax ())
html_print_image ("operation/tree/last_leaf.png", false, array ("style" => 'vertical-align: middle;', "id" => "tree_image_os_" . $row["id_agente"], "pos_tree" => "2" ));
// This line checks for (non-initialized) asyncronous modules
if ($row["estado"] == 0 AND $row["utimestamp"] == 0 AND ($row["id_tipo_modulo"] >= 21 AND $row["id_tipo_modulo"] <= 23)){
if ($row["estado"] == 0 AND $row["utimestamp"] == 0
AND ($row["id_tipo_modulo"] >= 21
AND $row["id_tipo_modulo"] <= 23)) {
$status = STATUS_MODULE_NO_DATA;
$title = __('UNKNOWN');
} // Else checks module status

4
pandora_console/operation/users/user_edit.php
View File

@ -35,7 +35,9 @@ $status = get_parameter ("status", -1); // Flag to print action status message
$user_info = get_user_info ($id);
$id = $user_info["id_user"]; //This is done in case there are problems with uppercase/lowercase (MySQL auth has that problem)
if ((!check_acl ($config["id_user"], users_get_groups ($id), "UM")) AND ($id != $config["id_user"])){
if ((!check_acl ($config["id_user"], users_get_groups ($id), "UM"))
AND ($id != $config["id_user"])) {
db_pandora_audit("ACL Violation","Trying to view a user without privileges");
require ("general/noaccess.php");
exit;