[Phpgroupware-cvs] CVS: felamimail/inc class.bopreferences.inc.php,1.1.1.1.2.6,1.1.1.1.2.7 class.uifelamimail.inc.php,1.2.2.4,1.2.2.5

[Lars Kneschke <address@hidden>]

Update of /cvsroot/phpgroupware/felamimail/inc
In directory subversions:/tmp/cvs-serv13016/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bopreferences.inc.php class.uifelamimail.inc.php 
Log Message:
no idea what i did change, but is was a bug :)


Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** class.bopreferences.inc.php 5 Jun 2002 21:56:53 -0000       1.1.1.1.2.6
--- class.bopreferences.inc.php 11 Jun 2002 19:10:00 -0000      1.1.1.1.2.7
***************
*** 54,58 ****
                        $data['key']                    = 
$GLOBALS['phpgw_info']['user']['passwd'];
                        $data['username']               = 
$GLOBALS['phpgw_info']['user']['userid'];
-                       $data['emailAddress']           = 
$GLOBALS['phpgw_info']['user']['userid']."@".$GLOBALS['phpgw_info']['server']['mail_suffix'];
                        $data['imap_server_type']       = 
strtolower($GLOBALS['phpgw_info']["server"]["imap_server_type"]);
                        $data['realname']               = 
$GLOBALS['phpgw_info']['user']['fullname'];
--- 54,57 ----
***************
*** 76,80 ****
                        if(!empty($felamimailConfig['mailSuffix']))
                                $data['defaultDomainname']      = 
$felamimailConfig['mailSuffix'];
!                       
                        
if($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
                        {
--- 75,81 ----
                        if(!empty($felamimailConfig['mailSuffix']))
                                $data['defaultDomainname']      = 
$felamimailConfig['mailSuffix'];
! 
!                       $data['emailAddress']           = 
$data['username']."@".$data['defaultDomainname'];
! 
                        
if($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')
                        {

Index: class.uifelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** class.uifelamimail.inc.php  4 Jun 2002 12:15:23 -0000       1.2.2.4
--- class.uifelamimail.inc.php  11 Jun 2002 19:10:00 -0000      1.2.2.5
***************
*** 223,226 ****
--- 223,227 ----
                        $this->t->set_block('body','header_row_D');
                        $this->t->set_block('body','header_row_DS');
+                       $this->t->set_block('body','header_row_A');
                
                        $this->translate();