clean up text a bit, still some issues remaining (like "http://DHCP", my logic is apparently flawed)

1 files changed, 17 insertions, 7 deletions

diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index d1ad242..37bb4eb 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -209,13 +209,23 @@
 	filter_configure_sync();
 	echo "\n";
 	
-	if ($intip != '') { 
-		echo "\n\n" . gettext("The IPv4 {$interface} address has been set to ") . "{$intip}/{$intbits}\n" ;
-		echo gettext('You can now access the webConfigurator by opening the following URL in your web browser:') . "\n";
-		if(!empty($config['system']['webgui']['port'])) {
-			$webuiport = $config['system']['webgui']['port'];
+	if ($intip != '') {
+		if (is_ipaddr($intip)) {
+			echo "\n\n" . gettext("The IPv4 {$upperifname} address has been set to ") . "{$intip}/{$intbits}\n";
+		} else {
+			echo "\n\n" . gettext("The IPv4 {$upperifname} address has been set to ") . "{$intip}\n";
+		}
+		if (count($ifdescrs) == "1" or $interface = "lan") {
+			echo "ifdescrs count is count($ifdescrs)\n";
+			echo "interface is $interface \n";
+			echo gettext('You can now access the webConfigurator by opening the following URL in your web browser:') . "\n";
+			if(!empty($config['system']['webgui']['port'])) {
+				$webuiport = $config['system']['webgui']['port'];
+				echo "		{$config['system']['webgui']['protocol']}://{$intip}:{$port}/\n";
+			} else {
+				echo "		{$config['system']['webgui']['protocol']}://{$intip}/\n";	
+			}
 		}
-		echo "		{$config['system']['webgui']['protocol']}://{$intip}:{$port}/\n";
 	}
 
 	echo "\n" . gettext('Press <ENTER> to continue.');
@@ -223,4 +233,4 @@
 	fgets($fp);
 	fclose($fp);
 		
-?>
+?>
\ No newline at end of file