Changeset 2821

Timestamp:

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

Author:

fufroma

Message:

Update domains, l'aventure continue

Location:

alternc/trunk

Files:

• bureau/admin/dom_edit.php (modified) (2 diffs)
• bureau/class/m_dom.php (modified) (8 diffs)
• install/upgrades/1.0.sql (modified) (1 diff)
• src/dns.sh (modified) (1 diff)
• src/hosting_functions_v2.sh (modified) (1 diff)
• src/update_domains.sh (modified) (2 diffs)

alternc/trunk/bureau/admin/dom_edit.php

@@ -95 +95 @@
  -->
 <table class="tlist">
-<tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Place"); ?></th></tr>
+<tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Place"); ?></th><th><?php __("Enable")?></th><th><?php __("Pending");?></tr>
 <?php
 $col=1;
@@ -111 +111 @@
                 <td><?php __($r['sub'][$i]['type_desc']);?></td>
                 <td><?php echo $r["sub"][$i]['type'] === 'LOCAL' ? '<a href="bro_main.php?R='.urlencode($r["sub"][$i]["dest"]).'">'.htmlspecialchars($r["sub"][$i]["dest"]).'</a>' : htmlspecialchars($r["sub"][$i]["dest"]); ?>&nbsp;</td>
+                <td><?php 
+      switch ($r['sub'][$i]['enable']) {
+        case 'ENABLED':
+          __("Enabled");
+          break;
+        case 'ENABLE':
+          __("Activation pending");
+          break;
+        case 'DISABLED':
+          __("Disabled");
+          break;
+        case 'DISABLE':
+          __("Desactivation pending");
+          break;
+      }?></td>
+                <td><?php 
+      switch ($r['sub'][$i]['web_action']) {
+        case 'UPDATE':
+          __("Update pending");
+          break;
+        case 'DELETE':
+          __("Deletion pending");
+          break;
+        case 'OK':
+        default:
+          __("Up to date");
+          break;
+      }?></td>
+            
         </tr>
 <?php } ?>

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);

alternc/trunk/install/upgrades/1.0.sql

@@ -35 +35 @@
 alter table domaines add column dns_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
 alter table domaines add column dns_result varchar(255) not null default '';
-alter table sub_domaines add column web_action enum ('OK','UPDATE','ENABLE','DISABLE','DELETE') NOT NULL default 'UPDATE';
-alter table sub add column dns_result varchar(255) not null default '';
+alter table sub_domaines add column web_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
+alter table sub_domaines add column dns_result varchar(255) not null default '';
+alter table sub_domaines add column enable enum ('ENABLED', 'ENABLE', 'DISABLED', 'DISABLE') NOT NULL DEFAULT 'ENABLED';
 drop table sub_domaines_standby;
 drop table domaines_standby;

alternc/trunk/src/dns.sh

@@ -94 +94 @@
     file=$(
         echo -e "$file"
-        $MYSQL_DO "select distinct replace(replace(dt.entry,'%TARGET%',sd.valeur), '%SUB%', if(length(sd.sub)>0,sd.sub,'@')) as entry from sub_domaines sd,domaines_type dt where sd.type=dt.name and sd.domaine='$domain' order by entry ;"
+        $MYSQL_DO "select distinct replace(replace(dt.entry,'%TARGET%',sd.valeur), '%SUB%', if(length(sd.sub)>0,sd.sub,'@')) as entry from sub_domaines sd,domaines_type dt where sd.type=dt.name and sd.domaine='$domain' and sd.enable in ('ENABLE', 'ENABLED') order by entry ;"
     )
-
 
     # Get some usefull vars

alternc/trunk/src/hosting_functions_v2.sh

@@ -114 +114 @@
 
     local FQDN=$2
+    local TYPE=$3 # no use here, but one day, maybe... So here he is
     local USER=$(get_account_by_domain $FQDN)
     local user_letter=`print_user_letter "$USER"`

alternc/trunk/src/update_domains.sh

@@ -43 +43 @@
 # Sub_domaines we want to delete
 # sub_domaines.web_action = delete
-for sub in $( $MYSQL_DO "select if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine) from sub_domaines sd where web_action ='DELETE';") ; do
-    host_delete $sub
+for sub in $( $MYSQL_DO "select concat_ws('|µ',if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),sd.type) from sub_domaines sd where web_action ='DELETE';") ; do
+    host_delete $(echo $sub|tr '|µ' ' ')
     # TODO Update the entry in the DB with the result and the action
 done
@@ -52 +52 @@
 params=$( $MYSQL_DO "
   select concat_ws('|µ',lower(sd.type), if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine), valeur) 
-  from sub_domaines sd, domaines_type dt
+  from sub_domaines sd
   where sd.web_action ='UPDATE'
-  and lower(sd.type) = lower(dt.name)
-  and dt.only_dns = false
   ;")
 for sub in $params;do
     host_create $(echo $sub|tr '|µ' ' ')
-    # TODO Update the entry in the DB with the result and the action
+    $MYSQL_DO "update sub_domaines sd set web_action='OK',web_result='$?' where concat_ws('|µ',lower(sd.type),if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),valeur)='$sub'"
 done
 
 # Domaine to enable
-for sub in $( $MYSQL_DO "select if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine) from sub_domaines sd where sd.web_action ='ENABLE' ;");do
-    host_enable $sub
-    # TODO Update the entry in the DB with the result and the action
+for sub in $( $MYSQL_DO "select concat_ws('|µ',if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),lower(sd.type)) from sub_domaines sd where sd.enable ='ENABLE' ;");do
+    host_enable $(echo $sub|tr '|µ' ' ')
+    $MYSQL_DO "update sub_domaines sd set enable='ENABLED' where concat_ws('|µ',if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),lower(sd.type)) = '$sub';"
 done
 
 # Domains to disable
-for sub in $( $MYSQL_DO "select if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine) from sub_domaines sd where sd.web_action ='DISABLE' ;");do
-    host_disable $sub
-    # TODO Update the entry in the DB with the result and the action
+for sub in $( $MYSQL_DO "select concat_ws('|µ',if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),lower(sd.type)) from sub_domaines sd where sd.enable ='DISABLE' ;");do
+    host_disable $(echo $sub|tr '|µ' ' ')
+    $MYSQL_DO "update sub_domaines sd set enable='DISABLED' where concat_ws('|µ',if(length(sd.sub)>0,concat_ws('.',sd.sub,sd.domaine),sd.domaine),lower(sd.type)) = '$sub';"
 done