diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5e6cdcaf52..0ee00a8f17 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190213 +Version: 7.0NG.731-190214 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 36394c1753..9ebfc5d3dc 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.731-190213" +pandora_version="7.0NG.731-190214" 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 51cfc9b3b4..664a9964e3 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.731'; -use constant AGENT_BUILD => '190213'; +use constant AGENT_BUILD => '190214'; # 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 dd33121a7b..5c097c9a07 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.731 -%define release 190213 +%define release 190214 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 594a55cf67..820f5d3ec1 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.731 -%define release 190213 +%define release 190214 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 a1fe47bf4d..8adeac4f7a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190213" +PI_BUILD="190214" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 97198033b0..3b606d8ec0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190213} +{190214} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e733c2c808..30fff5f13b 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.731(Build 190213)") +#define PANDORA_VERSION ("7.0NG.731(Build 190214)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 0a946f611d..a34c9905ea 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.731(Build 190213))" + VALUE "ProductVersion", "(7.0NG.731(Build 190214))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 48853b25f5..285b64c80f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190213 +Version: 7.0NG.731-190214 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 72b51f04c3..02c1b2ed71 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.731-190213" +pandora_version="7.0NG.731-190214" package_pear=0 package_pandora=1 diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php index ba40f75b00..e7f38447cf 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php +++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php @@ -44,8 +44,7 @@ if (empty($update_module_id)) { $data = []; $data[0] = __('Target IP'); $data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true); -$data[2] = __('Namespace'); -$data[2] .= ui_print_help_icon('wminamespace', true); +$data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true); $data[3] = html_print_input_text( 'tcp_send', $tcp_send, @@ -110,8 +109,7 @@ $table_simple->colspan['wmi_query'][1] = 3; push_table_simple($data, 'wmi_query'); $data = []; -$data[0] = __('Key string'); -$data[0] .= ui_print_help_icon('wmikey', true); +$data[0] = __('Key string').ui_print_help_tip(__('Optional. Substring to look for in the WQL query result. The module returns 1 if found, 0 if not.'), true); $data[1] = html_print_input_text( 'snmp_community', $snmp_community, @@ -124,8 +122,7 @@ $data[1] = html_print_input_text( '', $classdisabledBecauseInPolicy ); -$data[2] = __('Field number'); -$data[2] .= ui_print_help_icon('wmifield', true); +$data[2] = __('Field number').ui_print_help_tip(__('Column number to retrieve from the WQL query result (starting from zero).'), true); $data[3] = html_print_input_text( 'tcp_port', $tcp_port, diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index e951b77bf4..3f9a33cb8a 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -47,7 +47,7 @@ if ($create_network_from_module) { $id_module_group = $data_module['id_module_group']; $id_plugin = $data_module['id_plugin']; $plugin_user = $data_module['plugin_user']; - $plugin_pass = $data_module['plugin_pass']; + $plugin_pass = io_output_password($data_module['plugin_pass']); $plugin_parameter = $data_module['plugin_parameter']; $macros = $data_module['macros']; $max_timeout = $data_module['max_timeout']; @@ -104,7 +104,7 @@ if (isset($id)) { $id_group = $component['id_group']; $id_plugin = $component['id_plugin']; $plugin_user = $component['plugin_user']; - $plugin_pass = $component['plugin_pass']; + $plugin_pass = io_output_password($component['plugin_pass']); $plugin_parameter = $component['plugin_parameter']; $macros = $component['macros']; $max_timeout = $component['max_timeout']; @@ -140,10 +140,10 @@ if (isset($id)) { // New support for snmp v3 $snmp_version = $component['tcp_send']; $snmp3_auth_user = $component['plugin_user']; - $snmp3_auth_pass = $component['plugin_pass']; + $snmp3_auth_pass = io_output_password($component['plugin_pass']); $snmp3_auth_method = $component['plugin_parameter']; $snmp3_privacy_method = $component['custom_string_1']; - $snmp3_privacy_pass = $component['custom_string_2']; + $snmp3_privacy_pass = io_output_password($component['custom_string_2']); $snmp3_security_level = $component['custom_string_3']; } } else if (isset($new_component) && $new_component && !$create_network_from_snmp_browser) { diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php index b8a397531e..f8d53e722f 100644 --- a/pandora_console/godmode/setup/performance.php +++ b/pandora_console/godmode/setup/performance.php @@ -125,22 +125,19 @@ $table_other->data[3][0] = __('Default hours for event view'); $table_other->data[3][1] = html_print_input_text('event_view_hr', $config['event_view_hr'], '', 5, 5, true); $table_other->data[5][0] = __('Use realtime statistics'); -$table_other->data[5][1] = __('Yes').' '.html_print_radio_button('realtimestats', 1, '', $config['realtimestats'], true).'  '; -$table_other->data[5][1] .= __('No').' '.html_print_radio_button('realtimestats', 0, '', $config['realtimestats'], true); +$table_other->data[5][1] = html_print_checkbox_toogle_switch('realtimestats', 1, $config['realtimestats'], true); $table_other->data[6][0] = __('Batch statistics period (secs)').ui_print_help_tip(__('If realtime statistics are disabled, statistics interval resfresh will be set here.'), true); $table_other->data[6][1] = html_print_input_text('stats_interval', $config['stats_interval'], '', 5, 5, true); $table_other->data[7][0] = __('Use agent access graph').ui_print_help_icon('agent_access', true); -$table_other->data[7][1] = __('Yes').' '.html_print_radio_button('agentaccess', 1, '', $config['agentaccess'], true).'  '; -$table_other->data[7][1] .= __('No').' '.html_print_radio_button('agentaccess', 0, '', $config['agentaccess'], true); +$table_other->data[7][1] = html_print_checkbox_toogle_switch('agentaccess', 1, $config['agentaccess'], true); $table_other->data[8][0] = __('Max. recommended number of files in attachment directory').ui_print_help_tip(__('This number is the maximum number of files in attachment directory. If this number is reached then a warning message will appear in the header notification space.'), true); $table_other->data[8][1] = html_print_input_text('num_files_attachment', $config['num_files_attachment'], '', 5, 5, true); $table_other->data[9][0] = __('Delete not init modules'); -$table_other->data[9][1] = __('Yes').' '.html_print_radio_button('delete_notinit', 1, '', $config['delete_notinit'], true).'  '; -$table_other->data[9][1] .= __('No').' '.html_print_radio_button('delete_notinit', 0, '', $config['delete_notinit'], true); +$table_other->data[9][1] = html_print_checkbox_toogle_switch('delete_notinit', 1, $config['delete_notinit'], true); $table_other->data[10][0] = __('Big Operation Step to purge old data').ui_print_help_tip(__('The number of blocks that a time interval is split into. A bigger value means bigger blocks, which is faster but heavier on the database. Default is 100.'), true); $table_other->data[10][1] = html_print_input_text('big_operation_step_datos_purge', $config['big_operation_step_datos_purge'], '', 5, 5, true); diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index 925f967622..4d5eeb07ff 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -44,16 +44,14 @@ if (is_ajax()) { // Fallback to local authentication $row = []; $row['name'] = __('Fallback to local authentication').ui_print_help_tip(__('Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed.'), true); - $row['control'] = __('Yes').' '.html_print_radio_button('fallback_local_auth', 1, '', $config['fallback_local_auth'], true).'  '; - $row['control'] .= __('No').' '.html_print_radio_button('fallback_local_auth', 0, '', $config['fallback_local_auth'], true); + $row['control'] = html_print_checkbox_toogle_switch('fallback_local_auth', 1, $config['fallback_local_auth'], true); $table->data['fallback_local_auth'] = $row; if (enterprise_installed()) { // Autocreate remote users $row = []; $row['name'] = __('Autocreate remote users'); - $row['control'] = __('Yes').' '.html_print_radio_button_extended('autocreate_remote_users', 1, '', $config['autocreate_remote_users'], false, '', '', true).'  '; - $row['control'] .= __('No').' '.html_print_radio_button_extended('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, '', '', true); + $row['control'] = html_print_checkbox_toogle_switch_extended('autocreate_remote_users', 1, $config['autocreate_remote_users'], false, '', '', true).'  '; $table->data['autocreate_remote_users'] = $row; add_enterprise_auth_autocreate_profiles($table, $type_auth); @@ -91,8 +89,7 @@ if (is_ajax()) { // Start TLS $row = []; $row['name'] = __('Start TLS'); - $row['control'] = __('Yes').' '.html_print_radio_button('ldap_start_tls', 1, '', $config['ldap_start_tls'], true).'  '; - $row['control'] .= __('No').' '.html_print_radio_button('ldap_start_tls', 0, '', $config['ldap_start_tls'], true); + $row['control'] = html_print_checkbox_toogle_switch('ldap_start_tls', 1, $config['ldap_start_tls'], true); $table->data['ldap_start_tls'] = $row; // Base DN @@ -137,11 +134,7 @@ if (is_ajax()) { set_unless_defined($config['double_auth_enabled'], false); $row = []; $row['name'] = __('Double authentication').ui_print_help_tip(__('If this option is enabled, the users can use double authentication with their accounts'), true); - $row['control'] = __('Yes').' '; - $row['control'] .= html_print_radio_button('double_auth_enabled', 1, '', $config['double_auth_enabled'], true); - $row['control'] .= '  '; - $row['control'] .= __('No').' '; - $row['control'] .= html_print_radio_button('double_auth_enabled', 0, '', $config['double_auth_enabled'], true); + $row['control'] = html_print_checkbox_toogle_switch('double_auth_enabled', 1, $config['double_auth_enabled'], true); $table->data['double_auth_enabled'] = $row; // Session timeout diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php index 5ef355b071..f51854a63c 100644 --- a/pandora_console/godmode/setup/setup_ehorus.php +++ b/pandora_console/godmode/setup/setup_ehorus.php @@ -48,8 +48,8 @@ $table_enable->style['name'] = 'font-weight: bold'; // Enable eHorus $row = []; $row['name'] = __('Enable eHorus'); -$row['control'] = __('Yes').' '.html_print_radio_button('ehorus_enabled', 1, '', $config['ehorus_enabled'], true).'  '; -$row['control'] .= __('No').' '.html_print_radio_button('ehorus_enabled', 0, '', $config['ehorus_enabled'], true); +$row['control'] = __('Enabled').' '.html_print_radio_button('ehorus_enabled', 1, '', $config['ehorus_enabled'], true).'  '; +$row['control'] .= __('Disabled').' '.html_print_radio_button('ehorus_enabled', 0, '', $config['ehorus_enabled'], true); $row['button'] = html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"', true); $table_enable->data['ehorus_enabled'] = $row; diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index ee924c9c27..8196d98873 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -82,16 +82,17 @@ $sources['sql'] = __('Database'); $table->data[9][1] = html_print_select($sources, 'timesource', $config['timesource'], '', '', '', true); $table->data[10][0] = __('Automatic check for updates'); -$table->data[10][1] = __('Yes').'   '.html_print_radio_button('autoupdate', 1, '', $config['autoupdate'], true).'  '; -$table->data[10][1] .= __('No').'   '.html_print_radio_button('autoupdate', 0, '', $config['autoupdate'], true); +$table->data[10][1] = html_print_checkbox_toogle_switch('autoupdate', 1, $config['autoupdate'], true); + +echo "'; $table->data[11][0] = __('Enforce https'); -$table->data[11][1] = __('Yes').'   '.html_print_radio_button_extended('https', 1, '', $config['https'], false, "if (! confirm ('".__('If SSL is not properly configured you will lose access to %s Console. Do you want to continue?', get_product_name())."')) return false", '', true).'  '; -$table->data[11][1] .= __('No').'   '.html_print_radio_button('https', 0, '', $config['https'], true); +$table->data[11][1] = html_print_checkbox_toogle_switch_extended('https', 1, $config['https'], false, '', '', true); $table->data[12][0] = __('Use cert of SSL'); -$table->data[12][1] = __('Yes').'   '.html_print_radio_button_extended('use_cert', 1, '', $config['use_cert'], false, '', '', true).'  '; -$table->data[12][1] .= __('No').'   '.html_print_radio_button('use_cert', 0, '', $config['use_cert'], true); +$table->data[12][1] = html_print_checkbox_toogle_switch_extended('use_cert', 1, $config['use_cert'], false, '', '', true); $table->rowstyle[13] = 'display: none;'; $table->data[13][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true); @@ -113,8 +114,7 @@ $table->data[16][0] = __('API password').ui_print_help_tip(__('Please be careful $table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true); $table->data[17][0] = __('Enable GIS features'); -$table->data[17][1] = __('Yes').'   '.html_print_radio_button('activate_gis', 1, '', $config['activate_gis'], true).'  '; -$table->data[17][1] .= __('No').'   '.html_print_radio_button('activate_gis', 0, '', $config['activate_gis'], true); +$table->data[17][1] = html_print_checkbox_toogle_switch('activate_gis', 1, $config['activate_gis'], true); $table->data[19][0] = __('Enable Netflow'); $rbt_disabled = false; @@ -123,8 +123,8 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { $table->data[19][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true); } -$table->data[19][1] = __('Yes').'   '.html_print_radio_button_extended('activate_netflow', 1, '', $config['activate_netflow'], $rbt_disabled, '', '', true).'  '; -$table->data[19][1] .= __('No').'   '.html_print_radio_button_extended('activate_netflow', 0, '', $config['activate_netflow'], $rbt_disabled, '', '', true); +$table->data[19][1] = html_print_checkbox_toogle_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true); + $zone_name = [ 'Africa' => __('Africa'), @@ -202,18 +202,15 @@ $table->data[28][1] = html_print_input_text('public_url', $config['public_url'], $table->data[29][0] = __('Referer security'); $table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true); -$table->data[29][1] = __('Yes').'   '.html_print_radio_button('referer_security', 1, '', $config['referer_security'], true).'  '; -$table->data[29][1] .= __('No').'   '.html_print_radio_button('referer_security', 0, '', $config['referer_security'], true); +$table->data[29][1] = html_print_checkbox_toogle_switch('referer_security', 1, $config['referer_security'], true); $table->data[30][0] = __('Event storm protection'); $table->data[30][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true); -$table->data[30][1] = __('Yes').'   '.html_print_radio_button('event_storm_protection', 1, '', $config['event_storm_protection'], true).'  '; -$table->data[30][1] .= __('No').'   '.html_print_radio_button('event_storm_protection', 0, '', $config['event_storm_protection'], true); +$table->data[30][1] = html_print_checkbox_toogle_switch('event_storm_protection', 1, $config['event_storm_protection'], true); $table->data[31][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true); -$table->data[31][1] = __('Yes').'   '.html_print_radio_button('command_snapshot', 1, '', $config['command_snapshot'], true).'  '; -$table->data[31][1] .= __('No').'   '.html_print_radio_button('command_snapshot', 0, '', $config['command_snapshot'], true); +$table->data[31][1] = html_print_checkbox_toogle_switch('command_snapshot', 1, $config['command_snapshot'], true); $table->data[32][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true); $table->data[32][1] = html_print_input_text( @@ -253,8 +250,7 @@ $table->data['tutorial_mode'][1] = html_print_select( $config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1; $table->data[34][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true); -$table->data[34][1] = __('Yes').'   '.html_print_radio_button('past_planned_downtimes', 1, '', $config['past_planned_downtimes'], true).'  '; -$table->data[34][1] .= __('No').'   '.html_print_radio_button('past_planned_downtimes', 0, '', $config['past_planned_downtimes'], true); +$table->data[34][1] = html_print_checkbox_toogle_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true); $table->data[35][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true); $table->data[35][1] = html_print_input_text( @@ -267,16 +263,13 @@ $table->data[35][1] = html_print_input_text( ); $table->data[36][0] = __('Include agents manually disabled'); -$table->data[36][1] = __('Yes').'   '.html_print_radio_button('include_agents', 1, '', $config['include_agents'], true).'  '; -$table->data[36][1] .= __('No').'   '.html_print_radio_button('include_agents', 0, '', $config['include_agents'], true); +$table->data[36][1] = html_print_checkbox_toogle_switch('include_agents', 1, $config['include_agents'], true); $table->data[37][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true); $table->data[37][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true); $table->data[38][0] = __('Set alias as name by default in agent creation'); -$table->data[38][1] = __('Yes').'   '.html_print_radio_button('alias_as_name', 1, '', $config['alias_as_name'], true).'  '; -$table->data[38][1] .= __('No').'   '.html_print_radio_button('alias_as_name', 0, '', $config['alias_as_name'], true); - +$table->data[38][1] = html_print_checkbox_toogle_switch('alias_as_name', 1, $config['alias_as_name'], true); echo '
'; echo '
'; @@ -340,15 +333,24 @@ $(document).ready (function () { $("#timezone").attr("hidden", false); }); $("input[name=use_cert]").change(function () { - if( $(this).is(":checked") ){ - var val = $(this).val(); - if (val == 1) { + if( $(this).is(":checked") ) $('#setup_general-13').show(); - } else $('#setup_general-13').hide(); - } + }); + $("input[name=https]").change(function (){ + if($("input[name=https]").prop('checked')) { + $("#dialog").css({'display': 'inline', 'font-weight': 'bold'}).dialog({ + modal: true, + buttons:{ + "": function(){ + $(this).dialog("close"); + } + } + }); + } + }) }); data[$row][1] = html_print_select($values, 'vc_refr', $config[ $row++; $table_behaviour->data[$row][0] = __('Paginated module view'); -$table_behaviour->data[$row][1] = html_print_checkbox( +$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( 'paginate_module', 1, $config['paginate_module'], @@ -84,7 +84,7 @@ $table_behaviour->data[$row][1] = html_print_checkbox( $row++; $table_behaviour->data[$row][0] = __('Display data of proc modules in other format'); -$table_behaviour->data[$row][1] = html_print_checkbox( +$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( 'render_proc', 1, $config['render_proc'], @@ -102,7 +102,7 @@ $row++; // Daniel maya 02/06/2016 Display menu with click --INI $table_behaviour->data[$row][0] = __('Click to display lateral menus').ui_print_help_tip(__('When enabled, the lateral menus are shown when left clicking them, instead of hovering over them'), true); -$table_behaviour->data[$row][1] = html_print_checkbox( +$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( 'click_display', 1, $config['click_display'], @@ -121,7 +121,7 @@ if (enterprise_installed()) { } $table_behaviour->data[$row][0] = __('Classic menu mode').ui_print_help_tip(__('Text menu options always visible, don\'t hide'), true); -$table_behaviour->data[$row][1] = html_print_checkbox( +$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch( 'classic_menu', 1, $config['classic_menu'], @@ -491,7 +491,7 @@ if (enterprise_installed()) { if (enterprise_installed()) { $table_styles->data[$row][0] = __('Disable logo in graphs'); - $table_styles->data[$row][1] = html_print_checkbox( + $table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'fixed_graph', 1, $config['fixed_graph'], @@ -507,7 +507,7 @@ if (enterprise_installed()) { */ $table_styles->data[$row][0] = __('Disable helps'); -$table_styles->data[$row][1] = html_print_checkbox( +$table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'disable_help', 1, $config['disable_help'], @@ -516,7 +516,7 @@ $table_styles->data[$row][1] = html_print_checkbox( $row++; $table_styles->data[$row][0] = __('Fixed header'); -$table_styles->data[$row][1] = html_print_checkbox( +$table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'fixed_header', 1, $config['fixed_header'], @@ -525,7 +525,7 @@ $table_styles->data[$row][1] = html_print_checkbox( $row++; $table_styles->data[$row][0] = __('Fixed menu'); -$table_styles->data[$row][1] = html_print_checkbox( +$table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'fixed_menu', 1, $config['fixed_menu'], @@ -535,7 +535,7 @@ $row++; // For 5.1 Autohidden menu feature $table_styles->data['autohidden'][0] = __('Autohidden menu'); -$table_styles->data['autohidden'][1] = html_print_checkbox( +$table_styles->data['autohidden'][1] = html_print_checkbox_toogle_switch( 'autohidden_menu', 1, $config['autohidden_menu'], @@ -543,13 +543,14 @@ $table_styles->data['autohidden'][1] = html_print_checkbox( ); $table_styles->data[$row][0] = __('Visual effects and animation'); -$table_styles->data[$row][1] = html_print_checkbox( +$table_styles->data[$row][1] = html_print_checkbox_toogle_switch( 'visual_animation', 1, $config['visual_animation'], true ); + echo '
'; echo ''.__('Style configuration').''; html_print_table($table_styles); @@ -566,7 +567,7 @@ $table_gis->size[0] = '50%'; $table_gis->data = []; $table_gis->data[$row][0] = __('GIS Labels').ui_print_help_tip(__('This enabling this, you get a label with agent name in GIS maps. If you have lots of agents in the map, will be unreadable. Disabled by default.'), true); -$table_gis->data[$row][1] = html_print_checkbox( +$table_gis->data[$row][1] = html_print_checkbox_toogle_switch( 'gis_label', 1, $config['gis_label'], @@ -679,7 +680,7 @@ $table_font->data[$row][1] = html_print_input_text( $row++; $table_font->data[$row][0] = __('Show unit along with value in reports').ui_print_help_tip(__('This enabling this, max, min and avg values will be shown with units.'), true); -$table_font->data[$row][1] = html_print_checkbox( +$table_font->data[$row][1] = html_print_checkbox_toogle_switch( 'simple_module_value', 1, $config['simple_module_value'], @@ -777,7 +778,7 @@ $table_chars->data[$row][1] = html_print_input_text( $row++; $table_chars->data[$row][0] = __('Use round corners'); -$table_chars->data[$row][1] = html_print_checkbox( +$table_chars->data[$row][1] = html_print_checkbox_toogle_switch( 'round_corner', 1, $config['round_corner'], @@ -946,7 +947,7 @@ $table_other->data[$row][0] = __('Show report info with description').ui_print_h __('Custom report description info. It will be applied to all reports and templates by default.'), true ); -$table_other->data[$row][1] = html_print_checkbox( +$table_other->data[$row][1] = html_print_checkbox_toogle_switch( 'custom_report_info', 1, $config['custom_report_info'], @@ -966,6 +967,7 @@ $table_other->data[$row][1] = html_print_checkbox( $config['custom_report_front'], true ); + $row++; // ---------------------------------------------------------------------- $dirItems = scandir($config['homedir'].'/images/custom_logo'); @@ -1059,7 +1061,7 @@ $table_other->data['custom_report_front-footer'][1] = html_print_textarea( $table_other->data[$row][0] = __('Show QR Code icon in the header'); -$table_other->data[$row][1] = html_print_checkbox( +$table_other->data[$row][1] = html_print_checkbox_toogle_switch( 'show_qr_code_header', 1, $config['show_qr_code_header'], @@ -1097,7 +1099,7 @@ $table_other->data[$row][0] .= ui_print_help_tip( __('Show the group name instead the group icon.'), true ); -$table_other->data[$row][1] = html_print_checkbox( +$table_other->data[$row][1] = html_print_checkbox_toogle_switch( 'show_group_name', 1, $config['show_group_name'], @@ -1440,6 +1442,7 @@ $(document).ready (function () { .prop('checked'); display_custom_report_front(custom_report,$(this).parent().parent().parent().parent().attr('id')); }); + $(".databox.filters").css('margin-bottom','-10px'); }); // Change the favicon preview when is changed diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php index ea946f23d6..3e807367bd 100644 --- a/pandora_console/godmode/update_manager/update_manager.online.php +++ b/pandora_console/godmode/update_manager/update_manager.online.php @@ -140,8 +140,8 @@ if ($enterprise == ENTERPRISE_NOT_HOOK) { ?>