diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index edab1affeb..7382112db9 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -29,6 +29,7 @@ $CODEHOME/pandora_console/pandora_console.redhat.spec \ $CODEHOME/pandora_console/pandora_console.rhel7.spec \ $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \ $CODEHOME/pandora_server/pandora_server.redhat.spec \ +$PANDHOME_ENT/pandora_agents/pandora_agent.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.redhat.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec \ $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec" diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0cb4d4665b..58c64f5677 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.744-200331 +Version: 7.0NG.744-200406 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 c50e1e1c4c..9d79b755eb 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.744-200331" +pandora_version="7.0NG.744-200406" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null @@ -79,7 +79,7 @@ cp Linux/pandora_agent.conf temp_package/etc/pandora/ cp -aRf man/man1/* temp_package/usr/share/man/man1/ # Relocate plugins to the final dir and delete -mv temp_package/usr/share/pandora_agent/plugins/* temp_package/etc/pandora/plugins +cp temp_package/usr/share/pandora_agent/plugins/* temp_package/etc/pandora/plugins echo "Official plugins are placed on /etc/pandora/plugins" > temp_package/usr/share/pandora_agent/plugins/README diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 8ec14b84cf..da1937cf81 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.744'; -use constant AGENT_BUILD => '200331'; +use constant AGENT_BUILD => '200406'; # 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 9df20492fe..1ca2654d76 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.744 -%define release 200331 +%define release 200406 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 94f5c673ea..22339fec52 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.744 -%define release 200331 +%define release 200406 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 91e0402dfe..b238a7dc46 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.744" -PI_BUILD="200331" +PI_BUILD="200406" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a922e83b5b..3f26dd55e1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200331} +{200406} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9d37078a8a..61e6b73618 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.744(Build 200331)") +#define PANDORA_VERSION ("7.0NG.744(Build 200406)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 35b8f7e76c..93ddf508f4 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.744(Build 200331))" + VALUE "ProductVersion", "(7.0NG.744(Build 200406))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2b963f616e..4105406deb 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.744-200331 +Version: 7.0NG.744-200406 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 14323911ad..94c250b30f 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.744-200331" +pandora_version="7.0NG.744-200406" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 445323e186..fcb8a1df52 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -830,14 +830,7 @@ foreach ($modules as $module) { $data[4] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true); } - - if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) { - $module_description = utf8_decode($module['descripcion']); - } else { - $module_description = $module['descripcion']; - } - - $data[5] = ui_print_truncate_text($module_description, 'description', false); + $data[5] = ui_print_truncate_text($module['descripcion'], 'description', false); $data[6] = ui_print_status_image($status, htmlspecialchars($title), true); diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 546e4b1c28..447e627567 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -696,7 +696,7 @@ foreach ($simple_alerts as $alert) { $data[3] .= __('Agent'); $data[3] .= ''; $data[3] .= ''; - $data[3] .= ui_print_truncate_text($agent_name, 'agent_small', false, true, true, '[…]'); + $data[3] .= ui_print_truncate_text($alias, 'agent_small', false, true, true, '[…]'); $data[3] .= ''; $data[3] .= ''; } diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index be3b02d669..d106f5010a 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -468,12 +468,12 @@ foreach ($info as $user_id => $user_info) { $data[0] = ''.$user_id.''; $data[1] = ''; $data[2] = ui_print_timestamp($user_info['last_connect'], true); diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index 22ff8f5301..4593208547 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -466,7 +466,7 @@ class HostDevices extends Wizard } $id_network_profile = get_parameter('id_network_profile', []); - $review_results = get_parameter_switch('review_results'); + $review_results = get_parameter_switch('review_results', -1); $auto_monitor = get_parameter_switch('auto_monitor'); $autoconf_enabled = get_parameter_switch( 'autoconfiguration_enabled' @@ -504,6 +504,11 @@ class HostDevices extends Wizard ); } + if ($review_results < 0) { + // License limited, force review. + $this->task['review_mode'] = DISCOVERY_REVIEW; + } + if ($review_results) { if ($this->task['review_mode'] != DISCOVERY_RESULTS) { $this->task['review_mode'] = DISCOVERY_REVIEW; diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 10587df2dc..cecf14d4df 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1004,14 +1004,8 @@ if (check_login()) { $data[3] .= ' '.html_print_image('images/link2.png', true, ['id' => 'relations-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).' '; } - $module_description = ''; - if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) { - $module_description = utf8_decode($module['descripcion']); - } else { - $module_description = $module['descripcion']; - } - $data[4] = ui_print_string_substr($module_description, 60, true, 8); + $data[4] = ui_print_string_substr($module['descripcion'], 60, true, 8); if ($module['datos'] != strip_tags($module['datos'])) { diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1c8bac99fd..ce18f53213 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 = 'PC200331'; +$build_version = 'PC200406'; $pandora_version = 'v7.0NG.744'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index e18cfbd094..37ead3a465 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -13541,6 +13541,9 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) // 1 hour by default. $graph_threshold = (!empty($other) && isset($other['data'][2]) && $other['data'][2]) ? $other['data'][2] : 0; + // Graph height when send email by alert + $height = (!empty($other) && isset($other['data'][3]) && $other['data'][3]) ? $other['data'][3] : null; + if (is_nan($graph_seconds) || $graph_seconds <= 0) { // returnError('error_module_graph', __('')); return; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 4e22162717..6ee12bea9d 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -3356,9 +3356,11 @@ function html_print_switch($attributes=[]) $attributes['style'] = ''; } + $disabled_class .= (bool) ($attributes['disabled']) ? ' p-slider-disabled' : ''; + return ""; } diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php index 66efd3d4a7..45e08dfcf6 100644 --- a/pandora_console/include/functions_notifications.php +++ b/pandora_console/include/functions_notifications.php @@ -916,7 +916,7 @@ function notifications_print_two_ways_select($info_selec, $users, $source_id) function notifications_print_user_switch($source, $user, $label) { $status = notifications_get_user_label_status($source, $user, $label); - return html_print_switch( + $switch = html_print_switch( [ 'name' => $label, 'value' => $status['status'], @@ -925,6 +925,13 @@ function notifications_print_user_switch($source, $user, $label) 'id' => 'notifications-user-'.$source['id'].'-label-'.$label, ] ); + + $data = [ + 'disabled' => !$status['enabled'], + 'switch' => $switch, + ]; + + return $data; } diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 6925ceab20..3217a544bf 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -124,16 +124,16 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals $table->data['module_group'] = $row; // Description - $module_description = ''; - if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) { - $module_description = utf8_decode($module['descripcion']); - } else { - $module_description = $module['descripcion']; - } - $row = []; $row['title'] = __('Description'); - $row['data'] = ui_print_truncate_text($module_description, 'description', true, true, true, '[…]'); + $row['data'] = ui_print_truncate_text( + $module['descripcion'];, + 'description', + true, + true, + true, + '[…]' + ); $table->data['description'] = $row; // Tags diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index cb2a6fc4cc..175173160c 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -458,10 +458,19 @@ function pandoraFlotHBars( // v, axis; function xFormatter(v) { var label = parseFloat(v); + + const unit_prefixes = ["K", "M", "G"]; + var unit_prefix = ""; + var i = 0; + + while (label >= 1000 && i < 3) { + label = label / 1000; + unit_prefix = unit_prefixes[i]; + i++; + } var text = label.toLocaleString(); - if (label >= 1000000) text = text.substring(0, 4) + "M"; - else if (label >= 100000) text = text.substring(0, 3) + "K"; - else if (label >= 1000) text = text.substring(0, 2) + "K"; + + text = text + unit_prefix; return ( '
'.__('Also receive an email').'
'; - $sources = notifications_get_all_sources(); +$sources = notifications_get_all_sources(); + +$disabled_flag = false; + foreach ($sources as $source) { echo '
'; $table_content = [ @@ -72,12 +75,24 @@ foreach ($sources as $source) { notifications_print_user_switch($source, $id, 'enabled'), notifications_print_user_switch($source, $id, 'also_mail'), ]; + + $notifications_enabled = notifications_print_user_switch($source, $id, 'enabled'); + $notifications_also_mail = notifications_print_user_switch($source, $id, 'also_mail'); + + if ($notifications_enabled['disabled'] == 1 || $notifications_also_mail['disabled'] == 1) { + $disabled_flag = true; + } + echo '
'.$source['description'].'
'; - echo '
'.notifications_print_user_switch($source, $id, 'enabled').'
'; - echo '
'.notifications_print_user_switch($source, $id, 'also_mail').'
'; + echo '
'.$notifications_enabled['switch'].'
'; + echo '
'.$notifications_also_mail['switch'].'
'; echo '
'; } +if ($disabled_flag) { + echo 'Disabled controls have been set by the system administrator'; +} + echo ''; // Print id user to handle it on js. diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index cbf7e49f9d..a52ecba5f9 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.744 -%define release 200331 +%define release 200406 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index 4dc875f403..74d0ceeb2c 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.744 -%define release 200331 +%define release 200406 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 63c1ac589f..928ea2300d 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.744 -%define release 200331 +%define release 200406 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 58693c0ba4..25ecc64fe5 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.744-200331 +Version: 7.0NG.744-200406 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 4bdf19d5f6..b46b477387 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/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.744-200331" +pandora_version="7.0NG.744-200406" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index f2cead7f01..effafaeb3b 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -45,7 +45,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.744"; -my $pandora_build = "200331"; +my $pandora_build = "200406"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 6cf2204ff3..c781d6b9fb 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1271,11 +1271,11 @@ sub pandora_execute_action ($$$$$$$$$;$) { my $threshold = shift; my $period = $hours * 3600; # Hours to seconds if($threshold == 0){ - $params->{"other"} = $period . '%7C0%7C0'; + $params->{"other"} = $period . '%7C0%7C0%7C225'; $cid = 'module_graph_' . $hours . 'h'; } else{ - $params->{"other"} = $period . '%7C0%7C1'; + $params->{"other"} = $period . '%7C0%7C1%7C225'; $cid = 'module_graphth_' . $hours . 'h'; } @@ -3917,7 +3917,7 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) { 'direccion' => $trap_agent, 'comentarios' => '', 'id_agente' => 0, - 'id_grupo' => 0 + 'id_grupo' => $alert->{'id_group'} ); } diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm index d2e47fba59..bacda962d4 100644 --- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm +++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm @@ -1016,7 +1016,7 @@ sub PandoraFMS::Recon::Base::report_scanned_agents($;$) { # Agent creation. $agent_id = pandora_create_agent( $self->{'pa_config'}, $self->{'servername'}, $data->{'agent'}{'nombre'}, - $data->{'agent'}{'direccion'}, $self->{'task_data'}{'group_id'}, $parent_id, + $data->{'agent'}{'direccion'}, $self->{'task_data'}{'id_group'}, $parent_id, $os_id, $data->{'agent'}->{'description'}, $data->{'agent'}{'interval'}, $self->{'dbh'}, $data->{'agent'}{'timezone_offset'} diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 8272389ac2..9824b8cf16 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -33,7 +33,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.744"; -my $pandora_build = "200331"; +my $pandora_build = "200406"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 11230de7a8..956aa83e79 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.744 -%define release 200331 +%define release 200406 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 438dab93ba..bc0e8fbbe4 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.744 -%define release 200331 +%define release 200406 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 249d9f75f3..71350caa9c 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.744" -PI_BUILD="200331" +PI_BUILD="200406" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2872baa4b6..a0e53e35d9 100644 --- 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.744 PS200331"; +my $version = "7.0NG.744 PS200406"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 88cc08409e..494e4aff95 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.744 PS200331"; +my $version = "7.0NG.744 PS200406"; # save program name for logging my $progname = basename($0);