[Phpgroupware-cvs] CVS: email/inc class.mail_msg_base.inc.php,1.71,1.72 class.uimessage.inc.php,1.4,1.5 class.bomessage.inc.php,1.8,1.9

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv10079/email/inc

Modified Files:
        class.mail_msg_base.inc.php class.uimessage.inc.php 
        class.bomessage.inc.php 
Log Message:
GNU Patch #184.

Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** class.mail_msg_base.inc.php 1 Feb 2002 00:09:59 -0000       1.71
--- class.mail_msg_base.inc.php 26 Mar 2002 02:34:38 -0000      1.72
***************
*** 365,369 ****
                        // *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
--- 365,369 ----
                        // *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
***************
*** 540,544 ****
                                                $new_arg_value = $fldball;
                                        }
!                                       elseif ($key == 'msgball')
                                        {
                                                $msgball = $args_array[$key];
--- 540,544 ----
                                                $new_arg_value = $fldball;
                                        }
!                                       elseif ($key == 'msgball')
                                        {
                                                $msgball = $args_array[$key];
***************
*** 630,634 ****
                {
                        $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>'; }
--- 630,634 ----
                {
                        $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>'; }
***************
*** 870,874 ****
                        }
                        
!                       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)
--- 870,874 ----
                        }
                        
!                       @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)
***************
*** 876,880 ****
                        $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>'; }
--- 876,880 ----
                        $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>'; }
***************
*** 1101,1109 ****
                        }
                        // 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>'; }
                        
--- 1101,1109 ----
                        }
                        // 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>'; }
                        
***************
*** 1232,1236 ****
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 1232,1236 ----
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
***************
*** 1314,1318 ****
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 1314,1318 ----
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
***************
*** 1380,1384 ****
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 1380,1384 ----
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
***************
*** 1577,1581 ****
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 1577,1581 ----
                
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
***************
*** 1635,1639 ****
        {
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 1635,1639 ----
        {
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
***************
*** 1724,1728 ****
                // 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();
--- 1724,1728 ----
                // 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();
***************
*** 1777,1781 ****
                // 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();
--- 1777,1781 ----
                // 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();
***************
*** 2087,2091 ****
        {
                if ((!isset($acctnum))
!               || ((string)$acctnum == ''))
                {
                        $acctnum = $this->get_acctnum();
--- 2087,2091 ----
        {
                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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uimessage.inc.php     15 Jan 2002 07:40:36 -0000      1.4
--- class.uimessage.inc.php     26 Mar 2002 02:34:38 -0000      1.5
***************
*** 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.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bomessage.inc.php     17 Jan 2002 20:53:50 -0000      1.8
--- class.bomessage.inc.php     26 Mar 2002 02:34:38 -0000      1.9
***************
*** 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 ???????