Changeset 2821 for alternc/trunk/bureau/class/m_dom.php

Timestamp:

01/29/11 18:58:19 (2 years ago)

Author:

fufroma

Message:

Update domains, l'aventure continue

File:

• alternc/trunk/bureau/class/m_dom.php (modified) (8 diffs)

alternc/trunk/bureau/class/m_dom.php

@@ -647 +647 @@
     $r["nsub"]=$db->Record["cnt"];
     $db->free();
-    $db->query("select sd.*, dt.description as type_desc from sub_domaines sd, domaines_type dt where compte='$cuid' and domaine='$dom' and upper(dt.name)=upper(sd.type)");
+    $db->query("select sd.*, dt.description as type_desc, dt.only_dns from sub_domaines sd, domaines_type dt where compte='$cuid' and domaine='$dom' and upper(dt.name)=upper(sd.type)");
     // Pas de webmail, on le cochera si on le trouve.
     $this->webmail=0;
@@ -656 +656 @@
       $r["sub"][$i]["dest"]=$db->Record["valeur"];
       $r["sub"][$i]["type"]=$db->Record["type"];
+      $r["sub"][$i]["enable"]=$db->Record["enable"];
       $r["sub"][$i]["type_desc"]=$db->Record["type_desc"];
+      $r["sub"][$i]["only_dns"]=$db->Record["only_dns"];
+      $r["sub"][$i]["web_action"]=$db->Record["web_action"];
 /*
       if ($db->Record["type"]==3) { // Webmail
@@ -704 +707 @@
     }
 */
-    $db->query("select sd.*, dt.description as type_desc from sub_domaines sd, domaines_type dt where compte='$cuid' and domaine='$dom' and sub='$sub' and ( length('$type')=0 or type='$type') and (length('$value')=0 or '$value'=valeur) and upper(dt.name)=upper(sd.type);");
+    $db->query("select sd.*, dt.description as type_desc, dt.only_dns from sub_domaines sd, domaines_type dt where compte='$cuid' and domaine='$dom' and sub='$sub' and ( length('$type')=0 or type='$type') and (length('$value')=0 or '$value'=valeur) and upper(dt.name)=upper(sd.type);");
     if ($db->num_rows()==0) {
       $err->raise("dom",14);
@@ -713 +716 @@
     $r["name"]=$db->Record["sub"];
     $r["dest"]=$db->Record["valeur"];
-    $r["type"]=$db->Record["type"];
+    $r["enable"]=$db->Record["enable"];
     $r["type_desc"]=$db->Record["type_desc"];
+    $r["only_dns"]=$db->Record["only_dns"];
+    $r["web_action"]=$db->Record["web_action"];
     $db->free();
     return $r;
@@ -738 +743 @@
         return false;
         }
+        return true;
         break;
       case 'IP': 
@@ -759 +765 @@
 
 
-  function can_create_subdomain($dom,$sub,$type) {
+  function can_create_subdomain($dom,$sub,$type,$value_old='') {
     global $db,$err,$cuid;
     $err->log("dom","can_create_subdomain",$dom."/".$sub);
@@ -769 +775 @@
 
     # Get the list of type of subdomains already here who have the same name
-    $db->query("select distinct type from sub_domaines where sub='$sub' and domaine='$dom';");
+    $db->query("select * from sub_domaines where sub='$sub' and domaine='$dom' and not (type='$type' and valeur='$value_old')");
+    #$db->query("select * from sub_domaines where sub='$sub' and domaine='$dom';");
     while ($db->next_record()) {
       # And if there is a domain with a incompatible type, return false
@@ -829 +836 @@
     }
 
-    if (! $this->can_create_subdomain($dom,$sub,$type)) {
+    if (! $this->can_create_subdomain($dom,$sub,$type,$value_old)) {
       # TODO have a real error code
       $err->raise("dom", 654);