diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community.sh index 00c31d911b..7f70addfec 100644 --- a/extras/deploy-scripts/pandora_deploy_community.sh +++ b/extras/deploy-scripts/pandora_deploy_community.sh @@ -151,7 +151,7 @@ execute_cmd "yum install -y $extra_repos" "Installing extra repositories" execute_cmd "yum-config-manager --enable remi-php73" "Configuring PHP" # Install percona Database -[ -f /etc/resolv.conf ] && rm -rf /etc/my.cnf +[ -f /etc/my.cnf ] && rm -rf /etc/my.cnf execute_cmd "yum install -y Percona-Server-server-57" "Installing Percona Server" # Console dependencies @@ -429,6 +429,7 @@ sed -i -e "s/^max_input_time.*/max_input_time = -1/g" /etc/php.ini sed -i -e "s/^max_execution_time.*/max_execution_time = 0/g" /etc/php.ini sed -i -e "s/^upload_max_filesize.*/upload_max_filesize = 800M/g" /etc/php.ini sed -i -e "s/^memory_limit.*/memory_limit = 800M/g" /etc/php.ini +sed -i -e "s/.*post_max_size =.*/post_max_size = 800M/" /etc/php.ini cat > /var/www/html/index.html << EOF_INDEX diff --git a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh index 7c000ebebd..76a0954bb8 100755 --- a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh +++ b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh @@ -149,6 +149,7 @@ EOF_INDEX sed -i -e "s/^max_execution_time.*/max_execution_time = 0/g" /etc/php.ini sed -i -e "s/^upload_max_filesize.*/upload_max_filesize = 800M/g" /etc/php.ini sed -i -e "s/^memory_limit.*/memory_limit = 800M/g" /etc/php.ini + sed -i -e "s/.*post_max_size =.*/post_max_size = 800M/" /etc/php.ini echo "- Setting Public URL: $PUBLICURL" q=$(mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "select token from tconfig;" | grep public_url) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d24e9d2fa5..4a53219893 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.756-210726 +Version: 7.0NG.756-210910 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 5ff9d64bf4..9299c5c702 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.756-210726" +pandora_version="7.0NG.756-210910" 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 6baeaa16fa..c21c66dab0 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.756'; -use constant AGENT_BUILD => '210726'; +use constant AGENT_BUILD => '210910'; # 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 573af49127..ad7af1ad18 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.756 -%define release 210726 +%define release 210910 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 495b8c26ee..a05cdc508f 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.756 -%define release 210726 +%define release 210910 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 8b09996874..8f89d060c2 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.756" -PI_BUILD="210726" +PI_BUILD="210910" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index aef71b265f..d39e523a55 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210726} +{210910} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 5fba5d73db..37893c5aa4 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.756 Build 210726") +#define PANDORA_VERSION ("7.0NG.756 Build 210910") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c71f51047b..b6956f55c9 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.756(Build 210726))" + VALUE "ProductVersion", "(7.0NG.756(Build 210910))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4955feeea8..41440d41f3 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.756-210726 +Version: 7.0NG.756-210910 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 64b5dac436..50a20b36d6 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.756-210726" +pandora_version="7.0NG.756-210910" package_pear=0 package_pandora=1 diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php index 884285dd28..32be153e69 100644 --- a/pandora_console/extensions/users_connected.php +++ b/pandora_console/extensions/users_connected.php @@ -33,10 +33,19 @@ function users_extension_main_god($god=true) $image = 'images/user.png'; } - // Header + // Header. ui_print_page_header(__('Users connected'), $image, false, '', $god); - // Get groups user has permission + $check_profile = db_get_row('tusuario_perfil', 'id_usuario', $config['id_user'], 'id_up'); + if ($check_profile === false && !users_is_admin()) { + return ui_print_error_message( + __('This user does not have any associated profile'), + '', + false + ); + } + + // Get groups user has permission. $group_um = users_get_groups_UM($config['id_user']); // Is admin or has group permissions all. $groups = implode(',', array_keys($group_um, 1)); @@ -44,51 +53,85 @@ function users_extension_main_god($god=true) // Get user conected last 5 minutes.Show only those on which the user has permission. switch ($config['dbtype']) { case 'mysql': - $sql = sprintf( - 'SELECT tusuario.id_user, tusuario.last_connect - FROM tusuario - INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user - AND tusuario_perfil.id_grupo IN (%s) - WHERE last_connect > (UNIX_TIMESTAMP(NOW()) - '.SECONDS_5MINUTES.') - GROUP BY tusuario.id_user - ORDER BY last_connect DESC', - $groups - ); + if (users_is_admin()) { + $sql = sprintf( + 'SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + WHERE last_connect > (UNIX_TIMESTAMP(NOW()) - '.SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC' + ); + } else { + $sql = sprintf( + 'SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user + AND tusuario_perfil.id_grupo IN (%s) + WHERE last_connect > (UNIX_TIMESTAMP(NOW()) - '.SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC', + $groups + ); + } break; case 'postgresql': - $sql = sprintf( - "SELECT tusuario.id_user, tusuario.last_connect - FROM tusuario - INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user - AND tusuario_perfil.id_grupo IN (%s) - WHERE last_connect > (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_5MINUTES.') - GROUP BY tusuario.id_user - ORDER BY last_connect DESC', - $groups - ); + if (users_is_admin()) { + $sql = sprintf( + "SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + WHERE last_connect > (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC' + ); + } else { + $sql = sprintf( + "SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user + AND tusuario_perfil.id_grupo IN (%s) + WHERE last_connect > (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - ".SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC', + $groups + ); + } break; case 'oracle': - $sql = sprintf( - "SELECT tusuario.id_user, tusuario.last_connect - FROM tusuario - INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user - AND tusuario_perfil.id_grupo IN (%s) - WHERE last_connect > (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_5MINUTES.') - GROUP BY tusuario.id_user - ORDER BY last_connect DESC', - $groups - ); + if (users_is_admin()) { + $sql = sprintf( + "SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + WHERE last_connect > (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC' + ); + } else { + $sql = sprintf( + "SELECT tusuario.id_user, tusuario.last_connect + FROM tusuario + INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user + AND tusuario_perfil.id_grupo IN (%s) + WHERE last_connect > (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - '.SECONDS_5MINUTES.') + GROUP BY tusuario.id_user + ORDER BY last_connect DESC', + $groups + ); + } + break; + + default: + // Nothing to do. break; } $rows = db_get_all_rows_sql($sql); - if (empty($rows)) { $rows = []; echo "
".__('No other users connected').'
'; } else { + $table = new StdClass(); $table->cellpadding = 0; $table->cellspacing = 0; $table->width = '100%'; @@ -105,7 +148,7 @@ function users_extension_main_god($god=true) $rowPair = true; $iterator = 0; - // Get data + // Get data. foreach ($rows as $row) { // Get data of user's last login. switch ($config['dbtype']) { @@ -135,6 +178,10 @@ function users_extension_main_god($god=true) ) ); break; + + default: + // Nothing to do. + break; } if ($rowPair) { diff --git a/pandora_console/extras/mr/48.sql b/pandora_console/extras/mr/48.sql index e4c07e09c7..3efd501976 100644 --- a/pandora_console/extras/mr/48.sql +++ b/pandora_console/extras/mr/48.sql @@ -1,5 +1,7 @@ START TRANSACTION; +ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; +ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; ALTER TABLE `tmetaconsole_setup` ADD COLUMN `unified` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0; ALTER TABLE `tlayout` ADD COLUMN `auto_adjust` INTEGER UNSIGNED NOT NULL default 0; ALTER TABLE `tlayout_data` ADD COLUMN `title` TEXT default ''; diff --git a/pandora_console/extras/mr/49.sql b/pandora_console/extras/mr/49.sql new file mode 100644 index 0000000000..28178ca5fe --- /dev/null +++ b/pandora_console/extras/mr/49.sql @@ -0,0 +1,7 @@ +START TRANSACTION; + +UPDATE `tconfig` set value = 'Lato-Regular.ttf' WHERE token LIKE 'custom_report_front_font'; +UPDATE `tconfig` set value = 'Lato-Regular.ttf' WHERE token LIKE 'fontpath'; +UPDATE `tlanguage` SET `name` = 'Deutsch' WHERE `id_language` = 'de'; + +COMMIT; diff --git a/pandora_console/extras/mr/procedures/updateSnmpAlerts.sql b/pandora_console/extras/mr/procedures/updateSnmpAlerts.sql deleted file mode 100644 index 5fed73fdf9..0000000000 --- a/pandora_console/extras/mr/procedures/updateSnmpAlerts.sql +++ /dev/null @@ -1,35 +0,0 @@ -CREATE PROCEDURE updateSnmpAlerts() -BEGIN - DECLARE tokenId INT DEFAULT 0; - DECLARE procedureRun INT DEFAULT 0; - DECLARE done BOOLEAN DEFAULT FALSE; - DECLARE a, b INT DEFAULT 0; - DECLARE alertsCur CURSOR FOR SELECT id, id_alert_command FROM talert_actions; - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - SELECT id_config, value INTO tokenId, procedureRun FROM tconfig WHERE token = 'update_snmp_alerts_procedure_already_run' LIMIT 1; - - IF procedureRun < 1 THEN - SET done = FALSE; - - OPEN alertsCur; - - read_loop: LOOP - FETCH alertsCur INTO a, b; - IF done THEN - LEAVE read_loop; - END IF; - - UPDATE talert_snmp SET id_alert = b WHERE id_alert = a; - UPDATE talert_snmp_action SET alert_type = b WHERE alert_type = a; - END LOOP; - - CLOSE alertsCur; - - IF tokenId < 1 THEN - INSERT INTO tconfig (id_config, token, value) VALUES ('', 'update_snmp_alerts_procedure_already_run', '1'); - ELSE - UPDATE tconfig SET value = 1 WHERE token = 'update_snmp_alerts_procedure_already_run'; - END IF; - END IF; -END \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index ac6c127f62..e506d2f688 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1028,6 +1028,7 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_timestamp_idx` (`timestamp`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_status`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`); ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`); +ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL; -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` @@ -2350,6 +2351,8 @@ ALTER TABLE `tevento` ADD COLUMN `data` double(50,5) default NULL; ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; +ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL; + -- --------------------------------------------------------------------- -- Table `tevent_extended` -- --------------------------------------------------------------------- @@ -4075,3 +4078,5 @@ CREATE TABLE IF NOT EXISTS `talert_execution_queue` ( `utimestamp` bigint(20) NOT NULL default '0', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +UPDATE `tlanguage` SET `name` = 'Deutsch' WHERE `id_language` = 'de'; \ No newline at end of file diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 190ea87a81..2b423360c6 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -23,13 +23,8 @@ ui_require_css_file('order_interpreter'); // Global errors/warnings checking. config_check(); +echo sprintf('
', $menuTypeClass); - -if ($config['menu_type'] == 'classic') { - echo '
'; -} else { - echo '
'; -} ?>
$value) { html_print_input_hidden(io_safe_input($key), io_safe_input($value)); @@ -508,9 +510,29 @@ if ($login_screen == 'logout') { echo '
'; } +if ($login_screen === 'disabled_access_node') { + echo '
'; + echo '
'; + echo '
'; + echo html_print_image('images/icono_logo_pandora.png', true, ['alt' => __('Centralized user in metaconsole'), 'border' => 0]); + echo '
'; + echo '
'; + echo '
'; + echo '

'.__('Centralized user in metaconsole').'

'; + echo '

'.__('This user does not have access on node, please enable node access on this user from metaconsole.').'

'; + echo '
'; + echo '
'; + html_print_submit_button('Ok', 'hide-login-logout', false); + echo '
'; + echo '
'; + echo '
'; + echo '
'; +} + switch ($login_screen) { case 'error_dbconfig': case 'error_authconfig': + case 'disabled_node_access': if (!isset($config['rb_product_name_alt'])) { $title = __('Problem with %s database', get_product_name()); } else { @@ -694,6 +716,29 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', ' }); break; + case 'disabled_access_node': + $(document).ready (function () { + $(function() { + $("#disabled_access_node").dialog({ + resizable: true, + draggable: true, + modal: true, + height: 220, + width: 528, + clickOutside: true, + overlay: { + opacity: 0.5, + background: "black" + } + }); + }); + + $("#submit-hide-login-logout").click (function () { + document.location = ""; + }); + }); + break; + default: $(document).ready (function () { // IE9- modal warning window diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 5a45058c58..1462c717d7 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -1,17 +1,33 @@ $(document).ready(function(){ - var menuType_value = ""; + var menuType_value = ""; - if (menuType_value == 'classic') { + if (menuType_value === '' || menuType_value === 'classic') { $('ul.submenu').css('left', '214px'); } else{ @@ -34,26 +50,22 @@ $(document).ready(function(){ '; -} else { - echo '
'; $table_interval = '

'.__('Interval').'

'; @@ -500,7 +507,10 @@ if (enterprise_installed()) { false, // Delete_groups. // Do not show the primary group in this selection. - array_merge(($secondary_groups_selected['plain'] ?? []), [$agent['id_grupo']]) + array_merge( + (empty($secondary_groups_selected['plain']) === false) ? $secondary_groups_selected['plain'] : [], + [$agent['id_grupo']] + ) // Include_groups. // Size. // Simple_multiple_options. @@ -1243,6 +1253,9 @@ ui_require_jquery_file('bgiframe'); }); $("select#id_os").pandoraSelectOS (); + $('select#grupo').pandoraSelectGroupIcon (); + + var checked = $("#checkbox-cascade_protection").is(":checked"); if (checked) { diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index abdb5a8dca..8617f85b70 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -2095,7 +2095,7 @@ if ($delete_module) { exit; } - // Also call base function to delete modules madafakas de los cojones. + // Also call base function to delete modules. modules_delete_agent_module($id_borrar_modulo); // Check for errors. @@ -2368,7 +2368,7 @@ switch ($tab) { var aget_id_os = ''; - if('' != $('#text-name').val() && + if('' != $('#text-name').val() && '' == 19){ event.preventDefault(); @@ -2402,7 +2402,7 @@ switch ($tab) { var module_type_snmp = ''; - if('' != $('#text-name').val() && ( + if('' != $('#text-name').val() && ( module_type_snmp == 15 || module_type_snmp == 16 || module_type_snmp == 17 || module_type_snmp == 18)){ event.preventDefault(); diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 84f9c77ed7..36efc20290 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -215,7 +215,7 @@ $table_simple->colspan[3][1] = 3; $table_simple->data[0][0] = __('Name'); $table_simple->data[0][1] = html_print_input_text_extended( 'name', - io_safe_input(html_entity_decode($name, ENT_QUOTES, 'UTF-8')), + $name, 'text-name', '', 45, diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index be00db6518..6109445d29 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -443,6 +443,13 @@ $data[1] = html_print_input_text_extended( $largeClassDisabledBecauseInPolicy, true ); +$data[1] .= ui_print_help_tip( + __( + 'Please use single quotation marks when necessary. '."\n".' +If double quotation marks are needed, please escape them with a backslash (\")' + ), + true +); $table_simple->colspan['row-cmd-row-1'][1] = 3; push_table_simple($data, 'row-cmd-row-1'); @@ -577,12 +584,7 @@ $(document).ready (function () { $('#text-ip_target').keyup(function() { $('#text-target_ip').val($(this).val()); }); - $('#text-target_ip').keyup(function() { - $('#text-ip_target').val($(this).val()); - }); - $('#text-community').keyup(function() { - $('#text-snmp_community').val($(this).val()); - }); + $('#text-snmp_community').keyup(function() { $('#text-community').val($(this).val()); }); @@ -591,61 +593,25 @@ $(document).ready (function () { // Display or collapse the SNMP browser's v3 options checkSNMPVersion (); }); - $('#snmp_browser_version').change(function() { - $('#snmp_version').val($(this).val()); - - // Display or collapse the SNMP v3 options in the main window - if ($(this).val() == "3") { - $("#simple-field_snmpv3_row1").attr("style", ""); - $("#simple-field_snmpv3_row2").attr("style", ""); - $("#simple-field_snmpv3_row3").attr("style", ""); - $("input[name=active_snmp_v3]").val(1); - $("input[name=snmp_community]").attr("disabled", true); - } - else { - $("#simple-field_snmpv3_row1").css("display", "none"); - $("#simple-field_snmpv3_row2").css("display", "none"); - $("#simple-field_snmpv3_row3").css("display", "none"); - $("input[name=active_snmp_v3]").val(0); - $("input[name=snmp_community]").removeAttr('disabled'); - } - }); $('#snmp3_auth_user').keyup(function() { $('#snmp3_browser_auth_user').val($(this).val()); }); - $('#snmp3_browser_auth_user').keyup(function() { - $('#snmp3_auth_user').val($(this).val()); - }); $('#snmp3_security_level').change(function() { $('#snmp3_browser_security_level').val($(this).val()); }); - $('#snmp3_browser_security_level').change(function() { - $('#snmp3_security_level').val($(this).val()); - }); $('#snmp3_auth_method').change(function() { $('#snmp3_browser_auth_method').val($(this).val()); }); - $('#snmp3_browser_auth_method').change(function() { - $('#snmp3_auth_method').val($(this).val()); - }); $('#snmp3_auth_pass').keyup(function() { $('#snmp3_browser_auth_pass').val($(this).val()); }); - $('#snmp3_browser_auth_pass').keyup(function() { - $('#snmp3_auth_pass').val($(this).val()); - }); $('#snmp3_privacy_method').change(function() { $('#snmp3_browser_privacy_method').val($(this).val()); }); - $('#snmp3_browser_privacy_method').change(function() { - $('#snmp3_privacy_method').val($(this).val()); - }); $('#snmp3_privacy_pass').keyup(function() { $('#snmp3_browser_privacy_pass').val($(this).val()); }); - $('#snmp3_browser_privacy_pass').keyup(function() { - $('#snmp3_privacy_pass').val($(this).val()); - }); + var custom_ip_target = ""; if(custom_ip_target == ''){ $("#text-custom_ip_target").hide(); diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index 399bb55cfd..a9de8608e7 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -708,7 +708,7 @@ foreach ($simple_alerts as $alert) { $data[3] .= '