[Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.2.2.2,1.2.2.3

[Lars Kneschke <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bofelamimail.inc.php 
Log Message:
fixed trash folder problem


Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** class.bofelamimail.inc.php  22 Apr 2002 13:20:20 -0000      1.2.2.2
--- class.bofelamimail.inc.php  22 Apr 2002 19:08:51 -0000      1.2.2.3
***************
*** 58,64 ****
                function compressFolder()
                {
!                       
!                       $deleteOptions  = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
!                       $trashFolder    = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["trashFolder"];
                        
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")
--- 58,65 ----
                function compressFolder()
                {
!                       $prefs  = $this->bopreferences->getPreferences();
! 
!                       $deleteOptions  = $prefs['deleteOptions'];
!                       $trashFolder    = $prefs['trash_folder'];
                        
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")
***************
*** 123,127 ****
  
                        $deleteOptions  = $prefs['deleteOptions'];
!                       $trashFolder    = $prefs['trashFolder'];
  
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")
--- 124,128 ----
  
                        $deleteOptions  = $prefs['deleteOptions'];
!                       $trashFolder    = $prefs['trash_folder'];
  
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")