Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479

Added max/min thresholds to hbar graphs

extras/android-event-viewer/.idea/misc.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

extras/android-event-viewer/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 8
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         applicationId "pandroid_event_viewer.pandorafms"

extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/EventList.java

@@ -159,8 +159,14 @@ public class EventList extends ListActivity {
 			}
 		});
 
-		
+		ImageButton btnSettings = (ImageButton) findViewById(R.id.settings_icon_button_list);
-		
+		// Open the settings
+		btnSettings.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				startActivity(new Intent(v.getContext(), Options.class));
+			}
+		});
+
 		registerReceiver(onBroadcast, new IntentFilter("eventlist.java"));
 
 		this.toggleLoadingLayout();

extras/android-event-viewer/app/src/main/java/pandroid_event_viewer/pandorafms/Main.java

@@ -96,10 +96,29 @@ public class Main extends Activity {
 			Activity.MODE_PRIVATE);
 
 		setContentView(R.layout.main);
+		final ImageButton btnSettings = (ImageButton) findViewById(R.id.settings_icon_button_main);
+		final ImageButton btnFilter = (ImageButton) findViewById(R.id.filter_icon_button_main);
 		final Button buttonSetAsFilterWatcher = (Button) findViewById(R.id.button_set_as_filter_watcher);
 		final ImageButton buttonSearch = (ImageButton) findViewById(R.id.refresh_icon_button_main);
 		final ImageButton buttonDeleteProfile = (ImageButton) findViewById(R.id.button_delete_profile);
 		final ImageButton buttonSaveProfile = (ImageButton) findViewById(R.id.button_save_profile);
+
+		// Open the settings
+		btnSettings.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				startActivity(new Intent(v.getContext(), Options.class));
+			}
+		});
+
+		// Go to the events list
+		btnFilter.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				Activity a = (Activity) v.getContext();
+				TabActivity ta = (TabActivity) a.getParent();
+				ta.getTabHost().setCurrentTab(1);
+			}
+		});
+
 		// Check if the user preferences it is set.
 		if (object.user.length() == 0 || object.password.length() == 0
 				|| object.url.length() == 0) {

extras/android-event-viewer/app/src/main/res/layout/list_view_layout.xml

@@ -63,8 +63,22 @@
             android:layout_weight="0"
             android:padding="0dp"
             android:src="@drawable/filter_icon_button"
+            android:background="@null" />
+
+        <LinearLayout
+            android:layout_width="2px"
+            android:layout_height="fill_parent"
+            android:background="#6D9624" />
+
+        <ImageButton
+            android:id="@+id/settings_icon_button_list"
+            android:layout_width="58dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
             android:background="@null"
-            />
+            android:tint="@android:color/white"
+            android:src="@android:drawable/ic_menu_preferences" />
+
     </LinearLayout>
 
     <LinearLayout

extras/android-event-viewer/app/src/main/res/layout/main.xml

@@ -64,6 +64,21 @@
             android:background="@null"
             android:padding="0dp"
             android:src="@drawable/icon_filter_pressed" />
+
+        <LinearLayout
+            android:layout_width="2px"
+            android:layout_height="fill_parent"
+            android:background="#6D9624" />
+
+        <ImageButton
+            android:id="@+id/settings_icon_button_main"
+            android:layout_width="58dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:background="@null"
+            android:tint="@android:color/white"
+            android:src="@android:drawable/ic_menu_preferences" />
+
     </LinearLayout>
 
     <LinearLayout

extras/android-event-viewer/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 

extras/android-event-viewer/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Apr 18 16:40:24 CEST 2017
+#Thu Nov 02 13:39:33 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, AIX version
+# Version 7.0NG.715, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, FreeBSD Version
+# Version 7.0NG.715, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, HP-UX Version
+# Version 7.0NG.715, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, GNU/Linux
+# Version 7.0NG.715, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, GNU/Linux
+# Version 7.0NG.715, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, Solaris Version
+# Version 7.0NG.715, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Win32/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.714
+# Version 7.0NG.715
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/shellscript/aix/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.714, AIX version
+# Version 7.0NG.715, AIX version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/bsd-ipso/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.714
+# Version 7.0NG.715
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 

pandora_agents/shellscript/hp-ux/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.714, HPUX Version
+# Version 7.0NG.715, HPUX Version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714
+# Version 7.0NG.715
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/mac_osx/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714
+# Version 7.0NG.715
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/openWRT/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714
+# Version 7.0NG.715
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 

pandora_agents/shellscript/solaris/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.714, Solaris version
+# Version 7.0NG.715, Solaris version
 
 # General Parameters
 # ==================

pandora_agents/unix/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, AIX version
+# Version 7.0NG.715, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.714-171031
+Version: 7.0NG.715-171114
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.714-171031"
+pandora_version="7.0NG.715-171114"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/Darwin/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, GNU/Linux
+# Version 7.0NG.715, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, FreeBSD Version
+# Version 7.0NG.715, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, HP-UX Version
+# Version 7.0NG.715, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, GNU/Linux
+# Version 7.0NG.715, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, GNU/Linux
+# Version 7.0NG.715, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, NetBSD Version
+# Version 7.0NG.715, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.714, Solaris Version
+# Version 7.0NG.715, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -40,8 +40,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.714';
+use constant AGENT_VERSION => '7.0NG.715';
-use constant AGENT_BUILD => '171031';
+use constant AGENT_BUILD => '171114';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.714
+%define version     7.0NG.715
-%define release     171031
+%define release     171114
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.714
+%define version     7.0NG.715
-%define release     171031
+%define release     171114
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.714"
+PI_VERSION="7.0NG.715"
-PI_BUILD="171031"
+PI_BUILD="171114"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/bin/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2014 Artica Soluciones Tecnologicas 
-# Version 7.0NG.714
+# Version 7.0NG.715
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/win32/installer/pandora.mpi

@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.714}
+{Pandora FMS Windows Agent v7.0NG.715}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{171031}
+{171114}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.714(Build 171031)")
+#define PANDORA_VERSION ("7.0NG.715(Build 171114)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.714(Build 171031))"
+      VALUE "ProductVersion", "(7.0NG.715(Build 171114))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.714-171031
+Version: 7.0NG.715-171114
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.714-171031"
+pandora_version="7.0NG.715-171114"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/8.sql

@@ -6,4 +6,16 @@ ALTER TABLE treport_content ADD COLUMN visual_format tinyint(1) default '0';
 ALTER TABLE treport_content_template ADD COLUMN lapse_calc tinyint(1) default '0';
 ALTER TABLE treport_content_template ADD COLUMN lapse int(11) default '300';
 ALTER TABLE treport_content_template ADD COLUMN visual_format tinyint(1) default '0';
+
+UPDATE `talert_commands` 
+SET `description` = 'This alert send an email using internal Pandora FMS Server SMTP capabilities (defined in each server, using:
_field1_ as destination email address, and
_field2_ as subject for message. 
_field3_ as text of message. 
_field4_ as content type (text/plain or html/text).',
+    `fields_descriptions` = '[\"Destination address\",\"Subject\",\"Text\",\"Content Type\",\"\",\"\",\"\",\"\",\"\",\"\"]',
+    `fields_values` = '[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]'
+WHERE id=1;
+
+UPDATE `talert_actions`
+SET `field4` = 'text/html',
+    `field4_recovery` = 'text/html'
+WHERE id = 1;
+
 COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1137,6 +1137,10 @@ ALTER TABLE talert_actions ADD COLUMN `field15_recovery` TEXT NOT NULL DEFAULT "
 -- ---------------------------------------------------------------------
 UPDATE `talert_commands` SET `fields_descriptions` = '[\"Integria IMS API path\",\"Integria IMS API pass\",\"Integria IMS user\",\"Integria IMS user pass\",\"Ticket title\",\"Ticket group ID\",\"Ticket priority\",\"Email copy\",\"Ticket owner\",\"Ticket description\"]', `fields_values` = '[\"\",\"\",\"\",\"\",\"\",\"\",\"10,Maintenance;0,Informative;1,Low;2,Medium;3,Serious;4,Very Serious\",\"\",\"\",\"\"]' WHERE `id` = 11 AND `name` = 'Integria IMS Ticket';
 
+UPDATE `talert_commands` SET `description` = 'This alert send an email using internal Pandora FMS Server SMTP capabilities (defined in each server, using:
_field1_ as destination email address, and
_field2_ as subject for message. 
_field3_ as text of message. 
_field4_ as content type (text/plain or html/text).', `fields_descriptions` = '[\"Destination address\",\"Subject\",\"Text\",\"Content Type\",\"\",\"\",\"\",\"\",\"\",\"\"]', `fields_values` = '[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]' WHERE id=1;
+
+UPDATE `talert_actions` SET `field4` = 'text/html', `field4_recovery` = 'text/html' WHERE id = 1;
+
 -- ---------------------------------------------------------------------
 -- Table `tmap`
 -- ---------------------------------------------------------------------

pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php

@@ -35,12 +35,12 @@ $use_agent = get_parameter ('use_agent');
 $snmp_community = (string) get_parameter ('snmp_community', 'public');
 $snmp_version = get_parameter('snmp_version', '1');
 $server_to_exec = get_parameter('server_to_exec', 0);
-$snmp3_auth_user = get_parameter('snmp3_auth_user');
+$snmp3_auth_user = io_safe_output(get_parameter('snmp3_auth_user'));
 $snmp3_security_level = get_parameter('snmp3_security_level');
 $snmp3_auth_method = get_parameter('snmp3_auth_method');
-$snmp3_auth_pass = get_parameter('snmp3_auth_pass');
+$snmp3_auth_pass = io_safe_output(get_parameter('snmp3_auth_pass'));
 $snmp3_privacy_method = get_parameter('snmp3_privacy_method');
-$snmp3_privacy_pass = get_parameter('snmp3_privacy_pass');
+$snmp3_privacy_pass = io_safe_output(get_parameter('snmp3_privacy_pass'));
 $tcp_port = (string) get_parameter ('tcp_port');
 
 //See if id_agente is set (either POST or GET, otherwise -1

pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php

@@ -32,12 +32,12 @@ $use_agent = get_parameter ('use_agent');
 $snmp_community = (string) get_parameter ('snmp_community', 'public');
 $server_to_exec = get_parameter('server_to_exec', 0);
 $snmp_version = get_parameter('snmp_version', '1');
-$snmp3_auth_user = get_parameter('snmp3_auth_user');
+$snmp3_auth_user = io_safe_output(get_parameter('snmp3_auth_user'));
 $snmp3_security_level = get_parameter('snmp3_security_level');
 $snmp3_auth_method = get_parameter('snmp3_auth_method');
-$snmp3_auth_pass = get_parameter('snmp3_auth_pass');
+$snmp3_auth_pass = io_safe_output(get_parameter('snmp3_auth_pass'));
 $snmp3_privacy_method = get_parameter('snmp3_privacy_method');
-$snmp3_privacy_pass = get_parameter('snmp3_privacy_pass');
+$snmp3_privacy_pass = io_safe_output(get_parameter('snmp3_privacy_pass'));
 $tcp_port = (string) get_parameter ('tcp_port');
 
 //See if id_agente is set (either POST or GET, otherwise -1

pandora_console/godmode/agentes/modificar_agente.php

@@ -201,13 +201,13 @@ switch ($sortField) {
 		switch ($sort) {
 			case 'up':
 				$selectRemoteUp = $selected;
-				$order = array('field' => 'remote ' . $order_collation,
+				$order = array('field' => 'remote ',
 					'field2' => 'nombre ' . $order_collation,
 					'order' => 'ASC');
 				break;
 			case 'down':
 				$selectRemoteDown = $selected;
-				$order = array('field' => 'remote ' . $order_collation,
+				$order = array('field' => 'remote ',
 					'field2' => 'nombre ' . $order_collation,
 					'order' => 'DESC');
 				break;

pandora_console/godmode/agentes/module_manager_editor.php

@@ -111,12 +111,12 @@ if (is_ajax ()) {
 		else
 			$snmp_community = (string) get_parameter ('snmp_community');
 		$snmp_version = get_parameter('snmp_version');
-		$snmp3_auth_user = get_parameter('snmp3_auth_user');
+		$snmp3_auth_user = io_safe_output(get_parameter('snmp3_auth_user'));
 		$snmp3_security_level = get_parameter('snmp3_security_level');
 		$snmp3_auth_method = get_parameter('snmp3_auth_method');
-		$snmp3_auth_pass = get_parameter('snmp3_auth_pass');
+		$snmp3_auth_pass = io_safe_output(get_parameter('snmp3_auth_pass'));
 		$snmp3_privacy_method = get_parameter('snmp3_privacy_method');
-		$snmp3_privacy_pass = get_parameter('snmp3_privacy_pass');
+		$snmp3_privacy_pass = io_safe_output(get_parameter('snmp3_privacy_pass'));
 		$snmp_port = get_parameter('snmp_port');
 		
 		$snmpwalk = get_snmpwalk($ip_target, $snmp_version, $snmp_community,

pandora_console/godmode/agentes/module_manager_editor_network.php

@@ -398,12 +398,12 @@ function snmpBrowserWindow () {
 	$('#text-target_ip').val($('#text-ip_target').val());
 	$('#text-community').val($('#text-snmp_community').val());
 	$('#snmp_browser_version').val($('#snmp_version').val());
-	$('#snmp3_browser_auth_user').val($('#snmp3_auth_user').val());
+	$('#text-snmp3_browser_auth_user').val($('#text-snmp3_auth_user').val());
 	$('#snmp3_browser_security_level').val($('#snmp3_security_level').val());
 	$('#snmp3_browser_auth_method').val($('#snmp3_auth_method').val());
-	$('#snmp3_browser_auth_pass').val($('#snmp3_auth_pass').val());
+	$('#password-snmp3_browser_auth_pass').val($('#password-snmp3_auth_pass').val());
 	$('#snmp3_browser_privacy_method').val($('#snmp3_privacy_method').val());
-	$('#snmp3_browser_privacy_pass').val($('#snmp3_privacy_pass').val());
+	$('#password-snmp3_browser_privacy_pass').val($('#password-snmp3_privacy_pass').val());
 	
 	$("#snmp_browser_container").show().dialog ({
 		title: '',

pandora_console/godmode/alerts/alert_commands.php

@@ -165,8 +165,26 @@ if (is_ajax ()) {
 					$rfield = $editor_type_chkbx;
 					$rfield .= html_print_textarea ('field'.$i.'_recovery_value', 1, 1, '', 'class="fields_recovery"', true);
 				}
+				elseif(preg_match ("/^_content_type_$/i", $field_value)){
+					$editor_type_chkbx = "<div style=\"padding: 4px 0px;\"><b><small>";
+					$editor_type_chkbx .= __('Text/plain') . ui_print_help_tip (__("For sending emails only text plain"), true);
+					$editor_type_chkbx .= html_print_radio_button_extended ('field'.$i.'_value', 'text/plain', '', '', false, '', '', true);
+					$editor_type_chkbx .= "&nbsp;&nbsp;&nbsp;&nbsp;";
+					$editor_type_chkbx .= __('Text/html') . "&nbsp;&nbsp;";
+					$editor_type_chkbx .= html_print_radio_button_extended ('field'.$i.'_value', 'text/html', '', 'text/html', false, '', '', true);
+					$editor_type_chkbx .= "</small></b></div>";
+					$ffield = $editor_type_chkbx;
+
+					$editor_type_chkbx = "<div style=\"padding: 4px 0px;\"><b><small>";
+					$editor_type_chkbx .= __('Text/plain') . ui_print_help_tip (__("For sending emails only text plain"), true);
+					$editor_type_chkbx .= html_print_radio_button_extended ('field'.$i.'_recovery_value', 'text/plain', '', '', false, '', '', true);
+					$editor_type_chkbx .= "&nbsp;&nbsp;&nbsp;&nbsp;";
+					$editor_type_chkbx .= __('Text/html') . "&nbsp;&nbsp;";
+					$editor_type_chkbx .= html_print_radio_button_extended ('field'.$i.'_recovery_value', 'text/html', '', 'text/html', false, '', '', true);
+					$editor_type_chkbx .= "</small></b></div>";
+					$rfield = $editor_type_chkbx;
 				// Select type
-				else {
+				}else {
 					$fields_value_select = array();
 					$fv = explode(';', $field_value);
 					

pandora_console/godmode/alerts/configure_alert_action.php

@@ -305,8 +305,33 @@ $(document).ready (function () {
 					// Replace the old column with the new
 					$table_macros_field.replaceWith(field_row);
 					if (old_value != '' || old_recovery_value != '') {
-						$("[name=field" + i + "_value]").val(old_value);
+						var inputType = $("[name=field" + i + "_value]").attr('type')
-						$("[name=field" + i + "_recovery_value]").val(old_recovery_value);
+						if (inputType == 'radio') {
+							if(old_value == 'text/plain'){
+								if ($("[name=field" + i + "_value]").val() == 'text/plain') {
+									$("[name=field" + i + "_value]").attr('checked','checked');
+								}
+							}
+							else{
+								if($("[name=field" + i + "_value]").val() == 'text/html') {
+									$("[name=field" + i + "_value]").attr('checked','checked');
+								}
+							}
+							if(old_recovery_value == 'text/plain'){
+								if ($("[name=field" + i + "_recovery_value]").val() == 'text/plain') {
+									$("[name=field" + i + "_recovery_value]").attr('checked','checked');
+								}
+							}
+							else{
+								if ($("[name=field" + i + "_recovery_value]").val() == 'text/html') {
+									$("[name=field" + i + "_recovery_value]").attr('checked','checked');
+								}
+							}
+						}
+						else {
+							$("[name=field" + i + "_value]").val(old_value);
+							$("[name=field" + i + "_recovery_value]").val(old_recovery_value);
+						}
 					}
 					else {
 						$("[name=field" + i + "_value]")

pandora_console/godmode/modules/manage_network_components.php

@@ -129,7 +129,7 @@ else {
 }
 
 $snmp_version = (string) get_parameter('snmp_version');
-$snmp3_auth_user = (string) get_parameter('snmp3_auth_user');
+$snmp3_auth_user = (string) io_safe_output(get_parameter('snmp3_auth_user'));
 $snmp3_auth_pass = io_input_password((string) get_parameter('snmp3_auth_pass'));
 $snmp3_auth_method = (string) get_parameter('snmp3_auth_method');
 $snmp3_privacy_method = (string) get_parameter('snmp3_privacy_method');