ispman/lib/ISPMan UserMan.pm,1.58,1.58.4.1

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	UserMan.pm 
Log Message:
Initial commit of seccond approach to cyrus virtdomains support.


Index: UserMan.pm
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/ISPMan/UserMan.pm,v
retrieving revision 1.58
retrieving revision 1.58.4.1
diff -u -d -r1.58 -r1.58.4.1
--- UserMan.pm	27 May 2006 16:25:05 -0000	1.58
+++ UserMan.pm	3 Oct 2006 12:29:10 -0000	1.58.4.1
@@ -174,9 +174,25 @@
     # add user to LDAP from user ldif template
     if ( $self->addDataFromLdif( "templates/users.ldif.template", $r ) ) {
         if ( $r->param("mailHost") ) {
-            $self->addProcessToHost( $domain, $r->param("mailHost"),"createMailbox", "mailbox=$_uid");
             my $quota=$r->param("mailQuota") * 1024;
-            $self->addProcessToHost($domain, $r->param("mailHost"), "setMailboxQuota", "mailbox=$_uid&quota=$quota");
+            if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
+                my $cvd_uid = join '@', ( $r->param("userid"), $r->param("ispmanDomain") );
+                $self->addProcessToHost(
+                    $domain, $r->param("mailHost"),"createMailbox", "mailbox=$cvd_uid"
+                );
+                $self->addProcessToHost(
+                    $domain, $r->param("mailHost"), "setMailboxQuota",
+                    "mailbox=$cvd_uid&quota=$quota"
+                );
+            } else {
+                $self->addProcessToHost(
+                    $domain, $r->param("mailHost"),"createMailbox", "mailbox=$_uid"
+                );
+                #my $quota=$r->param("mailQuota") * 1024;
+                $self->addProcessToHost(
+                    $domain, $r->param("mailHost"), "setMailboxQuota", "mailbox=$_uid&quota=$quota"
+                );
+            }
         }
 
       # send the process to method addUserFileServerProcess


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV