--- misc/xenconsole/ajaxdata.php	2013/07/19 12:11:36	2022
+++ misc/xenconsole/ajaxdata.php	2014/01/30 10:16:09	2101
@@ -97,6 +97,11 @@
 	$uuid = $vm["uuid"];
 	$state = $vm["power_state"] ;
 	$cpus = $vm["VCPUs_max"];
+	
+	$operations = $vm["current_operations"];
+	if (sizeof($operations) > 0) {
+		$state = reset($operations); 
+	}
 
 
         $network = "";
@@ -108,11 +113,12 @@
 	$maxmem = 0;
 	$guestversion = "";
 
-        if ( $vm["power_state"] == "Running" ) {
+
+	if ( $vm["power_state"] == "Running" ) {
 		if ($vm["guest_metrics"] != "OpaqueRef:NULL") {//guest tools installed
-	                //$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
-	                $guest_metrics = $guestmetricmap[  $vm["guest_metrics"] ];
-        	        $network = get_network_string($guest_metrics["networks"])  ;
+			//$guest_metrics = $xenserver->VM_guest_metrics__get_record( $vm["guest_metrics"] );
+			$guest_metrics = $guestmetricmap[  $vm["guest_metrics"] ];
+			$network = get_network_string($guest_metrics["networks"])  ;
 			$tmpos =  explode('|', $guest_metrics["os_version"]["name"]);
 			$os = $tmpos[0];
 			$guestversion = $guest_metrics["PV_drivers_version"]["major"] . "." . $guest_metrics["PV_drivers_version"]["minor"] . "." .  $guest_metrics["PV_drivers_version"]["micro"];
@@ -120,7 +126,10 @@
 			$maxmem = round($xenserver->VM__query_data_source($vmref, "memory") / (1024*1024) );
 			$free = round( $xenserver->VM__query_data_source($vmref, "memory_internal_free") / 1024 );	
 			$curmem = $maxmem - $free;
+		} else {			
+			$maxmem = $vm["memory_static_max"] / (1024*1024);
 		}
+
 		$cpusum = 0.0;
 		for ($i=0; $i<$cpus; $i++) {
 			$cpusum += $xenserver->VM__query_data_source($vmref, "cpu" . $i);
@@ -132,12 +141,12 @@
 					$con = $consolemap[$conref];
 
 	                if ($con["protocol"] == "rfb") {
+							$session = $xenserver->get_id();
         	                $url = urlencode( $con["location"] );
-                	        $session = $xenserver->get_id();
 	                }
         	}
 
-        } else {
+    } else {
 		$maxmem = $vm["memory_static_max"] / (1024*1024);
 	}