[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.bomessage.inc.php class.mail_ms...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.bomessage.inc.php class.mail_ms... |
|
Date: |
Thu, 14 Dec 2006 10:58:54 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/14 10:58:54
Modified files:
inc : class.bomessage.inc.php
class.mail_msg_display.inc.php
class.mail_msg_wrappers.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bomessage.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_display.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
Patches:
Index: class.bomessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- class.bomessage.inc.php 13 Dec 2006 20:30:11 -0000 1.18
+++ class.bomessage.inc.php 14 Dec 2006 10:58:54 -0000 1.19
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
- * @version $Id: class.bomessage.inc.php,v 1.18 2006/12/13 20:30:11
sigurdne Exp $
+ * @version $Id: class.bomessage.inc.php,v 1.19 2006/12/14 10:58:54
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -491,6 +491,8 @@
// ---- "Go To Previous Message" Handling -----
if ($nav_data['prev_msg'] != $not_set)
{
+ $nav_uri =
(isset($nav_data['prev_msg']['msgball']['uri'])?$nav_data['prev_msg']['msgball']['uri']:array());
+
$prev_msg_link = $GLOBALS['phpgw']->link(
'/index.php',array(
'menuaction'=>'email.uimessage.message',
@@ -498,7 +500,8 @@
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+$this->no_fmt
-
+$nav_data['prev_msg']['msgball']['uri']);
+ +$nav_uri);
+
$prev_msg_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/arrow-left-24','_on'),$this->xi['lang_previous_message'],'','','0');
$href_prev_msg =
$GLOBALS['phpgw']->msg->href_maketag_class($prev_msg_link,'[<
'.$this->xi['lang_previous_message'].']', 'c_replybar');
$ilnk_prev_msg =
$GLOBALS['phpgw']->msg->href_maketag($prev_msg_link,$prev_msg_img);
@@ -517,6 +520,8 @@
// should be moved to emil / class.svc_nextmatches
if ($nav_data['next_msg'] != $not_set)
{
+ $nav_uri =
(isset($nav_data['next_msg']['msgball']['uri'])?$nav_data['next_msg']['msgball']['uri']:array());
+
$next_msg_link = $GLOBALS['phpgw']->link(
'/index.php',array(
'menuaction'=>'email.uimessage.message',
@@ -524,7 +529,7 @@
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+$this->no_fmt
-
+$nav_data['next_msg']['msgball']['uri']);
+ +$nav_uri);
$next_msg_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/arrow-right-24','_on'),$this->xi['lang_next_message'],'','','0');
$href_next_msg =
$GLOBALS['phpgw']->msg->href_maketag_class($next_msg_link,'['.$this->xi['lang_next_message'].'
>]', 'c_replybar');
$ilnk_next_msg =
$GLOBALS['phpgw']->msg->href_maketag($next_msg_link,$next_msg_img);
Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.mail_msg_display.inc.php 13 Dec 2006 15:45:00 -0000 1.46
+++ class.mail_msg_display.inc.php 14 Dec 2006 10:58:54 -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_display.inc.php,v 1.46 2006/12/13
15:45:00 sigurdne Exp $
+ * @version $Id: class.mail_msg_display.inc.php,v 1.47 2006/12/14
10:58:54 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -782,14 +782,31 @@
}
else
{
- $this_pageview_msgball['uri'] =
-
'msgball[msgnum]='.$this_pageview_msgball['msgnum']
-
.'&msgball[folder]='.$this_pageview_msgball['folder']
-
.'&msgball[acctnum]='.$this_pageview_msgball['acctnum'];
+ $this_pageview_msgball['uri'] = array(
+
'msgball[msgnum]'=>$this_pageview_msgball['msgnum'],
+
'msgball[folder]'=>$this_pageview_msgball['folder'],
+
'msgball[acctnum]'=>$this_pageview_msgball['acctnum']);
}
// get the pos in the msgball_list that is the array idx for
this current pageview msgball
$nav_data['msgnum_idx'] = False;
- $nav_data['msgnum_idx'] =
array_search($this_pageview_msgball['uri'],$nav_data['msgball_list']);
+
+ // $nav_data['msgnum_idx'] =
array_search($this_pageview_msgball['uri'],$nav_data['msgball_list']);
+ // The uri is now an array.
+ //Fix this: there must be a smarter way...
+ if(isset($this_pageview_msgball['uri']) &&
is_array($this_pageview_msgball['uri'])
+ && count($this_pageview_msgball['uri']) > 0
+ && isset($nav_data['msgball_list']) &&
is_array($nav_data['msgball_list']))
+ {
+ for ($i=0; $i < count($nav_data['msgball_list']); $i++)
+ {
+
if(count(array_diff_assoc($this_pageview_msgball['uri'],$nav_data['msgball_list'][$i]))==0
+ &&
count(array_diff_assoc($nav_data['msgball_list'][$i],$this_pageview_msgball['uri']))==0)
+ {
+ $nav_data['msgnum_idx'] = $i;
+ break;
+ }
+ }
+ }
// NOTE: msgnum_idx int 0 is NOT to be confused with "empty"
nor "boolean False"
if ((isset($nav_data['msgnum_idx']))
@@ -2291,13 +2308,14 @@
$url_part_name = urlencode($part_name);
// ex_part_href
$ex_part_href = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.boaction.get_attach'
-
.'&'.$msgball['uri'].'&msgball[part_no]='.$m_part_num_mime
- .'&type=' .$url_part_type
- .'&subtype=' .$url_part_subtype
- .'&name=' .$url_part_name
- .'&encoding=' .$url_part_encoding);
+ '/index.php',array(
+ 'menuaction'=>'email.boaction.get_attach',
+ 'msgball[part_no]'=>$m_part_num_mime,
+ 'type'=> $url_part_type,
+ 'subtype'=>$url_part_subtype,
+ 'name'=> $url_part_name,
+ 'encoding'=>$url_part_encoding)
+ +$msgball['uri']);
// Make CLICKABLE link directly to this attachment or part
$href_part_name = $this->decode_header_string($part_name);
// escape certain undesirable chars before HTML display
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.mail_msg_wrappers.inc.php 13 Dec 2006 20:30:11 -0000 1.44
+++ class.mail_msg_wrappers.inc.php 14 Dec 2006 10:58:54 -0000 1.45
@@ -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.44 2006/12/13
20:30:11 sigurdne Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.45 2006/12/14
10:58:54 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -735,10 +735,10 @@
// 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 +1729,12 @@
// assemble the URI like string that will hold the
command move request instructions
$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 +1771,12 @@
// assemble the URI like string that will hold the
command move request instructions
$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)