2012-03-14 Vanessa Gil <vanessa.gil@artica.es>

* godmode/alerts/alert_actions.php
	  godmode/alerts/alert_commands.php
  	  godmode/alerts/alert_templates.php
	  godmode/alerts/configure_alert_template.php
	  godmode/modules/manage_nc_groups.php
	  godmode/modules/manage_netwok_components.php
	  godmode/modules/manage_network_templates.php
	  godmode/modules/manage_network_templates_form.php
	  godmode/reporting/graph_builder.php
	  godmode/reporting/graphs.php
	  godmode/reporting/map_builder.php
	  godmode/reporting/reporting_builder.php
	  godmode/reporting/visual_console_builder.php
	  godmode/snmpconsole/snmp_alert.php
	  godmode/tag/edit_tag.php
	  godmode/tag/tag.php
	  include/functions_config.php
	  include/functions_events.php: Extended system audit log.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5769 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,24 @@
+2012-03-14  Vanessa Gil  <vanessa.gil@artica.es>
+
+	* godmode/alerts/alert_actions.php
+	  godmode/alerts/alert_commands.php
+  	  godmode/alerts/alert_templates.php
+	  godmode/alerts/configure_alert_template.php
+	  godmode/modules/manage_nc_groups.php
+	  godmode/modules/manage_netwok_components.php
+	  godmode/modules/manage_network_templates.php
+	  godmode/modules/manage_network_templates_form.php
+	  godmode/reporting/graph_builder.php
+	  godmode/reporting/graphs.php
+	  godmode/reporting/map_builder.php
+	  godmode/reporting/reporting_builder.php
+	  godmode/reporting/visual_console_builder.php
+	  godmode/snmpconsole/snmp_alert.php
+	  godmode/tag/edit_tag.php
+	  godmode/tag/tag.php
+	  include/functions_config.php
+	  include/functions_events.php: Extended system audit log.
+
 2012-03-14  Sergio Martin <sergio.martin@artica.es>
 
 	* operation/reporting/reporting_viewer.php: Changed a bad

pandora_console/godmode/alerts/alert_actions.php

@@ -134,7 +134,7 @@ if ($create_action) {
 	}
 		
 	if ($result) {
-		db_pandora_audit("Command management", "Create alert action " . $result, false, false, $info);
+		db_pandora_audit("Command management", "Create alert action #" . $result, false, false, $info);
 	}
 	else {
 		db_pandora_audit("Command management", "Fail try to create alert action", false, false);
@@ -195,10 +195,10 @@ if ($update_action) {
 	}
 
 	if ($result) {
-		db_pandora_audit("Command management", "Update alert action " . $id, false, false, json_encode($values));
+		db_pandora_audit("Command management", "Update alert action #" . $id, false, false, json_encode($values));
 	}
 	else {
-		db_pandora_audit("Command management", "Fail try to update alert action " . $id, false, false, json_encode($values));
+		db_pandora_audit("Command management", "Fail try to update alert action #" . $id, false, false, json_encode($values));
 	}
 	
 	ui_print_result_message ($result,

pandora_console/godmode/alerts/alert_commands.php

@@ -62,7 +62,7 @@ if ($create_command) {
 	}
 
 	if ($result) {
-		db_pandora_audit("Command management", "Create alert command " . $result, false, false, $info);
+		db_pandora_audit("Command management", "Create alert command #" . $result, false, false, $info);
 	}
 	else {
 		db_pandora_audit("Command management", "Fail try to create alert command", false, false);
@@ -100,10 +100,10 @@ if ($update_command) {
 	}
 
 	if ($result) {
-		db_pandora_audit("Command management", "Create alert command " . $id, false, false, $info);
+		db_pandora_audit("Command management", "Update alert command #" . $id, false, false, $info);
 	}
 	else {
-		db_pandora_audit("Command management", "Fail to create alert command " . $id, false, false);
+		db_pandora_audit("Command management", "Fail to update alert command #" . $id, false, false);
 	}
 	
 	ui_print_result_message ($result,
@@ -125,10 +125,10 @@ if ($delete_command) {
 	$result = alerts_delete_alert_command ($id);
 	
 	if ($result) {
-		db_pandora_audit("Command management", "Delete alert command " . $id);
+		db_pandora_audit("Command management", "Delete alert command #" . $id);
 	}
 	else {
-		db_pandora_audit("Command management", "Fail to delete alert command " . $id);
+		db_pandora_audit("Command management", "Fail try to delete alert command #" . $id);
 	}
 	
 	ui_print_result_message ($result,

pandora_console/godmode/alerts/alert_templates.php

@@ -177,10 +177,10 @@ if ($delete_template) {
 	$result = alerts_delete_alert_template ($id);
 	
 	if ($result) {
-		db_pandora_audit("Template alert management", "Delete alert template " . $id);
+		db_pandora_audit("Template alert management", "Delete alert template #" . $id);
 	}
 	else {
-		db_pandora_audit("Template alert management", "Fail try to delete alert template " . $id);
+		db_pandora_audit("Template alert management", "Fail try to delete alert template #" . $id);
 	}
 	
 	ui_print_result_message ($result,

pandora_console/godmode/alerts/configure_alert_template.php

@@ -370,10 +370,12 @@ if ($create_template) {
 		$result = '';
 	}	
 	if ($result) {
-		db_pandora_audit("Command management", "Create alert command " . $result, false, false, json_encode($values));
+		//db_pandora_audit("Command management", "Create alert command " . $result, false, false, json_encode($values));
+		db_pandora_audit("Template alert management", "Create alert template " . $result, false, false, json_encode($values));
 	}
 	else {
-		db_pandora_audit("Command management", "Fail try to create alert command", false, false, json_encode($values));
+		//db_pandora_audit("Command management", "Fail try to create alert command", false, false, json_encode($values));
+		db_pandora_audit("Template alert management", "Fail try to create alert template", false, false, json_encode($values));
 	}
 	
 	ui_print_result_message ($result,

pandora_console/godmode/modules/manage_nc_groups.php

@@ -50,6 +50,11 @@ if ($create) {
 		$result = db_process_sql_insert ('tnetwork_component_group',
 			array ('name' => $name,
 				'parent' => $parent));
+		if ($result) {
+			db_pandora_audit( "Module management", "Create component group #$result");
+		} else {
+			db_pandora_audit( "Module management", "Fail try to create component group");
+		}
 		ui_print_result_message ($result,
 			__('Successfully created'),
 			__('Could not be created'));
@@ -67,6 +72,12 @@ if ($update) {
 			array ('name' => $name,
 				'parent' => $parent),
 			array ('id_sg' => $id));
+		if ($result) {
+			db_pandora_audit( "Module management", "Update component group #$id");
+		} else {
+			db_pandora_audit( "Module management", "Fail try to update component group #$id");
+		}
+		
 		ui_print_result_message ($result,
 			__('Successfully updated'),
 			__('Not updated. Error updating data'));
@@ -82,6 +93,12 @@ if ($delete) {
 		
 	if (($result !== false) and ($result1 !== false)) $result = true;
 	else $result = false;
+	
+	if ($result) {
+			db_pandora_audit( "Module management", "Delete component group #$id");
+		} else {
+			db_pandora_audit( "Module management", "Fail try to delete component group #$id");
+		}
 		
 	ui_print_result_message ($result,
 		__('Successfully deleted'),
@@ -111,7 +128,13 @@ if ($multiple_delete) {
 	
 	if ($result !== false) $result = true;
 	else $result = false;
-		
+	
+	$str_ids = implode (',', $ids);
+	if ($result) {
+		db_pandora_audit( "Module management", "Multiple delete component group: $str_ids");
+	} else {
+		db_pandora_audit( "Module management", "Fail try to delete component group: $str_ids");
+	}	
 	ui_print_result_message ($result,
 		__('Successfully multiple deleted'),
 		__('Not deleted. Error deleting multiple data'));

pandora_console/godmode/modules/manage_network_components.php

@@ -144,10 +144,12 @@ if ($create_component) {
 	$id = '';
 	}
 	if ($id === false || !$id) {
+		db_pandora_audit("Module management", "Fail try to create network component");
 		ui_print_error_message (__('Could not be created'));
 		include_once ('godmode/modules/manage_network_components_form.php');
 		return;
 	}
+	db_pandora_audit("Module management", "Create network component group #$id");
 	ui_print_success_message (__('Created successfully'));
 	$id = 0;
 }
@@ -208,11 +210,13 @@ if ($update_component) {
 		$result = '';
 	}
 	if ($result === false || !$result) {
+		db_pandora_audit("Module management", "Fail try to update network component #$id");
 		ui_print_error_message (__('Could not be updated'));
 		include_once ('godmode/modules/manage_network_components_form.php');
 		return;
 	}
 
+	db_pandora_audit("Module management", "Update network component #$id");
 	ui_print_success_message (__('Updated successfully'));
 	
 	$id = 0;
@@ -223,6 +227,12 @@ if ($delete_component) {
 	
 	$result = network_components_delete_network_component ($id);
 	
+	if ($result) {
+		db_pandora_audit( "Module management", "Delete network component #$id");
+	} else {
+		db_pandora_audit( "Module management", "Fail try to delete network component #$id");
+	}	
+	
 	ui_print_result_message ($result,
 		__('Successfully deleted'),
 		__('Could not be deleted'));
@@ -243,6 +253,13 @@ if ($multiple_delete) {
 		}
 	}
 	
+	$str_ids = implode (',', $ids);
+	if ($result) {
+		db_pandora_audit( "Module management", "Multiple delete network component: $str_ids");
+	} else {
+		db_pandora_audit( "Module management", "Fail try to delete network component: $str_ids");
+	}	
+	
 	if ($result !== false) {
 		db_process_sql_commit();
 	}

pandora_console/godmode/modules/manage_network_templates.php

@@ -40,6 +40,13 @@ if ($delete_profile) { // if delete
 	$id = (int) get_parameter ('delete_profile');
 	
 	$result = network_profiles_delete_network_profile ($id);
+	
+	if ($result) {
+		db_pandora_audit("Module management", "Delete module template #$id");
+	} else {
+		db_pandora_audit("Module management", "Fail try to delete module template #$id");
+	}
+	
 	ui_print_result_message ($result,
 		__('Template successfully deleted'),
 		__('Error deleting template'));
@@ -62,6 +69,13 @@ if ($multiple_delete) {
 	if ($result !== false) {
 		db_process_sql_commit();
 	}
+	
+	$str_ids = implode (',', $ids);
+	if ($result) {
+		db_pandora_audit("Module management", "Multiple delete module template: $str_ids");
+	} else {
+		db_pandora_audit("Module management", "Fail try to delete module template: $str_ids");
+	}
 		
 	ui_print_result_message ($result,
 		__('Successfully multiple deleted'),

pandora_console/godmode/modules/manage_network_templates_form.php

@@ -82,7 +82,13 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) {
 				'name' => $name,
 				'description' => $description);
 			$result = db_process_sql_update('tnetwork_profile', $values, array('id_np' => $id_np));
-		
+			
+			if ($result) {
+				db_pandora_audit("Module management", "Update module template #$id_np");
+			} else {
+				db_pandora_audit("Module management", "Fail try to update module template #$id_np");
+			}
+	
 			ui_print_result_message ($result !== false,
 				__('Successfully updated network profile'),
 				__('Error updating network profile'));
@@ -92,6 +98,12 @@ if (isset ($_GET["create"]) || isset ($_GET["update"])) {
 			$values = array('name' => $name, 'description' => $description);
 			$result = db_process_sql_insert('tnetwork_profile', $values);
 			
+			if ($result) {
+				db_pandora_audit("Module management", "Create module template #$result");
+			} else {
+				db_pandora_audit("Module management", "Fail try to create module template");
+			}
+			
 			ui_print_result_message ($result,
 				__('Successfully added network profile'),
 				__('Error adding network profile'));

pandora_console/godmode/reporting/graph_builder.php

@@ -81,6 +81,10 @@ if ($add_graph) {
 
 	if (trim($name) != "") {
 		$id_graph = db_process_sql_insert('tgraph', $values);
+		if ($id_graph !== false)
+			db_pandora_audit("Report management", "Create graph #$id_graph");
+		else
+			db_pandora_audit("Report management", "Fail try to create graph");
 	} else {
 		$id_graph = false;
 	}
@@ -103,9 +107,14 @@ if ($update_graph) {
 
 	if (trim($name) != "") {
 
-	$success = db_process_sql_update('tgraph', 
+		$success = db_process_sql_update('tgraph', 
-		array('name' => $name, 'id_group' => $id_group, 'description' => $description, 'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked, 'events' => $events), 
+			array('name' => $name, 'id_group' => $id_group, 'description' => $description, 'width' => $width, 'height' => $height, 'period' => $period, 'stacked' => $stacked, 'events' => $events), 
-		array('id_graph' => $id_graph));
+			array('id_graph' => $id_graph));
+		if ($success !== false)
+			db_pandora_audit("Report management", "Update graph #$id_graph");
+		else
+			db_pandora_audit("Report management", "Fail try to update graph #$id_graph");
+			
 	} else {
 		$success = false;
 	}

pandora_console/godmode/reporting/graphs.php

@@ -79,10 +79,13 @@ if ($delete_graph) {
 			
 		$result = db_process_sql_delete("tgraph", array('id_graph' =>$id));
 		
-		if ($result)
+		if ($result) {
+			db_pandora_audit("Report management", "Delete graph #$id");
 			$result = "<h3 class=suc>".__('Successfully deleted')."</h3>";
-		else
+		} else {
+			db_pandora_audit("Report management", "Fail try to delete graph #$id");
 			$result = "<h3 class=error>".__('Not deleted. Error deleting data')."</h3>";
+		}
 		
 		echo $result;
 	}
@@ -114,7 +117,14 @@ if ($multiple_delete) {
 	
 	if ($result !== false) $result = true;
 	else $result = false;
-		
+	
+	$str_ids = implode (',', $ids);
+	if ($result) {
+		db_pandora_audit("Report management", "Multiple delete graph: $str_ids");
+	} else {
+		db_pandora_audit("Report management", "Fail try to delete graphs: $str_ids");
+	}
+	
 	ui_print_result_message ($result,
 		__('Successfully deleted'),
 		__('Not deleted. Error deleting data'));

pandora_console/godmode/reporting/map_builder.php

@@ -27,10 +27,12 @@ if ($delete_layout) {
 	db_process_sql_delete ('tlayout_data', array ('id_layout' => $id_layout));
 	$result = db_process_sql_delete ('tlayout', array ('id' => $id_layout));
 	if ($result) {
+		db_pandora_audit( "Visual console builder", "Delete visual console #$id_layout");
 		echo '<h3 class="suc">'.__('Successfully deleted').'</h3>';
 		db_clean_cache();
 	}
 	else {
+		db_pandora_audit( "Visual console builder", "Fail try to delete visual console #$id_layout");
 		echo '<h3 class="error">'.__('Not deleted. Error deleting data').'</h3>';
 	}
 	$id_layout = 0;

pandora_console/godmode/reporting/reporting_builder.php

@@ -67,6 +67,11 @@ switch ($action) {
 		
 		if ($action == 'delete_report') {
 			$result = reports_delete_report ($idReport);
+			if ($result !== false)
+				db_pandora_audit("Report management", "Delete report #$idReport");
+			else
+				db_pandora_audit("Report management", "Fail try to delete report #$idReport");
+				
 			ui_print_result_message ($result,
 				__('Successfully deleted'),
 				__('Could not be deleted'));
@@ -174,6 +179,10 @@ switch ($action) {
 				if ($action == 'update') {
 					if ($reportName != "" && $idGroupReport != ""){
 						$resultOperationDB = (bool)db_process_sql_update('treport', array('name' => $reportName, 'id_group' => $idGroupReport, 'description' => $description), array('id_report' => $idReport));
+						if ($resultOperationDB !== false)
+							db_pandora_audit( "Report management", "Update report #$idReport");
+						else
+							db_pandora_audit( "Report management", "Fail try to update report #$idReport");
 					}
 					else {
 						$resultOperationDB = false;
@@ -182,6 +191,10 @@ switch ($action) {
 				else if ($action == 'save') {
 					if($reportName != "" && $idGroupReport != "") {
 						$idOrResult = db_process_sql_insert('treport', array('name' => $reportName, 'id_group' => $idGroupReport, 'description' => $description));
+						if ($idOrResult !== false)
+							db_pandora_audit( "Report management", "Create report #$idOrResult");
+						else
+							db_pandora_audit( "Report management", "Fail try to create report");
 					}
 					else {
 						$idOrResult = false;

pandora_console/godmode/reporting/visual_console_builder.php

@@ -65,10 +65,12 @@ switch ($activeTab) {
 						if($values['name'] != "" && $values['background'])
 							$result = db_process_sql_update('tlayout', $values, array('id' => $idVisualConsole));
 						if ($result !== false && $values['background']) {
+							db_pandora_audit( "Visual console builder", "Update visual console #$idVisualConsole");
 							$action = 'edit';
 							$statusProcessInDB = array('flag' => true, 'message' => '<h3 class="suc">'.__('Successfully update.').'</h3>');
 						}
 						else {
+							db_pandora_audit( "Visual console builder", "Fail update visual console #$idVisualConsole");
 							$statusProcessInDB = array('flag' => false, 'message' => '<h3 class="error">'.__('Could not be update.').'</h3>');
 						}
 						break;
@@ -80,10 +82,12 @@ switch ($activeTab) {
 							$idVisualConsole = false;
 							
 						if ($idVisualConsole !== false) {
+							db_pandora_audit( "Visual console builder", "Create visual console #$idVisualConsole");
 							$action = 'edit';
 							$statusProcessInDB = array('flag' => true, 'message' => '<h3 class="suc">'.__('Successfully created.').'</h3>');
 						}
 						else {
+							db_pandora_audit( "Visual console builder", "Fail try to create visual console");
 							$statusProcessInDB = array('flag' => false, 'message' => '<h3 class="error">'.__('Could not be created.').'</h3>');
 						}
 						break;

pandora_console/godmode/snmpconsole/snmp_alert.php

@@ -85,9 +85,11 @@ if (isset ($_GET["update_alert"]) && $_GET["update_alert"] == "-1") {
 			$result = db_process_sql_insert('talert_snmp', $values);
 		
 		if (!$result) {
+			db_pandora_audit("SNMP management", "Fail try to create snmp alert");
 			echo '<h3 class="error">'.__('There was a problem creating the alert').'</h3>';
 		}
 		else {
+			db_pandora_audit("SNMP management", "Create snmp alert #$result");
 			echo '<h3 class="suc">'.__('Successfully created').'</h3>';
 		}
 		
@@ -104,8 +106,10 @@ if (isset ($_GET["update_alert"]) && $_GET["update_alert"] == "-1") {
 		$result = db_process_sql ($sql);
 
 		if (!$result) {
+			db_pandora_audit("SNMP management", "Fail try to update snmp alert #$id_as");
 			echo '<h3 class="error">'.__('There was a problem updating the alert').'</h3>';
 		} else {
+			db_pandora_audit("SNMP management", "Update snmp alert #$id_as");
 			echo '<h3 class="suc">'.__('Successfully updated').'</h3>';
 		}
 	}
@@ -174,9 +178,11 @@ if (isset ($_GET["delete_alert"])) { // Delete alert
 	
 	$result = db_process_sql_delete('talert_snmp', array('id_as' => $alert_delete));
 	if ($result === false) {
+		db_pandora_audit("SNMP management", "Fail try to delete snmp alert #$alert_delete");
 		echo '<h3 class="error">'.__('There was a problem deleting the alert').'</h3>';
 	}
 	else {
+		db_pandora_audit("SNMP management", "Delete snmp alert #$alert_delete");
 		echo '<h3 class="suc">'.__('Successfully deleted').'</h3>';
 	}
 }

pandora_console/godmode/tag/edit_tag.php

@@ -64,8 +64,10 @@ if ($update_tag && $id_tag != 0) {
 		$result = tags_update_tag($values, 'id_tag = ' . $id_tag);
 	
 	if ($result === false) {
+		db_pandora_audit("Tag management", "Fail try to update tag #$id_tag");
 		echo '<h3 class="error">'.__('Error updating tag').'</h3>';
 	} else {
+		db_pandora_audit("Tag management", "Update tag #$id_tag");
 		echo '<h3 class="suc">'.__('Successfully updated tag').'</h3>';
 	}
 }
@@ -89,10 +91,12 @@ if ($create_tag) {
 		$return_create = tags_create_tag ($data);
 
 	if ($return_create === false) {
+		db_pandora_audit("Tag management", "Fail try to create tag");
 		echo '<h3 class="error">'.__('Error creating tag').'</h3>';
 		$action = "new";
 	// If create action ends successfully then current action is update
 	} else {
+		db_pandora_audit("Tag management", "Create tag #$return_create");
 		echo '<h3 class="suc">'.__('Successfully created tag').'</h3>';
 		$id_tag = $return_create;
 		$action = "update";

pandora_console/godmode/tag/tag.php

@@ -74,8 +74,10 @@ if ($delete != 0) {
 	$return_delete = tags_delete_tag ($delete);
 
 	if ($return_delete === false) {
+		db_pandora_audit("Tag management", "Fail try to delete tag #$delete");
 		echo '<h3 class="error">'.__('Error deleting tag').'</h3>';
 	} else {
+		db_pandora_audit("Tag management", "Delete tag #$delete");
 		echo '<h3 class="suc">'.__('Successfully deleted tag').'</h3>';
 	}
 }

pandora_console/include/functions_config.php

@@ -81,8 +81,12 @@ function config_update_config () {
 		return false;
 	
 	$update_config = (bool) get_parameter ('update_config');
-	if (! $update_config)
+	
+	if ($update_config) {
+		db_pandora_audit("Setup", "Setup has changed");
+	} else {
 		return false;
+	}
 	
 	$style = (string) get_parameter ('style', $config["style"]);
 	if ($style != $config['style'])

pandora_console/include/functions_events.php

@@ -216,9 +216,11 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
 		}	
 	}
 	
+/*
 	foreach ($id_event as $event) {
 		db_pandora_audit("Event validated", "Validated event #".$event);
 	}
+*/
 	db_process_sql_commit ();
 	return true;
 }

pandora_console/operation/users/user_edit.php

@@ -241,7 +241,7 @@ echo '</td></tr><tr><td class="datos">'.__('Shortcut bar') . ui_print_help_tip(_
 echo html_print_checkbox('shortcut_bar', 1, $user_info["shortcut"], true);
 
 echo '</td></tr><tr><td class="datos">'.__('Home screen'). ui_print_help_tip(__('
-User can customize the home page. By default, will display \'Tactical view\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true) .'</td><td class="datos2">';
+User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type sec=estado&sec2=operation/agentes/estado_agente to show agent detail view'), true) .'</td><td class="datos2">';
 $values = array ('Default' => 'Default', 'Dashboard'=>__('Dashboard'), 'Visual console'=>__('Visual console'), 'Event list'=>__('Event list'),
 	'Group view'=>__('Group view'), 'Tactical view'=>__('Tactical view'), 'Alert detail' => __('Alert detail'), 'Other'=>__('Other'));
 echo html_print_select($values, 'section', io_safe_output($user_info["section"]), 'show_data_section();', '', -1, true, false, false);