From 22cc9d84db4c6e34a9eb7e5a72351278eca403e9 Mon Sep 17 00:00:00 2001 From: ftimme Date: Wed, 28 Sep 2011 14:23:28 +0000 Subject: [PATCH] - Updated various language files. --- interface/web/tools/dns_resync.php | 4 +++- interface/web/tools/index.php | 2 +- interface/web/tools/lib/lang/de.lng | 1 + interface/web/tools/lib/lang/de_usersettings.lng | 6 +++--- interface/web/tools/lib/lang/en.lng | 1 + interface/web/tools/lib/lang/en_usersettings.lng | 2 +- interface/web/tools/templates/dns_resync.htm | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/interface/web/tools/dns_resync.php b/interface/web/tools/dns_resync.php index aed2f4e7c..c80735df3 100644 --- a/interface/web/tools/dns_resync.php +++ b/interface/web/tools/dns_resync.php @@ -46,7 +46,7 @@ $error = ''; // Resyncing dns zones if(isset($_POST['resync']) && $_POST['resync'] == 1) { $zones = $app->db->queryAllRecords("SELECT id,origin,serial FROM dns_soa WHERE active = 'Y'"); - if(is_array($zones)) { + if(is_array($zones) && !empty($zones)) { foreach($zones as $zone) { $records = $app->db->queryAllRecords("SELECT id,serial FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'"); if(is_array($records)) { @@ -60,6 +60,8 @@ if(isset($_POST['resync']) && $_POST['resync'] == 1) { $app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $zone['id']); $msg .= "Resynced: ".$zone['origin'].'
'; } + } else { + $error .= "No zones found to sync.
"; } } diff --git a/interface/web/tools/index.php b/interface/web/tools/index.php index b17b83bf6..ac064f649 100644 --- a/interface/web/tools/index.php +++ b/interface/web/tools/index.php @@ -45,6 +45,6 @@ require_once('../../lib/app.inc.php'); //* Check permissions for module $app->auth->check_module_permissions('tools'); -echo '

'.$app->lng('ISPConfig Tools').'

'; +echo '

'.$app->lng('ISPConfig Tools').'

'.$app->lng('ispconfig_tools_note').'

'; ?> \ No newline at end of file diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng index 2b2b61006..deb9fe144 100644 --- a/interface/web/tools/lib/lang/de.lng +++ b/interface/web/tools/lib/lang/de.lng @@ -3,4 +3,5 @@ $wb['User Settings'] = 'Benutzereinstellungen'; $wb['Settings'] = 'Einstellungen'; $wb['ISPConfig Tools'] = 'Einstellungen'; $wb['Password and Language'] = 'Passwort und Sprache'; +$wb['ispconfig_tools_note'] = 'Dieses Modul erlaubt Ihnen, das Passwort und die Sprache zu ändern sowie einen Resync der DNS-Records anzustoßen.'; ?> diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng index 1791b71de..d52f8e8c7 100644 --- a/interface/web/tools/lib/lang/de_usersettings.lng +++ b/interface/web/tools/lib/lang/de_usersettings.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/tools/lib/lang/en.lng b/interface/web/tools/lib/lang/en.lng index 0c5b151be..abf0ecf7d 100644 --- a/interface/web/tools/lib/lang/en.lng +++ b/interface/web/tools/lib/lang/en.lng @@ -3,4 +3,5 @@ $wb['User Settings'] = 'User Settings'; $wb['Settings'] = 'Settings'; $wb['ISPConfig Tools'] = 'ISPConfig Tools'; $wb['Password and Language'] = 'Password and Language'; +$wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; ?> \ No newline at end of file diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng index 4169e8cce..bfe487113 100644 --- a/interface/web/tools/lib/lang/en_usersettings.lng +++ b/interface/web/tools/lib/lang/en_usersettings.lng @@ -3,6 +3,6 @@ $wb["passwort_txt"] = 'Password'; $wb["password_strength_txt"] = 'Password strength'; $wb["language_txt"] = 'Language'; $wb["password_mismatch"] = 'The password in the second password field does not match the first password.'; -$wb["Form to edit the user password and language."] = 'Form to edit the user password, language, and authentication.'; +$wb["Form to edit the user password and language."] = 'Form to edit the user password and language.'; $wb["Settings"] = 'Settings'; ?> diff --git a/interface/web/tools/templates/dns_resync.htm b/interface/web/tools/templates/dns_resync.htm index 990e94849..372206af9 100644 --- a/interface/web/tools/templates/dns_resync.htm +++ b/interface/web/tools/templates/dns_resync.htm @@ -1,4 +1,4 @@ -

+

DNS Resync

-- GitLab