diff options
| -rw-r--r-- | src/etc/inc/priv.defs.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/diag_backup.php | 8 | ||||
| -rw-r--r-- | src/usr/local/www/diag_confbak.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/head.inc | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 133ce6f..9adaa06 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -44,8 +44,8 @@ $priv_list['page-diagnostics-authentication']['match'] = array(); $priv_list['page-diagnostics-authentication']['match'][] = "diag_authentication.php*"; $priv_list['page-diagnostics-backup-restore'] = array(); -$priv_list['page-diagnostics-backup-restore']['name'] = gettext("WebCfg - Diagnostics: Backup/restore"); -$priv_list['page-diagnostics-backup-restore']['descr'] = gettext("Allow access to the 'Diagnostics: Backup/restore' page."); +$priv_list['page-diagnostics-backup-restore']['name'] = htmlspecialchars(gettext("WebCfg - Diagnostics: Backup & Restore")); +$priv_list['page-diagnostics-backup-restore']['descr'] = htmlspecialchars(gettext("Allow access to the 'Diagnostics: Backup & Restore' page.")); $priv_list['page-diagnostics-backup-restore']['match'] = array(); $priv_list['page-diagnostics-backup-restore']['match'][] = "diag_backup.php*"; diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 5e42912..380bf62 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -58,8 +58,8 @@ ##|+PRIV ##|*IDENT=page-diagnostics-backup-restore -##|*NAME=Diagnostics: Backup/restore -##|*DESCR=Allow access to the 'Diagnostics: Backup/restore' page. +##|*NAME=Diagnostics: Backup & Restore +##|*DESCR=Allow access to the 'Diagnostics: Backup & Restore' page. ##|*MATCH=diag_backup.php* ##|-PRIV @@ -593,7 +593,7 @@ function build_area_list($showall) { } } -$pgtitle = array(gettext("Diagnostics"), gettext("Backup/Restore"), gettext("Backup/Restore")); +$pgtitle = array(gettext("Diagnostics"), htmlspecialchars(gettext("Backup & Restore")), htmlspecialchars(gettext("Backup & Restore"))); include("head.inc"); if ($input_errors) { @@ -617,7 +617,7 @@ endif; $tab_array = array(); $tab_array[] = array(gettext("Config History"), false, "diag_confbak.php"); -$tab_array[] = array(gettext("Backup/Restore"), true, "diag_backup.php"); +$tab_array[] = array(htmlspecialchars(gettext("Backup & Restore")), true, "diag_backup.php"); display_top_tabs($tab_array); $form = new Form(false); diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index 7ba6c91..6353692 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -132,7 +132,7 @@ cleanup_backupcache(false); $confvers = get_backups(); unset($confvers['versions']); -$pgtitle = array(gettext("Diagnostics"), gettext("Backup/Restore"), gettext("Config History")); +$pgtitle = array(gettext("Diagnostics"), htmlspecialchars(gettext("Backup & Restore")), gettext("Config History")); include("head.inc"); if ($savemsg) { @@ -141,7 +141,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Config History"), true, "diag_confbak.php"); -$tab_array[] = array(gettext("Backup/Restore"), false, "diag_backup.php"); +$tab_array[] = array(htmlspecialchars(gettext("Backup & Restore")), false, "diag_backup.php"); display_top_tabs($tab_array); if ($diff) { diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index ea9fd39..b053bb8 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -328,7 +328,7 @@ $status_menu = msort(array_merge($status_menu, return_ext_menu("Status")), 0); $diagnostics_menu = array(); $diagnostics_menu[] = array(gettext("ARP Table"), "/diag_arp.php"); $diagnostics_menu[] = array(gettext("Authentication"), "/diag_authentication.php"); -$diagnostics_menu[] = array(gettext("Backup/Restore"), "/diag_backup.php"); +$diagnostics_menu[] = array(htmlspecialchars(gettext("Backup & Restore")), "/diag_backup.php"); $diagnostics_menu[] = array(gettext("Command Prompt"), "/exec.php"); $diagnostics_menu[] = array(gettext("DNS Lookup"), "/diag_dns.php"); $diagnostics_menu[] = array(gettext("Edit File"), "/edit.php"); @@ -535,7 +535,7 @@ if (is_subsystem_dirty('packagelock') || file_exists('/conf/needs_package_sync' } else { $pgtitle = array(gettext("System"), gettext("Package Manager")); $warning_text = gettext("Packages are currently being reinstalled in the background.<p>Do not make changes in the GUI until this is complete."); - $warning_text .= gettext("<p>If the above message is still displayed after a couple of hours, use the 'Clear Package Lock' button on the <a href='diag_backup.php' title='Backup/Restore'>Backup/Restore page</a> and reinstall packages manually."); + $warning_text .= gettext("<p>If the above message is still displayed after a couple of hours, use the 'Clear Package Lock' button on the <a href='diag_backup.php' title='Backup & Restore'>Backup & Restore page</a> and reinstall packages manually."); } print_info_box($warning_text); |
