[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.mail_msg_wrappers.inc.php
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.mail_msg_wrappers.inc.php |
|
Date: |
Thu, 14 Dec 2006 20:59:14 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/14 20:59:14
Modified files:
inc : class.mail_msg_wrappers.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
Patches:
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.mail_msg_wrappers.inc.php 14 Dec 2006 15:10:11 -0000 1.46
+++ class.mail_msg_wrappers.inc.php 14 Dec 2006 20:59:13 -0000 1.47
@@ -7,7 +7,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_wrappers.inc.php,v 1.46 2006/12/14
15:10:11 sigurdne Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.47 2006/12/14
20:59:13 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -732,13 +732,10 @@
for($i=0;$i<$loops;$i++)
{
// NEW - try making the
msgball_list URI DATA ONLY
- // see php manual page
"function.parse-str.html" for explanation of the array'ing of the URI data
- // NOTE: this uri NEVER begins
with a "&" here
- // YOU must add the prefix "&"
if it's needed
- $msgball_list[$i] =
-
'msgball[msgnum]='.$server_msgnum_list[$i]
-
.'&msgball[folder]='.$msg_folder
-
.'&msgball[acctnum]='.$acctnum;
+ $msgball_list[$i] = array(
+
'msgball[msgnum]'=>$server_msgnum_list[$i],
+
'msgball[folder]'=>$msg_folder,
+
'msgball[acctnum]'=>$acctnum);
}
}
@@ -1729,12 +1726,20 @@
// assemble the URI like string that will hold the
command move request instructions
$this_move_data = '';
- $this_move_data =
+ /* $this_move_data =
'mov_msgball[acctnum]='.$mov_msgball['acctnum']
.'&mov_msgball[folder]='.$mov_msgball['folder']
.'&to_fldball[acctnum]='.$to_fldball['acctnum']
.'&to_fldball[folder]='.$to_fldball['folder']
.'&mov_msgball[msgnum]='.$mov_msgball['msgnum'];
+ */
+
+ $this_move_data = array(
+ 'mov_msgball[acctnum]'=>$mov_msgball['acctnum'],
+ 'mov_msgball[folder]'=>$mov_msgball['folder'],
+ 'to_fldball[acctnum]'=>$to_fldball['acctnum'],
+ 'to_fldball[folder]'=>$to_fldball['folder'],
+ 'mov_msgball[msgnum]'=>$mov_msgball['msgnum']);
if ($this->debug_wrapper_dcom_calls > 1) {
$this->dbug->out('mail_msg(_wrappers): buffer_move_commands ('.__LINE__.'):
$this_move_data ['.htmlspecialchars($this_move_data).']<br />'); }
if ($this->debug_wrapper_dcom_calls > 2)
@@ -1771,12 +1776,19 @@
// assemble the URI like string that will hold the
command move request instructions
$this_move_data = '';
- $this_move_data =
+ /* $this_move_data =
'mov_msgball[acctnum]='.$mov_msgball['acctnum']
.'&mov_msgball[folder]='.$mov_msgball['folder']
.'&to_fldball[acctnum]='.$to_fldball['acctnum']
.'&to_fldball[folder]='.$to_fldball['folder']
.'&mov_msgball[msgnum]='.$mov_msgball['msgnum'];
+ */
+ $this_move_data = array(
+ 'mov_msgball[acctnum]'=>$mov_msgball['acctnum'],
+ 'mov_msgball[folder]'=>$mov_msgball['folder'],
+ 'to_fldball[acctnum]'=>$to_fldball['acctnum'],
+ 'to_fldball[folder]'=>$to_fldball['folder'],
+ 'mov_msgball[msgnum]'=>$mov_msgball['msgnum']);
if ($this->debug_wrapper_dcom_calls > 1) {
$this->dbug->out('mail_msg(_wrappers): buffer_move_commands ('.__LINE__.'):
$this_move_data ['.htmlspecialchars($this_move_data).']<br />'); }
if ($this->debug_wrapper_dcom_calls > 2)
@@ -2988,15 +3000,18 @@
{
return $return_struct;
}
- parse_str($uri_ball_data, $return_struct);
+ // parse_str($uri_ball_data, $return_struct);
// RAISE UP one level, we want the return to be the
msgball or fldball itself
- if (stristr($uri_ball_data,'fldball[folder]'))
+ // if (stristr($uri_ball_data,'fldball[folder]'))
+ if (isset($uri_ball_data['fldball[folder]']) &&
$uri_ball_data['fldball[folder]'])
{
- $return_struct = $return_struct['fldball'];
+ // $return_struct = $return_struct['fldball'];
+ $return_struct['folder'] =
$uri_ball_data['fldball[folder]'];
}
- elseif (stristr($uri_ball_data,'msgball[folder]'))
+ // elseif (stristr($uri_ball_data,'msgball[folder]'))
+ elseif (isset($uri_ball_data['msgball[folder]']) &&
$uri_ball_data['msgball[folder]'])
{
- $return_struct = $return_struct['msgball'];
+ $return_struct['folder'] =
$uri_ball_data['msgball[folder]'];
}
else
{
@@ -3018,9 +3033,14 @@
// we always keep folder data in urlencoded form until
the last second
$return_struct['folder'] =
$this->prep_folder_out($return_struct['folder']);
//rebuild the uri string
- $return_struct['uri'] =
array('msgball[msgnum]'=>$return_struct['msgnum'],
-
'msgball[folder]'=>$return_struct['folder'],
-
'msgball[acctnum]'=>$return_struct['acctnum']);
+ // $return_struct['uri'] =
array('msgball[msgnum]'=>$return_struct['msgnum'],
+ //
'msgball[folder]'=>$return_struct['folder'],
+ //
'msgball[acctnum]'=>$return_struct['acctnum']);
+
+ $return_struct['msgnum'] =
$uri_ball_data['msgball[msgnum]'];
+ $return_struct['acctnum'] =
$uri_ball_data['msgball[acctnum]'];
+ $return_struct['uri'] = $uri_ball_data;
+
if ($this->debug_args_input_flow > 2) {
$this->dbug->out('mail_msg: ball_data_parse_str('.__LINE__.'): final
$return_struct DUMP:', $return_struct); }
if ($this->debug_args_input_flow > 0) {
$this->dbug->out('mail_msg: ball_data_parse_str('.__LINE__.'): LEAVING<br />');
}
return $return_struct;