ispman/lib mailbox_actions_cyrus.lib,1.2.2.5,1.2.2.6

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

Modified Files:
      Tag: dev_1_3-cyrus_virtdomain2
	mailbox_actions_cyrus.lib 
Log Message:
Reduced getConf LDAP calls.


Index: mailbox_actions_cyrus.lib
===================================================================
RCS file: /cvsroot/ispman/ispman/lib/mailbox_actions_cyrus.lib,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -d -r1.2.2.5 -r1.2.2.6
--- mailbox_actions_cyrus.lib	5 Oct 2006 13:57:49 -0000	1.2.2.5
+++ mailbox_actions_cyrus.lib	5 Oct 2006 14:18:32 -0000	1.2.2.6
@@ -2,12 +2,24 @@
 
 use IMAP::Admin;
 
+my $allowFullEmailLogins = 0;
+my $cyrusUnixHierarchySep = 0;
+
+if ( lc( $ispman->getConf("allowFullEmailLogins") ) eq 'yes' ) {
+    $allowFullEmailLogins = 1;
+}
+
+if ( lc( $ispman->getConf('cyrusUnixHierarchySep') ) eq 'yes' ) {
+    $cyrusUnixHierarchySep = 1;
+}
+    
+
 # helper function to convert email into uid notation
 sub email2uid {
     my $str = shift;
     ( $uid, $domain ) = split( '@', $str );
-    if ( lc( $ispman->getConf("allowFullEmailLogins") ) eq 'yes' ) {
-        if ( lc( $ispman->getConf('cyrusUnixHierarchySep') ) eq 'yes' ) {
+    if ( $allowFullEmailLogins ) {
+        if ( $cyrusUnixHierarchySep ) {
             if ($uid) {
                 $uid =~s/\./\\./g;
             }
@@ -27,7 +39,7 @@
 
 sub get_correct_mailbox {
     my $mbox = shift;
-    if ( lc( $ispman->getConf("allowFullEmailLogins") ) eq 'yes' ) {
+    if ( $allowFullEmailLogins ) {
         $tmbox = $ispman->getUserInfo($mbox);
         return $tmbox->{'mailLocalAddress'};
     }
@@ -39,7 +51,7 @@
 
 my $imap_mailbox_prefix = $ispman->getConf('imapMailboxPrefix');
 my $sep = '.';
-if ( lc( $ispman->getConf("cyrusUnixHierarchySep") ) eq 'yes' ) {
+if ( $cyrusUnixHierarchySep ) {
     $sep = '/';
     $imap_mailbox_prefix .= $sep;
 } else {
@@ -94,7 +106,7 @@
 
     if ( $imap_conn->list($mailbox) ) {
     	# mailbox exists. Lets continue
-        if ( lc( $ispman->getConf("allowFullEmailLogins") ) eq 'yes' ) {
+        if ( $allowFullEmailLogins ) {
             ( $addr_start, $addr_end ) = split( '@', $addr );
             if ( $imap_conn->list( join '',
                     ( $imap_mailbox_prefix, $addr_start, $sep, $folder, '@', $addr_end)) ) {


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