diff --git a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/ConnectionCustomToast.java b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/ConnectionCustomToast.java index 8540370a2b..5026d96d98 100644 --- a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/ConnectionCustomToast.java +++ b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/ConnectionCustomToast.java @@ -2,7 +2,7 @@ Pandora FMS - http://pandorafms.com ================================================== -Copyright (c) 2005-2021 Artica Soluciones Tecnologicas +Copyright (c) 2005-2023 Pandora FMS Please see http://pandorafms.org for full contribution list This program is free software; you can redistribute it and/or diff --git a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Help.java b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Help.java index 32d73a7fa8..60708495c1 100644 --- a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Help.java +++ b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Help.java @@ -2,7 +2,7 @@ Pandora FMS - http://pandorafms.com ================================================== -Copyright (c) 2005-2021 Artica Soluciones Tecnologicas +Copyright (c) 2005-2023 Pandora FMS Please see http://pandorafms.org for full contribution list This program is free software; you can redistribute it and/or diff --git a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Options.java b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Options.java index 2cd8542fa0..782448ace6 100644 --- a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Options.java +++ b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/Options.java @@ -2,7 +2,7 @@ Pandora FMS - http://pandorafms.com ================================================== -Copyright (c) 2005-2021 Artica Soluciones Tecnologicas +Copyright (c) 2005-2023 Pandora FMS Please see http://pandorafms.org for full contribution list This program is free software; you can redistribute it and/or diff --git a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java index 4c566ff0f4..5b03bd03d3 100644 --- a/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java +++ b/extras/PandoraFMS_android_console/src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java @@ -2,7 +2,7 @@ Pandora FMS - http://pandorafms.com ================================================== -Copyright (c) 2005-2021 Artica Soluciones Tecnologicas +Copyright (c) 2005-2023 Pandora FMS Please see http://pandorafms.org for full contribution list This program is free software; you can redistribute it and/or diff --git a/extras/aditional_rpmspec/xprobe2-0.3.spec b/extras/aditional_rpmspec/xprobe2-0.3.spec deleted file mode 100644 index 7345b8d16e..0000000000 --- a/extras/aditional_rpmspec/xprobe2-0.3.spec +++ /dev/null @@ -1,73 +0,0 @@ -Name: xprobe2 -Version: 0.3 -Release: 2 -Summary: Tool to detect OS remotely by TCP/IP fingerprinting -License: GPLv2 -Group: Network/Security -URL: http://xprobe.sourceforge.net/ -Packager: Sancho Lerena -Source: http://dl.sf.net/xprobe/xprobe2-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version} -Provides: %{name}-%{version} -Requires: libpcap -BuildRequires: gcc-c++ libpcap-devel - -#This is for SUSE build service, to avoid enforce FHS paths -#!BuildIgnore: post-build-checks - -%description -Xprobe is an alternative to some tools which are heavily dependent upon the -usage of the TCP protocol for remote active operating system fingerprinting. - -Xprobe I combines various remote active operating system fingerprinting methods -using the ICMP protocol, which were discovered during the "ICMP Usage in -Scanning" research project, into a simple, fast, efficient and a powerful way -to detect an underlying operating system a targeted host is using. - -Xprobe2 is an active operating system fingerprinting tool with a different -approach to operating system fingerprinting. Xprobe2 rely on fuzzy signature -matching, probabilistic guesses, multiple matches simultaneously, and a -signature database. - -%prep -%setup - -%build -./configure --with-libpcap-libraries=/usr/lib --with-libpcap-includes=/usr/include/pcap --mandir=%{_mandir} --disable-schemas-install -make - -%install -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -ln -s /usr/local/bin/xprobe2 /usr/bin - -%preun - -%postun - -%files - -%defattr(755,root,root) -/usr/local/etc -/usr/local/etc/xprobe2 - -%defattr(644,root,root) -%doc AUTHORS CHANGELOG COPYING CREDITS README TODO docs/* -%doc /usr/share/man/man1/xprobe2.1.gz -/usr/local/etc/xprobe2/xprobe2.conf - -%defattr(755,root,root) -/usr/local/bin/xprobe2 - - -%changelog -* Fri Dec 18 2009 Sancho Lerena 3.2-2 -- A lot of changes to be ready for all RPM plattforms available on build.opensuse.org - -* Tue Dec 08 2009 Sancho Lerena 3.2-1 -- First RPM Spec for SUSE Systems, based on CentOS Spec from Dag Wieers - diff --git a/extras/aditional_sources/xprobe2-0.3.diff.patch.README b/extras/aditional_sources/xprobe2-0.3.diff.patch.README deleted file mode 100644 index 77e404772b..0000000000 --- a/extras/aditional_sources/xprobe2-0.3.diff.patch.README +++ /dev/null @@ -1,62 +0,0 @@ -Get the original xprobe2-0.3 from Sourceforge: - -http://downloads.sourceforge.net/project/xprobe/xprobe2/Xprobe2%200.3/xprobe2-0.3.tar.gz - -Uncompress it under, for example /tmp/xprobe2-0.3 directory - -Copy the diff file at /tmp - -Execute the patch command: - - patch -p1 < ../xprobe2-0.3.diff.patch - -This should look like: - -patching file CHANGELOG -patching file config.status -patching file configure -patching file libs-external/USI++/src/config.h -patching file libs-external/USI++/src/config.log -patching file libs-external/USI++/src/config.status -patching file libs-external/USI++/src/ip.cc -patching file libs-external/USI++/src/Makefile -patching file libs-external/USI++/src/misc.cc -patching file libs-external/USI++/src/usi++/arp.h -patching file libs-external/USI++/src/usi++/config.h -patching file libs-external/USI++/src/usi++/datalink.h -patching file libs-external/USI++/src/usi++/icmp.h -patching file libs-external/USI++/src/usi++/if.h -patching file libs-external/USI++/src/usi++/ip.h -patching file libs-external/USI++/src/usi++/Layer2.h -patching file libs-external/USI++/src/usi++/README -patching file libs-external/USI++/src/usi++/RX.h -patching file libs-external/USI++/src/usi++/tcp.h -patching file libs-external/USI++/src/usi++/TX.h -patching file libs-external/USI++/src/usi++/TX_IP.h -patching file libs-external/USI++/src/usi++/udp.h -patching file libs-external/USI++/src/usi++/usi++ -patching file libs-external/USI++/src/usi++/usi++.h -patching file libs-external/USI++/src/usi++/usi-structs.h -patching file libs-external/USI++/usi++/config.h -patching file libs-external/USI++/usi++/tcp.h -patching file Makefile -patching file src/config.h -patching file src/defines.h -patching file src/Makefile -patching file src/xplib/Makefile -patching file src/xpmodules/alive_probe/Makefile -patching file src/xpmodules/alive_probe/portscanner/Makefile -patching file src/xpmodules/alive_probe/ttl_calc/Makefile -patching file src/xpmodules/Makefile -patching file src/xpmodules/os_probe/icmp_addrmask/Makefile -patching file src/xpmodules/os_probe/icmp_echo_id/Makefile -patching file src/xpmodules/os_probe/icmp_inforeq/Makefile -patching file src/xpmodules/os_probe/icmp_port_unreach/Makefile -patching file src/xpmodules/os_probe/icmp_timestamp/Makefile -patching file src/xpmodules/os_probe/Makefile -patching file src/xpmodules/os_probe/smb/Makefile -patching file src/xpmodules/os_probe/snmp/Makefile -patching file src/xpmodules/os_probe/tcp_handshake/Makefile -patching file src/xpmodules/os_probe/tcp_rst/Makefile - -Your patched code is now ready to be used. diff --git a/extras/android-event-viewer/app/src/main/AndroidManifest.xml b/extras/android-event-viewer/app/src/main/AndroidManifest.xml index 56e27364eb..1678445c33 100644 --- a/extras/android-event-viewer/app/src/main/AndroidManifest.xml +++ b/extras/android-event-viewer/app/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ @@ -904,6 +920,44 @@ echo sprintf('
', $menuTypeClass); $("#agent_access").css("display",""); }); + $("#welcome-icon-header").click(function () { + if (!$('#welcome_modal_window').length){ + $(document.body).append('
'); + $(document.body).append( $('').attr('href', 'include/styles/new_installation_welcome_window.css') ); + } + // Clean DOM. + load_modal({ + target: $('#welcome_modal_window'), + url: '', + modal: { + title: "", + cancel: '', + ok: '' + }, + onshow: { + page: 'include/ajax/welcome_window', + method: 'loadWelcomeWindow', + }, + oncancel: { + page: 'include/ajax/welcome_window', + title: "", + method: 'cancelWelcome', + confirm: function (fn) { + confirmDialog({ + title: '', + message: '', + ok: '', + cancel: '', + onAccept: function() { + // Continue execution. + fn(); + } + }) + } + } + }); + }); + // Feedback. $("#feedback-header").click(function () { diff --git a/pandora_console/general/help_feedback.php b/pandora_console/general/help_feedback.php index 97d161ea61..0e1c5852ba 100644 --- a/pandora_console/general/help_feedback.php +++ b/pandora_console/general/help_feedback.php @@ -9,13 +9,13 @@ * @license See below * * ______ ___ _______ _______ ________ - * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __| - * | __/| _ | | _ || _ | _| _ | | ___| |__ | + * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __| + * | __/| _ | | _ || _ | _| _ | | ___| |__ | * |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______| * * ============================================================================ - * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas - * Please see http://pandorafms.org for full contribution list + * Copyright (c) 2005-2023 Pandora FMS + * Please see https://pandorafms.com/community/ for full contribution list * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation for version 2. diff --git a/pandora_console/general/last_message.php b/pandora_console/general/last_message.php index 862d3f8076..e2f6f2d5aa 100644 --- a/pandora_console/general/last_message.php +++ b/pandora_console/general/last_message.php @@ -1,9 +1,9 @@ '; echo ''; - echo ''.html_print_image( + echo ''.html_print_image( 'images/enterprise_version.png', true, [ @@ -72,7 +72,7 @@ echo '
'; - echo ''.__('Enterprise version').''; + echo ''.__('Enterprise version').''; echo ''; echo ''; diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index bd5d791b96..d3d9c7e686 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -1,9 +1,9 @@ '; + echo ''; echo ''; echo '