From f5d4dc84fd2b1a89f984ce7d5cf471dc1500a722 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 15 Dec 2011 12:52:22 +0000
Subject: [PATCH] =?UTF-8?q?Bugfix=20:=20quand=20on=20ajoute=20un=20domaine?=
 =?UTF-8?q?,=20la=20liste=20des=20redirection=20propos=C3=A9=20ne=20conten?=
 =?UTF-8?q?ais=20*que*=20les=20domaines=20dont=20le=20DNS=20=C3=A9tait=20g?=
 =?UTF-8?q?=C3=A9r=C3=A9=20en=20local.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/dom_add.php |  2 +-
 bureau/class/m_dom.php   | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bureau/admin/dom_add.php b/bureau/admin/dom_add.php
index 20bf1a7b..f7fd8b66 100644
--- a/bureau/admin/dom_add.php
+++ b/bureau/admin/dom_add.php
@@ -71,7 +71,7 @@ if ($q["u"]>0) {
    <input type="radio" id="newisslave1" name="newisslave" value="1"<?php cbox($newisslave==1); ?>/><label for="newisslave1"><?php __("Yes, redirect this new domain to this one:"); ?> </label> <select name="slavedom" id="slavedom" class="inl">
  <option value=""><?php __("-- Choose a domain --"); ?></option>
 <?php
-$dl=$dom->get_domain_list($cuid);
+$dl=$dom->get_domain_list($cuid, false);
   $ddl=array();
   foreach($dl as $d) {
     $ddl[$d]=$d;
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index 17a3dd83..4eff38a7 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -1132,14 +1132,20 @@ class m_dom {
   /**
    * Returns the complete hosted domain list : 
    */
-  function get_domain_list($uid=-1) {
+  function get_domain_list($uid=-1, $nodns=true) {
   global $db,$err;
   $uid=intval($uid);
   $res=array();
+  if ( $nodns ) {
+    $sql=" gesdns=0 ";
+  } else {
+    $sql=" gesdns=1 ";
+	}
+
   if ($uid!=-1) {
-    $sql=" AND compte='$uid' ";
+    $sql.=" AND compte='$uid' ";
   }
-  $db->query("SELECT domaine FROM domaines WHERE gesdns=1 $sql ORDER BY domaine");
+  $db->query("SELECT domaine FROM domaines WHERE $sql ORDER BY domaine");
   while ($db->next_record()) {
     $res[]=$db->f("domaine");
   }