Merge remote branch 'mainline/master' into 4_load_balancer_and_services

Conflicts:
	usr/local/www/services_captiveportal_ip_edit.php
	usr/local/www/services_captiveportal_mac_edit.php
	usr/local/www/services_dhcp_edit.php
	usr/local/www/services_rfc2136.php
	usr/local/www/services_snmp.php

1 files changed, 310 insertions, 76 deletions

diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php
index f988d02..f5e37e0 100644
--- a/usr/local/www/installer.php
+++ b/usr/local/www/installer.php
@@ -27,8 +27,15 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require("globals.inc");
 require("guiconfig.inc");
 
+// Handle other type of file systems
+if($_REQUEST['fstype']) 
+	$fstype = strtoupper($_REQUEST['fstype']);
+else 
+	$fstype = "UFS+S";
+
 if($g['platform'] == "pfSense" or $g['platform'] == "nanobsd") {
 	Header("Location: /index.php");
 	exit;
@@ -42,13 +49,12 @@ switch ($_REQUEST['state']) {
 	case "update_installer_status":
 		update_installer_status();
 		exit;
-	case "quickeasyinstall":
-		begin_quick_easy_install();
 	default:
 		installer_main();	
 }
 
 function write_out_pc_sysinstaller_config($disk) {
+	global $fstype;
 	$fd = fopen("/PCBSD/pc-sysinstall/examples/pfSense-install.cfg", "w");
 	if(!$fd) {
 		return true;
@@ -71,7 +77,7 @@ commitDiskPart
 # All sizes are expressed in MB
 # Avail FS Types, UFS, UFS+S, UFS+J, ZFS, SWAP
 # Size 0 means use the rest of the slice size
-disk0-part=UFS+S 0 / 
+disk0-part={$fstype} 0 / 
 # Do it now!
 commitDiskLabel
 
@@ -83,7 +89,7 @@ packageType=cpdup
 # Optional Components
 cpdupPaths=boot,COPYRIGHT,bin,conf,conf.default,dev,etc,home,kernels,libexec,lib,root,sbin,sys,usr,var
 
-runExtCommand=chmod a+rx /usr/local/bin/after_installation_routines.sh && cd / && /usr/local/bin/after_installation_routines.sh
+# runExtCommand=chmod a+rx /usr/local/bin/after_installation_routines.sh && cd / && /usr/local/bin/after_installation_routines.sh
 EOF;
 	fwrite($fd, $config);
 	fclose($fd);
@@ -91,40 +97,140 @@ EOF;
 }
 
 function start_installation() {
+	global $g, $fstype;
+	if(file_exists("/tmp/install_complete"))
+		return;
+	$ps_running = exec("ps awwwux | grep -v grep | grep 'sh /tmp/installer.sh'");
+	if($ps_running)	
+		return;
 	$fd = fopen("/tmp/installer.sh", "w");
 	if(!$fd) {
 		die("Could not open /tmp/installer.sh for writing");
 		exit;
-	}	
-	fwrite($fd, "/PCBSD/pc-sysinstall/pc-sysinstall -c /PCBSD/pc-sysinstall/examples/pfSense-install.cfg && touch /tmp/install_complete");
+	}
+	fwrite($fd, "rm /tmp/.pc-sysinstall/pc-sysinstall.log 2>/dev/null\n");
+	fwrite($fd, "/PCBSD/pc-sysinstall/pc-sysinstall -c /PCBSD/pc-sysinstall/examples/pfSense-install.cfg \n");
+	fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n");
+	fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n");
+	fwrite($fd, "mkdir /mnt/tmp\n");
+	fwrite($fd, "umount /mnt\n");
+	fwrite($fd, "touch /tmp/install_complete\n");
 	fclose($fd);
 	exec("chmod a+rx /tmp/installer.sh");
 	mwexec_bg("sh /tmp/installer.sh");
 }
 
 function installer_find_first_disk() {
+	global $g, $fstype;
 	$disk = `/PCBSD/pc-sysinstall/pc-sysinstall disk-list | head -n1 | cut -d':' -f1`;
 	return $disk;
 }
 
 function update_installer_status() {
-	if(!file_exists("/tmp/.pc-sysinstall/pc-sysinstall.log")) 
+	global $g, $fstype;
+	// Ensure status files exist
+	if(!file_exists("/tmp/installer_installer_running"))
+		touch("/tmp/installer_installer_running");
+	$status = `cat /tmp/.pc-sysinstall/pc-sysinstall.log`;
+	$status = str_replace("\n", "\\n", $status);
+	$status = str_replace("\n", "\\r", $status);
+	echo "this.document.forms[0].installeroutput.value='$status';\n";
+	echo "this.document.forms[0].installeroutput.scrollTop = this.document.forms[0].installeroutput.scrollHeight;\n";	
+	// Find out installer progress
+	$progress = "5";
+	if(strstr($status, "Running: dd")) 
+		$progress = "6";
+	if(strstr($status, "Running: gpart create -s GPT")) 
+		$progress = "7";
+	if(strstr($status, "Running: gpart bootcode")) 
+		$progress = "7";
+	if(strstr($status, "Running: newfs -U")) 
+		$progress = "8";
+	if(strstr($status, "Running: sync")) 
+		$progress = "9";
+	if(strstr($status, "/boot /mnt/boot")) 
+		$progress = "10";
+	if(strstr($status, "/COPYRIGHT /mnt/COPYRIGHT"))
+		$progress = "11";
+	if(strstr($status, "/bin /mnt/bin"))
+		$progress = "12";
+	if(strstr($status, "/conf /mnt/conf"))
+		$progress = "15";
+	if(strstr($status, "/conf.default /mnt/conf.default"))
+		$progress = "20";
+	if(strstr($status, "/dev /mnt/dev"))
+		$progress = "25";
+	if(strstr($status, "/etc /mnt/etc"))
+		$progress = "30";
+	if(strstr($status, "/home /mnt/home"))
+		$progress = "35";
+	if(strstr($status, "/kernels /mnt/kernels"))
+		$progress = "40";
+	if(strstr($status, "/libexec /mnt/libexec"))
+		$progress = "50";
+	if(strstr($status, "/lib /mnt/lib"))
+		$progress = "60";
+	if(strstr($status, "/root /mnt/root"))
+		$progress = "70";
+	if(strstr($status, "/sbin /mnt/sbin"))
+		$progress = "75";
+	if(strstr($status, "/sys /mnt/sys"))
+		$progress = "80";
+	if(strstr($status, "/usr /mnt/usr"))
+		$progress = "95";
+	if(strstr($status, "/usr /mnt/usr"))
+		$progress = "90";
+	if(strstr($status, "/var /mnt/var"))
+		$progress = "95";
+	if(strstr($status, "cap_mkdb /etc/login.conf"))
+		$progress = "96";
+	if(strstr($status, "Setting hostname"))
+		$progress = "97";
+	if(strstr($status, "umount -f /mnt"))
+		$progress = "98";
+	if(strstr($status, "umount -f /mnt"))
+		$progress = "99";
+	if(strstr($status, "Installation finished"))
+		$progress = "100";
+	// Check for error and bail if we see one.
+	if(stristr($status, "error")) {
+		$error = true;
+		echo "\$('installerrunning').innerHTML='<img class=\"infoboxnpimg\" src=\"/themes/{$g['theme']}/images/icons/icon_exclam.gif\"> <font size=\"2\"><b>An error occurred.  Aborting installation.'; ";
+		echo "\$('progressbar').style.width='100%';\n";
+		unlink("/tmp/install_complete");
 		return;
-	echo `tail -n20 /tmp/.pc-sysinstall/pc-sysinstall.log`;
+	}
+	$running_old = trim(file_get_contents("/tmp/installer_installer_running"));
+	if($installer_running <> "running") {
+		$ps_running = exec("ps awwwux | grep -v grep | grep 'sh /tmp/installer.sh'");
+		if($ps_running)	{
+			$running = "\$('installerrunning').innerHTML='<table><tr><td valign=\"middle\"><img src=\"/themes/{$g['theme']}/images/misc/loader.gif\"></td><td valign=\"middle\">&nbsp;<font size=\"2\"><b>Installer running ({$progress}% completed)...</td></tr></table>'; ";
+			if($running_old <> $running) {
+				echo $running;
+				file_put_contents("/tmp/installer_installer_running", "$running");			
+			}
+		}
+	}
+	if($progress) 
+		echo "\$('progressbar').style.width='{$progress}%';\n";
 	if(file_exists("/tmp/install_complete")) {
-		echo "Installation completed.";
+		echo "\$('installerrunning').innerHTML='<img class=\"infoboxnpimg\" src=\"/themes/{$g['theme']}/images/icons/icon_exclam.gif\"> <font size=\"+1\">Installation completed.  Please <a href=\"reboot.php\">reboot</a> to continue';\n";
 		unlink_if_exists("/tmp/installer.sh");
+		file_put_contents("/tmp/installer_installer_running", "finished");
 	}
 }
 
 function update_installer_status_win($status) {
+	global $g, $fstype;
 	echo "<script type=\"text/javascript\">\n";
-	echo "\$('installeroutput').value = '" . str_replace(htmlentities($status), "\n", "") . "';\n";
-	echo "installeroutput.scroll = installeroutput.maxScroll;\n";
+	echo "	\$('installeroutput').value = '" . str_replace(htmlentities($status), "\n", "") . "';\n";
 	echo "</script>";
 }
 
 function begin_quick_easy_install() {
+	global $g, $fstype;
+	if(file_exists("/tmp/install_complete"))
+		return;
 	unlink_if_exists("/tmp/install_complete");
 	$disk = installer_find_first_disk();
 	if(!$disk) {
@@ -138,37 +244,69 @@ function begin_quick_easy_install() {
 	start_installation();
 }
 
+function head_html() {
+	global $g, $fstype;
+	echo <<<EOF
+<html>
+	<head>
+		<style type='text/css'>
+			a:link { 
+				color: #000000;
+				text-decoration:underline;
+				font-size:14;
+			}
+			a:visited { 
+				color: #000000;
+				text-decoration:underline;
+				font-size:14;
+			}
+			a:hover { 
+				color: #FFFF00;
+				text-decoration: none;
+				font-size:14;
+			}
+			a:active { 
+				color: #FFFF00;
+				text-decoration:underline;
+				font-size:14;
+			}
+		</style>
+	</head>
+EOF;
+
+}
+
 function body_html() {
+	global $g, $fstype;
 	$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 	if(strstr($pfSversion, "1.2"))
 		$one_two = true;
-	$pgtitle = "pfSense: Installer";
+	$pgtitle = "{$g['product_name']}: Installer";
 	include("head.inc");
 	echo <<<EOF
 	<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 	<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-		<script type="text/javascript">
-			function getinstallerprogress() {
-				url = 'installer.php';
-				pars = 'state=update_installer_status';
-				callajax(url, pars, installcallback);
-			}
-			function callajax(url, pars, activitycallback) {
-				var myAjax = new Ajax.Request(
-					url,
-					{
-						method: 'post',
-						parameters: pars,
-						onComplete: activitycallback
-					});
-			}
-			function installcallback(transport) {
-				this.document.forms[0].installeroutput.value=transport.responseText;
-				setTimeout('getinstallerprogress()', 1000);		
-			}
+	<script type="text/javascript">
+		function getinstallerprogress() {
+			url = 'installer.php';
+			pars = 'state=update_installer_status';
+			callajax(url, pars, installcallback);
+		}
+		function callajax(url, pars, activitycallback) {
+			var myAjax = new Ajax.Request(
+				url,
+				{
+					method: 'post',
+					parameters: pars,
+					onComplete: activitycallback
+				});
+		}
+		function installcallback(transport) {
+			setTimeout('getinstallerprogress()', 2000);
+			eval(transport.responseText);
+		}
 	</script>
 EOF;
-	include("fbegin.inc");
 
 	if($one_two)
 		echo "<p class=\"pgtitle\">{$pgtitle}</font></p>";
@@ -177,13 +315,15 @@ EOF;
 }
 
 function end_html() {
+	global $g, $fstype;
 	echo "</form>";
-	include("fend.inc");
 	echo "</body>";
 	echo "</html>";
 }
 
 function template() {
+	global $g, $fstype;
+	head_html();
 	body_html();
 	echo <<<EOF
 	<div id="mainlevel">
@@ -212,64 +352,158 @@ EOF;
 }
 
 function quickeasyinstall_gui() {
+	global $g, $fstype;
+	head_html();
 	body_html();
+	echo "<form action=\"installer.php\" method=\"post\" state=\"step1_post\">";
+	page_table_start();
 	echo <<<EOF
-	<div id="mainlevel">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	 		<tr>
-	    		<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-	     						<td class="tabcont" >
-	      							<form action="installer.php" method="post" state="step1_post">
-									<div id="pfsenseinstaller">
-										Starting Installer...  Please wait...<p/>
-										{{ Insert progressbar here }}<p/>
-										<textarea name='installeroutput' id='installeroutput' rows="20" cols="80">
-										</textarea>
-									</div>
-	     						</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
+	<center>
+		<table width="100%">
+		<tr><td>
+			<div id="mainlevel">
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
+			 		<tr>
+			    		<td>
+							<div id="mainarea">
+								<table width="100%" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+			     						<td>
+											<div id="pfsenseinstaller" width="100%">
+												<div id='installerrunning' width='100%' style="padding:8px; border:1px dashed #000000">
+													<table>
+														<tr>
+															<td valign="middle">
+																<img src="/themes/{$g['theme']}/images/misc/loader.gif">
+															</td>
+															<td valign="middle">
+																&nbsp;<font size="2"><b>Starting Installer...  Please wait...
+															</td>
+														</tr>
+													</table>
+												</div>
+												<br/>
+												<center>
+												<table height='15' width='640' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
+													<tr>
+														<td background="./themes/the_wall/images/misc/bar_left.gif" height='15' width='5'>
+														</td>
+														<td>
+															<table id="progholder" name="progholder" height='15' width='630' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
+																<td background="./themes/the_wall/images/misc/bar_gray.gif" valign="top" align="left">
+																	<img src='./themes/the_wall/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'>
+																</td>
+															</table>
+														</td>
+														<td background="./themes/the_wall/images/misc/bar_right.gif" height='15' width='5'>
+														</td>
+													</tr>
+												</table>
+												<br/>
+												<textarea name='installeroutput' id='installeroutput' rows="31" cols="90">
+												</textarea>
+											</div>
+			     						</td>
+									</tr>
+								</table>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</div>
+		</td></tr>
 		</table>
-	</div>
+	</center>
 	<script type="text/javascript">setTimeout('getinstallerprogress()', 250);</script>
+
 EOF;
+	page_table_end();
 	end_html();
+	begin_quick_easy_install();
+}
+
+function page_table_start() {
+	global $g, $fstype;
+	echo <<<EOF
+	<center>
+		<img border="0" src="./themes/{$g['theme']}/images/logo.gif"></a><br/>
+		<table cellpadding="6" cellspacing="0" width="640" height="480" style="border:1px solid #000000">
+		<tr height="10" bgcolor="#990000">
+			<td style="border-bottom:1px solid #000000">
+				<font color='white'>
+					<b>
+						{$g['product_name']} installer
+					</b>
+				</font>
+			</td>
+		</tr>
+		<tr>
+			<td>
+
+EOF;
+
+}
+
+function page_table_end() {
+	global $g, $fstype;
+	echo <<<EOF
+			</td>
+		</tr>
+		</table>
+	</center>
+
+EOF;
+	
 }
 
 function installer_main() {
+	global $g, $fstype;
+	if(file_exists("/tmp/.pc-sysinstall/pc-sysinstall.log")) 
+		unlink("/tmp/.pc-sysinstall/pc-sysinstall.log");
+	head_html();
 	body_html();
+	// Only enable ZFS if this exists.  The install will fail otherwise.
+	if(file_exists("/boot/gptzfsboot")) 
+		$zfs_enabled = "or <a href=\"installer.php?state=quickeasyinstall&fstype=ZFS\">ZFS</a> ";
 	$disk = installer_find_first_disk();
 	if(!$disk) 
 		echo "WARNING: Could not find any suitable disks for installation.";
+	page_table_start();
 	echo <<<EOF
-	<div id="mainlevel">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	 		<tr>
-	    		<td>
-					<div id="mainarea">
-						<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-	     						<td class="tabcont" >
-	      							<form action="installer.php" method="post" state="step1_post">
-									<div id="pfsenseinstaller">
-										<a onclick="return confirm('Are you sure you want to install pfSense to $disk?')"> href='installer.php?state=quickeasyinstall'>Quick/Easy installation</a> 
-										</p>
-									</div>
-	     						</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-			</tr>
-		</table>
-	</div>
+		<form action="installer.php" method="post" state="step1_post">
+			<div id="mainlevel">
+				<center>
+				<b><font face="arial" size="+2">Welcome to the {$g['product_name']} PCSysInstaller!</b></font><p/>
+				<font face="arial" size="+1">This utility will install {$g['product_name']} to a hard disk, flash drive, etc.</font>
+				<table width="100%" border="0" cellpadding="5" cellspacing="0">
+			 		<tr>
+			    		<td>
+							<center>
+							<div id="mainarea">
+								<br/>
+								<center>
+								Please select an installer option to begin:
+								<table width="100%" border="0" cellpadding="5" cellspacing="5">
+									<tr>
+			     						<td>
+											<div id="pfsenseinstaller">
+												<center>
+												Rescue config.xml<p/>
+												Install {$g['product_name']} using the <a href="installer.php?state=quickeasyinstall">UFS</a>
+												 {$zfs_enabled}
+												filesystem.
+												</p>
+											</div>
+			     						</td>
+									</tr>
+								</table>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</div>
 EOF;
+	page_table_end();
 	end_html();
 }