Honor $pkg_interface for console operations

2 files changed, 36 insertions, 18 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index a8fd972..94d80b9 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -844,7 +844,7 @@ function update_output_window($text) {
 	global $pkg_interface;
 	$log = ereg_replace("\n", "\\n", $text);
 	if($pkg_interface == "console") {
-		echo " $log";
+		echo " $log\n";
 	} else {
 		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>";
 	}
@@ -903,9 +903,11 @@ function exec_command_and_return_text($command) {
  *   exec_command_and_return_text: execute command and update output window dynamically
  */
 function execute_command_return_output($command) {
-	global $fd_log;
+	global $fd_log, $pkg_interface;
 	$fd = popen($command . " 2>&1 ", "r");
-	echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
+	if($pkg_interface <> "console") {
+		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
+	}
 	$counter = 0;
 	$counter2 = 0;
 	while(!feof($fd)) {
@@ -928,11 +930,15 @@ function execute_command_return_output($command) {
 	    $counter++;
 		}
 		if($counter2 > 600) {
-			echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
+			if($pkg_interface <> "console") {
+				echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"\";</script>";
+			}
 			$counter2 = 0;
 		} else
 			$counter2++;
-		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = this.document.forms[0].output.value + \"" . $text . $extrabreak .  "\"; f('output'); </script>";
+		if($pkg_interface <> "console") {
+			echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = this.document.forms[0].output.value + \"" . $text . $extrabreak .  "\"; f('output'); </script>";
+		}
 	}
 	fclose($fd);
 }
@@ -980,9 +986,13 @@ function convert_real_interface_to_friendly_interface_name($interface) {
  */
 function update_progress_bar($percent) {
 	if($percent > 100) $percent = 1;
-	echo "\n<script type=\"text/javascript\" language=\"javascript\">";
-	echo "\ndocument.progressbar.style.width='" . $percent . "%';";
-	echo "\n</script>";
+	if($pkg_interface <> "console") {
+		echo "\n<script type=\"text/javascript\" language=\"javascript\">";
+		echo "\ndocument.progressbar.style.width='" . $percent . "%';";
+		echo "\n</script>";
+	} else {
+		echo " $percent";
+	}
 }
 
 /****f* pfsense-utils/WakeOnLan
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;