[20878] Fix some imap-warnings and links not defined as arrays - and hopefully the choke on initialising
Sigurd Nes <[email protected]>
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 20878
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20878
Author: sigurdne
Date: 2009-11-22 16:31:30 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
Fix some imap-warnings and links not defined as arrays - and hopefully the choke on initialising
Modified Paths:
--------------
modules/email/trunk/inc/class.bopreferences.inc.php
modules/email/trunk/inc/class.mail_dcom_imap.inc.php
modules/email/trunk/inc/class.mail_msg_base.inc.php
modules/email/trunk/inc/class.service.inc.php
Modified: modules/email/trunk/inc/class.bopreferences.inc.php
===================================================================
--- modules/email/trunk/inc/class.bopreferences.inc.php 2009-11-21 20:17:33 UTC (rev 20877)
+++ modules/email/trunk/inc/class.bopreferences.inc.php 2009-11-22 16:31:30 UTC (rev 20878)
@@ -1712,11 +1712,12 @@
$accountname = 'unknown accountname on ('.__LINE__.')';
}
- $return_list[$next_pos]['go_there_url'] = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uiindex.index'
- .'&fldball[folder]=INBOX'
- .'&fldball[acctnum]='.$this_acctnum);
+ $return_list[$next_pos]['go_there_url'] = $GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' => 'email.uiindex.index',
+ 'fldball[folder]' => 'INBOX',
+ 'fldball[acctnum]' => $this_acctnum
+ ));
$return_list[$next_pos]['go_there_href'] = '<a href="'.$return_list[$next_pos]['go_there_url'].'">'.lang('go').'</a>';
}
// NEXT: html encode the acctname string
@@ -1730,15 +1731,18 @@
$return_list[$next_pos]['display_string'] = '['.$this_acctnum.'] '.$accountname;
// NEXT: control action links
- $return_list[$next_pos]['edit_url'] = $GLOBALS['phpgw']->link( '/index.php',
- 'menuaction=email.uipreferences.ex_accounts_edit'
- .'&ex_acctnum='.$this_acctnum);
+ $return_list[$next_pos]['edit_url'] = $GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' => 'email.uipreferences.ex_accounts_edit',
+ 'ex_acctnum' => $this_acctnum
+ ));
$return_list[$next_pos]['edit_href'] = '<a href="'.$return_list[$next_pos]['edit_url'].'">'.lang('Edit').'</a>';
- $return_list[$next_pos]['delete_url'] = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.bopreferences.ex_accounts_delete'
- .'&ex_acctnum='.$this_acctnum);
+ $return_list[$next_pos]['delete_url'] = $GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' => 'email.bopreferences.ex_accounts_delete',
+ 'ex_acctnum' => $this_acctnum
+ ));
$return_list[$next_pos]['delete_href'] = '<a href="'.$return_list[$next_pos]['delete_url'].'">'.lang('Delete').'</a>';
}
}
Modified: modules/email/trunk/inc/class.mail_dcom_imap.inc.php
===================================================================
--- modules/email/trunk/inc/class.mail_dcom_imap.inc.php 2009-11-21 20:17:33 UTC (rev 20877)
+++ modules/email/trunk/inc/class.mail_dcom_imap.inc.php 2009-11-22 16:31:30 UTC (rev 20878)
@@ -32,7 +32,7 @@
return imap_base64($text);
}
- function close($stream,$flags='')
+ function close($stream,$flags=0)
{
return imap_close($stream,$flags);
}
@@ -218,7 +218,7 @@
function open($mailbox,$username,$password,$flags=0)
{
$mailbox = $this->utf7_encode($mailbox);
- return @imap_open($mailbox, $username, $password, $flags);
+ return @imap_open($mailbox, $username, $password, $flags,2);
}
function qprint($message)
Modified: modules/email/trunk/inc/class.mail_msg_base.inc.php
===================================================================
--- modules/email/trunk/inc/class.mail_msg_base.inc.php 2009-11-21 20:17:33 UTC (rev 20877)
+++ modules/email/trunk/inc/class.mail_msg_base.inc.php 2009-11-22 16:31:30 UTC (rev 20878)
@@ -1482,7 +1482,7 @@
if ($this->debug_logins > 1) { $this->dbug->out('mail_msg.begin_request('.__LINE__.'): about to issue: $GLOBALS[phpgw_dcom_'.$acctnum.']->dcom->reopen('.$mailsvr_stream.', '.$mailsvr_callstr.$processed_folder_arg,', )'.'<br />'); }
//$did_reopen = $tmp_a['dcom']->reopen($mailsvr_stream, $mailsvr_callstr.$processed_folder_arg, '');
if ($this->debug_logins > 0) { $this->dbug->out('mail_msg: begin_request('.__LINE__.'): <font color="red">MAIL SERVER COMMAND</font>'.'<br />'); }
- $did_reopen = $GLOBALS['phpgw_dcom_'.$acctnum]->dcom->reopen($mailsvr_stream, $mailsvr_callstr.$processed_folder_arg, '');
+ $did_reopen = $GLOBALS['phpgw_dcom_'.$acctnum]->dcom->reopen($mailsvr_stream, $mailsvr_callstr.$processed_folder_arg);
if ($this->debug_logins > 1) { $this->dbug->out('mail_msg.begin_request('.__LINE__.'): reopen returns: '.serialize($did_reopen).'<br />'); }
// error check
if ($did_reopen == False)
@@ -1869,7 +1869,7 @@
if ($this->debug_logins > 1) { $this->dbug->out('mail_msg: ensure_stream_and_folder('.__LINE__.'): need to switch folders (reopen) from $preped_current_folder_arg ['.$preped_current_folder_arg.'] to $preped_folder: '.$preped_folder.'<br />'); }
if ($this->debug_logins > 1) { $this->dbug->out('mail_msg: ensure_stream_and_folder('.__LINE__.'): about to issue: $GLOBALS[phpgw_dcom_'.$acctnum.']->dcom->reopen('.$mailsvr_stream.', '.$mailsvr_callstr.$preped_folder,', )'.'<br />'); }
if ($this->debug_logins > 0) { $this->dbug->out('mail_msg: ensure_stream_and_folder('.__LINE__.'): <font color="red">MAIL SERVER COMMAND</font>'.'<br />'); }
- $did_reopen = $GLOBALS['phpgw_dcom_'.$acctnum]->dcom->reopen($mailsvr_stream, $mailsvr_callstr.$preped_folder, '');
+ $did_reopen = $GLOBALS['phpgw_dcom_'.$acctnum]->dcom->reopen($mailsvr_stream, $mailsvr_callstr.$preped_folder);
if ($this->debug_logins > 1) { $this->dbug->out('mail_msg: ensure_stream_and_folder('.__LINE__.'): reopen returns: '.serialize($did_reopen).'<br />'); }
if ($did_reopen == False)
{
Modified: modules/email/trunk/inc/class.service.inc.php
===================================================================
--- modules/email/trunk/inc/class.service.inc.php 2009-11-21 20:17:33 UTC (rev 20877)
+++ modules/email/trunk/inc/class.service.inc.php 2009-11-22 16:31:30 UTC (rev 20878)
@@ -118,8 +118,8 @@
$msg_bootstrap->ensure_mail_msg_exists('email.bofolder.folder', false);
$bopreferences = CreateObject('email.bopreferences');
- $accts = $bopreferences->msg->a;
-
+// $accts = $bopreferences->msg->a;
+ $accts = array();
$menu['folders'] = array();
foreach ( $accts as $id => $acct )
{