From d4335ebfcfed221a37d14958c31b9152187b3b69 Mon Sep 17 00:00:00 2001
From: Liam McLoughlin <hexxeh@hexxeh.net>
Date: Fri, 12 Aug 2011 23:16:06 +0100
Subject: WebUI refactor, added testdrive memory configuration option

---
 config.php        |   3 +
 create_image.sh   |   2 +-
 daemon.php        |   2 +-
 ui/ajax.php       |  72 ++++++++++++++
 ui/index.php      |  88 +++++++++++++++++
 ui/process.php    | 109 +++++++++++++++++++++
 ui/recaptcha.php  | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ui/status.php     | 107 +++++++++++++++++++++
 ui/testdrive.php  |  69 ++++++++++++++
 web/ajax.php      |  72 +-------------
 web/index.php     |  88 +----------------
 web/process.php   | 111 +---------------------
 web/recaptcha.php | 277 ------------------------------------------------------
 web/status.php    | 107 +--------------------
 web/testdrive.php |  69 +-------------
 wrap.sh           |  13 +--
 16 files changed, 743 insertions(+), 723 deletions(-)
 create mode 100644 ui/ajax.php
 create mode 100644 ui/index.php
 create mode 100644 ui/process.php
 create mode 100644 ui/recaptcha.php
 create mode 100644 ui/status.php
 create mode 100644 ui/testdrive.php
 delete mode 100644 web/recaptcha.php

diff --git a/config.php b/config.php
index 96b5728..2e4021a 100644
--- a/config.php
+++ b/config.php
@@ -27,6 +27,9 @@
     
     // Set the externally accessible IP/host of this machine
     define("EXTERNAL_HOST", "192.168.2.169");
+
+    // How much memory (in megabytes) should each testdrive instance have?
+    define("TESTDRIVE_MEMORY", "512");
     
     // Set the port range that should be used for testdrives
     define("LOW_PORT", 5900);
diff --git a/create_image.sh b/create_image.sh
index f83c1e3..c3ec7d1 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -232,7 +232,7 @@ else
 	cp ${TOOL_RES_PATH}/kernelconfig usr/src/linux/.config || handle_error "Error copying kernel config"
 
 	echo "Building kernel" &>> ${LOG_FILE}
-	yes "" | linux32 chroot . make -C /usr/src/linux oldconfig &>> ${LOG_FILE} || handle_error "Error configuring kernel"
+	yes "" | linux32 chroot . make -C /usr/src/linux oldconfig &>> ${LOG_FILE}
 	linux32 chroot . make -C /usr/src/linux -j${NUM_JOBS} &>> ${LOG_FILE} || handle_error "Error building kernel"
 
 	echo "Installing kernel" &>> ${LOG_FILE}
diff --git a/daemon.php b/daemon.php
index 4041317..60c1616 100644
--- a/daemon.php
+++ b/daemon.php
@@ -212,7 +212,7 @@
         if (!$running || $update) {
             $cmd = GENTOASTER_PATH."/".WRAP_TOOL_NAME." ".
                    CONFIGURATIONS_PATH."/".$buildID."/".$buildID.".image ".
-                   $port." &";
+                   $port." ".TESTDRIVE_MEMORY."&";
             $handle = proc_open($cmd, array(), $foo);
             $status = proc_get_status($handle);
             $pid = $status["pid"];
diff --git a/ui/ajax.php b/ui/ajax.php
new file mode 100644
index 0000000..105c893
--- /dev/null
+++ b/ui/ajax.php
@@ -0,0 +1,72 @@
+<?php
+
+    // Gentoaster web interface AJAX remote
+    // Licensed under GPL v3, see COPYING file
+
+    require_once "config.php";
+
+    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
+
+
+    $db = new mysqli(
+        MYSQL_HOSTNAME, 
+        MYSQL_USERNAME,
+        MYSQL_PASSWORD, 
+        MYSQL_DATABASE
+    );
+    
+    if (mysqli_connect_errno()) {
+       die("Could not connect to database ".mysqli_connect_error());
+    }
+
+    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
+    $stmt->bind_param("s", $buildID);
+    $stmt->execute();
+    $stmt->store_result();
+    if ($stmt->num_rows == 1) {
+            $stmt->bind_result($handle);
+            $stmt->fetch();
+            $stmt->close();
+            $client = new GearmanClient();
+            $client->addServer();
+
+            $status = $client->jobStatus($handle);
+            if ($status[0]) {
+                    if ($status[3] != 0) {
+                            // in progress
+                            $ret = array("status" => 1, "num" => $status[2], "den" => $status[3]);
+                    } else {
+                            // not yet processed
+                            $ret = array("status" => 2);
+                    }
+            } else {
+                    $query = "SELECT returncode, result ".
+                             "FROM builds WHERE id = ?";
+                    $stmt = $db->prepare($query);
+                    $stmt->bind_param("s", $buildID);
+                    $stmt->execute();
+                    $stmt->bind_result($returncode, $result);
+                    $stmt->fetch();
+                    $stmt->close();
+                    if ($returncode !== null) {
+                            if ($returncode == 0) {
+                                 // finished
+                                 $ret = array("status" => 0);
+                            } else {
+                                // returned with non-zero status code
+                                 $ret = array("status" => 3);
+                            }
+                    } else {
+                            // failed
+                             $ret = array("status" => 4);
+                    }
+            }
+    } else {
+             // job not found
+             $ret = array("status" => -1);
+    }
+
+    $db->close();
+    
+    echo json_encode($ret);
+?>
\ No newline at end of file
diff --git a/ui/index.php b/ui/index.php
new file mode 100644
index 0000000..59cd061
--- /dev/null
+++ b/ui/index.php
@@ -0,0 +1,88 @@
+<?php
+    require_once "config.php";
+    
+    if (RECAPTCHA_ENABLED) {
+        require_once GENTOASTER_PATH."/ui/recaptcha.php";
+    }
+
+    if (!SIMULTANEOUS_BUILDS) {
+            $db = new mysqli(
+                MYSQL_HOSTNAME, 
+                MYSQL_USERNAME,
+                MYSQL_PASSWORD, 
+                MYSQL_DATABASE
+            );
+                  
+            if (mysqli_connect_errno()) {
+               die("Could not connect to database ".mysqli_connect_error());
+            }
+        
+            $ipaddress = filter_input(
+                INPUT_SERVER, 
+                "REMOTE_ADDR",
+                FILTER_VALIDATE_IP
+            );
+                
+            $query = "SELECT id, handle ".
+                     "FROM builds WHERE ipaddress = ?";
+            $stmt = $db->prepare($query);
+            $stmt->bind_param("s", $ipaddress);
+            $stmt->execute();
+            $stmt->store_result();
+                        
+            if ($stmt->num_rows == 1) {
+                    $stmt->bind_result($buildID, $handle);
+                    $stmt->fetch();
+                    $client = new GearmanClient();
+                    $client->addServer();
+                    $status = $client->jobStatus($handle);
+                    if ($status[0]) {
+                        $url = "status.php?uuid=".$buildID."&simultaneous=true";
+                        header("Location: ".$url);
+                    }
+            }
+            $stmt->close();
+    }
+
+    $timezones = array();
+    $zonetab = file(ZONETAB);
+    foreach ($zonetab as $buf) {
+        if (substr($buf, 0, 1)=='#') {
+            continue;
+        }
+        $rec = preg_split('/\s+/', $buf);
+        $key = $rec[2];
+        $val = $rec[2];
+        $c = count($rec);
+        for ($i=3;$i<$c;$i++) {
+            $val.= ' '.$rec[$i];
+        }
+        $timezones[$key] = $val;
+        ksort($timezones);
+    }
+    $timezoneOption = "";
+    foreach ($timezones as $timezone => $description) {
+        $timezoneOption .= "<option";
+        if ($timezone == DEFAULT_TIMEZONE) {
+            $timezoneOption .= " selected";
+        }
+        $timezoneOption .= ">".$timezone."</option>\n";
+    }
+    $layoutLines = file(GENTOASTER_PATH."/res/keyboard.lst");
+    $keyboardOption = "";
+    $layouts = array();
+    
+    foreach($layoutLines as $layout) {
+        $layoutdata = explode("\t", $layout);
+        $layouts[$layoutdata[0]] = $layoutdata[1];
+    }
+    asort($layouts);
+     
+    foreach($layouts as $layoutCode => $layoutName) {   
+        $keyboardOption .= "<option value=\"".$layoutCode."\"";
+        if ($layoutCode == DEFAULT_KEYBOARD) {
+            $keyboardOption .= " selected";
+        }
+        $keyboardOption .= ">".trim($layoutName)."</option>\n";
+    }
+?>
\ No newline at end of file
diff --git a/ui/process.php b/ui/process.php
new file mode 100644
index 0000000..29dd296
--- /dev/null
+++ b/ui/process.php
@@ -0,0 +1,109 @@
+<?php
+
+    // Gentoaster web interface config processor
+    // Licensed under GPL v3, see COPYING file
+
+    require_once "config.php";
+
+    $ipaddress = filter_input(
+        INPUT_SERVER,
+        "REMOTE_ADDR",
+        FILTER_VALIDATE_IP
+    );
+
+    if (RECAPTCHA_ENABLED) {
+        require_once GENTOASTER_PATH."/ui/recaptcha.php";
+
+        $challenge = filter_input(
+            INPUT_POST,
+            "recaptcha_challenge_field",
+            FILTER_UNSAFE_RAW
+        );
+        
+        $response = filter_input(
+            INPUT_POST, 
+            "recaptcha_response_field",
+            FILTER_UNSAFE_RAW
+        );
+        
+        $resp = recaptcha_check_answer(
+            RECAPTCHA_PRIVATE_KEY,
+            $ipaddress,
+            $challenge,
+            $response
+        );
+                                    
+        if (!$resp->is_valid) {
+            die("CAPTCHA was incorrect");
+        }
+    }
+
+    function sanitize_shellarg($arg)
+    {
+        $arg = str_replace("\r\n", " ", $arg);
+        $arg = str_replace("\n", " ", $arg);
+        return escapeshellarg($arg);
+    }
+    $sfi = array("options" => "sanitize_shellarg");
+
+    $buildID = uniqid();
+    $bootMegabytes = filter_input(INPUT_POST, "boot_size", FILTER_VALIDATE_INT);
+    $swapMegabytes = filter_input(INPUT_POST, "swap_size", FILTER_VALIDATE_INT);
+    $rootMegabytes = filter_input(INPUT_POST, "root_size", FILTER_VALIDATE_INT);
+    $timezone = filter_input(INPUT_POST, "timezone", FILTER_CALLBACK, $sfi);
+    $keyboard = filter_input(INPUT_POST, "keyboard", FILTER_CALLBACK, $sfi);
+    $hostname = filter_input(INPUT_POST, "hostname", FILTER_CALLBACK, $sfi);
+    $username =  filter_input(INPUT_POST, "username", FILTER_CALLBACK, $sfi);
+    $password = filter_input(INPUT_POST, "password", FILTER_CALLBACK, $sfi);
+    $rootPass = filter_input(INPUT_POST, "rootpassword", FILTER_CALLBACK, $sfi);
+    $packagesList = filter_input(INPUT_POST, "packages", FILTER_CALLBACK, $sfi);
+    $use = filter_input(INPUT_POST, "use", FILTER_CALLBACK, $sfi);
+    $puse = filter_input(INPUT_POST, "puse", FILTER_CALLBACK, $sfi);
+    $features = filter_input(INPUT_POST, "features", FILTER_CALLBACK, $sfi);
+    $keywords = filter_input(INPUT_POST, "keywords", FILTER_CALLBACK, $sfi);
+    $outputFormat = filter_input(INPUT_POST, "format", FILTER_CALLBACK, $sfi);
+    $email = filter_input(INPUT_POST, "email", FILTER_VALIDATE_EMAIL);
+
+$iniString = "[vmconfig]
+
+BUILD_ID='$buildID'
+BOOT_MEGABYTES='$bootMegabytes'
+SWAP_MEGABYTES='$swapMegabytes'
+ROOT_MEGABYTES='$rootMegabytes'
+TIMEZONE=$timezone
+KEYBOARD=$keyboard
+HOSTNAME=$hostname
+ROOT_PASSWORD=$rootPass
+DEFAULT_USERNAME=$username
+DEFAULT_PASSWORD=$password
+USE_FLAGS=$use
+PACKAGE_USE=$puse
+FEATURES=$features
+PACKAGE_ACCEPT_KEYWORDS=$keywords
+PACKAGES_LIST=$packagesList
+OUTPUT_FORMAT=$outputFormat";
+
+    $client = new GearmanClient();
+    $client->addServer();
+    $handle = $client->doBackground("invoke_image_build", $iniString);
+
+    $db = new mysqli(
+        MYSQL_HOSTNAME, 
+        MYSQL_USERNAME,
+        MYSQL_PASSWORD, 
+        MYSQL_DATABASE
+    );
+            
+    if (mysqli_connect_errno()) {
+       die("Could not connect to database ".mysqli_connect_error());
+    }
+
+    $query = "INSERT INTO builds (id, handle, ipaddress, email) ".
+             "VALUES(?, ?, ?, ?)";
+    $stmt = $db->prepare($query);
+    $stmt->bind_param("ssss", $buildID, $handle, $ipaddress, $email);
+    $stmt->execute();
+    $stmt->close();
+    $db->close();
+
+    header("Location: finished.php?uuid=".$buildID);
\ No newline at end of file
diff --git a/ui/recaptcha.php b/ui/recaptcha.php
new file mode 100644
index 0000000..32c4f4d
--- /dev/null
+++ b/ui/recaptcha.php
@@ -0,0 +1,277 @@
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          http://recaptcha.net/plugins/php/
+ *    - Get a reCAPTCHA API Key
+ *          https://www.google.com/recaptcha/admin/create
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * The reCAPTCHA server URL's
+ */
+define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
+
+/**
+ * Encodes the given data into a query string format
+ * @param $data - array of string elements to be encoded
+ * @return string - encoded request
+ */
+function _recaptcha_qsencode ($data) {
+        $req = "";
+        foreach ( $data as $key => $value )
+                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+
+        // Cut the last '&'
+        $req=substr($req,0,strlen($req)-1);
+        return $req;
+}
+
+
+
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+
+        $req = _recaptcha_qsencode ($data);
+
+        $http_request  = "POST $path HTTP/1.0\r\n";
+        $http_request .= "Host: $host\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $req;
+
+        $response = '';
+        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+                die ('Could not open socket');
+        }
+
+        fwrite($fs, $http_request);
+
+        while ( !feof($fs) )
+                $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+
+        return $response;
+}
+
+
+
+/**
+ * Gets the challenge HTML (javascript and non-javascript version).
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ * @param string $pubkey A public key for reCAPTCHA
+ * @param string $error The error given by reCAPTCHA (optional, default is null)
+ * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
+
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+{
+	if ($pubkey == null || $pubkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+	}
+	
+	if ($use_ssl) {
+                $server = RECAPTCHA_API_SECURE_SERVER;
+        } else {
+                $server = RECAPTCHA_API_SERVER;
+        }
+
+        $errorpart = "";
+        if ($error) {
+           $errorpart = "&amp;error=" . $error;
+        }
+        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+
+	<noscript>
+  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+	</noscript>';
+}
+
+
+
+
+/**
+ * A ReCaptchaResponse is returned from recaptcha_check_answer()
+ */
+class ReCaptchaResponse {
+        var $is_valid;
+        var $error;
+}
+
+
+/**
+  * Calls an HTTP POST function to verify if the user's guess was correct
+  * @param string $privkey
+  * @param string $remoteip
+  * @param string $challenge
+  * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
+  * @return ReCaptchaResponse
+  */
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+{
+	if ($privkey == null || $privkey == '') {
+		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+	}
+
+	if ($remoteip == null || $remoteip == '') {
+		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+	}
+
+	
+	
+        //discard spam submissions
+        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+                $recaptcha_response = new ReCaptchaResponse();
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = 'incorrect-captcha-sol';
+                return $recaptcha_response;
+        }
+
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array (
+                                                 'privatekey' => $privkey,
+                                                 'remoteip' => $remoteip,
+                                                 'challenge' => $challenge,
+                                                 'response' => $response
+                                                 ) + $extra_params
+                                          );
+
+        $answers = explode ("\n", $response [1]);
+        $recaptcha_response = new ReCaptchaResponse();
+
+        if (trim ($answers [0]) == 'true') {
+                $recaptcha_response->is_valid = true;
+        }
+        else {
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = $answers [1];
+        }
+        return $recaptcha_response;
+
+}
+
+/**
+ * gets a URL where the user can sign up for reCAPTCHA. If your application
+ * has a configuration page where you enter a key, you should provide a link
+ * using this function.
+ * @param string $domain The domain where the page is hosted
+ * @param string $appname The name of your application
+ */
+function recaptcha_get_signup_url ($domain = null, $appname = null) {
+	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+}
+
+function _recaptcha_aes_pad($val) {
+	$block_size = 16;
+	$numpad = $block_size - (strlen ($val) % $block_size);
+	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+}
+
+/* Mailhide related code */
+
+function _recaptcha_aes_encrypt($val,$ky) {
+	if (! function_exists ("mcrypt_encrypt")) {
+		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+	}
+	$mode=MCRYPT_MODE_CBC;   
+	$enc=MCRYPT_RIJNDAEL_128;
+	$val=_recaptcha_aes_pad($val);
+	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+}
+
+
+function _recaptcha_mailhide_urlbase64 ($x) {
+	return strtr(base64_encode ($x), '+/', '-_');
+}
+
+/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
+function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+	}
+	
+
+	$ky = pack('H*', $privkey);
+	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+	
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+}
+
+/**
+ * gets the parts of the email to expose to the user.
+ * eg, given johndoe@example,com return ["john", "example.com"].
+ * the email is then displayed as john...@example.com
+ */
+function _recaptcha_mailhide_email_parts ($email) {
+	$arr = preg_split("/@/", $email );
+
+	if (strlen ($arr[0]) <= 4) {
+		$arr[0] = substr ($arr[0], 0, 1);
+	} else if (strlen ($arr[0]) <= 6) {
+		$arr[0] = substr ($arr[0], 0, 3);
+	} else {
+		$arr[0] = substr ($arr[0], 0, 4);
+	}
+	return $arr;
+}
+
+/**
+ * Gets html to display an email address given a public an private key.
+ * to get a key, go to:
+ *
+ * http://www.google.com/recaptcha/mailhide/apikey
+ */
+function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+	$emailparts = _recaptcha_mailhide_email_parts ($email);
+	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+	
+	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+
+}
+
+
+?>
diff --git a/ui/status.php b/ui/status.php
new file mode 100644
index 0000000..5b10483
--- /dev/null
+++ b/ui/status.php
@@ -0,0 +1,107 @@
+<?php
+
+    // Gentoaster web interface status
+    // Licensed under GPL v3, see COPYING file
+
+    require_once "config.php";
+
+    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
+    $simultaneous = filter_input(
+        INPUT_GET, 
+        "simultaneous", 
+        FILTER_VALIDATE_BOOLEAN
+    );
+    $bres = "Unknown!";
+    $inprogress = false;
+    $builddone = false;
+    $simultaneousString = "";
+
+    if ($simultaneous && !SIMULTANEOUS_BUILDS) {
+        $simultaneousString = "You were redirected to this page because you ". 
+                              "already have a build in progress. Simultaneous ".
+                              "builds are disabled on this server.<br/><br/>";
+    }
+
+    $db = new mysqli(
+        MYSQL_HOSTNAME, 
+        MYSQL_USERNAME,
+        MYSQL_PASSWORD, 
+        MYSQL_DATABASE
+    );
+    
+    if (mysqli_connect_errno()) {
+       die("Could not connect to database ".mysqli_connect_error());
+    }
+
+    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
+    $stmt->bind_param("s", $buildID);
+    $stmt->execute();
+    $stmt->store_result();
+    if ($stmt->num_rows == 1) {
+            $stmt->bind_result($handle);
+            $stmt->fetch();
+            $stmt->close();
+            $client = new GearmanClient();
+            $client->addServer();
+
+            $status = $client->jobStatus($handle);
+            if ($status[0]) {
+                    if ($status[3] != 0) {
+                            $percentage = ceil($status[2]/$status[3]*100);
+                            $bres = "Your build is currently running".
+                                           " and is <span id=\"percent\">".$percentage."</span>% complete";
+                            $inprogress = true;
+                    } else {
+                            $bres = "Task has not yet been processed";
+                    }
+            } else {
+                    $query = "SELECT returncode, result ".
+                             "FROM builds WHERE id = ?";
+                    $stmt = $db->prepare($query);
+                    $stmt->bind_param("s", $buildID);
+                    $stmt->execute();
+                    $stmt->bind_result($returncode, $result);
+                    $stmt->fetch();
+                    $stmt->close();
+                    if ($returncode !== null) {
+                            if ($returncode == 0) {
+                                $bres = "Your build is complete! ".
+                                   "What would you like to do now?".
+                                   "<br /><br /><center>".
+                                   "<table><tr><td>".
+                                   "<a href=\"".IMAGES_URL."/".
+                                   $buildID."/".$buildID.
+                                   ".tar.gz\">".
+                                   "<img style=\"padding: 10px;\" ".
+                                   "src=\"img/icons/download.png\">".
+                                   "</a></td><td>".
+                                   "<a href=\"testdrive.php?uuid=".
+                                   $buildID."\">".
+                                   "<img style=\"padding: 10px;\" ".
+                                   "src=\"img/icons/testdrive.png\">".
+                                   "</a></td></tr>".
+                                   "<tr><td>Download</td>".
+                                   "<td>Testdrive</td></tr>".
+                                   "</table></center>";
+                                $builddone = true;
+                            } else {
+                                $bres = "Job returned with code ".
+                                        $returncode.": ".$result;
+                            }
+                    } else {
+                            $bres = "Job failed";
+                    }
+            }
+    } else {
+            $stmt->close();
+            $bres = "Invalid handle hash";
+    }
+
+    $db->close();
+    
+    if (!$builddone) {
+        $titleString = "How's things?";
+    } else {
+        $titleString = "It's showtime!";
+    }
+?>
\ No newline at end of file
diff --git a/ui/testdrive.php b/ui/testdrive.php
new file mode 100644
index 0000000..be4c514
--- /dev/null
+++ b/ui/testdrive.php
@@ -0,0 +1,69 @@
+<?php
+
+    // Gentoaster web interface framebuffer testdrive
+    // Licensed under GPL v3, see COPYING file
+
+    require_once "config.php";
+
+    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
+    $buildresult = "Unknown!";
+    $inprogress = false;
+
+    $db = new mysqli(
+        MYSQL_HOSTNAME, 
+        MYSQL_USERNAME,
+        MYSQL_PASSWORD, 
+        MYSQL_DATABASE
+    );
+    
+    if (mysqli_connect_errno()) {
+       die("Could not connect to database ".mysqli_connect_error());
+    }
+
+    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
+    $stmt->bind_param("s", $buildID);
+    $stmt->execute();
+    $stmt->store_result();
+    if ($stmt->num_rows == 1) {
+            $stmt->bind_result($handle);
+            $stmt->fetch();
+            $stmt->close();
+            $client = new GearmanClient();
+            $client->addServer();
+
+            $status = $client->jobStatus($handle);
+            if ($status[0]) {
+                    header("Location: status.php?uuid=".$buildID);
+            } else {
+                    $query = "SELECT returncode, result ".
+                             "FROM builds WHERE id = ?";
+                    $stmt = $db->prepare($query);
+                    $stmt->bind_param("s", $buildID);
+                    $stmt->execute();
+                    $stmt->bind_result($returncode, $result);
+                    $stmt->fetch();
+                    $stmt->close();
+                    if ($returncode !== null) {
+                            if ($returncode == 0) {
+                                // we're built, let's do this
+                                $client = new GearmanClient();
+                                $client->addServer();
+                                $server = $client->do(
+                                    "invoke_start_image",
+                                    $buildID
+                                );
+                                $server = unserialize($server);
+                            } else {
+                                header("Location: status.php?uuid=".$buildID);
+                            }
+                    } else {
+                               header("Location: status.php?uuid=".$buildID);
+                    }
+            }
+    } else {
+            $stmt->close();
+            die("Invalid handle hash");
+    }
+
+    $db->close();
+?>
\ No newline at end of file
diff --git a/web/ajax.php b/web/ajax.php
index 105c893..0b11359 100644
--- a/web/ajax.php
+++ b/web/ajax.php
@@ -1,72 +1,4 @@
 <?php
-
-    // Gentoaster web interface AJAX remote
-    // Licensed under GPL v3, see COPYING file
-
-    require_once "config.php";
-
-    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
-
-
-    $db = new mysqli(
-        MYSQL_HOSTNAME, 
-        MYSQL_USERNAME,
-        MYSQL_PASSWORD, 
-        MYSQL_DATABASE
-    );
-    
-    if (mysqli_connect_errno()) {
-       die("Could not connect to database ".mysqli_connect_error());
-    }
-
-    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
-    $stmt->bind_param("s", $buildID);
-    $stmt->execute();
-    $stmt->store_result();
-    if ($stmt->num_rows == 1) {
-            $stmt->bind_result($handle);
-            $stmt->fetch();
-            $stmt->close();
-            $client = new GearmanClient();
-            $client->addServer();
-
-            $status = $client->jobStatus($handle);
-            if ($status[0]) {
-                    if ($status[3] != 0) {
-                            // in progress
-                            $ret = array("status" => 1, "num" => $status[2], "den" => $status[3]);
-                    } else {
-                            // not yet processed
-                            $ret = array("status" => 2);
-                    }
-            } else {
-                    $query = "SELECT returncode, result ".
-                             "FROM builds WHERE id = ?";
-                    $stmt = $db->prepare($query);
-                    $stmt->bind_param("s", $buildID);
-                    $stmt->execute();
-                    $stmt->bind_result($returncode, $result);
-                    $stmt->fetch();
-                    $stmt->close();
-                    if ($returncode !== null) {
-                            if ($returncode == 0) {
-                                 // finished
-                                 $ret = array("status" => 0);
-                            } else {
-                                // returned with non-zero status code
-                                 $ret = array("status" => 3);
-                            }
-                    } else {
-                            // failed
-                             $ret = array("status" => 4);
-                    }
-            }
-    } else {
-             // job not found
-             $ret = array("status" => -1);
-    }
-
-    $db->close();
-    
-    echo json_encode($ret);
+	require_once "config.php";
+	require_once GENTOASTER_PATH."/ui/ajax.php";
 ?>
\ No newline at end of file
diff --git a/web/index.php b/web/index.php
index 6bb2f9f..aa17151 100644
--- a/web/index.php
+++ b/web/index.php
@@ -1,90 +1,6 @@
 <?php
-    require_once "config.php";
-    
-    if (RECAPTCHA_ENABLED) {
-        require_once "recaptcha.php";
-    }
-
-    if (!SIMULTANEOUS_BUILDS) {
-            $db = new mysqli(
-                MYSQL_HOSTNAME, 
-                MYSQL_USERNAME,
-                MYSQL_PASSWORD, 
-                MYSQL_DATABASE
-            );
-                  
-            if (mysqli_connect_errno()) {
-               die("Could not connect to database ".mysqli_connect_error());
-            }
-        
-            $ipaddress = filter_input(
-                INPUT_SERVER, 
-                "REMOTE_ADDR",
-                FILTER_VALIDATE_IP
-            );
-                
-            $query = "SELECT id, handle ".
-                     "FROM builds WHERE ipaddress = ?";
-            $stmt = $db->prepare($query);
-            $stmt->bind_param("s", $ipaddress);
-            $stmt->execute();
-            $stmt->store_result();
-                        
-            if ($stmt->num_rows == 1) {
-                    $stmt->bind_result($buildID, $handle);
-                    $stmt->fetch();
-                    $client = new GearmanClient();
-                    $client->addServer();
-                    $status = $client->jobStatus($handle);
-                    if ($status[0]) {
-                        $url = "status.php?uuid=".$buildID."&simultaneous=true";
-                        header("Location: ".$url);
-                    }
-            }
-            $stmt->close();
-    }
-
-    $timezones = array();
-    $zonetab = file(ZONETAB);
-    foreach ($zonetab as $buf) {
-        if (substr($buf, 0, 1)=='#') {
-            continue;
-        }
-        $rec = preg_split('/\s+/', $buf);
-        $key = $rec[2];
-        $val = $rec[2];
-        $c = count($rec);
-        for ($i=3;$i<$c;$i++) {
-            $val.= ' '.$rec[$i];
-        }
-        $timezones[$key] = $val;
-        ksort($timezones);
-    }
-    $timezoneOption = "";
-    foreach ($timezones as $timezone => $description) {
-        $timezoneOption .= "<option";
-        if ($timezone == DEFAULT_TIMEZONE) {
-            $timezoneOption .= " selected";
-        }
-        $timezoneOption .= ">".$timezone."</option>\n";
-    }
-    $layoutLines = file(GENTOASTER_PATH."/res/keyboard.lst");
-    $keyboardOption = "";
-    $layouts = array();
-    
-    foreach($layoutLines as $layout) {
-        $layoutdata = explode("\t", $layout);
-        $layouts[$layoutdata[0]] = $layoutdata[1];
-    }
-    asort($layouts);
-     
-    foreach($layouts as $layoutCode => $layoutName) {   
-        $keyboardOption .= "<option value=\"".$layoutCode."\"";
-        if ($layoutCode == DEFAULT_KEYBOARD) {
-            $keyboardOption .= " selected";
-        }
-        $keyboardOption .= ">".trim($layoutName)."</option>\n";
-    }
+	require_once "config.php";
+	require_once GENTOASTER_PATH."/ui/index.php";
 ?>
 <html>
     <head>
diff --git a/web/process.php b/web/process.php
index de8ea90..0105475 100644
--- a/web/process.php
+++ b/web/process.php
@@ -1,109 +1,4 @@
 <?php
-
-    // Gentoaster web interface config processor
-    // Licensed under GPL v3, see COPYING file
-
-    require_once "config.php";
-
-    $ipaddress = filter_input(
-        INPUT_SERVER,
-        "REMOTE_ADDR",
-        FILTER_VALIDATE_IP
-    );
-
-    if (RECAPTCHA_ENABLED) {
-        require_once "recaptcha.php";
-
-        $challenge = filter_input(
-            INPUT_POST,
-            "recaptcha_challenge_field",
-            FILTER_UNSAFE_RAW
-        );
-        
-        $response = filter_input(
-            INPUT_POST, 
-            "recaptcha_response_field",
-            FILTER_UNSAFE_RAW
-        );
-        
-        $resp = recaptcha_check_answer(
-            RECAPTCHA_PRIVATE_KEY,
-            $ipaddress,
-            $challenge,
-            $response
-        );
-                                    
-        if (!$resp->is_valid) {
-            die("CAPTCHA was incorrect");
-        }
-    }
-
-    function sanitize_shellarg($arg)
-    {
-        $arg = str_replace("\r\n", " ", $arg);
-        $arg = str_replace("\n", " ", $arg);
-        return escapeshellarg($arg);
-    }
-    $sfi = array("options" => "sanitize_shellarg");
-
-    $buildID = uniqid();
-    $bootMegabytes = filter_input(INPUT_POST, "boot_size", FILTER_VALIDATE_INT);
-    $swapMegabytes = filter_input(INPUT_POST, "swap_size", FILTER_VALIDATE_INT);
-    $rootMegabytes = filter_input(INPUT_POST, "root_size", FILTER_VALIDATE_INT);
-    $timezone = filter_input(INPUT_POST, "timezone", FILTER_CALLBACK, $sfi);
-    $keyboard = filter_input(INPUT_POST, "keyboard", FILTER_CALLBACK, $sfi);
-    $hostname = filter_input(INPUT_POST, "hostname", FILTER_CALLBACK, $sfi);
-    $username =  filter_input(INPUT_POST, "username", FILTER_CALLBACK, $sfi);
-    $password = filter_input(INPUT_POST, "password", FILTER_CALLBACK, $sfi);
-    $rootPass = filter_input(INPUT_POST, "rootpassword", FILTER_CALLBACK, $sfi);
-    $packagesList = filter_input(INPUT_POST, "packages", FILTER_CALLBACK, $sfi);
-    $use = filter_input(INPUT_POST, "use", FILTER_CALLBACK, $sfi);
-    $puse = filter_input(INPUT_POST, "puse", FILTER_CALLBACK, $sfi);
-    $features = filter_input(INPUT_POST, "features", FILTER_CALLBACK, $sfi);
-    $keywords = filter_input(INPUT_POST, "keywords", FILTER_CALLBACK, $sfi);
-    $outputFormat = filter_input(INPUT_POST, "format", FILTER_CALLBACK, $sfi);
-    $email = filter_input(INPUT_POST, "email", FILTER_VALIDATE_EMAIL);
-
-$iniString = "[vmconfig]
-
-BUILD_ID='$buildID'
-BOOT_MEGABYTES='$bootMegabytes'
-SWAP_MEGABYTES='$swapMegabytes'
-ROOT_MEGABYTES='$rootMegabytes'
-TIMEZONE=$timezone
-KEYBOARD=$keyboard
-HOSTNAME=$hostname
-ROOT_PASSWORD=$rootPass
-DEFAULT_USERNAME=$username
-DEFAULT_PASSWORD=$password
-USE_FLAGS=$use
-PACKAGE_USE=$puse
-FEATURES=$features
-PACKAGE_ACCEPT_KEYWORDS=$keywords
-PACKAGES_LIST=$packagesList
-OUTPUT_FORMAT=$outputFormat";
-
-    $client = new GearmanClient();
-    $client->addServer();
-    $handle = $client->doBackground("invoke_image_build", $iniString);
-
-    $db = new mysqli(
-        MYSQL_HOSTNAME, 
-        MYSQL_USERNAME,
-        MYSQL_PASSWORD, 
-        MYSQL_DATABASE
-    );
-            
-    if (mysqli_connect_errno()) {
-       die("Could not connect to database ".mysqli_connect_error());
-    }
-
-    $query = "INSERT INTO builds (id, handle, ipaddress, email) ".
-             "VALUES(?, ?, ?, ?)";
-    $stmt = $db->prepare($query);
-    $stmt->bind_param("ssss", $buildID, $handle, $ipaddress, $email);
-    $stmt->execute();
-    $stmt->close();
-    $db->close();
-
-    header("Location: finished.php?uuid=".$buildID);
\ No newline at end of file
+	require_once "config.php";
+	require_once GENTOASTER_PATH."/ui/process.php";
+?>
\ No newline at end of file
diff --git a/web/recaptcha.php b/web/recaptcha.php
deleted file mode 100644
index 32c4f4d..0000000
--- a/web/recaptcha.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          http://recaptcha.net/plugins/php/
- *    - Get a reCAPTCHA API Key
- *          https://www.google.com/recaptcha/admin/create
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
- * AUTHORS:
- *   Mike Crawford
- *   Ben Maurer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * The reCAPTCHA server URL's
- */
-define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
-
-/**
- * Encodes the given data into a query string format
- * @param $data - array of string elements to be encoded
- * @return string - encoded request
- */
-function _recaptcha_qsencode ($data) {
-        $req = "";
-        foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
-
-        // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
-        return $req;
-}
-
-
-
-/**
- * Submits an HTTP POST to a reCAPTCHA server
- * @param string $host
- * @param string $path
- * @param array $data
- * @param int port
- * @return array response
- */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
-
-        $req = _recaptcha_qsencode ($data);
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
-        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $req;
-
-        $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
-        }
-
-        fwrite($fs, $http_request);
-
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
-
-        return $response;
-}
-
-
-
-/**
- * Gets the challenge HTML (javascript and non-javascript version).
- * This is called from the browser, and the resulting reCAPTCHA HTML widget
- * is embedded within the HTML form it was called from.
- * @param string $pubkey A public key for reCAPTCHA
- * @param string $error The error given by reCAPTCHA (optional, default is null)
- * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
-
- * @return string - The HTML to be embedded in the user's form.
- */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
-{
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-	
-	if ($use_ssl) {
-                $server = RECAPTCHA_API_SECURE_SERVER;
-        } else {
-                $server = RECAPTCHA_API_SERVER;
-        }
-
-        $errorpart = "";
-        if ($error) {
-           $errorpart = "&amp;error=" . $error;
-        }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
-
-	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
-  		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
-  		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
-	</noscript>';
-}
-
-
-
-
-/**
- * A ReCaptchaResponse is returned from recaptcha_check_answer()
- */
-class ReCaptchaResponse {
-        var $is_valid;
-        var $error;
-}
-
-
-/**
-  * Calls an HTTP POST function to verify if the user's guess was correct
-  * @param string $privkey
-  * @param string $remoteip
-  * @param string $challenge
-  * @param string $response
-  * @param array $extra_params an array of extra variables to post to the server
-  * @return ReCaptchaResponse
-  */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
-{
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
-	}
-
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
-	}
-
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
-                $recaptcha_response = new ReCaptchaResponse();
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = 'incorrect-captcha-sol';
-                return $recaptcha_response;
-        }
-
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
-                                          array (
-                                                 'privatekey' => $privkey,
-                                                 'remoteip' => $remoteip,
-                                                 'challenge' => $challenge,
-                                                 'response' => $response
-                                                 ) + $extra_params
-                                          );
-
-        $answers = explode ("\n", $response [1]);
-        $recaptcha_response = new ReCaptchaResponse();
-
-        if (trim ($answers [0]) == 'true') {
-                $recaptcha_response->is_valid = true;
-        }
-        else {
-                $recaptcha_response->is_valid = false;
-                $recaptcha_response->error = $answers [1];
-        }
-        return $recaptcha_response;
-
-}
-
-/**
- * gets a URL where the user can sign up for reCAPTCHA. If your application
- * has a configuration page where you enter a key, you should provide a link
- * using this function.
- * @param string $domain The domain where the page is hosted
- * @param string $appname The name of your application
- */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
-}
-
-function _recaptcha_aes_pad($val) {
-	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
-}
-
-/* Mailhide related code */
-
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
-	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-}
-
-
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
-}
-
-/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
-	}
-	
-
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
-}
-
-/**
- * gets the parts of the email to expose to the user.
- * eg, given johndoe@example,com return ["john", "example.com"].
- * the email is then displayed as john...@example.com
- */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
-
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
-	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
-	}
-	return $arr;
-}
-
-/**
- * Gets html to display an email address given a public an private key.
- * to get a key, go to:
- *
- * http://www.google.com/recaptcha/mailhide/apikey
- */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
-
-}
-
-
-?>
diff --git a/web/status.php b/web/status.php
index bde0ad2..676b528 100644
--- a/web/status.php
+++ b/web/status.php
@@ -1,109 +1,6 @@
 <?php
-
-    // Gentoaster web interface finished stage
-    // Licensed under GPL v3, see COPYING file
-
-    require_once "config.php";
-
-    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
-    $simultaneous = filter_input(
-        INPUT_GET, 
-        "simultaneous", 
-        FILTER_VALIDATE_BOOLEAN
-    );
-    $bres = "Unknown!";
-    $inprogress = false;
-    $builddone = false;
-    $simultaneousString = "";
-
-    if ($simultaneous && !SIMULTANEOUS_BUILDS) {
-        $simultaneousString = "You were redirected to this page because you ". 
-                              "already have a build in progress. Simultaneous ".
-                              "builds are disabled on this server.<br/><br/>";
-    }
-
-    $db = new mysqli(
-        MYSQL_HOSTNAME, 
-        MYSQL_USERNAME,
-        MYSQL_PASSWORD, 
-        MYSQL_DATABASE
-    );
-    
-    if (mysqli_connect_errno()) {
-       die("Could not connect to database ".mysqli_connect_error());
-    }
-
-    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
-    $stmt->bind_param("s", $buildID);
-    $stmt->execute();
-    $stmt->store_result();
-    if ($stmt->num_rows == 1) {
-            $stmt->bind_result($handle);
-            $stmt->fetch();
-            $stmt->close();
-            $client = new GearmanClient();
-            $client->addServer();
-
-            $status = $client->jobStatus($handle);
-            if ($status[0]) {
-                    if ($status[3] != 0) {
-                            $percentage = ceil($status[2]/$status[3]*100);
-                            $bres = "Your build is currently running".
-                                           " and is <span id=\"percent\">".$percentage."</span>% complete";
-                            $inprogress = true;
-                    } else {
-                            $bres = "Task has not yet been processed";
-                    }
-            } else {
-                    $query = "SELECT returncode, result ".
-                             "FROM builds WHERE id = ?";
-                    $stmt = $db->prepare($query);
-                    $stmt->bind_param("s", $buildID);
-                    $stmt->execute();
-                    $stmt->bind_result($returncode, $result);
-                    $stmt->fetch();
-                    $stmt->close();
-                    if ($returncode !== null) {
-                            if ($returncode == 0) {
-                                $bres = "Your build is complete! ".
-                                   "What would you like to do now?".
-                                   "<br /><br /><center>".
-                                   "<table><tr><td>".
-                                   "<a href=\"".IMAGES_URL."/".
-                                   $buildID."/".$buildID.
-                                   ".tar.gz\">".
-                                   "<img style=\"padding: 10px;\" ".
-                                   "src=\"img/icons/download.png\">".
-                                   "</a></td><td>".
-                                   "<a href=\"testdrive.php?uuid=".
-                                   $buildID."\">".
-                                   "<img style=\"padding: 10px;\" ".
-                                   "src=\"img/icons/testdrive.png\">".
-                                   "</a></td></tr>".
-                                   "<tr><td>Download</td>".
-                                   "<td>Testdrive</td></tr>".
-                                   "</table></center>";
-                                $builddone = true;
-                            } else {
-                                $bres = "Job returned with code ".
-                                        $returncode.": ".$result;
-                            }
-                    } else {
-                            $bres = "Job failed";
-                    }
-            }
-    } else {
-            $stmt->close();
-            $bres = "Invalid handle hash";
-    }
-
-    $db->close();
-    
-    if (!$builddone) {
-        $titleString = "How's things?";
-    } else {
-        $titleString = "It's showtime!";
-    }
+	require_once "config.php";
+	require_once GENTOASTER_PATH."/ui/status.php";
 ?>
 <html>
     <head>
diff --git a/web/testdrive.php b/web/testdrive.php
index a141af5..4c17bdd 100644
--- a/web/testdrive.php
+++ b/web/testdrive.php
@@ -1,71 +1,6 @@
 <?php
-
-    // Gentoaster web interface testdrive
-    // Licensed under GPL v3, see COPYING file
-
-    require_once "config.php";
-
-    $buildID = filter_input(INPUT_GET, "uuid", FILTER_UNSAFE_RAW);
-    $buildresult = "Unknown!";
-    $inprogress = false;
-
-    $db = new mysqli(
-        MYSQL_HOSTNAME, 
-        MYSQL_USERNAME,
-        MYSQL_PASSWORD, 
-        MYSQL_DATABASE
-    );
-    
-    if (mysqli_connect_errno()) {
-       die("Could not connect to database ".mysqli_connect_error());
-    }
-
-    $stmt = $db->prepare("SELECT handle FROM builds WHERE id = ?");
-    $stmt->bind_param("s", $buildID);
-    $stmt->execute();
-    $stmt->store_result();
-    if ($stmt->num_rows == 1) {
-            $stmt->bind_result($handle);
-            $stmt->fetch();
-            $stmt->close();
-            $client = new GearmanClient();
-            $client->addServer();
-
-            $status = $client->jobStatus($handle);
-            if ($status[0]) {
-                    header("Location: status.php?uuid=".$buildID);
-            } else {
-                    $query = "SELECT returncode, result ".
-                             "FROM builds WHERE id = ?";
-                    $stmt = $db->prepare($query);
-                    $stmt->bind_param("s", $buildID);
-                    $stmt->execute();
-                    $stmt->bind_result($returncode, $result);
-                    $stmt->fetch();
-                    $stmt->close();
-                    if ($returncode !== null) {
-                            if ($returncode == 0) {
-                                // we're built, let's do this
-                                $client = new GearmanClient();
-                                $client->addServer();
-                                $server = $client->do(
-                                    "invoke_start_image",
-                                    $buildID
-                                );
-                                $server = unserialize($server);
-                            } else {
-                                header("Location: status.php?uuid=".$buildID);
-                            }
-                    } else {
-                               header("Location: status.php?uuid=".$buildID);
-                    }
-            }
-    } else {
-            $stmt->close();
-            die("Invalid handle hash");
-    }
-
-    $db->close();
+	require_once "config.php";
+	require_once GENTOASTER_PATH."/ui/testdrive.php";
 ?>
 <html>
     <head>
diff --git a/wrap.sh b/wrap.sh
index 9a2cc65..8b5da72 100755
--- a/wrap.sh
+++ b/wrap.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# this is a dirty hack that will be disappearing soon
-# just saves me restarting the daemon every time i want to change something
-
 cd  /usr/share/websockify
-MEMORY=512
-DISP=$(( ${2}-5900 ))
-DISP2=$(( ${2}+1000 ))
-qemu -hda $1 -m ${MEMORY} -net nic -net user -vnc :$DISP -usbdevice tablet &
-websockify -D ${DISP2} 127.0.0.1:${2}
+MEMORY=${3}
+VNCDISPLAY=$(( ${2}-5900 ))
+RPORT=$(( ${2}+1000 ))
+qemu -hda $1 -m ${MEMORY} -net nic -net user -vnc :$VNCDISPLAY -usbdevice tablet &
+websockify -D ${RPORT} 127.0.0.1:${2}
-- 
cgit v1.2.3-65-gdbad