[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.1,1.1.1.1.2.2 class.uicompose.inc.php,1.1.1.1.2.1,1.1.1.1.2.2 hook_preferences.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-serv24935/felamimail/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocompose.inc.php class.uicompose.inc.php 
        hook_preferences.inc.php 
Log Message:
updated to latest version from at home


Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** class.bocompose.inc.php     25 Feb 2002 23:58:37 -0000      1.1.1.1.2.1
--- class.bocompose.inc.php     22 Mar 2002 20:07:20 -0000      1.1.1.1.2.2
***************
*** 283,288 ****
  
                        $mail = CreateObject('felamimail.phpmailer');
                        
!                       include(PHPGW_APP_ROOT . "/config/config.php");
                                
                        $mail->IsSMTP();
--- 283,289 ----
  
                        $mail = CreateObject('felamimail.phpmailer');
+                       #_debug_array($this->preferences);
                        
!                       #include(PHPGW_APP_ROOT . "/config/config.php");
                                
                        $mail->IsSMTP();
***************
*** 298,305 ****
                                while (list($key,$value) = each($address))
                                {
!                                       $mail->AddAddress($value);
                                }
                        }
!                       
                        if (!empty($this->sessionData['cc']))
                        {
--- 299,312 ----
                                while (list($key,$value) = each($address))
                                {
!                                       $address_array  = 
imap_rfc822_parse_adrlist($value,'');
!                                       if(count($address_array)>0)
!                                       {
!                                               $emailAddress = 
$address_array[0]->mailbox."@".$address_array[0]->host;
!                                               $emailName = 
$address_array[0]->personal;
!                                               
$mail->AddAddress($emailAddress,$emailName);
!                                       }
                                }
                        }
! 
                        if (!empty($this->sessionData['cc']))
                        {
***************
*** 307,311 ****
                                while (list($key,$value) = each($address))
                                {
!                                       $mail->AddCC($value);
                                }
                        }
--- 314,324 ----
                                while (list($key,$value) = each($address))
                                {
!                                       $address_array  = 
imap_rfc822_parse_adrlist($value,'');
!                                       if(count($address_array)>0)
!                                       {
!                                               $emailAddress = 
$address_array[0]->mailbox."@".$address_array[0]->host;
!                                               $emailName = 
$address_array[0]->personal;
!                                               
$mail->AddCC($emailAddress,$emailName);
!                                       }
                                }
                        }
***************
*** 316,320 ****
                                while (list($key,$value) = each($address))
                                {
!                                       $mail->AddBCC($value);
                                }
                        }
--- 329,339 ----
                                while (list($key,$value) = each($address))
                                {
!                                       $address_array  = 
imap_rfc822_parse_adrlist($value,'');
!                                       if(count($address_array)>0)
!                                       {
!                                               $emailAddress = 
$address_array[0]->mailbox."@".$address_array[0]->host;
!                                               $emailName = 
$address_array[0]->personal;
!                                               
$mail->AddBCC($emailAddress,$emailName);
!                                       }
                                }
                        }
***************
*** 325,329 ****
                                while (list($key,$value) = each($address))
                                {
!                                       $mail->AddReplyTo($value);
                                }
                        }
--- 344,354 ----
                                while (list($key,$value) = each($address))
                                {
!                                       $address_array  = 
imap_rfc822_parse_adrlist($value,'');
!                                       if(count($address_array)>0)
!                                       {
!                                               $emailAddress = 
$address_array[0]->mailbox."@".$address_array[0]->host;
!                                               $emailName = 
$address_array[0]->personal;
!                                               
$mail->AddReplyTo($emailAddress,$emailName);
!                                       }
                                }
                        }

Index: class.uicompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** class.uicompose.inc.php     25 Feb 2002 23:58:37 -0000      1.1.1.1.2.1
--- class.uicompose.inc.php     22 Mar 2002 20:07:20 -0000      1.1.1.1.2.2
***************
*** 21,24 ****
--- 21,25 ----
                        'compose'       => 'True',
                        'reply'         => 'True',
+                       'replyAll'      => 'True',
                        'forward'       => 'True',
                        'action'        => 'True'
***************
*** 211,214 ****
--- 212,227 ----
  
                function reply()
+               {
+                       $replyID = $GLOBALS['HTTP_GET_VARS']['reply_id'];
+                       $folder  = 
urldecode($GLOBALS['HTTP_GET_VARS']['mailbox']);
+                       if (!empty($replyID) && !empty($folder))
+                       {
+                               // this fill the session data with the values 
from the original email
+                               $this->bocompose->getReplyData($folder, 
$replyID);
+                       }
+                       $this->compose();
+               }
+               
+               function replyAll()
                {
                        $replyID = $GLOBALS['HTTP_GET_VARS']['reply_id'];

Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_preferences.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
*** hook_preferences.inc.php    16 Mar 2002 01:39:05 -0000      1.2.2.2
--- hook_preferences.inc.php    22 Mar 2002 20:07:20 -0000      1.2.2.3
***************
*** 13,28 ****
    /* $Id$ */
  {
!       $title = $appname;
!       $file = array(
!               'Mail Settings' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_email.php'),
!               'Message Highlighting' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_highlight.php'),
!               'Index Order' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_index_order.php'),
!               'Translation Preferences' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_translate.php'),
!               'Display Preferences' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_display.php'),
!               'Folder Preferences' => 
$GLOBALS['phpgw']->link('/'.$appname.'/preferences_folder.php'),
!               'Manage Folders' => 
$GLOBALS['phpgw']->link('/'.$appname.'/folders.php')
!       );
! //Do not modify below this line
!       display_section($appname,$title,$file);
  }
  ?>
--- 13,46 ----
    /* $Id$ */
  {
!       echo "<p>\n";
!       $imgfile = $GLOBALS['phpgw']->common->get_image_dir($appname) . '/' . 
$appname . '.gif';
!       if (file_exists($imgfile))
!       {
!               $imgpath = $GLOBALS['phpgw']->common->get_image_path($appname) 
. '/' . $appname . '.gif';
!       }
!       else
!       {
!               $imgfile = $GLOBALS['phpgw']->common->get_image_dir($appname) . 
'/navbar.gif';
!               if (file_exists($imgfile))
!               {
!                       $imgpath = 
$GLOBALS['phpgw']->common->get_image_path($appname) . '/navbar.gif';
!               }
!               else
!               {
!                       $imgpath = '';
!               }
!       }
! 
!       section_start(ucfirst($appname),$imgpath);
! 
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_email.php'),lang('Mail
 Settings'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_highlight.php'),lang('Message
 Highlighting'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_index_order.php'),lang('Index
 Order'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_translate.php'),lang('Translation
 Preferences'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_display.php'),lang('Display
 Preferences'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/preferences_folder.php'),lang('Folder
 Preferences'));
!       
section_item($GLOBALS['phpgw']->link('/felamimail/folders.php'),lang('Manage 
Folders'));
! 
!       section_end(); 
  }
  ?>