From e55b1f86dc5c792b5fb0d9f64be422c20e74e000 Mon Sep 17 00:00:00 2001 From: Jesse Norell Date: Thu, 8 Oct 2020 15:44:50 -0600 Subject: [PATCH 1/3] port !751 to develop: better ip suggestions --- install/tpl/system.ini.master | 2 + interface/lib/classes/functions.inc.php | 50 +++++++++++++++---- .../web/admin/form/system_config.tform.php | 14 ++++++ .../web/admin/lib/lang/ar_system_config.lng | 4 +- .../web/admin/lib/lang/bg_system_config.lng | 4 +- .../web/admin/lib/lang/br_system_config.lng | 3 ++ .../web/admin/lib/lang/ca_system_config.lng | 4 +- .../web/admin/lib/lang/cz_system_config.lng | 3 ++ .../web/admin/lib/lang/de_system_config.lng | 4 +- .../web/admin/lib/lang/dk_system_config.lng | 4 +- .../web/admin/lib/lang/el_system_config.lng | 4 +- .../web/admin/lib/lang/en_system_config.lng | 4 +- .../web/admin/lib/lang/es_system_config.lng | 4 +- .../web/admin/lib/lang/fi_system_config.lng | 4 +- .../web/admin/lib/lang/fr_system_config.lng | 4 +- .../web/admin/lib/lang/hr_system_config.lng | 4 +- .../web/admin/lib/lang/hu_system_config.lng | 4 +- .../web/admin/lib/lang/id_system_config.lng | 4 +- .../web/admin/lib/lang/it_system_config.lng | 4 +- .../web/admin/lib/lang/ja_system_config.lng | 4 +- .../web/admin/lib/lang/nl_system_config.lng | 4 +- .../web/admin/lib/lang/pl_system_config.lng | 4 +- .../web/admin/lib/lang/pt_system_config.lng | 4 +- .../web/admin/lib/lang/ro_system_config.lng | 4 +- .../web/admin/lib/lang/ru_system_config.lng | 4 +- .../web/admin/lib/lang/se_system_config.lng | 4 +- .../web/admin/lib/lang/sk_system_config.lng | 4 +- .../web/admin/lib/lang/tr_system_config.lng | 4 +- .../templates/system_config_misc_edit.htm | 10 ++++ .../lib/lang/ar_web_sites_stats_list.lng | 3 +- .../lib/lang/bg_web_sites_stats_list.lng | 3 +- .../lib/lang/br_web_sites_stats_list.lng | 2 + .../lib/lang/ca_web_sites_stats_list.lng | 3 +- .../lib/lang/cz_web_sites_stats_list.lng | 2 + .../lib/lang/de_web_sites_stats_list.lng | 3 +- .../lib/lang/dk_web_sites_stats_list.lng | 3 +- .../lib/lang/el_web_sites_stats_list.lng | 3 +- .../lib/lang/es_web_sites_stats_list.lng | 3 +- .../lib/lang/fi_web_sites_stats_list.lng | 3 +- .../lib/lang/fr_web_sites_stats_list.lng | 3 +- .../lib/lang/hr_web_sites_stats_list.lng | 3 +- .../lib/lang/hu_web_sites_stats_list.lng | 3 +- .../lib/lang/id_web_sites_stats_list.lng | 3 +- .../lib/lang/it_web_sites_stats_list.lng | 3 +- .../lib/lang/ja_web_sites_stats_list.lng | 3 +- .../lib/lang/nl_web_sites_stats_list.lng | 1 - .../lib/lang/pl_web_sites_stats_list.lng | 3 +- .../lib/lang/pt_web_sites_stats_list.lng | 3 +- .../lib/lang/ro_web_sites_stats_list.lng | 3 +- .../lib/lang/ru_web_sites_stats_list.lng | 3 +- .../lib/lang/se_web_sites_stats_list.lng | 3 +- .../lib/lang/sk_web_sites_stats_list.lng | 3 +- .../lib/lang/tr_web_sites_stats_list.lng | 3 +- .../default/assets/stylesheets/ispconfig.css | 3 ++ 54 files changed, 189 insertions(+), 56 deletions(-) diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index bbd78e6b3a..f76a7cc863 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -57,6 +57,8 @@ tab_change_warning=n use_loadindicator=y use_combobox=y show_support_messages=y +use_ipsuggestions=y +ipsuggestions_max=50 maintenance_mode=n maintenance_mode_exclude_ips= admin_dashlets_left= diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index 4d4c011fb5..cb61cb8549 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -186,11 +186,23 @@ class functions { } } + /** + * Function to suggest IP addresses in selectbox with hints, limited to the client logged in. + * + * @access public + * @param string $type (default: 'IPv4') + * @return void + */ public function suggest_ips($type = 'IPv4'){ global $app; + $use_suggestions = $app->getconf->get_global_config('misc')['use_ipsuggestions'] == 'n' ? false : true; + if(!$use_suggestions) {return array('cheader' => array(), 'cdata' => array());} + + $suggestions_max = $app->getconf->get_global_config('misc')['ipsuggestions_max']; + $groupid = intval($_SESSION["s"]["user"]["default_group"]); + if($type == 'IPv4'){ -// $regex = "/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/"; $regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"; } else { // IPv6 @@ -202,58 +214,74 @@ class functions { $servers = $app->db->queryAllRecords("SELECT * FROM server"); if(is_array($servers) && !empty($servers)){ foreach($servers as $server){ - $server_by_id[$server['server_id']] = $server['server_name']; + $server_by_id[$server['server_id']] = 'server: ' . $server['server_name'] . ''; } } + $localips = array(); $ips = array(); $results = $app->db->queryAllRecords("SELECT ip_address AS ip, server_id FROM server_ip WHERE ip_type = ?", $type); if(!empty($results) && is_array($results)){ foreach($results as $result){ if(preg_match($regex, $result['ip'])){ - $ips[] = $result['ip']; + $localips[] = $result['ip']; $server_by_ip[$result['ip']] = $server_by_id[$result['server_id']]; } } } + $results = $app->db->queryAllRecords("SELECT ip_address AS ip FROM openvz_ip"); if(!empty($results) && is_array($results)){ foreach($results as $result){ if(preg_match($regex, $result['ip'])) $ips[] = $result['ip']; } } - $results = $app->db->queryAllRecords("SELECT data AS ip FROM dns_rr WHERE type = 'A' OR type = 'AAAA'"); + + $results = $groupid != 1 ? $app->db->queryAllRecords("SELECT rr.data AS server_ip, rr.name as server_name, soa.origin as domain FROM dns_rr as rr, dns_soa as soa WHERE (rr.type = 'A' OR rr.type = 'AAAA') AND soa.id = rr.zone AND rr.sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT rr.data AS server_ip, rr.name as server_name, soa.origin as domain FROM dns_rr as rr, dns_soa as soa WHERE (rr.type = 'A' OR rr.type = 'AAAA') AND soa.id = rr.zone"); if(!empty($results) && is_array($results)){ foreach($results as $result){ - if(preg_match($regex, $result['ip'])) $ips[] = $result['ip']; + $result['server_name'] = substr($result['server_name'], -1) == '.' ? $result['server_name'] : $result['server_name'] . '.' . $result['domain']; + if (!array_key_exists($result['server_ip'],$server_by_ip)) { + $server_by_ip[$result['server_ip']] = 'dns: ' . $result['server_name']; + if(preg_match($regex, $result['server_ip'])) $ips[] = $result['server_ip']; + } } } - $results = $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave"); + + $results = $groupid != 1 ? $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave WHERE sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT ns AS ip FROM dns_slave"); if(!empty($results) && is_array($results)){ foreach($results as $result){ - if(preg_match($regex, $result['ip'])) $ips[] = $result['ip']; + if (!array_key_exists($result['ip'],$server_by_ip)) { + if(preg_match($regex, $result['ip'])) $ips[] = $result['ip']; + } } } - $results = $app->db->queryAllRecords("SELECT remote_ips FROM web_database WHERE remote_ips != ''"); + $results = $groupid != 1 ? $app->db->queryAllRecords("SELECT database_name as name,remote_ips as ip FROM web_database WHERE remote_ips != '' AND sys_groupid = ?", $groupid) : $results = $app->db->queryAllRecords("SELECT database_name as name,remote_ips as ip FROM web_database WHERE remote_ips != ''"); if(!empty($results) && is_array($results)){ foreach($results as $result){ - $tmp_ips = explode(',', $result['remote_ips']); + $tmp_ips = explode(',', $result['ip']); foreach($tmp_ips as $tmp_ip){ $tmp_ip = trim($tmp_ip); - if(preg_match($regex, $tmp_ip)) $ips[] = $tmp_ip; + if (!array_key_exists($tmp_ip,$server_by_ip)) { + $server_by_ip[$tmp_ip] = 'database: ' . $result['name']; + if(preg_match($regex, $tmp_ip)) $ips[] = $tmp_ip; + } } } } $ips = array_unique($ips); + sort($localips, SORT_NUMERIC); sort($ips, SORT_NUMERIC); + $ips = array_merge($localips,$ips); + $ips = array_slice($ips, 0, $suggestions_max); $result_array = array('cheader' => array(), 'cdata' => array()); if(!empty($ips)){ $result_array['cheader'] = array('title' => 'IPs', 'total' => count($ips), - 'limit' => count($ips) + 'limit' => count($ips), ); foreach($ips as $ip){ diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index bbfb921e9a..c48ebd41b8 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -637,6 +637,20 @@ $form["tabs"]['misc'] = array ( 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), + 'use_ipsuggestions' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), + 'ipsuggestions_max' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'default' => '50', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), 'maintenance_mode' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 7d3df7fbf8..515f3ce7a8 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index f99465e1b6..23b5d1fdeb 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index 58ffca080b..abcafab6b8 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -104,3 +104,6 @@ $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; $wb['monitor_key_txt'] = 'Senha do Monitor'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng index d8bc0e2d48..e286504acd 100644 --- a/interface/web/admin/lib/lang/ca_system_config.lng +++ b/interface/web/admin/lib/lang/ca_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index 7db312097c..07f74d739c 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -97,6 +97,9 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktivní'; $wb['btn_save_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zrušit'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 4a862a2d4a..99de96b33b 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktiv'; $wb['btn_save_txt'] = 'Speichern'; $wb['btn_cancel_txt'] = 'Abbrechen'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Nur Apache)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng index eb96004421..5bc359d996 100644 --- a/interface/web/admin/lib/lang/dk_system_config.lng +++ b/interface/web/admin/lib/lang/dk_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index 68e10e37fc..ffcf5be89f 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 4493913fb0..66a998679e 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -101,10 +101,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Active'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index a001999dd4..9c581eeb06 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index eb7863fd53..b2647a0412 100644 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index cfecf8e27f..9cc2965aba 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 3f6486ae53..da87058859 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index 6b1a29ee46..1d2eea91b1 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index f034f9bd76..06075f56cd 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 42f878a54d..554d545246 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index f50ffb5114..f9d501e2ac 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 4078be986e..c1e3614b4f 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'IP adres suggesties inschakelen'; +$wb['use_ipsuggestions_descr_txt'] = 'Toont een dropdown box met een lijst van IP adressen voor IPv4 en IPv6 adressen.'; +$wb['ipsuggestions_max_txt'] = 'Max aantal IP suggesties'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index c94313bdcb..819092ed51 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index 39e4dc93f2..3844a8fd2f 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index 2b819a013e..25f508a0b3 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index 3aee07ff2e..fc83f5855b 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index d075f87509..247a35a384 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index ef4cc3fef9..96491e70d6 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -97,10 +97,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Aktive'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index 3bb9c82b0a..6ab500bd60 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -100,10 +100,12 @@ $wb['ca_iodef_txt'] = 'iodef'; $wb['active_txt'] = 'Active'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; +$wb['use_ipsuggestions_txt'] = 'Enable IP suggestions dropdown'; +$wb['use_ipsuggestions_descr_txt'] = 'Shows a dropdown list of IP addresses below a field where an IP address is needed for both IPv4 and IPv6.'; +$wb['ipsuggestions_max_txt'] = 'Max IP suggestions'; $wb['web_php_options_txt'] = 'PHP Handler (Apache only)'; $wb['client_protection_txt'] = 'Client protection'; $wb['show_support_messages_txt'] = 'Show message function in help module'; $wb['show_aps_menu_txt'] = 'Show APS menu'; $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.'; $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.'; -?> diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm index 5c57eeb9a6..9c4e5fdb22 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -90,6 +90,16 @@ {tmpl_var name='show_support_messages'} +
+ +
+ {tmpl_var name='use_ipsuggestions'}
{tmpl_var name='use_ipsuggestions_descr_txt'} +
+
+
+ +
+
diff --git a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng index 28d4e1fbdb..4c66bc29ea 100644 --- a/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/ar_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month'; $wb['this_year_txt'] = 'This year'; $wb['last_year_txt'] = 'Last year'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng index 28d4e1fbdb..4c66bc29ea 100644 --- a/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/bg_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month'; $wb['this_year_txt'] = 'This year'; $wb['last_year_txt'] = 'Last year'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng index 382e75f68d..a10c1222a8 100644 --- a/interface/web/sites/lib/lang/br_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/br_web_sites_stats_list.lng @@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Último mês'; $wb['this_year_txt'] = 'Este ano'; $wb['last_year_txt'] = 'Último ano'; $wb['sum_txt'] = 'Soma'; +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng index 553fa01e51..f7b14e367d 100644 --- a/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Le mois précédent'; $wb['this_year_txt'] = 'L\'année en cours'; $wb['last_year_txt'] = 'L\'année précédente'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng index 7f1812ba34..c710efe322 100644 --- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng @@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Minulý měsíc'; $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; $wb['sum_txt'] = 'Součet'; +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng index c834793ce1..edea20e6ae 100644 --- a/interface/web/sites/lib/lang/de_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/de_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Vergangener Monat'; $wb['this_year_txt'] = 'Aktuelles Jahr'; $wb['last_year_txt'] = 'Vergangenes Jahr'; $wb['sum_txt'] = 'Summe'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng b/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng index 7d5e6c0dbb..7114dd96b5 100644 --- a/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/dk_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Forrige måned'; $wb['this_year_txt'] = 'Dette år'; $wb['last_year_txt'] = 'Forrige år'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng index 9916646017..ee0b9db81d 100644 --- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Το τελευταίο μήνα'; $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng index f952a8258d..0977007c1f 100644 --- a/interface/web/sites/lib/lang/es_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/es_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Último mes'; $wb['this_year_txt'] = 'Este año'; $wb['last_year_txt'] = 'Último año'; $wb['sum_txt'] = 'Resumen'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng index d8b0eb377a..5f60db510f 100644 --- a/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/fi_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Viime kuussa'; $wb['this_year_txt'] = 'Tänä vuonna'; $wb['last_year_txt'] = 'Viime vuonna'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng index 09d5e16570..77494457fe 100644 --- a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Le mois précédent'; $wb['this_year_txt'] = 'L’année en cours'; $wb['last_year_txt'] = 'L’année précédente'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng index a89fc20e10..9aa7180c9f 100644 --- a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Prošli mjesec'; $wb['this_year_txt'] = 'Ovu godinu'; $wb['last_year_txt'] = 'Prošlu godinu'; $wb['sum_txt'] = 'Ukupno'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng index 99c5c0a531..7b6e74fe92 100644 --- a/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/hu_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Előző hónapban'; $wb['this_year_txt'] = 'Ebben az évben'; $wb['last_year_txt'] = 'Előző évben'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng index 8fcf2bd62f..50e480c7f8 100644 --- a/interface/web/sites/lib/lang/id_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/id_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Sebulan terakhir'; $wb['this_year_txt'] = 'Tahun ini'; $wb['last_year_txt'] = 'Setahun terakhir'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng index e2eb5d0deb..dbb1107659 100644 --- a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Mese precedente'; $wb['this_year_txt'] = 'Anno in corso'; $wb['last_year_txt'] = 'Anno precedente'; $wb['sum_txt'] = 'Somma'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng index f0fc5fcfb1..89695e011c 100644 --- a/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/ja_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = '先月'; $wb['this_year_txt'] = '今年'; $wb['last_year_txt'] = '去年'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng index fa5568418c..910ed2d538 100644 --- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng @@ -8,4 +8,3 @@ $wb['last_year_txt'] = 'Vorig jaar'; $wb['sum_txt'] = 'Som'; $wb['percentage_txt'] = 'In gebruik %'; $wb['quota_txt'] = 'Quota'; -?> diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng index 29985f02f0..21043a7dfc 100644 --- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Ostatni miesiąc'; $wb['this_year_txt'] = 'Ten rok'; $wb['last_year_txt'] = 'Ostatni rok'; $wb['sum_txt'] = 'Razem'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng index acc22859be..c4c6102876 100644 --- a/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/pt_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Último mês'; $wb['this_year_txt'] = 'Este ano'; $wb['last_year_txt'] = 'Último ano'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng index 28d4e1fbdb..4c66bc29ea 100644 --- a/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/ro_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Last month'; $wb['this_year_txt'] = 'This year'; $wb['last_year_txt'] = 'Last year'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng index 84aa99119e..a941727ef7 100644 --- a/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/ru_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Последний месяц'; $wb['this_year_txt'] = 'Этот год'; $wb['last_year_txt'] = 'Последний год'; $wb['sum_txt'] = 'Итого'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng index 95a82568ed..d1e5c01b3e 100644 --- a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Föregående månad'; $wb['this_year_txt'] = 'I år'; $wb['last_year_txt'] = 'Förra året'; $wb['sum_txt'] = 'Total'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng index 80f9585a08..0f1a7d56ef 100644 --- a/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/sk_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Minulý mesiac'; $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; $wb['sum_txt'] = 'Sum'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng index 685fc22fc6..0819dfc35f 100644 --- a/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/tr_web_sites_stats_list.lng @@ -6,4 +6,5 @@ $wb['last_month_txt'] = 'Geçen ay'; $wb['this_year_txt'] = 'Bu yıl'; $wb['last_year_txt'] = 'Geçen yıl'; $wb['sum_txt'] = 'Toplam'; -?> +$wb['percentage_txt'] = 'In use %'; +$wb['quota_txt'] = 'Quota'; diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 9d44048e82..2796bd16b9 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -836,3 +836,6 @@ span.tmp_account_name { #apache_directives, #nginx_directives, #proxy_directives { font-family: Consolas, "Courier New", Courier, monospace; } +.ip_suggestion_server { + font-weight: bold; +} -- GitLab From 754f35fbf556c5fd09a9f614d7cb3ff33e76593c Mon Sep 17 00:00:00 2001 From: Jesse Norell Date: Thu, 10 Dec 2020 16:00:46 -0700 Subject: [PATCH 2/3] disable autocomplete of ip field in dns wizard --- interface/web/dns/templates/dns_wizard.htm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 07d064c161..e6301313c9 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -76,13 +76,13 @@
-
+
-
+
-- GitLab From a3957d7f520f90bc0787038228fd0fcecb0992c8 Mon Sep 17 00:00:00 2001 From: Jesse Norell Date: Thu, 10 Dec 2020 16:53:22 -0700 Subject: [PATCH 3/3] fix or hide "no results" text, and disable autocomplete in dns slave zone --- interface/lib/classes/functions.inc.php | 3 +++ interface/web/dns/templates/dns_a_edit.htm | 5 ++-- interface/web/dns/templates/dns_aaaa_edit.htm | 4 +-- .../web/dns/templates/dns_slave_edit.htm | 12 ++++----- interface/web/dns/templates/dns_soa_edit.htm | 8 +++--- interface/web/dns/templates/dns_wizard.htm | 10 +++----- interface/web/js/jquery.ispconfigsearch.js | 25 +++++++++++-------- .../web/sites/templates/database_edit.htm | 5 ++-- .../web/themes/default/templates/main.tpl.htm | 2 +- 9 files changed, 39 insertions(+), 35 deletions(-) diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php index cb61cb8549..803be62d5f 100644 --- a/interface/lib/classes/functions.inc.php +++ b/interface/lib/classes/functions.inc.php @@ -202,6 +202,9 @@ class functions { $suggestions_max = $app->getconf->get_global_config('misc')['ipsuggestions_max']; $groupid = intval($_SESSION["s"]["user"]["default_group"]); + // todo: order search results intelligently + // todo: read "context" from uri and search accordingly + if($type == 'IPv4'){ $regex = "/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"; } else { diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm index 592999de7e..09637cc6ee 100644 --- a/interface/web/dns/templates/dns_a_edit.htm +++ b/interface/web/dns/templates/dns_a_edit.htm @@ -26,11 +26,12 @@