From 01641c45849d66a92aa4535ac8325cda54e9e2e8 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 5 Mar 2020 14:52:04 +0100 Subject: [PATCH 01/10] Avoid collections case for files download --- pandora_console/include/get_file.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandora_console/include/get_file.php b/pandora_console/include/get_file.php index 550e7e92fd..6ebde02add 100644 --- a/pandora_console/include/get_file.php +++ b/pandora_console/include/get_file.php @@ -51,6 +51,10 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) | $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/attachment/files_repo/'.$file; break; + case 'enterprise/godmode/agentes/collections': + $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/attachment/collection/'.$file; + break; + default: $downloadable_file = ''; // Do nothing From a8469413ac06ae008b01432bae1a1e56d859ff1f Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Thu, 7 May 2020 17:56:29 +0200 Subject: [PATCH 02/10] adaptation to centos new version: new data MemAvailable introduced --- pandora_agents/unix/plugins/pandora_mem | 9 ++++++++- pandora_agents/unix/plugins/pandora_mem_used | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/plugins/pandora_mem b/pandora_agents/unix/plugins/pandora_mem index 998438d5b6..43883744d8 100755 --- a/pandora_agents/unix/plugins/pandora_mem +++ b/pandora_agents/unix/plugins/pandora_mem @@ -33,9 +33,16 @@ my $freemem=`cat /proc/meminfo | grep 'MemFree' | awk '{ print \$2 } '`; my $cached=`cat /proc/meminfo | grep '^Cached:' | awk '{ print \$2 } '`; my $cachedswap=`cat /proc/meminfo | grep '^SwapCached:' | awk '{ print \$2 }'`; my $total_meminfo=`cat /proc/meminfo | grep 'MemTotal:' | awk '{ print \$2 }'`; -my $available=$freemem+$cached+$cachedswap; +my $available_new=`cat /proc/meminfo | grep 'MemAvailable:' | awk '{ print \$2 }'`; +my $available; +if ($available_new == 0){ + $available=$freemem+$cached+$cachedswap; +}else{ + $available=$available_new; +} my $available_percent = floor(($available / $total_meminfo)*100); +my $USED = 100 - $available_percent; print "\n"; print "\n"; diff --git a/pandora_agents/unix/plugins/pandora_mem_used b/pandora_agents/unix/plugins/pandora_mem_used index 3ba2034d80..4bca3f3c2f 100755 --- a/pandora_agents/unix/plugins/pandora_mem_used +++ b/pandora_agents/unix/plugins/pandora_mem_used @@ -23,7 +23,13 @@ my $freemem=`cat /proc/meminfo | grep 'MemFree' | awk '{ print \$2 } '`; my $cached=`cat /proc/meminfo | grep '^Cached:' | awk '{ print \$2 } '`; my $cachedswap=`cat /proc/meminfo | grep '^SwapCached:' | awk '{ print \$2 }'`; my $total_meminfo=`cat /proc/meminfo | grep 'MemTotal:' | awk '{ print \$2 }'`; -my $available=$freemem+$cached+$cachedswap; +my $available_new=`cat /proc/meminfo | grep 'MemAvailable:' | awk '{ print \$2 }'`; +my $available; +if ($available_new == 0){ + $available=$freemem+$cached+$cachedswap; +}else{ + $available=$available_new; +} my $available_percent = floor(($available / $total_meminfo)*100); my $USED = 100 - $available_percent; From 72e32ab5de435796f25fda6b39095ee10ac7452c Mon Sep 17 00:00:00 2001 From: marcos Date: Fri, 8 May 2020 11:32:44 +0200 Subject: [PATCH 03/10] add close option in toast --- pandora_console/general/header.php | 45 ++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index b443926a63..958f3dbe79 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -530,15 +530,34 @@ if ($config['menu_type'] == 'classic') { }); } - function print_toast(title, subtitle, severity, url, id, onclick) { + function closeToast(event) { + var match = /notification-(.*)-id-([0-9]+)/.exec(event.target.id); + var div_id = document.getElementById(match.input); + $(div_id).attr("hidden",true); + } + + function print_toast(title, subtitle, severity, url, id, onclick, closeToast) { // TODO severity. severity = ''; - // Start the toast. + + var parent_div = document.createElement('div'); + + // Print close image + var img = document.createElement('img'); + img.setAttribute('id', id); + img.setAttribute("src", './images/close_button_dialog.png'); + img.setAttribute('onclick', closeToast); + img.setAttribute('style', 'margin-left: 95%;'); + parent_div.appendChild(img); + + // Print a element var toast = document.createElement('a'); - toast.setAttribute('onclick', onclick); - toast.setAttribute('href', url); toast.setAttribute('target', '_blank'); + toast.setAttribute('href', url); + toast.setAttribute('onclick', onclick); + + var link_div = document.createElement('div'); // Fill toast. var toast_div = document.createElement('div'); @@ -548,9 +567,13 @@ if ($config['menu_type'] == 'classic') { var toast_text = document.createElement('p'); toast_title.innerHTML = title; toast_text.innerHTML = subtitle; - toast_div.appendChild(toast_title); + + // Append Elements + toast_div.appendChild(img); + link_div.appendChild(toast_title); + toast.appendChild(link_div); + toast_div.appendChild(toast); toast_div.appendChild(toast_text); - toast.appendChild(toast_div); // Show and program the hide event. toast_div.className = toast_div.className + ' show'; @@ -558,9 +581,11 @@ if ($config['menu_type'] == 'classic') { toast_div.className = toast_div.className.replace("show", ""); }, 8000); - return toast; - } + toast_div.appendChild(parent_div); + return toast_div; + } + function check_new_notifications() { var last_id = document.getElementById('notification-ball-header') .getAttribute('last_id'); @@ -617,9 +642,11 @@ if ($config['menu_type'] == 'classic') { ele.criticity, ele.full_url, 'notification-toast-id-' + ele.id_mensaje, - 'click_on_notification_toast(event)' + 'click_on_notification_toast(event)', + 'closeToast(event)' ) ); + }); } }, From 24f4f68b33e884fb8e9155700217f8b05e5ea9f6 Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Mon, 11 May 2020 14:50:13 +0200 Subject: [PATCH 04/10] Fixed errors in dashboards --- .../include/javascript/pandora_dashboards.js | 15 +++++++++++++-- pandora_console/include/styles/dashboards.css | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 842bd5daaa..8fec02411c 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -667,8 +667,19 @@ function initialiceLayout(data) { } $("#delete-widget-" + cellId).click(function(event) { - var nodo = event.target.offsetParent; - deleteCell(cellId, nodo.parentNode); + // eslint-disable-next-line no-undef + confirmDialog({ + title: "Are you sure?", + message: + "

All changes made to this widget will be lost

", + cancel: "Cancel", + ok: "Ok", + onAccept: function() { + // Continue execution. + var nodo = event.target.offsetParent; + deleteCell(cellId, nodo.parentNode); + } + }); }); $("#configure-widget-" + cellId).click(function() { diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index f3b41ccb2c..e89e282d6f 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -477,14 +477,14 @@ div#main_pure { margin-top: 30px; } -.info_box { +.content-widget .info_box { border-radius: 5px; width: 90%; } -.info_box tbody tr td { +.content-widget .info_box tbody tr td { padding: 10px; } -.info_box tbody tr td.icon { +.content-widget .info_box tbody tr td.icon { padding-right: 10px !important; } From 13339d5f68ee529ce15e645dcb221fdc56c29d55 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 12 May 2020 08:43:16 +0200 Subject: [PATCH 05/10] Solved issue with metaconsole filemanager --- pandora_console/include/get_file.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/get_file.php b/pandora_console/include/get_file.php index 6ebde02add..86d9a6d830 100644 --- a/pandora_console/include/get_file.php +++ b/pandora_console/include/get_file.php @@ -41,9 +41,11 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) | $downloadable_file = ''; $parse_all_queries = explode('&', parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY)); $parse_sec2_query = explode('=', $parse_all_queries[1]); + // If is metaconsole, the file manager has a route distinct than node. + $main_file_manager = (is_metaconsole() === true) ? 'advanced/metasetup' : 'godmode/setup/file_manager'; if ($parse_sec2_query[0] === 'sec2') { switch ($parse_sec2_query[1]) { - case 'godmode/setup/file_manager': + case $main_file_manager: $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/'.$file; break; From d1d51dcde6d0bcb75f74f82a51b87fde1babc4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 12 May 2020 11:56:53 +0200 Subject: [PATCH 06/10] Update get_file.php resolving issue with collections --- pandora_console/include/get_file.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandora_console/include/get_file.php b/pandora_console/include/get_file.php index 86d9a6d830..82b52ff167 100644 --- a/pandora_console/include/get_file.php +++ b/pandora_console/include/get_file.php @@ -57,6 +57,12 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) | $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/attachment/collection/'.$file; break; + case 'advanced/collections': + if (is_metaconsole() === true) { + $downloadable_file = '/'.$file; + } + break; + default: $downloadable_file = ''; // Do nothing From e435c09a01fbbe400928231d257c60b5051677d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 12 May 2020 18:01:47 +0200 Subject: [PATCH 07/10] Update get_file.php with lastest corrections --- pandora_console/include/get_file.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pandora_console/include/get_file.php b/pandora_console/include/get_file.php index 82b52ff167..f6efe98bf6 100644 --- a/pandora_console/include/get_file.php +++ b/pandora_console/include/get_file.php @@ -41,8 +41,9 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) | $downloadable_file = ''; $parse_all_queries = explode('&', parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY)); $parse_sec2_query = explode('=', $parse_all_queries[1]); - // If is metaconsole, the file manager has a route distinct than node. + // Metaconsole have a route distinct than node. $main_file_manager = (is_metaconsole() === true) ? 'advanced/metasetup' : 'godmode/setup/file_manager'; + $main_collections = (is_metaconsole() === true) ? 'advanced/collections' : 'enterprise/godmode/agentes/collections'; if ($parse_sec2_query[0] === 'sec2') { switch ($parse_sec2_query[1]) { case $main_file_manager: @@ -53,16 +54,10 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) | $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/attachment/files_repo/'.$file; break; - case 'enterprise/godmode/agentes/collections': + case $main_collections: $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/attachment/collection/'.$file; break; - case 'advanced/collections': - if (is_metaconsole() === true) { - $downloadable_file = '/'.$file; - } - break; - default: $downloadable_file = ''; // Do nothing From 1206e6dd117b4d9d5da2656dc4ac7d0d62dc5274 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 18 May 2020 13:46:31 +0200 Subject: [PATCH 08/10] minor fix php74 => php72 --- tests/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Dockerfile b/tests/Dockerfile index b8c80a9382..2a1fb9f667 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -10,12 +10,12 @@ RUN { \ # Pandora FMS dependencies. RUN yum install -y epel-release vim wget bzip2 curl && \ - yum install yum-utils && \ + yum install -y yum-utils && \ yum install -y https://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm && \ yum-config-manager --disable mysql80-community && \ yum-config-manager --enable mysql57-community && \ yum install -y https://rpms.remirepo.net/enterprise/remi-release-7.rpm && \ - yum-config-manager --enable remi-php74 && \ + yum-config-manager --enable remi-php72 && \ yum install -y gtk3 python-pip \ python-pip \ firefox \ From d2c2ae7502decdf9d66803ac88afb4b47f1c4fc5 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 19 May 2020 01:00:16 +0200 Subject: [PATCH 09/10] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 7f6a3936b3..5f9d720497 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200518 +Version: 7.0NG.745-200519 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 714342ef47..ddfb8b8732 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/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.745-200518" +pandora_version="7.0NG.745-200519" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 7389556d8f..d073cb4579 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.745'; -use constant AGENT_BUILD => '200518'; +use constant AGENT_BUILD => '200519'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 472ed816f4..7644b9583e 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.745 -%define release 200518 +%define release 200519 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 046d0352f1..f7fb42fb27 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.745 -%define release 200518 +%define release 200519 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index c4c5b972a0..315e1e5ad9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200518" +PI_BUILD="200519" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ad334129ba..20df2e4b95 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200518} +{200519} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d4b80840d5..f2ffece35b 100644 --- a/pandora_agents/win32/pandora.cc +++ b/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.745(Build 200518)") +#define PANDORA_VERSION ("7.0NG.745(Build 200519)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 6705f21e66..3f86b9faae 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/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.745(Build 200518))" + VALUE "ProductVersion", "(7.0NG.745(Build 200519))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ab623331a1..75aea2426d 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200518 +Version: 7.0NG.745-200519 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 1a7aaf4841..6e1dd718b2 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/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.745-200518" +pandora_version="7.0NG.745-200519" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e11addeafa..30b1caaa3f 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200518'; +$build_version = 'PC200519'; $pandora_version = 'v7.0NG.745'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index cefb2f8665..efabb80044 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index b8a86bb138..f3036203bb 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200518 +%define release 200519 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ebabb169f7..b393316483 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200518 +%define release 200519 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ea4212ec57..ac8ff62b40 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200518" +PI_BUILD="200519" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 43a9ee7918..58fcfdd203 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.745 PS200518"; +my $version = "7.0NG.745 PS200519"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index db503ce89b..b4de5ace47 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.745 PS200518"; +my $version = "7.0NG.745 PS200519"; # save program name for logging my $progname = basename($0); From b99298786ea27f347594115516a9ba67e80a6513 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Tue, 19 May 2020 08:20:04 +0200 Subject: [PATCH 10/10] Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario --- .../godmode/users/configure_user.php | 455 ++++++++++++------ pandora_console/include/functions_html.php | 10 +- pandora_console/include/functions_profile.php | 13 +- pandora_console/include/styles/pandora.css | 41 +- 4 files changed, 350 insertions(+), 169 deletions(-) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index dc0f726dc0..f4134a27e2 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -46,6 +46,54 @@ if ($enterprise_include) { enterprise_include_once('meta/include/functions_users_meta.php'); } + +if (!is_metaconsole()) { + date_default_timezone_set('UTC'); + include 'include/javascript/timezonepicker/includes/parser.inc'; + + // Read in options for map builder. + $bases = [ + 'gray' => 'Gray', + 'blue-marble' => 'Blue marble', + 'night-electric' => 'Night Electric', + 'living' => 'Living Earth', + ]; + + $local_file = 'include/javascript/timezonepicker/images/gray-400.png'; + + // Dimensions must always be exact since the imagemap does not scale. + $array_size = getimagesize($local_file); + + $map_width = $array_size[0]; + $map_height = $array_size[1]; + + $timezones = timezone_picker_parse_files( + $map_width, + $map_height, + 'include/javascript/timezonepicker/tz_world.txt', + 'include/javascript/timezonepicker/tz_islands.txt' + ); + + + foreach ($timezones as $timezone_name => $tz) { + if ($timezone_name == 'America/Montreal') { + $timezone_name = 'America/Toronto'; + } else if ($timezone_name == 'Asia/Chongqing') { + $timezone_name = 'Asia/Shanghai'; + } + + $area_data_timezone_polys .= ''; + foreach ($tz['polys'] as $coords) { + $area_data_timezone_polys .= ''; + } + + $area_data_timezone_rects .= ''; + foreach ($tz['rects'] as $coords) { + $area_data_timezone_rects .= ''; + } + } +} + // This defines the working user. Beware with this, old code get confusses // and operates with current logged user (dangerous). $id = get_parameter('id', get_parameter('id_user', '')); @@ -75,6 +123,12 @@ if (! check_acl($config['id_user'], 0, 'UM')) { $tab = get_parameter('tab', 'user'); +if ($id) { + $header_title = ' » '.__('Update user'); +} else { + $header_title = ' » '.__('Create user'); +} + // Header if ($meta) { user_meta_print_header(); @@ -94,7 +148,7 @@ if ($meta) { $buttons[$tab]['active'] = true; ui_print_page_header( - __('User detail editor'), + __('User detail editor').$header_title, 'images/gm_users.png', false, 'profile_tab', @@ -625,59 +679,61 @@ if ($values) { $user_info = $values; } -$table = new stdClass(); -$table->id = 'user_configuration_table'; -$table->width = '100%'; -$table->class = 'databox filters'; if (defined('METACONSOLE')) { if ($id) { - $table->head[0] = __('Update User'); + echo '
'.__('Update User').'
'; } else { - $table->head[0] = __('Create User'); + echo '
'.__('Create User').'
'; } - - $table->head_colspan[0] = 5; - $table->headstyle[0] = 'text-align: center'; } -$table->data = []; -$table->colspan = []; -$table->size = []; -$table->size[0] = '35%'; -$table->size[1] = '65%'; -$table->style = []; -$table->style[0] = 'font-weight: bold;'; +if (!$new_user) { + $user_id = '

'.__('User ID').':

'; + $user_id .= ''.$id.''; + $user_id .= html_print_input_hidden('id_user', $id, true); + $user_id .= '
'; +} else { + $user_id = '
'.html_print_input_text_extended( + 'id_user', + $id, + '', + '', + 20, + 100, + !$new_user || $view_mode, + '', + [ + 'class' => 'input_line user_icon_input', + 'placeholder' => __('User ID'), + ], + true + ).'
'; +} -$table->data[0][0] = __('User ID'); -$table->data[0][1] = html_print_input_text_extended( - 'id_user', - $id, - '', - '', - 20, - 60, - !$new_user || $view_mode, - '', - '', - true -); +if (is_user_admin($id)) { + $avatar = html_print_image('images/people_1.png', true, ['class' => 'user_avatar']); +} else { + $avatar = html_print_image('images/people_2.png', true, ['class' => 'user_avatar']); +} -$table->data[1][0] = __('Full (display) name'); -$table->data[1][1] = html_print_input_text_extended( +$full_name = '
'.html_print_input_text_extended( 'fullname', $user_info['fullname'], + 'fullname', '', - '', - 30, - 125, + 20, + 100, $view_mode, '', - '', + [ + 'class' => 'input', + 'placeholder' => __('Full (display) name'), + ], true -); +).'
'; -$table->data[2][0] = __('Language'); -$table->data[2][1] = html_print_select_from_sql( +$language = '

'.__('Language').':

'; +$language .= html_print_select_from_sql( 'SELECT id_language, name FROM tlanguage', 'language', $user_info['language'], @@ -685,88 +741,112 @@ $table->data[2][1] = html_print_select_from_sql( __('Default'), 'default', true -); +).'
'; -$table->data[3][0] = __('Timezone'); -$table->data[3][1] = html_print_timezone_select('timezone', $user_info['timezone']); + +$timezone = '

'.__('Timezone').':

'; +$timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'
'; if ($config['user_can_update_password']) { - $table->data[4][0] = __('Password'); - $table->data[4][1] = html_print_input_text_extended( + $new_pass = '
'.html_print_input_text_extended( 'password_new', '', + 'password_new', '', - '', - 15, - 45, + '25', + '45', $view_mode, '', - '', + [ + 'class' => 'input', + 'placeholder' => __('Password'), + ], true, true - ); - $table->data[5][0] = __('Password confirmation'); - $table->data[5][1] = html_print_input_text_extended( + ).'
'; + $new_pass_confirm = '
'.html_print_input_text_extended( 'password_confirm', '', + 'password_conf', '', - '', - 15, - 45, + '20', + '45', $view_mode, '', - '', + [ + 'class' => 'input', + 'placeholder' => __('Password confirmation'), + ], true, true - ); + ).'
'; } $own_info = get_user_info($config['id_user']); -if ($config['admin_can_make_admin']) { - $table->data[6][0] = __('Global Profile'); - $table->data[6][1] = ''; - if ($own_info['is_admin'] || $user_info['is_admin']) { - $table->data[6][1] = html_print_radio_button('is_admin', 1, '', $user_info['is_admin'], true); - $table->data[6][1] .= __('Administrator'); - $table->data[6][1] .= ui_print_help_tip(__('This user has permissions to manage all. An admin user should not requiere additional group permissions, except for using Enterprise ACL.'), true); - $table->data[6][1] .= '
'; - } +$global_profile = '
'.__('Global Profile').': '; +$global_profile .= '
'; +$global_profile .= html_print_radio_button_extended( + 'is_admin', + 1, + [ + 'label' => __('Administrator'), + 'help_tip' => __('This user has permissions to manage all. An admin user should not requiere additional group permissions, except for using Enterprise ACL.'), + ], + $user_info['is_admin'], + false, + '', + '', + true +); +$global_profile .= html_print_radio_button_extended( + 'is_admin', + 0, + [ + 'label' => __('Standard User'), + 'help_tip' => __('This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles'), + ], + $user_info['is_admin'], + false, + '', + '', + true +); +$global_profile .= '
'; - $table->data[6][1] .= html_print_radio_button('is_admin', 0, '', $user_info['is_admin'], true); - $table->data[6][1] .= __('Standard User'); - $table->data[6][1] .= ui_print_help_tip(__('This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles'), true); -} - -$table->data[7][0] = __('E-mail'); -$table->data[7][1] = html_print_input_text_extended( +$email = '
'.html_print_input_text_extended( 'email', $user_info['email'], + 'email', '', - '', - 20, - 100, + '25', + '100', $view_mode, '', - '', + [ + 'class' => 'input input_line email_icon_input', + 'placeholder' => __('E-mail'), + ], true -); +).'
'; -$table->data[8][0] = __('Phone number'); -$table->data[8][1] = html_print_input_text_extended( +$phone = '
'.html_print_input_text_extended( 'phone', $user_info['phone'], + 'phone', '', - '', - 10, - 30, + '20', + '30', $view_mode, '', - '', + [ + 'class' => 'input input_line phone_icon_input', + 'placeholder' => __('Phone number'), + ], true -); +).'
'; -$table->data[9][0] = __('Comments'); -$table->data[9][1] = html_print_textarea( +$comments = '

'.__('Comments').':

'; +$comments .= html_print_textarea( 'comments', 2, 65, @@ -795,16 +875,17 @@ if (!$meta) { // User only can change skins if has more than one group if (count($usr_groups) > 1) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { - $table->data[10][0] = __('Skin'); - $table->data[10][1] = skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true); + $skin = '

'.__('Skin').':

'; + $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
'; } } } if ($meta) { $array_filters = get_filters_custom_fields_view(0, true); - $table->data[11][0] = __('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true); - $table->data[11][1] = html_print_select( + + $search_custom_fields_view = '

'.__('Search custom field view').' '.ui_print_help_tip(__('Load by default the selected view in custom field view'), true).'

'; + $search_custom_fields_view .= html_print_select( $array_filters, 'default_custom_view', $user_info['default_custom_view'], @@ -816,7 +897,7 @@ if ($meta) { true, '', false - ); + ).'
'; } $values = [ @@ -825,7 +906,8 @@ $values = [ 0 => __('No'), ]; -$table->data[12][0] = __('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'), true); +$home_screen = '

'.__('Home screen').ui_print_help_tip(__('User can customize the home page. By default, will display \'Agent Detail\'. Example: Select \'Other\' and type index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=1 to show agent detail view'), true).'

'; +; $values = [ 'Default' => __('Default'), 'Visual console' => __('Visual console'), @@ -841,7 +923,7 @@ if (!is_metaconsole()) { } -$table->data[12][1] = html_print_select($values, 'section', io_safe_output($user_info['section']), 'show_data_section();', '', -1, true, false, false); +$home_screen .= html_print_select($values, 'section', io_safe_output($user_info['section']), 'show_data_section();', '', -1, true, false, false).'
'; $dashboards = Manager::getDashboards(-1, -1); @@ -854,7 +936,7 @@ if ($dashboards === false) { } } -$table->data[12][1] .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true); +$home_screen .= html_print_select($dashboards_aux, 'dashboard', $user_info['data_section'], '', '', '', true); $layouts = visual_map_get_user_layouts($config['id_user'], true); @@ -867,14 +949,14 @@ if ($layouts === false) { } } -$table->data[12][1] .= html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true); -$table->data[12][1] .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false); +$home_screen .= html_print_select($layouts_aux, 'visual_console', $user_info['data_section'], '', '', '', true); +$home_screen .= html_print_input_text('data_section', $user_info['data_section'], '', 60, 255, true, false); -$table->data[13][0] = __('Block size for pagination'); -$table->data[13][1] = html_print_input_text('block_size', $user_info['block_size'], '', 5, 5, true); +$size_pagination = '

'.__('Block size for pagination').'

'; +$size_pagination .= html_print_input_text('block_size', $user_info['block_size'], '', 5, 5, true).'
'; if ($id == $config['id_user']) { - $table->data[13][1] .= html_print_input_hidden('quick_language_change', 1, true); + $language .= html_print_input_hidden('quick_language_change', 1, true); } if (enterprise_installed() && defined('METACONSOLE')) { @@ -883,12 +965,12 @@ if (enterprise_installed() && defined('METACONSOLE')) { $user_info_metaconsole_access = $user_info['metaconsole_access']; } - $table->data[13][0] = __('Metaconsole access').' '.ui_print_help_icon('meta_access', true); + $meta_access = '

'.__('Metaconsole access').' '.ui_print_help_icon('meta_access', true).'

'; $metaconsole_accesses = [ 'basic' => __('Basic'), 'advanced' => __('Advanced'), ]; - $table->data[13][1] = html_print_select( + $meta_access .= html_print_select( $metaconsole_accesses, 'metaconsole_access', $user_info_metaconsole_access, @@ -898,16 +980,16 @@ if (enterprise_installed() && defined('METACONSOLE')) { true, false, false - ); + ).'
'; } -$table->data[14][0] = __('Not Login'); -$table->data[14][0] .= ui_print_help_tip(__('The user with not login set only can access to API.'), true); -$table->data[14][1] = html_print_checkbox('not_login', 1, $user_info['not_login'], true); +$not_login = '

'.__('Not Login').'

'; +$not_login .= ui_print_help_tip(__('The user with not login set only can access to API.'), true); +$not_login .= html_print_checkbox_switch('not_login', 1, $user_info['not_login'], true).'
'; -$table->data[15][0] = __('Session Time'); -$table->data[15][0] .= ui_print_help_tip(__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), true); -$table->data[15][1] = html_print_input_text('session_time', $user_info['session_time'], '', 5, 5, true); +$session_time = '

'.__('Session Time'); +$session_time .= ui_print_help_tip(__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), true).'

'; +$session_time .= html_print_input_text('session_time', $user_info['session_time'], '', 5, 5, true.false, false, '', 'class="input_line_small"').'
'; $event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter'); if ($event_filter_data === false) { @@ -920,69 +1002,104 @@ foreach ($event_filter_data as $filter) { $event_filter[$filter['id_filter']] = $filter['id_name']; } -$table->data[16][0] = __('Default event filter'); -$table->data[16][1] = html_print_select($event_filter, 'default_event_filter', $user_info['default_event_filter'], '', '', __('None'), true, false, false); +$default_event_filter = '

'.__('Default event filter').'

'; +$default_event_filter .= html_print_select($event_filter, 'default_event_filter', $user_info['default_event_filter'], '', '', __('None'), true, false, false).'
'; -$table->data[17][0] = __('Disabled newsletter'); +$newsletter = '

'.__('Disabled newsletter').'

'; if ($user_info['middlename'] >= 0) { $middlename = false; } else { $middlename = true; } -$table->data[17][1] = html_print_checkbox( +$newsletter .= html_print_checkbox_switch( 'middlename', -1, $middlename, true -); +).'
'; if ($config['ehorus_user_level_conf']) { - $table->data[18][0] = __('eHorus user acces enabled'); - $table->data[18][1] = html_print_checkbox('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true); - $table->data[19][0] = __('eHorus user'); - $table->data[20][0] = __('eHorus password'); - $table->data[19][1] = html_print_input_text('ehorus_user_level_user', $user_info['ehorus_user_level_user'], '', 15, 45, true); - $table->data[20][1] = html_print_input_password('ehorus_user_level_pass', io_output_password($user_info['ehorus_user_level_pass']), '', 15, 45, true); + $ehorus = '

'.__('eHorus user access enabled').'

'; + $ehorus .= html_print_checkbox_switch('ehorus_user_level_enabled', 1, $user_info['ehorus_user_level_enabled'], true).'
'; + $ehorus .= '
'; + $ehorus .= '

'.__('eHorus user').'

'; + $ehorus .= html_print_input_text('ehorus_user_level_user', $user_info['ehorus_user_level_user'], '', 15, 45, true).'
'; + $ehorus .= '

'.__('eHorus password').'

'; + $ehorus .= html_print_input_password('ehorus_user_level_pass', io_output_password($user_info['ehorus_user_level_pass']), '', 15, 45, true).'
'; + $ehorus .= '
'; } if ($meta) { enterprise_include_once('include/functions_metaconsole.php'); - $data = []; - $data[0] = __('Enable agents managment'); - $data[1] = html_print_checkbox('metaconsole_agents_manager', 1, $user_info['metaconsole_agents_manager'], true); - $table->rowclass[] = ''; - $table->rowstyle[] = 'font-weight: bold;'; - $table->data['metaconsole_agents_manager'] = $data; + $metaconsole_agents_manager = '

'.__('Enable agents managment').'

'; + $metaconsole_agents_manager .= html_print_checkbox_switch('metaconsole_agents_manager', 1, $user_info['metaconsole_agents_manager'], true).'
'; - $data = []; - $data[0] = __('Assigned node').ui_print_help_tip(__('Server where the agents created of this user will be placed'), true); + $metaconsole_assigned_server = '

'.__('Assigned node').ui_print_help_tip(__('Server where the agents created of this user will be placed'), true).'

'; $servers = metaconsole_get_servers(); $servers_for_select = []; foreach ($servers as $server) { $servers_for_select[$server['id']] = $server['server_name']; } - $data[1] = html_print_select($servers_for_select, 'metaconsole_assigned_server', $user_info['metaconsole_assigned_server'], '', '', -1, true, false, false); - $table->rowclass[] = ''; - $table->rowstyle[] = 'font-weight: bold;'; - $table->data['metaconsole_assigned_server'] = $data; + $metaconsole_assigned_server .= html_print_select($servers_for_select, 'metaconsole_assigned_server', $user_info['metaconsole_assigned_server'], '', '', -1, true, false, false).'
'; - $data = []; - $data[0] = __('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true); - $data[2] = html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true); - $table->rowclass[] = ''; - $table->rowstyle[] = ''; - $table->data['metaconsole_access_node'] = $data; + $metaconsole_access_node = '

'.__('Enable node access').ui_print_help_tip(__('With this option enabled, the user will can access to nodes console'), true).'

'; + $metaconsole_access_node .= html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true).'
'; } echo '
'; -html_print_table($table); -echo '
'; +if (!$id) { + $user_id_update_view = $user_id; + $user_id_create = ''; +} else { + $user_id_update_view = ''; + $user_id_create = $user_id; +} + +if (is_metaconsole()) { + $access_or_pagination = $meta_access; +} else { + $access_or_pagination = $size_pagination; +} + + +echo '
+
+ +

Extra info:

'.$email.$phone.$not_login.$session_time.'
+
+
+
'.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.'
+ +
'.$timezone; +if (!is_metaconsole()) { + echo '
+ + + '.$area_data_timezone_polys.$area_data_timezone_rects.' +
'; +} else { + echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_assigned_server.$metaconsole_access_node; +} + + echo '
+
+ +
+
'.$comments.'
+
+
'.$ehorus.'
+
'; + +echo '
'; if ($config['admin_can_add_user']) { html_print_csrf_hidden(); if ($new_user) { @@ -1005,32 +1122,62 @@ if (!empty($id) && !$new_user) { enterprise_hook('close_meta_frame'); +if (!is_metaconsole()) { + ?> + + + + + '."\n\t"; + echo ''."\n\t"; + // Closes no meta condition. +} + ?>