ispman/lib mailbox_actions_cyrus.lib,1.2.2.1,1.2.2.2

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	mailbox_actions_cyrus.lib 
Log Message:
Updated logic checks to the new LDAP based config.


Index: mailbox_actions_cyrus.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/mailbox_actions_cyrus.lib,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- mailbox_actions_cyrus.lib	3 Oct 2006 12:29:10 -0000	1.2.2.1
+++ mailbox_actions_cyrus.lib	3 Oct 2006 16:52:20 -0000	1.2.2.2
@@ -6,8 +6,8 @@
 sub email2uid {
     my $str = shift;
     ( $uid, $domain ) = split( '@', $str );
-    if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
-        if ( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) {
+    if ( lc( $ISPMan::Config->{'AllowFullEmailLogins'} ) == 'yes' ) {
+        if ( lc( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) == 'yes' ) {
             if ($uid) {
                 $uid =~s/\./\\./g;
             }
@@ -29,7 +29,7 @@
 my $imap_conn;
 
 my $imap_mailbox_prefix = $ispman->getConf('imapMailboxPrefix');
-if ( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) {
+if ( lc( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) == 'yes' ) {
     $imap_mailbox_prefix .= '/';
 } else {
     $imap_mailbox_prefix .= '.';
@@ -82,8 +82,8 @@
 
     if ( $imap_conn->list($mailbox) ) {
     	# mailbox exists. Lets continue
-        if ( $ISPMan::Config->{'AllowFullEmailLogins'} ) {
-            if ( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) {
+        if ( lc( $ISPMan::Config->{'AllowFullEmailLogins'} ) == 'yes' ) {
+            if ( lc( $ISPMan::Config->{'CyrusUnixHierarchySep'} ) == 'yes' ) {
                 $sep = '/';
             } else {
                 $sep = '.';


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