[Phpgroupware-cvs] CVS: felamimail/inc class.bofelamimail.inc.php,1.4,1.5 class.bopreferences.inc.php,1.3,1.4 class.uifelamimail.inc.php,1.4,1.5

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.bofelamimail.inc.php class.bopreferences.inc.php 
        class.uifelamimail.inc.php 
Log Message:
update pix plus fix delete

Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bofelamimail.inc.php  27 Mar 2002 22:06:44 -0000      1.4
--- class.bofelamimail.inc.php  26 Apr 2002 15:51:35 -0000      1.5
***************
*** 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
***************
*** 33,45 ****
                function bofelamimail($_foldername)
                {
!                       $this->foldername       = $_foldername;
!                       $this->accountid        = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       
                        $this->bopreferences    = 
CreateObject('felamimail.bopreferences');
!                       $this->sofelamimail     = 
CreateObject('felamimail.sofelamimail');
!                       
                        $this->mailPreferences  = 
$this->bopreferences->getPreferences();
!                       $this->imapBaseDir      = '';
!                       
                        $mailboxString = sprintf("{%s:%s}%s",
                                        
$this->mailPreferences['imapServerAddress'],
--- 33,45 ----
                function bofelamimail($_foldername)
                {
!                       $this->foldername               = $_foldername;
!                       $this->accountid                = 
$GLOBALS['phpgw_info']['user']['account_id'];
! 
                        $this->bopreferences    = 
CreateObject('felamimail.bopreferences');
!                       $this->sofelamimail             = 
CreateObject('felamimail.sofelamimail');
! 
                        $this->mailPreferences  = 
$this->bopreferences->getPreferences();
!                       $this->imapBaseDir              = '';
! 
                        $mailboxString = sprintf("{%s:%s}%s",
                                        
$this->mailPreferences['imapServerAddress'],
***************
*** 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")
***************
*** 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)
                        {
--- 121,134 ----
                        }
                        
!                       $prefs  = $this->bopreferences->getPreferences();
! 
!                       $deleteOptions  = $prefs['deleteOptions'];
!                       $trashFolder    = $prefs['trash_folder'];
! 
                        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);
--- 151,159 ----
                                        }
                                        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.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bopreferences.inc.php 27 Mar 2002 22:06:44 -0000      1.3
--- class.bopreferences.inc.php 26 Apr 2002 15:51:35 -0000      1.4
***************
*** 19,30 ****
                (
                        'getPreferences'        => True,
!                       'none'  => True
                );
!               
                function bopreferences()
                {
                        #$this->bocompose       = 
CreateObject('felamimail.bocompose');
                }
!               
                function getPreferences()
                {
--- 19,30 ----
                (
                        'getPreferences'        => True,
!                       'none'                          => True
                );
! 
                function bopreferences()
                {
                        #$this->bocompose       = 
CreateObject('felamimail.bocompose');
                }
! 
                function getPreferences()
                {
***************
*** 45,52 ****
                                $data['imapServerAddress']      = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server'];
  
!                               $data['key']                    = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['passwd'];
!                               $data['username']               = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
                                $data['emailAddress']           = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
!                               
                                $data['imap_server_type']       = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['email']['imap_server_type']);
                        }
--- 45,52 ----
                                $data['imapServerAddress']      = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server'];
  
!                               $data['key']                            = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['passwd'];
!                               $data['username']                       = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['userid'];
                                $data['emailAddress']           = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
! 
                                $data['imap_server_type']       = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['email']['imap_server_type']);
                        }
***************
*** 55,85 ****
                                $data['imapServerAddress']      = 
$GLOBALS['phpgw_info']['server']['mail_server'];
  
!                               $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"]["address"]);
                        }
!                       
                        // global settings
!                       $data['realname']               = 
$GLOBALS['phpgw_info']['user']['fullname'];
                        $data['defaultDomainname']      = 
$GLOBALS['phpgw_info']["server"]["mail_suffix"];
  
                        $data['smtpServerAddress']      = 
$GLOBALS['phpgw_info']["server"]["smtp_server"];
!                       $data['smtpPort']               = 
$GLOBALS['phpgw_info']["server"]["smtp_port"];
  
-                       $data['imapPort']               = 143;
-                       
                        // preferences
!                       $data['deleteOptions']          = 
$GLOBALS['phpgw_info']["user"]["preferences"]["felamimail"]["deleteOptions"];
                        $data['trash_folder']           = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['trashFolder'];
                        $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;
                }
! }
\ No newline at end of file
--- 55,109 ----
                                $data['imapServerAddress']      = 
$GLOBALS['phpgw_info']['server']['mail_server'];
  
!                               $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"]["address"]);
                        }
! 
                        // global settings
!                       $data['realname']                       = 
$GLOBALS['phpgw_info']['user']['fullname'];
                        $data['defaultDomainname']      = 
$GLOBALS['phpgw_info']["server"]["mail_suffix"];
  
                        $data['smtpServerAddress']      = 
$GLOBALS['phpgw_info']["server"]["smtp_server"];
!                       $data['smtpPort']                       = 
$GLOBALS['phpgw_info']["server"]["smtp_port"];
! 
!                       $data['imapPort']                       = 143;
  
                        // preferences
!                       $data['deleteOptions']          = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['deleteOptions'];
!                       if(empty($data['deleteOptions']))
!                       {
!                               $data['deleteOptions']  = 'remove_immediately';
!                       }
! 
                        $data['trash_folder']           = 
$GLOBALS['phpgw_info']['user']['preferences']['felamimail']['trashFolder'];
+ 
+                       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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uifelamimail.inc.php  27 Mar 2002 22:06:44 -0000      1.4
--- class.uifelamimail.inc.php  26 Apr 2002 15:51:35 -0000      1.5
***************
*** 139,142 ****
--- 139,143 ----
                {
                        $message[] = $GLOBALS['HTTP_GET_VARS']["message"];
+ 
                        $this->bofelamimail->deleteMessages($message);
                        $this->viewMainScreen();