From 7a7559219f4fae2419285348dabd86788e5eefea Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 28 Dec 2016 13:45:04 -0500
Subject: Do not output PHP shell starup message unless it is run
 interactively. Fixes #7045

---
 src/usr/local/sbin/pfSsh.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/usr/local/sbin/pfSsh.php b/src/usr/local/sbin/pfSsh.php
index 56f6406..ba160ab 100755
--- a/src/usr/local/sbin/pfSsh.php
+++ b/src/usr/local/sbin/pfSsh.php
@@ -1,5 +1,4 @@
 #!/usr/local/bin/php-cgi -f
-
 <?php
 /*
  * pfSsh
@@ -54,13 +53,21 @@
  */
 
 require_once("globals.inc");
-echo "Starting the {$g['product_name']} developer shell";
+if ($argc < 2) {
+	echo "Starting the {$g['product_name']} developer shell";
+}
 require_once("functions.inc");
-echo ".";
+if ($argc < 2) {
+	echo ".";
+}
 require_once("config.inc");
-echo ".";
+if ($argc < 2) {
+	echo ".";
+}
 require_once("util.inc");
-echo ".";
+if ($argc < 2) {
+	echo ".";
+}
 
 $shell_cmds = array("alias", "alloc", "bg", "bind", "bindkey", "break",
 	 "breaksw", "builtins", "case", "cd", "chdir", "command", "complete", "continue", "default",
@@ -199,7 +206,9 @@ EOF;
 
 $fp = fopen('php://stdin', 'r');
 
-echo ".\n\n";
+if ($argc < 2) {
+	echo ".\n\n";
+}
 
 $pkg_interface='console';
 
-- 
cgit v1.1