From dc63e7553fdb8c55c4b724a96ed9f306bff51784 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 7 Oct 2010 10:50:04 +0000 Subject: [PATCH] 2010-10-07 Miguel de Dios * include/javascript/calendar.js, include/javascript/jquery.colorpicker.js: fixed end of sentences with lost semicolons, the Eclipse IDE warned me some this bugs. * include/javascript/jquery.timeentry.js, include/help/en/help_wmiquery.php, include/help/en/help_tcp_send.php, include/help/en/help_web_checks.php, include/help/es/help_date_format.php, include/help/es/help_tcp_send.php, include/help/es/help_agent_status.php, include/help/es/help_eventview.php, include/help/es/help_configure_gis_map.php, include/help/es/help_web_checks.php, include/help/es/help_plugin_definition.php, include/help/es/help_alert_macros.php, include/help/ja/help_wmiquery.php, include/help/ja/help_date_format.php, include/help/ja/help_alert-matches.php, include/help/ja/help_tcp_send.php, include/help/ja/help_agent_status.php, include/help/ja/help_eventview.php, include/help/ja/help_configure_gis_map.php, include/help/ja/help_map_builder.php, include/help/ja/help_web_checks.php, include/help/ja/help_plugin_definition.php, include/help/ja/help_alert_macros.php, include/help/ja/help_gis_setup_map_connection.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@3363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 24 +++++++++++++++ .../include/help/en/help_tcp_send.php | 11 +++---- .../include/help/en/help_web_checks.php | 10 +++---- .../include/help/en/help_wmiquery.php | 2 +- .../include/help/es/help_agent_status.php | 18 +++++------ .../include/help/es/help_alert_macros.php | 14 ++++----- .../help/es/help_configure_gis_map.php | 2 +- .../include/help/es/help_date_format.php | 30 +++++++++++-------- .../include/help/es/help_eventview.php | 1 - .../help/es/help_plugin_definition.php | 12 ++++---- .../include/help/es/help_tcp_send.php | 11 +++---- .../include/help/es/help_web_checks.php | 8 ++--- .../include/help/ja/help_agent_status.php | 18 +++++------ .../include/help/ja/help_alert-matches.php | 9 +++--- .../include/help/ja/help_alert_macros.php | 2 +- .../help/ja/help_configure_gis_map.php | 2 +- .../include/help/ja/help_date_format.php | 29 +++++++++++------- .../include/help/ja/help_eventview.php | 1 - .../help/ja/help_gis_setup_map_connection.php | 3 +- .../include/help/ja/help_map_builder.php | 2 +- .../help/ja/help_plugin_definition.php | 12 ++++---- .../include/help/ja/help_tcp_send.php | 11 +++---- .../include/help/ja/help_web_checks.php | 4 +-- .../include/help/ja/help_wmiquery.php | 2 +- .../include/javascript/calendar.js | 8 ++--- .../include/javascript/jquery.colorpicker.js | 2 +- .../include/javascript/jquery.timeentry.js | 2 +- 27 files changed, 144 insertions(+), 106 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2765cd0f02..6ae6c699d4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,27 @@ +2010-10-07 Miguel de Dios + + * include/javascript/calendar.js, include/javascript/jquery.colorpicker.js: + fixed end of sentences with lost semicolons, the Eclipse IDE warned me some + this bugs. + + * include/javascript/jquery.timeentry.js, include/help/en/help_wmiquery.php, + include/help/en/help_tcp_send.php, include/help/en/help_web_checks.php, + include/help/es/help_date_format.php, include/help/es/help_tcp_send.php, + include/help/es/help_agent_status.php, include/help/es/help_eventview.php, + include/help/es/help_configure_gis_map.php, + include/help/es/help_web_checks.php, + include/help/es/help_plugin_definition.php, + include/help/es/help_alert_macros.php, include/help/ja/help_wmiquery.php, + include/help/ja/help_date_format.php, + include/help/ja/help_alert-matches.php, include/help/ja/help_tcp_send.php, + include/help/ja/help_agent_status.php, include/help/ja/help_eventview.php, + include/help/ja/help_configure_gis_map.php, + include/help/ja/help_map_builder.php, include/help/ja/help_web_checks.php, + include/help/ja/help_plugin_definition.php, + include/help/ja/help_alert_macros.php, + include/help/ja/help_gis_setup_map_connection.php: cleaned html and fixed + unclose html tags in source code, the Eclipse IDE warned me some this bugs. + 2010-10-07 Miguel de Dios * include/calendar.js, include/FusionCharts/FusionCharts.js: fixed end of diff --git a/pandora_console/include/help/en/help_tcp_send.php b/pandora_console/include/help/en/help_tcp_send.php index 33b48920da..ea44e5e276 100644 --- a/pandora_console/include/help/en/help_tcp_send.php +++ b/pandora_console/include/help/en/help_tcp_send.php @@ -50,27 +50,28 @@ SSH-2.0|Protocol mismatch

Example #3. Checking a SMTP service

-This is sample SMTP conversation: +This is sample SMTP conversation:

 R: 220 mail.supersmtp.com Blah blah blah
 S: HELO myhostname.com
 R: 250 myhostname.com
-S: MAIL FROM: 
+S: MAIL FROM: <pepito@myhostname.com>
 R: 250 OK
-S: RCPT TO: 
+S: RCPT TO: <Jones@supersmtp.com>
 R: 250 OK
 S: DATA
-R: 354 Start mail input; end with .
+R: 354 Start mail input; end with <CRLF>.<CRLF>
 S: .......your mail here........
 S: .
 R: 250 OK
 S: QUIT
 R: 221 mail.supersmtp.com Service closing blah blah blah
+


So if you want to check the first steps of conversation, the fields will be:

-TCP SEND : HELLO myhostname.com^M|MAIL FROM: ^M| RCPT TO: ^M +TCP SEND : HELLO myhostname.com^M|MAIL FROM: <pepito@myhostname.com>^M| RCPT TO: <Jones@supersmtp.com>^M

TCP SEND : 250|250|250

diff --git a/pandora_console/include/help/en/help_web_checks.php b/pandora_console/include/help/en/help_web_checks.php index 2eae42d440..7de63a2557 100644 --- a/pandora_console/include/help/en/help_web_checks.php +++ b/pandora_console/include/help/en/help_web_checks.php @@ -7,9 +7,10 @@

Advanced WEB Monitoring is a feature done by the Goliat/WEB Server in Pandora FMS Enterprise version. -

+

This is a sample of GOLIAT Webcheck module: -
+
+

 
 
@@ -24,12 +25,11 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
+get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
 task_end
 
 
-
-

+ \ No newline at end of file diff --git a/pandora_console/include/help/en/help_wmiquery.php b/pandora_console/include/help/en/help_wmiquery.php index fa7fc04075..53122c722d 100644 --- a/pandora_console/include/help/en/help_wmiquery.php +++ b/pandora_console/include/help/en/help_wmiquery.php @@ -7,7 +7,7 @@

Any valid WQL query. According to Microsoft, the WMI Query Language (WQL) is a subset of standard American National Standards Institute Structured Query Language (ANSI SQL) with minor semantic changes to support WMI. -

+

Example: SELECT LoadPercentage from Win32_Processor WHERE DeviceID = "CPU0"

\ No newline at end of file diff --git a/pandora_console/include/help/es/help_agent_status.php b/pandora_console/include/help/es/help_agent_status.php index 010049bfb8..385c3b0127 100644 --- a/pandora_console/include/help/es/help_agent_status.php +++ b/pandora_console/include/help/es/help_agent_status.php @@ -23,14 +23,14 @@ Los valores posibles del estado de un agente son: - - - + + + - - - + + +
At least one monitor failsAt least one monitor failsAl menos un monitor fallaChange between Green/Red stateChange between Green/Red stateCambia entre el estado Verde/RojoAll Monitors OKAll Monitors OKTodos los monitores están OKAt least one monitor failsAt least one monitor failsAl menos un monitor fallaChange between Green/Red stateChange between Green/Red stateCambia entre el estado Verde/RojoAll Monitors OKAll Monitors OKTodos los monitores están OK
Agent without monitorsAgent without monitorsAgente sin monitoresAgent without dataAgent without dataAgente sin datosAgent downAgent downAgente caídoAgent without monitorsAgent without monitorsAgente sin monitoresAgent without dataAgent without dataAgente sin datosAgent downAgent downAgente caído
@@ -40,9 +40,9 @@ Los valores posibles del estado de alerta son:

- - - + + +
Alert firedAlert firedAlerta disparadaAlert disabledAlert disabledAlerta desactivadaAlert not firedAlert not firedAlerta no disparadaAlert firedAlert firedAlerta disparadaAlert disabledAlert disabledAlerta desactivadaAlert not firedAlert not firedAlerta no disparada
diff --git a/pandora_console/include/help/es/help_alert_macros.php b/pandora_console/include/help/es/help_alert_macros.php index 8cde388d01..ab24d7baa5 100644 --- a/pandora_console/include/help/es/help_alert_macros.php +++ b/pandora_console/include/help/es/help_alert_macros.php @@ -7,6 +7,7 @@

Las siguientes macros están disponibles: +

  • _field1_: Campo 1 definido por el usuario.
  • _field2_: Campo 2 definido por el usuario.
    • @@ -18,16 +19,15 @@ Las siguientes macros están disponibles:
  • _alert_description_: Descripción de la alerta.
  • _alert_threshold_: Umbral de la alerta.
  • _alert_times_fired_: Número de veces que se ha disparado la alerta.
    • -
  • _module_: Nombre del módulo -
  • _moduledescription_: Descripcion del modulo. -
  • _alert_name_: Nombre de la alerta. -
  • _alert_priority_: Prioridad de la alerta. -
  • _id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora. -
  • _id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros. +
  • _module_: Nombre del módulo
    • +
  • _moduledescription_: Descripcion del modulo.
    • +
  • _alert_name_: Nombre de la alerta.
    • +
  • _alert_priority_: Prioridad de la alerta.
    • +
  • _id_agent_: ID del agente, util para construir URL de acceso a la consola de Pandora.
    • +
  • _id_alert_: ID de la alerta, util para correlar la alerta en herramientas de terceros.

-

Ejemplo: Error en el agente _agent_: _alert_description_

diff --git a/pandora_console/include/help/es/help_configure_gis_map.php b/pandora_console/include/help/es/help_configure_gis_map.php index 10c6927820..68c18bde03 100644 --- a/pandora_console/include/help/es/help_configure_gis_map.php +++ b/pandora_console/include/help/es/help_configure_gis_map.php @@ -15,7 +15,7 @@ Cada mapa tiene un nombre descriptivo que se utiliza para reconocer el mapa dent

Seleccionar Conexiones

-El primer paso es seleccionar la principal conexión empleada en este Mapa GIS. Al menos una conexión debe ser seleccionada para configurar el MAPA GIS, pero es posible añadir más presionando el icono(Add) Add +El primer paso es seleccionar la principal conexión empleada en este Mapa GIS. Al menos una conexión debe ser seleccionada para configurar el MAPA GIS, pero es posible añadir más presionando el icono(Add) Add

diff --git a/pandora_console/include/help/es/help_date_format.php b/pandora_console/include/help/es/help_date_format.php index 54dc7b80a8..495e3cf002 100644 --- a/pandora_console/include/help/es/help_date_format.php +++ b/pandora_console/include/help/es/help_date_format.php @@ -336,24 +336,30 @@

Ejemplos

- - + - + - + - + - + - + - + - + + +
Cadena de formato Ejemplo de salida
F j, Y, g:i a March 10, 2001, 5:16 pm +Cadena de formato Ejemplo de salida
m.d.y 03.10.01 +F j, Y, g:i aMarch 10, 2001, 5:16 pm
j, n, Y 10, 3, 2001 +m.d.y03.10.01
Ymd 20010310 +j, n, Y10, 3, 2001
h-i-s, j-m-y, it is w Day z 05-16-17, 10-03-01, 1631 1618 6 Fripm01 +Ymd20010310
\e\s \e\l \d\í\a j. Es el día 10. - +h-i-s, j-m-y, it is w Day z05-16-17, 10-03-01, 1631 1618 6 Fripm01
-D M j G:i:s T Y Sat Mar 10 15:16:08 MST 2001 - +\e\s \e\l \d\í\a j.Es el día 10.
H:i:s 17:16:17 +D M j G:i:s T YSat Mar 10 15:16:08 MST 2001
H:i:s17:16:17
diff --git a/pandora_console/include/help/es/help_eventview.php b/pandora_console/include/help/es/help_eventview.php index 15db6f8e1a..cabcc4e3b3 100644 --- a/pandora_console/include/help/es/help_eventview.php +++ b/pandora_console/include/help/es/help_eventview.php @@ -31,4 +31,3 @@
 
- diff --git a/pandora_console/include/help/es/help_plugin_definition.php b/pandora_console/include/help/es/help_plugin_definition.php index 4bc50f04b9..db024e87f5 100644 --- a/pandora_console/include/help/es/help_plugin_definition.php +++ b/pandora_console/include/help/es/help_plugin_definition.php @@ -20,24 +20,24 @@ La operación podría ser «status», «qps», «load&r - - - - - -
Comando del complemento/usr/share/pandora/util/plugins/informix_plugin_pandora (ubicación predeterminada para los complementos) +Comando del complemento/usr/share/pandora/util/plugins/informix_plugin_pandora (ubicación predeterminada para los complementos)
Máx. tiempo de expiración 15 (por ejemplo). +Máx. tiempo de expiración 15 (por ejemplo).
Dirección IP -H +Dirección IP -H
Opción de puerto Déjela en blanco. +Opción de puerto Déjela en blanco.
Opción de usuario -U +Opción de usuario -U
Opción de contraseña -P +Opción de contraseña -P
diff --git a/pandora_console/include/help/es/help_tcp_send.php b/pandora_console/include/help/es/help_tcp_send.php index 78365dbd21..94b65abfa6 100644 --- a/pandora_console/include/help/es/help_tcp_send.php +++ b/pandora_console/include/help/es/help_tcp_send.php @@ -50,27 +50,28 @@ SSH-2.0|Protocol mismatch

Ejemplo #3. Comprobar un servicio SMTP

-Este es un ejemplo de una conversacion SMTP: +Este es un ejemplo de una conversacion SMTP:

 R: 220 mail.supersmtp.com Bla bla bla
 S: HELO myhostname.com
 R: 250 myhostname.com
-S: MAIL FROM: 
+S: MAIL FROM: <pepito@myhostname.com>
 R: 250 OK
-S: RCPT TO: 
+S: RCPT TO: <Jones@supersmtp.com>
 R: 250 OK
 S: DATA
-R: 354 Start mail input; end with .
+R: 354 Start mail input; end with <CRLF>.<CRLF>
 S: .......aquí su correo-e........
 S: .
 R: 250 OK
 S: QUIT
 R: 221 mail.supersmtp.com Service closing bla bla bla
+


De tal forma que si quiere comprar los primeros pasos de la conversación, los campos deberían ser:

-TCP SEND : HELO myhostname.com^M|MAIL FROM: ^M| RCPT TO: ^M +TCP SEND : HELO myhostname.com^M|MAIL FROM: <pepito@myhostname.com>^M| RCPT TO: <Jones@supersmtp.com>^M

TCP SEND : 250|250|250

diff --git a/pandora_console/include/help/es/help_web_checks.php b/pandora_console/include/help/es/help_web_checks.php index 70fe05af1e..fef95021e1 100644 --- a/pandora_console/include/help/es/help_web_checks.php +++ b/pandora_console/include/help/es/help_web_checks.php @@ -10,7 +10,8 @@ La monitorización WEB avanzada es una funcionalidad que realiza el Servidor WEB

Este es un ejemplo del modulo Webcheck de GOLIAT: -
+
+

 
 
@@ -25,12 +26,11 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
+get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
 task_end
 
 
-
-

+ \ No newline at end of file diff --git a/pandora_console/include/help/ja/help_agent_status.php b/pandora_console/include/help/ja/help_agent_status.php index 998e252f1a..eff4dfac61 100644 --- a/pandora_console/include/help/ja/help_agent_status.php +++ b/pandora_console/include/help/ja/help_agent_status.php @@ -10,20 +10,20 @@

- - - + + + - - + + - - - + + + - +
すべての監視項目が正常すべての監視項目が正常1つ以上の監視項目で障害1つ以上の監視項目で障害緑/赤 の状態変化発生緑/赤 の状態変化発生すべての監視項目が正常すべての監視項目が正常1つ以上の監視項目で障害1つ以上の監視項目で障害緑/赤 の状態変化発生緑/赤 の状態変化発生アラート発生中アラート発生中アラートが無効アラートが無効アラート発生中アラート発生中アラートが無効アラートが無効
監視対象外エージェント監視対象外エージェントデータ収集対象外エージェントデータ収集対象外エージェントエージェント停止中エージェント停止中監視対象外エージェント監視対象外エージェントデータ収集対象外エージェントデータ収集対象外エージェントエージェント停止中エージェント停止中アラート未発生アラート未発生アラート未発生アラート未発生
diff --git a/pandora_console/include/help/ja/help_alert-matches.php b/pandora_console/include/help/ja/help_alert-matches.php index a96cd0d6e7..30f803b50b 100644 --- a/pandora_console/include/help/ja/help_alert-matches.php +++ b/pandora_console/include/help/ja/help_alert-matches.php @@ -8,9 +8,8 @@

いくつアラートが上がった時にアクション(メール送信等)を実行するかを定義します。 数値は、開始の値と終了の値が定義でき、定義する値によって次のような動作になります。 - -

    -
  • 未定義もしくは開始の値が 0 の場合は、常にアクションを実行します。 -
  • 開始の値と終了の値が 1 以上の場合は、アラートの回数がその範囲の間、アクションを実行します。 -

+
    +
  • 未定義もしくは開始の値が 0 の場合は、常にアクションを実行します。
    • +
  • 開始の値と終了の値が 1 以上の場合は、アラートの回数がその範囲の間、アクションを実行します。
    • +
diff --git a/pandora_console/include/help/ja/help_alert_macros.php b/pandora_console/include/help/ja/help_alert_macros.php index b171750aaa..8ba72c408a 100644 --- a/pandora_console/include/help/ja/help_alert_macros.php +++ b/pandora_console/include/help/ja/help_alert_macros.php @@ -7,6 +7,7 @@

次のマクロが利用できます: +

  • _field1_ : ユーザ定義フィールド1
  • _field2_ : ユーザ定義フィールド2
    • @@ -30,6 +31,5 @@

-

例: Agent _agent_ has fired alert _alert_ with data _data_

diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php index 67248ae46c..0b21629504 100644 --- a/pandora_console/include/help/ja/help_configure_gis_map.php +++ b/pandora_console/include/help/ja/help_configure_gis_map.php @@ -25,7 +25,7 @@ GIS マップを設定するためには、少なくとも一つ選択されて

マップパラメータ

一度利用マップが選択されると、個別のパラメータ設定が可能です。 -マップの中心(マップを開いた時に表示される)、デフォルトの拡大レベル(マップを開いた時の拡大レベル)、デフォルト位置(位置情報を持たないエージェントが表示される位置)の設定ができます。 +マップの中心(マップを開いた時に表示される)、デフォルトの拡大レベル(マップを開いた時の拡大レベル)、デフォルト位置(位置情報を持たないエージェントが表示される位置)の設定ができます。

オプション: diff --git a/pandora_console/include/help/ja/help_date_format.php b/pandora_console/include/help/ja/help_date_format.php index 01e6f6a91c..5b510cb504 100644 --- a/pandora_console/include/help/ja/help_date_format.php +++ b/pandora_console/include/help/ja/help_date_format.php @@ -337,24 +337,31 @@

例

- - + - + - + - + - + - + + + + - + -
フォーマット設定 表示例
F j, Y, g:i a March 10, 2001, 5:16 pm +フォーマット設定表示例
m.d.y 03.10.01 +F j, Y, g:i a March 10, 2001, 5:16 pm
j, n, Y 10, 3, 2001 +m.d.y 03.10.01
Ymd 20010310 +j, n, Y 10, 3, 2001
h-i-s, j-m-y, it is w Day z 05-16-17, 10-03-01, 1631 1618 6 Fripm01 +Ymd20010310
\i\t \i\s \t\h\e jS \d\a\y. It is the 10th day. +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.
-D M j G:i:s T Y Sat Mar 10 15:16:08 MST 2001 - +D M j G:i:s T Y Sat 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/ja/help_eventview.php b/pandora_console/include/help/ja/help_eventview.php index 48e1ed1c4f..db5d87b6c7 100644 --- a/pandora_console/include/help/ja/help_eventview.php +++ b/pandora_console/include/help/ja/help_eventview.php @@ -31,4 +31,3 @@
 
- diff --git a/pandora_console/include/help/ja/help_gis_setup_map_connection.php b/pandora_console/include/help/ja/help_gis_setup_map_connection.php index 1179ac6625..05854f7c5e 100644 --- a/pandora_console/include/help/ja/help_gis_setup_map_connection.php +++ b/pandora_console/include/help/ja/help_gis_setup_map_connection.php @@ -17,12 +17,13 @@

Open Street マップを利用するためには、以下に示す Open Street マップサーバにアクセスできる必要があります。 (詳細は、http://wiki.openstreetmap.org/wiki/ja:Main_Page を参照してください。また、http://wiki.openstreetmap.org/wiki/ja:Mapnik にサンプルがあります。) +

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

OpenStreetマップの利用は、ライセンスに従っています。

-

Google マップ

最初に Google MAPS API に登録し、フリーの API キーを取得する必要があります。 diff --git a/pandora_console/include/help/ja/help_map_builder.php b/pandora_console/include/help/ja/help_map_builder.php index 735cdc927c..5ca2a9b3f4 100644 --- a/pandora_console/include/help/ja/help_map_builder.php +++ b/pandora_console/include/help/ja/help_map_builder.php @@ -30,6 +30,6 @@

  • 親クラス - 他のアイテムの子アイテムとして定義したい場合に指定します。
  • リンク先マップ - アイテムを他のマップへリンクしたい場合に指定します
    • -作成済みアイテムのプロパティを編集するには、マップ上のアイテムを「マップアイテム編集」にドラッグ&ドロップします。 +作成済みアイテムのプロパティを編集するには、マップ上のアイテムを「マップアイテム編集」にドラッグ&ドロップします。

    アイテムを削除するには、「マップアイテム削除」から削除したいアイテムを選択し、「削除」をクリックします。 diff --git a/pandora_console/include/help/ja/help_plugin_definition.php b/pandora_console/include/help/ja/help_plugin_definition.php index 1153997f1b..62012460f5 100644 --- a/pandora_console/include/help/ja/help_plugin_definition.php +++ b/pandora_console/include/help/ja/help_plugin_definition.php @@ -24,23 +24,23 @@ Pandora FMS で利用するために、このプラグインは単一の値を - - - - - -
    プラグインコマンド/usr/share/pandora/util/plugins/informix_plugin_pandora (プラグインのデフォルト配置ディレクトリ) +プラグインコマンド/usr/share/pandora/util/plugins/informix_plugin_pandora (プラグインのデフォルト配置ディレクトリ)
    最大タイムアウト 15 (例) +最大タイムアウト 15 (例)
    IPアドレスオプション -H +IPアドレスオプション -H
    Port オプション 未記入 +Port オプション 未記入
    User オプション -U +User オプション -U
    Password オプション -P +Password オプション -P
    diff --git a/pandora_console/include/help/ja/help_tcp_send.php b/pandora_console/include/help/ja/help_tcp_send.php index 3f273810cf..291a875faf 100644 --- a/pandora_console/include/help/ja/help_tcp_send.php +++ b/pandora_console/include/help/ja/help_tcp_send.php @@ -55,27 +55,28 @@ SSH-2.0|Protocol mismatch

    例3) SMTP サービスの確認

    -これは、SMTP 通信の例です。 +これは、SMTP 通信の例です。

     R: 220 mail.supersmtp.com Blah blah blah
 S: HELO myhostname.com
 R: 250 myhostname.com
-S: MAIL FROM: 
+S: MAIL FROM: <pepito@myhostname.com>
 R: 250 OK
-S: RCPT TO: 
+S: RCPT TO: <Jones@supersmtp.com>
 R: 250 OK
 S: DATA
-R: 354 Start mail input; end with .
+R: 354 Start mail input; end with <CRLF>.<CRLF>
 S: .......your mail here........
 S: .
 R: 250 OK
 S: QUIT
 R: 221 mail.supersmtp.com Service closing blah blah blah
    +


    最初の通信ステップをチェックしたい場合、各フィールドへ設定する値は次のようになります。

    -「TCP 送信文字列」: HELLO myhostname.com^M|MAIL FROM: ^M| RCPT TO: ^M +「TCP 送信文字列」: HELLO myhostname.com^M|MAIL FROM: <pepito@myhostname.com>^M| RCPT TO: <Jones@supersmtp.com>^M

    「TCP 受信文字列」: 250|250|250

    diff --git a/pandora_console/include/help/ja/help_web_checks.php b/pandora_console/include/help/ja/help_web_checks.php index e6d8f4bb2d..e6df74fa5b 100644 --- a/pandora_console/include/help/ja/help_web_checks.php +++ b/pandora_console/include/help/ja/help_web_checks.php @@ -10,6 +10,7 @@

    以下に、GOLIAT ウェブチェックモジュールのサンプルを示します。
    +

     
 
@@ -24,7 +25,7 @@ resource 1
 task_end
 
 task_begin
-get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
+get http://galaga.artica.es/pandora/index.php?sec=messages&sec2=operation/messages/message
 cookie 1
 resource 1
 check_string Read messages
@@ -32,4 +33,3 @@ task_end
    -

    diff --git a/pandora_console/include/help/ja/help_wmiquery.php b/pandora_console/include/help/ja/help_wmiquery.php index 846fcbf4ea..ddd1cb09bb 100644 --- a/pandora_console/include/help/ja/help_wmiquery.php +++ b/pandora_console/include/help/ja/help_wmiquery.php @@ -7,7 +7,7 @@

    WMI クエリ言語(WQL)は、マイクロソフトにより WMI サポートを追加された ANSI SQL のサブセットです。 -

    +

    例: SELECT LoadPercentage from Win32_Processor WHERE DeviceID = "CPU0"

    diff --git a/pandora_console/include/javascript/calendar.js b/pandora_console/include/javascript/calendar.js index f3f831d0cd..76fa971e2a 100644 --- a/pandora_console/include/javascript/calendar.js +++ b/pandora_console/include/javascript/calendar.js @@ -654,7 +654,7 @@ } } return result; - } + }; // Add a method to left pad zeroes @@ -663,7 +663,7 @@ {var result = ''; for (var i=0;i<(padToLength - this.length);i++) {result += '0';} return (result + this); - } + }; // Set up a closure so that any next function can be triggered // after the calendar has been closed AND that function can take @@ -683,7 +683,7 @@ return (args.shift()==scwTriggerEle) ?func.apply(this, args):null; - } + }; }; // Set up some shortcuts @@ -1451,7 +1451,7 @@ // The first Base Day in the year var scwFirstBaseDay = - new Date(scwInDateWeekBase.getFullYear(),0,1) + new Date(scwInDateWeekBase.getFullYear(),0,1); scwFirstBaseDay.setDate(scwFirstBaseDay.getDate() - scwFirstBaseDay.getDay() diff --git a/pandora_console/include/javascript/jquery.colorpicker.js b/pandora_console/include/javascript/jquery.colorpicker.js index 30d2b1dbab..c98d3328ea 100644 --- a/pandora_console/include/javascript/jquery.colorpicker.js +++ b/pandora_console/include/javascript/jquery.colorpicker.js @@ -46,5 +46,5 @@ $.colorPicker.hideColorPicker();},_generateColorPicker:function(){var colors=new {if((i%width)==0){html+="";} html+='';if(((i+1)>=total)||(((i+1)%width)==0)) {html+="";}} -html+="";return html}});$.fn.attachColorPicker=function(){return this.each(function(){var nodeName=this.nodeName.toLowerCase();if(nodeName=='input') +html+="";return html;}});$.fn.attachColorPicker=function(){return this.each(function(){var nodeName=this.nodeName.toLowerCase();if(nodeName=='input') {var inst=new ColorPickerInstance();$.colorPicker._connectColorPicker(this,inst);}});};$.fn.getValue=function(){var inst=(this.length>0?$.colorPicker._getInst(this[0]._colId):null);return(inst?inst._getValue():null);};$.fn.setValue=function(value){var inst=(this.length>0?$.colorPicker._getInst(this[0]._colId):null);if(inst)inst._setValue(value);};$(document).ready(function(){$.colorPicker=new colorPicker();$(document.body).append($.colorPicker._colorPickerDiv).mousedown($.colorPicker._checkExternalClick);});})(jQuery); diff --git a/pandora_console/include/javascript/jquery.timeentry.js b/pandora_console/include/javascript/jquery.timeentry.js index 4da617a404..c088787fb4 100644 --- a/pandora_console/include/javascript/jquery.timeentry.js +++ b/pandora_console/include/javascript/jquery.timeentry.js @@ -4,4 +4,4 @@ Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. Please attribute the author if you use it. */ -(function($){function TimeEntry(){this._nextId=0;this._inst=[];this._disabledInputs=[];this.regional=[];this.regional['']={show24Hours:false,separator:':',ampmPrefix:'',ampmNames:['AM','PM'],spinnerTexts:['Now','Previous field','Next field','Increment','Decrement']};this._defaults={appendText:'',showSeconds:false,timeSteps:[1,1,1],initialField:0,useMouseWheel:true,defaultTime:null,minTime:null,maxTime:null,spinnerImage:'timeEntry.png',spinnerSize:[20,20,8],spinnerIncDecOnly:false,spinnerRepeat:[500,250],beforeShow:null};$.extend(this._defaults,this.regional[''])}$.extend(TimeEntry.prototype,{markerClassName:'hasTimeEntry',_register:function(a){var b=this._nextId++;this._inst[b]=a;return b},_getInst:function(a){return this._inst[a]||a},setDefaults:function(a){extendRemove(this._defaults,a||{})},_doFocus:function(a){var b=(a.nodeName&&a.nodeName.toLowerCase()=='input'?a:this);if($.timeEntry._lastInput==b){return}if($.timeEntry._isDisabledTimeEntry(b)){return}var c=$.timeEntry._getInst(b._timeId);c._input=$(b);$.timeEntry._focussed=true;$.timeEntry._lastInput=b;$.timeEntry._blurredInput=null;var d=c._get('beforeShow');extendRemove(c._settings,(d?d(b):{}));c._parseTime()},_doBlur:function(a){$.timeEntry._blurredInput=$.timeEntry._lastInput;$.timeEntry._lastInput=null},_doClick:function(a){var b=a.target;var c=$.timeEntry._getInst(b._timeId);if(!$.timeEntry._focussed){var d=c._get('separator').length+2;c._field=0;if($.browser.msie){var e=b.value;var f=a.clientX+$.timeEntry._findScroll(a.srcElement)[0]-$.timeEntry._findPos(a.srcElement)[0];for(var g=0;g<=Math.max(1,c._secondField,c._ampmField);g++){var h=(g!=c._ampmField?(g*d)+2:(c._ampmField*d)+c._get('ampmPrefix').length+c._get('ampmNames')[0].length);b.value=e.substring(0,h);var i=b.createTextRange();if(f=48){return true}var b=$.timeEntry._getInst(this._timeId);switch(a.keyCode){case 9:return(a.shiftKey?b._previousField(true):b._nextField(true));case 35:if(a.ctrlKey){b._setValue('')}else{b._field=Math.max(1,b._secondField,b._ampmField);b._adjustField(0)}break;case 36:if(a.ctrlKey){b._setTime()}else{b._field=0;b._adjustField(0)}break;case 37:b._previousField(false);break;case 38:b._adjustField(+1);break;case 39:b._nextField(false);break;case 40:b._adjustField(-1);break;case 46:b._setValue('');break}return false},_doKeyPress:function(a){var b=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);if(b<' '){return true}var c=$.timeEntry._getInst(this._timeId);c._handleKeyPress(b);return false},_doMouseWheel:function(a,b){b=($.browser.opera?-b/Math.abs(b):b);var c=$.timeEntry._getInst(this._timeId);c._adjustField(b);a.preventDefault()},_connectTimeEntry:function(b,c){var d=$(b);if(d.is('.'+this.markerClassName)){return}var e=c._get('spinnerImage');var f=c._get('spinnerText');var g=c._get('spinnerSize');var h=c._get('appendText');var i=(!e?null:$(''));d.wrap('').after(h?''+h+'':'').after(i||'');d.addClass(this.markerClassName).bind('focus.timeEntry',this._doFocus).bind('blur.timeEntry',this._doBlur).bind('click.timeEntry',this._doClick).bind('keydown.timeEntry',this._doKeyDown).bind('keypress.timeEntry',this._doKeyPress);if($.browser.mozilla){d.bind('input.timeEntry',function(a){c._parseTime()})}if($.browser.msie){d.bind('paste.timeEntry',function(a){setTimeout(function(){c._parseTime()},1)})}if(c._get('useMouseWheel')&&$.fn.mousewheel){d.mousewheel(this._doMouseWheel)}d[0]._timeId=c._id;if(i){i.mousedown(this._handleSpinner).mouseup(this._endSpinner).mouseout(this._endSpinner).mousemove(this._describeSpinner);i[0]._timeId=c._id}},_enableTimeEntry:function(a){this._enableDisable(a,false)},_disableTimeEntry:function(a){this._enableDisable(a,true)},_enableDisable:function(b,c){var d=$.timeEntry._getInst(b._timeId);if(!d){return}b.disabled=c;if(b.nextSibling&&b.nextSibling.nodeName.toLowerCase()=='span'){$.timeEntry._changeSpinner(d,b.nextSibling,(c?5:-1))}$.timeEntry._disabledInputs=$.map($.timeEntry._disabledInputs,function(a){return(a==b?null:a)});if(c){$.timeEntry._disabledInputs[$.timeEntry._disabledInputs.length]=b}},_isDisabledTimeEntry:function(a){for(var i=0;i=3&&f[0]){$.timeEntry._timer=setTimeout(function(){$.timeEntry._repeatSpinner(d,e)},f[0]);$(b).one('mouseout',$.timeEntry._releaseSpinner).one('mouseup',$.timeEntry._releaseSpinner)}},_actionSpinner:function(a,b){switch(b){case 0:a._setTime();break;case 1:a._previousField(false);break;case 2:a._nextField(false);break;case 3:a._adjustField(+1);break;case 4:a._adjustField(-1);break}},_repeatSpinner:function(a,b){$.timeEntry._lastInput=$.timeEntry._blurredInput;this._actionSpinner(a,b);this._timer=setTimeout(function(){$.timeEntry._repeatSpinner(a,b)},a._get('spinnerRepeat')[1])},_releaseSpinner:function(a){clearTimeout($.timeEntry._timer)},_endSpinner:function(a){var b=$.timeEntry._getSpinnerTarget(a);var c=$.timeEntry._getInst(b._timeId);if(!$.timeEntry._isDisabledTimeEntry(b.previousSibling)){$.timeEntry._changeSpinner(c,b,-1)}if(!$.browser.opera){$.timeEntry._lastInput=$.timeEntry._blurredInput}if($.timeEntry._lastInput){c._showField()}},_getSpinnerTarget:function(a){return(a.target?a.target:a.srcElement)},_getSpinnerRegion:function(a,b){var c=this._getSpinnerTarget(b);var d=this._findPos(c);var e=this._findScroll(c);var f=a._get('spinnerIncDecOnly');var g=(f?99:b.clientX+e[0]-d[0]-($.browser.msie?1:0));var h=b.clientY+e[1]-d[1]-($.browser.msie?1:0);var i=a._get('spinnerSize');var j=(f?99:i[0]-g);var k=i[1]-h;if(i[2]>0&&Math.abs(g-j)<=i[2]&&Math.abs(h-k)<=i[2]){return 0}var l=Math.min(g,h,j,k);return(l==g?1:(l==j?2:(l==h?3:4)))},_changeSpinner:function(a,b,c){$(b).css('background-position','-'+((c+1)*a._get('spinnerSize')[0])+'px 0px')},_findPos:function(a){var b=curTop=0;if(a.offsetParent){b=a.offsetLeft;curTop=a.offsetTop;while(a=a.offsetParent){var c=b;b+=a.offsetLeft;if(b<0){b=c}curTop+=a.offsetTop}}return[b,curTop]},_findScroll:function(a){var b=false;$(a).parents().each(function(){b|=$(this).css('position')=='fixed'});if(b&&!$.browser.opera){return[0,0]}var c=($.browser.opera?document.body.scrollLeft:a.scrollLeft);var d=($.browser.opera?document.body.scrollTop:a.scrollTop);if(!$.browser.opera){while(a=a.parentNode){c+=a.scrollLeft||0;d+=a.scrollTop||0}}return[c,d]}});function TimeEntryInstance(a){this._id=$.timeEntry._register(this);this._selectedHour=0;this._selectedMinute=0;this._selectedSecond=0;this._field=0;this._input=null;this._settings=extendRemove({},a||{})}$.extend(TimeEntryInstance.prototype,{_get:function(a){return(this._settings[a]!=null?this._settings[a]:$.timeEntry._defaults[a])},_parseTime:function(){var a=this._extractTime();var b=this._get('showSeconds');if(a){this._selectedHour=a[0];this._selectedMinute=a[1];this._selectedSecond=a[2]}else{var c=this._constrainTime();this._selectedHour=c[0];this._selectedMinute=c[1];this._selectedSecond=(b?c[2]:0)}this._secondField=(b?2:-1);this._ampmField=(this._get('show24Hours')?-1:(b?3:2));this._lastChr='';this._field=Math.max(0,Math.min(Math.max(1,this._secondField,this._ampmField),this._get('initialField')));if(this._input.val()!=''){this._showTime()}},_extractTime:function(){var a=(this._input?this._input.val():'');var b=this._get('separator');var c=a.split(b);if(b==''&&a!=''){c[0]=a.substring(0,2);c[1]=a.substring(2,4);c[2]=a.substring(4,6)}var d=this._get('ampmNames');var e=this._get('show24Hours');if(c.length>=2){var f=!e&&(a.indexOf(d[0])>-1);var g=!e&&(a.indexOf(d[1])>-1);var h=parseInt(c[0],10);h=(isNaN(h)?0:h);h=((f||g)&&h==12?0:h)+(g?12:0);var i=parseInt(c[1],10);i=(isNaN(i)?0:i);var j=(c.length>=3?parseInt(c[2],10):0);j=(isNaN(j)||!this._get('showSeconds')?0:j);return this._constrainTime([h,i,j])}return null},_constrainTime:function(a){var b=(a!=null);if(!b){var c=this._determineTime(this._get('defaultTime'))||new Date();a=[c.getHours(),c.getMinutes(),c.getSeconds()]}var d=false;var e=this._get('timeSteps');for(var i=0;i1){a[i]=Math.round(a[i]/e[i])*e[i];d=true}}return a},_showTime:function(){var a=this._get('show24Hours');var b=this._get('separator');var c=(this._formatNumber(a?this._selectedHour:((this._selectedHour+11)%12)+1)+b+this._formatNumber(this._selectedMinute)+(this._get('showSeconds')?b+this._formatNumber(this._selectedSecond):'')+(a?'':this._get('ampmPrefix')+this._get('ampmNames')[(this._selectedHour<12?0:1)]));this._setValue(c);this._showField()},_showField:function(){if(!this._input){return}var a=this._input[0];var b=this._get('separator');var c=b.length+2;var d=(this._field!=this._ampmField?(this._field*c):(this._ampmField*c)-b.length+this._get('ampmPrefix').length);var e=d+(this._field!=this._ampmField?2:this._get('ampmNames')[0].length);if(a.setSelectionRange){a.setSelectionRange(d,e)}else if(a.createTextRange){var f=a.createTextRange();f.moveStart('character',d);f.moveEnd('character',e-this._input.val().length);f.select()}if(!a.disabled){a.focus()}},_formatNumber:function(a){return(a<10?'0':'')+a},_setValue:function(a){this._input.val(a);this._input.trigger('change')},_previousField:function(a){var b=(this._input.val()==''||this._field==0);if(!b){this._field--}this._showField();this._lastChr='';return(b&&a)},_nextField:function(a){var b=(this._input.val()==''||this._field==Math.max(1,this._secondField,this._ampmField));if(!b){this._field++}this._showField();this._lastChr='';return(b&&a)},_adjustField:function(a){if(this._input&&this._input.val()==''){a=0}var b=this._get('timeSteps');this._setTime(new Date(0,0,0,this._selectedHour+(this._field==0?a*b[0]:0)+(this._field==this._ampmField?a*12:0),this._selectedMinute+(this._field==1?a*b[1]:0),this._selectedSecond+(this._field==this._secondField?a*b[2]:0)))},_setTime:function(a){a=this._determineTime(a);var b=this._constrainTime(a?[a.getHours(),a.getMinutes(),a.getSeconds()]:null);a=new Date(0,0,0,b[0],b[1],b[2]);var a=this._normaliseTime(a);var c=this._normaliseTime(this._determineTime(this._get('minTime')));var d=this._normaliseTime(this._determineTime(this._get('maxTime')));a=(c&&ad?d:a));this._selectedHour=a.getHours();this._selectedMinute=a.getMinutes();this._selectedSecond=a.getSeconds();this._showTime()},_determineTime:function(h){var i=function(a){var b=new Date();b.setTime(b.getTime()+a*1000);return b};var j=function(a){var b=new Date();var c=b.getHours();var d=b.getMinutes();var e=b.getSeconds();var f=/([+-]?[0-9]+)\s*(s|S|m|M|h|H)?/g;var g=f.exec(a);while(g){switch(g[2]||'s'){case's':case'S':e+=parseInt(g[1]);break;case'm':case'M':d+=parseInt(g[1]);break;case'h':case'H':c+=parseInt(g[1]);break}g=f.exec(a)}b=new Date(0,0,10,c,d,e,0);if(/^!/.test(a)){if(b.getDate()>10){b=new Date(0,0,10,23,59,59)}else if(b.getDate()<10){b=new Date(0,0,10,0,0,0)}}return b};return(h?(typeof h=='string'?j(h):(typeof h=='number'?i(h):h)):null)},_normaliseTime:function(a){if(!a){return null}a.setFullYear(2001);a.setMonth(1-1);a.setDate(26);return a},_handleKeyPress:function(a){if(a==this._get('separator')){this._nextField(false)}else if(a>='0'&&a<='9'){var b=(this._lastChr+a)*1;var c=this._get('show24Hours');var d=(this._field==0&&((c&&b<24)||(b>=1&&b<=12))?b+(!c&&this._selectedHour>=12?12:0):this._selectedHour);var e=(this._field==1&&b<60?b:this._selectedMinute);var f=(this._field==this._secondField&&b<60?b:this._selectedSecond);var g=this._constrainTime([d,e,f]);this._setTime(new Date(0,0,0,g[0],g[1],g[2]));this._lastChr=a}else if(!this._get('show24Hours')){var h=this._get('ampmNames');if((a==h[0].substring(0,1).toLowerCase()&&this._selectedHour>=12)||(a==h[1].substring(0,1).toLowerCase()&&this._selectedHour<12)){var i=this._field;this._field=this._ampmField;this._adjustField(+1);this._field=i;this._showField()}}}});function extendRemove(a,b){$.extend(a,b);for(var c in b){if(b[c]==null){a[c]=null}}return a}$.fn.timeEntry=function(e){var f=Array.prototype.slice.call(arguments,1);if(typeof e=='string'&&(e=='isDisabled'||e=='getTime')){return $.timeEntry['_'+e+'TimeEntry'].apply($.timeEntry,[this[0]].concat(f))}return this.each(function(){var a=this.nodeName.toLowerCase();if(a=='input'){if(typeof e=='string'){$.timeEntry['_'+e+'TimeEntry'].apply($.timeEntry,[this].concat(f))}else{var b=null;for(attrName in $.timeEntry._defaults){var c=this.getAttribute('time:'+attrName);if(c){b=b||{};try{b[attrName]=eval(c)}catch(err){b[attrName]=c}}}var d=(d&&!b?d:new TimeEntryInstance(!b?e:$.extend(b,e)));$.timeEntry._connectTimeEntry(this,d)}}})};$(document).ready(function(){$.timeEntry=new TimeEntry()})})(jQuery); \ No newline at end of file +(function($){function TimeEntry(){this._nextId=0;this._inst=[];this._disabledInputs=[];this.regional=[];this.regional['']={show24Hours:false,separator:':',ampmPrefix:'',ampmNames:['AM','PM'],spinnerTexts:['Now','Previous field','Next field','Increment','Decrement']};this._defaults={appendText:'',showSeconds:false,timeSteps:[1,1,1],initialField:0,useMouseWheel:true,defaultTime:null,minTime:null,maxTime:null,spinnerImage:'timeEntry.png',spinnerSize:[20,20,8],spinnerIncDecOnly:false,spinnerRepeat:[500,250],beforeShow:null};$.extend(this._defaults,this.regional[''])}$.extend(TimeEntry.prototype,{markerClassName:'hasTimeEntry',_register:function(a){var b=this._nextId++;this._inst[b]=a;return b},_getInst:function(a){return this._inst[a]||a},setDefaults:function(a){extendRemove(this._defaults,a||{})},_doFocus:function(a){var b=(a.nodeName&&a.nodeName.toLowerCase()=='input'?a:this);if($.timeEntry._lastInput==b){return}if($.timeEntry._isDisabledTimeEntry(b)){return}var c=$.timeEntry._getInst(b._timeId);c._input=$(b);$.timeEntry._focussed=true;$.timeEntry._lastInput=b;$.timeEntry._blurredInput=null;var d=c._get('beforeShow');extendRemove(c._settings,(d?d(b):{}));c._parseTime()},_doBlur:function(a){$.timeEntry._blurredInput=$.timeEntry._lastInput;$.timeEntry._lastInput=null},_doClick:function(a){var b=a.target;var c=$.timeEntry._getInst(b._timeId);if(!$.timeEntry._focussed){var d=c._get('separator').length+2;c._field=0;if($.browser.msie){var e=b.value;var f=a.clientX+$.timeEntry._findScroll(a.srcElement)[0]-$.timeEntry._findPos(a.srcElement)[0];for(var g=0;g<=Math.max(1,c._secondField,c._ampmField);g++){var h=(g!=c._ampmField?(g*d)+2:(c._ampmField*d)+c._get('ampmPrefix').length+c._get('ampmNames')[0].length);b.value=e.substring(0,h);var i=b.createTextRange();if(f=48){return true}var b=$.timeEntry._getInst(this._timeId);switch(a.keyCode){case 9:return(a.shiftKey?b._previousField(true):b._nextField(true));case 35:if(a.ctrlKey){b._setValue('')}else{b._field=Math.max(1,b._secondField,b._ampmField);b._adjustField(0)}break;case 36:if(a.ctrlKey){b._setTime()}else{b._field=0;b._adjustField(0)}break;case 37:b._previousField(false);break;case 38:b._adjustField(+1);break;case 39:b._nextField(false);break;case 40:b._adjustField(-1);break;case 46:b._setValue('');break}return false},_doKeyPress:function(a){var b=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);if(b<' '){return true}var c=$.timeEntry._getInst(this._timeId);c._handleKeyPress(b);return false},_doMouseWheel:function(a,b){b=($.browser.opera?-b/Math.abs(b):b);var c=$.timeEntry._getInst(this._timeId);c._adjustField(b);a.preventDefault()},_connectTimeEntry:function(b,c){var d=$(b);if(d.is('.'+this.markerClassName)){return}var e=c._get('spinnerImage');var f=c._get('spinnerText');var g=c._get('spinnerSize');var h=c._get('appendText');var i=(!e?null:$(''));d.wrap('').after(h?''+h+'':'').after(i||'');d.addClass(this.markerClassName).bind('focus.timeEntry',this._doFocus).bind('blur.timeEntry',this._doBlur).bind('click.timeEntry',this._doClick).bind('keydown.timeEntry',this._doKeyDown).bind('keypress.timeEntry',this._doKeyPress);if($.browser.mozilla){d.bind('input.timeEntry',function(a){c._parseTime()})}if($.browser.msie){d.bind('paste.timeEntry',function(a){setTimeout(function(){c._parseTime()},1)})}if(c._get('useMouseWheel')&&$.fn.mousewheel){d.mousewheel(this._doMouseWheel)}d[0]._timeId=c._id;if(i){i.mousedown(this._handleSpinner).mouseup(this._endSpinner).mouseout(this._endSpinner).mousemove(this._describeSpinner);i[0]._timeId=c._id}},_enableTimeEntry:function(a){this._enableDisable(a,false)},_disableTimeEntry:function(a){this._enableDisable(a,true)},_enableDisable:function(b,c){var d=$.timeEntry._getInst(b._timeId);if(!d){return}b.disabled=c;if(b.nextSibling&&b.nextSibling.nodeName.toLowerCase()=='span'){$.timeEntry._changeSpinner(d,b.nextSibling,(c?5:-1))}$.timeEntry._disabledInputs=$.map($.timeEntry._disabledInputs,function(a){return(a==b?null:a)});if(c){$.timeEntry._disabledInputs[$.timeEntry._disabledInputs.length]=b}},_isDisabledTimeEntry:function(a){for(var i=0;i=3&&f[0]){$.timeEntry._timer=setTimeout(function(){$.timeEntry._repeatSpinner(d,e)},f[0]);$(b).one('mouseout',$.timeEntry._releaseSpinner).one('mouseup',$.timeEntry._releaseSpinner)}},_actionSpinner:function(a,b){switch(b){case 0:a._setTime();break;case 1:a._previousField(false);break;case 2:a._nextField(false);break;case 3:a._adjustField(+1);break;case 4:a._adjustField(-1);break}},_repeatSpinner:function(a,b){$.timeEntry._lastInput=$.timeEntry._blurredInput;this._actionSpinner(a,b);this._timer=setTimeout(function(){$.timeEntry._repeatSpinner(a,b)},a._get('spinnerRepeat')[1])},_releaseSpinner:function(a){clearTimeout($.timeEntry._timer)},_endSpinner:function(a){var b=$.timeEntry._getSpinnerTarget(a);var c=$.timeEntry._getInst(b._timeId);if(!$.timeEntry._isDisabledTimeEntry(b.previousSibling)){$.timeEntry._changeSpinner(c,b,-1)}if(!$.browser.opera){$.timeEntry._lastInput=$.timeEntry._blurredInput}if($.timeEntry._lastInput){c._showField()}},_getSpinnerTarget:function(a){return(a.target?a.target:a.srcElement)},_getSpinnerRegion:function(a,b){var c=this._getSpinnerTarget(b);var d=this._findPos(c);var e=this._findScroll(c);var f=a._get('spinnerIncDecOnly');var g=(f?99:b.clientX+e[0]-d[0]-($.browser.msie?1:0));var h=b.clientY+e[1]-d[1]-($.browser.msie?1:0);var i=a._get('spinnerSize');var j=(f?99:i[0]-g);var k=i[1]-h;if(i[2]>0&&Math.abs(g-j)<=i[2]&&Math.abs(h-k)<=i[2]){return 0}var l=Math.min(g,h,j,k);return(l==g?1:(l==j?2:(l==h?3:4)))},_changeSpinner:function(a,b,c){$(b).css('background-position','-'+((c+1)*a._get('spinnerSize')[0])+'px 0px')},_findPos:function(a){var b=curTop=0;if(a.offsetParent){b=a.offsetLeft;curTop=a.offsetTop;while(a=a.offsetParent){var c=b;b+=a.offsetLeft;if(b<0){b=c}curTop+=a.offsetTop}}return[b,curTop]},_findScroll:function(a){var b=false;$(a).parents().each(function(){b|=$(this).css('position')=='fixed'});if(b&&!$.browser.opera){return[0,0]}var c=($.browser.opera?document.body.scrollLeft:a.scrollLeft);var d=($.browser.opera?document.body.scrollTop:a.scrollTop);if(!$.browser.opera){while(a=a.parentNode){c+=a.scrollLeft||0;d+=a.scrollTop||0;}}return[c,d];}});function TimeEntryInstance(a){this._id=$.timeEntry._register(this);this._selectedHour=0;this._selectedMinute=0;this._selectedSecond=0;this._field=0;this._input=null;this._settings=extendRemove({},a||{})}$.extend(TimeEntryInstance.prototype,{_get:function(a){return(this._settings[a]!=null?this._settings[a]:$.timeEntry._defaults[a])},_parseTime:function(){var a=this._extractTime();var b=this._get('showSeconds');if(a){this._selectedHour=a[0];this._selectedMinute=a[1];this._selectedSecond=a[2]}else{var c=this._constrainTime();this._selectedHour=c[0];this._selectedMinute=c[1];this._selectedSecond=(b?c[2]:0)}this._secondField=(b?2:-1);this._ampmField=(this._get('show24Hours')?-1:(b?3:2));this._lastChr='';this._field=Math.max(0,Math.min(Math.max(1,this._secondField,this._ampmField),this._get('initialField')));if(this._input.val()!=''){this._showTime()}},_extractTime:function(){var a=(this._input?this._input.val():'');var b=this._get('separator');var c=a.split(b);if(b==''&&a!=''){c[0]=a.substring(0,2);c[1]=a.substring(2,4);c[2]=a.substring(4,6)}var d=this._get('ampmNames');var e=this._get('show24Hours');if(c.length>=2){var f=!e&&(a.indexOf(d[0])>-1);var g=!e&&(a.indexOf(d[1])>-1);var h=parseInt(c[0],10);h=(isNaN(h)?0:h);h=((f||g)&&h==12?0:h)+(g?12:0);var i=parseInt(c[1],10);i=(isNaN(i)?0:i);var j=(c.length>=3?parseInt(c[2],10):0);j=(isNaN(j)||!this._get('showSeconds')?0:j);return this._constrainTime([h,i,j])}return null},_constrainTime:function(a){var b=(a!=null);if(!b){var c=this._determineTime(this._get('defaultTime'))||new Date();a=[c.getHours(),c.getMinutes(),c.getSeconds()]}var d=false;var e=this._get('timeSteps');for(var i=0;i1){a[i]=Math.round(a[i]/e[i])*e[i];d=true}}return a},_showTime:function(){var a=this._get('show24Hours');var b=this._get('separator');var c=(this._formatNumber(a?this._selectedHour:((this._selectedHour+11)%12)+1)+b+this._formatNumber(this._selectedMinute)+(this._get('showSeconds')?b+this._formatNumber(this._selectedSecond):'')+(a?'':this._get('ampmPrefix')+this._get('ampmNames')[(this._selectedHour<12?0:1)]));this._setValue(c);this._showField()},_showField:function(){if(!this._input){return}var a=this._input[0];var b=this._get('separator');var c=b.length+2;var d=(this._field!=this._ampmField?(this._field*c):(this._ampmField*c)-b.length+this._get('ampmPrefix').length);var e=d+(this._field!=this._ampmField?2:this._get('ampmNames')[0].length);if(a.setSelectionRange){a.setSelectionRange(d,e)}else if(a.createTextRange){var f=a.createTextRange();f.moveStart('character',d);f.moveEnd('character',e-this._input.val().length);f.select()}if(!a.disabled){a.focus()}},_formatNumber:function(a){return(a<10?'0':'')+a},_setValue:function(a){this._input.val(a);this._input.trigger('change')},_previousField:function(a){var b=(this._input.val()==''||this._field==0);if(!b){this._field--}this._showField();this._lastChr='';return(b&&a)},_nextField:function(a){var b=(this._input.val()==''||this._field==Math.max(1,this._secondField,this._ampmField));if(!b){this._field++}this._showField();this._lastChr='';return(b&&a)},_adjustField:function(a){if(this._input&&this._input.val()==''){a=0}var b=this._get('timeSteps');this._setTime(new Date(0,0,0,this._selectedHour+(this._field==0?a*b[0]:0)+(this._field==this._ampmField?a*12:0),this._selectedMinute+(this._field==1?a*b[1]:0),this._selectedSecond+(this._field==this._secondField?a*b[2]:0)))},_setTime:function(a){a=this._determineTime(a);var b=this._constrainTime(a?[a.getHours(),a.getMinutes(),a.getSeconds()]:null);a=new Date(0,0,0,b[0],b[1],b[2]);var a=this._normaliseTime(a);var c=this._normaliseTime(this._determineTime(this._get('minTime')));var d=this._normaliseTime(this._determineTime(this._get('maxTime')));a=(c&&ad?d:a));this._selectedHour=a.getHours();this._selectedMinute=a.getMinutes();this._selectedSecond=a.getSeconds();this._showTime()},_determineTime:function(h){var i=function(a){var b=new Date();b.setTime(b.getTime()+a*1000);return b};var j=function(a){var b=new Date();var c=b.getHours();var d=b.getMinutes();var e=b.getSeconds();var f=/([+-]?[0-9]+)\s*(s|S|m|M|h|H)?/g;var g=f.exec(a);while(g){switch(g[2]||'s'){case's':case'S':e+=parseInt(g[1]);break;case'm':case'M':d+=parseInt(g[1]);break;case'h':case'H':c+=parseInt(g[1]);break}g=f.exec(a)}b=new Date(0,0,10,c,d,e,0);if(/^!/.test(a)){if(b.getDate()>10){b=new Date(0,0,10,23,59,59)}else if(b.getDate()<10){b=new Date(0,0,10,0,0,0)}}return b};return(h?(typeof h=='string'?j(h):(typeof h=='number'?i(h):h)):null)},_normaliseTime:function(a){if(!a){return null}a.setFullYear(2001);a.setMonth(1-1);a.setDate(26);return a},_handleKeyPress:function(a){if(a==this._get('separator')){this._nextField(false)}else if(a>='0'&&a<='9'){var b=(this._lastChr+a)*1;var c=this._get('show24Hours');var d=(this._field==0&&((c&&b<24)||(b>=1&&b<=12))?b+(!c&&this._selectedHour>=12?12:0):this._selectedHour);var e=(this._field==1&&b<60?b:this._selectedMinute);var f=(this._field==this._secondField&&b<60?b:this._selectedSecond);var g=this._constrainTime([d,e,f]);this._setTime(new Date(0,0,0,g[0],g[1],g[2]));this._lastChr=a}else if(!this._get('show24Hours')){var h=this._get('ampmNames');if((a==h[0].substring(0,1).toLowerCase()&&this._selectedHour>=12)||(a==h[1].substring(0,1).toLowerCase()&&this._selectedHour<12)){var i=this._field;this._field=this._ampmField;this._adjustField(+1);this._field=i;this._showField()}}}});function extendRemove(a,b){$.extend(a,b);for(var c in b){if(b[c]==null){a[c]=null}}return a}$.fn.timeEntry=function(e){var f=Array.prototype.slice.call(arguments,1);if(typeof e=='string'&&(e=='isDisabled'||e=='getTime')){return $.timeEntry['_'+e+'TimeEntry'].apply($.timeEntry,[this[0]].concat(f))}return this.each(function(){var a=this.nodeName.toLowerCase();if(a=='input'){if(typeof e=='string'){$.timeEntry['_'+e+'TimeEntry'].apply($.timeEntry,[this].concat(f))}else{var b=null;for(attrName in $.timeEntry._defaults){var c=this.getAttribute('time:'+attrName);if(c){b=b||{};try{b[attrName]=eval(c)}catch(err){b[attrName]=c}}}var d=(d&&!b?d:new TimeEntryInstance(!b?e:$.extend(b,e)));$.timeEntry._connectTimeEntry(this,d)}}})};$(document).ready(function(){$.timeEntry=new TimeEntry()})})(jQuery); \ No newline at end of file