[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.boindex.inc.php class.bomessage...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.boindex.inc.php class.bomessage... |
|
Date: |
Fri, 15 Dec 2006 14:02:38 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/15 14:02:38
Modified files:
inc : class.boindex.inc.php class.bomessage.inc.php
class.html_widgets.inc.php
class.mail_msg_display.inc.php
class.uiindex.inc.php class.uimessage.inc.php
Log message:
more notices and ascii to utf conversion
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boindex.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bomessage.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.html_widgets.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_display.inc.php?cvsroot=phpgroupware&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uiindex.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uimessage.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
Patches:
Index: class.boindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.boindex.inc.php 15 Dec 2006 10:44:17 -0000 1.36
+++ class.boindex.inc.php 15 Dec 2006 14:02:38 -0000 1.37
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.boindex.inc.php,v 1.36 2006/12/15 10:44:17
sigurdne Exp $
+ * @version $Id: class.boindex.inc.php,v 1.37 2006/12/15 14:02:38
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -195,13 +195,13 @@
}
$tpl_vars = Array(
- 'stats_backcolor' =>
$GLOBALS['phpgw_info']['theme']['em_folder'],
+ //'stats_backcolor' =>
$GLOBALS['phpgw_info']['theme']['em_folder'],
//'stats_backcolor_class' => 'th',
'stats_backcolor_class' => 'email_folder',
'stats_font' =>
$GLOBALS['phpgw_info']['theme']['font'],
'stats_font_size' => '2',
'stats_foldername_size' => '3',
- 'stats_color' =>
$GLOBALS['phpgw_info']['theme']['em_folder_text'],
+ //'stats_color' =>
$GLOBALS['phpgw_info']['theme']['em_folder_text'],
//'stats_color_class' => 'th_text',
'stats_color_class' => 'email_folder',
//'stats_folder' =>
$GLOBALS['phpgw']->msg->get_folder_short($GLOBALS['phpgw']->msg->get_arg_value('folder')),
Index: class.bomessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.bomessage.inc.php 15 Dec 2006 10:44:17 -0000 1.20
+++ class.bomessage.inc.php 15 Dec 2006 14:02:38 -0000 1.21
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.bomessage.inc.php,v 1.20 2006/12/15 10:44:17
sigurdne Exp $
+ * @version $Id: class.bomessage.inc.php,v 1.21 2006/12/15 14:02:38
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -209,9 +209,9 @@
$this->no_fmt = array('no_fmt'=>1);
}
// ---- TOOL BAR / MENU BAR ----
- $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ // $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['ctrl_bar_font_size'] = '-1';
- $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ // $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
// ---- Fill Some Important Variables -----
$svr_image_dir = PHPGW_IMAGES_DIR;
@@ -240,7 +240,8 @@
$this->xi['accounts_link'] =
$GLOBALS['phpgw']->link(
'/index.php',array(
'menuaction'=>'email.uipreferences.ex_accounts_list'));
- $this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on($this->icon_theme.'/accounts-24','_on'),$this->xi['folders_txt1'],'','','0');
+// $this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on($this->icon_theme.'/accounts-24','_on'),$this->xi['folders_txt1'],'','','0');
+ $this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on($this->icon_theme.'/accounts-24','_on'),'','','','0');
$this->xi['ilnk_accounts'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['accounts_link'],$this->xi['accounts_img']);
}
else
@@ -311,7 +312,7 @@
// ---- Fill Some Important Variables -----
- $sm_envelope_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/address-conduit-16','_on'),$this->xi['land_add_to_address_book'],'','','0');
+ $sm_envelope_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/address-conduit-16','_on'),lang('add
to address book'),'','','0');
$not_set = $GLOBALS['phpgw']->msg->not_set;
@@ -582,11 +583,11 @@
}
// ---- Labels and Colors for From, To, CC, Files, and
Subject -----
- $this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ // $this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['tofrom_labels_class'] = 'th';
//$this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
//$this->xi['tofrom_labels_class'] = 'row_off';
- $this->xi['tofrom_data_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ // $this->xi['tofrom_data_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
$this->xi['tofrom_data_class'] = 'row_on';
// ---- From: Message Data -----
@@ -987,9 +988,9 @@
$href_edit =
$GLOBALS['phpgw']->msg->href_maketag_class($edit_url, $this->xi['lang_edit'],
'c_replybar');
$ilnk_edit =
$GLOBALS['phpgw']->msg->href_maketag($edit_url, $edit_img);
- $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
- $this->xi['reply_btns_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
- $this->xi['reply_btns_text'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
+ // $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ // $this->xi['reply_btns_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
+ // $this->xi['reply_btns_text'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
$this->xi['lnk_goback_folder'] = $lnk_goback_folder;
$this->xi['go_back_to'] = $this->xi['lang_go_back_to'];
$this->xi['href_reply'] = $href_reply;
@@ -1141,9 +1142,9 @@
// ----- Message_Display Template Handles it from here
-------
- $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
- $this->xi['theme_th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
- $this->xi['theme_row_on'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ // $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ // $this->xi['theme_th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ // $this->xi['theme_row_on'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
// ---- so called "little toolbar (not the real
toolbar) between the msg header data and the message siaplay
// (1) "view formatted/unformatted" link goes there,
(MAYBE CALL IT "PLAIN TEXT" INSTEAD?)
@@ -1255,11 +1256,8 @@
// Fallback Value
$done_processing = False;
-
-
-
-
$count_part_nice = count($this->part_nice);
+ $d1_num_parts = $count_part_nice; // Sigurd: not
totally shore on this one
for ($i = 0; $i < $count_part_nice; $i++)
{
if ($this->debug > 2) {
$this->msg->dbug->out('email.bomessage.message_data('.__LINE__.'): disp loop:
'.($i+1).' of '.$count_part_nice.'<br />'); }
@@ -1917,7 +1915,7 @@
}
// used to show in calendar-notifications the event and
allow to except it there
- if($application)
+ if(isset($application) && $application)
{
if(strstr($msgtype,'"; Id="'))
{
Index: class.html_widgets.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.html_widgets.inc.php 13 Dec 2006 15:45:00 -0000 1.8
+++ class.html_widgets.inc.php 15 Dec 2006 14:02:38 -0000 1.9
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package email
- * @version $Id: class.html_widgets.inc.php,v 1.8 2006/12/13 15:45:00
sigurdne Exp $
+ * @version $Id: class.html_widgets.inc.php,v 1.9 2006/12/15 14:02:38
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -917,8 +917,8 @@
$this->tpl->set_var('report_this',
$GLOBALS['phpgw']->msg->report_moved_or_deleted());
- $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$acctnum);
- $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$acctnum);
+ $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$GLOBALS['phpgw']->msg->get_acctnum());
+ $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$GLOBALS['phpgw']->msg->get_acctnum());
$svr_image_dir = PHPGW_IMAGES_DIR;
$image_dir = PHPGW_IMAGES;
Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- class.mail_msg_display.inc.php 15 Dec 2006 10:44:17 -0000 1.49
+++ class.mail_msg_display.inc.php 15 Dec 2006 14:02:38 -0000 1.50
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package email
- * @version $Id: class.mail_msg_display.inc.php,v 1.49 2006/12/15
10:44:17 sigurdne Exp $
+ * @version $Id: class.mail_msg_display.inc.php,v 1.50 2006/12/15
14:02:38 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -753,7 +753,7 @@
if ((!isset($ex_folder))
|| ((string)$ex_folder == ''))
{
- $ex_folder =
$this->prep_folder_out($this->get_arg_value('folder', $acctnum));
+ $ex_folder =
$this->prep_folder_out($this->get_arg_value('folder', $this->get_acctnum()));
}
// TESTING this gets a verified non stale msgball_list and puts
it in cache, or uses the one in cache if it passes verified and not stale test
//$this->get_msgball_list($ex_acctnum, $ex_folder);
@@ -1670,7 +1670,7 @@
elseif (
($part_nice[$i]['type'] == 'text')
&& ($part_nice[$i]['subtype'] == 'plain')
- &&
($part_nice[$presentable_parent_idx]['ex_parent_flat_idx'] == $not_set)
+ &&
(isset($part_nice[$presentable_parent_idx]['ex_parent_flat_idx']) &&
$part_nice[$presentable_parent_idx]['ex_parent_flat_idx'] == $not_set)
&& (stristr($struct->type, 'multipart'))
// SHOULD BE THIS && ((string)$struct->type
== '1') // "1" = "multipart"
&& (stristr($struct->subtype, 'alternative'))
@@ -2351,6 +2351,7 @@
return $data;
}
+ $newText = '';
$lines = split("\n",$data);
while ( list ($key,$line) = each ($lines))
@@ -2362,7 +2363,7 @@
$line = eregi_replace("(ftp://[^ )\r\n]+)","<A
href=\"\\1\" target=\"_new\">\\1</A>",$line);
$line = eregi_replace("(irc://[^ )\r\n]+)","<A
href=\"\\1\">\\1</A>",$line);//added by skwashd for chatzilla :)
$line =
eregi_replace("([-a-z0-9_]+(\.[_a-z0-9-]+)*@([a-z0-9-]+(\.[a-z0-9-]+)+))",
- "<a
href=\"".$GLOBALS['phpgw']->link("/".$GLOBALS['phpgw_info']['flags']['currentapp']."/compose.php","folder=".$this->prep_folder_out($folder))
+ "<a
href=\"".$GLOBALS['phpgw']->link("/".$GLOBALS['phpgw_info']['flags']['currentapp']."/compose.php",array('folder'=>$this->prep_folder_out($folder)))
."&to=\\1\">\\1</a>", $line);
$newText .= $line . "\n";
Index: class.uiindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uiindex.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.uiindex.inc.php 13 Dec 2006 14:57:20 -0000 1.27
+++ class.uiindex.inc.php 15 Dec 2006 14:02:38 -0000 1.28
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.uiindex.inc.php,v 1.27 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uiindex.inc.php,v 1.28 2006/12/15 14:02:38
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -121,16 +121,16 @@
// fonts and font sizes
// 'ctrl_bar_font' =>
$this->bo->xi['ctrl_bar_font'],
// 'ctrl_bar_font_size' =>
$this->bo->xi['ctrl_bar_font_size'],
- 'mlist_font' =>
$this->bo->xi['mlist_font'],
+ // 'mlist_font' =>
$this->bo->xi['mlist_font'],
'mlist_font_size' =>
$this->bo->xi['mlist_font_size'],
'mlist_font_size_sm' =>
$this->bo->xi['mlist_font_size_sm'],
- 'stats_font' =>
$this->bo->xi['stats_font'],
+ // 'stats_font' =>
$this->bo->xi['stats_font'],
'stats_font_size' =>
$this->bo->xi['stats_font_size'],
'stats_foldername_size' =>
$this->bo->xi['stats_foldername_size'],
- 'hdr_font' =>
$this->bo->xi['hdr_font'],
+ // 'hdr_font' =>
$this->bo->xi['hdr_font'],
'hdr_font_size' =>
$this->bo->xi['hdr_font_size'],
'hdr_font_size_sm' =>
$this->bo->xi['hdr_font_size_sm'],
- 'ftr_font' =>
$this->bo->xi['ftr_font'],
+ // 'ftr_font' =>
$this->bo->xi['ftr_font'],
// other message list stuff, we parse the mlist
block before the rest of the tpl vars are needed
'mlist_newmsg_char' =>
$this->bo->xi['mlist_newmsg_char'],
'mlist_newmsg_color' =>
$this->bo->xi['mlist_newmsg_color'],
@@ -140,7 +140,7 @@
'attach_img' =>
$this->bo->xi['attach_img'],
'check_image' =>
$this->bo->xi['check_image'],
'delmov_image' =>
$this->bo->xi['delmov_image'],
- 'compose_text' =>
$this->bo->xi['compose_text'],
+ // 'compose_text' =>
$this->bo->xi['compose_text'],
'compose_link' =>
$this->bo->xi['compose_link'],
'compose_img' =>
$this->bo->xi['compose_img'],
'compose_clickme' =>
$this->bo->xi['compose_clickme'],
@@ -268,8 +268,8 @@
// in every folder EXCEPT
"Sent" folder, we show who the message came from
$tpl_vars = Array(
// new checkbox value,
new fake_uri method of embedding coumpound data in a single HTML element
- 'mlist_embedded_uri' =>
$this->bo->xi['msg_list_dsp'][$i]['uri'],
- 'mlist_backcolor'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color'],
+ 'mlist_embedded_uri' =>
http_build_query($this->bo->xi['msg_list_dsp'][$i]['uri']),
+ // 'mlist_backcolor'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color'],
'mlist_backcolor_class'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color_class'],
'mlist_subject'
=> $this->bo->xi['msg_list_dsp'][$i]['subject'],
'mlist_subject_link'
=> $this->bo->xi['msg_list_dsp'][$i]['subject_link'],
@@ -363,7 +363,7 @@
// old version of first prev next last arrows
for "layout 1"
'prev_arrows' =>
$this->bo->xi['td_prev_arrows'],
'next_arrows' =>
$this->bo->xi['td_next_arrows'],
- 'arrows_backcolor' =>
$this->bo->xi['arrows_backcolor'],
+ // 'arrows_backcolor' =>
$this->bo->xi['arrows_backcolor'],
'arrows_backcolor_class' =>
$this->bo->xi['arrows_backcolor_class'],
'arrows_td_backcolor' =>
$this->bo->xi['arrows_td_backcolor'],
// part of new first prev next last arrows data
block for "layout 2"
@@ -373,11 +373,11 @@
'prev_page' => $this->bo->xi['prev_page'],
'next_page' => $this->bo->xi['next_page'],
'last_page' => $this->bo->xi['last_page'],
- 'stats_backcolor' =>
$this->bo->xi['stats_backcolor'],
- 'stats_color' => $this->bo->xi['stats_color'],
- 'stats_folder' =>
$this->bo->xi['stats_folder'],
- 'stats_saved' => $this->bo->xi['stats_saved'],
- 'stats_new' => $this->bo->xi['stats_new'],
+ // 'stats_backcolor' =>
$this->bo->xi['stats_backcolor'],
+ // 'stats_color' => $this->bo->xi['stats_color'],
+ // 'stats_folder' =>
$this->bo->xi['stats_folder'],
+ // 'stats_saved' => $this->bo->xi['stats_saved'],
+ // 'stats_new' => $this->bo->xi['stats_new'],
'lang_new' => $this->bo->xi['lang_new'],
'lang_new2' => $this->bo->xi['lang_new2'],
'lang_total' => $this->bo->xi['lang_total'],
@@ -385,15 +385,15 @@
'lang_size' => $this->bo->xi['lang_size'],
'lang_size2' => $this->bo->xi['lang_size2'],
'stats_to_txt' =>
$this->bo->xi['stats_to_txt'],
- 'stats_first' => $this->bo->xi['stats_first'],
- 'hdr_backcolor' =>
$this->bo->xi['hdr_backcolor'],
+ // 'stats_first' => $this->bo->xi['stats_first'],
+ // 'hdr_backcolor' =>
$this->bo->xi['hdr_backcolor'],
'hdr_backcolor_class' =>
$this->bo->xi['hdr_backcolor_class'],
'hdr_subject' => $this->bo->xi['hdr_subject'],
'hdr_from' => $this->bo->xi['hdr_from'],
'hdr_date' => $this->bo->xi['hdr_date'],
'hdr_size' => $this->bo->xi['hdr_size'],
'app_images' =>
$this->bo->xi['image_dir'],
- 'ftr_backcolor' =>
$this->bo->xi['ftr_backcolor'],
+ // 'ftr_backcolor' =>
$this->bo->xi['ftr_backcolor'],
'ftr_backcolor_class' =>
$this->bo->xi['ftr_backcolor_class'],
'delmov_button' => $this->bo->xi['lang_delete'],
'delmov_button' =>
$this->bo->xi['delmov_button'],
Index: class.uimessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.uimessage.inc.php 13 Dec 2006 14:57:20 -0000 1.15
+++ class.uimessage.inc.php 15 Dec 2006 14:02:38 -0000 1.16
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.uimessage.inc.php,v 1.15 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uimessage.inc.php,v 1.16 2006/12/15 14:02:38
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -138,9 +138,9 @@
//'ilnk_next_msg' =>
$this->bo->xi['ilnk_next_msg'],
// ---- Labels and Colors for From, To, CC,
Files, and Subject -----
- 'tofrom_labels_bkcolor' =>
$this->bo->xi['tofrom_labels_bkcolor'],
+ // 'tofrom_labels_bkcolor' =>
$this->bo->xi['tofrom_labels_bkcolor'],
'tofrom_labels_class' =>
$this->bo->xi['tofrom_labels_class'],
- 'tofrom_data_bkcolor' =>
$this->bo->xi['tofrom_data_bkcolor'],
+ // 'tofrom_data_bkcolor' =>
$this->bo->xi['tofrom_data_bkcolor'],
'tofrom_data_class' =>
$this->bo->xi['tofrom_data_class'],
'lang_inbox_folder' =>
$this->bo->xi['lang_inbox'],
@@ -191,11 +191,11 @@
$tpl_vars = Array(
// ---- Images and Hrefs For Reply, ReplyAll,
Forward, and Delete -----
- 'theme_font' =>
$this->bo->xi['theme_font'],
- 'theme_th_bg' =>
$this->bo->xi['theme_th_bg'],
- 'theme_row_on' =>
$this->bo->xi['theme_row_on'],
- 'reply_btns_bkcolor' =>
$this->bo->xi['reply_btns_bkcolor'],
- 'reply_btns_text' =>
$this->bo->xi['reply_btns_text'],
+ // 'theme_font' =>
$this->bo->xi['theme_font'],
+ // 'theme_th_bg' =>
$this->bo->xi['theme_th_bg'],
+ // 'theme_row_on' =>
$this->bo->xi['theme_row_on'],
+ // 'reply_btns_bkcolor' =>
$this->bo->xi['reply_btns_bkcolor'],
+ // 'reply_btns_text' =>
$this->bo->xi['reply_btns_text'],
'go_back_to' =>
$this->bo->xi['lang_go_back_to'],
'lnk_goback_folder' =>
$this->bo->xi['lnk_goback_folder'],
@@ -221,9 +221,9 @@
}
// ----- Message_Display Template Handles it from here
-------
-
$this->tpl->set_var('theme_font',$this->bo->xi['theme_font']);
-
$this->tpl->set_var('theme_th_bg',$this->bo->xi['theme_th_bg']);
-
$this->tpl->set_var('theme_row_on',$this->bo->xi['theme_row_on']);
+ //
$this->tpl->set_var('theme_font',$this->bo->xi['theme_font']);
+ //
$this->tpl->set_var('theme_th_bg',$this->bo->xi['theme_th_bg']);
+ //
$this->tpl->set_var('theme_row_on',$this->bo->xi['theme_row_on']);
// ---- so called "TOOLBAR" between the msg header
data and the message siaplay
switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type'))
@@ -341,7 +341,7 @@
{
$this->tpl->set_var('title_text',$this->bo->part_nice[$i]['title_text']);
$this->tpl->set_var('display_str',$this->bo->part_nice[$i]['display_str']);
-
$this->tpl->set_var('message_body',$this->bo->part_nice[$i]['message_body']);
+
$this->tpl->set_var('message_body',$GLOBALS['phpgw']->msg->ascii2utf($this->bo->part_nice[$i]['message_body']));
//$this->tpl->parse('V_display_part','B_display_part', True);
//if
($GLOBALS['phpgw']->msg->phpgw_before_xslt)
//{
@@ -374,7 +374,7 @@
// ----- Echo This Data Directly to
the Client
// since the php version of this of
b0rked for large msgs, perhaps use sockets code?
echo '<pre>';
- echo
$GLOBALS['phpgw']->msg->phpgw_fetchbody($msgball);
+ echo
$GLOBALS['phpgw']->msg->ascii2utf($GLOBALS['phpgw']->msg->phpgw_fetchbody($msgball));
echo '</pre>';
// ----- Close Table
$this->tpl->set_var('V_setup_echo_dump','');
@@ -387,7 +387,6 @@
}
}
//@set_time_limit(0);
-
//if ($GLOBALS['phpgw']->msg->phpgw_before_xslt ==
False)
//{
// // fix a b0rk in template showing last item 2
times under XSLT
@@ -430,7 +429,7 @@
}
// ralfbecker patch dated 021124
- if (isset($this->bo->xi['application']))
+ if (isset($this->bo->xi['application']) &&
$this->bo->xi['application'])
{
global $calendar_id;
$calendar_id = $this->bo->xi['calendar_id'];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.boindex.inc.php class.bomessage...,
Sigurd Nes <=