[eGroupWare-cvs] felamimail/inc class.bofelamimail.inc.php,1.8,1.9 class.bopreferences.inc.php,1.7,1.8

[<lkn...@us...>]

Update of /cvsroot/egroupware/felamimail/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv5217/felamimail/inc

Modified Files:
	class.bofelamimail.inc.php class.bopreferences.inc.php 
Log Message:
change needed for integration of emailadmin
ldap bugfixing



Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/egroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.bofelamimail.inc.php	31 Aug 2003 18:00:57 -0000	1.8
--- class.bofelamimail.inc.php	31 Aug 2003 22:09:12 -0000	1.9
***************
*** 964,974 ****
  			if($_adminConnection)
  			{
- 				$config = CreateObject('phpgwapi.config','qmailldap');
- 				$config->read_repository();
- 				$qmailldapConfig = $config->config_data;
- 				
  				$folderName	= '';
! 				$username	= $qmailldapConfig['imapAdminUser'];
! 				$password	= $qmailldapConfig['imapAdminPassword'];
  				$options	= '';
  			}
--- 964,970 ----
  			if($_adminConnection)
  			{
  				$folderName	= '';
! 				$username	= $this->mailPreferences['imapAdminUsername'];
! 				$password	= $this->mailPreferences['imapAdminPW'];
  				$options	= '';
  			}

Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/egroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.bopreferences.inc.php	31 Aug 2003 18:00:57 -0000	1.7
--- class.bopreferences.inc.php	31 Aug 2003 22:09:12 -0000	1.8
***************
*** 36,40 ****
  			$profileData = $this->boemailadmin->getProfile($this->profileID);
  			
! 			$imapServerTypes[$profileData['imapType']]['protocol'];
  			
  			#_debug_array($profileData);
--- 36,40 ----
  			$profileData = $this->boemailadmin->getProfile($this->profileID);
  			
! 			#$imapServerTypes[$profileData['imapType']]['protocol'];
  			
  			#_debug_array($profileData);
***************
*** 61,64 ****
--- 61,66 ----
  			$data['emailAddress']		= $data['username']."@".$profileData['defaultDomain'];
  			$data['smtpAuth']		= $profileData['smtpAuth'];
+ 			$data['imapAdminUsername']	= $profileData['imapAdminUsername'];
+ 			$data['imapAdminPW']		= $profileData['imapAdminPW'];
  
  			if($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')