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

updating mail class wrapper function to handle virtual and non virtual mailing list

This commit is contained in:
Steven Mondji-Lerider 2012-10-16 16:37:12 +00:00
parent 64f3e7f556
commit bde1a5ac62
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bureau/class/m_mail.php
View File

@ -204,7 +204,7 @@ class m_mail {
*/ */
function create($dom_id, $mail,$type=""){ function create($dom_id, $mail,$type=""){
global $err,$db,$cuid,$quota,$dom,$hooks; global $err,$db,$cuid,$quota,$dom,$hooks;
$err->log("mail","create"); $err->log("mail","create",$mail);
// Validate the domain id // Validate the domain id
if (!($domain=$dom->get_domain_byid($dom_id))) { if (!($domain=$dom->get_domain_byid($dom_id))) {
@ -545,6 +545,8 @@ 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,$function,$name){
@ -555,14 +557,21 @@ class m_mail {
if (!($domain=$dom->get_domain_byid($dom_id))) { if (!($domain=$dom->get_domain_byid($dom_id))) {
return false; return false;
} }
if($function==""){ if(empty($function)){
$recipient="$name"; #$recipient="$name";
$this->set_details($mail_id,1,0,"",$delivery); $this->set_details($mail_id,1,0,"",$delivery);
}else{ }else{
$recipient="$name-$function"; $recipient="$name-$function";
$this->set_details($mail_id,0,0,"$recipient@$domain",$delivery);
$mail_id2=$mail->create($dom_id,$recipient,$delivery); #used to alias virtual lists
$this->set_details($mail_id2,1,0,"",$delivery); 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);
}
} }
} }