| "; - $result_t=mysql_query("SELECT COUNT(*) FROM tevento"); - $row=mysql_fetch_array($result_t); + $row = get_db_row_sql ("SELECT COUNT(*) AS total, MIN(timestamp) AS first_date, MAX(timestamp) AS latest_date FROM tevento"); + echo "".$lang_label["total"].""; - echo " | ".$row[0]." ".$lang_label["records"]." | "; + echo "".$row["total"]." ".$lang_label["records"]." | "; echo "
| ".$lang_label["first_date"]." | "; - echo "".$row[0]." | ".$row["first_date"]." | "; echo "
| "; - $result_t=mysql_query("SELECT max(timestamp) FROM tevento"); - $row=mysql_fetch_array($result_t); echo "".$lang_label["latest_date"].""; - echo " | ".$row[0]." | "; + echo "".$row["latest_date"]." | "; echo "
".$lang_label["dbmain_title"]." > "; - echo $lang_label["db_info2"]."
"; - echo "";
- echo ''.$lang_label["db_agente_modulo"].''; - echo ""; - echo " |
"; - echo " |
";
- echo ''.$lang_label["db_agente_paquetes"].''; - echo ""; - echo " ".$lang_label["press_db_info"].""; - echo " |
".$lang_label["dbmain_title"]." > "; +echo $lang_label["db_info2"]."
"; +echo "";
+echo ''.$lang_label["db_agente_modulo"].''; +echo ""; +echo " |
"; +echo " |
";
+echo ''.$lang_label["db_agente_paquetes"].''; +echo ""; +echo " ".$lang_label["press_db_info"].""; +echo " |
'; return $retval; @@ -1335,8 +1334,9 @@ function get_db_all_rows_sql ($sql) { array_push ($retval, $row); } $sql_cache[$sql] = $retval; + mysql_free_result ($result); } - if(!empty($retval)) + if(!empty ($retval)) return $retval; return ""; //Return empty because NULL is a possible database value } @@ -1350,9 +1350,9 @@ function get_db_all_rows_sql ($sql) { */ function get_db_all_rows_in_table ($table, $order_field = "") { if ($order_field != "") { - return get_db_all_rows_sql("SELECT * FROM `".$table."` ORDER BY `".$order_field."` "); + return get_db_all_rows_sql ("SELECT * FROM `".$table."` ORDER BY `".$order_field."` "); } else { - return get_db_all_rows_sql("SELECT * FROM `".$table."`"); + return get_db_all_rows_sql ("SELECT * FROM `".$table."`"); } } @@ -1388,8 +1388,12 @@ function get_db_all_rows_field_filter ($table, $field, $condition, $order_field * * @return A matrix with all the values in the table that matches the condition in the field */ -function get_db_all_fields_in_table ($table, $field) { - return get_db_all_rows_sql ('SELECT '.$field.' FROM '. $table); +function get_db_all_fields_in_table ($table, $field, $condition='') { + $sql = sprintf ("SELECT %s FROM `%s`",$field,$table); + if($condition != '') { + $sql .= sprintf (" WHERE `%s` = '%s'",$field,$condition); + } + return get_db_all_rows_sql ($sql); } /** @@ -1400,28 +1404,22 @@ function get_db_all_fields_in_table ($table, $field) { * @return True if there were alerts fired. */ function return_status_agent_module ($id_agentmodule = 0){ - $query1 = "SELECT estado FROM tagente_estado WHERE id_agente_modulo = " . $id_agentmodule; - $resq1 = mysql_query ($query1); - if ($resq1 != 0) { - $rowdup = mysql_fetch_array($resq1); - if ($rowdup[0] == 100) { - // We need to check if there are any alert on this item - $query2 = "SELECT SUM(times_fired) FROM talerta_agente_modulo WHERE id_agente_modulo = " . $id_agentmodule; - $resq2 = mysql_query($query2); - if ($resq2 != 0) { - $rowdup2 = mysql_fetch_array ($resq2); - if ($rowdup2[0] > 0){ - return 0; - } - } - // No alerts fired for this agent module - return 1; - } elseif ($rowdup[0] == 0) // 0 is ok for estado field - return 1; + $sql = sprintf ("SELECT `estado` FROM `tagente_estado` WHERE `id_agente_modulo` = '%d'",$id_agentmodule); + $estado = get_db_sql($sql); + if ($estado == 100) { + // We need to check if there are any alert on this item + $sql = sprintf ("SELECT SUM(times_fired) FROM `talerta_agente_modulo` WHERE `id_agente_modulo` = '%d'",$id_agentmodule); + $times_fired = get_db_sql($sql); + if ($times_fired > 0){ + return 0; + } + // No alerts fired for this agent module + return 1; + } elseif ($estado == 0) { // 0 is ok for estado field + return 1; + } else { return 0; } - - return 1; } /** @@ -1438,24 +1436,22 @@ function return_status_agent_module ($id_agentmodule = 0){ function return_status_layout ($id_layout = 0) { $temp_status = 0; $temp_total = 0; - $sql = "SELECT * FROM tlayout_data WHERE id_layout = $id_layout"; - $res = mysql_query ($sql); - while ($row = mysql_fetch_array ($res)) { - $id_agentmodule = $row["id_agente_modulo"]; - $type = $row["type"]; - $parent_item = $row["parent_item"]; - $link_layout = $row["id_layout_linked"]; - if (($link_layout != 0) && ($id_agentmodule == 0)) { - $temp_status += return_status_layout ($link_layout); + $sql = sprintf ("SELECT id_agente_modulo, parent_item, id_layout_linked FROM `tlayout_date` WHERE `id_layout` = '%d'",$id_layout); + $result = get_db_all_rows_sql ($sql); + foreach ($result as $rownum => $data) { + if (($data["id_layout_linked"] != 0) && ($data["id_agente_modulo"] == 0)) { + $temp_status += return_status_layout ($data["id_layout_linked"]); $temp_total++; } else { - $temp_status += return_status_agent_module ($id_agentmodule); + $temp_status += return_status_agent_module ($data["id_agente_modulo"]); $temp_total++; } } - if ($temp_status == $temp_total) + if ($temp_status == $temp_total) { return 1; - return 0; + } else { + return 0; + } } /** @@ -1616,8 +1612,7 @@ function get_agent_module_value_sumatory ($id_agent_module, $period, $date = 0) if (! $date) $date = time (); $datelimit = $date - $period; // limit date - $id_module_type = get_db_value ('id_tipo_modulo', 'tagente_modulo', - 'id_agente_modulo', $id_agent_module); + $id_module_type = get_db_value ('id_tipo_modulo', 'tagente_modulo','id_agente_modulo', $id_agent_module); $module_name = get_db_value ('nombre', 'ttipo_modulo', 'id_tipo', $id_module_type); if (is_module_data_string ($module_name)) { @@ -1691,7 +1686,12 @@ function get_agent_module_value_sumatory ($id_agent_module, $period, $date = 0) */ function lang_string ($string) { global $config; - require ($config["homedir"]."/include/languages/language_".$config["language"].".php"); + global $lang_label; + + if(!is_array ($lang_label)) { + require_once ($config["homedir"]."/include/languages/language_".$config["language"].".php"); + } //Only includes the file once (the first function call) and since $lang_label is global, it will propagate + if (isset ($lang_label[$string])) return $lang_label[$string]; return $string; diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php index e5f255025a..1948e29dc2 100644 --- a/pandora_console/operation/agentes/estado_alertas.php +++ b/pandora_console/operation/agentes/estado_alertas.php @@ -65,7 +65,7 @@ if (isset($_GET["id_agente"])){ echo "