diff options
| author | Ermal <eri@pfsense.org> | 2010-11-17 22:45:22 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-11-17 22:45:52 +0000 |
| commit | fa15f4ae52fa80f26f29aec39ea4c5c9ee909534 (patch) | |
| tree | ac1f1cd917113f0d4f0c189f310979f040db4706 | |
| parent | d98d6f7f42b08c62af8009ed6086e37379317bb7 (diff) | |
| download | pfsense-fa15f4ae52fa80f26f29aec39ea4c5c9ee909534.zip pfsense-fa15f4ae52fa80f26f29aec39ea4c5c9ee909534.tar.gz | |
Clear up some code.
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
| -rw-r--r-- | etc/inc/pkg-utils.inc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index d566062..9b4d20b 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1506,9 +1506,7 @@ function read_body($ch, $string) { function update_output_window($text) { global $pkg_interface; $log = ereg_replace("\n", "\\n", $text); - if($pkg_interface == "console") { - /* too chatty */ - } else { + if($pkg_interface != "console") { echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>"; } /* ensure that contents are written out */ diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index c7575c7..b2f622a 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -600,7 +600,7 @@ function install_package_xml($pkg) { update_output_window($static_output); foreach((array) $pkg_info['depends_on_package'] as $pkgdep) { $pkg_name = substr(reverse_strrchr($pkgdep, "."), 0, -1); - $static_output = $static_orig . "done.\nChecking for successful package installation... "; + $static_output = $static_orig . "Checking for package installation... "; update_output_window($static_output); $pkg_installed = true; if (!isset($pkg_info['skip_install_checks'])) |
