From c2fad0ced174abc16f452ae5b92ac495fcebdbda Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 7 Oct 2010 10:08:38 +0000 Subject: [PATCH] 2010-10-07 Miguel de Dios * include/calendar.js, include/FusionCharts/FusionCharts.js: fixed end of sentences with lost semicolons, the Eclipse IDE warned me some this bugs. * include/help/en/help_date_format.php, include/help/en/help_agent_status.php, include/help/en/help_eventview.php, include/help/en/help_configure_gis_map.php, include/help/en/help_alerts.php, include/help/en/help_plugin_definition.php, include/help/en/help_alert_macros.php, include/help/en/help_gis_setup_map_connection.php, general/license/pandora_info_en.html, general/license/pandora_info_pt_BR.html, general/license/pandora_info_es.html, general/license/pandora_info_ja.html, general/pandora_help.php: cleaned html and fixed unclose html tags in source code, the Eclipse IDE warned me some this bugs. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 17 ++++++ .../general/license/pandora_info_en.html | 52 +++++-------------- .../general/license/pandora_info_es.html | 5 +- .../general/license/pandora_info_ja.html | 5 +- .../general/license/pandora_info_pt_BR.html | 40 +++++++------- pandora_console/general/pandora_help.php | 14 +++-- .../include/FusionCharts/FusionCharts.js | 20 +++---- pandora_console/include/calendar.js | 8 +-- .../include/help/en/help_agent_status.php | 18 +++---- .../include/help/en/help_alert_macros.php | 3 +- .../include/help/en/help_alerts.php | 2 +- .../help/en/help_configure_gis_map.php | 2 +- .../include/help/en/help_date_format.php | 29 ++++++----- .../include/help/en/help_eventview.php | 2 +- .../help/en/help_gis_setup_map_connection.php | 5 +- .../help/en/help_plugin_definition.php | 22 ++++---- 16 files changed, 122 insertions(+), 122 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2ee3f17aa8..2765cd0f02 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2010-10-07 Miguel de Dios + + * include/calendar.js, include/FusionCharts/FusionCharts.js: fixed end of + sentences with lost semicolons, the Eclipse IDE warned me some this bugs. + + * include/help/en/help_date_format.php, + include/help/en/help_agent_status.php, include/help/en/help_eventview.php, + include/help/en/help_configure_gis_map.php, include/help/en/help_alerts.php, + include/help/en/help_plugin_definition.php, + include/help/en/help_alert_macros.php, + include/help/en/help_gis_setup_map_connection.php, + general/license/pandora_info_en.html, + general/license/pandora_info_pt_BR.html, + general/license/pandora_info_es.html, general/license/pandora_info_ja.html, + general/pandora_help.php: cleaned html and fixed unclose html tags in source + code, the Eclipse IDE warned me some this bugs. + 2010-10-07 Sergio Martin * include/functions_reporting.php diff --git a/pandora_console/general/license/pandora_info_en.html b/pandora_console/general/license/pandora_info_en.html index f06fb9d35b..8abb8c934c 100644 --- a/pandora_console/general/license/pandora_info_en.html +++ b/pandora_console/general/license/pandora_info_en.html @@ -9,23 +9,16 @@
  • GNU GENERAL PUBLIC LICENSE
  • Preamble
  • TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -

    - -

    - -

    GNU GENERAL PUBLIC LICENSE

    -

    -Version 2, June 1991 -

    - -
    -Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
+		
+		
    
+		
    
+		
    GNU GENERAL PUBLIC LICENSE
    
+		
    Version 2, June 1991
    
+		
    Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
    
+of this license document, but changing it is not allowed.

    Preamble

    @@ -127,21 +120,18 @@ you may at your option offer warranty protection in exchange for a fee. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: -

    +above, provided that you also meet all of these conditions: +

    +

    -
    a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
    -
    -

    -
    b) You must cause any work that you distribute or publish, that in @@ -149,12 +139,8 @@ above, provided that you also meet all of these conditions: part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
    -
    -

    -

    -
    c) If the modified program normally reads commands interactively @@ -168,9 +154,7 @@ above, provided that you also meet all of these conditions: does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
    -
    -

    These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, @@ -197,20 +181,14 @@ the scope of this License. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - +

    -
    a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
    - -
    -

    -

    -
    b) Accompany it with a written offer, valid for at least three @@ -220,12 +198,8 @@ Sections 1 and 2 above provided that you also do one of the following: distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
    -
    -

    -

    -
    c) Accompany it with the information you received as to the offer @@ -234,9 +208,7 @@ Sections 1 and 2 above provided that you also do one of the following: received the program in object code or executable form with such an offer, in accord with Subsection b above.)
    -
    -

    The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source @@ -387,6 +359,6 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

    -

    +

    END OF TERMS AND CONDITIONS

    \ No newline at end of file diff --git a/pandora_console/general/license/pandora_info_es.html b/pandora_console/general/license/pandora_info_es.html index 52f0fdf2fc..aa20e3bc57 100644 --- a/pandora_console/general/license/pandora_info_es.html +++ b/pandora_console/general/license/pandora_info_es.html @@ -374,12 +374,13 @@ elementos de un menú (lo que sea apropiado para su programa).

    como programador) o tu Universidad (si es el caso) firme un �renuncia de copyright� para el programa, si es necesario. A continuación se ofrece un ejemplo, altere los nombres según sea conveniente: -

      +

        +
      1. Yoyodyne, Inc. mediante este documento renuncia a cualquier interés de derechos de copyright con respecto al programa Gnomovision (que hace pasadas a compiladores) escrito por Pepe Programador.

        <firma de Pepito Grillo>, 20 de diciembre de 1996 -

        Pepito Grillo, Presidente de Asuntillos Varios.

      +

      Pepito Grillo, Presidente de Asuntillos Varios.

    Esta Licencia Pública General no permite que incluya sus programas en programas propietarios. Si su programa es una biblioteca de subrutinas, diff --git a/pandora_console/general/license/pandora_info_ja.html b/pandora_console/general/license/pandora_info_ja.html index 38ab2695c7..3a6dcedffe 100644 --- a/pandora_console/general/license/pandora_info_ja.html +++ b/pandora_console/general/license/pandora_info_ja.html @@ -21,11 +21,8 @@

  • 複製、頒布、改変に関する条件と制約
    • - -

    -

    - +

    GNU 一般公衆利用許諾契約書

    バージョン 2、1991年6月
    diff --git a/pandora_console/general/license/pandora_info_pt_BR.html b/pandora_console/general/license/pandora_info_pt_BR.html index 31062d5845..b4eb7552e4 100644 --- a/pandora_console/general/license/pandora_info_pt_BR.html +++ b/pandora_console/general/license/pandora_info_pt_BR.html @@ -122,21 +122,21 @@ opcionalmente, oferecer garantia em troca de pagamento. parte dele, assim gerando um trabalho baseado no Programa, e copiar e distribuir essas modifica��es ou trabalhos sob os temos da se��o 1 acima, desde que voc� tamb�m se enquadre em todas estas condi��es:

    -
    +
    a) Voc� tem que fazer com que os arquivos modificados levem avisos proeminentes afirmando que voc� alterou os arquivos, incluindo a data de qualquer altera��o. -
    -

    -

    +
    + +
    b) Voc� tem que fazer com que quaisquer trabalhos que voc� distribua ou publique, e que integralmente ou em partes contenham ou sejam derivados do Programa ou de suas partes, sejam licenciados, integralmente e sem custo algum para quaisquer terceiros, sob os termos desta Licen�a. -

    -

    -

    +
    + +
    c) Se qualquer programa modificado normalmente l� comandos interativamente quando executados, voc� tem que fazer com que, quando iniciado tal uso interativo da forma mais simples, seja @@ -147,7 +147,7 @@ acima, desde que voc� tamb�m se enquadre em todas estas condi��es:

    Programa em si � interativo mas normalmente n�o imprime estes tipos de an�ncios, seu trabalho baseado no Programa n�o precisa imprimir um an�ncio.) -

    +

    Estas exig�ncias aplicam-se ao trabalho modificado como um todo. Se se��es identific�veis de tal trabalho n�o s�o derivadas do Programa, e @@ -178,29 +178,31 @@ nele, conforme descrito na Se��o 2) em c�digo-objeto ou em forma execut�vel sob os termos das Se��es 1 e 2 acima, desde que voc� fa�a um dos seguintes:

    -
    +
    a)O acompanhe com o c�digo-fonte completo e em forma acess�vel por m�quinas, que tem que ser distribu�do sob os termos das Se��es 1 e 2 acima e em meio normalmente utilizado para o interc�mbio de software; ou, -
    -

    -

    +
    + +
    b) O acompanhe com uma oferta escrita, v�lida por pelo menos tr�s anos, de fornecer a qualquer um, com um custo n�o superior ao custo de distribui��o f�sica do material, uma c�pia do c�digo-fonte completo e em forma acess�vel por m�quinas, que tem que ser distribu�do sob os termos das Se��es 1 e 2 acima e em meio normalmente utilizado para o interc�mbio de software; ou, -
    -

    -

    +
    + +
    +

    c) O acompanhe com a informa��o que voc� recebeu em rela��o � oferta de distribui��o do c�digo-fonte correspondente. (Esta alternativa � permitida somente em distribui��o n�o comerciais, e apenas se voc� recebeu o programa em forma de c�digo-objeto ou execut�vel, com oferta de acordo com a Subse��o b acima.) -

    +

    +

    O c�digo-fonte de um trabalho corresponde � forma de trabalho preferida para se fazer modifica��es. Para um trabalho em forma @@ -350,9 +352,9 @@ PERDAS SOFRIDAS POR VOC� OU POR OUTRAS PARTES, OU FALHAS DO PROGRAMA AO OPERAR COM QUALQUER OUTRO PROGRAMA), MESMO QUE TAL DETENTOR OU PARTE TENHAM SIDO AVISADOS DA POSSIBILIDADE DE TAIS DANOS.

    -

    FIM DOS TERMOS E CONDI��ES

    -

    -

    Como Aplicar Estes Termos aos Seus Novos Programas

    +

    FIM DOS TERMOS E CONDI��ES

    + +

    Como Aplicar Estes Termos aos Seus Novos Programas

    Se voc� desenvolver um novo programa, e quer que ele seja utilizado amplamente pelo p�blico, a melhor forma de alcan�ar este objetivo � diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index 6de35ec4b3..2ed4b44110 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -16,11 +16,15 @@ require_once ("../include/config.php"); require_once ("../include/functions.php"); - -echo ''.__('Pandora FMS help system').''; -echo ''; -echo ''; - +?> + +<?php +echo __('Pandora FMS help system'); +?> + + + +agent status are: - - - + + + - - - + + +
    At least one monitor failsAt least one monitor failsAt least one monitor failsChange between Green/Red stateChange between Green/Red stateChange between Green/Red stateAll Monitors OKAll Monitors OKAll Monitors OKAt least one monitor failsAt least one monitor failsAt least one monitor failsChange between Green/Red stateChange between Green/Red stateChange between Green/Red stateAll Monitors OKAll Monitors OKAll Monitors OK
    Agent without monitorsAgent without monitorsAgent without monitorsAgent without dataAgent without dataAgent without dataAgent downAgent downAgent downAgent without monitorsAgent without monitorsAgent without monitorsAgent without dataAgent without dataAgent without dataAgent downAgent downAgent down
    @@ -38,9 +38,9 @@ Possible values of alert status are:

    - - - + + +
    Alert firedAlert firedAlert firedAlert disabledAlert disabledAlerts disabledAlert not firedAlert not firedAlert not firedAlert firedAlert firedAlert firedAlert disabledAlert disabledAlerts disabledAlert not firedAlert not firedAlert not fired
    diff --git a/pandora_console/include/help/en/help_alert_macros.php b/pandora_console/include/help/en/help_alert_macros.php index 120f943264..abf60f78b3 100644 --- a/pandora_console/include/help/en/help_alert_macros.php +++ b/pandora_console/include/help/en/help_alert_macros.php @@ -24,12 +24,13 @@ The following macros are available:

  • _moduledescription_ : Description of the module who fired the alert
  • _alert_name_ : Alert name
  • _alert_priority_ : Numerical alert priorityu
    • -
  • _id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage. +
  • _id_agent_ : Id of agent, useful to build direct URL to redirect to a Pandora FMS console webpage.
  • _id_alert_ : Numerical ID of the alert (unique), used to correlate on third party software

    • +

    Example: Agent _agent_ has fired alert _alert_ with data _data_

    diff --git a/pandora_console/include/help/en/help_alerts.php b/pandora_console/include/help/en/help_alerts.php index 9a2a897ac5..6e53cc7728 100644 --- a/pandora_console/include/help/en/help_alerts.php +++ b/pandora_console/include/help/en/help_alerts.php @@ -15,7 +15,7 @@ The next fields must be filled to assign an alert:
    • Alert type: This can be selected from the alert list previously generated.
    • Max. Value: Defines the maximum value for a module. Any value above that threshold will trigger the alert.
      • -
    • Min. Value: Defines the minimum value for a module. Any value below that will trigger the alert. "max." & "min." couple are the key values while defining an alert, since they define the range of normal values, out of that range Pandora FMS will trigger the alert.
      • +
    • Min. Value: Defines the minimum value for a module. Any value below that will trigger the alert. "max." & "min." couple are the key values while defining an alert, since they define the range of normal values, out of that range Pandora FMS will trigger the alert.
    • Alert text: In case of string modules, you can define a regular expression or a single string to match contents of data module to trigger the alert.
    • Time from / Time to: This defines a range of "valid" time range to fire alerts.
    • Description: Describes the function of the alert, and it is useful to identify the alert among the others in the general view of alerts.
      • diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php index fa11f454c8..5d5d49244c 100644 --- a/pandora_console/include/help/en/help_configure_gis_map.php +++ b/pandora_console/include/help/en/help_configure_gis_map.php @@ -14,7 +14,7 @@ Each map has a desciptive name used to recognice the map within Pandora FMS.

      Select Connections

      -The first step is to select the main connection used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the Add (Add) icon. +The first step is to select the main connection used in this GIS Map. At least one connection must be selected to configure the GIS Map, but it's possible to add more by pressing the Add (Add) icon.

      When the firs connection is set, Pandora FMS asks if you want to use the default values of the connection for the map, to avoid to write again all the information. Also if the default connection for the map is changed (using the radio button), Pandora FMS will ask again if you want to use the values of the new default connection. diff --git a/pandora_console/include/help/en/help_date_format.php b/pandora_console/include/help/en/help_date_format.php index 4303e56e66..4c61c8f7ad 100644 --- a/pandora_console/include/help/en/help_date_format.php +++ b/pandora_console/include/help/en/help_date_format.php @@ -343,24 +343,29 @@

      Examples

      - + + - - + - - + - + - + - + - +
      Format String Output sample +
      Format StringOutput sample
      F j, Y, g:i a March 10, 2001, 5:16 pm +F j, Y, g:i a March 10, 2001, 5:16 pm
      m.d.y 03.10.01 +m.d.y03.10.01
      j, n, Y 10, 3, 2001 +j, n, Y10, 3, 2001
      Ymd 20010310 +Ymd20010310
      h-i-s, j-m-y, it is w Day z 05-16-17, 10-03-01, 1631 1618 6 Fripm01 +h-i-s, j-m-y, it is w Day z05-16-17, 10-03-01, 1631 1618 6 Fripm01
      \i\t \i\s \t\h\e jS \d\a\y. It is the 10th day. - +\i\t \i\s \t\h\e jS \d\a\y.It is the 10th day.
      -D M j G:i:s T Y Sat Mar 10 15:16:08 MST 2001 - +D M j G:i:s T YSat Mar 10 15:16:08 MST 2001
      H:i:s 17:16:17 +H:i:s17:16:17
      \ No newline at end of file diff --git a/pandora_console/include/help/en/help_eventview.php b/pandora_console/include/help/en/help_eventview.php index 0cde1992a2..c4d686ddc9 100644 --- a/pandora_console/include/help/en/help_eventview.php +++ b/pandora_console/include/help/en/help_eventview.php @@ -31,4 +31,4 @@
       
      - + diff --git a/pandora_console/include/help/en/help_gis_setup_map_connection.php b/pandora_console/include/help/en/help_gis_setup_map_connection.php index f2aa87b087..c813b78100 100644 --- a/pandora_console/include/help/en/help_gis_setup_map_connection.php +++ b/pandora_console/include/help/en/help_gis_setup_map_connection.php @@ -15,13 +15,14 @@ Currently Pandora FMS support 3 differet kinds of connections: OpenStreetMap, Go

      Open Street Maps

      -To use the Open Street maps connection you can setup your own server (see http://wiki.openstreetmap.org/wiki/Main_Page to start and http://wiki.openstreetmap.org/wiki/Mapnik as an example of how to render your own tiles.) also you can access the open street map tile server:
      +To use the Open Street maps connection you can setup your own server (see http://wiki.openstreetmap.org/wiki/Main_Page to start and http://wiki.openstreetmap.org/wiki/Mapnik as an example of how to render your own tiles.) also you can access the open street map tile server:
      +

       http://tile.openstreetmap.org/${z}/${x}/${y}.png
      +

      Using their Licence

      -

      Google MAPS

      First, you need to register and get a free API KEY. Read about this at:
      diff --git a/pandora_console/include/help/en/help_plugin_definition.php b/pandora_console/include/help/en/help_plugin_definition.php index 83dfc015ac..2514b8e1ec 100644 --- a/pandora_console/include/help/en/help_plugin_definition.php +++ b/pandora_console/include/help/en/help_plugin_definition.php @@ -20,23 +20,23 @@ Operation could be "status", "qps", "load", "fragment" and "memory". It returns - - - + - + + + + + + - - - -
      Plugin command/usr/share/pandora/util/plugins/informix_plugin_pandora (default location for plugins) -
      Max. timeout: 15 (for example). +Plugin command/usr/share/pandora/util/plugins/informix_plugin_pandora (default location for plugins)
      IP Address option -H - +Max. timeout: 15 (for example).
      Port option Leave it blank. +IP Address option -H
      Port option Leave it blank.
      User option -U
      User option -U -
      Password option -P +Password option -P