diff options
| author |   Liam McLoughlin <hexxeh@hexxeh.net> | 2011-07-27 22:40:22 +0100 |
|---|---|---|
| committer | Liam McLoughlin <hexxeh@hexxeh.net> | 2011-07-27 22:40:22 +0100 |
| commit | 5af0df843f05f6f1650ccb63498741431bb9d58a (patch) | |
| tree | 75487bb61aa8e6787b59a94415d3d41aba785478 /web/testdrive.php | |
| parent | Fix broken shell filter (diff) | |
| download | gentoaster-5af0df843f05f6f1650ccb63498741431bb9d58a.tar.gz gentoaster-5af0df843f05f6f1650ccb63498741431bb9d58a.tar.bz2 gentoaster-5af0df843f05f6f1650ccb63498741431bb9d58a.zip | |
Making everything Zend compliant again
Diffstat (limited to 'web/testdrive.php')
| -rw-r--r-- | web/testdrive.php | 104 |
1 files changed, 65 insertions, 39 deletions
diff --git a/web/testdrive.php b/web/testdrive.php index 3847b69..7610811 100644 --- a/web/testdrive.php +++ b/web/testdrive.php @@ -9,8 +9,13 @@ $buildresult = "Unknown!"; $inprogress = false; - $db = new mysqli(MYSQL_HOSTNAME, MYSQL_USERNAME, - MYSQL_PASSWORD, MYSQL_DATABASE); + $db = new mysqli( + MYSQL_HOSTNAME, + MYSQL_USERNAME, + MYSQL_PASSWORD, + MYSQL_DATABASE + ); + if (mysqli_connect_errno()) { die("Could not connect to database ".mysqli_connect_error()); } @@ -30,7 +35,9 @@ if ($status[0]) { header("Location: status.php?uuid=".$buildID); } else { - $stmt = $db->prepare("SELECT returncode, result FROM builds WHERE id = ?"); + $query = "SELECT returncode, result ". + "FROM builds WHERE id = ?"; + $stmt = $db->prepare($query); $stmt->bind_param("s", $buildID); $stmt->execute(); $stmt->bind_result($returncode, $result); @@ -41,7 +48,10 @@ // we're built, let's do this $client = new GearmanClient(); $client->addServer(); - $server = $client->do("invoke_start_image", $buildID); + $server = $client->do( + "invoke_start_image", + $buildID + ); $server = unserialize($server); } else { header("Location: status.php?uuid=".$buildID); @@ -61,9 +71,10 @@ <head> <title>Gentoaster</title> <link rel="stylesheet" type="text/css" href="css/style.css"> - <link rel="stylesheet" type="text/css" href="css/ui-lightness/jquery-ui-1.8.14.custom.css"> - <script type="text/javascript" src="/js/jquery-1.5.1.min.js"></script> - <script type="text/javascript" src="/js/jquery-ui-1.8.14.custom.min.js"></script> + <link rel="stylesheet" type="text/css" + href="css/ui-lightness/jquery-ui-1.8.14.custom.css"> + <script type="text/javascript" src="/js/jquery-1.5.1.min.js"></script> + <script type="text/javascript" src="/js/jquery-ui-1.8.14.js"></script> <script type="text/javascript" src="include/vnc.js"></script> </head> <body> @@ -75,16 +86,24 @@ <h1>Let's fire her up!</h1> <center> <div id="VNC_screen"> - <div id="VNC_status_bar" class="VNC_status_bar" style="margin-top: -25px;"> + <div id="VNC_status_bar" class="VNC_status_bar" + style="margin-top: -25px;"> <table border=0 width="100%"><tr> - <td><div id="VNC_status" style="display: none;">Loading</div></td> + <td> + <div id="VNC_status" + style="display: none;"> + Loading + </div> + </td> <td width="1%"><div id="VNC_buttons"> - <input type=button value="Send CtrlAltDel" + <input type=button + value="Send CtrlAltDel" id="sendCtrlAltDelButton"> </div></td> </tr></table> </div> - <canvas id="VNC_canvas" width="640px" height="20px"> + <canvas id="VNC_canvas" width="640px" + height="20px"> Canvas not supported. </canvas> </div> @@ -97,21 +116,11 @@ var rfb; - function passwordRequired(rfb) { - var msg; - msg = '<form onsubmit="return setPassword();"'; - msg += ' style="margin-bottom: 0px">'; - msg += 'Password Required: '; - msg += '<input type=password size=10 id="password_input" class="VNC_status">'; - msg += '<\/form>'; - $D('VNC_status_bar').setAttribute("class", "VNC_status_warn"); - $D('VNC_status').innerHTML = msg; - } function setPassword() { rfb.sendPassword($D('password_input').value); return false; } - function sendCtrlAltDel() { + function sendCAD() { rfb.sendCtrlAltDel(); return false; } @@ -121,19 +130,35 @@ sb = $D('VNC_status_bar'); cad = $D('sendCtrlAltDelButton'); switch (state) { - case 'failed': level = "error"; break; - case 'fatal': level = "error"; break; - case 'normal': level = "normal"; break; - case 'disconnected': level = "normal"; break; - case 'loaded': level = "normal"; break; - default: level = "warn"; break; + case 'failed': + level = "error"; + break; + case 'fatal': + level = "error"; + break; + case 'normal': + level = "normal"; + break; + case 'disconnected': + level = "normal"; + break; + case 'loaded': + level = "normal"; + break; + default: + level = "warn"; + break; } - if (state === "normal") { cad.disabled = false; } - else { cad.disabled = true; } + if (state === "normal") { + cad.disabled = false; + } else { + cad.disabled = true; + } if (typeof(msg) !== 'undefined') { - sb.setAttribute("class", "VNC_status_" + level); + attr = "VNC_status_" + level; + sb.setAttribute("class", attr); s.innerHTML = msg; } } @@ -141,19 +166,20 @@ function connect() { var host, port, password; - $D('sendCtrlAltDelButton').onclick = sendCtrlAltDel; + $D('sendCtrlAltDelButton').onclick = sendCAD; host = "<?php echo $server[0]; ?>"; port = <?php echo $server[1]; ?>; password = ""; - rfb = new RFB({'target': $D('VNC_canvas'), - 'encrypt': WebUtil.getQueryVar('encrypt', false), - 'true_color': WebUtil.getQueryVar('true_color', true), - 'local_cursor': WebUtil.getQueryVar('cursor', true), - 'shared': WebUtil.getQueryVar('shared', true), - 'updateState': updateState, - 'onPasswordRequired': passwordRequired}); + gqv = WebUtil.getQueryVar; + + rfb = new RFB({'target':$D('VNC_canvas'), + 'encrypt': gqv('encrypt',false), + 'true_color': gqv('true_color',true), + 'local_cursor': gqv('cursor',true), + 'shared': gqv('shared',true), + 'updateState': updateState, rfb.connect(host, port, password); }; |