From 2d682b1196b49e2e4c08f850962bced7e0dd4790 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Fri, 18 Oct 2013 12:56:46 +0000
Subject: [PATCH] adding SSH keys to VM scripted output

---
 bureau/admin/dom_edit.php | 2 +-
 bureau/admin/vm.php       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index a1776054..2cd0ca24 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -150,7 +150,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 		<td><div class="retour-auto"><a href="http://<?php ecif($r["sub"][$i]["name"],$r["sub"][$i]["name"]."."); echo $r["name"] ?>" target="_blank"><?php 
 				echo ecif($r["sub"][$i]["name"] , $r["sub"][$i]["name"]."." , "" , 0) . $r["name"];
 			?></a></div></td>
-		<td><div class="retour-auto"><?php __($r['sub'][$i]['type_desc']); ?>
+  <td><div class="retour-auto"><?php if ($r['sub'][$i]['type_desc']) { __($r['sub'][$i]['type_desc']); } else { echo __("ERROR, please check your server setup"); } ?>
  <?php 
  //if ($r["sub"][$i]['type'] === 'VHOST') {
  if ( @$dt[$r["sub"][$i]['type']]['target'] === 'DIRECTORY') {
diff --git a/bureau/admin/vm.php b/bureau/admin/vm.php
index 850ebf59..b6ba58e9 100644
--- a/bureau/admin/vm.php
+++ b/bureau/admin/vm.php
@@ -35,6 +35,9 @@ if ($script) {
     echo "VM_STATUS:OK\n";
     echo "VM_START:".$infos['starttime']."\n";
     echo "VM_HOSTNAME:".$infos['hostname']."\n";
+    foreach($infos['ssh-keys'] as $k) 
+      if (trim($k))
+	echo "VM_SSHKEY:".trim($k)."\n";
   } else {
     echo "VM_STATUS:NONE\n";
   }
@@ -69,7 +72,7 @@ include_once("head.php");
 <input type="submit" class="inb" name="go" value="<?php __("Click here to start a virtual machine."); ?>" />
 </form>
 <?php
-} else {
+   } else {
  echo "<table class='tedit'>";
  echo "<tr><th>"._("Hostname")."</th><td>".$infos['hostname']."</td></tr>";
  echo "<tr><th>"._("Start time")."</th><td>".date('Y-m-d H:i:s',$infos['starttime'])."</td></tr>";