[Phpgroupware-cvs] CVS: qmailldap/inc hook_admin.inc.php,NONE,1.1.2.1 class.soqmailldap.inc.php,1.13,1.13.2.1

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.soqmailldap.inc.php 
Added Files:
      Tag: Version-0_9_14-branch
        hook_admin.inc.php 
Log Message:
fixed ldap2 support plus support of mail/mailroutingaddress attributes

***** Error reading new file: [Errno 2] No such file or directory: 
'hook_admin.inc.php'
Index: class.soqmailldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/class.soqmailldap.inc.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** class.soqmailldap.inc.php   26 Oct 2001 14:28:55 -0000      1.13
--- class.soqmailldap.inc.php   11 Dec 2002 13:51:06 -0000      1.13.2.1
***************
*** 16,24 ****
                function soqmailldap()
                {
!                       global $phpgw, $phpgw_info;
! 
!                       $this->db               = $phpgw->db;
                }
!               
                function deleteServer($_serverid)
                {
--- 16,37 ----
                function soqmailldap()
                {
!                       $this->db       = $GLOBALS['phpgw']->db;
!                       $config         = 
CreateObject('phpgwapi.config','qmailldap');
!                       $config->read_repository();
! 
!                       if ($config->config_data)
!                       {
!                               $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);
                }
! 
                function deleteServer($_serverid)
                {
***************
*** 138,141 ****
--- 151,157 ----
                        $filter = "(&(uidnumber=$_accountID))";
                        
+                       $mail_address           = $this->mail_address;
+                       $routing_address        = $this->routing_address;
+ 
                        $sri = 
@ldap_search($ldap,$phpgw_info['server']['ldap_context'],$filter);
                        if ($sri)
***************
*** 144,153 ****
                                if ($allValues['count'] > 0)
                                {
!                                       #print "found something<br>";
!                                       $userData["mailLocalAddress"]           
= $allValues[0]["maillocaladdress"][0];
                                        $userData["mailAlternateAddress"]       
= $allValues[0]["mailalternateaddress"];
!                                       $userData["accountStatus"]              
= $allValues[0]["accountstatus"][0];
!                                       $userData["mailRoutingAddress"]         
= $allValues[0]["mailroutingaddress"][0];
!                                       $userData["qmailDotMode"]               
= $allValues[0]["qmaildotmode"][0];
                                        $userData["deliveryProgramPath"]        
= $allValues[0]["deliveryprogrampath"][0];
                                        if 
($userData["mailAlternateAddress"]["count"] == 0)
--- 160,169 ----
                                if ($allValues['count'] > 0)
                                {
!                                       //print "found something<br>";
!                                       $userData["mailLocalAddress"]           
= $allValues[0][$mail_address][0];
                                        $userData["mailAlternateAddress"]       
= $allValues[0]["mailalternateaddress"];
!                                       $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];
                                        if 
($userData["mailAlternateAddress"]["count"] == 0)
***************
*** 187,215 ****
                        }
                        
                        if(empty($homedirectory))
                        {
                                $homedirectory = "/home/".$uid;
                        }
!                       
                        $newData = array 
                        (
!                               'mailLocalAddress'      => 
$_accountData["mailLocalAddress"],
!                               'mailAlternateAddress'  => 
$_accountData["mailAlternateAddress"],
!                               'mailRoutingAddress'    => 
$_accountData["mailRoutingAddress"],
!                               'homedirectory'         => $homedirectory,
!                               'mailMessageStore'      => 
$homedirectory."/Maildir/",
!                               'gidnumber'             => '1000',
!                               'qmailDotMode'          => 
$_accountData["qmailDotMode"],
!                               'deliveryProgramPath'   => 
$_accountData["deliveryProgramPath"],
!                               'accountStatus'         => 
$_accountData["accountStatus"]
                        );
                        ldap_mod_replace ($ldap, $accountDN, $newData);
                        
!                       $newData = array
!                       (
!                               'objectclass'   => "qmailUser"
!                       );
!                       @ldap_mod_add($ldap, $accountDN, $newData);
!                       #print ldap_error($ldap);
                }
  
--- 203,255 ----
                        }
                        
+                       $mail_address           = $this->mail_address;
+                       $routing_address        = $this->routing_address;
+ 
+                       $newData = array
+                       (
+                               $mail_address   => 
$_accountData["mailLocalAddress"],
+                               'objectclass'   => "qmailUser"
+                       );
+ 
+                       @ldap_mod_add($ldap, $accountDN, $newData);
+ 
                        if(empty($homedirectory))
                        {
                                $homedirectory = "/home/".$uid;
                        }
! 
                        $newData = array 
                        (
!                               $mail_address           => 
(isset($_accountData['mailLocalAddress'])?$_accountData['mailLocalAddress']:$uid
 . '@localhost'),
!                 'homeDirectory'     => $homedirectory,
!                 'mailMessageStore'  => $homedirectory."/Maildir/",
!                 'qmailDotMode'      => 
(isset($_accountData['qmailDotMode'])?$_accountData['qmailDotMode']:'ldaponly')
                        );
+ 
+                       if ($_accountData['accountStatus'])
+                       {
+                               $newData['accountStatus'] = 
$_accountData['accountStatus'];
+                       }
+ 
+                       if ($_accountData["mailAlternateAddress"])
+                       {
+                               $newData['mailAlternateAddress'] = 
$_accountData["mailAlternateAddress"];
+                       }
+ 
+                       if ($_accountData["mailRoutingAddress"])
+                       {
+                               $newData[$routing_address] = 
$_accountData["mailRoutingAddress"];
+                       }
+ 
+                       if ($_accountData["deliveryProgramPath"])
+                       {
+                               $newData['deliveryProgramPath'] = 
$_accountData["deliveryProgramPath"];
+                       }
+ 
+                       _debug_array($newData);
+ 
                        ldap_mod_replace ($ldap, $accountDN, $newData);
                        
!                       //print ldap_error($ldap);
                }