ispman/lib/ISPMan UserMan.pm,1.35.2.3,1.35.2.4

Update of /cvsroot/ispman/ispman/lib/ISPMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25567/lib/ISPMan

Modified Files:
      Tag: rel_1_1-bugfixes
	UserMan.pm 
Log Message:
fixed bug with invalid usernames (supplied uid was not filtered properly)

Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.35.2.3
retrieving revision 1.35.2.4
diff -u -d -r1.35.2.3 -r1.35.2.4
--- UserMan.pm	17 Apr 2004 09:46:24 -0000	1.35.2.3
+++ UserMan.pm	17 Apr 2004 13:12:45 -0000	1.35.2.4
@@ -122,7 +122,7 @@
    my $userid=$r->param("uid");
    $userid=lc($userid);
    $userid=~s/[^a-z0-9\-_]//g;
-   $r->param("userid", $userid);
+   $r->param("uid", $userid);
 
    # lets  crypt the pass
    my $userpassword=$self->encryptPassWithMethod($r->param("userPassword"),$self->getConf('userPassHashMethod'));
@@ -145,9 +145,9 @@
 
    my $domain_info=$self->getDomainInfo($r->param("ispmanDomain"));
    my $homeDirectory=join '/', ($domain_info->{'homeDirectory'}, "users", $r->param("uid"), "");
-   my $cn=($r->param("givenName") && $r->param("sn"))? join " ", ($r->param("givenName"), $r->param("sn")) :$r->param("userid");
+   my $cn=($r->param("givenName") && $r->param("sn"))? join " ", ($r->param("givenName"), $r->param("sn")) :$r->param("uid");
    $r->param("cn", $cn);
-   $r->param("sn", ($r->param("sn")? $r->param("sn"):$r->param("userid")));
+   $r->param("sn", ($r->param("sn")? $r->param("sn"):$r->param("uid")));
    $r->param("homeDirectory", $homeDirectory);
 
    #define 1 MB quota by default



-------------------------------------------------------
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