From 0ad5a31b040072c2f4d67fe88b4e70864e38fac9 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sat, 7 Nov 2009 00:34:12 +0000 Subject: [PATCH] 2009-11-07 Raul Mateos * operation/servers/view_server_detail.php: Change title to show the father section and some added texts. * include/help/en/help_*.php: Several language fixes. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2095 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ .../include/help/en/help_module_type.php | 16 ++++++++-------- .../include/help/en/help_plugin_definition.php | 4 ++-- .../include/help/en/help_recontask.php | 6 +++--- .../include/help/en/help_tcp_send.php | 4 ++-- .../operation/servers/view_server_detail.php | 9 +++++---- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5526cc5db8..45142662cb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-11-07 Raul Mateos + + * operation/servers/view_server_detail.php: Change title to show the + father section and some added texts. + + * include/help/en/help_*.php: Several language fixes. + 2009-11-06 Raul Mateos * operation/agentes/tactical.php, general/logon_ok.php: Use the same diff --git a/pandora_console/include/help/en/help_module_type.php b/pandora_console/include/help/en/help_module_type.php index d65f4638ad..65aad4ce63 100644 --- a/pandora_console/include/help/en/help_module_type.php +++ b/pandora_console/include/help/en/help_module_type.php @@ -7,14 +7,14 @@ The following list describes the module types:
    -
  • async_data: Asyncronous numeric data
    • -
  • async_inc: Asyncronous incremental data
    • -
  • async_proc: Asyncronous proc data
    • -
  • async_string: Asyncronous string data
    • -
  • generic_data: Generic module to adquire numeric data
    • -
  • generic_data_inc: Generic module to adquire numeric incremental data
    • -
  • generic_data_string: Generic module to adquire alphanumeric data
    • -
  • generic_proc: Generic module to adquire boolean data
    • +
  • async_data: Asynchronous numeric data
    • +
  • async_inc: Asynchronous incremental data
    • +
  • async_proc: Asynchronous proc data
    • +
  • async_string: Asynchronous string data
    • +
  • generic_data: Generic module to acquire numeric data
    • +
  • generic_data_inc: Generic module to acquire numeric incremental data
    • +
  • generic_data_string: Generic module to acquire alphanumeric data
    • +
  • generic_proc: Generic module to acquire boolean data
  • image_jpg: Image JPG data
  • image_png: Image PNG data
  • keep_alive: KeepAlive
    • diff --git a/pandora_console/include/help/en/help_plugin_definition.php b/pandora_console/include/help/en/help_plugin_definition.php index d3cc159de3..83dfc015ac 100644 --- a/pandora_console/include/help/en/help_plugin_definition.php +++ b/pandora_console/include/help/en/help_plugin_definition.php @@ -42,10 +42,10 @@ Operation could be "status", "qps", "load", "fragment" and "memory". It returns
    -If you needed to create a module that uses this plugin, you would need to choose the plugin (this new plugin would apear in the combo to be selected). Afterwards only to fill the IP Address, Username, and Password would be required. Pandora FMS will put this data into the appropiate fields when executing external plugins. +If you needed to create a module that uses this plugin, you would need to choose the plugin (this new plugin will show up in the combo to be selected). Afterwards only to fill the IP Address, Username, and Password would be required. Pandora FMS will put this data into the appropriate fields when executing external plugins.

    There are always some sort of parameters which cannot be "generic", in this scenario, you would have "tablespace" parameter. This one is very particular for Informix, but each example could have its own exception. You would have a field called "Plugin parameter", that is used to pass "as is" to the plugin. In this particular case you would need to put "-T tablespace" there.

    If you want to use another tablespace, just create another module with different string after "-T".

    -Of course, in "Plugin parameter" field, you can put more than one parameter. All data entered there is passed to the plugin "as is". \ No newline at end of file +Of course, in "Plugin parameter" field, you can put more than one parameter. All data entered there is passed to the plugin "as is". diff --git a/pandora_console/include/help/en/help_recontask.php b/pandora_console/include/help/en/help_recontask.php index 2e387f3b99..76104e771b 100644 --- a/pandora_console/include/help/en/help_recontask.php +++ b/pandora_console/include/help/en/help_recontask.php @@ -6,11 +6,11 @@

    Recon Task

    -To create a Recon Task, you must fill this form. Please fill all the fields, paying special attention to "Recon Server" and "Network Server", remember you must choose one for each, so the task will be assinged to the required servers and it will run. +To create a Recon (Reconnaissance) Task, you must fill this form. Please fill all the fields, paying special attention to "Recon Server" and "Network Server", remember you must choose one for each, so the task will be assigned to the required servers and it will run.

    -"Network" refers to the network segment, and are defined using CIDR format. For example 192.168.1.0/24 refers to all C class on 192.168.1.0, wich includes all the addresses in the scope: 192.168.1.0 - 192.168.1.255. +"Network" refers to the network segment, and are defined using CIDR format. For example 192.168.1.0/24 refers to all C class on 192.168.1.0, which includes all the addresses in the scope: 192.168.1.0 - 192.168.1.255.

    "Module template" are predefined profiles for the reconnaissance task. It will add such modules defined in the profile to the newly discovered machines in the network. -

    \ No newline at end of file +

    diff --git a/pandora_console/include/help/en/help_tcp_send.php b/pandora_console/include/help/en/help_tcp_send.php index b3a199e152..33b48920da 100644 --- a/pandora_console/include/help/en/help_tcp_send.php +++ b/pandora_console/include/help/en/help_tcp_send.php @@ -6,7 +6,7 @@

    TCP Check

    -This module just send character strings to destination IP / port, wait for response and optionally match it's response with a predefined response. If TCP SEND / TCP RCV. fields are emply just check for an open port in destination. +This module just send character strings to destination IP / port, wait for response and optionally match it's response with a predefined response. If TCP SEND / TCP RCV. fields are empty, it just checks for an open port in destination.

    You can use ^M string to send a carriage return, and also can use a multi request / multi response conversation. Several request and responses are separated with | character. @@ -16,7 +16,7 @@ You can use ^M string to send a carriage return, and also can use a multi reques

    Example #1. Checking WEB service

    -Just imagine that you want to check that www.yahoo.com reply correctly to a HTTP request. Put this in TCP Send:

    +Just imagine that you want to check that www.yahoo.com reply correctly to a HTTP request. Put this in TCP Send:

    GET / HTTP/1.0^M^M

    And this on TCP receive: diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php index 4963765d36..abd9ff87ff 100644 --- a/pandora_console/operation/servers/view_server_detail.php +++ b/pandora_console/operation/servers/view_server_detail.php @@ -46,12 +46,13 @@ $id_server = (int) get_parameter ("server_id", -1); $server_name = get_server_name ($id_server); $recon_tasks = get_db_all_rows_field_filter ("trecon_task", "id_recon_server", $id_server); -echo "

    ". __('Configuration detail') . " - ".safe_input ($server_name); +echo "

    ".__('Pandora servers')." » "; +echo __('Configuration detail') . " - ".safe_input ($server_name); echo ' '; print_image ("images/refresh.png"); echo " "; if (check_acl ($config["id_user"],0,"PW")){ - echo ""; + echo ""; } echo "

    "; @@ -69,7 +70,7 @@ $table->head = array (); $table->data = array (); $table->align = array (); -$table->head[0] = ''; +$table->head[0] = __('Force'); $table->align[0] = "center"; $table->head[1] = __('Task name'); @@ -99,7 +100,7 @@ $table->align[8] = "center"; $table->head[9] = __('Updated at'); $table->align[9] = "center"; -$table->head[10] = ''; +$table->head[10] = __('Edit'); $table->align[10] = "center"; foreach ($recon_tasks as $task) {