phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.20.2.1,1.20.2.


From: Mark A Peters <address@hidden>
Subject: [Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.20.2.1,1.20.2.2 class.mail_msg_display.inc.php,1.31.2.1,1.31.2.2
Date: Sat, 29 Jun 2002 12:17:32 -0400

Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv17293/email/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.boindex.inc.php class.mail_msg_display.inc.php 
Log Message:
GNU Patch #378.

Index: class.boindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -r1.20.2.1 -r1.20.2.2
*** class.boindex.inc.php       14 Feb 2002 06:42:44 -0000      1.20.2.1
--- class.boindex.inc.php       29 Jun 2002 16:17:30 -0000      1.20.2.2
***************
*** 142,145 ****
--- 142,146 ----
                                'lang_arrival_date'     => lang('Arrival Date'),
                                'lang_from'                     => lang('From'),
+                               'lang_to'                       => lang('To'),
                                'lang_subject'          => lang('Subject'),
                                'lang_size'                     => lang('Size'),
***************
*** 164,168 ****
                                $this->xi[$key] = $lang_strings[$key];
                        }
!                       // optional return value, primarily for external 
clients, we need only fill $this->xi[]
                        return $lang_strings;
                }
--- 165,169 ----
                                $this->xi[$key] = $lang_strings[$key];
                        }
!                       // optional return value, primarily for external 
clients, we need only fill $this->xi[]
                        return $lang_strings;
                }
***************
*** 481,484 ****
--- 482,486 ----
                                .'<option value="2"' .$sort_selected[2] 
.'>'.$this->xi['lang_from'].'</option>' ."\r\n"
                                .'<option value="3"' .$sort_selected[3] 
.'>'.$this->xi['lang_subject'].'</option>' ."\r\n"
+                               .'<option value="4"' .$sort_selected[4] 
.'>'.$this->xi['lang_to'].'</option>' ."\r\n"
                                .'<option value="6"' .$sort_selected[6] 
.'>'.$this->xi['lang_size'].'</option>' ."\r\n";
                        
***************
*** 543,546 ****
--- 545,549 ----
                                case 2 : $this->xi['lang_from'] = 
$flag_sort_pre .$this->xi['lang_from'] .$flag_sort_post; break;
                                case 3 : $this->xi['lang_subject'] = 
$flag_sort_pre .$this->xi['lang_subject'] .$flag_sort_post; break;
+                               case 4 : $this->xi['lang_to'] = $flag_sort_pre 
.$this->xi['lang_to'] .$flag_sort_post; break;
                                case 6 : $this->xi['lang_size'] = 
'*'.$this->xi['lang_size'].'*';
                                         $this->xi['lang_lines'] = 
$this->xi['lang_lines'] .$flag_sort_post; break;
***************
*** 561,565 ****
                        {
                                $this->xi['hdr_subject'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'3',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_subject'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
!                               $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'2',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_from'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
                                $this->xi['hdr_date'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'1',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_date'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
                                $this->xi['hdr_size'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'6',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_lines'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
--- 564,576 ----
                        {
                                $this->xi['hdr_subject'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'3',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_subject'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
!                               if ($GLOBALS['phpgw']->msg->get_isset_pref 
('use_sent_folder')
!                               && ($GLOBALS['phpgw']->msg->prep_folder_out() 
== $GLOBALS['phpgw']->msg->folder_lookup ('', 
$GLOBALS['phpgw']->msg->get_pref_value ('sent_folder_name'))))
!                               {
!                                       $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'4',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_to'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
!                               }
!                               else
!                               {
!                                       $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'2',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_from'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
!                               }
                                $this->xi['hdr_date'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'1',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_date'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
                                $this->xi['hdr_size'] = 
$this->nextmatchs->show_sort_order($GLOBALS['phpgw']->msg->get_arg_value('sort'),'6',$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_lines'],'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out(''));
***************
*** 570,576 ****
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
                                                
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
!                               $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order_imap($GLOBALS['phpgw']->msg->get_arg_value('sort'),'2',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_from'],
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
                                                
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
                                $this->xi['hdr_date'] = 
$this->nextmatchs->show_sort_order_imap($GLOBALS['phpgw']->msg->get_arg_value('sort'),'1',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_date'],
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
--- 581,599 ----
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
                                                
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
! 
!                               if ($GLOBALS['phpgw']->msg->get_isset_pref 
('use_sent_folder')
!                               && ($GLOBALS['phpgw']->msg->prep_folder_out() 
== $GLOBALS['phpgw']->msg->folder_lookup ('', 
$GLOBALS['phpgw']->msg->get_pref_value ('sent_folder_name'))))
!                               {
!                                       $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order_imap($GLOBALS['phpgw']->msg->get_arg_value('sort'),'4',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_to'],
!                                               
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
!                                               
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
!                               }
!                               else
!                               {
!                                       $this->xi['hdr_from'] = 
$this->nextmatchs->show_sort_order_imap($GLOBALS['phpgw']->msg->get_arg_value('sort'),'2',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_from'],
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
                                                
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+                               }
+                               
                                $this->xi['hdr_date'] = 
$this->nextmatchs->show_sort_order_imap($GLOBALS['phpgw']->msg->get_arg_value('sort'),'1',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php'.'menuaction=email.uiindex.index',$this->xi['lang_date'],
                                                
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
***************
*** 826,829 ****
--- 849,853 ----
                                .'<option value="2"' .$sort_selected[2] 
.'>'.$this->xi['lang_from'].'</option>' ."\r\n"
                                .'<option value="3"' .$sort_selected[3] 
.'>'.$this->xi['lang_subject'].'</option>' ."\r\n"
+                               .'<option value="4"' .$sort_selected[4] 
.'>'.$this->xi['lang_to'].'</option>' ."\r\n"
                                .'<option value="6"' .$sort_selected[6] 
.'>'.$this->xi['lang_size'].'</option>' ."\r\n";
                        

Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -C2 -r1.31.2.1 -r1.31.2.2
*** class.mail_msg_display.inc.php      14 Feb 2002 06:42:44 -0000      1.31.2.1
--- class.mail_msg_display.inc.php      29 Jun 2002 16:17:30 -0000      1.31.2.2
***************
*** 50,54 ****
                        use "explode_fake_uri()" to get the data, which it then 
inserts back into the HTTP_POST_VARS
                        as if the data had never been embeeded. NOTE: such data 
should be urlencode'd just as if this
!                       were a URI, however "prep_folder_out" takes care of 
this for the folder name automatically.
                ['on_change'] : string : the HTML select widget's "onChange" 
value. Default: "document.switchbox.submit()'"
                '[first_line_txt'] : string : the text that initially is 
displayed in the select widget, used for information only,
--- 50,54 ----
                        use "explode_fake_uri()" to get the data, which it then 
inserts back into the HTTP_POST_VARS
                        as if the data had never been embeeded. NOTE: such data 
should be urlencode'd just as if this
!                       were a URI, however "prep_folder_out" takes care of 
this for the folder name automatically.
                ['on_change'] : string : the HTML select widget's "onChange" 
value. Default: "document.switchbox.submit()'"
                '[first_line_txt'] : string : the text that initially is 
displayed in the select widget, used for information only,
***************
*** 390,393 ****
--- 390,394 ----
                SORTFROM:  2
                SORTSUBJECT: 3
+               SORTTO: 4
                SORTSIZE:  6
  
***************
*** 2233,2236 ****
--- 2234,2252 ----
                        // NOTE: wasn't this decode_header_string proc already 
done above?
                        $msg_list_display[$x]['from_name'] = 
$this->decode_header_string($personal);
+ 
+                       if ($this->get_isset_pref ('use_sent_folder')
+                       && ($msg_list_display[$x]['folder'] == 
$this->folder_lookup ('', $this->get_pref_value ('sent_folder_name'))))
+                       {
+                               $to = $hdr_envelope->to[0];
+                               if ($to->personal)
+                               {
+                                       $topersonal = 
$this->decode_header_string ($to->personal);
+                               }
+                               else
+                               {
+                                       $topersonal = 
$to->mailbox.'@'.$to->host;
+                               }
+                               $msg_list_display[$x]['from_name'] = 
$topersonal;
+                       }
  
                        // ----  From Link  ----




reply via email to

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