diff --git a/interface/web/tools/dns_resync.php b/interface/web/tools/dns_resync.php index aed2f4e7c203bd58dac20a705d5ad8f2ed464f1a..c80735df3e4a909d9a23bab5e0e227fd41977687 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'].'<br />'; } + } else { + $error .= "No zones found to sync.<br />"; } } diff --git a/interface/web/tools/index.php b/interface/web/tools/index.php index b17b83bf6e89142932aafe64c49f13724a17bfb0..ac064f6496e6d03caf1001d46e5e56d77d9e68cb 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 '<h2 class="frmTextHead">'.$app->lng('ISPConfig Tools').'</h2>'; +echo '<h2 class="frmTextHead">'.$app->lng('ISPConfig Tools').'</h2><p>'.$app->lng('ispconfig_tools_note').'</p>'; ?> \ 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 2b2b6100678c7a72dcf72e7ddca9a69bb074391f..deb9fe1446b29bda9776c746ed1f96acdf193580 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 1791b71dec007092a299b438cb3ebb8acbbbbf2d..d52f8e8c7070c174be4ff7c51cf2a8b8afa397e6 100644 --- a/interface/web/tools/lib/lang/de_usersettings.lng +++ b/interface/web/tools/lib/lang/de_usersettings.lng @@ -1,8 +1,8 @@ <?php $wb['passwort_txt'] = 'Passwort'; $wb['language_txt'] = 'Sprache'; -$wb['password_mismatch'] = 'Die PasswÃķrter stimmen nicht Þberein.'; -$wb['password_strength_txt'] = 'PasswortkomplexitÃĪt'; -$wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort, die Sprache und die authentication zu bearbeiten.'; +$wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.'; +$wb['password_strength_txt'] = 'Passwortkomplexität'; +$wb['Form to edit the user password and language.'] = 'Formular, um das Benutzerpasswort und die Sprache zu bearbeiten.'; $wb['Settings'] = 'Einstellungen'; ?> diff --git a/interface/web/tools/lib/lang/en.lng b/interface/web/tools/lib/lang/en.lng index 0c5b151bea67a9ff8072ea852901e820717e1f8d..abf0ecf7d890e9ed5c73eec9daf233a0f9c733f6 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 4169e8cce2d5a027a767d72ee4db7c5a07ec5932..bfe487113b715886e4e5511818ab9c4b0a55ee76 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 990e9484906cf32bf48fb106a8620c9d0504174a..372206af970caefdb22abb86e0e0606c98783790 100644 --- a/interface/web/tools/templates/dns_resync.htm +++ b/interface/web/tools/templates/dns_resync.htm @@ -1,4 +1,4 @@ -<h2><tmpl_var name="list_head_txt"></h2> +<h2>DNS Resync</h2> <p><tmpl_var name="list_desc_txt"></p> <div class="panel panel_language_import">