[Phpgroupware-cvs] CVS: qmailldap/inc class.soqmailldap.inc.php,1.15,1.16

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/qmailldap/inc
In directory subversions:/tmp/cvs-serv32172/inc

Modified Files:
        class.soqmailldap.inc.php 
Log Message:
update

Index: class.soqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.soqmailldap.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soqmailldap.inc.php   10 Dec 2002 23:03:59 -0000      1.15
--- class.soqmailldap.inc.php   11 Dec 2002 14:18:01 -0000      1.16
***************
*** 26,32 ****
                  $items = $config->config_data;
  
!                               $this->mail_address             = 
$config['mail'];
!                               $this->routing_address  = $config['routing'];
                        }
                }
  
--- 26,38 ----
                  $items = $config->config_data;
  
!                               $this->mail_address             = 
$items['mail'];
!                               $this->routing_address  = $items['routing'];
                        }
+                       else
+                       {
+                               $this->mail_address             = 
'maillocaladdress';
+                               $this->routing_address  = 'mailroutingaddress';
+                       }
+                       unset($config);
                }
  
***************
*** 153,157 ****
                                        $userData['mailLocalAddress']           
= $allValues[0][$mail_address][0];
                                        $userData['accountStatus']              
        = $allValues[0]['accountstatus'][0];
!                                       $userData['mailForwardingAddress']      
= $allValues[0][$routing_address][0];
                                        $userData['qmailDotMode']               
        = $allValues[0]['qmaildotmode'][0];
                                        $userData['deliveryProgramPath']        
= $allValues[0]['deliveryprogrampath'][0];
--- 159,163 ----
                                        $userData['mailLocalAddress']           
= $allValues[0][$mail_address][0];
                                        $userData['accountStatus']              
        = $allValues[0]['accountstatus'][0];
!                                       $userData['mailRoutingingAddress']      
= $allValues[0][$routing_address][0];
                                        $userData['qmailDotMode']               
        = $allValues[0]['qmaildotmode'][0];
                                        $userData['deliveryProgramPath']        
= $allValues[0]['deliveryprogrampath'][0];
***************
*** 181,187 ****
                        if ($sri)
                        {
!                               $allValues      = ldap_get_entries($ldap, $sri);
!                               $accountDN      = $allValues[0]['dn'];
!                               $uid            = $allValues[0]['uid'][0];
                                $homedirectory  = 
(isset($allValues[0]['homedirectory'][0])?$allValues[0]['homedirectory'][0]:'/home/'
 . $uid);
                        }
--- 187,193 ----
                        if ($sri)
                        {
!                               $allValues              = 
ldap_get_entries($ldap, $sri);
!                               $accountDN              = $allValues[0]['dn'];
!                               $uid                    = 
$allValues[0]['uid'][0];
                                $homedirectory  = 
(isset($allValues[0]['homedirectory'][0])?$allValues[0]['homedirectory'][0]:'/home/'
 . $uid);
                        }
***************
*** 224,230 ****
                        }
  
!                       if ($_accountData['mailForwardingAddress'])
                        {
!                               $newData[$routing_address] = 
$_accountData['mailForwardingAddress'];
                        }
  
--- 230,236 ----
                        }
  
!                       if ($_accountData['mailRoutingAddress'])
                        {
!                               $newData[$routing_address] = 
$_accountData['mailRoutingAddress'];
                        }