From 1deeb6d899131084f5e7793686ced00c43116a2d Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Tue, 8 Dec 2009 08:47:13 +0000
Subject: [PATCH] adding 'connect as' link in the domain list, (I craved for
 ... and today I remembered I have commit right ;) ), and removed a _parent
 target in another link

---
 bureau/admin/adm_doms.php | 8 +++++++-
 bureau/admin/adm_list.php | 2 +-
 bureau/class/m_admin.php  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bureau/admin/adm_doms.php b/bureau/admin/adm_doms.php
index 1a1f7e5c..6907c5f8 100644
--- a/bureau/admin/adm_doms.php
+++ b/bureau/admin/adm_doms.php
@@ -52,7 +52,7 @@ $c=$admin->dom_list();
 
 <form method="post" action="adm_dodom.php">
 <table border="0" cellpadding="4" cellspacing="0">
-<tr><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Member"); ?></th><th>Lock</th></tr>
+  <tr><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Member"); ?></th><th><?php __("Connect as"); ?><th>Lock</th></tr>
 <?php
 $col=1;
 for($i=0;$i<count($c);$i++) {
@@ -64,6 +64,12 @@ for($i=0;$i<count($c);$i++) {
    if ($c[$i]["noerase"]) __("Unlock"); else __("Lock");  ?></a></td>
 <td><a href="http://<?php echo $c[$i][domaine]; ?>" target="_blank"><?php echo $c[$i]["domaine"]; ?></a></td>
 <td><?php echo $c[$i]["login"]; ?></td>
+<td>
+<?php		  if($admin->checkcreator($c[$i]['uid'])) {
+		?>
+			<a href="adm_login.php?id=<?php echo $c[$i]["uid"];?>"><?php __("Connect as"); ?></a>
+		<?php } ?>
+</td>
 				    <td><?php if ($c[$i]["noerase"]) {
 			echo "<img src=\"icon/encrypted.png\" width=\"16\" height=\"16\" alt=\""._("Locked Domain")."\" />";
 				    } ?></td>
diff --git a/bureau/admin/adm_list.php b/bureau/admin/adm_list.php
index b550b5e4..9d0cab33 100644
--- a/bureau/admin/adm_list.php
+++ b/bureau/admin/adm_list.php
@@ -132,7 +132,7 @@ while (list($key,$val)=each($r))
 		else {
 		  if($admin->checkcreator($val['uid'])) {
 		?>
-			<a href="adm_login.php?id=<?php echo $val["uid"];?>" target="_parent"><?php __("Connect as"); ?></a>
+			<a href="adm_login.php?id=<?php echo $val["uid"];?>"><?php __("Connect as"); ?></a>
 		<?php } } ?>
 		</td>
 		    <?php
diff --git a/bureau/class/m_admin.php b/bureau/class/m_admin.php
index 4077be51..ed7b8aa3 100644
--- a/bureau/class/m_admin.php
+++ b/bureau/class/m_admin.php
@@ -826,7 +826,7 @@ EOF;
    */
   function dom_list() {
     global $db;
-    $db->query("SELECT m.login,d.domaine,d.gesdns,d.gesmx,d.noerase FROM domaines d LEFT JOIN membres m ON m.uid=d.compte ORDER BY domaine;");
+    $db->query("SELECT m.uid,m.login,d.domaine,d.gesdns,d.gesmx,d.noerase FROM domaines d LEFT JOIN membres m ON m.uid=d.compte ORDER BY domaine;");
     while ($db->next_record()) {
       $c[]=$db->Record;
     }