ispman/install-data/templates users.ldif.template,1.12,1.12.6.1

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

Modified Files:
      Tag: rel_1_1-bugfixes
	users.ldif.template 
Log Message:
merged fixes from HEAD up to 1.13

Index: users.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/users.ldif.template,v
retrieving revision 1.12
retrieving revision 1.12.6.1
diff -u -d -r1.12 -r1.12.6.1
--- users.ldif.template	2 Aug 2003 19:46:19 -0000	1.12
+++ users.ldif.template	7 Feb 2004 15:28:09 -0000	1.12.6.1
@@ -8,7 +8,7 @@
 </perl>
 <perl>
         $text="";
-        if ($r->param("dialupAcces") == "enabled") {
+        if ($r->param("dialupAcces") && $r->param("dialupAcces") eq "enabled"){
                 $text="dialupAccess: yes\n";
         }
         $text
@@ -33,8 +33,6 @@
 uidNumber: <perl>$ispman->getUid()</perl>
 gidNumber: <perl>$ispman->getDomainGid($r->param("ispmanDomain"))</perl>
 
-mailHost: <perl>$r->param("mailHost") || "undefined"</perl>
-fileHost: <perl>$r->param("fileHost") || "undefined"</perl>
 DestinationAddress: <perl>$r->param("fileHost") || "127.0.0.1"</perl>
 DestinationPort: <perl>$ispman->getConf("FTPDestinationPort") || $r->param("DestinationPort") || 21</perl>
 
@@ -50,8 +48,12 @@
 <perl>
    $text="";
    if ($r->param("mailHost")){
-      $text="mailRoutingAddress: ";
-      $text.=join '@', ($r->param("uid"), $r->param("mailHost"));
+      my $address=join '@', ($r->param("uid"), $r->param("mailHost"));
+      $text.="mailHost: ".$r->param("mailHost")."\n";
+      $text.="mailRoutingAddress: $address\n";
+   }
+   if ($r->param("fileHost")){
+      $text.="fileHost: ".$r->param("fileHost")."\n";
    }
    $text
 </perl>



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn