From fb0fd61b1fce8b24d80f207045719aa3a4718a2f Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Fri, 28 Jan 2011 16:46:32 +0000 Subject: [PATCH] =?UTF-8?q?Qques=20modifs=20pour=20am=C3=A9liorer=20l'inte?= =?UTF-8?q?rface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bureau/admin/adm_domstype.php | 6 ++++++ bureau/admin/adm_domstypedoedit.php | 2 +- bureau/admin/adm_domstypeedit.php | 24 +++++++++++++++++++----- bureau/admin/dom_edit.inc.php | 2 +- bureau/admin/dom_edit.php | 5 +++-- bureau/class/m_dom.php | 13 +++++++++---- 6 files changed, 39 insertions(+), 13 deletions(-) diff --git a/bureau/admin/adm_domstype.php b/bureau/admin/adm_domstype.php index 75310480..599f97ec 100644 --- a/bureau/admin/adm_domstype.php +++ b/bureau/admin/adm_domstype.php @@ -57,6 +57,9 @@ include_once("head.php"); + + + domains_type_lst() as $d) { + + +
<?php __(" />
diff --git a/bureau/admin/adm_domstypedoedit.php b/bureau/admin/adm_domstypedoedit.php index a8ebc2a6..ccd5930d 100644 --- a/bureau/admin/adm_domstypedoedit.php +++ b/bureau/admin/adm_domstypedoedit.php @@ -6,7 +6,7 @@ if (!$admin->enabled) { } -if ( ! $dom->domains_type_update($name, $description, $target, $entry, $compatibility) ) { +if ( ! $dom->domains_type_update($name, $description, $target, $entry, $compatibility, $enable, $only_dns, $need_dns) ) { die($err->errstr()); } else { include("adm_domstype.php"); diff --git a/bureau/admin/adm_domstypeedit.php b/bureau/admin/adm_domstypeedit.php index 70e5a839..bf513fa2 100644 --- a/bureau/admin/adm_domstypeedit.php +++ b/bureau/admin/adm_domstypeedit.php @@ -41,6 +41,9 @@ $fields = array ( "target" => array ("request", "string", ""), "entry" => array ("request", "string", ""), "compatibility" => array ("request", "string", ""), + "enable" => array ("request", "boolean", ""), + "only_dns" => array ("request", "boolean", ""), + "need_dns" => array ("request", "boolean", ""), ); getFields($fields); @@ -67,7 +70,7 @@ if ($error_edit) { - + @@ -81,13 +84,24 @@ if ($error_edit) { - + - - - + + + + /> + + + + /> + + + + /> + + " /> diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php index 81f1637a..288ab2f3 100644 --- a/bureau/admin/dom_edit.inc.php +++ b/bureau/admin/dom_edit.inc.php @@ -58,7 +58,7 @@ $dom->unlock(); - +&sub=&type=&value="><?php __(" /> - + +
" target="_blank">'.htmlspecialchars($r["sub"][$i]["dest"]).'' : htmlspecialchars($r["sub"][$i]["dest"]); ?> '.htmlspecialchars($r["sub"][$i]["dest"]).'' : htmlspecialchars($r["sub"][$i]["dest"]); ?> 
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index 318d3412..00251bef 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -159,7 +159,7 @@ class m_dom { return true; } - function domains_type_update($name, $description, $target, $entry, $compatibility) { + function domains_type_update($name, $description, $target, $entry, $compatibility, $enable, $only_dns, $need_dns) { global $err,$cuid,$db; $id=intval($id); $name=mysql_real_escape_string($name); @@ -167,7 +167,10 @@ class m_dom { $target=mysql_real_escape_string($target); $entry=mysql_real_escape_string($entry); $compatibility=mysql_real_escape_string($compatibility); - $db->query("UPDATE domaines_type SET description='$description', target='$target', entry='$entry', compatibility='$compatibility' where name='$name';"); + $enable=intval($enable); + $only_dns=intval($only_dns); + $need_dns=intval($need_dns); + $db->query("UPDATE domaines_type SET description='$description', target='$target', entry='$entry', compatibility='$compatibility', enable=$enable, need_dns=$need_dns, only_dns=$only_dns where name='$name';"); return true; } @@ -629,7 +632,7 @@ class m_dom { $db->next_record(); $r["nsub"]=$db->Record["cnt"]; $db->free(); - $db->query("select * from sub_domaines where compte='$cuid' and domaine='$dom'"); + $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)"); // Pas de webmail, on le cochera si on le trouve. $this->webmail=0; for($i=0;$i<$r["nsub"];$i++) { @@ -638,6 +641,7 @@ class m_dom { $r["sub"][$i]["name"]=$db->Record["sub"]; $r["sub"][$i]["dest"]=$db->Record["valeur"]; $r["sub"][$i]["type"]=$db->Record["type"]; + $r["sub"][$i]["type_desc"]=$db->Record["type_desc"]; /* if ($db->Record["type"]==3) { // Webmail $this->webmail=1; @@ -685,7 +689,7 @@ class m_dom { $type = " and type=\"".mysql_real_escape_string($type)."\""; } */ - $db->query("select * from sub_domaines where compte='$cuid' and domaine='$dom' and sub='$sub' and ( length('$type')=0 or type='$type') and (length('$value')=0 or '$value'=valeur);"); + $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);"); if ($db->num_rows()==0) { $err->raise("dom",14); return false; @@ -695,6 +699,7 @@ class m_dom { $r["name"]=$db->Record["sub"]; $r["dest"]=$db->Record["valeur"]; $r["type"]=$db->Record["type"]; + $r["type_desc"]=$db->Record["type_desc"]; $db->free(); return $r; } // get_sub_domain_all