[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.boaction.inc.php class.bofolder...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.boaction.inc.php class.bofolder... |
|
Date: |
Thu, 21 Dec 2006 12:34:15 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/21 12:34:15
Modified files:
inc : class.boaction.inc.php class.bofolder.inc.php
class.bomessage.inc.php
class.mail_msg_display.inc.php
class.uifolder.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boaction.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bofolder.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bomessage.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_display.inc.php?cvsroot=phpgroupware&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifolder.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
Patches:
Index: class.boaction.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boaction.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.boaction.inc.php 20 Dec 2006 19:37:45 -0000 1.24
+++ class.boaction.inc.php 21 Dec 2006 12:34:15 -0000 1.25
@@ -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.boaction.inc.php,v 1.24 2006/12/20 19:37:45
sigurdne Exp $
+ * @version $Id: class.boaction.inc.php,v 1.25 2006/12/21 12:34:15
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -447,6 +447,14 @@
// ---- "Go To Previous Message" Handling
-----
if ($nav_data['prev_msg'] != $not_set)
{
+
if(isset($nav_data['prev_msg']['msgball']['uri']) &&
is_array($nav_data['prev_msg']['msgball']['uri']))
+ {
+ $nav_data_uri =
$nav_data['prev_msg']['msgball']['uri'];
+ }
+ else
+ {
+ $nav_data_uri = array();
+ }
$this->redirect_to =
$GLOBALS['phpgw']->link(
'/index.php',array(
@@ -455,7 +463,7 @@
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+$this->no_fmt
-
+$nav_data['prev_msg']['msgball']['uri']);
+ +$nav_data_uri);
}
else
{
Index: class.bofolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bofolder.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.bofolder.inc.php 17 Dec 2006 11:21:02 -0000 1.14
+++ class.bofolder.inc.php 21 Dec 2006 12:34:15 -0000 1.15
@@ -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.bofolder.inc.php,v 1.14 2006/12/17 11:21:02
sigurdne Exp $
+ * @version $Id: class.bofolder.inc.php,v 1.15 2006/12/21 12:34:15
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -337,9 +337,9 @@
// ROW BACK COLOR
//$tr_color =
$this->nextmatchs->alternate_row_color($tr_color);
- $tr_color = (($i + 1)/2 == floor(($i + 1)/2)) ?
$GLOBALS['phpgw_info']['theme']['row_off'] :
$GLOBALS['phpgw_info']['theme']['row_on'];
+ // $tr_color = (($i + 1)/2 == floor(($i + 1)/2)) ?
$GLOBALS['phpgw_info']['theme']['row_off'] :
$GLOBALS['phpgw_info']['theme']['row_on'];
$tr_color_class = (($i + 1)/2 == floor(($i +
1)/2)) ? 'row_off' : 'row_on';
-
$this->xi['folder_list_display'][$i]['list_backcolor'] = $tr_color;
+ //
$this->xi['folder_list_display'][$i]['list_backcolor'] = $tr_color;
$this->xi['folder_list_display'][$i]['list_backcolor_class'] = $tr_color_class;
$this->xi['folder_list_display'][$i]['folder_link'] = $GLOBALS['phpgw']->link(
'/index.php',array(
@@ -415,8 +415,8 @@
$this->xi['form_submit_txt'] = lang("submit");
// ---- Set Up Other Variables ---
- $this->xi['title_backcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
- $this->xi['title_textcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
+ // $this->xi['title_backcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
+ // $this->xi['title_textcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
$this->xi['title_text'] = lang('Folder Maintenance');
$this->xi['label_name_text'] = lang('Folder name');
//$this->xi['label_messages_text'] = lang('Messages');
@@ -457,8 +457,8 @@
//
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
//
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
//
- $this->xi['the_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
- $this->xi['th_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ // $this->xi['the_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ // $this->xi['th_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
if ($this->debug > 0) { echo 'LEAVING:
email.bofolder.folder_data('.__LINE__.')'.'<br />'; }
}
Index: class.bomessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.bomessage.inc.php 17 Dec 2006 11:21:02 -0000 1.23
+++ class.bomessage.inc.php 21 Dec 2006 12:34:15 -0000 1.24
@@ -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.23 2006/12/17 11:21:02
sigurdne Exp $
+ * @version $Id: class.bomessage.inc.php,v 1.24 2006/12/21 12:34:15
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -1443,7 +1443,7 @@
// ---- Replace "Related" part's ID
with a mime reference link
// this for the less-standard
multipart/RELATED subtype ex. Outl00k's Stationary email
// update: now common in Ximian
- if
(($this->part_nice[$parent_idx]['m_html_related_kids'])
+ if
((isset($this->part_nice[$parent_idx]['m_html_related_kids']) &&
$this->part_nice[$parent_idx]['m_html_related_kids'])
//|| (stristr($msg_raw_headers,
$ms_related_str)))
//|| (stristr($msg_struct->subtype,
'RELATED'))
//||
(stristr($this->part_nice[$parent_idx]['subtype'], 'RELATED')))
Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- class.mail_msg_display.inc.php 17 Dec 2006 11:21:02 -0000 1.52
+++ class.mail_msg_display.inc.php 21 Dec 2006 12:34:15 -0000 1.53
@@ -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.52 2006/12/17
11:21:02 sigurdne Exp $
+ * @version $Id: class.mail_msg_display.inc.php,v 1.53 2006/12/21
12:34:15 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -264,7 +264,7 @@
'mailsvr_stream' =>
$this->get_arg_value('mailsvr_stream', $acctnum),
'pre_select_folder' => '',
'skip_folder' => '',
- 'show_num_new' =>
$GLOBALS['phpgw_info']['user']['preferences']['email']['newmsg_combobox'],
+ 'show_num_new' =>
(isset($GLOBALS['phpgw_info']['user']['preferences']['email']['newmsg_combobox'])?$GLOBALS['phpgw_info']['user']['preferences']['email']['newmsg_combobox']:''),
'widget_name' => 'folder_fake_uri',
'folder_key_name' => 'folder',
'acctnum_key_name' => 'acctnum',
@@ -1757,7 +1757,7 @@
if (
($part_nice[$i]['type'] == 'text')
&& ($part_nice[$i]['subtype'] == 'html')
- && ($part_nice[$parent_idx]['type'] == 'multipart')
+ && (isset($part_nice[$parent_idx]['type']) &&
($part_nice[$parent_idx]['type'] == 'multipart'))
&& ($part_nice[$parent_idx]['subtype'] == 'alternative')
&& ($part_nice[$parent_idx]['ex_parent_flat_idx'] ==
$not_set)
&& (stristr($struct->subtype, 'RELATED'))
Index: class.uifolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifolder.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.uifolder.inc.php 17 Dec 2006 11:21:02 -0000 1.11
+++ class.uifolder.inc.php 21 Dec 2006 12:34:15 -0000 1.12
@@ -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.uifolder.inc.php,v 1.11 2006/12/17 11:21:02
sigurdne Exp $
+ * @version $Id: class.uifolder.inc.php,v 1.12 2006/12/21 12:34:15
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -82,7 +82,7 @@
for ($i=0;
$i<count($this->bo->xi['folder_list_display']);$i++)
{
-
$this->tpl->set_var('list_backcolor',$this->bo->xi['folder_list_display'][$i]['list_backcolor']);
+ //
$this->tpl->set_var('list_backcolor',$this->bo->xi['folder_list_display'][$i]['list_backcolor']);
$this->tpl->set_var('list_backcolor_class',$this->bo->xi['folder_list_display'][$i]['list_backcolor_class']);
$this->tpl->set_var('folder_link',$this->bo->xi['folder_list_display'][$i]['folder_link']);
$this->tpl->set_var('folder_name',$this->bo->xi['folder_list_display'][$i]['folder_name']);
@@ -113,8 +113,8 @@
$this->tpl->set_var('target_fldball_boxname',$this->bo->xi['target_fldball_boxname']);
// ---- Set Up Other Variables ---
-
$this->tpl->set_var('title_backcolor',$this->bo->xi['title_backcolor']);
-
$this->tpl->set_var('title_textcolor',$this->bo->xi['title_textcolor']);
+ //
$this->tpl->set_var('title_backcolor',$this->bo->xi['title_backcolor']);
+ //
$this->tpl->set_var('title_textcolor',$this->bo->xi['title_textcolor']);
$this->tpl->set_var('title_text',$this->bo->xi['title_text']);
$this->tpl->set_var('label_name_text',$this->bo->xi['label_name_text']);
//$this->tpl->set_var('label_messages_text',$this->bo->xi['label_messages_text']);
@@ -129,8 +129,8 @@
//$this->tpl->set_var('view_short_txt',$this->bo->xi['view_short_txt']);
//$this->tpl->set_var('view_short_lnk',$this->bo->xi['view_short_lnk']);
-
$this->tpl->set_var('the_font',$this->bo->xi['the_font']);
-
$this->tpl->set_var('th_backcolor',$this->bo->xi['th_backcolor']);
+ //
$this->tpl->set_var('the_font',$this->bo->xi['the_font']);
+ //
$this->tpl->set_var('th_backcolor',$this->bo->xi['th_backcolor']);
// new way to handle debug data, if there is debug
data, this will put it in the template source data vars
$this->tpl->set_var('debugdata',
$GLOBALS['phpgw']->msg->dbug->notice_pagedone());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.boaction.inc.php class.bofolder...,
Sigurd Nes <=