ispman/lib mailbox_actions_cyrus.lib, 1.2.2.9, 1.2.2.10

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	mailbox_actions_cyrus.lib 
Log Message:
Fixed forgoten old vars and default folders creation.


Index: mailbox_actions_cyrus.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/mailbox_actions_cyrus.lib,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -d -r1.2.2.9 -r1.2.2.10
--- mailbox_actions_cyrus.lib	24 Oct 2006 21:01:45 -0000	1.2.2.9
+++ mailbox_actions_cyrus.lib	25 Oct 2006 23:08:38 -0000	1.2.2.10
@@ -24,7 +24,7 @@
     my $mail = shift;
     my $box  = $mail;
 
-    $box =~ s/\.|@/_/g unless $allowFullEmailLogins;
+    $box =~ s/\.|@/_/g unless $cyrusVirtDomainFeature;
 
     return $cyrusPrefix . $box;
 }
@@ -42,7 +42,8 @@
 
 sub create_mailbox {
     my $server  = shift;
-    my $mailbox = mail2mailbox(shift);
+    my $mail = shift;
+    my $mailbox = mail2mailbox($mail);
 
     $imap_conn or _connect($server);
 
@@ -54,7 +55,7 @@
     # create any defaults folders
     my @folders = split( ' ', $ispman->getConf('defaultMailboxFolders') );
     for (@folders) {
-        create_folder( $server, $mailbox, $_ );
+        create_folder( $server, $mail, $_ );
     }
 
     return 0;
@@ -84,7 +85,7 @@
     if ( $imap_conn->list($mailbox) ) {
 
         # mailbox exists. Lets continue
-        if ($allowFullEmailLogins) {
+        if ($cyrusVirtDomainFeature) {
             ( $upath, $domain ) = split( '@', $mailbox );
             my $tmpbox = $upath . $cyrusSep . $folder . '@' . $domain;
             if ( $imap_conn->list($tmpbox) ) {


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642