[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: |
Wed, 13 Dec 2006 20:30:12 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/13 20:30:11
Modified files:
inc : class.bomessage.inc.php
class.mail_msg_wrappers.inc.php
hook_home.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bomessage.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/email/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.60&r2=1.61
Patches:
Index: class.bomessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.bomessage.inc.php 11 May 2005 18:06:58 -0000 1.17
+++ class.bomessage.inc.php 13 Dec 2006 20:30:11 -0000 1.18
@@ -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.17 2005/05/11 18:06:58
powerstat Exp $
+ * @version $Id: class.bomessage.inc.php,v 1.18 2006/12/13 20:30:11
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -30,7 +30,7 @@
var $preserve_no_fmt = True;
//var $preserve_no_fmt = False;
- var $no_fmt='';
+ var $no_fmt=array();
// maximum number of TO and CC addresses to show, too many will
error message display
var $max_to_loops = 15;
@@ -206,7 +206,7 @@
&& ($GLOBALS['phpgw']->msg->get_arg_value('no_fmt') !=
'')
&& ($this->preserve_no_fmt == True))
{
- $this->no_fmt = '&no_fmt=1';
+ $this->no_fmt = array('no_fmt'=>1);
}
// ---- TOOL BAR / MENU BAR ----
$this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
@@ -238,8 +238,8 @@
);
$this->xi['acctbox_listbox'] =
$GLOBALS['phpgw']->msg->all_ex_accounts_listbox($feed_args);
$this->xi['accounts_link'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uipreferences.ex_accounts_list');
+
'/index.php',array(
+
'menuaction'=>'email.uipreferences.ex_accounts_list'));
$this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on($this->icon_theme.'/accounts-24','_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_accounts'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['accounts_link'],$this->xi['accounts_img']);
}
@@ -251,8 +251,8 @@
$this->xi['acctbox_frm_name'] = 'acctbox';
// switchbox will itself contain "fake_uri" embedded
data which includes the applicable account number for the folder
$this->xi['acctbox_action'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index');
+
'/index.php',array(
+
'menuaction'=>'email.uiindex.index'));
// ---- Move Message Box ----
// borrow code from boindex and uiindex for this
functionality
@@ -269,8 +269,8 @@
$this->xi['mlist_checkbox_name'] = 'delmov_list[]';
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.boaction.delmov'.$this->no_fmt);
+
'/index.php',array(
+
'menuaction'=>'email.boaction.delmov')+$this->no_fmt);
$this->xi['frm_delmov_name'] = 'delmov';
// imitate the stuff that happens when message(s)
is/are selected on the uiindex page, then the move combobox is used
$this->xi['mlist_embedded_uri'] =
$GLOBALS['phpgw']->msg->get_arg_value('["msgball"]["uri"]');
@@ -411,13 +411,13 @@
// addressbook needs to know what to return to, give it
ALL VARS we can possibly want preserved
// so addybook can send us back to this exact place
when done
$get_back_here_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uimessage.message'
- .'&'address@hidden'uri']
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
- .$this->no_fmt);
+ '/index.php',array(
+ 'menuaction'=>'email.uimessage.message',
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$this->no_fmt
+ +$msgball['uri']);
address@hidden(0);
@@ -468,13 +468,13 @@
//$lnk_goback_folder =
$GLOBALS['phpgw']->msg->href_maketag(
$lnk_goback_folder =
$GLOBALS['phpgw']->msg->href_maketag_class(
$GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uiindex.index'
- .'&fldball[folder]='.$msgball['folder']
-
.'&fldball[acctnum]='.$msgball['acctnum']
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')),
+ '/index.php',array(
+ 'menuaction'=>'email.uiindex.index',
+ 'fldball[folder]'=>$msgball['folder'],
+ 'fldball[acctnum]'=>$msgball['acctnum'],
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))),
//$GLOBALS['phpgw']->msg->get_folder_short($msgball['folder']));
$nice_folder_name,
// his class name is reference to a css on the
page itself, for the A item
@@ -492,13 +492,13 @@
if ($nav_data['prev_msg'] != $not_set)
{
$prev_msg_link = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uimessage.message'
-
.'&'address@hidden'prev_msg']['msgball']['uri']
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
- .$this->no_fmt);
+ '/index.php',array(
+
'menuaction'=>'email.uimessage.message',
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'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']);
$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);
@@ -518,13 +518,13 @@
if ($nav_data['next_msg'] != $not_set)
{
$next_msg_link = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uimessage.message'
-
.'&'address@hidden'next_msg']['msgball']['uri']
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
- .$this->no_fmt);
+ '/index.php',array(
+
'menuaction'=>'email.uimessage.message',
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'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']);
$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);
@@ -564,15 +564,15 @@
{
// folder is probably empty, probably no more
messages to show, so goto uiindex page *for this same folder*
$this->xi['move_postmove_goto_value'] =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum()
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
+ '/index.php',array(
+
'menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum(),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
// This "no_fmt" does not apply
of we are going back to the index page, it only applies to viewing messages.
- //.$this->no_fmt
+ //+$this->no_fmt
);
}
@@ -628,17 +628,17 @@
// first text in the "from" table data, AND
click on it to compose a new, blank email to this email address
$from_and_compose_link =
$GLOBALS['phpgw']->msg->href_maketag($GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uicompose.compose'
+ '/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
// DO NOT USE msgball[] -
bosend will interpret this incorrectly as a reply or forward
-
.'&fldball[folder]='.$msgball['folder']
-
.'&fldball[acctnum]='.$msgball['acctnum']
- .'&to='.urlencode($from_plain)
-
.'&personal='.urlencode($from_personal)
+
'fldball[folder]'=>$msgball['folder'],
+
'fldball[acctnum]'=>$msgball['acctnum'],
+ 'to'=>urlencode($from_plain),
+
'personal'=>urlencode($from_personal),
// preserve these things for
when we return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))),
$from_personal);
// click on the little envelope image to add
this person/address to your address book
@@ -705,17 +705,17 @@
$to_real_name =
$GLOBALS['phpgw']->msg->href_maketag(
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uicompose.compose'
+ '/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
// DO NOT USE msgball[]
- bosend will interpret this incorrectly as a reply or forward
-
.'&fldball[folder]='.$msgball['folder']
-
.'&fldball[acctnum]='.$msgball['acctnum']
-
.'&to='.urlencode($to_plain)
-
.'&personal='.urlencode($to_personal)
+
'fldball[folder]'=>$msgball['folder'],
+
'fldball[acctnum]'=>$msgball['acctnum'],
+
'to'=>urlencode($to_plain),
+
'personal'=>urlencode($to_personal),
// preserve these
things for when we return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))),
$to_personal);
// I honestly think this needs some
attention here.. I feel this isn't used anymore like this..
@@ -724,11 +724,11 @@
$to_addybook_add =
$GLOBALS['phpgw']->msg->href_maketag(
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=addressbook.uiaddressbook.add_email'
-
.'&add_email='.urlencode($to_plain)
-
.'&name='.urlencode($to_personal)
-
.'&referer='.urlencode($get_back_here_url)),
+ '/index.php',array(
+
'menuaction'=>'addressbook.uiaddressbook.add_email',
+
'add_email'=>urlencode($to_plain),
+
'name'=>urlencode($to_personal),
+
'referer'=>urlencode($get_back_here_url))),
$sm_envelope_img);
// assemble the string and store for
later use (note to_extra_info also handles the spacing)
$to_data_array[$i] = $to_real_name
.$to_extra_info .$to_addybook_add;
@@ -776,27 +776,27 @@
$cc_extra_info = ' ';
}
$cc_real_name =
$GLOBALS['phpgw']->msg->href_maketag($GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uicompose.compose'
+ '/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
// DO NOT USE msgball -
bosend will interpret this the wrong way
//.'&'.$msgball['uri']
-
.'&fldball[folder]='.$msgball['folder']
-
.'&fldball[acctnum]='.$msgball['acctnum']
-
.'&to='.urlencode($cc_plain)
-
.'&personal='.urlencode($cc_personal)
+
'fldball[folder]'=>$msgball['folder'],
+
'fldball[acctnum]'=>$msgball['acctnum'],
+
'to'=>urlencode($cc_plain),
+
'personal'=>urlencode($cc_personal),
// preserve these
things for when we return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')),
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))),
$cc_personal);
$cc_addybook_add =
$GLOBALS['phpgw']->msg->href_maketag(
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=addressbook.uiaddressbook.add_email'
-
.'&add_email='.urlencode($cc_plain)
-
.'&name='.urlencode($cc_personal)
-
.'&referer='.urlencode($get_back_here_url)),
+ '/index.php',array(
+
'menuaction'=>'addressbook.uiaddressbook.add_email',
+
'add_email'=>urlencode($cc_plain),
+
'name'=>urlencode($cc_personal),
+
'referer'=>urlencode($get_back_here_url))),
$sm_envelope_img);
// assemble the string and store for
later use
@@ -854,26 +854,26 @@
}
// ---- Reply to First Presentable Part (needed for
Reply, ReplyAll, and Forward below) -----
- $first_presentable = '';
+ $first_presentable = array();
// what's the first presentable part?
// we do not want to reply quoting a blank paty, what
is the 1st part of this message that has real text
for ($i = 0; $i < count($this->part_nice); $i++)
{
if (($this->part_nice[$i]['m_description'] ==
'presentable')
- && ($first_presentable == '')
+ && (count($first_presentable) == 0)
&& ($this->part_nice[$i]['bytes'] > 5))
{
- $first_presentable =
'&msgball[part_no]='.$this->part_nice[$i]['m_part_num_mime'];
+ $first_presentable =
array('msgball[part_no]'=>$this->part_nice[$i]['m_part_num_mime']);
// and if it is qprint then we must
decode in the reply process
if
(stristr($this->part_nice[$i]['m_keywords'], 'qprint'))
{
- $first_presentable =
$first_presentable .'&encoding=qprint';
+
$first_presentable['encoding']='qprint';
}
elseif
(stristr($this->part_nice[$i]['m_keywords'], 'base64'))
{
// usually only spammers do
this, but *RARELY* the text message is base 64 encoded
// then we must decode in the
reply process
- $first_presentable =
$first_presentable .'&encoding=base64';
+
$first_presentable['encoding']='base64';
}
// also check for this mess...
if
(stristr($this->part_nice[$i]['m_keywords'], 'html'))
@@ -881,7 +881,7 @@
// hotmail.com, for example, is
(the ONLY?) mailer to BREAK RFC RULES and send
// out html parts WITHOUT the
required PLAIN part
// then we must decode in the
reply process
- $first_presentable =
$first_presentable .'&subtype=html';
+
$first_presentable['subtype']='html';
}
break;
}
@@ -903,73 +903,73 @@
// ---- Images and Hrefs For Reply, ReplyAll, Forward,
and Delete -----
$reply_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/reply','_on'),$this->xi['lang_reply'],'','','0');
$reply_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uicompose.compose'
- .'&action=reply'
- .'&'.$msgball['uri']
- .$first_presentable
+ '/index.php',array(
+ 'menuaction'=>'email.uicompose.compose',
+ 'action'=>'reply',
// preserve these things for when we
return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$msgball['uri']
+ +$first_presentable);
$href_reply =
$GLOBALS['phpgw']->msg->href_maketag_class($reply_url, $this->xi['lang_reply'],
'c_replybar');
$ilnk_reply =
$GLOBALS['phpgw']->msg->href_maketag($reply_url, $reply_img);
$replyall_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/reply-all','_on'),$this->xi['lang_reply_all'],'','','0');
$replyall_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uicompose.compose'
- .'&action=replyall'
- .'&'.$msgball['uri']
- .$first_presentable
+ '/index.php',array(
+ 'menuaction'=>'email.uicompose.compose',
+ 'action'=>'replyall',
// preserve these things for when we
return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$msgball['uri']
+ +$first_presentable);
$href_replyall =
$GLOBALS['phpgw']->msg->href_maketag_class($replyall_url,
$this->xi['lang_reply_all'], 'c_replybar');
$ilnk_replyall =
$GLOBALS['phpgw']->msg->href_maketag($replyall_url, $replyall_img);
$forward_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/forward','_on'),$this->xi['lang_forward'],'','','0');
$forward_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uicompose.compose'
- .'&action=forward'
- .'&'.$msgball['uri']
- .'&fwd_proc='.$fwd_proc
- .$first_presentable
+ '/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
+ 'action'=>'forward',
+ 'fwd_proc'=>$fwd_proc,
// preserve these things for when we
return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$msgball['uri']
+ +$first_presentable);
$href_forward =
$GLOBALS['phpgw']->msg->href_maketag_class($forward_url,
$this->xi['lang_forward'], 'c_replybar');
$ilnk_forward =
$GLOBALS['phpgw']->msg->href_maketag($forward_url, $forward_img);
$delete_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/delete-message','_on'),$this->xi['lang_delete'],'','','0');
$delete_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.boaction.delmov'
- .'&what=delete_single_msg'
- .'&'.$msgball['uri']
+ '/index.php',array(
+ 'menuaction'=>'email.boaction.delmov',
+ 'what'=>'delete_single_msg',
// preserve these things for when we
return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
- .$this->no_fmt);
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$this->no_fmt
+ +$msgball['uri']);
$href_delete=
$GLOBALS['phpgw']->msg->href_maketag_class($delete_url,
$this->xi['lang_delete'], 'c_replybar');
$ilnk_delete =
$GLOBALS['phpgw']->msg->href_maketag($delete_url, $delete_img);
$edit_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/compose-message-'.$this->icon_size,'_on'),$this->xi['lang_edit'],'','','0');
$edit_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uicompose.compose'
- .'&action=edit'
- .'&'.$msgball['uri']
- .$first_presentable
+ '/index.php',array(
+
'menuaction'=>'email.uicompose.compose',
+ 'action'=>'edit',
// preserve these things for when we
return to the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'))
+ +$msgball['uri']
+ +$first_presentable);
$href_edit =
$GLOBALS['phpgw']->msg->href_maketag_class($edit_url, $this->xi['lang_edit'],
'c_replybar');
$ilnk_edit =
$GLOBALS['phpgw']->msg->href_maketag($edit_url, $edit_img);
@@ -1141,13 +1141,14 @@
// if "vew_unformatted" if the url, then "&no_fmt=1"
will be added below
// other wise, this URL will be used unchanged
$view_option_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uimessage.message'
- .'&'.$msgball['uri']
+ '/index.php',array(
+ 'menuaction'=>'email.uimessage.message',
// preserve these things for when we return to
the message list after the send
-
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
-
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
-
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start')
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start'),
+ )
+ +$msgball['uri']
);
// (2) view headers option
@@ -1155,13 +1156,14 @@
$this_msgball = $msgball;
$this_msgball['part_no'] = 0;
$view_headers_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.boaction.get_attach'
-
.'&'.$msgball['uri'].'&msgball[part_no]='.$this_msgball['part_no']
- .'&type=text'
- .'&subtype=plain'
- .'&name=headers.txt'
- .'&encoding=7bit'
+ '/index.php',array(
+ 'menuaction'=>'email.boaction.get_attach',
+ 'msgball[part_no]'=>$this_msgball['part_no'],
+ 'type'=>'text',
+ 'subtype'=>'plain',
+ 'name'=>'headers.txt',
+ 'encoding'=>'7bit')
+ +$msgball['uri']
);
$view_headers_href = '<a href="'.$view_headers_url.'"
target="new">'.$this->xi['lang_view_headers'].'</a>';
$this->xi['view_headers_href'] = $view_headers_href;
@@ -1173,13 +1175,14 @@
$this_msgball = $msgball;
$this_msgball['part_no'] = 'raw_message';
$view_raw_message_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.boaction.get_attach'
-
.'&'.$msgball['uri'].'&msgball[part_no]='.$this_msgball['part_no']
- .'&type=text'
- .'&subtype=plain'
- .'&name=raw_message.txt'
- .'&encoding=7bit'
+ '/index.php',array(
+ 'menuaction'=>'email.boaction.get_attach',
+ 'msgball[part_no]'=>$this_msgball['part_no'],
+ 'type'=>'text',
+ 'subtype'=>'plain',
+ 'name'=>'raw_message.txt',
+ 'encoding'=>'7bit')
+ +$msgball['uri']
);
$view_raw_message_href = '<a
href="'.$view_raw_message_url.'"
target="new">'.$this->xi['lang_view_raw_message'].'</a>';
$this->xi['view_raw_message_href'] =
$view_raw_message_href;
@@ -1189,9 +1192,9 @@
// (4) view printer friendly version
$view_printable_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email','view_printable-'.$this->icon_size,'_on'),$this->xi['lang_view_printable'],'','','0');
$view_printable_url = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uimessage.printable'
- .'&'.$msgball['uri']
+ '/index.php',array(
+ 'menuaction'=>'email.uimessage.printable')
+ +$msgball['uri']
);
$view_printable_href = '<a
href="'.$view_printable_url.'"
target="new">'.$this->xi['lang_view_printable'].'</a>';
$this->xi['view_printable_href'] = $view_printable_href;
@@ -1509,9 +1512,9 @@
// -- View As HTML
Button With Special HTML RELATED handling
$view_html_form_action
= $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.boaction.view_html'
-
.'&'.$msgball['uri']
+
'/index.php',array(
+
'menuaction'=>'email.boaction.view_html')
+ +$msgball['uri']
);
// this means we *may*
have replaced, a guess, but better security
@@ -1552,11 +1555,11 @@
$part_encoding
= '';
}
$view_html_form_action
= $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.boaction.get_attach'
-
.'&'.$msgball['uri']
-
.'&msgball[part_no]='.$this->part_nice[$i]['m_part_num_mime']
-
.'&encoding=' .$part_encoding);
+
'/index.php',array(
+
'menuaction'=>'email.boaction.get_attach',
+
'msgball[part_no]'=>$this->part_nice[$i]['m_part_num_mime'],
+
'encoding'=>$part_encoding)
+
+$msgball['uri']);
$dsp =
'<p>'
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- class.mail_msg_wrappers.inc.php 13 Dec 2006 15:45:00 -0000 1.43
+++ class.mail_msg_wrappers.inc.php 13 Dec 2006 20:30:11 -0000 1.44
@@ -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.43 2006/12/13
15:45:00 sigurdne Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.44 2006/12/13
20:30:11 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -3322,10 +3322,10 @@
// we want the folder value to
be URLENCODED, so we need to re-urlencode it
$re_urlencoded_folder =
$this->prep_folder_out($got_args[$this_arg_name]['folder']);
$got_args[$this_arg_name]['folder'] = $re_urlencoded_folder;
-
$got_args[$this_arg_name]['uri'] =
-
'msgball[msgnum]='.$got_args[$this_arg_name]['msgnum']
-
.'&msgball[folder]='.$got_args[$this_arg_name]['folder']
-
.'&msgball[acctnum]='.$got_args[$this_arg_name]['acctnum'];
+
$got_args[$this_arg_name]['uri'] = array(
+
'msgball[msgnum]'=>$got_args[$this_arg_name]['msgnum'],
+
'msgball[folder]'=>$got_args[$this_arg_name]['folder'],
+
'msgball[acctnum]'=>$got_args[$this_arg_name]['acctnum']);
if
($this->debug_args_input_flow > 2) { $this->dbug->out(' * * (grab pref -
external)('.__LINE__.') made msgball URI, added it to msgball[]: DUMP:',
$got_args[$this_arg_name]); }
}
}
Index: hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- hook_home.inc.php 30 Aug 2006 16:25:28 -0000 1.60
+++ hook_home.inc.php 13 Dec 2006 20:30:11 -0000 1.61
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
* @subpackage hooks
- * @version $Id: hook_home.inc.php,v 1.60 2006/08/30 16:25:28 skwashd
Exp $
+ * @version $Id: hook_home.inc.php,v 1.61 2006/12/13 20:30:11 sigurdne
Exp $
*/
@@ -81,22 +81,22 @@
$data[] = array(
'text' => $subject,
'link' => $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uimessage.message'
- .'&'.$this_loop_msgball['uri']
+ '/index.php',array(
+
'menuaction'=>'email.uimessage.message')
+ +$this_loop_msgball['uri']
)
);
}
// COMPOSE NEW email link
$compose_link = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uicompose.compose'
+ '/index.php',array(
+ 'menuaction'=>'email.uicompose.compose',
// this data tells us where to return
to after sending a message
// since we started from home page,
send can not (at this time) take us back there
// so instead take user to INBOX for
the default account (acctnum 0) after clicking the send button
- .'&fldball[folder]=INBOX'
- .'&fldball[acctnum]=0'
+ 'fldball[folder]'=>'INBOX',
+ 'fldball[acctnum]'=>'0')
);
$compose_href = '<a href="'.$compose_link.'">'.lang('Compose
New').'</a>'."\r\n";
@@ -142,7 +142,7 @@
$my_widgets = CreateObject('email.html_widgets');
$my_widgets->new_form();
$my_widgets->set_form_name('switchbox');
-
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
+
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')));
$my_widgets->set_form_method('post');
$form_folder_switch_opentag = $my_widgets->get_form();
$folder_switch_combobox =
$my_widgets->all_folders_combobox('switchbox');
@@ -158,7 +158,7 @@
}
// how to display this data
- if (is_object($GLOBALS['phpgw']->xslttpl))
+ /* if (is_object($GLOBALS['phpgw']->xslttpl))
{
$phpgw_before_xslt = False;
}
@@ -166,6 +166,8 @@
{
$phpgw_before_xslt = True;
}
+ */
+ $phpgw_before_xslt = True;
// now display according to the version of the template system
in use
if ($phpgw_before_xslt == True)
@@ -221,6 +223,7 @@
$app_id =
$GLOBALS['phpgw']->applications->name2id('email');
$GLOBALS['portal_order'][] = $app_id;
+
$GLOBALS['phpgw']->portalbox->set_params(
array(
'app_id' => $app_id,
- [Phpgroupware-cvs] email/inc class.bomessage.inc.php class.mail_ms...,
Sigurd Nes <=