2013-01-30 Miguel de Dios <miguel.dedios@artica.es>

* godmode/agentes/planned_downtime.list.php, include/db/oracle.php,
	include/Image/image_functions.php,
	operation/events/events.build_table.php,
	operation/messages/message_edit.php, operation/users/user_edit.php,
	operation/tree.php: improved the source style.
	
	* include/constants.php: added constants for the subtype of modules.




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

pandora_console/ChangeLog

@@ -1,3 +1,13 @@
+2013-01-30 Miguel de Dios <miguel.dedios@artica.es>
+
+	* godmode/agentes/planned_downtime.list.php, include/db/oracle.php,
+	include/Image/image_functions.php,
+	operation/events/events.build_table.php,
+	operation/messages/message_edit.php, operation/users/user_edit.php,
+	operation/tree.php: improved the source style.
+	
+	* include/constants.php: added constants for the subtype of modules.
+
 2013-01-30  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/events/event_responses.editor.php: Little fix

pandora_console/include/constants.php

@@ -208,6 +208,8 @@ define ('STATUS_ALERT_DISABLED', 'alert_disabled.png');
 define ('STATUS_SERVER_OK', 'server_ok.png');
 define ('STATUS_SERVER_DOWN', 'server_down.png');
 
+
+
 /* Events criticity */
 define ('EVENT_CRIT_MAINTENANCE', 0);
 define ('EVENT_CRIT_INFORMATIONAL', 1);
@@ -219,4 +221,9 @@ define ('EVENT_CRIT_CRITICAL', 4);
 define ('EVENT_CRIT_WARNING_OR_CRITICAL', 34);
 define ('EVENT_CRIT_NOT_NORMAL', 20);
 
+/* Id Module (more use in component)*/
+define ('MODULE_WMI', 6);
+define ('MODULE_NETWORK', 2);
+define ('MODULE_PLUGIN', 4);
+define ('MODULE_WEB', 7);
 ?>

pandora_console/include/db/oracle.php

@@ -621,12 +621,12 @@ function oracle_db_format_array_where_clause_sql ($values, $join = 'AND', $prefi
 			$query .= sprintf ("%s IN ('%s')", $field, implode ("', '", $value));
 		}
 		else {
-			if ($value[0] == ">"){
+			if ($value[0] == ">") {
 				$value = substr($value,1,strlen($value)-1);
 				$query .= sprintf ("%s > '%s'", $field, $value);
 			}
-			else if ($value[0] == "<"){
+			else if ($value[0] == "<") {
-				if ($value[1] == ">"){
+				if ($value[1] == ">") {
 					$value = substr($value,2,strlen($value)-2);
 					$query .= sprintf ("%s <> '%s'", $field, $value);
 				}
@@ -1224,6 +1224,7 @@ function oracle_db_process_sql_delete_temp ($table, $where, $where_join = 'AND')
 	}
 	
 	$result = '';
+	
 	return db_process_sql ($query, "affected_rows", '', true, $result, false);
 }
 

pandora_console/operation/tree.php

@@ -586,7 +586,8 @@ if(tags_has_user_acl_tags()) {
 echo "<br>";
 if (! defined ('METACONSOLE')) {
 	echo '<form id="tree_search" method="post" action="index.php?extension_in_menu=estado&sec=estado&sec2=operation/tree&refr=0&sort_by='.$activeTab.'&pure='.$pure.'">';
-} else {
+}
+else {
 	echo '<form id="tree_search" method="post" action="index.php?sec=monitoring&sec2=operation/tree&refr=0&tab='.$activeTab.'&pure='.$pure.'">';
 }
 echo "<b>" . __('Agent status') . "</b>";
@@ -690,9 +691,11 @@ treeview_printTree($activeTab);
 			});
 		}
 		else {
-			<?php if (! defined ('METACONSOLE')) {
+			<?php
+			if (! defined ('METACONSOLE')) {
 				echo 'var icon_path = \'operation/tree\';';
-			} else {
+			}
+			else {
 				echo 'var icon_path = \'../../operation/tree\';';
 			}
 			?>

pandora_console/operation/users/user_edit.php

@@ -237,8 +237,7 @@ $usr_groups = (users_get_groups($config['id_user'], 'AR', $display_all_group));
 $id_usr = $config['id_user'];
 
 // User only can change skins if has more than one group 
-if (count($usr_groups) > 1){
+if (count($usr_groups) > 1) {
-
 	$isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
 	if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
 		echo '</td></tr><tr><td class="datos">' . __('Skin') . '</td><td class="datos2">';
@@ -250,7 +249,7 @@ echo '</td></tr><tr><td class="datos">'.__('Interactive charts') . ui_print_help
 $values = array(-1 => __('Default'),1 => __('Yes'),0 => __('No'));
 echo html_print_select($values, 'flash_charts', $user_info["flash_chart"], '', '', -1, true, false, false);
 echo '</td></tr><tr><td class="datos">'.__('Block size for pagination'). ui_print_help_tip(__('If checkbox is clicked then block size global configuration is used'), true) . '</td><td class="datos2">';
-if($user_info["block_size"] == 0) {
+if ($user_info["block_size"] == 0) {
 	$block_size = $config["global_block_size"];
 }
 else {
@@ -371,42 +370,42 @@ $(document).ready (function () {
 function show_data_section () {
 	section=$("#section").val();
 	switch (section) {
-		case <?php echo "'".__('Dashboard')."'"; ?>:
+		case <?php echo "'" . __('Dashboard') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Visual console')."'"; ?>:
+		case <?php echo "'" . __('Visual console') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "");
 			break;
-		case <?php echo "'".__('Event list')."'"; ?>:
+		case <?php echo "'" . __('Event list') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Group view')."'"; ?>:
+		case <?php echo "'" . __('Group view') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Tactical view')."'"; ?>:
+		case <?php echo "'" . __('Tactical view') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Alert detail')."'"; ?>:
+		case <?php echo "'" . __('Alert detail') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Other')."'"; ?>:
+		case <?php echo "'" . __('Other') . "'"; ?>:
 			$("#text-data_section").css("display", "");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");
 			break;
-		case <?php echo "'".__('Default')."'"; ?>:
+		case <?php echo "'" . __('Default') . "'"; ?>:
 			$("#text-data_section").css("display", "none");
 			$("#dashboard").css("display", "none");
 			$("#visual_console").css("display", "none");