ispman/install-data/templates users.ldif.template,1.14,1.15

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

Modified Files:
	users.ldif.template 
Log Message:
moved some logic from UserMan.pm to user.ldif.template to allow better customizing

Index: users.ldif.template
===================================================================
RCS file: /cvsroot/ispman/ispman/install-data/templates/users.ldif.template,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- users.ldif.template	7 Feb 2004 18:13:02 -0000	1.14
+++ users.ldif.template	18 Apr 2004 19:19:32 -0000	1.15
@@ -20,31 +20,31 @@
         }
         $text
 </perl>
-ispmanStatus: active
-ispmanCreateTimestamp: <perl>time()</perl>
-uid: <perl>$r->param("uid")</perl>
-userPassword: <perl>$r->param("userPassword") || "noEntry"</perl>
-ispmanUserId: <perl>$r->param("userid")</perl>
-ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
+
 givenName: <perl>$r->param("givenName")</perl>
-sn: <perl>$r->param("sn")</perl>
-cn: <perl>$r->param("cn")</perl>
+sn: <perl>$r->param("sn")? $r->param("sn"):$r->param("userid")</perl>
+cn: <perl>($r->param("givenName") && $r->param("sn"))? join " ", ($r->param("givenName"), $r->param("sn")) :$r->param("userid")</perl>
 
+uid: <perl>$r->param("uid")</perl>
+uid: <perl>join '@', ($r->param("userid"), $r->param("ispmanDomain"))</perl>
+userPassword: <perl>$r->param("userPassword") || "noEntry"</perl>
 uidNumber: <perl>$ispman->getUid()</perl>
 gidNumber: <perl>$ispman->getDomainGid($r->param("ispmanDomain"))</perl>
+homeDirectory: <perl>join '/', ($r->param("domaininfo")->{'homeDirectory'}, "users", $r->param("uid"))</perl>
+loginShell: <perl>$r->param("loginShell")||$ispman->getConf("loginShell")</perl>
+
+ispmanStatus: active
+ispmanCreateTimestamp: <perl>time()</perl>
+ispmanUserId: <perl>$r->param("userid")</perl>
+ispmanDomain: <perl>$r->param("ispmanDomain")</perl>
 
 DestinationAddress: <perl>$r->param("fileHost") || "127.0.0.1"</perl>
 DestinationPort: <perl>$ispman->getConf("FTPDestinationPort") || $r->param("DestinationPort") || 21</perl>
-
 FTPStatus: <perl>$r->param("FTPStatus")</perl>
 FTPQuotaMBytes: <perl>$r->param("FTPQuotaMBytes")</perl>
 
-homeDirectory: <perl>$r->param("homeDirectory")</perl>
-loginShell: <perl>$r->param("loginShell")||$ispman->getConf("loginShell")</perl>
 mailLocalAddress: <perl>join '@', ($r->param("userid"), $r->param("ispmanDomain"))</perl>
-uid: <perl>join '@', ($r->param("userid"), $r->param("ispmanDomain"))</perl>
 mailQuota: <perl>$r->param("mailQuota")*1024</perl>
-
 <perl>
    $text="";
    if ($r->param("mailHost")){



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click