[Ispman-cvs] ispman/install-data/templates users.ldif.template, 1.15, 1.16

[Joerg D. <jd...@us...>]

Update of /cvsroot/ispman/ispman/install-data/templates
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21579/install-data/templates

Modified Files:
	users.ldif.template 
Log Message:
merged branch dev_1_3-cyrus_virtdomain2

Index: users.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/users.ldif.template,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- users.ldif.template	18 Apr 2004 19:19:32 -0000	1.15
+++ users.ldif.template	21 Nov 2006 14:41:28 -0000	1.16
@@ -48,7 +48,12 @@
 <perl>
    $text="";
    if ($r->param("mailHost")){
-      my $address=join '@', ($r->param("uid"), $r->param("mailHost"));
+      my $address="";
+      if ( lc( $ispman->getConf("cyrusVirtDomainFeature") ) eq 'yes') {
+         $address=join '@', ($r->param("userid"), $r->param("ispmanDomain"));
+      } else {
+         $address=join '@', ($r->param("uid"), $r->param("mailHost"));
+      }
       $text.="mailHost: ".$r->param("mailHost")."\n";
       $text.="mailRoutingAddress: $address\n";
    }