--- misc/xenconsole/index.php	2013/03/26 13:15:05	1957
+++ misc/xenconsole/index.php	2013/07/23 15:30:12	2028
@@ -1,5 +1,5 @@
 <?php
-include("config.php");
+require("config.php");
 
 function format_memory($size) {
   if (1024 > $size) {
@@ -58,6 +58,19 @@
 
 <script type='text/javascript'>
 var menu = 0;
+var menu_uuid = '';
+
+var user = "";
+var password = "";
+var loggedin = false;
+
+function isLoggedIn() {
+	if (loggedin == false) {
+		alert("You need to login to perform this operation");
+	}
+	return loggedin;
+}
+
 
 $(document).ready( function() {
 	$("#menu").hide();
@@ -75,10 +88,17 @@
 	});
 
 	$('.settings').click( function(event) {
+		menu_uuid = $(this).attr('uuid');
 
 		$('#menu').menu( {
 			select: function(event2,ui) {
-					alert( ui.item.text() );
+					var action = $(ui.item).attr("action");
+					if (action == "memory") {
+						doAction("setMemory", menu_uuid, "");	
+					}
+					if (action == "cpu") {
+						doAction("setCPU", menu_uuid, "");	
+					}
 				},
 			create: function(event3,ui) {
 				menu = 1;
@@ -91,12 +111,93 @@
 		event.stopPropagation();
 	});
 
+	$('.cd').click( function(event) {
+		var uuid = $(this).attr('uuid');
+		cdSelectorDialog(uuid);
+	});
+	$('#loginlink').click( function(event) {
+		loginDialog();
+	});
+
 	$(document).click( function(event) {
 		closeMenu();
 	});
-
+	$('#dialog-login').keypress(function(e) {
+    	if (e.keyCode == $.ui.keyCode.ENTER) {
+			loginDialogSubmit();
+    	}
+	});
 });
 
+function loginDialog() {
+	$('#dialog-login').dialog({
+		modal: true,
+		height: 210,
+		width: 350,
+		buttons: {
+			Login: loginDialogSubmit
+		}
+	});
+}
+function loginDialogSubmit() {
+	var params = $('#loginform').serialize();
+
+	$.get('login.php?' + params, function(data) {
+		if (data == "OK") {
+			loggedin = true;
+			username = $('#username').val();
+			password = $('#password').val();
+
+			$('#login').html("Logged in as <i>" + username + "</i>");
+			refreshData();
+		} else {
+			alert(data);
+		}
+		$("#dialog-login").dialog( "close" );
+	});
+}
+
+function cdSelectorDialog(uuid) {
+	if (isLoggedIn() == false)
+		return;
+
+	$('#cdselector').html('');
+	$('#cdselector').load( 'getisolist.php' );
+	var cddata;
+
+	$.getJSON('getcdinfo.php?uuid=' + uuid, function(data) {
+		cddata = data;
+		if (data.ISO != '') {
+			$('#cdcurrent').html(  data.ISO );
+			$(":button:contains('Mount')").prop("disabled", true).addClass("ui-state-disabled");
+		} else {
+			$('#cdcurrent').html('<i>No ISO currently mounted</i>');
+			$(":button:contains('Eject')").prop("disabled", true).addClass("ui-state-disabled");
+		}
+	});
+	
+	$('#dialog-cd').dialog({
+		modal: true,
+		width: 800,
+		height: 300,
+		buttons: {
+			Mount: function() {
+				$( this ).dialog( "close" );
+				var vdi = $("#cdselector").val();
+				cdAction("mount", cddata.VBD, vdi);
+			},
+			Eject: function() {
+				$( this ).dialog( "close" );
+				cdAction("eject", cddata.VBD, "");
+			},
+			Cancel: function() {
+				$( this ).dialog( "close" );
+			}
+			
+		}
+	});
+}
+
 function closeMenu() {
 	if (menu > 0) {
 		$("#menu").menu("destroy").hide();
@@ -142,11 +243,14 @@
 			var cpuavg = $(this).find('cpuavg').text();
 			var curmem = $(this).find('curmem').text();
 			var maxmem = $(this).find('maxmem').text();
+			var cpus = $(this).find('cpus').text();
 
 			var mempercent = Math.round( (curmem*100) / maxmem );
 
-			name = name.replace(" ", "_");
-			name = name.replace(".", "_");
+			name = name.replace(/ /g, "_");
+			name = name.replace(/\./g, "_");
+			name = name.replace(/\(/g, "_");
+			name = name.replace(/\)/g, "_");
 			
 			var id = "#vm_" + name;
 
@@ -157,6 +261,7 @@
 			}
 
 			vm.find('.vps_memory_usage_txt_UID').text( maxmem + " MB");
+			vm.find('.vps_cpu_usage_txt_UID').text( cpus + " VCPU");
 
 			if (state == "Running") {
 				vm.find('.state').css("background-image", "url('gfx/vps_topgreen.png')");
@@ -167,8 +272,10 @@
 				vm.find('.console').data('session', session);
 				vm.find('.console').data('name', name);
 				vm.find('.settings').hide();
-				vm.find('.actionstop').show();
-				vm.find('.actionstart').hide();
+				if (loggedin) {
+					vm.find('.actionstop').show();
+					vm.find('.actionstart').hide();
+				}
 				vm.find('.os').text(' - ' + os);
 
 
@@ -190,8 +297,10 @@
 				vm.find('.network').hide();
 				vm.find('.console').hide();
 				vm.find('.settings').show();
-				vm.find('.actionstop').hide();
-				vm.find('.actionstart').show();
+				if (loggedin) {
+					vm.find('.actionstop').hide();
+					vm.find('.actionstart').show();
+				}
 				vm.find('.cpu_graph').hide();
 				vm.find('.mem_graph').hide();
 			}
@@ -204,22 +313,27 @@
 function doAction(action, uuid, vm) {
 	var val="";
 
-	var key = prompt("Key");
-	if (key == "" || key == null) {
+	if (isLoggedIn() == false)
 		return;
-	}
+
 	document.body.style.cursor = 'wait';
 	$('#vm_' + vm).find('.state').css("background-image", "url('gfx/vps_topyellow.png')");
 
 	if (action == "setMemory") {
 		val = prompt("Set memory target");
+		val *= (1024*1024);
+		if (val == "" || val == null) {
+			return;
+		}
+	}
+	if (action == "setCPU") {
+		val = prompt("Set CPU count");
 		if (val == "" || val == null) {
-			alert("" + val);
 			return;
 		}
 	}
 
-	var url = "action.php?action=" + action + "&uuid=" + uuid + "&key=" + key + "&val=" + val;;
+	var url = "action.php?action=" + action + "&uuid=" + uuid + "&key=" + password + "&val=" + val;;
 	var response = $.get(url, function(data) {
 		if (data != 'OK') {
 			alert(data);
@@ -230,15 +344,29 @@
 	});
 }
 
+function cdAction(action, vbd,vdi) {
+	if (isLoggedIn() == false)
+		return;
+
+	document.body.style.cursor = 'wait';
+	var url = "cdaction.php?action=" + action + "&VBD=" + vbd + "&key=" + password + "&VDI=" + vdi;
+	var response = $.get(url, function(data) {
+		if (data != 'OK') {
+			alert(data);
+		}
+		document.body.style.cursor = 'default'
+	});
+	
+}
+
 function openConsole(url, session, name) {
 	if (url == '')
 		return;
 
-	var key = prompt("Key");
-	if (key == "" || key == null) {
+	if (isLoggedIn() == false)
 		return;
-	}
-	var url = "console.php?url=" + url + "&session=" + session + "&key=" + key + "&name=" + name;
+
+	var url = "console.php?url=" + url + "&session=" + session + "&key=" + password + "&name=" + name;
 
 	//window.location = url;
 	//$('#mainwindow').load(url);
@@ -291,7 +419,10 @@
 	<td colspan='4' class='small' align='right'><?php echo $namelabel . " / " . $xenversion;?><br><?php echo $license;?></td>
 </tr>
 <tr>
-<td width='150'></td>
+<td width='150'>
+	<span id="login" class='small'><i>Not <a href="#" id="loginlink">logged in</a></i>
+	</span>
+</td>
 <td width='150'></td>
 	<td width='150' align='right' class='small'><img src='gfx/icon-cpu.png'>
 		<img id='server_cpu_usage' src='usagebar.php?usage=12' width='102' height='16' title='static dummy data'><div id='server_cpu_usage_txt'>12%</div></td>
@@ -326,6 +457,8 @@
 
 	$clean_name = str_replace(" ", "_", $name);
 	$clean_name = str_replace(".", "_", $clean_name);
+	$clean_name = str_replace("(", "_", $clean_name);
+	$clean_name = str_replace(")", "_", $clean_name);
 	
 
 	foreach ($vm["VBDs"] as $vbds) {
@@ -346,10 +479,13 @@
 			<td colspan='2' class='small' title='<?php echo $description;?>'><b><?php echo $name; ?></b><span class='os'></span></td>
 			<td colspan='2' class='small' align='right'>
 				<span class='network'></span>
+				<a href='#' class='cd' uuid='<?php echo $uuid;?>' >
+					<img src='gfx/icon-cd.gif' style='vertical-align: middle;'></a>
 				<a href='#' style='display:none;' class='console'>
 					<img src='gfx/icon-terminal.png' style='vertical-align: middle;'>
 				</a>
-				<a href='#' style='display:none;' class='settings'>
+
+				<a href='#' style='display:none;' class='settings' uuid='<?php echo $uuid;?>'>
 					<img src='gfx/icon-settings16.png' style='vertical-align: middle;'>
 				</a>
 			</td>
@@ -362,16 +498,13 @@
 			<span class="actionstop" style='display:none'>
 				start | 
 				<a href='#' onclick="doAction('shutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >stop</a> | 
-				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force shutdown</a> | 
-				set memory
+				<a href='#' onclick="doAction('hardshutdown','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >force shutdown</a>
 			</span>
 			
-			<span class="actionstart">			
+			<span class="actionstart" style='display:none'>			
 				<a href='#' onclick="doAction('start','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >start</a> | 
 				stop | 
-				force shutdown | 
-
-				<a href='#' onclick="doAction('setMemory','<?php echo $uuid;?>','<?php echo $clean_name;?>')" >set memory</a> 
+				force shutdown
 			</span>
 
 		</td>
@@ -379,7 +512,7 @@
 		<td width='100' align='right' class='small' valign='top'>
 			<img src='usagebar.php?usage=1' width='102' height='16' title='static dummy data' class='cpu_graph'><br>
 			<img src='gfx/icon-cpu.png' style='vertical-align: middle;'>
-			<span id='vps_cpu_usage_txt_UID'><?php echo $cpu_count; ?> VCPU</span>
+			<span class='vps_cpu_usage_txt_UID'><?php echo $cpu_count; ?> VCPU</span>
 		</td>
 		<td width='100' align='right' class='small'>
 			<img src='usagebar.php?usage=1' width='102' height='16' title='static dummy data' class='mem_graph'><br>
@@ -407,9 +540,42 @@
 
 <br>
 
+<div style="display: none;">
+
+<div id="dialog-login" title="Login">
+	<form id="loginform">
+	<table border="0">
+		<tr>
+			<td>Username: </td>
+			<td><input type="text" id="username" name="username"></td>
+		<tr>
+		<tr>
+			<td>Password: </td>
+			<td><input type="password" id="password" name="password"></td>
+		</tr>
+	</table>
+	</form>
+</div>
+
+<div id="dialog-cd" title="Select CD">
+
+	<table border=0>
+		<tr>
+			<td>Current: <span id="cdcurrent"></span></td>
+		</tr>
+		<tr>
+			<td>
+				CD: <select id="cdselector"></select>
+			</td>
+		</tr>
+	</table>
+</div>
+
+</div>
+
 <ul id="menu">
-	<li><a href="#">Set Memory Size</a></li>
-	<li><a href="#">Set CPU Count</a></li>
+	<li action="memory"><a href="#">Set Memory Size</a></li>
+	<li action="cpu"><a href="#">Set CPU Count</a></li>
 
 
 <!--	<li><a href="#">Item 3</a>