[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.email_service.inc.php class.mai...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] email/inc class.email_service.inc.php class.mai... |
Date: |
Sun, 26 Nov 2006 14:16:49 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/11/26 14:16:49
Modified files:
inc : class.email_service.inc.php
class.mail_dcom.inc.php
class.mail_msg_base.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.email_service.inc.php?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_dcom.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.84&r2=1.85
Patches:
Index: class.email_service.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.email_service.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- class.email_service.inc.php 11 May 2005 18:52:07 -0000 1.4
+++ class.email_service.inc.php 26 Nov 2006 14:16:48 -0000 1.5
@@ -19,6 +19,7 @@
{
var $msg_bootstrap; //email.msg_bootstrap
var $bopreferences;
+ var $debug;
/**
* Constructor
@@ -93,10 +94,10 @@
// parse link to view email folder
$folderName =
$GLOBALS['phpgw']->msg->prep_folder_out($folder_list_i[$j]['folder_long']);
- $folderLink =
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'.
-
'&fldball[folder]='.$folderName.
-
'&fldball[acctnum]='.$account_list[$i]['acctnum']
- );
+ $folderLink =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$folderName,
+
'fldball[acctnum]'=>$account_list[$i]['acctnum']
+
));
$id =
'email_'.$account_list[$i]['acctnum'].'_'.$path[count($path)-1];
$return[$id] = array('text' =>
$path[count($path)-1],
Index: class.mail_dcom.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_dcom.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.mail_dcom.inc.php 11 May 2005 18:52:06 -0000 1.13
+++ class.mail_dcom.inc.php 26 Nov 2006 14:16:48 -0000 1.14
@@ -9,7 +9,7 @@
* @copyright Copyright (C) 2001-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_dcom.inc.php,v 1.13 2005/05/11 18:52:06
powerstat Exp $
+ * @version $Id: class.mail_dcom.inc.php,v 1.14 2006/11/26 14:16:48
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -45,7 +45,7 @@
{
if ($debug_dcom) { echo 'DCOM DEBUG: did NOT find class feed
arg $p1 ['.serialize($p1).']<br />'; }
//{ echo 'DCOM DEBUG: did NOT find class feed arg $p1
['.serialize($p1).']<br />'; }
- $mail_server_type =
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'];
+ $mail_server_type =
(isset($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'])?$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type']:'');
}
/* ----- is IMAP compiled into PHP */
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- class.mail_msg_base.inc.php 31 Aug 2006 02:39:41 -0000 1.84
+++ class.mail_msg_base.inc.php 26 Nov 2006 14:16:48 -0000 1.85
@@ -9,7 +9,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_base.inc.php,v 1.84 2006/08/31 02:39:41
skwashd Exp $
+ * @version $Id: class.mail_msg_base.inc.php,v 1.85 2006/11/26 14:16:48
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Originally Based on Aeromail http://the.cushman.net/
*/
@@ -3143,7 +3143,7 @@
// check if class dcom reports that the folder list has
changed
// is this accounts dcom object has not been created
yet, then obviously we did not just change its folder list
// NOTE THIS IS OBSOLETED - THE DCOM CLASS NOW USES
CALLBACK FUNCTION "folder_list_change_callback"
- if ((is_object($GLOBALS['phpgw_dcom_'.$acctnum]->dcom))
+ if ((isset($GLOBALS['phpgw_dcom_'.$acctnum]->dcom) &&
is_object($GLOBALS['phpgw_dcom_'.$acctnum]->dcom))
&&
($GLOBALS['phpgw_dcom_'.$acctnum]->dcom->folder_list_changed == True))
{
// class dcom recorded a change in the folder
list
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.email_service.inc.php class.mai...,
Sigurd Nes <=