[Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.2.2.1,1.2.2.2 class.bopreferences.inc.php,1.1.1.1.2.2,1.1.1.1.2.3 class.uifelamimail.inc.php,1.2.2.1,1.2.2.2

[Lars Kneschke <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bofelamimail.inc.php class.bopreferences.inc.php 
        class.uifelamimail.inc.php 
Log Message:
made default prefernces working


Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.bofelamimail.inc.php  25 Feb 2002 23:58:37 -0000      1.2.2.1
--- class.bofelamimail.inc.php  22 Apr 2002 13:20:20 -0000      1.2.2.2
***************
*** 23,27 ****
  
                var $mbox;              // the mailbox identifier any function 
should use
!               
                // define some constants
                // message types
--- 23,27 ----
  
                var $mbox;              // the mailbox identifier any function 
should use
! 
                // define some constants
                // message types
***************
*** 120,131 ****
                        }
                        
!                       $deleteOptions  = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
!                       $trashFolder    = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["trashFolder"];
!                       
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")
                        {
                                $deleteOptions = "remove_immediately";
                        }
!                       
                        switch($deleteOptions)
                        {
--- 120,133 ----
                        }
                        
!                       $prefs  = $this->bopreferences->getPreferences();
! 
!                       $deleteOptions  = $prefs['deleteOptions'];
!                       $trashFolder    = $prefs['trashFolder'];
! 
                        if($this->foldername == $trashFolder && $deleteOptions 
== "move_to_trash")
                        {
                                $deleteOptions = "remove_immediately";
                        }
! 
                        switch($deleteOptions)
                        {
***************
*** 148,156 ****
                                        }
                                        break;
!                                       
                                case "mark_as_deleted":
                                        imap_delete($this->mbox, $msglist, 
FT_UID);
                                        break;
!                                       
                                case "remove_immediately":
                                        imap_delete($this->mbox, $msglist, 
FT_UID);
--- 150,158 ----
                                        }
                                        break;
! 
                                case "mark_as_deleted":
                                        imap_delete($this->mbox, $msglist, 
FT_UID);
                                        break;
! 
                                case "remove_immediately":
                                        imap_delete($this->mbox, $msglist, 
FT_UID);

Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** class.bopreferences.inc.php 22 Apr 2002 10:44:55 -0000      1.1.1.1.2.2
--- class.bopreferences.inc.php 22 Apr 2002 13:20:20 -0000      1.1.1.1.2.3
***************
*** 72,79 ****
                        
                        // preferences
!                       $data['deleteOptions']          = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
                        if(empty($data['deleteOptions']))
                        {
!                               $data['deleteOptions'] = "remove_immediately";
                        }
                        
--- 72,79 ----
                        
                        // preferences
!                       $data['deleteOptions']          = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['deleteOptions'];
                        if(empty($data['deleteOptions']))
                        {
!                               $data['deleteOptions'] = 'remove_immediately';
                        }
                        
***************
*** 81,95 ****
                        if(empty($data['trash_folder']))
                        {
!                               $data['trash_folder'] = "INBOX.Sent";
                        }
!                       
                        $data['sent_folder']            = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sent_folder'];
!                       
                        if (!empty($data['trash_folder'])) 
!                               $data['move_to_trash']  = "true";
!                       if (!empty($data['sent_folder']))  
!                               $data['move_to_sent']   = "true";
                        $data['signature']              = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'];
  
                        return $data;
                }
--- 81,101 ----
                        if(empty($data['trash_folder']))
                        {
!                               $data['trash_folder'] = 'INBOX.Trash';
                        }
! 
                        $data['sent_folder']            = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['sent_folder'];
! 
!                       if (empty($data['sent_folder']))
!                       {
!                               $data['sent_folder'] = 'INBOX.Sent'; 
!                       }
! 
                        if (!empty($data['trash_folder'])) 
!                               $data['move_to_trash']  = True;
!                       if (!empty($data['sent_folder'])) 
!                               $data['move_to_sent']   = True;
                        $data['signature']              = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['email_sig'];
  
+               //      _debug_array($data);
                        return $data;
                }

Index: class.uifelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.uifelamimail.inc.php  25 Feb 2002 23:58:37 -0000      1.2.2.1
--- class.uifelamimail.inc.php  22 Apr 2002 13:20:20 -0000      1.2.2.2
***************
*** 139,142 ****
--- 139,143 ----
                {
                        $message[] = $GLOBALS['HTTP_GET_VARS']["message"];
+ 
                        $this->bofelamimail->deleteMessages($message);
                        $this->viewMainScreen();