[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_base.inc.php,1.61.2.4,1
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.mail_msg_base.inc.php,1.61.2.4,1.61.2.5 class.uimessage.inc.php,1.2.2.1,1.2.2.2 class.bomessage.inc.php,1.5.2.2,1.5.2.3 |
|
Date: |
Mon, 25 Mar 2002 21:20:44 -0500 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv9769/email/inc
Modified Files:
Tag: Version-0_9_14-branch
class.mail_msg_base.inc.php class.uimessage.inc.php
class.bomessage.inc.php
Log Message:
GNU Patch #185, Fix for GNU Bug #100576.
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.61.2.4
retrieving revision 1.61.2.5
diff -C2 -r1.61.2.4 -r1.61.2.5
*** class.mail_msg_base.inc.php 4 Mar 2002 15:10:43 -0000 1.61.2.4
--- class.mail_msg_base.inc.php 26 Mar 2002 02:20:40 -0000 1.61.2.5
***************
*** 325,329 ****
// *update* "folder" obtains it's value from (1)
args_array, (2) fldball, (3) msgball, (4) default "INBOX"
'folder',
!
// which email account is the object of this operation
// *update* now in fldball
--- 325,329 ----
// *update* "folder" obtains it's value from (1)
args_array, (2) fldball, (3) msgball, (4) default "INBOX"
'folder',
!
// which email account is the object of this operation
// *update* now in fldball
***************
*** 423,427 ****
{
$this->ex_accounts_count =
count($this->unprocessed_prefs['email']['ex_accounts']);
! if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: $this->unprocessed_prefs[email][ex_accounts] is set and
is_array, its count: $this->ex_accounts_count:
['.$this->ex_accounts_count.']<br>'; }
if ($this->debug_logins > 2) { echo
'$this->unprocessed_prefs[email][ex_accounts] DUMP<pre>';
print_r($this->unprocessed_prefs[email][ex_accounts]); echo '</pre>'; }
if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: about to process extra account data ; $this->ex_accounts_count:
['.$this->ex_accounts_count.']<br>'; }
--- 423,427 ----
{
$this->ex_accounts_count =
count($this->unprocessed_prefs['email']['ex_accounts']);
! if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: $this->unprocessed_prefs[email][ex_accounts] is set and
is_array, its count: $this->ex_accounts_count:
['.$this->ex_accounts_count.']<br>'; }
if ($this->debug_logins > 2) { echo
'$this->unprocessed_prefs[email][ex_accounts] DUMP<pre>';
print_r($this->unprocessed_prefs[email][ex_accounts]); echo '</pre>'; }
if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: about to process extra account data ; $this->ex_accounts_count:
['.$this->ex_accounts_count.']<br>'; }
***************
*** 663,667 ****
}
! set_time_limit(60);
// login to INBOX because we know that always(?) should
exist on an imap server and pop server
// after we are logged in we can get additional info
that will lead us to the desired folder (if not INBOX)
--- 663,667 ----
}
! @set_time_limit(60);
// login to INBOX because we know that always(?) should
exist on an imap server and pop server
// after we are logged in we can get additional info
that will lead us to the desired folder (if not INBOX)
***************
*** 669,673 ****
$mailsvr_stream =
$GLOBALS['phpgw_dcom_'.$acctnum]->dcom->open($mailsvr_callstr."INBOX", $user,
$pass, '');
$pass = '';
! set_time_limit(0);
if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: open returns $mailsvr_stream =
['.serialize($mailsvr_stream).']<br>'; }
--- 669,673 ----
$mailsvr_stream =
$GLOBALS['phpgw_dcom_'.$acctnum]->dcom->open($mailsvr_callstr."INBOX", $user,
$pass, '');
$pass = '';
! @set_time_limit(0);
if ($this->debug_logins > 1) { echo 'mail_msg:
begin_request: open returns $mailsvr_stream =
['.serialize($mailsvr_stream).']<br>'; }
***************
*** 893,901 ****
}
// log in to INBOX because we know INBOX should exist
on every mail server, "reopen" to desired folder (if different) later
! set_time_limit(60);
if ($this->debug_logins > 1) { echo 'mail_msg:
ensure_stream_and_folder: about to call dcom->open:
$GLOBALS[phpgw_dcom_'.$acctnum.']->dcom->open('.$mailsvr_callstr."INBOX".',
'.$user.', '.$pass.', )'.'<br>'; }
$mailsvr_stream =
$GLOBALS['phpgw_dcom_'.$acctnum]->dcom->open($mailsvr_callstr."INBOX", $user,
$pass, '');
$pass = '';
! set_time_limit(0);
if ($this->debug_logins > 1) { echo 'mail_msg:
ensure_stream_and_folder: open returns $mailsvr_stream =
['.serialize($mailsvr_stream).']<br>'; }
--- 893,901 ----
}
// log in to INBOX because we know INBOX should exist
on every mail server, "reopen" to desired folder (if different) later
! @set_time_limit(60);
if ($this->debug_logins > 1) { echo 'mail_msg:
ensure_stream_and_folder: about to call dcom->open:
$GLOBALS[phpgw_dcom_'.$acctnum.']->dcom->open('.$mailsvr_callstr."INBOX".',
'.$user.', '.$pass.', )'.'<br>'; }
$mailsvr_stream =
$GLOBALS['phpgw_dcom_'.$acctnum]->dcom->open($mailsvr_callstr."INBOX", $user,
$pass, '');
$pass = '';
! @set_time_limit(0);
if ($this->debug_logins > 1) { echo 'mail_msg:
ensure_stream_and_folder: open returns $mailsvr_stream =
['.serialize($mailsvr_stream).']<br>'; }
***************
*** 1024,1028 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1024,1028 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1106,1110 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1106,1110 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1172,1176 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1172,1176 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1350,1354 ****
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1350,1354 ----
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1408,1412 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1408,1412 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1497,1501 ****
// note: we need $acctnum to obtain the right namespace and
delimiter, so we can strip them
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1497,1501 ----
// note: we need $acctnum to obtain the right namespace and
delimiter, so we can strip them
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1550,1554 ****
// what acctnum is operative here, we can only get a folder
list for one account at a time (obviously)
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1550,1554 ----
// what acctnum is operative here, we can only get a folder
list for one account at a time (obviously)
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
***************
*** 1835,1839 ****
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
--- 1835,1839 ----
{
if ((!isset($acctnum))
! || ((string)$acctnum == ''))
{
$acctnum = $this->get_acctnum();
Index: class.uimessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.uimessage.inc.php 14 Feb 2002 06:42:44 -0000 1.2.2.1
--- class.uimessage.inc.php 26 Mar 2002 02:20:41 -0000 1.2.2.2
***************
*** 230,234 ****
// ----- SHOW MESSAGE -------
! set_time_limit(120);
$count_part_nice = count($this->bo->part_nice);
for ($i = 0; $i < $count_part_nice; $i++)
--- 230,234 ----
// ----- SHOW MESSAGE -------
! @set_time_limit(120);
$count_part_nice = count($this->bo->part_nice);
for ($i = 0; $i < $count_part_nice; $i++)
***************
*** 273,277 ****
}
}
! set_time_limit(0);
// by now it should be OK to close the stream
$GLOBALS['phpgw']->msg->end_request();
--- 273,277 ----
}
}
! @set_time_limit(0);
// by now it should be OK to close the stream
$GLOBALS['phpgw']->msg->end_request();
Index: class.bomessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** class.bomessage.inc.php 18 Feb 2002 17:19:23 -0000 1.5.2.2
--- class.bomessage.inc.php 26 Mar 2002 02:20:41 -0000 1.5.2.3
***************
*** 229,233 ****
if ($this->debug > 2) { echo
'class.bomessage.message_data: $msg_struct DUMP:<pre>'; print_r($msg_struct);
echo '</pre>'; }
! #set_time_limit(0);
// ---- Special X-phpGW-Type Message Flag -----
--- 229,233 ----
if ($this->debug > 2) { echo
'class.bomessage.message_data: $msg_struct DUMP:<pre>'; print_r($msg_struct);
echo '</pre>'; }
! address@hidden(0);
// ---- Special X-phpGW-Type Message Flag -----
***************
*** 879,883 ****
// ----- GET BODY AND SHOW MESSAGE -------
! set_time_limit(120);
// $this->part_nice[X]['d_instructions']
--- 879,883 ----
// ----- GET BODY AND SHOW MESSAGE -------
! @set_time_limit(120);
// $this->part_nice[X]['d_instructions']
***************
*** 1423,1427 ****
}
}
! set_time_limit(0);
/* // IS THIS STILL USED ???????
--- 1423,1427 ----
}
}
! @set_time_limit(0);
/* // IS THIS STILL USED ???????
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.mail_msg_base.inc.php,1.61.2.4,1.61.2.5 class.uimessage.inc.php,1.2.2.1,1.2.2.2 class.bomessage.inc.php,1.5.2.2,1.5.2.3,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: setup index.php,1.98.2.3,1.98.2.4 applications.php,1.11.2.1,1.11.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: email view_image.php,1.13,1.14
- Previous by thread:
[Phpgroupware-cvs] CVS: setup index.php,1.98.2.3,1.98.2.4 applications.php,1.11.2.1,1.11.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: email view_image.php,1.13,1.14
- Index(es):