From 21e4fbd9736dd6ee0eb343ae0e3dd9eebc05c0fd Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Fri, 31 Aug 2012 10:05:39 +0000
Subject: [PATCH] finishing up default domain types admin

---
 .gitattributes                     |  1 +
 bureau/admin/adm_doms_def_type.php | 23 +++++++++++++++++------
 bureau/admin/dom_defdel.php        | 15 +++++++++++++++
 bureau/class/m_dom.php             | 24 +++++++++++++++++++++---
 4 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 bureau/admin/dom_defdel.php

diff --git a/.gitattributes b/.gitattributes
index 642107a6..0fe1dc3d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -133,6 +133,7 @@ bureau/admin/bro_view.php -text
 bureau/admin/browseforfolder.php -text
 bureau/admin/cron.php -text
 bureau/admin/dom_add.php -text
+bureau/admin/dom_defdel.php -text
 bureau/admin/dom_doadd.php -text
 bureau/admin/dom_dodel.php -text
 bureau/admin/dom_edit.inc.php -text
diff --git a/bureau/admin/adm_doms_def_type.php b/bureau/admin/adm_doms_def_type.php
index 17bd4486..5e62b56c 100644
--- a/bureau/admin/adm_doms_def_type.php
+++ b/bureau/admin/adm_doms_def_type.php
@@ -12,6 +12,14 @@ if (!$admin->enabled) {
     <h3><?php __("Manage defaults domains type"); ?></h3>
     <hr id="topbar" />
       <p><?php __("If you don't know what this page is about, don't touch anything, and read AlternC documentation about domain types"); ?></p>
+      <p><?php __("The Type column contains a type of available VirtualHost config on The server."); ?></p>
+      <p><?php __("The Setting column contains the variables to be expanded in the defaults configuration. Available values are:  "); ?></p>
+      <ul>
+        <li><?php __("%%DOMAIN%% : the Domain name"); ?></li>
+        <li><?php __("%%TARGETDOM%%: The destination domain"); ?></li>
+        <li><?php __("%%SUB%% : The subdomain name"); ?></li>
+        <li><?php __("%%DOMAINDIR%%: the domain directory on the file system"); ?></li>
+      </ul>
 
       <br />
       <?php
@@ -35,7 +43,7 @@ if (!empty($domup)) {
 
 $tab=$dom->lst_default_subdomains();
 ?>
-<form method="post" action="dom_defedit.php" name="main" id="main">
+<form method="post" action="adm_doms_def_type.php" name="main" id="main">
 <table class="tlist">
    <tr><th>&nbsp;</th><th><?php __("Sub"); ?></th><th><?php __("Type"); ?></th><th><?php __("settings"); ?></th><th><?php __("Concerned"); ?></th><th><?php __("Activation"); ?></th></tr>
 <?php
@@ -48,17 +56,20 @@ for($i=0;$i<count($tab)+1;$i++) {
     }
 ?>
 	<tr  class="lst<?php echo $col; ?>">
-  <td></td>
-  <td><input type='text' name='domup[<?php echo $i; ?>][sub]' value="<?php echo $val['sub']; ?>"/></td>
+  <td>
+  <div class="ina"><a href=dom_defdel.php?id=<?php echo $val['id']; ?> type=''><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
+  </td>
+
+  <td><input type='text' size="16" name='domup[<?php echo $i; ?>][sub]' value="<?php echo $val['sub']; ?>"/></td>
   <?php $type=array("VHOST","URL","WEBMAIL","");
   if(in_array($val['domain_type'],$type)){?> 
-  <td><select name='domup[<?php echo $i; ?>][domain_type]'>
+  <td><select width="100px" style="width:100px"  name='domup[<?php echo $i; ?>][domain_type]'>
         <option value='VHOST' <?php if($val['domain_type']=='VHOST') echo "selected=\"selected\""; ?> >VHOST</option>
         <option value='URL' <?php if($val['domain_type']=='URL') echo "selected=\"selected\""; ?> >URL</option>
         <option value='WEBMAIL' <?php if($val['domain_type']=='WEBMAIL') echo "selected=\"selected\""; ?> >WEBMAIL</option>
       </select>
   <?php }else{?>
-    <td><input type ='text' name='domup[<?php echo $i; ?>][domain_type]' value='<?php echo $val['domain_type']?>' ></td>
+    <td><input type ='text'  width="100px" style="width:100px" name='domup[<?php echo $i; ?>][domain_type]' value='<?php echo $val['domain_type']?>' ></td>
  <? }?>
   </td>
   <td><input type ='text' name='domup[<?php echo $i; ?>][domain_type_parameter]' value='<?php echo $val['domain_type_parameter']?>' ></td>
@@ -74,8 +85,8 @@ for($i=0;$i<count($tab)+1;$i++) {
 }
 ?>
 
+  <td><p><input type="submit" class="inb" name="submit" value="<?php __("Save"); ?>" /></p></td>
 </table>
-  <p><input type="submit" class="inb" name="submit" value="<?php __("Save"); ?>" /></p>
 </form>
 <?php
  include_once("foot.php"); ?>
diff --git a/bureau/admin/dom_defdel.php b/bureau/admin/dom_defdel.php
new file mode 100644
index 00000000..7dbe661a
--- /dev/null
+++ b/bureau/admin/dom_defdel.php
@@ -0,0 +1,15 @@
+<?php 
+require_once("../class/config.php");
+include_once("head.php");
+
+$fields = array (
+        "id"     => array ("request", "integer", ""),
+        );
+getFields($fields);
+
+//checker admin rights
+
+$dom->del_default_type($id);
+include_once("adm_doms_def_type.php");
+
+
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index 6ede7489..b6e5afe2 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -391,6 +391,7 @@ class m_dom {
 
   function create_default_subdomains($domain,$target_domain=""){
     global $db;
+    $err->log("dom","create_default_subdomains",$domain);
     $query="SELECT sub, domain_type, domain_type_parameter FROM default_subdomains WHERE concerned = 'SLAVE' or concerned = 'BOTH' and enabled=1;";
     if(empty($target_domain)) {
       $query="SELECT sub, domain_type, domain_type_parameter FROM default_subdomains WHERE concerned = 'MAIN' or concerned = 'BOTH' and enabled=1;";
@@ -419,6 +420,7 @@ class m_dom {
 
   function lst_default_subdomains(){
     global $db,$err;
+    $err->log("dom","lst_default_subdomains");
     $c=array();
     $db->query("select * from default_subdomains;");
      
@@ -437,13 +439,14 @@ class m_dom {
 
   
   function update_default_subdomains($arr) {
+    global $err;
+    $err->log("dom","update_default_subdomains");
     $ok=true;
     foreach ($arr as $a) {
       if (! isset($a['id'])) $a['id']=null;
       if(!empty($a['sub']) || !empty($a['domain_type_parameter'])){
 
         if (! isset($a['enabled'])) $a['enabled']=0;
-        printvar($a);
         if (! $this->update_one_default($a['domain_type'],$a['sub'], $a['domain_type_parameter'], $a['concerned'], $a['enabled'],$a['id']) ) {
          $ok=false;
         }
@@ -454,15 +457,30 @@ class m_dom {
 
   function update_one_default($domain_type,$sub,$domain_type_parameter,$concerned,$enabled,$id=null){
     global $db,$err;
+    $err->log("dom","update_one_default");
     
     if($id==null)
-      $db->query("INSERT INTO default_subdomains values ('','".$sub."','".$domain_type."','".$domain_type_parameter."','".$concerned."','".$enabled."');");
+      $db->query("INSERT INTO default_subdomains values ('','".addslashes($sub)."','".addslashes($domain_type)."','".addslashes($domain_type_parameter)."','".addslashes($concerned)."','".addslashes($enabled)."');");
     else
-    $db->query("UPDATE default_subdomains set sub='".$sub."', domain_type='".$domain_type."',domain_type_parameter='".$domain_type_parameter."',concerned='".$concerned."',enabled='".$enabled."' where id=".$id.";");
+    $db->query("UPDATE default_subdomains set sub='".addslashes($sub)."', domain_type='".addslashes($domain_type)."',domain_type_parameter='".addslashes($domain_type_parameter)."',concerned='".addslashes($concerned)."',enabled='".addslashes($enabled)."' where id=".addslashes($id).";");
     return true;
       //update
     
 
+  }
+
+  function del_default_type($id){
+    global $err,$db;
+    $err->log("dom","del_default_type");
+
+    if(!$db->query("delete from default_subdomains where id=$id;")){
+      $err->raise("dom",_("Could not delete default type"));
+      return false;
+    }
+
+    return true;
+
+
   }
 
   /* ----------------------------------------------------------------- */