From 94a3bc85d31c66dc840dbbd883b99860bcf0a26e Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 28 Nov 2017 15:56:38 +0100
Subject: [PATCH 1/2] Fixed module definition help and add autodisable mode to
 bulk operations

---
 .../godmode/massive/massive_edit_agents.php     |  1 +
 .../include/help/en/help_module_definition.php  | 17 +++++++++++------
 .../include/help/es/help_module_definition.php  | 17 +++++++++++------
 .../include/help/ja/help_module_definition.php  | 16 +++++++++++-----
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 1b77093025..ce92ca588a 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -410,6 +410,7 @@ $table->data[1][0] = __('Module definition') . ui_print_help_icon("module_defini
 $table->data[1][1] = __('No change').' '.html_print_radio_button_extended ("mode", -1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
 $table->data[1][1] .= __('Learning mode').' '.html_print_radio_button_extended ("mode", 1, '', $mode, false, '', 'style="margin-right: 40px;"', true);
 $table->data[1][1] .= __('Normal mode').' '.html_print_radio_button_extended ("mode", 0, '', $mode, false, '', 'style="margin-right: 40px;"', true);
+$table->data[1][1] .= __('Autodisable mode').' '.html_print_radio_button_extended ("mode", 2, '', $mode, false, '', 'style="margin-right: 40px;"', true);
 
 // Status (Disabled / Enabled)
 $table->data[2][0] = __('Status');
diff --git a/pandora_console/include/help/en/help_module_definition.php b/pandora_console/include/help/en/help_module_definition.php
index 8173a8093b..d9cef4610c 100644
--- a/pandora_console/include/help/en/help_module_definition.php
+++ b/pandora_console/include/help/en/help_module_definition.php
@@ -4,12 +4,17 @@
  */
 ?>
 <h1>Module definition</h1>
-<p>
-There are two modes for an agent:
-</p>
+<p>Agents can be configured from the console in three working modes:</p>
 <ul>
-    <li><i>Learning mode:</i> all the modules sent by the agent are accepted. If modules are not defined, they will be automatically defined by the system. It is recommended to activate the agents in this mode and change it once the user is familiar with Pandora FMS.<br>From version 4.0.3, in this mode,  Pandora console collect all the configuration specified by the agent configuration file the first time and thereafter any changes should be made through console, will not catch changes in config file.
-</li>
+    <li>
+        <b>Learning mode:</b> If the XML received from the software agent contains new modules, they will be automatically created. This is the default behavior.
+    </li>
 <br>
-    <li><i>Normal mode:</i> the modules in this mode must be configured manually. The self definition of the modules is not allowed in this mode.</li>
+    <li>
+        <b>Normal mode:</b> No new modules will be created that arrive in XML if they have not been previously declared in the console.
+    </li>
+<br>
+    <li>
+        <b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
+    </li>
 </ul>
diff --git a/pandora_console/include/help/es/help_module_definition.php b/pandora_console/include/help/es/help_module_definition.php
index e31ac65d6c..303fe1d188 100644
--- a/pandora_console/include/help/es/help_module_definition.php
+++ b/pandora_console/include/help/es/help_module_definition.php
@@ -4,12 +4,17 @@
  */
 ?>
 <h1>Definición de módulo</h1>
-
-<p>
-Existen dos modos para un agente:
-</p>
+<p>Los agentes pueden configurarse desde la consola en tres modos de trabajo:</p>
 <ul>
-    <li><i>Modo aprendizaje:</i> todos los módulos enviados por el agente se aceptan. Si los módulos no están definidos, el sistema los creará automáticamente. Se recomienda activar los agentes en este modo y cambiarlo una vez que se el operador se ha familiarizado con Pandora FMS. A partir de la versión 4.0.3, en este modo Pandora recogerá en consola toda la configuración indicada por el fichero de configuración del agente la primera vez y a partir de entonces todas las modificaciones se deberán realizar a través de consola, no cogerá cambios en el fichero de configuración.</li>
+    <li>
+        <b>Modo aprendizaje:</b> Si el XML recibido del agente software contiene nuevos módulos, éstos serán automáticamente creados. Este es el comportamiento por defecto.
+    </li>
 <br>
-    <li><i>Modo normal:</i> los módulos en este modo se deben configurar manualmente. No se permite la definición automática en este modo.</li>
+    <li>
+        <b>Modo normal:</b> No se crearán nuevos módulos que lleguen en el XML si no han sido declarados previamente en la consola.
+    </li>
+<br>
+    <li>
+        <b>Modo autodeshabilitado:</b> Similar al modo aprendizaje, en este modo, además, si todos los módulos pasan a estado desconocido el agente se deshabilitará automáticamente, pasando a habilitarse de nuevo si recibe nueva información.
+    </li>
 </ul>
diff --git a/pandora_console/include/help/ja/help_module_definition.php b/pandora_console/include/help/ja/help_module_definition.php
index e7e4055d18..d7b14bb889 100644
--- a/pandora_console/include/help/ja/help_module_definition.php
+++ b/pandora_console/include/help/ja/help_module_definition.php
@@ -4,11 +4,17 @@
  */
 ?>
 <h1>モジュール定義</h1>
-
-エージェントには、次の2つのモードがあります:
+<p>Agents can be configured from the console in three working modes:</p>
 <ul>
-    <li><i>学習モード:</i> エージェントから通知されるモジュール情報を受け取ります。モジュールが定義されていない場合は自動的にそれが追加されます。エージェントの設定でこのモードを有効にすることをお勧めします。Pandora FMS が使いやすいです。<br>バージョン 4.0.3 からは、このモードの場合、コンソールが初回はエージェント設定ファイルの全設定内容を読み込みますが、その後はコンソールから変更可能で設定ファイル側の変更は反映されません。
-</li>
+    <li>
+        <b>Learning mode:</b> If the XML received from the software agent contains new modules, they will be automatically created. This is the default behavior.
+    </li>
 <br>
-    <li><i>通常モード:</i> このモードでは、モジュール設定を手動で実施する必要があります。自動設定は行われません。</li>
+    <li>
+        <b>Normal mode:</b> No new modules will be created that arrive in XML if they have not been previously declared in the console.
+    </li>
+<br>
+    <li>
+        <b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
+    </li>
 </ul>

From d625652f9a0b7246fe1fc658ec345bf48e45fac4 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Tue, 6 Feb 2018 12:06:21 +0100
Subject: [PATCH 2/2] Removed unwanted git merge traces (sorry)

---
 .../include/help/en/help_module_definition.php      | 12 ------------
 .../include/help/es/help_module_definition.php      | 13 -------------
 .../include/help/ja/help_module_definition.php      |  6 ------
 3 files changed, 31 deletions(-)

diff --git a/pandora_console/include/help/en/help_module_definition.php b/pandora_console/include/help/en/help_module_definition.php
index 700d450f87..d9cef4610c 100644
--- a/pandora_console/include/help/en/help_module_definition.php
+++ b/pandora_console/include/help/en/help_module_definition.php
@@ -4,7 +4,6 @@
  */
 ?>
 <h1>Module definition</h1>
-<<<<<<< HEAD
 <p>Agents can be configured from the console in three working modes:</p>
 <ul>
     <li>
@@ -18,15 +17,4 @@
     <li>
         <b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
     </li>
-=======
-<p>
-There are three modes for an agent:
-</p>
-<ul>
-    <li><i>Learning mode:</i> All the modules sent by the agent are accepted. If modules are not defined, they will be automatically defined by the system. It is recommended to activate the agents in this mode and change it once the user is familiar with Pandora FMS.<br>From version 4.0.3, in this mode,  Pandora console collect all the configuration specified by the agent configuration file the first time and thereafter any changes should be made through console, will not catch changes in config file.</li>
-<br>
-    <li><i>Normal mode:</i> The modules in this mode must be configured manually. The self definition of the modules is not allowed in this mode.</li>
-<br>
-    <li><i>Autodisable mode:</i> It behaves exactly the same as an agent in learning mode: when the first XML reaches it, the first agent is created and, on each report, if there are new modules they can also be added automatically. Nevertheless, when all modules from an agent that are in autodisable mode are also marked as unknown, the agent is automatically disabled. In any case, if the agent reports again, it gets enabled again on its own.</li>
->>>>>>> develop
 </ul>
diff --git a/pandora_console/include/help/es/help_module_definition.php b/pandora_console/include/help/es/help_module_definition.php
index b38b81db80..303fe1d188 100644
--- a/pandora_console/include/help/es/help_module_definition.php
+++ b/pandora_console/include/help/es/help_module_definition.php
@@ -4,7 +4,6 @@
  */
 ?>
 <h1>Definición de módulo</h1>
-<<<<<<< HEAD
 <p>Los agentes pueden configurarse desde la consola en tres modos de trabajo:</p>
 <ul>
     <li>
@@ -18,16 +17,4 @@
     <li>
         <b>Modo autodeshabilitado:</b> Similar al modo aprendizaje, en este modo, además, si todos los módulos pasan a estado desconocido el agente se deshabilitará automáticamente, pasando a habilitarse de nuevo si recibe nueva información.
     </li>
-=======
-
-<p>
-Existen tres modos para un agente:
-</p>
-<ul>
-    <li><i>Modo aprendizaje:</i>Si el XML recibido del agente software contiene nuevos módulos, éstos serán automáticamente creados. Este es el comportamiento por defecto.</li>
-<br>
-    <li><i>Modo normal:</i>No se crearán nuevos módulos que lleguen en el XML si no han sido declarados previamente en la consola.</li>
-<br>
-    <li><i>Modo auto deshabilitado:</i>Similar al modo aprendizaje, en este modo, además, si todos los módulos pasan a estado desconocido el agente se deshabilitará automáticamente, pasando a habilitarse de nuevo si recibe nueva información.</li>
->>>>>>> develop
 </ul>
diff --git a/pandora_console/include/help/ja/help_module_definition.php b/pandora_console/include/help/ja/help_module_definition.php
index 5a62aa563a..d7b14bb889 100644
--- a/pandora_console/include/help/ja/help_module_definition.php
+++ b/pandora_console/include/help/ja/help_module_definition.php
@@ -10,7 +10,6 @@
         <b>Learning mode:</b> If the XML received from the software agent contains new modules, they will be automatically created. This is the default behavior.
     </li>
 <br>
-<<<<<<< HEAD
     <li>
         <b>Normal mode:</b> No new modules will be created that arrive in XML if they have not been previously declared in the console.
     </li>
@@ -18,9 +17,4 @@
     <li>
         <b>Autodisable mode:</b> Similar to learning mode, in this mode, also, if all modules pass to unknown state the agent will be automatically disabled, going to be enabled again if it receives new information.
     </li>
-=======
-    <li><i>通常モード:</i> このモードでは、モジュール設定を手動で実施する必要があります。自動設定は行われません。</li>
-<br>
-    <li><i>Autodisable mode:</i> In terms of creating agents and modules it behaves exactly the same as an agent in learning mode: when the first XML reaches it, the first agent is created and, on each report, if there are new modules they can also be added automatically. Nevertheless, when all modules from an agent that are in autodisable mode are also marked as unknown, the agent is automatically disabled. In any case, if the agent reports again, it gets enabled again on its own.</li>
->>>>>>> develop
 </ul>