Use product_name

9 files changed, 21 insertions, 21 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index ffed245..550cf19 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -58,18 +58,18 @@ function interfaces_loopback_configure()
 
 function interfaces_vlan_configure() 
 {
-        global $config;
+	global $config;
 
 	$i = 0;
-        if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
-                foreach ($config['vlans']['vlan'] as $vlan) {
+	if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
+		foreach ($config['vlans']['vlan'] as $vlan) {
 			if(empty($vlan['vlanif']))
 				$vlan['vlanif'] = "vlan{$i}";
-                        /* XXX: Maybe we should report any errors?! */
-                        interface_vlan_configure($vlan['if'], $vlan['tag'], $vlan['vlanif']);
+			/* XXX: Maybe we should report any errors?! */
+			interface_vlan_configure($vlan['if'], $vlan['tag'], $vlan['vlanif']);
 			$i++;
 		}
-        }
+	}
 }
 
 function interface_vlan_configure($if, $tag, $vlanif = "") 
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 7fa0574..c7cede7 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -269,7 +269,7 @@
 
 	if($avail < 126) {
 		require_once("/etc/inc/notices.inc");
-		file_notice("pfSenseMemoryRequirements", "pfSense requires atleast 128 megabytes of RAM.  Expect unusual performance.  This platform is not supported.", "Memory", "", 1);
+		file_notice("{$g['product_name']}MemoryRequirements", "{$g['product_name']} requires atleast 128 megabytes of RAM.  Expect unusual performance.  This platform is not supported.", "Memory", "", 1);
 		mwexec("sysctl net.inet.tcp.recvspace=4096");
 		mwexec("sysctl net.inet.tcp.sendspace=4096");
 	}
diff --git a/etc/rc.initial.defaults b/etc/rc.initial.defaults
index 0bfeec2..9067c6b 100755
--- a/etc/rc.initial.defaults
+++ b/etc/rc.initial.defaults
@@ -53,7 +53,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense is rebooting now.
+{$g['product_name']} is rebooting now.
 
 EOD;
 
diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update
index 77afa64..a9d1064 100755
--- a/etc/rc.initial.firmware_update
+++ b/etc/rc.initial.firmware_update
@@ -2,11 +2,11 @@
 
 <?php
 
-echo "Starting the pfSense console firmware update system";
-
-echo ".";
-require("globals.inc");
 $g['booting'] = true;
+require("globals.inc");
+
+echo "Starting the {$g['product_name']} console firmware update system";
+
 require("functions.inc");
 echo ".";
 require("config.inc");
diff --git a/etc/rc.initial.halt b/etc/rc.initial.halt
index c1fbaa9..7a250d0 100755
--- a/etc/rc.initial.halt
+++ b/etc/rc.initial.halt
@@ -40,7 +40,7 @@
 
 	echo <<<EOD
 
-pfSense will shutdown and halt system. This may take one minute.
+{$g['product_name']} will shutdown and halt system. This may take one minute.
 
 Do you want to proceed [y|n]? 
 EOD;
@@ -49,7 +49,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense will shutdown and halt system  now.
+{$g['product_name']} will shutdown and halt system now.
 
 EOD;
 
diff --git a/etc/rc.initial.reboot b/etc/rc.initial.reboot
index 26804a1..61bf0a9 100755
--- a/etc/rc.initial.reboot
+++ b/etc/rc.initial.reboot
@@ -38,7 +38,7 @@
 
 	echo <<<EOD
 
-pfSense will reboot. This may take one minute.
+{$g['product_name']} will reboot. This may take one minute.
 
 Do you want to proceed [y|n]? 
 EOD;
@@ -47,7 +47,7 @@ EOD;
 
 		echo <<<EOD
 
-pfSense is rebooting now.
+{$g['product_name']} is rebooting now.
 
 EOD;
 
diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device
index 8733e98..f5dcb5b 100755
--- a/etc/rc.initial.store_config_to_removable_device
+++ b/etc/rc.initial.store_config_to_removable_device
@@ -51,7 +51,7 @@
 		echo "\n\n";
 		echo "Enter the device that you wish the";
 		echo "\n";
-		echo "pfSense configuration file to reside on: ";
+		echo "{$g['product_name']} configuration file to reside on: ";
 		$move_config_to_device = chop(fgets($fp));
 		if ($move_config_to_device == "") {
 			exit(0);
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 0169359..5f654b0 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -111,7 +111,7 @@ if($old_ip <> "") {
 	if($old_ip <> $curwanip) {
 		mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
 		exec("/etc/rc.start_packages");
-		log_error("pfSense package system has detected an ip change $old_ip ->  $curwanip ... Restarting packages.");		
+		log_error("{$g['product_name']} package system has detected an ip change $old_ip ->  $curwanip ... Restarting packages.");		
 	}
 }
 
@@ -119,4 +119,4 @@ if($old_ip <> "") {
 setup_gateways_monitor();
 
 return 0;
-?>
+?>
\ No newline at end of file
diff --git a/etc/sshd b/etc/sshd
index f9c0405..b4aa168 100755
--- a/etc/sshd
+++ b/etc/sshd
@@ -138,7 +138,7 @@
 
 	if (!file_exists("$sshConfigDir/ssh_host_key") or file_exists("/etc/keys_generating")) {
 		/* remove previous keys and regen later */
-		file_notice("SSH", "pfSense has started creating your SSH keys.  SSH Startup will be delayed.  Please note that reloading the filter rules and changes will be delayed until this operation is completed.", "SSH KeyGen", "");
+		file_notice("SSH", "{$g['product_name']} has started creating your SSH keys.  SSH Startup will be delayed.  Please note that reloading the filter rules and changes will be delayed until this operation is completed.", "SSH KeyGen", "");
 		conf_mount_rw();
 		mwexec("rm /etc/ssh/ssh_host_*");
 		touch("/etc/keys_generating");
@@ -149,7 +149,7 @@
 		system("/usr/bin/nice -n20 /usr/bin/ssh-keygen -t dsa -N '' -f $sshConfigDir/ssh_host_dsa_key");
 		unlink("/etc/keys_generating");
 		unlink("/tmp/keys_generating");
-		file_notice("SSH", "pfSense has completed creating your SSH keys.  SSH is now started.", "SSH Startup", "");
+		file_notice("SSH", "{$g['product_name']} has completed creating your SSH keys.  SSH is now started.", "SSH Startup", "");
 		echo "Starting SSH... ";
 	}