2007-09-08 Raul Mateos <raulofpandora@gmail.com>

* include/languages/language_en.php, language_es_es.php: Add two 
	new texts.

	* general/error_*.php: Changed default HTML encoding to UTF-8.

	* operation/agentes/estadogeneralagente.php: Removed function
	in label that causes some problems with UTF-8 texts.
	
	* index.php: Updated build, version and set develop pass to 1.

	* godmode/agentes/configurar_agente.php: Changed strings from code
	to language includes.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@649 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2007-09-08 18:05:06 +00:00
parent 6243f4d410
commit 7b57809619
9 changed files with 54 additions and 31 deletions

View File

@ -1,3 +1,20 @@
2007-09-08 Raul Mateos <raulofpandora@gmail.com>
* include/languages/language_en.php, language_es_es.php: Add two
new texts.
* general/error_*.php: Changed default HTML encoding to UTF-8.
* operation/agentes/estadogeneralagente.php: Removed function
in label that causes some problems with UTF-8 texts.
* godmode/agentes/configurar_agente.php: Changed strings from code
to language includes.
* index.php: Updated build, version and set develop pass to 1.
2007-09-07 Raul Mateos <raulofpandora@gmail.com>
* include/languages/language_en.php: Solved bug due to adding accent

View File

@ -26,7 +26,7 @@ include "include/languages/language_en.php";
<head>
<title>Pandora FMS - The Free Monitoring System - Console Error</title>
<meta http-equiv="expires" content="0">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="author" content="Sancho Lerena, Raul Mateos">

View File

@ -27,7 +27,7 @@ include "include/languages/language_en.php";
<head>
<title>Pandora FMS - The Free Monitoring System - Console error</title>
<meta http-equiv="expires" content="0">
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-15">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="author" content="Sancho Lerena, Raul Mateos">
@ -42,9 +42,8 @@ include "include/languages/language_en.php";
<div id='login_f'>
<h1 id="log_f" class="error">Bad permission for include/config.php</h1>
<div>
<img src="images/pandora_logo.png" border="0"></a><br><font size="1">
<?php echo $pandora_version; ?>
</font>
<img src="images/pandora_logo.png" border="0"></a><br>
<font size="1"><?php echo $pandora_version; ?></font>
</div>
<div class="msg"><br><br>For security reasons, <i>config.php</i> must have restrictive permissions, and "other" users cannot read or write to it. It could be writed only for owner (usually www-data or http daemon user), normal operation is not possible until you change permissions for <i>include/config.php</i> file. Please do it, it's for your security.</div>
</div>

View File

@ -134,7 +134,7 @@ echo "<div id='menu_tab_left'>
<ul class='mn'>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'>
<img src='images/setup.png' class='top' border=0>&nbsp; ".substr(dame_nombre_agente($id_agente),0,15)." - ".$lang_label["setup_mode"]."</a>";
<img src='images/setup.png' class='top' border='0'>&nbsp; ".substr(dame_nombre_agente($id_agente),0,15)." - ".$lang_label["setup_mode"]."</a>";
echo "</li>";
echo "</ul></div>";
@ -143,23 +143,23 @@ echo "<div id='menu_tab'>
<ul class='mn'>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/zoom.png' width='16' class='top' border=0>&nbsp; View</a>";
echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/zoom.png' width='16' class='top' border='0'>&nbsp;".$lang_label["view"]."</a>";
echo "</li>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=$id_agente'><img src='images/cog.png' width='16' class='top' border=0>&nbsp; Setup agent</a>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=$id_agente'><img src='images/cog.png' width='16' class='top' border='0'>&nbsp; ".$lang_label["setup_agent"]."</a>";
echo "</li>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=$id_agente'><img src='images/lightbulb.png' width='16' class='top' border=0>&nbsp; Modules</a>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=$id_agente'><img src='images/lightbulb.png' width='16' class='top' border='0'>&nbsp;".$lang_label["modules"]."</a>";
echo "</li>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente=$id_agente'><img src='images/bell.png' width='16' class='top' border=0>&nbsp; Alerts</a>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente=$id_agente'><img src='images/bell.png' width='16' class='top' border='0'>&nbsp;". $lang_label["Alerts"]."</a>";
echo "</li>";
echo "<li class='nomn'>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente=$id_agente'><img src='images/network.png' width='16' class='top' border=0>&nbsp; NC Templates</a>";
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente=$id_agente'><img src='images/network.png' width='16' class='top' border=0>&nbsp;".$lang_label["ntemplates"]."</a>";
echo "</li>";
echo "</ul>";

View File

@ -875,7 +875,7 @@ $lang_label["graph_event_total"]="Event graph";
$lang_label["graph_event_group"]="Event graph by group";
$lang_label["graph_event_user"]="Event graph by user";
$lang_label["db_agente_paquetes"]="Packets per agent";
$lang_label["db_agente_módulo"]="Modules per agent";
$lang_label["db_agente_modulo"]="Modules per agent";
$lang_label["inc_stat_status"]="Incidents by status";
$lang_label["inc_stat_priority"]="Incidents by priority";
@ -893,6 +893,9 @@ $lang_label["message_not_read"]= "Message not read";
$lang_label["Factor"]="Factor";
$lang_label["render_now"]="Render now";
global $lang_label;
$lang_label["ntemplates"]="Net. Templates";
$lang_label["setup_agent"]="Setup Agent";
global $lang_label;
global $help_label;
?>

View File

@ -1,4 +1,4 @@
<?php
<?php
// Pandora FMS - the Free monitoring system
// ========================================
@ -130,7 +130,7 @@ $lang_label["description"]="Descripción";
$lang_label["last_fired"]="Lanzada por última vez";
$lang_label["type"]="Tipo";
$lang_label["last_contact"]="Último contacto";
$lang_label["last_data_chunk"]="Contenido de los últimos paquetes enviados por el agente: ";
$lang_label["last_data_chunk"]="Contenido de los últimos paquetes enviados por el agente";
$lang_label["graph"]="Gráfico";
$lang_label["raw_data"]="Datos";
$lang_label["data"]="Datos";
@ -423,7 +423,7 @@ $lang_label["definedprofiles"]="Perfiles definidos en Pandora";
$lang_label["attachfile"]="Añadir archivo";
$lang_label["filename"]="Nombre del archivo";
$lang_label["size"]="Tamaño";
$lang_label["upload"]="Subir";
$lang_label["module"]="Módulo";
$lang_label["modules"]="Módulos";
@ -661,11 +661,11 @@ $lang_label["no_rtask"]="No hay ninguna tarea de reconocimiento configurada";
$lang_label["no_netprofiles"]="No hay ningún perfil de red definido";
// PANDORA 1.3
$lang_label["dbprohelp"]="El proceso de borrado de la base de datos es usado para borrar aquellas entradas de la BBDD que por alguna razon necesitan ser borradas";
$lang_label["dbprohelp"]="El proceso de borrado de la base de datos es usado para borrar aquellas entradas de la BBDD que por alguna razon necesitan ser borradas";
$lang_label["valprohelp"]="El valor del módulo del agente mínimo y máximo que delimitan los valores válidos. Cualquier otro valor fuera de ese rango será eliminado";
$lang_label["validate_event_failed"]="Validación de evento fallida";
$lang_label["view_agent_general_data"]="Informaci´´on general del agente";
$lang_label["view_agent_general_data"]="Información general del agente";
$lang_label["information"]="Información general";
$lang_label["load"]="Carga";
$lang_label["tactical_server_information"]="Información táctica del servidor";
@ -764,7 +764,7 @@ $lang_label["alert_text"]="Alerta de texto";
$lang_label["text"]="Texto";
$lang_label["delete_data_above"]="Dato borrado";
$lang_label["enabled"]="Habilitado";
$lang_label["average_per_hourday"]="Media por hora/dií";
$lang_label["average_per_hourday"]="Media por hora/día";
$lang_label["datatable"]="Tabla de datos";
$lang_label["export_type"]="Tipo de exportación";
$lang_label["sunday"]="Domingo";
@ -875,6 +875,9 @@ $lang_label["message_read"]="Mensaje leído";
$lang_label["message_not_read"]="Mensaje sin leer";
$lang_label["Factor"]="Factor";
$lang_label["render_now"]="Ver ahora";
$lang_label["ntemplates"]="Plantillas Red";
$lang_label["setup_agent"]="Configurar agente";
global $lang_label;
global $help_label;
?>
?>

View File

@ -24,13 +24,13 @@
// Pandora FMS 1.x uses Pear Image::Graph code
//Pandora Version, if not defined here it would take from config.php
$build_version="PC070820";
$pandora_version="v1.3 Beta2";
$build_version="PC070908";
$pandora_version="v1.3 Beta3";
global $build_version;
global $pandora_version;
// Set to 1 to do not check for installer or config file (for development!).
$develop_bypass = 0;
$develop_bypass = 1;
if ($develop_bypass != 1){
// If no config file, automatically try to install

View File

@ -65,9 +65,10 @@ if (comprueba_login() == 0) {
echo '<table cellspacing="4" cellpadding="4" border=0 class="databox"> ';
echo '<tr>
<td class="datos"><b>'.$lang_label["agent_name"].'</b></td>
<td class="datos"><b>'.strtoupper(salida_limpia($nombre_agente));
<td class="datos"><b>'.strtoupper(salida_limpia($nombre_agente)).'</b></td>';
echo "<td class='datos2' width='40'><a class='info' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&refr=60'><span>".$lang_label["refresh_data"]."</span>"."<img src='images/refresh.png' class='top' border=0></a>&nbsp;&nbsp;";
echo "<td class='datos2' width='40'>
<a class='info' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&refr=60'><span>".$lang_label["refresh_data"]."</span><img src='images/refresh.png' class='top' border=0></a>&nbsp;&nbsp;";
// Data base access graph
echo '</td>';
@ -78,8 +79,8 @@ if (comprueba_login() == 0) {
// Show all address for this agent, show first the main IP (taken from tagente table)
echo "<select style='padding:0px' name='notused' size=1>";
echo "<option>".salida_limpia($direccion_agente);
echo "<select style='padding:0px' name='notused' size='1'>";
echo "<option>".salida_limpia($direccion_agente)."</option>";
$sql_2='SELECT id_a FROM taddress_agent WHERE id_agent = '.$id_agente;
$result_t=mysql_query($sql_2);
while ($row=mysql_fetch_array($result_t)){
@ -96,7 +97,7 @@ if (comprueba_login() == 0) {
//if ($agent_type == 0) {
echo '<tr>
<td class="datos"><b>'.$lang_label["os"].'</b></td>
<td class="datos" colspan=2>
<td class="datos" colspan="2">
<img src="images/'.dame_so_icon($id_os).'"> - '.dame_so_name($id_os);
if ($os_version != "")
echo ' '.salida_limpia($os_version);
@ -113,12 +114,12 @@ if (comprueba_login() == 0) {
<td class="datos2" colspan=2>'.$intervalo.'</td>';
echo '</tr>';
echo '<tr>
<td class="datos"><b>'.salida_limpia($lang_label["description"]).'</b></td>
<td class="datos"><b>'.$lang_label["description"].'</b></td>
<td class="datos" colspan=2>'.$comentarios.'</td>';
echo '</tr>';
echo '<tr>
<td class="datos2"><b>'.salida_limpia($lang_label["group"]).'</b></td>
<td class="datos2"><b>'.$lang_label["group"].'</b></td>
<td class="datos2" colspan="2">
<img class="bot" src="images/groups_small/'.show_icon_group($id_grupo).'.png" >&nbsp;&nbsp; '.dame_grupo($id_grupo).'</td></tr>';
if ($agent_type == 0) {