From d0f8fd35b36d36392359b889ab0bfb0ae0052b29 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Thu, 23 Aug 2012 18:46:47 +0000 Subject: [PATCH] commit 2/3: new email class, adding PAGER on functions.php, search engine in email list, email ARE broken now, please wait for third commit --- bureau/admin/images/check_no.png | Bin 1460 -> 575 bytes bureau/admin/images/check_ok.png | Bin 4059 -> 535 bytes bureau/admin/js/alternc.js | 1 + bureau/admin/mail_edit.inc.php | 8 +- bureau/admin/mail_list.php | 103 ++++++--- bureau/admin/styles/style.css | 18 ++ bureau/class/functions.php | 138 ++++++++--- bureau/class/m_dom.php | 30 ++- bureau/class/m_err.php | 4 +- bureau/class/m_mail.php | 386 +++++++++++++++---------------- 10 files changed, 408 insertions(+), 280 deletions(-) diff --git a/bureau/admin/images/check_no.png b/bureau/admin/images/check_no.png index ca6b56a965983e0a4e1db614737a0a5689816933..4933cfa300cb384c2097f5e70f9fd2e557907782 100644 GIT binary patch literal 575 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47{vp8LR|m<|KGsCu!4bMEdxV4 z149=B!$by#84L__7#LPDFhHc%v#SE>V$9X)iy?viZaoP(t8;g_AxN*w=_N|$aTor z_>iy1VJoYnmPW^fc#aG4oV2q$?P7o0&+Ckv+XV)O3qm}X!@@3yhg?ogxRMliEg|-L za^h`af!iX2_l5cIiwND%NPNt|@Kj&xse#T@Bi*M)dQXcBpXKI0D=U53+xcEZ=)I`$ z`_A?cy$kUiq%o=3fsUa!3>ZwCqyE$=5QR z3NBSvGrvAR&6Bt3C|I~CEIx1ce{&fp^4bi8Al7MYu4vPpPgIeu_NKb z+%4(7X|MF(zG-EAsHZB$u&m~(K!V7AcX>6Azv}VMn}xHN_UzpObS{IZtDnm{r-UW| DtmNn$ literal 1460 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkElTP*+PHDPZ@NmxA#Es{oUcXabb?SfM!P~vkN@eyp{xfZ2 z$aA{7^;^o^k11x=JIWIt>{jvIw`K0!#*Jc;|9c!=99TjEL$6d{vAkj#BeL_-ojdC< zUb?hYTU*;Wx2K$!_pd?0rza127TnuzC^XSmCt6h`xoN-m()IWE)cjN~*uYuid_>Ns z?#~2Gv8&f#&kp!^mX&pvmG#fZ4-dcL6|`RXimBmm!t{Bzo3}bKJ~vxpC`G# zjliQ)o3&0x>94wK^8ZO^{sKi zWIJj3X;xat$ZTog>}`Gd&24~#JO5d zpH5jHw>0~?pV9Ac8_QE#b_6MEPA|O5b#nKkX$*QgnTyz%JMMbid3Vrpl19?;M&^`n zZ*Cgsa&#OLP;T;<^oOE0m!l$TnxeEG+83w&`SY2+zDv@sES^o;Q#p$Fzn&KK zr}Dq}{oGwS$4MrhYWI(|GaGFK4VjV?%VC{H`SbYjyTP(%#~ti3sREEe!07Ha({b! z;kk!%9v_`+Eh1;1_l`eyzu((Ot~?hwm+-v5c4MOz7te%KX*UbsNZhO5^IgZscjMbr zqG^6}lTxd8-MnA=PR7%n-Hk;#Cs&S1&Y-w>k5&D=9RUfMSzYr!7TSHEH@TImd%1t` zym`yatWSTMXfV{QX{g-}k%! zG1mB8VD#K9F&UUsRZCnWN|K9G6H8KcQ-B16k%57wuA!l>p=pSrxs`#jm4T_Q0gz!( zc=u&BOan-z6+{nC}Q!>*kp&EcT7={>F zS{a#InL=%t+qeHSP(wP%Nj{m$sd>ez3>hUQ1y=g{V7oHQQj_y@bMy0x_413-^>ZLf ziuIE!b&C`Ajr9!l74nM|h|%HW9^j*Iq-Urf-EWf&b0frgNTFb0tZQf)VrXDxYGh>s zbfXzC6x@4nb^|p?g4`IKpH@7Hc~)E!VpEJMaiiQ z{uPz!sd);X$w1e?ky!TvD6Ni=jt>p;fq4~VSUy;_ZYD@I*st%+SDglGVeoYIb6Mw< G&;$VUzFNxw diff --git a/bureau/admin/images/check_ok.png b/bureau/admin/images/check_ok.png index e2b3eee052f16d7a0793a5dd689da4f06dbf7d4c..790f5e14569f7f316e1d3560b48a7c843e698e6f 100644 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl482JKxLR|m<|IgsZz~ITi5X!*d z!@%Irz~IXO5&@FlFa}T@$OV!>aUTYz04A1T79e5{VrKGV0wG@}CJ!ctXa?aFA;xG% zz6>7mG*R(PQPFH6!E8Rh3~tVNcA;zmff!ziSP}6sL8%ZSnE*kV01=%QW%pftUcCms zwVHlSx_;e;0c*5EnsvhuNklAgik$BlJ;y$FlWxk!fRtTE#amL!wkDVDi7Y=5TDc>! zdUsm=fsFbSrcK9On-6()9IEQv>)m;*y6a$g*TLw%BME)SUHVVPOxT+};b8v6qnQ)$ z*-buHF!@B*w8J?wuDZ{>&_DCigjpvtW}U8{dop*~h4O8$7HYnEzXBLQ+9g4L!3?~7 z64J7YDn`a8re<#0IYqq_CQh9-cfsO4*KXW?_Wb4Rw_m@0`~LIiuV4Ro`3`&pYU}lM zaSW-rHTA5k(4hbU*Newwo7meQ$lZx$Vk!T&UocLzd4l8|$Lss=Hv89KH1LYdPQKgl z=(pV7{cLtj(RVsm_Q|Z9zE)m8`(0%51g$;MXI%XHT|Zp2ycWCgYDR^Z1jifJgfx~UoE|*^7qBsH|Ha_wCJXtQAxgd@%+8IgTe~DWM4f3Omk! literal 4059 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 array ("request", "string", ""), - "domain_id" => array ("request", "integer", ""), -); + "domain_id" => array ("request", "integer", ""), + "search" => array ("request", "string", ""), + "offset" => array ("request", "integer", 0), + "count" => array ("request", "integer", 50), + ); $champs=getFields($fields); -if( !$domain && !$domain_id ) -{ - include("main.php"); - exit(); +$counts=array("10" => "10", "20" => "20", "30" => "30", "50" => "50", "100" => "100", "200" => "200", "500" => "500", "1000" => "1000"); + +if(!$domain_id ) { + include("main.php"); + exit(); } -$domain_id=$champs["domain_id"]; - -if(!$mails_list = $mail->enum_domain_mails($domain_id)){ - $error=$err->errstr(); +if ($domain=$dom->get_domain_byid($domain_id)) { + if(!($mails_list = $mail->enum_domain_mails($domain_id,$search,$offset,$count))) { + $error=$err->errstr(); + } +} else { + $error=$err->errstr(); } ?> @@ -55,15 +56,14 @@ if (isset($error)) { echo "

$error

"; } -//Mail creation. -if ($quota->cancreate("mail")) { ?> +// Mail creation form +if ($quota->cancreate("mail")) { +?>

-
- + + - - - " /> + " />
- +
+

:

+ +
+
+ + + +
+		 +total,"mail_list.php?domain_id=".$domain_id."&count=".$count."&search=".urlencode($search)."&offset=%%offset%%"); ?> + +
+ + + +
+
+ + +
- + - '"> + + + + - - + + + + + + + + + + +
+ " /> + +
"><?php __(" />
 <?php __(" /> <?php __(" />
"><?php __(" />
60chars, use "..." + js close/open */ ?>
+

" />

+
+ diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css index d8dccdc2..99bad351 100644 --- a/bureau/admin/styles/style.css +++ b/bureau/admin/styles/style.css @@ -154,6 +154,14 @@ hr { padding: 2px; color: black; } +.intleft { + border-right: 0px; + padding-right: 0px; +} +.intright { + border-left: 0px; + padding-left: 0px; +} .lst1 { background-color: #F1F8FD; @@ -329,6 +337,16 @@ img { margin-right: auto; } +table.searchtable { + width: 700px; + border: 1px dotted #99f; + margin: 20px 0 20px 0px; +} + +table.searchtable td { + padding: 5px; +} + /* Others */ .center { text-align: center; diff --git a/bureau/class/functions.php b/bureau/class/functions.php index 3ebb3269..9a47ad0c 100644 --- a/bureau/class/functions.php +++ b/bureau/class/functions.php @@ -1,13 +1,9 @@ "._("Previous Page")." "; + } else { + echo _("Previous Page")." "; + } + + if ($total>(2*$count)) { // On n'affiche le pager central (0 1 2 ...) s'il y a au moins 2 pages. + echo " - "; + if (($total<($count*10)) && ($total>$count)) { // moins de 10 pages : + for($i=0;$i<$total/$count;$i++) { + $o=$i*$count; + if ($offset==$o) { + echo $i." "; + } else { + echo "$i "; + } + } + } else { // Plus de 10 pages, on affiche 0 1 2 , 2 avant et 2 après la page courante, et les 3 dernieres + for($i=0;$i<=2;$i++) { + $o=$i*$count; + if ($offset==$o) { + echo $i." "; + } else { + echo "$i "; + } + } + if ($offset>=$count && $offset<($total-2*$count)) { // On est entre les milieux ... + // On affiche 2 avant jusque 2 après l'offset courant mais sans déborder sur les indices affichés autour + $start=max(3,intval($offset/$count)-2); + $end=min(intval($offset/$count)+3,intval($total/$count)-3); + if ($start!=3) echo " ... "; + for($i=$start;$i<$end;$i++) { + $o=$i*$count; + if ($offset==$o) { + echo $i." "; + } else { + echo "$i "; + } + } + if ($end!=intval($total/$count)-3) echo " ... "; + } else { + echo " ... "; + } + for($i=intval($total/$count)-3;$i<$total/$count;$i++) { + $o=$i*$count; + if ($offset==$o) { + echo $i." "; + } else { + echo "$i "; + } + } + echo " - "; + } // More than 10 pages? + } + // Shall-we show the next page link ? + if ($offset+$count<$total) { + $o=$offset+$count; + echo ""._("Next Page")." "; + } else { + echo _("Next Page")." "; + } + echo $after; +} + + + ?> diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index b60641de..d024ac8b 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -1,6 +1,5 @@ raise("dom", 26); @@ -1157,6 +1157,32 @@ class m_dom { } + + /* ----------------------------------------------------------------- */ + /** + * Returns the name of a domain for the current user, from it's domain_id + * @param $dom_id integer the domain_id to search for + * @return string the domain name, or false with an error raised. + */ + function get_domain_byid($dom_id) { + global $db,$err,$cuid; + $dom_id=intval($dom_id); + $db->query("SELECT domaine FROM domaines WHERE id=$dom_id AND compte=$cuid;"); + if ($db->next_record()) { + $domain=$db->f("domaine"); + if (!$domain) { + $err->raise("dom",_("This domain is not installed in your account")); + return false; + } else { + return $domain; + } + } else { + $err->raise("dom",_("This domain is not installed in your account")); + return false; + } + } + + /* ----------------------------------------------------------------- */ /** * Return the list of allowed slave accounts diff --git a/bureau/class/m_err.php b/bureau/class/m_err.php index 05af74c6..fb018b9a 100644 --- a/bureau/class/m_err.php +++ b/bureau/class/m_err.php @@ -91,8 +91,10 @@ class m_err { */ function errstr() { if (is_string($this->error)) { - $str = _("err_".$this->clsid."_generic: ")._($this->error)."\n"; + // new way of handling errors: message directly in the class + $str = $this->error."\n"; } else { + // old way: message in the locales files (ugly) $str = _("err_".$this->clsid."_".$this->error)."\n"; } $args = $this->param; diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php index 597b62e7..c4702c18 100644 --- a/bureau/class/m_mail.php +++ b/bureau/class/m_mail.php @@ -1,6 +1,5 @@ invoke in the code. */ class m_mail { - /** domain list + + /* ----------------------------------------------------------------- */ + /** domain list for this account * @access private */ var $domains; /* ----------------------------------------------------------------- */ - /** - * Constructor + /** Number of results for a pager display + * @access public */ - function m_mail() { - } + var $total; /* ----------------------------------------------------------------- */ - /** - * Quota list (hook for quota class) + /** Quota list (hook for quota class) */ function alternc_quota_names() { return "mail"; } + + /* ----------------------------------------------------------------- */ + /** get_quota (hook for quota class), returns the number of used + * service for a quota-bound service + * @param $name string the named quota we want + * @return the number of used service for the specified quota, + * or false if I'm not the one for the named quota + */ function alternc_get_quota($name) { global $db,$err,$cuid; if ($name=="mail") { $err->log("mail","getquota"); - //$db->query("SELECT COUNT(*) AS cnt FROM address WHERE domain_id in(select id from domaines where compte=$cuid);"); - $db->query("SELECT COUNT(a.id) AS cnt FROM address a, domaines d WHERE a.domain_id =d.id and d.compte=$cuid group by a.id;"); + $db->query("SELECT COUNT(*) AS cnt FROM address WHERE domain_id in (select id from domaines where compte=$cuid);"); $db->next_record(); return $db->f("cnt"); } - } - - - /** - * Password kind used in this class (hook for admin class) - */ - function alternc_password_policy() { - return array("pop"=>"POP/IMAP account passwords"); + return false; } /* ----------------------------------------------------------------- */ - /** Returns the list of mail-hosted domains for a user + /** Password policy kind used in this class (hook for admin class) + * @return array an array of policykey => "policy name (for humans)" + */ + function alternc_password_policy() { + return array("pop"=>_("Email account password")); + } + + + /* ----------------------------------------------------------------- */ + /** Returns the list of mail-hosting domains for a user * @return array indexed array of hosted domains */ function enum_domains() { global $db,$err,$cuid; $err->log("mail","enum_domains"); $db->query("select d.id, d.domaine, count(a.id) as nb_mail FROM domaines d left join address a on a.domain_id=d.id where d.compte = $cuid group by d.id order by d.domaine asc;"); + $this->enum_domains=array(); while($db->next_record()){ $this->enum_domains[]=$db->Record; } - //print_r("
");print_r($this->enum_domains);die();
       return $this->enum_domains;
-
   }
 
+
+  /* ----------------------------------------------------------------- */
   /* function used to list every mail address hosted on a domain.
-   * @param : the technical domain id.
-   * @result : an array of each mail hosted under the domain.
+   * @param $dom_id integer the domain id.
+   * @param $search string search that string in recipients or address.
+   * @param $offset integer skip THAT much emails in the result.
+   * @param $count integer return no more than THAT much emails.
+   * @result an array of each mail hosted under the domain.
    */
-  function enum_domain_mails($dom_id = null){
-    global $db,$err,$cuid;
+  function enum_domain_mails($dom_id = null, $search="", $offset=0, $count=30){
+    global $db,$err,$cuid,$hooks;
     $err->log("mail","enum_domains_mail");
-    $db->query("select * from address where domain_id=$dom_id order by address asc;");
-    if (!$db->num_rows()) {
+
+    $search=trim($search);
+
+    $where="a.domain_id=$dom_id";
+    if ($search) $where.=" AND (a.address LIKE '%".addslashes($search)."%' OR r.recipients LIKE '%".addslashes($search)."%')";
+    $db->query("SELECT count(a.id) AS total FROM address a LEFT JOIN recipient r ON r.address_id=a.id WHERE $where;");
+    $db->next_record();
+    $this->total=$db->f("total");
+
+    $db->query("SELECT a.id, a.address, a.password, a.enabled, d.domaine AS domain, m.quota*1024*1024 AS quota, m.bytes AS used, NOT ISNULL(m.id) AS islocal, a.type, r.recipients, m.lastlogin  
+         FROM (address a LEFT JOIN mailbox m ON m.address_id=a.id) LEFT JOIN recipient r ON r.address_id=a.id, domaines d 
+         WHERE $where AND d.id=a.domain_id 
+         LIMIT $offset,$count;");
+    if (! $db->next_record()) {
+      $err->raise("mail",_("No mail found for this query"));
       return false;
     }
-    while($db->next_record()){
-      $this->enum_domain_mails[]=$db->Record;
-    }
-    return $this->enum_domain_mails;
+    $res=array();
+    do {
+      $details=$db->Record;
+      // if necessary, fill the typedata with data from hooks ...
+      if ($details["type"]) {
+	$result=$hooks->invoke("mail_get_details",array($details["id"])); // Will fill typedata if necessary
+	$details["typedata"]=implode("
",$result);
+      }
+      $res[]=$details;
+    } while ($db->next_record());
+    return $res;
   }
 
-  function enum_doms_mails_letters($mail_id) {
+
+
+  /* ----------------------------------------------------------------- */
+  /** Function used to insert a new mail into de the db
+   * should be used by the web interface, not by third-party programs.
+   *
+   * This function calls the hook "hooks_mail_cancreate"
+   * which must return FALSE if the user can't create this email, and raise and error accordingly
+   * 
+   * @param $dom_id integer A domain_id (owned by the user) 
+   * (will be the part at the right of the @ in the email)
+   * @param $mail string the left part of the email to create (something@dom_id)
+   * @return an hashtable containing the database id of the newly created mail, 
+   * or false if an error occured ($err is filled accordingly)
+   */ 
+  function create($dom_id, $mail){
+    global $err,$db,$cuid,$quota,$dom;
+    $err->log("mail","create");
+
+    // Validate the domain id
+    if (!($domain=$dom->get_domain_byid($dom_id))) {
+      return false;
+    }
+
+    // Validate the email syntax:
+    $m=$mail."@".$domain;
+    if (!filter_var($m,FILTER_VALIDATE_EMAIL)){
+      $err->raise("mail",_("The email you entered is syntaxically incorrect"));
+      return false;
+    }
+
+    // Call other classes to check we can create it:
+    $cancreate=$hooks->invoke('hooks_mail_cancreate',array($dom_id,$domain,$mail));
+    if (in_array(false,$cancreate,true)) {
+      return false;
+    }
+
+    // Check the quota:
+    if (!$quota->cancreate("mail")) {
+      $err->raise("mail",_("You cannot create email addresses: your quota is over."));
+      return false;
+    }
+    // Already exists?
+    $db->query("SELECT * FROM address WHERE domain_id=".$dom_id." AND address='".addslashes($mail)."';");
+    if ($db->next_record()) {
+      $err->raise("mail",_("This email address already exists"));
+      return false;
+    }
+    // Create it now
+    $db->query("INSERT INTO address (domain_id, address) VALUES ($dom_id, '".addslashes($mail)."');");
+    if (!($id=$db->lastid())) {
+      $err->raise("mail",_("An unexpected error occured when creating the email"));
+      return false;
+    }
+    return $id;
+  }
+
+
+  /* ----------------------------------------------------------------- */
+  /** function used to get every information we can on a mail 
+  * @param $mail_id integer
+  * @return array a hashtable with all the informations for that email
+  */
+  function get_details($mail_id) {
+    global $db, $err, $cuid;
+    $err->log("mail","get_details");
+
+    $mail_id=intval($mail_id);
+
+    // We fetch all the informations for that email: these will fill the hastable : 
+    $db->query("SELECT a.address, a.password, a.enabled, d.domaine AS domain, m.quota, m.bytes/1024/1024 AS used, NOT ISNULL(m.id) AS islocal, a.type  
+         FROM address a LEFT JOIN mailbox m ON m.address_id=a.id, domaines d WHERE a.id=$mail_id AND d.id=a.domain_id;");
+    if (! $db->next_record()) return false;
+    $details=$db->Record;
+    // if necessary, fill the typedata with data from hooks ...
+    if ($details["type"]) {
+      $result=$hooks->invoke("mail_get_details",array($mail_id)); // Will fill typedata if necessary
+      $details["typedata"]=implode("
",$result);
+    }
+    return $details;
+  }
+
+
+
+
+
+
+
+  /* ############################################################ */
+  /* ############################################################ */
+  /* After that line, to be deleted / checked & co. */
+  /* ############################################################ */
+  /* ############################################################ */
+
+
+
+  /* ----------------------------------------------------------------- */
+  /** function used to list the first letter used in the list of the emails hosted in a specific domain
+   * @param $domain_id integer the domain id.
+   * @result an array of each letter used in mail hosted under the domain.
+   */
+  function enum_doms_mails_letters($domain_id) {
     global $err,$cuid,$db;
     $err->log("mail","enum_doms_mails_letters");
-    //$db->query("select distinct left(ad.address,1) as letter from address ad, domaines d where ad.domain_id = d.id and d.compte='$cuid' order by letter;");
-    $db->query("select distinct left(ad.address,1) as letter from address ad,where ad.id = $mail_id ;");
+    $domain_id=intval($domain_id);
+    $db->query("select distinct left(ad.address,1) as letter from address ad,where ad.domain_id = $domain_id ;");
     $res=array();
     while($db->next_record()) {
       $res[]=$db->f("letter");
@@ -119,130 +252,20 @@ class m_mail {
     return $res;
   }
 
-  /*
-   * Function used to insert a new mail into de the db
-   * @param: a domain_id (linked to the user ) and the left part of mail waiting to be inserted 
-   * @return: an hashtable containing the database id of the newly created mail, the state ( succes or failure ) of the operation, 
-   * and an error message if necessary.
-   * TODO piensar a enlever la contrainte d'unicité sur le champs address et en rajouter une sur adrresse+dom_id.
-   */ 
-  function create($dom_id, $mail_arg,$dom_name){
-    global $mail,$err,$db,$cuid,$quota;
-    $err->log("mail","create");
-  
-    $return = array ( 
-      "state" => true,
-      "mail_id" => null,
-      "error" => "OK");
-
-    $m=$mail_arg."@".$dom_name;
-    if(checkmail($m) != 0){
-      $return["state"]=false;
-      $return["error"]="erreur d'appel a cancreate";
-      return $return;
-    }
-  
-    $return=$mail->cancreate($dom_id, $mail_arg);
-    //Si l'appel échoue
-    if(!$return ){
-      $return["state"]=false;
-      $return["error"]="erreur d'appel a cancreate";
-      return $return;
-    }
-    if($return["state"]==false){
-      $return["error"]="erreur d'appel a cancreate";
-      return ($return);
-    }    
-    // check appartenance domaine      
-    $test=$db->query("select id from domaines where compte=$cuid and id=$dom_id;");
-  
-    if(!$db->next_record($test)){
-        $return["state"]= false;
-        $return["error"]=" hophophop tu t'es prix pour un banquier ouquoi ?";
-        return $return;
-    }
-
-    // Check the quota :
-    if (!$quota->cancreate("mail")) {
-      $err->raise("mail",10);
-      return false;
-    }
-  
-		$db->query("insert into address (domain_id, address) VALUES ($dom_id, '$mail_arg');");
-		$test=$db->query("select id from address where domain_id=$dom_id and address=\"$mail_arg\";");
-
-    $db->next_record();
-    
-    $return["mail_id"]=$db->f("id");
-  
-    return $return;
+  /* FIXME: check who is using that function and delete it when unused */
+  function cancreate($dom_id, $email){
+    return true;
   }
-
-/*
- *Function used to check if a given mail address can be inserted a new mail into de the db
- *@param: a domain_id (linked to the user ) and the left part of mail waiting to be inserted 
- *@return: an hashtable containing the database id of the newly created mail, the state ( succes or failure ) of the operation, 
- *and an error message if necessary.
- */
-  function cancreate($dom_id,$mail_arg){
-    global $db,$err,$cuid,$hooks;
-    $err->log("mail","cancreate");
   
-    $return = array ( 
-        "state" => true,
-        "mail_id" => null,
-        "error" => "");
-  
-    $return2 = array ();
-    $return2 = $hooks->invoke('hooks_mail_cancreate',array($dom_id,$mail_arg));
-  
-    foreach($return2 as $tab => $v){
-      if($v["state"] != true){
-        //print_r($tab);
-        $return["state"]=false;
-        $return["error"]="erreur lors du check de la classe $tab";
-        return $return; 
-      }
-    }
-    return $return; 
-  }
-
+   /* FIXME: check who is using that function and delete it when unused */
   function form($mail_id) {
-    global $mail, $err;
-    include('mail_edit.inc.php');
   }
 
 
-  /*
-   * hooks called by the cancreate function
-   * @param: a domain_id (linked to the user ) and the left part of mail waiting to be inserted 
-   * @return: an hashtable containing the database id of the newly created mail, the state ( succes or failure ) of the operation, 
-   * and an error message if necessary.
-   *
-   */ 
-  function hooks_mail_cancreate($dom_id, $mail_arg) {
+   /* FIXME: check who is using that function and delete it when unused */
+  function hooks_mail_cancreate($dom_id, $domain, $mail_arg) {
     global $db,$err;
-    $err->log("mail","hooks_mail_cancreate");
-  
-    $return = array ( 
-        "state" => true,
-        "mail_id" => null,
-        "error" => "");
-  
-    $db->query("select count(*) as cnt from address where domain_id=$dom_id and address=\"$mail_arg\";"); 
-  
-    if($db->next_record()){
-      //if mail_arg not already in table "address"
-      if( $db->f("cnt") == "0") {
-        return $return;
-      }else{
-        $return["state"] = false;
-        $return["error"]="mail existe deja";
-        return $return;
-      }
-    } 
-    $return["error"]="erreur de requête";
-    return $return;
+    return true;
   }
 
   /**
@@ -290,49 +313,7 @@ class m_mail {
     return $final;
   }
   
-  /* function used to get every information at our disposal concerning a mail.
-  *  @param: $mail_id, $recur (used to stop the fonction correctly when called from list alias.
-  *  @return: an hashtable of every usefull informations we can get about a mail.
-  */
 
-  function mail_get_details($mail_id, $recur=true){
-    global $db, $err, $mail_redirection,$mail_alias, $mail_localbox;
-    $err->log("mail","mail_get_details");
-    
-    $details = array (
-        "address_id" => "",
-        "address" => "",
-        "domain" => "", 
-        "address_full" => "",
-        "password" => "",
-        "enabled" => false,
-        "is_local" => Array(),
-        "recipients" => Array(),
-        "alias" => Array(),
-        );
-  
-    //on recupere les info principales de toutes adresses
-    $db->query("select a.address,a.password,a.enabled, d.domaine from address a, domaines d where a.id=$mail_id and d.id=a.domain_id;");
-  
-    // Return if no entry in the database
-    if (! $db->next_record()) return false;
-  
-    $details["address_id"]  =$mail_id;
-    $details["address"]  =$db->f("address");
-    $details["password"]  =$db->f("password");
-    $details["enabled"]  =$db->f("enabled");
-    $details["domain"]  =$db->f("domaine");
-    $details["address_full"]=$details["address"].'@'.$details["domain"];
-  
-    if ($recur) {
-      // Get some human-usefull informations
-      $details["is_local"]=$mail_localbox->details($mail_id);
-      $details["recipients"] = $mail_redirection->list_recipients($mail_id);
-      $details["alias"] = $mail_alias->list_alias($details['address_full']);
-    }
-    
-    return $details;
-  }
 
  /** 
   * activate a mail address.
@@ -344,6 +325,7 @@ class m_mail {
     if( !$db->query("UPDATE address SET enabled=1 where id=$mail_id;"))return false;
   }
 
+
  /** 
   * disable a mail address.
   * @param integer mail_id: unique mail identifier
@@ -354,20 +336,16 @@ class m_mail {
     if( !$db->query("UPDATE address SET enabled=0 where id=$mail_id;")) return false;
   }
 
+
  /** 
   * setpasswd a mail address.
   * @param integer mail_id: unique mail identifier
-  * @return boolean true if the password has been changed. Set $err to a proper error code is false.
   */  
   function setpasswd($mail_id,$pass,$passwd_type){
     global $db,$err,$admin;
     $err->log("mail","setpasswd");
     if(!$admin->checkPolicy("pop",$mail_full,$pass)) return false;
-    if(!$db->query("UPDATE address SET password='"._md5cr($pass)."' where id=$mail_id;")) {
-      $err->raise("mail",1);
-      return false;
-    }
-    return true;
+    if(!$db->query("UPDATE address SET password='"._md5cr($pass)."' where id=$mail_id;")) return false;
   }