[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail inc/class.bofelamimail.inc.php inc/c... |
|
Date: |
Mon, 18 Dec 2006 14:43:28 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 06/12/18 14:43:28
Modified files:
inc : class.bofelamimail.inc.php
class.uidisplay.inc.php
templates/base : view_message.tpl
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uidisplay.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/felamimail/templates/base/view_message.tpl?cvsroot=phpgroupware&r1=1.1&r2=1.2
Patches:
Index: inc/class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.bofelamimail.inc.php 18 Dec 2006 11:02:55 -0000 1.8
+++ inc/class.bofelamimail.inc.php 18 Dec 2006 14:43:28 -0000 1.9
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bofelamimail.inc.php,v 1.8 2006/12/18 11:02:55 sigurdne
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.9 2006/12/18 14:43:28 sigurdne
Exp $ */
class bofelamimail
{
@@ -137,6 +137,8 @@
$this->sessionData['mailbox']);
reset($_messageUID);
+
+ $msglist = false;
while(list($key, $value) = each($_messageUID))
{
if(!empty($msglist)) $msglist .= ",";
@@ -279,6 +281,7 @@
// create a new array holding information only on message
attachments
function get_attachments($arr)
{
+ $ret = false;
reset($arr);
while(list($key,$value) = @each($arr))
{
@@ -445,7 +448,7 @@
$messageData['date'] =
date("Y-m-d H:i:s",$transformdate->getTimeStamp($tmpdate));
$messageData['subject'] =
$header->subject;
- $messageData['to_name'] =
$header->to[0]->personal;
+ $messageData['to_name'] =
(isset($header->to[0]->personal) ? $header->to[0]->personal:'');
$messageData['to_address'] =
$header->to[0]->mailbox."@".$header->to[0]->host;
$messageData['sender_name'] =
$header->from[0]->personal;
$messageData['sender_address'] =
$header->from[0]->mailbox."@".$header->from[0]->host;
@@ -474,6 +477,7 @@
$displayHeaders = $caching->getHeaders();
if (count($displayHeaders) > $status->messages)
{
+ $removedMessages = 0;
$messagesToRemove = count($displayHeaders) -
$status->messages;
reset($displayHeaders);
for($i=0; $i<count($displayHeaders); $i++)
@@ -762,7 +766,7 @@
$ret = array();
// split structure into parts
- $parts = $structure->parts;
+ $parts = (isset($structure->parts) ? $structure->parts
:'');
for($x=0; $x<sizeof($parts); $x++)
{
Index: inc/class.uidisplay.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uidisplay.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- inc/class.uidisplay.inc.php 18 Dec 2006 11:02:55 -0000 1.4
+++ inc/class.uidisplay.inc.php 18 Dec 2006 14:43:28 -0000 1.5
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uidisplay.inc.php,v 1.4 2006/12/18 11:02:55 sigurdne Exp
$ */
+ /* $Id: class.uidisplay.inc.php,v 1.5 2006/12/18 14:43:28 sigurdne Exp
$ */
class uidisplay
{
@@ -32,8 +32,8 @@
$this->mailbox =
$this->bofelamimail->sessionData['mailbox'];
$this->uid =
$GLOBALS['HTTP_GET_VARS']['uid'];
- // $this->rowColor[0] =
$GLOBALS['phpgw_info']["theme"]["bg01"];
- // $this->rowColor[1] =
$GLOBALS['phpgw_info']["theme"]["bg02"];
+ $this->rowColor[0] = 'row_on';
+ $this->rowColor[1] = 'row_off';
if($GLOBALS['HTTP_GET_VARS']['showHeader'] == "false")
{
@@ -228,14 +228,14 @@
// attachments
if (is_array($attachments) && count($attachments) > 0)
{
- //
$this->t->set_var('row_color',$this->rowColor[0]);
+
$this->t->set_var('row_class',$this->rowColor[0]);
$this->t->set_var('name',lang('name'));
$this->t->set_var('type',lang('type'));
$this->t->set_var('size',lang('size'));
#$this->t->parse('attachment_rows','attachment_row_bold',True);
while (list($key,$value) = each($attachments))
{
-
$this->t->set_var('row_color',$this->rowColor[($key+1)%2]);
+
$this->t->set_var('row_class',$this->rowColor[($key+1)%2]);
$this->t->set_var('filename',htmlentities($this->bofelamimail->decode_header($value['name'])));
$this->t->set_var('mimetype',$value['type']);
$this->t->set_var('size',$value['size']);
Index: templates/base/view_message.tpl
===================================================================
RCS file: /sources/phpgroupware/felamimail/templates/base/view_message.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- templates/base/view_message.tpl 16 Dec 2006 21:50:31 -0000 1.1
+++ templates/base/view_message.tpl 18 Dec 2006 14:43:28 -0000 1.2
@@ -84,7 +84,7 @@
<!-- END message_navbar_print -->
<!-- BEGIN message_attachement_row -->
-<tr>
+<tr class = {row_class}>
<td valign="top" bgcolor={bg01}>
<a href="{link_view}"><font size="2" face="{theme_font}">
<b>{filename}</b></font><a>