diff options
Diffstat (limited to 'src/usr/local/www/pkg_mgr_install.php')
| -rw-r--r-- | src/usr/local/www/pkg_mgr_install.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index 5ce1331..05d96e0 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -127,8 +127,12 @@ if ($_REQUEST['ajax']) { // Log file is read a line at a time so that we can detect/modify certain entries while (($logline = fgets($logfile)) !== false) { // Check for return codes and replace with suitable strings - if (strpos($logline, "_RC=") != false) { - $code = str_replace("__RC=", "", $logline); + if (strpos($logline, "__RC=") == 0) { + list($code, $reboot_after) = explode(" ", $logline); + + $code = str_replace("__RC=", "", $code); + /* XXX: Implement a GUI timeout counter if (is_numericint($reboot_after)) */ + $reboot_after = str_replace("__REBOOT_AFTER=", "", $reboot_after); if ($code == 0) { $logline = gettext("Success") . "\n"; @@ -243,7 +247,7 @@ if ($_POST) { if ($_GET && $_GET['id'] == "firmware") { $firmwareupdate = true; $firmwareversion = get_system_pkg_version(); - $headline = gettext("System update") ; + $headline = gettext("System Update") ; } $tab_array = array(); @@ -306,7 +310,7 @@ if ($input_errors) { <?php } else if ($firmwareupdate) { ?> - <?=$g['product_name']?> <?=gettext(" system update")?> + <?=$g['product_name']?> <?=gettext(" System Update")?> <?php } else { ?> @@ -343,7 +347,7 @@ if ($input_errors) { ?> <div class="form-group"> <label class="col-sm-2 control-label"> - <?=gettext("Confirm Upgrade")?> + <?=gettext("Confirm Update")?> </label> <div class="col-sm-10"> <input type="hidden" name="id" value="firmware" /> |
