phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: felamimail/inc array.php,1.2,1.3 auth.php,1.2,1.


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: felamimail/inc array.php,1.2,1.3 auth.php,1.2,1.3 class.bocaching.inc.php,1.2,1.3 class.bocompose.inc.php,1.2,1.3 class.bofelamimail.inc.php,1.3,1.4 class.bopreferences.inc.php,1.2,1.3 class.socaching.inc.php,1.2,1.3 class.sofelamimail.inc.php,1.2,1.3 class.transformdate.inc.php,1.2,1.3 class.uicompose.inc.php,1.2,1.3 class.uifelamimail.inc.php,1.3,1.4 date.php,1.2,1.3 display_messages.php,1.2,1.3 hook_about.inc.php,1.2,1.3 hook_admin.inc.php,1.2,1.3 hook_home.inc.php,1.4,1.5 hook_preferences.inc.php,1.5,1.6 i18n.php,1.2,1.3 imap.php,1.2,1.3 imap_general.php,1.2,1.3 imap_mailbox.php,1.2,1.3 imap_messages.php,1.2,1.3 imap_search.php,1.2,1.3 mailbox_display.php,1.2,1.3 mime.php,1.2,1.3 page_header.php,1.2,1.3 plugin.php,1.2,1.3 prefs.php,1.2,1.3 smtp.php,1.2,1.3 strings.php,1.2,1.3 tree.php,1.2,1.3 url_parser.php,1.2,1.3
Date: Wed, 27 Mar 2002 17:06:49 -0500

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

Modified Files:
        array.php auth.php class.bocaching.inc.php 
        class.bocompose.inc.php class.bofelamimail.inc.php 
        class.bopreferences.inc.php class.socaching.inc.php 
        class.sofelamimail.inc.php class.transformdate.inc.php 
        class.uicompose.inc.php class.uifelamimail.inc.php date.php 
        display_messages.php hook_about.inc.php hook_admin.inc.php 
        hook_home.inc.php hook_preferences.inc.php i18n.php imap.php 
        imap_general.php imap_mailbox.php imap_messages.php 
        imap_search.php mailbox_display.php mime.php page_header.php 
        plugin.php prefs.php smtp.php strings.php tree.php 
        url_parser.php 
Log Message:
update

Index: array.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/array.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: auth.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/auth.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.bocaching.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bocaching.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.bocompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bocompose.inc.php     26 Feb 2002 00:07:12 -0000      1.2
--- class.bocompose.inc.php     27 Mar 2002 22:06:44 -0000      1.3
***************
*** 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.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4

Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.socaching.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.socaching.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.sofelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.sofelamimail.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.transformdate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.transformdate.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: class.uicompose.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uicompose.inc.php     26 Feb 2002 00:07:12 -0000      1.2
--- class.uicompose.inc.php     27 Mar 2002 22:06:44 -0000      1.3
***************
*** 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: class.uifelamimail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4

Index: date.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/date.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: display_messages.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/display_messages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: hook_about.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_about.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_admin.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_home.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** hook_home.inc.php   11 Mar 2002 01:16:18 -0000      1.4
--- hook_home.inc.php   27 Mar 2002 22:06:44 -0000      1.5
***************
*** 16,35 ****
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
        unset($d1);
  
!       $tmp_app_inc = $GLOBALS['phpgw']->common->get_inc_dir('felamimail');
  
        if 
($phpgw_info['user']['preferences']['felamimail']['mainscreen_showmail'] == 
True)
        {
                // ----  Create the base email Msg Class    -----
!               $GLOBALS['phpgw']->msg = CreateObject("email.mail_msg");
                $args_array = Array();
                $args_array['folder'] = 'INBOX';
                $args_array['do_login'] = True;
!               $GLOBALS['phpgw']->msg->begin_request($args_array);
  
!               if (!$GLOBALS['phpgw']->msg->mailsvr_stream)
                {
                        $error_msg = '<b>Mail error:</b> Can not open 
connection to mail server';
--- 16,35 ----
        {
                echo "Failed attempt to break in via an old Security 
Hole!<br>\n";
!               $phpgw->common->phpgw_exit();
        }
        unset($d1);
  
!       $tmp_app_inc = $phpgw->common->get_inc_dir('felamimail');
  
        if 
($phpgw_info['user']['preferences']['felamimail']['mainscreen_showmail'] == 
True)
        {
                // ----  Create the base email Msg Class    -----
!               $phpgw->msg = CreateObject("email.mail_msg");
                $args_array = Array();
                $args_array['folder'] = 'INBOX';
                $args_array['do_login'] = True;
!               $phpgw->msg->begin_request($args_array);
  
!               if (!$phpgw->msg->mailsvr_stream)
                {
                        $error_msg = '<b>Mail error:</b> Can not open 
connection to mail server';
***************
*** 42,46 ****
                                .'</td>'."\r\n"
                        .'</tr>'."\r\n";
!                       //$GLOBALS['phpgw']->common->phpgw_exit(True);
                }
                else
--- 42,46 ----
                                .'</td>'."\r\n"
                        .'</tr>'."\r\n";
!                       //$phpgw->common->phpgw_exit(True);
                }
                else
***************
*** 48,52 ****
                        /*  // this is the structure you will get
                          $inbox_data['is_imap'] boolean - pop3 server do not 
know what is "new" or not
!                         $inbox_data['folder_checked'] string - the folder 
checked, as processed by the msg class
                          $inbox_data['alert_string'] string - what to show the 
user about this inbox check
                          $inbox_data['number_new'] integer - for IMAP is 
number "unseen"; for pop3 is number messages
--- 48,52 ----
                        /*  // this is the structure you will get
                          $inbox_data['is_imap'] boolean - pop3 server do not 
know what is "new" or not
!                         $inbox_data['folder_checked'] string - the folder 
checked, as processed by the msg class
                          $inbox_data['alert_string'] string - what to show the 
user about this inbox check
                          $inbox_data['number_new'] integer - for IMAP is 
number "unseen"; for pop3 is number messages
***************
*** 54,58 ****
                        */
                        $inbox_data = Array();
!                       $inbox_data = 
$GLOBALS['phpgw']->msg->new_message_check();
  
                        $title = '<font color="FFFFFF">'.lang('EMail').' 
'.$inbox_data['alert_string'].'</font>';
--- 54,58 ----
                        */
                        $inbox_data = Array();
!                       $inbox_data = $phpgw->msg->new_message_check();
  
                        $title = '<font color="FFFFFF">'.lang('EMail').' 
'.$inbox_data['alert_string'].'</font>';
***************
*** 75,84 ****
                        {
                                $msg_array = array();
!                               $msg_array = 
$GLOBALS['phpgw']->msg->get_message_list();
                        }
                        for($i=0; $i<$check_msgs; $i++)
                        {
!                               $msg = 
$GLOBALS['phpgw']->dcom->header($GLOBALS['phpgw']->msg->mailsvr_stream,$msg_array[$i]);
!                               $subject = 
$GLOBALS['phpgw']->msg->get_subject($msg,'');
                                if (strlen($subject) > 65)
                                {
--- 75,84 ----
                        {
                                $msg_array = array();
!                               $msg_array = $phpgw->msg->get_message_list();
                        }
                        for($i=0; $i<$check_msgs; $i++)
                        {
!                               $msg = 
$phpgw->dcom->header($phpgw->msg->mailsvr_stream,$msg_array[$i]);
!                               $subject = $phpgw->msg->get_subject($msg,'');
                                if (strlen($subject) > 65)
                                {
***************
*** 87,100 ****
                                $linkData = array
                                (
!                                       'mailbox'       => 
$GLOBALS['phpgw']->msg->prep_folder_out(''),
                                        'passed_id'     => $msg_array[$i],
                                        'startMessage'  => 1,
                                        'show_more'     => 0
                                );
!                               $portalbox->data[$i] = 
array($subject,$GLOBALS['phpgw']->link('/felamimail/read_body.php',$linkData));
                        }
                        // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be 
TEMPLATED)
                        // Does This Mailbox Support Folders (i.e. more than 
just INBOX)?
!                       if 
($GLOBALS['phpgw']->msg->get_mailsvr_supports_folders() == False)
                        {
                                $switchbox_tablerow = '';
--- 87,100 ----
                                $linkData = array
                                (
!                                       'mailbox'       => 
$phpgw->msg->prep_folder_out(''),
                                        'passed_id'     => $msg_array[$i],
                                        'startMessage'  => 1,
                                        'show_more'     => 0
                                );
!                               $portalbox->data[$i] = 
array($subject,$phpgw->link('/felamimail/read_body.php',$linkData));
                        }
                        // ADD FOLDER LISTBOX TO HOME PAGE (Needs to be 
TEMPLATED)
                        // Does This Mailbox Support Folders (i.e. more than 
just INBOX)?
!                       if ($phpgw->msg->get_mailsvr_supports_folders() == 
False)
                        {
                                $switchbox_tablerow = '';
***************
*** 107,114 ****
                                $switchbox_listbox = '<select name="mailbox" 
onChange="document.switchbox.submit()">'
                                                . '<option>' . lang('switch 
current folder to') . ':'
!                                               . 
$GLOBALS['phpgw']->msg->all_folders_listbox('','','',$listbox_show_unseen)
                                                . '</select>';
                                // make it another TR we can insert
!                               $switchbox_action = 
$GLOBALS['phpgw']->link('/felamimail/index.php');
                                $switchbox_tablerow = 
                                        '<tr>'."\r\n"
--- 107,114 ----
                                $switchbox_listbox = '<select name="mailbox" 
onChange="document.switchbox.submit()">'
                                                . '<option>' . lang('switch 
current folder to') . ':'
!                                               . 
$phpgw->msg->all_folders_listbox('','','',$listbox_show_unseen)
                                                . '</select>';
                                // make it another TR we can insert
!                               $switchbox_action = 
$phpgw->link('/felamimail/index.php');
                                $switchbox_tablerow = 
                                        '<tr>'."\r\n"
***************
*** 121,125 ****
                                        .'</tr>'."\r\n";
                        }
!                       $GLOBALS['phpgw']->msg->end_request();
                        // output the portalbox and (if applicable) the folders 
listbox below it
                        echo '<!-- start Mailbox info -->'."\r\n"
--- 121,125 ----
                                        .'</tr>'."\r\n";
                        }
!                       $phpgw->msg->end_request();
                        // output the portalbox and (if applicable) the folders 
listbox below it
                        echo '<!-- start Mailbox info -->'."\r\n"

Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/hook_preferences.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** hook_preferences.inc.php    16 Mar 2002 01:46:27 -0000      1.5
--- hook_preferences.inc.php    27 Mar 2002 22:06:44 -0000      1.6
***************
*** 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(); 
  }
  ?>

Index: i18n.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/i18n.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: imap.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: imap_general.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap_general.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: imap_mailbox.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap_mailbox.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: imap_messages.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap_messages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: imap_search.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/imap_search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: mailbox_display.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/mailbox_display.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: mime.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/mime.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/page_header.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: plugin.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/plugin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/prefs.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: smtp.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/smtp.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: strings.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/strings.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: tree.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/tree.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: url_parser.php
===================================================================
RCS file: /cvsroot/phpgroupware/felamimail/inc/url_parser.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]