diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-02-07 22:14:22 +0545 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-07 14:52:15 -0200 |
| commit | c0e46e9aca6355d28414b9d6f61150a0c2ddf5d7 (patch) | |
| tree | 0ae3bf62030a50b13a2143f8b419c6ecc70d63fc /src | |
| parent | 7100f0410b02d152f12f95fa892c427b06ec26c0 (diff) | |
| download | pfsense-c0e46e9aca6355d28414b9d6f61150a0c2ddf5d7.zip pfsense-c0e46e9aca6355d28414b9d6f61150a0c2ddf5d7.tar.gz | |
pkg_mgr_install remove embedded HTML from result strings
(cherry picked from commit 682008ff758b942d85ed007b485e0b2fa8e3a11c)
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index d123cc5..98f779f 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -400,6 +400,8 @@ if ($_POST) { } } +$pkgname_bold = '<b>' . $pkgname . '</b>'; + if ($firmwareupdate) { $panel_heading_txt = gettext("Updating System"); $pkg_success_txt = gettext('System update successfully completed.'); @@ -407,9 +409,9 @@ if ($firmwareupdate) { $pkg_wait_txt = gettext('Please wait while the system update completes.'); } else if ($pkgmode == 'delete') { $panel_heading_txt = gettext("Package Removal"); - $pkg_success_txt = sprintf(gettext('<b>%1$s</b> removal successfully completed.'), $pkgname); - $pkg_fail_txt = sprintf(gettext('<b>%1$s</b> removal failed!'), $pkgname); - $pkg_wait_txt = sprintf(gettext('Please wait while the removal of <b>%1$s</b> completes.'), $pkgname); + $pkg_success_txt = sprintf(gettext('%1$s removal successfully completed.'), $pkgname_bold); + $pkg_fail_txt = sprintf(gettext('%1$s removal failed!'), $pkgname_bold); + $pkg_wait_txt = sprintf(gettext('Please wait while the removal of %1$s completes.'), $pkgname_bold); } else if ($pkgmode == 'reinstallall') { $panel_heading_txt = gettext("Packages Reinstallation"); $pkg_success_txt = gettext('All packages reinstallation successfully completed.'); @@ -417,14 +419,14 @@ if ($firmwareupdate) { $pkg_wait_txt = gettext('Please wait while the reinstallation of all packages completes.'); } else if ($pkgmode == 'reinstallpkg') { $panel_heading_txt = gettext("Package Reinstallation"); - $pkg_success_txt = sprintf(gettext('<b>%1$s</b> reinstallation successfully completed.'), $pkgname); - $pkg_fail_txt = sprintf(gettext('<b>%1$s</b> reinstallation failed!'), $pkgname); - $pkg_wait_txt = sprintf(gettext('Please wait while the reinstallation of <b>%1$s</b> completes.'), $pkgname); + $pkg_success_txt = sprintf(gettext('%1$s reinstallation successfully completed.'), $pkgname_bold); + $pkg_fail_txt = sprintf(gettext('%1$s reinstallation failed!'), $pkgname_bold); + $pkg_wait_txt = sprintf(gettext('Please wait while the reinstallation of %1$s completes.'), $pkgname_bold); } else { $panel_heading_txt = gettext("Package Installation"); - $pkg_success_txt = sprintf(gettext('<b>%1$s</b> installation successfully completed.'), $pkgname); - $pkg_fail_txt = sprintf(gettext('<b>%1$s</b> installation failed!'), $pkgname); - $pkg_wait_txt = sprintf(gettext('Please wait while the installation of <b>%1$s</b> completes.'), $pkgname); + $pkg_success_txt = sprintf(gettext('%1$s installation successfully completed.'), $pkgname_bold); + $pkg_fail_txt = sprintf(gettext('%1$s installation failed!'), $pkgname_bold); + $pkg_wait_txt = sprintf(gettext('Please wait while the installation of %1$s completes.'), $pkgname_bold); } if ($confirmed): |
