--- misc/xenconsole/webadmin.php	2012/11/30 08:27:52	1876
+++ misc/xenconsole/index.php	2012/11/30 09:09:06	1881
@@ -60,6 +60,9 @@
 }
 
 function console(url, session) {
+	if (url == '')
+		return;
+
 	var key = prompt("Key");
 	if (key == "" || key == null) {
 		return;
@@ -67,7 +70,8 @@
 	var url = "console.php?url=" + url + "&session=" + session + "&key=" + key;
 
 	//window.location = url;
-	$('#mainwindow').load(url);
+	//$('#mainwindow').load(url);
+	window.open(url);
 }
 
 function loadServer() {
@@ -168,6 +172,28 @@
 		$vps_topbg = 'vps_topred.png';
 	}
 
+	$network = "";
+	if ( $vm["power_state"] == "Running" && $vm["guest_metrics"] != "OpaqueRef:NULL" ) {
+        	$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
+		$network = "(IP: " . implode( ",",  $guest_metrics["networks"]) . ")";
+	} else {
+        	$guest_metrics = Array() ;
+	}
+
+
+	$url = "";
+	$session = "";
+	foreach($vm["consoles"] as $conref) {
+        	$con = $xenserver->console__get_record( $conref );
+	        //var_dump($con);
+
+        	if ($con["protocol"] == "rfb") {
+	                $url = urlencode( $con["location"] );
+	                $session = $xenserver->get_id();
+        	}
+	}
+
+
 
 //	echo "<a href='#' onclick=\"loadvm('$uuid');\">$name</a><br>\n";
 ?>
@@ -176,13 +202,29 @@
 		<tr background='gfx/vps_topbg.png'>
 			<td width='10' background='gfx/<?php echo $vps_topbg; ?>' class='small'>&nbsp;</td>
 			<td colspan='2' class='small'><b><?php echo $name; ?></b></td>
-			<td colspan='2' class='small' align='right'>(IP: 192.168.10.45, 172.10.0.34) <img src='gfx/icon-terminal.png' style='vertical-align: middle;'></td>
+			<td colspan='2' class='small' align='right'>
+				<?php echo $network;?>
+				<a href="#" onclick="console('<?php echo $url;?>','<?php echo $session;?>')"><img src='gfx/icon-terminal.png' style='vertical-align: middle;'></a>
+			</td>
 		</tr>
 
 		<tr bgcolor='#eee'>
 		<td></td>
 
-			<td width='150' class='small'>start stop force</td>
+		<td width='150' class='small'>
+			<?php
+			if ($state == "Running") {
+				echo "start | ";
+				echo "<a href='#' onclick=\"doAction('shutdown','$uuid')\">stop</a> | ";
+				echo "<a href='#' onclick=\"doAction('hardshutdown','$uuid')\">force shutdown</a>";
+			} else {
+				echo "<a href='#' onclick=\"doAction('start','$uuid')\">start</a> | ";
+				echo "stop | ";
+				echo "force shutdown";
+			}
+			?>
+
+		</td>
 
 		<td width='100' align='right' class='small'>
 			<img src='gfx/icon-cpu.png' style='vertical-align: middle;'>