kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

updating mail wrapper for genericity

This commit is contained in:
Steven Mondji-Lerider 2012-10-18 12:49:55 +00:00
parent de4ec88b89
commit 215f537e62
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bureau/class/m_mail.php
View File

@ -567,35 +567,32 @@ class m_mail {
* @ param : $dom_id , the domain id associated to a given address * @ param : $dom_id , the domain id associated to a given address
* @ param : $m , the left part of the mail address being created * @ param : $m , the left part of the mail address being created
* @ param : $delivery , the delivery used to deliver the mail * @ param : $delivery , the delivery used to deliver the mail
* @ param : $function , the address' function ( join,leave,request etc...)
* @ param : $name , the mailing list name
*/ */
function add_wrapper($dom_id,$m,$delivery,$function,$name){ function add_wrapper($dom_id,$m,$delivery){
global $err,$db,$ciud,$mail,$dom; global $err,$db,$mail;
$err->log("mail","add_wrapper","$m------$name-----$function"); $err->log("mail","add_wrapper","creating $delivery $m address");
$mail_id=$mail->create($dom_id,$m,$delivery); $mail_id=$mail->create($dom_id,$m,$delivery);
if (!($domain=$dom->get_domain_byid($dom_id))) { $this->set_details($mail_id,1,0,'',$delivery);
return false;
}
if(empty($function)){
#$recipient="$name";
$this->set_details($mail_id,1,0,"",$delivery);
}else{
$recipient="$name-$function";
#used to alias virtual lists
if (file_exists("/usr/share/alternc-mailman/patches/mailman-true-virtual.applied")) {
$this->set_details($mail_id,0,0,"$recipient@$domain",$delivery);
$mail_id2=$mail->create($dom_id,$recipient,$delivery);
$this->set_details($mail_id2,1,0,"",$delivery);
}else{
$this->set_details($mail_id,1,0,"$recipient@$domain",$delivery);
} }
/* ----------------------------------------------------------------- */
/** A function used to create an alias for a specific address
* @ param : $dom_id , the domain sql identifier
* @ param : $m , the alias we want to create
* @ param : $alias , the already existing aliased address
* @ param : $delivery, the type of delivery of the alias created
*/
function create_alias($dom_id,$m,$alias,$delivery) {
global $err,$db,$mail;
$err->log("mail","create_alias","creating $delivery $m alias for $alias");
$mail_id=$mail->create($dom_id,$m,$delivery);
$this->set_details($mail_id,0,0,$alias,"mailman");
} }
}
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
/** A wrapper used by mailman class to create it's needed addresses /** A wrapper used by mailman class to create it's needed addresses