rc: rework password

Looks like factory_shipped_username was never really honoured here.
Clean this up while bringing general sanity to the file.

src/etc/rc.initial.password

@@ -2,8 +2,6 @@
 <?php
 
 /*
-	part of m0n0wall (http://m0n0.ch/wall)
-
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
@@ -29,57 +27,55 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-	/* parse the configuration and include all functions used below */
+/* parse the configuration and include all functions used below */
 
-	require_once("config.inc");
-	require("auth.inc");
-	require_once("functions.inc");
-	require_once("shaper.inc");
+require_once('config.inc');
+require_once('auth.inc');
+require_once('functions.inc');
+require_once('shaper.inc');
 
-	$fp = fopen('php://stdin', 'r');
+$fp = fopen('php://stdin', 'r');
 
-	echo "\n" . gettext('
-The webConfigurator admin password and privileges will be reset to the default (which is "' . strtolower($g['product_name']) . '").') . "\n" .
-	gettext('Do you want to proceed [y|n]?');
+printf(_("The %s password will be reset to the factory default `%s'."),
+    $g['factory_shipped_username'], $g['factory_shipped_password']);
+printf("\n");
+printf(_('Do you want to proceed [y|n]? '));
 
-	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
-		if (isset($config['system']['webgui']['authmode']) &&
-		    $config['system']['webgui']['authmode'] != "Local Database") {
-			echo "\n" . gettext('
+if (strcasecmp(chop(fgets($fp)), "y") == 0) {
+	if (isset($config['system']['webgui']['authmode']) &&
+	    $config['system']['webgui']['authmode'] != "Local Database") {
+		echo "\n" . gettext('
 The User manager authentication server is set to "' . $config['system']['webgui']['authmode'] . '".') . "\n" .
-			gettext('Do you want to set it back to Local Database [y|n]?');
-			if (strcasecmp(chop(fgets($fp)), "y") == 0)
-				$config['system']['webgui']['authmode'] = "Local Database";
-		}
-		$admin_user =& getUserEntryByUID(0);
-		if (!$admin_user) {
-			echo "Failed to locate the admin user account! Attempting to restore access.\n";
-			$admin_user = array();
-			$admin_user['uid'] = 0;
-			if (!is_array($config['system']['user']))
-				$config['system']['user'] = array();
-			$config['system']['user'][] = $admin_user;
-		}
+		gettext('Do you want to set it back to Local Database [y|n]?');
+		if (strcasecmp(chop(fgets($fp)), "y") == 0)
+			$config['system']['webgui']['authmode'] = "Local Database";
+	}
+	$admin_user =& getUserEntryByUID(0);
+	if (!$admin_user) {
+		echo "Failed to locate the admin user account! Attempting to restore access.\n";
+		$admin_user = array();
+		$admin_user['uid'] = 0;
+		if (!isset($config['system']['user']))
+			$config['system']['user'] = array();
+		$config['system']['user'][] = $admin_user;
+	}
 
-		$admin_user['name'] = "admin";
-		$admin_user['scope'] = "system";
-		$admin_user['priv'] = array("user-shell-access");
+	$admin_user['name'] = $g['factory_shipped_username'];
+	$admin_user['priv'] = array("user-shell-access");
+	$admin_user['scope'] = "system";
 
-		if (isset($admin_user['disabled']))
-			unset($admin_user['disabled']);
+	if (isset($admin_user['disabled'])) {
+		unset($admin_user['disabled']);
+	}
 
-		local_user_set_password($admin_user, strtolower($g['product_name']));
-		local_user_set($admin_user);
-		write_config(gettext("password changed from console menu"));
+	local_user_set_password($admin_user, $g['factory_shipped_password']);
+	local_user_set($admin_user);
+	write_config($config, gettext("password changed from console menu"));
 
-		echo "\n" . gettext('
-The password for the webConfigurator has been reset and 
-the default username has been set to "admin".') . "\n" .
-		gettext('
-Remember to set the password to something else than
-the default as soon as you have logged into the webConfigurator.') . "\n" .
-		gettext("Press ENTER to continue.");
+	printf(_("The password has been reset."));
+	printf(_("Please change the password as soon as you log in!"));
+	printf("\n\n");
+	printf(_("Press any key to continue."));
 
-		fgets($fp);
-	}
-?>
+	fgets($fp);
+}