[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] felamimail/inc class.bocompose.inc.php class.bo...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] felamimail/inc class.bocompose.inc.php class.bo... |
|
Date: |
Tue, 20 Feb 2007 10:27:37 +0000 |
CVSROOT: /sources/phpgroupware
Module name: felamimail
Changes by: Sigurd Nes <sigurdne> 07/02/20 10:27:37
Modified files:
inc : class.bocompose.inc.php
class.bofelamimail.inc.php
class.bopreferences.inc.php
class.uicompose.inc.php
class.uifelamimail.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bopreferences.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uifelamimail.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.bocompose.inc.php 21 Dec 2006 12:34:39 -0000 1.6
+++ class.bocompose.inc.php 20 Feb 2007 10:27:37 -0000 1.7
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bocompose.inc.php,v 1.6 2006/12/21 12:34:39 sigurdne Exp
$ */
+ /* $Id: class.bocompose.inc.php,v 1.7 2007/02/20 10:27:37 sigurdne Exp
$ */
class bocompose
{
@@ -494,7 +494,7 @@
$mail->Body .= "\r\n--\r\n";
$mail->Body .=
$this->sessionData['signature'];
}
- if (is_array($this->sessionData['attachments']))
+ if (isset($this->sessionData['attachments']) &&
is_array($this->sessionData['attachments']))
{
while(list($key,$value) =
each($this->sessionData['attachments']))
{
@@ -544,7 +544,7 @@
$bofelamimail->closeConnection();
}
- if(is_array($this->sessionData['attachments']))
+ if(isset($this->sessionData['attachments']) &&
is_array($this->sessionData['attachments']))
{
reset($this->sessionData['attachments']);
while(list($key,$value) =
@each($this->sessionData['attachments']))
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- class.bofelamimail.inc.php 21 Dec 2006 15:07:55 -0000 1.15
+++ class.bofelamimail.inc.php 20 Feb 2007 10:27:37 -0000 1.16
@@ -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.15 2006/12/21 15:07:55 sigurdne
Exp $ */
+ /* $Id: class.bofelamimail.inc.php,v 1.16 2007/02/20 10:27:37 sigurdne
Exp $ */
class bofelamimail
{
@@ -304,6 +304,7 @@
function encodeHeader($_string, $_encoding="q")
{
+ $retString = '';
switch($_encoding)
{
case "q":
Index: class.bopreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bopreferences.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.bopreferences.inc.php 9 Feb 2007 12:37:54 -0000 1.11
+++ class.bopreferences.inc.php 20 Feb 2007 10:27:37 -0000 1.12
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.bopreferences.inc.php,v 1.11 2007/02/09 12:37:54 sigurdne
Exp $ */
+ /* $Id: class.bopreferences.inc.php,v 1.12 2007/02/20 10:27:37 sigurdne
Exp $ */
class bopreferences
{
@@ -122,8 +122,8 @@
// check for user specific settings
#_debug_array($felamimailUserPrefs);
- if ($felamimailConfig['userDefinedAccounts'] == 'yes' &&
- $felamimailUserPrefs['use_custom_settings'] ==
'yes')
+ if ((isset($felamimailConfig['userDefinedAccounts']) &&
$felamimailConfig['userDefinedAccounts'] == 'yes') &&
+
(isset($felamimailUserPrefs['use_custom_settings']) &&
$felamimailUserPrefs['use_custom_settings'] == 'yes'))
{
if(!empty($felamimailUserPrefs['username']))
$data['username'] =
$felamimailUserPrefs['username'];
Index: class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.uicompose.inc.php 22 Dec 2006 10:36:52 -0000 1.9
+++ class.uicompose.inc.php 20 Feb 2007 10:27:37 -0000 1.10
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uicompose.inc.php,v 1.9 2006/12/22 10:36:52 sigurdne Exp
$ */
+ /* $Id: class.uicompose.inc.php,v 1.10 2007/02/20 10:27:37 sigurdne Exp
$ */
class uicompose
{
@@ -113,7 +113,7 @@
$linkData = array
(
'menuaction'=>
'felamimail.uifelamimail.viewMainScreen',
- 'mailbox' =>
$GLOBALS['HTTP_GET_VARS']['mailbox'],
+ 'mailbox' =>
isset($GLOBALS['HTTP_GET_VARS']['mailbox']) ?
$GLOBALS['HTTP_GET_VARS']['mailbox'] : '',
'startMessage' => '1'
);
Index: class.uifelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uifelamimail.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uifelamimail.inc.php 9 Feb 2007 12:37:54 -0000 1.13
+++ class.uifelamimail.inc.php 20 Feb 2007 10:27:37 -0000 1.14
@@ -11,7 +11,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
- /* $Id: class.uifelamimail.inc.php,v 1.13 2007/02/09 12:37:54 sigurdne
Exp $ */
+ /* $Id: class.uifelamimail.inc.php,v 1.14 2007/02/20 10:27:37 sigurdne
Exp $ */
class uifelamimail
{
@@ -621,7 +621,7 @@
$langTotal = lang("total");
}
- $this->t->set_var('maxMessages',$i);
+ $this->t->set_var('maxMessages',isset($i)?$i:0);
//Fix this: move into next if-block
if(isset($GLOBALS['HTTP_GET_VARS']["select_all"]) &&
$GLOBALS['HTTP_GET_VARS']["select_all"] == "select_all")
@@ -693,8 +693,11 @@
}
+ if(isset($totalMessage))
+ {
$this->t->set_var('message',lang("Viewing messages")."
<b>$firstMessage</b> - <b>$lastMessage</b> ($totalMessage $langTotal)");
- if($firstMessage > 1)
+ }
+ if(isset($firstMessage) && $firstMessage > 1)
{
$linkData = array
(
@@ -709,7 +712,7 @@
$this->t->set_var('link_previous',lang("previous"));
}
- if($totalMessage > $lastMessage)
+ if(isset($totalMessage) && $totalMessage > $lastMessage)
{
$linkData = array
(
- [Phpgroupware-cvs] felamimail/inc class.bocompose.inc.php class.bo...,
Sigurd Nes <=