diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-02-23 00:52:14 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-02-23 00:52:14 +0000 |
| commit | 1a22ffcd7ca59af3ffd764c9dd6267848700695b (patch) | |
| tree | fb5fb4f0e29844151b6063551463cc628cf28e64 /etc/inc/pkg-utils.inc | |
| parent | aa9e7aaaedfbe7384851c60157ebb7bb5d02b352 (diff) | |
| download | pfsense-1a22ffcd7ca59af3ffd764c9dd6267848700695b.zip pfsense-1a22ffcd7ca59af3ffd764c9dd6267848700695b.tar.gz | |
Honor $pkg_interface for console operations
Diffstat (limited to 'etc/inc/pkg-utils.inc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index dfa7f81..c78bd9a 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -461,12 +461,14 @@ function eval_once($toeval) { } function install_package_xml($pkg) { - global $g, $config, $fd_log, $static_output; + global $g, $config, $fd_log, $static_output, $pkg_interface; if(($pkgid = get_pkg_id($pkg)) == -1) { $static_output .= "The {$pkg} package is not installed.\n\nInstallation aborted."; update_output_window($static_output); - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + if($pkg_interface <> "console") { + echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + } sleep(1); return; } else { @@ -523,8 +525,10 @@ function install_package_xml($pkg) { update_output_window($static_output); fwrite($fd_log, "Package WAS NOT installed properly.\n"); fclose($fd_log); - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + if($pkg_interface <> "console") { + echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + } sleep(1); die; } @@ -650,8 +654,10 @@ function install_package_xml($pkg) { update_output_window($static_output); fwrite($fd_log, "Unable to load package configuration. Installation aborted.\n"); fclose($fd_log); - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + if($pkg_interface <> "console") { + echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + } sleep(1); return; } @@ -708,12 +714,14 @@ function delete_package_recursive($pkg) { } function delete_package_xml($pkg) { - global $g, $config, $fd_log, $static_output; + global $g, $config, $fd_log, $static_output, $pkg_interface; if(($pkgid = get_pkg_id($pkg)) == -1) { $static_output .= "The {$pkg} package is not installed.\n\nDeletion aborted."; update_output_window($static_output); - echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; - echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + if($pkg_interface <> "console") { + echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';</script>"; + echo "\n<script language=\"JavaScript\">document.progholder.style.visibility='hidden';</script>"; + } ob_flush(); sleep(1); return; |
