From 329ac8627c597115898521ffb155062ece788870 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Tue, 25 Sep 2007 15:13:57 +0000
Subject: [PATCH] Correcting m_dom error : cannot add '' empty subdomain

---
 bureau/class/m_dom.php                       | 3 ++-
 bureau/locales/fr_FR/LC_MESSAGES/messages.po | 9 ---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index d159befc..27f50ba4 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -637,7 +637,8 @@ class m_dom {
 
     //    if (!(($sub == '*') || ($sub=="") || (preg_match('/([a-z0-9][\.\-a-z0-9]*)?[a-z0-9]/', $sub)))) {
     $fqdn=checkfqdn($sub);
-    if (($sub != '*') && !($fqdn==0 || $fqdn==4)) {
+    // Special cases : * (all subdomains at once) and '' empty subdomain are allowed.
+    if (($sub != '*' && $sub!='') && !($fqdn==0 || $fqdn==4)) {
       $err->raise("dom",24);
       return false;
     }
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index d484b921..c1bea463 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -2146,15 +2146,6 @@ msgstr "Suppression du quota %s"
 msgid "WARNING : Confirm the deletion of the quota"
 msgstr "ATTENTION : Etes-vous sur de vouloir supprimer le quota"
 
-#: ../admin/adm_dodel.php:61
-#, php-format
-msgid "Deleting users"
-msgstr "Supprimer un utilisateur"
-
-#: ../admin/adm_dodel.php:65
-msgid "WARNING : Confirm the deletion of the users"
-msgstr "ATTENTION : Confirmez-vous la suppression de cette utilisateur"
-
 #: ../admin/adm_doms.php:54 ../admin/adm_list.php:60
 #: ../admin/quota_show_all.php:38
 msgid "Update this page"