summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-01-14 09:11:54 -0500
committerStephen Beaver <sbeaver@netgate.com>2016-01-14 09:11:54 -0500
commit498fe561adc42a23dcdf96f689edc0c760f02cec (patch)
treee9117dd3454f3c66b7ea605b2c0d0cd6388f6e15
parent851cc33a1f09a703164ef8ff93a706311af563b1 (diff)
downloadpfsense-498fe561adc42a23dcdf96f689edc0c760f02cec.zip
pfsense-498fe561adc42a23dcdf96f689edc0c760f02cec.tar.gz
Fix status reporting (Detect rebbot required to follow)
-rw-r--r--src/usr/local/www/pkg_mgr_install.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 05d96e0..560a4b5 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -127,12 +127,8 @@ 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=") == 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 (strpos($logline, "_RC=") != false) {
+ $code = str_replace("__RC=", "", $logline);
if ($code == 0) {
$logline = gettext("Success") . "\n";
@@ -655,6 +651,7 @@ events.push(function() {
// we only meed to re-populate the progress indicator and the status banner
if ("<?=$_POST['completed']?>" == "true") {
setProgress('progressbar', 100, false);
+ $('#progressbar').addClass("progress-bar-success");
show_success();
setTimeout(scrollToBottom, 200);
}
OpenPOWER on IntegriCloud