[Phpgroupware-cvs] CVS: qmailldap/inc hook_admin.inc.php,NONE,1.1 class.soqmailldap.inc.php,1.14,1.15hook_preferences.inc.php,1.4,1.5 hook_add_def_pref.inc.php,1.1.1.1,NONE

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.soqmailldap.inc.php hook_preferences.inc.php 
Added Files:
        hook_admin.inc.php 
Removed Files:
        hook_add_def_pref.inc.php 
Log Message:
update

***** 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.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.soqmailldap.inc.php   7 Dec 2002 02:10:31 -0000       1.14
--- class.soqmailldap.inc.php   10 Dec 2002 23:03:59 -0000      1.15
***************
*** 19,35 ****
                        $this->ldap                     = 
$GLOBALS['phpgw']->common->ldapConnect();
  
!                       /*$this->config         = 
CreateObject('phpgwapi.config','phpgwapi');
!                       $this->config->read_repository();*/
!                       $ldap_version   = 
$GLOBALS['phpgw_info']['server']['ldap_version'];
  
!                       if ($ldap_version == 3)
!                       {
!                               $this->mail_address             = 'mail';
!                               $this->routing_address  = 'mailRoutingAddress';
!                       }
!                       else
!                       {
!                               $this->mail_address             = 
'maillocaladdress';
!                               $this->routing_address  = 
'mailForwardingAddress';
                        }
                }
--- 19,31 ----
                        $this->ldap                     = 
$GLOBALS['phpgw']->common->ldapConnect();
  
!                       $config = CreateObject('phpgwapi.config','qmailldap');
!                       $config->read_repository();
  
!                       if ($config->config_data)
!             {
!                 $items = $config->config_data;
! 
!                               $this->mail_address             = 
$config['mail'];
!                               $this->routing_address  = $config['routing'];
                        }
                }

Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/qmailldap/inc/hook_preferences.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_preferences.inc.php    12 Jan 2002 15:46:47 -0000      1.4
--- hook_preferences.inc.php    10 Dec 2002 23:03:59 -0000      1.5
***************
*** 14,18 ****
  // Only Modify the $file and $title variables.....
  
-               $title = $appname;
                $file = Array
                (
--- 14,17 ----
***************
*** 21,25 ****
                );
  //Do not modify below this line
!               display_section($appname,$title,$file);
        }
  ?>
--- 20,24 ----
                );
  //Do not modify below this line
!               display_section($appname,$file);
        }
  ?>

--- hook_add_def_pref.inc.php DELETED ---