From 023f15ba372c0c7d9d40a5b0d9ec0c139951a775 Mon Sep 17 00:00:00 2001 From: thom Date: Mon, 31 Aug 2020 20:34:10 +0200 Subject: [PATCH 1/2] Remove monitor key field (#3844) --- .../web/admin/form/system_config.tform.php | 6 - .../templates/system_config_misc_edit.htm | 429 +++++++++--------- 2 files changed, 227 insertions(+), 208 deletions(-) diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index 0e29902c33..d998c46015 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -595,12 +595,6 @@ $form["tabs"]['misc'] = array ( 'default' => 'http://www.ispconfig.org/atom', 'value' => '' ), - 'monitor_key' => array ( - 'datatype' => 'VARCHAR', - 'formtype' => 'TEXT', - 'default' => '', - 'value' => '' - ), 'tab_change_discard' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm index 31fafdc545..356d2e1b25 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -1,204 +1,229 @@ - -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} -
-
- -
- {tmpl_var name='tab_change_discard'} -
-
-
- -
- {tmpl_var name='tab_change_warning'}
{tmpl_var name='tab_change_warning_note_txt'} -
-
-
- -
- {tmpl_var name='use_loadindicator'}
{tmpl_var name='f5_to_reload_js_txt'} -
-
-
- -
- {tmpl_var name='use_combobox'}
{tmpl_var name='f5_to_reload_js_txt'} -
-
-
- -
-
- -
-
- -
-
- -
-
- -
- {tmpl_var name='session_allow_endless'} -
-
-
- -
-
- -
-
-
- -
-
-
- -
- {tmpl_var name='maintenance_mode'} -
-
-
- -
- -
-
- - -

- - -

- - - -
- - -
+ +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+ +
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+
+
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+
+
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+
+
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+
+
+ +
{tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"} +
+
+
+ +
+ {tmpl_var name='tab_change_discard'} +
+
+
+ +
+ {tmpl_var name='tab_change_warning'}
{tmpl_var name='tab_change_warning_note_txt'} +
+
+
+ +
+ {tmpl_var name='use_loadindicator'}
{tmpl_var name='f5_to_reload_js_txt'} +
+
+
+ +
+ {tmpl_var name='use_combobox'}
{tmpl_var name='f5_to_reload_js_txt'} +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+ {tmpl_var name='session_allow_endless'} +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+ {tmpl_var name='maintenance_mode'} +
+
+
+ +
+ +
+
+ +
+

+ +

+
+ + +
+

+ +

+
    + +
+
+ + +
+
+ + +
+
+ function delCustomLogo() { + var id = jQuery('input[name="id"]').val(); + + jQuery.getJSON('admin/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {'id': id, 'type': "delcustomlogo"}, function(data) { + //console.log(data); + $('#used_logo').html(defaultLogo); + $('#logo').css({ "background": "url("+data.data+") no-repeat", "width": data.width, "height": data.height }); + }); + } + + // Variable to store your files + var files; + // Add events + $('input[type="file"]').on('change', prepareUpload); + $('#start_upload').on('click', uploadFiles); + + // Grab the files and set them to our variable + function prepareUpload(event){ + files = event.target.files; + } + + // Catch the form submit and upload the files + function uploadFiles(event){ + event.stopPropagation(); // Stop stuff happening + event.preventDefault(); // Totally stop stuff happening + + var id = jQuery('input[name="id"]').val(); + + // Create a formdata object and add the files + var data = new FormData(); + $.each(files, function(key, value){ + data.append(key, value); + }); + + $.ajax({ + url: 'admin/ajax_get_json.php?id='+id+'&type=uploadfile', + type: 'POST', + data: data, + cache: false, + dataType: 'json', + processData: false, // Don't process the files + contentType: false, // Set content type to false as jQuery will tell the server its a query string request + success: function(data, textStatus, jqXHR){ + if(typeof data.error === 'undefined'){ + // Success so call function to process the form + //console.log(data); + $('#used_logo').html('  '); + $('#logo').css({ "background": "url("+data.data+") no-repeat", "width": data.width, "height": data.height }); + } else { + // Handle errors here + //console.log(data); + } + }, + error: function(jqXHR, textStatus, errorThrown){ + // Handle errors here + //console.log(data); + } + }); + } + + --> -- GitLab From b1b6e6062b515c3e8d83933b2da07db6a3e0eca9 Mon Sep 17 00:00:00 2001 From: thom Date: Thu, 3 Sep 2020 15:36:12 +0200 Subject: [PATCH 2/2] Remove ISPConfig monitor app code (#3844) --- install/tpl/system.ini.master | 1 - .../web/admin/lib/lang/ar_system_config.lng | 1 - .../web/admin/lib/lang/bg_system_config.lng | 1 - .../web/admin/lib/lang/br_system_config.lng | 1 - .../web/admin/lib/lang/ca_system_config.lng | 1 - .../web/admin/lib/lang/cz_system_config.lng | 1 - .../web/admin/lib/lang/de_system_config.lng | 1 - .../web/admin/lib/lang/dk_system_config.lng | 1 - .../web/admin/lib/lang/el_system_config.lng | 1 - .../web/admin/lib/lang/es_system_config.lng | 1 - .../web/admin/lib/lang/fi_system_config.lng | 1 - .../web/admin/lib/lang/fr_system_config.lng | 1 - .../web/admin/lib/lang/hr_system_config.lng | 1 - .../web/admin/lib/lang/hu_system_config.lng | 1 - .../web/admin/lib/lang/id_system_config.lng | 1 - .../web/admin/lib/lang/it_system_config.lng | 1 - .../web/admin/lib/lang/ja_system_config.lng | 1 - .../web/admin/lib/lang/nl_system_config.lng | 1 - .../web/admin/lib/lang/pl_system_config.lng | 1 - .../web/admin/lib/lang/pt_system_config.lng | 1 - .../web/admin/lib/lang/ro_system_config.lng | 1 - .../web/admin/lib/lang/ru_system_config.lng | 1 - .../web/admin/lib/lang/se_system_config.lng | 1 - .../web/admin/lib/lang/sk_system_config.lng | 1 - .../web/admin/lib/lang/tr_system_config.lng | 1 - interface/web/remote/monitor.php | 64 ------------------- 26 files changed, 89 deletions(-) delete mode 100644 interface/web/remote/monitor.php diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index ec6573d7b1..c42966a01c 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -52,7 +52,6 @@ custom_login_link= dashboard_atom_url_admin=https://www.ispconfig.org/atom dashboard_atom_url_reseller=https://www.ispconfig.org/atom dashboard_atom_url_client=https://www.ispconfig.org/atom -monitor_key= tab_change_discard=n tab_change_warning=n use_loadindicator=y diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 495da61225..6715b22bfc 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index 25ad5d2cc5..5511eb4a5a 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -19,7 +19,6 @@ $wb['new_domain_txt'] = 'HTML to create a new domain'; $wb['webdavuser_prefix_txt'] = 'Webdav user prefix'; $wb['webdavuser_prefix_error_regex'] = 'Неразрешени символи в името на webdav префикса.'; $wb['webftp_url_txt'] = 'WebFTP URL'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)'; $wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)'; $wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)'; diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index a680265116..a3748d5c44 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -38,7 +38,6 @@ $wb['use_domain_module_hint'] = 'Se você usar este módulo, os clientes podem s $wb['new_domain_txt'] = 'Código HTML para criar um novo domínio'; $wb['webftp_url_txt'] = 'URL do FTPweb'; $wb['admin_mail_txt'] = 'Administrador(es) de e-mails'; -$wb['monitor_key_txt'] = 'Palavras reservadas a monitorar'; $wb['admin_name_txt'] = 'Nome do administrador'; $wb['maintenance_mode_txt'] = 'Modo manutenção'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng index f40012120f..81c2241c59 100644 --- a/interface/web/admin/lib/lang/ca_system_config.lng +++ b/interface/web/admin/lib/lang/ca_system_config.lng @@ -38,7 +38,6 @@ $wb['use_domain_module_hint'] = 'If you use the domain limits, your customers ca $wb['new_domain_txt'] = 'HTML to create a new domain'; $wb['webftp_url_txt'] = 'WebFTP URL'; $wb['admin_mail_txt'] = 'Administrator\'s e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrator\'s name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index b7a7515403..45ddabf38d 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -28,7 +28,6 @@ $wb['admin_name_txt'] = 'Jméno Administrátora'; $wb['enable_custom_login_txt'] = 'Povolit vlastní přihlašovací jméno u e-mailové schránky'; $wb['mailmailinglist_link_txt'] = 'Ikonový odkaz na aplikaci E-mailových konferencí seznamu e-mailových konferencí'; $wb['mailmailinglist_url_txt'] = 'E-mailové konference URL'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['maintenance_mode_txt'] = 'Režim údržby'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; $wb['maintenance_mode_exclude_ips_error_isip'] = 'One or more invalid IP addresses in maintenance mode exclude list. Must be a list of comma-separated IPv4 and/or IPv6 addresses.'; diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 58575617ad..082c6fb3a1 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -35,7 +35,6 @@ $wb['enable_custom_login_txt'] = 'Abweichenden Login Namen erlauben'; $wb['mailmailinglist_link_txt'] = 'Link zur Mailingliste in der Mailinglisten Übersicht'; $wb['mailmailinglist_url_txt'] = 'Mailinglisten URL'; $wb['admin_mail_txt'] = 'Administrator E-Mail'; -$wb['monitor_key_txt'] = 'ISPConfig Monitor App Passwort'; $wb['admin_name_txt'] = 'Name des Administrators'; $wb['maintenance_mode_txt'] = 'Wartungsmodus'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng index 6801b566c9..ed6837aaf0 100644 --- a/interface/web/admin/lib/lang/dk_system_config.lng +++ b/interface/web/admin/lib/lang/dk_system_config.lng @@ -33,7 +33,6 @@ $wb['use_domain_module_hint'] = 'Hvis du bruger domæne grænser, kan dine kunde $wb['new_domain_txt'] = 'HTML for at oprette et nyt domæne'; $wb['webftp_url_txt'] = 'WebFTP URL'; $wb['admin_mail_txt'] = 'Administratorer e-mail'; -$wb['monitor_key_txt'] = 'Monitor nøgleord'; $wb['admin_name_txt'] = 'Administratorer navn'; $wb['maintenance_mode_txt'] = 'Vedligeholdelsestilstand'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index f324e335b3..54f8c49712 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Αποδοχή προσαρμοσμένου $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'URL της Mailing list '; $wb['admin_mail_txt'] = 'e-mail Διαχειριστών'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Όνομα Administrator'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index 4eeaa9abe9..fce27f40a3 100644 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -45,7 +45,6 @@ $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; $wb['maintenance_mode_exclude_ips_error_isip'] = 'One or more invalid IP addresses in maintenance mode exclude list. Must be a list of comma-separated IPv4 and/or IPv6 addresses.'; $wb['min_password_length_txt'] = 'Longitud mínima de la contraseña'; $wb['min_password_strength_txt'] = 'Fortaleza mínima de la contraseña'; -$wb['monitor_key_txt'] = 'Palabra clave del Monitor'; $wb['new_domain_txt'] = 'HTML para la creación de nuevos dominios'; $wb['No'] = 'No'; $wb['phpmyadmin_url_error_regex'] = 'URL inválida a phpMyAdmin'; diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index 831eee9ff6..fbf2f67db1 100644 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index a5270b879f..56d1b239f5 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -27,7 +27,6 @@ $wb['use_domain_module_hint'] = 'Si vous utilisez ce module, vos utilisateurs pe $wb['new_domain_txt'] = 'HTML pour créer un nouveau domaine'; $wb['webftp_url_txt'] = 'URL du WebFTP'; $wb['admin_mail_txt'] = 'E-mail de l’administrateur'; -$wb['monitor_key_txt'] = 'Mot-clé du moniteur'; $wb['admin_name_txt'] = 'Nom des administrateurs'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index 220ca7e90c..cd39670674 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -20,7 +20,6 @@ $wb['use_domain_module_txt'] = 'Koristi modul Domene za dodavanje novih domena'; $wb['use_domain_module_hint'] = 'Ukoliko koristite ovaj modul, vaši klijenti mogu izabrati samo domenu koju im je admin kreirao. Klijenti ne mogu slobodno mijenjati postavke domene. Morate se ponovno logirati nakon mijenjanja ove postavke da bi promjene bile vidljive.'; $wb['new_domain_txt'] = 'HTML za kreiranje nove domene'; $wb['webftp_url_txt'] = 'WebFTP URL'; -$wb['monitor_key_txt'] = 'Monitoriranje riječi'; $wb['dashboard_atom_url_admin_txt'] = 'RSS URL za početnu stranicu (admin)'; $wb['dashboard_atom_url_reseller_txt'] = 'RSS URL za početnu stranicu (reseller)'; $wb['dashboard_atom_url_client_txt'] = 'RSS URL za početnu stranicu (client)'; diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index 0069f31c07..c5484c67d1 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -28,7 +28,6 @@ $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; $wb['admin_name_txt'] = 'Administrators name'; $wb['enable_custom_login_txt'] = 'Allow custom login name'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; $wb['maintenance_mode_exclude_ips_error_isip'] = 'One or more invalid IP addresses in maintenance mode exclude list. Must be a list of comma-separated IPv4 and/or IPv6 addresses.'; diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index 539699da88..b0808f8835 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 0c20959df2..98be8b9a0b 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -20,7 +20,6 @@ $wb['new_domain_txt'] = 'HTML to create a new domain'; $wb['webdavuser_prefix_txt'] = 'Webdav user prefix'; $wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.'; $wb['webftp_url_txt'] = 'WebFTP URL'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)'; $wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)'; $wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)'; diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index f6b5c9e1a5..c629f7cf92 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 19eae464a3..88dce5ac51 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -30,7 +30,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index f44853ccb2..184991d794 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -26,7 +26,6 @@ $wb['enable_custom_login_txt'] = 'Zezwalaj na dowolną nazwę loginu'; $wb['mailmailinglist_link_txt'] = 'Link do listy mailingowej na liście list mailingowych'; $wb['mailmailinglist_url_txt'] = 'URL listy mailingowej'; $wb['admin_mail_txt'] = 'E-Mail administratora'; -$wb['monitor_key_txt'] = 'Klucz monitora'; $wb['admin_name_txt'] = 'Nazwa administratora'; $wb['system_config_desc_txt'] = ''; $wb['smtp_missing_admin_mail_txt'] = 'Podaj nazwę administratora oraz adres email jeżeli chcesz użyć wysyłanie maili przez SMTP.'; diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index bbfedbf3a4..31b3163807 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index a7756c737d..d6f6c6e683 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index 37d9c263ab..4505ca2089 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -20,7 +20,6 @@ $wb['new_domain_txt'] = 'HTML текст, чтобы создать новый $wb['webdavuser_prefix_txt'] = 'Префикс пользователя WebDAV'; $wb['webdavuser_prefix_error_regex'] = 'Некорректный символ в префиксе пользователя WebDAV.'; $wb['webftp_url_txt'] = 'URL WebFTP'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)'; $wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)'; $wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)'; diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index 6768bc4118..3d29084a09 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Tillåt valfritt inloggningsnamn'; $wb['mailmailinglist_link_txt'] = 'Länka till epostlista i listan över epostlistor'; $wb['mailmailinglist_url_txt'] = 'Adress till epostlista'; $wb['admin_mail_txt'] = 'Administratörens epostadress'; -$wb['monitor_key_txt'] = 'Bevakning nyckelord'; $wb['admin_name_txt'] = 'Administratörens namn'; $wb['maintenance_mode_txt'] = 'Underhållsläge'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index 85a96bf5bf..54edd2de4a 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -27,7 +27,6 @@ $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; $wb['admin_mail_txt'] = 'Administrators e-mail'; -$wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; $wb['maintenance_mode_txt'] = 'Maintenance Mode'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index b4cb7c8d11..ad9c01bc58 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -38,7 +38,6 @@ $wb['use_domain_module_hint'] = 'Bu modül kullanıldığında, müşteriler yal $wb['new_domain_txt'] = 'Yeni etki alanı oluşturma HTML kodu'; $wb['webftp_url_txt'] = 'WebFTP Adresi'; $wb['admin_mail_txt'] = 'Yönetici E-posta Adresi'; -$wb['monitor_key_txt'] = 'İzlenecek Kelime'; $wb['admin_name_txt'] = 'Yönetici Adı'; $wb['maintenance_mode_txt'] = 'Bakım Kipi'; $wb['maintenance_mode_exclude_ips_txt'] = 'Exclude IP\'s from maintenance'; diff --git a/interface/web/remote/monitor.php b/interface/web/remote/monitor.php deleted file mode 100644 index 914a09382e..0000000000 --- a/interface/web/remote/monitor.php +++ /dev/null @@ -1,64 +0,0 @@ -error('This function is disabled in demo mode.'); - -header('Content-Type: application/json; charset=utf-8'); -header('Access-Control-Allow-Origin: *'); -header('Access-Control-Allow-Headers: X-Requested-With'); -header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 -header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - -$type = addslashes($_GET['type']); -$token = addslashes($_GET['token']); -$server_id = $app->functions->intval($_GET['server']); - -$app->uses('getconf'); -$interface_config = $app->getconf->get_global_config('misc'); -$secret = $interface_config['monitor_key']; - -$out = array(); - -if($token == '' or $secret == '' or $token != $secret) { - $out['state'] = 'syserror'; - $out['data'] = 'Password empty or incorrect.'; - $out['time'] = date('Y-m-d H:i'); -} else { - if($type == 'serverlist') { - $sql = 'SELECT server_id, server_name FROM server WHERE 1 ORDER BY server_id'; - $records = $app->db->queryAllRecords($sql); - foreach($records as $index => $rec) { - $rec = $app->db->queryOneRecord("SELECT * FROM monitor_data WHERE server_id = ? AND state NOT IN ('ok', 'no_state', 'info')", $rec['server_id']); - if($rec) $records[$index]['state'] = 'warn'; - else $records[$index]['state'] = 'ok'; - } - $out['state'] = 'ok'; - $out['data'] = $records; - $out['time'] = date('Y-m-d H:i', $rec['created']); - } else { - $rec = $app->db->queryOneRecord("SELECT * FROM monitor_data WHERE type = ? AND server_id = ?", $type, $server_id); - if(is_array($rec)) { - $out['state'] = $rec['state']; - $out['data'] = unserialize(stripslashes($rec['data'])); - if(is_array($out['data']) && sizeof($out['data']) > 0){ - foreach($out['data'] as $key => $val){ - if(!$val) $out['data'][$key] = " "; - } - } - $out['time'] = date('Y-m-d H:i', $rec['created']); - } else { - $out['state'] = 'syserror'; - $out['data'] = 'No monitor record found.'; - $out['time'] = date('Y-m-d H:i'); - } - $sql = 'SELECT server_id, server_name FROM server WHERE 1 ORDER BY server_id'; - $records = $app->db->queryAllRecords($sql); - $out['serverlist'] = $records; - } -} -$out['type'] = $type; -echo json_encode($out); -exit; -?> -- GitLab