[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.bocompose.inc.php hook_notifywi...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.bocompose.inc.php hook_notifywi... |
|
Date: |
Thu, 14 Dec 2006 15:09:30 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/14 15:09:30
Modified files:
inc : class.bocompose.inc.php
hook_notifywindow.inc.php
class.uisearch.inc.php
class.ui_mail_debug.inc.php
class.boaction.inc.php class.uifilters.inc.php
class.bofilters.inc.php class.bofolder.inc.php
class.svc_nextmatches.inc.php
class.boindex.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/email/inc/hook_notifywindow.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uisearch.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.ui_mail_debug.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boaction.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifilters.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bofilters.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bofolder.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.svc_nextmatches.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boindex.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
Patches:
Index: class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bocompose.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.bocompose.inc.php 11 May 2005 14:23:59 -0000 1.11
+++ class.bocompose.inc.php 14 Dec 2006 15:09:30 -0000 1.12
@@ -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.bocompose.inc.php,v 1.11 2005/05/11 14:23:59
powerstat Exp $
+ * @version $Id: class.bocompose.inc.php,v 1.12 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -82,24 +82,23 @@
// generally, msgball arg exists when
reply,replyall, or forward is being done
// if it exists, preserve (carry forward) its
"folder" "action" and "acctnum" values
$send_btn_action = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction='.$menuaction_target
- //.'&action=forward'
-
.'&action='.$GLOBALS['phpgw']->msg->get_arg_value('action')
- .'&'.$msgball['uri']
+ '/index.php',array(
+
'menuaction'=>$menuaction_target,
+ //'action'=>'forward',
+
'action'=>$GLOBALS['phpgw']->msg->get_arg_value('action'),
// this is used to preserve
these values when we return to folder 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'),
// this is somewhat redundant
in this particular case
-
.'&orig_action='.$GLOBALS['phpgw']->msg->recall_desired_action()
+
'orig_action'=>$GLOBALS['phpgw']->msg->recall_desired_action())
+ +$msgball['uri']
);
if
(($GLOBALS['phpgw']->msg->get_isset_arg('action'))
&&
($GLOBALS['phpgw']->msg->get_arg_value('action') == 'forward')
&&
($GLOBALS['phpgw']->msg->get_isset_arg('fwd_proc')))
{
- $send_btn_action = $send_btn_action
-
.'&fwd_proc='.$GLOBALS['phpgw']->msg->get_arg_value('fwd_proc');
+ $send_btn_action['fwd_proc'] =
$GLOBALS['phpgw']->msg->get_arg_value('fwd_proc');
}
}
elseif
($GLOBALS['phpgw']->msg->get_isset_arg('fldball'))
@@ -117,16 +116,16 @@
// it never holds a "msgnum" value.
$fldball =
$GLOBALS['phpgw']->msg->get_arg_value('fldball');
$send_btn_action = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction='.$menuaction_target
+ '/index.php',array(
+
'menuaction'=>$menuaction_target,
// this is used to preserve
these values when we return to folder list after the send
-
.'&fldball[folder]='.$fldball['folder']
-
.'&fldball[acctnum]='.$fldball['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')
+
'fldball[folder]'=>$fldball['folder'],
+
'fldball[acctnum]'=>$fldball['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'),
// when this hits bosend it is
useful to know if it is a reply or not for linebreak purposes
-
.'&orig_action='.$GLOBALS['phpgw']->msg->recall_desired_action()
+
'orig_action'=>$GLOBALS['phpgw']->msg->recall_desired_action())
);
}
else
@@ -137,16 +136,16 @@
// is depreciated, fallback procedure that does
not necessarily preserve and
// pass on precise acctnum and folder value data
$send_btn_action = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction='.$menuaction_target
+ '/index.php',array(
+
'menuaction'=>$menuaction_target,
// this is used to preserve
these values when we return to folder list after the send
-
.'&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')
+
'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'),
// when this hits bosend it is
useful to know if it is a reply or not for linebreak purposes
-
.'&orig_action='.$GLOBALS['phpgw']->msg->recall_desired_action()
+
'orig_action'=>$GLOBALS['phpgw']->msg->recall_desired_action())
);
}
return $send_btn_action;
Index: hook_notifywindow.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/hook_notifywindow.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- hook_notifywindow.inc.php 11 May 2005 14:08:27 -0000 1.14
+++ hook_notifywindow.inc.php 14 Dec 2006 15:09:30 -0000 1.15
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package email
* @subpackage hooks
- * @version $Id: hook_notifywindow.inc.php,v 1.14 2005/05/11 14:08:27
powerstat Exp $
+ * @version $Id: hook_notifywindow.inc.php,v 1.15 2006/12/14 15:09:30
sigurdne Exp $
*/
$d1 = strtolower(substr(APP_INC,0,3));
@@ -56,7 +56,7 @@
echo ' <!-- Activate Cloaking Device'."\n";
echo ' function CheckEmail()'."\n";
echo ' {'."\n";
- echo '
window.opener.document.location.href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index').'";'."\n";
+ echo '
window.opener.document.location.href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')).'";'."\n";
echo ' }'."\n";
echo ' //-->'."\n";
echo ' </script>'."\n";
Index: class.uisearch.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uisearch.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.uisearch.inc.php 13 Dec 2006 14:57:20 -0000 1.5
+++ class.uisearch.inc.php 14 Dec 2006 15:09:30 -0000 1.6
@@ -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.uisearch.inc.php,v 1.5 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uisearch.inc.php,v 1.6 2006/12/14 15:09:30
sigurdne Exp $
*/
@@ -377,7 +377,7 @@
$t->set_var('form_name',
'delmov_'.$search_vars['fldball']['folder']);
# set form action
- $t->set_var('delmov_action',
$GLOBALS['phpgw']->link('/index.php', 'menuaction=email.boaction.delmov'));
+ $t->set_var('delmov_action',
$GLOBALS['phpgw']->link('/index.php',
array('menuaction'=>'email.boaction.delmov')));
$t->set_var("folder",
$search_vars['fldball']['folder']);
@@ -396,7 +396,7 @@
$t->set_var('checkbox_val',
'msgball[msgnum]='.$search_results[$i].'&msgball[folder]='.urlencode($GLOBALS['phpgw']->msg->get_folder_long($search_vars['fldball']['folder'])).'&msgball[acctnum]='.$search_vars['fldball']['acctnum']);
$t->set_var("from", $header_info->fromaddress);
- $msg_link =
$GLOBALS['phpgw']->link('/index.php',
'menuaction=email.uimessage.message&msgball[msgnum]='.$search_results[$i].'&msgball[folder]='.$search_vars['fldball']['folder'].'&msgball[acctnum]='.$search_vars['fldball']['acctnum']);
+ $msg_link =
$GLOBALS['phpgw']->link('/index.php',
array('menuaction'=>'email.uimessage.message','msgball[msgnum]'=>$search_results[$i],'msgball[folder]'=>$search_vars['fldball']['folder'],'msgball[acctnum]'=>$search_vars['fldball']['acctnum']));
$t->set_var("msg_link", $msg_link);
$t->set_var("subject", $header_info->subject);
$t->set_var("date", strftime("%D",
$header_info->udate));
Index: class.ui_mail_debug.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.ui_mail_debug.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.ui_mail_debug.inc.php 11 May 2005 19:09:36 -0000 1.5
+++ class.ui_mail_debug.inc.php 14 Dec 2006 15:09:30 -0000 1.6
@@ -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.ui_mail_debug.inc.php,v 1.5 2005/05/11 19:09:36
powerstat Exp $
+ * @version $Id: class.ui_mail_debug.inc.php,v 1.6 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -121,7 +121,7 @@
@discussion Uncomment the "public_functions" line to enable the
Email Debug Page.
Should be disabled by default, this is a developers tool. If
enabled, call this function to
display the page.
- @example /index.php?menuaction=email.ui_mail_debug.index
+ @example
/index.php?array('menuaction'=>'email.ui_mail_debug.index
@author Angles
*/
function index()
@@ -152,46 +152,46 @@
// make a list of available debub calls
// Enviornment data
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=phpinfo'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'phpinfo')));
//$this->widgets->set_href_target('new');
$this->widgets->set_href_clickme('phpinfo page');
$this->tpl->set_var('func_E1',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=get_defined_constants'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'get_defined_constants')));
$this->widgets->set_href_target('new');
$this->widgets->set_href_clickme('get_defined_constants
DUMP');
$this->tpl->set_var('func_E2',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=globals_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_dump')));
$this->widgets->set_href_target('new');
$this->widgets->set_href_clickme('dump the entire
globals[] array');
$this->tpl->set_var('func_E3',
$this->widgets->get_href());
// DUMP functions
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=common.debug_list_core_functions'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'common.debug_list_core_functions')));
$this->widgets->set_href_clickme('common.debug_list_core_functions');
$this->tpl->set_var('func_D1',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=globals_phpgw_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_dump')));
$this->widgets->set_href_clickme('dump the entire
globals[phpgw] structure');
$this->tpl->set_var('func_D2',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=globals_phpgw_info_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_info_dump')));
$this->widgets->set_href_clickme('dump the entire
globals[phpgw_info] structure');
$this->tpl->set_var('func_D3',
$this->widgets->get_href());
-
//$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=globals_phpgw_session_dump'));
+
//$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_session_dump')));
//$this->widgets->set_href_clickme('dump the entire
globals[phpgw_session] structure');
//$this->tpl->set_var('func_D4',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=ref_session_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'ref_session_dump')));
$this->widgets->set_href_clickme('dump the entire
msg->ref_SESSION structure');
$this->tpl->set_var('func_D4',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=msg_object_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'msg_object_dump')));
$this->widgets->set_href_clickme('dump the entire
globals[phpgw]->msg object');
$this->tpl->set_var('func_D5',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=preferences_object_dump'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'preferences_object_dump')));
$this->widgets->set_href_clickme('dump the entire
$GLOBALS[phpgw]->preferences object');
$this->tpl->set_var('func_D6',
$this->widgets->get_href());
@@ -232,27 +232,27 @@
$this->tpl->set_var('func_I7',
$this->widgets->get_href());
// other stuff
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=copyinteresting'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'copyinteresting')));
$this->widgets->set_href_clickme('copy emails in BOB
interesting to Local folder (no workie)');
$this->tpl->set_var('func_O1',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=env_test'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'env_test')));
$this->widgets->set_href_clickme('utility for testing
env code parts');
$this->tpl->set_var('func_O2',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=db_admin_make_table'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_make_table')));
$this->widgets->set_href_clickme('Create the email DB
table');
$this->tpl->set_var('func_O3',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=db_admin_rm_table'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_rm_table')));
$this->widgets->set_href_clickme('Delete the email DB
table');
$this->tpl->set_var('func_O4',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=db_admin_clear_entire_table'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_clear_entire_table')));
$this->widgets->set_href_clickme('Wipe the email DB
table');
$this->tpl->set_var('func_O5',
$this->widgets->get_href());
-
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','menuaction=email.ui_mail_debug.index&dfunc=db_am_table_exists'));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_am_table_exists')));
$this->widgets->set_href_clickme('Check if email DB
table exists');
$this->tpl->set_var('func_O6',
$this->widgets->get_href());
@@ -526,7 +526,7 @@
$boaction_obj->set_expected_args($expected_args);
// the URI of the redirect string contains data needed
for the next page view
- //$redirect_to =
'/mail/index_php?menuaction=email.uiindex.index&fldball[folder]=INBOX&fldball[acctnum]=4&sort=1&order=1&start=0';
+ //$redirect_to =
'/mail/index_php?array('menuaction'=>'email.uiindex.index&fldball[folder]=INBOX&fldball[acctnum]=4&sort=1&order=1&start=0';
$redirect_to =
'/mail/index_php?menuaction=email.uimessage.message&msgball[msgnum]=102&msgball[folder]=INBOX&msgball[acctnum]=4&sort=1&order=1&start=0';
$boaction_obj->set_new_args_uri($redirect_to);
Index: class.boaction.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boaction.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.boaction.inc.php 11 May 2005 14:08:27 -0000 1.20
+++ class.boaction.inc.php 14 Dec 2006 15:09:30 -0000 1.21
@@ -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.boaction.inc.php,v 1.20 2005/05/11 14:08:27
powerstat Exp $
+ * @version $Id: class.boaction.inc.php,v 1.21 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -30,7 +30,7 @@
// class var to hold content to be downloaded
var $output_data='';
// if bomessage wants this preserves, we detect that and store
it here
- var $no_fmt='';
+ var $no_fmt=array();
var $debug = 0;
//var $debug = 3;
//var $debug = 4;
@@ -277,15 +277,15 @@
$return_to_fldball['acctnum'] =
$delmov_list[0]['acctnum'];
$this->redirect_to =
$GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$return_to_fldball['folder']
-
.'&fldball[acctnum]='.$return_to_fldball['acctnum']
-
.'&tm='.$tm
-
.'&tf='.$tf
-
.'&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]'=>$return_to_fldball['folder'],
+
'fldball[acctnum]'=>$return_to_fldball['acctnum'],
+
'tm'=>$tm,
+
'tf'=>$tf,
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start')));
if ($this->debug > 1) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.delmov ('.__LINE__.'): NOT
called by uimessage, determination of $this->redirect_to :
['.$this->redirect_to.']<br />'); }
}
@@ -356,14 +356,14 @@
$totaldeleted = $i;
//$GLOBALS['phpgw']->msg->phpgw_expunge();
$this->redirect_to = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out($was_in_folder)
-
.'&fldball[acctnum]='.$was_in_folder_acctnum
-
.'&td='.$totaldeleted
-
.'&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($was_in_folder),
+
'fldball[acctnum]'=>$was_in_folder_acctnum,
+
'td'=>$totaldeleted,
+
'sort'=>$GLOBALS['phpgw']->msg->get_arg_value('sort'),
+
'order'=>$GLOBALS['phpgw']->msg->get_arg_value('order'),
+
'start'=>$GLOBALS['phpgw']->msg->get_arg_value('start')));
/*
// Experimental:
// NO REDIRECT - DIRECTLY MANUFACTURE THE NEXT
PAGE VIEW RIGHT NOW
@@ -435,7 +435,7 @@
if
(($GLOBALS['phpgw']->msg->get_isset_arg('no_fmt'))
&&
($GLOBALS['phpgw']->msg->get_arg_value('no_fmt') != ''))
{
- $this->no_fmt = '&no_fmt=1';
+ $this->no_fmt = array('no_fmt'=>1);
}
if ($this->debug > 0) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.delmov ('.__LINE__.'):
get_arg_value(what) == "delete_single_msg") <br />'); }
// called by clicking the "X" dutton while
reading an individual message
@@ -450,13 +450,13 @@
{
$this->redirect_to =
$GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uimessage.message'
-
.'&'.$nav_data['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']);
}
else
{
@@ -465,13 +465,13 @@
// to move to the nex message instead
of going to index....this way we save clicks
// if anyone has an issue with this,
ill make a preference for it
$this->redirect_to =
$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')));
}
if ($this->debug > 1) {
$GLOBALS['phpgw']->msg->dbug->out('email.boaction.delmov ('.__LINE__.'):
delete_single_msg: pre-delete determination of $this->redirect_to :
['.$this->redirect_to.']<br />'); }
@@ -807,11 +807,11 @@
$new_folder =
$new_args_env['msgball']['folder'];
// IMITATION: during grab_args_gpc, the code
add an element [uri] to the existing msgball
// NOTE that for this uri element, the "folder"
string shoulf be urlencoded
- $new_uri_element =
'msgball[msgnum]='.$new_args_env['msgball']['msgnum']
+ $new_uri_element =
array('msgball[msgnum]'=>$new_args_env['msgball']['msgnum'],
//.'&msgball[folder]='.urlencode($new_args_env['msgball']['folder'])
//.'&msgball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out($new_args_env['msgball']['folder'])
-
.'&msgball[folder]='.$new_args_env['msgball']['folder']
-
.'&msgball[acctnum]='.$new_args_env['msgball']['acctnum'];
+
'msgball[folder]'=>$new_args_env['msgball']['folder'],
+
'msgball[acctnum]'=>$new_args_env['msgball']['acctnum']);
$new_args_env['msgball']['uri'] =
$new_uri_element;
}
else
Index: class.uifilters.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifilters.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- class.uifilters.inc.php 13 Dec 2006 14:57:20 -0000 1.18
+++ class.uifilters.inc.php 14 Dec 2006 15:09:30 -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.uifilters.inc.php,v 1.18 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uifilters.inc.php,v 1.19 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -173,19 +173,22 @@
//
'menuaction=email.uifilters.filters_edit');
$form_edit_filter_action = $GLOBALS['phpgw']->link(
'/index.php',
-
'menuaction=email.bofilters.process_submitted_data');
+
array('menuaction'=>'email.bofilters.process_submitted_data'));
$form_cancel_action = $GLOBALS['phpgw']->link(
'/index.php',
-
'menuaction=email.uifilters.filters_list');
+
array('menuaction'=>'email.uifilters.filters_list'));
$apply_this_filter_url = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.bofilters.do_filter'
-
.'&filter_num='.$filter_num);
+
'/index.php',array('menuaction'=>'email.bofilters.do_filter',
+
'filter_num'=>$filter_num));
$apply_this_filter_href = '<a
href="'.$apply_this_filter_url.'">'.lang('<b>*apply*</b> this filter').'</a>';
- $test_this_filter_url =
$apply_this_filter_url.'&filter_test=1';
+ $test_this_filter_url = $GLOBALS['phpgw']->link(
+
'/index.php',array('menuaction'=>'email.bofilters.do_filter',
+
'filter_num'=>$filter_num,
+
'filter_test'=>1));
+
$test_this_filter_href = '<a
href="'.$test_this_filter_url.'">'.lang('Test Run This Filter').'</a>';
$this->tpl->set_var('apply_this_filter_href',$apply_this_filter_href);
@@ -738,17 +741,17 @@
if ($i != 0)
{
$filters_list[$i]['move_up_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.move_up'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.move_up',
+
'filter_num'=>$i));
$filters_list[$i]['move_up_href'] = '<a
href="'.$filters_list[$i]['move_up_url'].'">'.lang('Move Up').'</a>';
}
else
{
$filters_list[$i]['move_up_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.move_up'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.move_up',
+
'filter_num'=>$i));
$filters_list[$i]['move_up_href'] = '<a
href="'.$filters_list[$i]['move_up_url'].'"></a>';
}
@@ -756,31 +759,31 @@
if ($i != $loops-1)
{
$filters_list[$i]['move_down_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.move_down'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.move_down',
+
'filter_num'=>$i));
$filters_list[$i]['move_down_href'] = '<a
href="'.$filters_list[$i]['move_down_url'].'">'.lang('Move Down').'</a>';
}
else
{
$filters_list[$i]['move_down_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.move_down'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.move_down',
+
'filter_num'=>$i));
$filters_list[$i]['move_down_href'] = '<a
href="'.$filters_list[$i]['move_down_url'].'"></a>';
}
// end of changes (Sam Przyswa)
$filters_list[$i]['edit_url'] =
$GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_edit'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.uifilters.filters_edit',
+
'filter_num'=>$i));
$filters_list[$i]['edit_href'] = '<a
href="'.$filters_list[$i]['edit_url'].'">'.lang('Edit').'</a>';
$filters_list[$i]['delete_url'] =
$GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.delete_filter'
-
.'&filter_num='.$i);
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.delete_filter',
+
'filter_num'=>$i));
$filters_list[$i]['delete_href'] = '<a
href="'.$filters_list[$i]['delete_url'].'">'.lang('Delete').'</a>';
$this->tpl->set_var('tr_color',$tr_color);
@@ -806,9 +809,9 @@
}
$add_new_filter_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_edit'
-
.'&filter_num='.$this->bo->add_new_filter_token);
+
'/index.php',array(
+
'menuaction'=>'email.uifilters.filters_edit',
+
'filter_num'=>$this->bo->add_new_filter_token));
$add_new_filter_href = '<a
href="'.$add_new_filter_url.'">'.lang('New Filter').'</a>';
$this->tpl->set_var('add_new_filter_href',$add_new_filter_href);
@@ -819,12 +822,16 @@
// TEST AND APPLY LINKS
$run_all_filters_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.bofilters.do_filter');
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.do_filter'));
$run_all_filters_href = '<a
href="'.$run_all_filters_url.'">'.lang('<b>APPLY ALL</b> Filters').'</a>';
$this->tpl->set_var('run_all_filters_href',$run_all_filters_href);
- $test_all_filters_url =
$run_all_filters_url.'&filter_test=1';
+ $test_all_filters_url = $GLOBALS['phpgw']->link(
+
'/index.php',array(
+
'menuaction'=>'email.bofilters.do_filter',
+
'filter_test'=>1));
+
$test_all_filters_href = '<a
href="'.$test_all_filters_url.'">'.lang('Test All Filters').'</a>';
$this->tpl->set_var('test_all_filters_href',$test_all_filters_href);
Index: class.bofilters.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bofilters.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.bofilters.inc.php 11 May 2005 14:23:59 -0000 1.17
+++ class.bofilters.inc.php 14 Dec 2006 15:09:30 -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.bofilters.inc.php,v 1.17 2005/05/11 14:23:59
powerstat Exp $
+ * @version $Id: class.bofilters.inc.php,v 1.18 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -335,8 +335,8 @@
$this->save_all_filters_to_repository();
// redirect user back to filters list page
$take_me_to_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_list');
+
'/index.php',array(
+
'menuaction'=>'email.uifilters.filters_list'));
if ($this->debug > 0 || $this->debug_set_prefs > 0 ) {
echo 'bofilters.move_up: LEAVING with redirect to: <br />'.$take_me_to_url.'<br
/>'; }
Header('Location: ' . $take_me_to_url);
}
@@ -377,8 +377,8 @@
$this->save_all_filters_to_repository();
// redirect user back to filters list page
$take_me_to_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_list');
+
'/index.php',array(
+
'menuaction'=>'email.uifilters.filters_list'));
if ($this->debug_set_prefs > 0) { echo
'bofilters.move_down: LEAVING with redirect to: <br />'.$take_me_to_url.'<br
/>'; }
Header('Location: ' . $take_me_to_url);
}
@@ -824,8 +824,8 @@
// redirect user back to filters list page
$take_me_to_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
'menuaction=email.uifilters.filters_list');
+
'/index.php',array(
+
'menuaction'=>'email.uifilters.filters_list'));
if ($this->debug_set_prefs > 0) { echo
'bofilters.save_all_filters_to_repository: almost LEAVING, about to issue a
redirect to:<br />'.$take_me_to_url.'<br />'; }
if ($this->debug_set_prefs > 1)
@@ -965,9 +965,9 @@
$GLOBALS['phpgw']->msg->end_request();
if ($this->debug > 0) { echo
'bofilters.do_filter('.__LINE__.'): LEAVING<br />'; }
$take_me_to_url = $GLOBALS['phpgw']->link(
-
'/index.php',
-
//'menuaction=email.uifilters.filters_list');
-
'menuaction=email.uiindex.index');
+
'/index.php',array(
+
//'menuaction'=>'email.uifilters.filters_list'));
+
'menuaction'=>'email.uiindex.index'));
$take_me_to_href = '<a href="'.$take_me_to_url.'">
'.lang('Go Back').' </a>';
//Header('Location: ' . $take_me_to_url);
echo '<br
/><p>'.' '.$take_me_to_href.'</p><br />';
@@ -1982,7 +1982,7 @@
// preserve the folder we searched (raw posted
source_account was never preped in here, so it's ok to send out as is)
$mlist_hidden_vars .= '<input type="hidden"
name="folder" value="'.$this->filters[0]['source_account'].'">'."\r\n";
// make the first prev next last arrows
-
$this->template->set_var('mlist_submit_form_action',
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.mlist'));
+
$this->template->set_var('mlist_submit_form_action',
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.mlist')));
$this->template->set_var('mlist_hidden_vars',$mlist_hidden_vars);
$this->template->parse('V_mlist_submit_form','B_mlist_submit_form');
Index: class.bofolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bofolder.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.bofolder.inc.php 11 May 2005 14:23:59 -0000 1.11
+++ class.bofolder.inc.php 14 Dec 2006 15:09:30 -0000 1.12
@@ -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.bofolder.inc.php,v 1.11 2005/05/11 14:23:59
powerstat Exp $
+ * @version $Id: class.bofolder.inc.php,v 1.12 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -342,10 +342,10 @@
$this->xi['folder_list_display'][$i]['list_backcolor'] = $tr_color;
$this->xi['folder_list_display'][$i]['list_backcolor_class'] = $tr_color_class;
$this->xi['folder_list_display'][$i]['folder_link'] = $GLOBALS['phpgw']->link(
- '/index.php',
-
'menuaction=email.uiindex.index'
-
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out($folder_long)
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
'/index.php',array(
+
'menuaction'=>'email.uiindex.index',
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out($folder_long),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
if
(($GLOBALS['phpgw']->msg->get_isset_arg('show_long') == True)
&&
($GLOBALS['phpgw']->msg->get_arg_value('show_long') != ''))
@@ -401,8 +401,8 @@
// ---- Set Up Form Variables ---
$this->xi['form_action'] = $GLOBALS['phpgw']->link(
- '/index.php',
- 'menuaction=email.uifolder.folder');
+ '/index.php',array(
+ 'menuaction'=>'email.uifolder.folder'));
//$GLOBALS['phpgw']->template->set_var('all_folders_listbox',$GLOBALS['phpgw']->msg->all_folders_listbox('','','',False));
//$GLOBALS['phpgw']->template->set_var('select_name_rename','source_folder');
@@ -426,13 +426,18 @@
if (($GLOBALS['phpgw']->msg->get_isset_arg('show_long') == true) &&
($GLOBALS['phpgw']->msg->get_arg_value('show_long') != '')) {
$this->xi['view_txt'] = lang('Show short names');
// $this->xi['view_short_lnk'] =
$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/folder.php');
- $this->xi['view_lnk'] = $GLOBALS['phpgw']->link('/index.php',
- 'menuaction=email.uifolder.folder' . '&fldball[folder]=' .
$GLOBALS['phpgw']->msg->prep_folder_out() . '&fldball[acctnum]=' .
$GLOBALS['phpgw']->msg->get_acctnum());
+ $this->xi['view_lnk'] = $GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>'email.uifolder.folder',
+
'fldball[folder]'=> $GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
} else {
$this->xi['view_txt'] = lang('Show long names');
// $this->xi['view_long_lnk'] =
$GLOBALS['phpgw']->link('/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/folder.php?show_long=1');
- $this->xi['view_lnk'] = $GLOBALS['phpgw']->link('/index.php',
- 'menuaction=email.uifolder.folder' . '&fldball[folder]=' .
$GLOBALS['phpgw']->msg->prep_folder_out() . '&fldball[acctnum]=' .
$GLOBALS['phpgw']->msg->get_acctnum() . '&show_long=1');
+ $this->xi['view_lnk'] = $GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>'email.uifolder.folder',
+
'fldball[folder]'=> $GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=> $GLOBALS['phpgw']->msg->get_acctnum(),
+
'show_long'=>1));
}
// Depreciated
// $this->xi['view_long_txt'] = lang('long names');
Index: class.svc_nextmatches.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.svc_nextmatches.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.svc_nextmatches.inc.php 13 Dec 2006 15:45:00 -0000 1.6
+++ class.svc_nextmatches.inc.php 14 Dec 2006 15:09:30 -0000 1.7
@@ -8,7 +8,7 @@
* @copyright Copyright (C) 2000-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.svc_nextmatches.inc.php,v 1.6 2006/12/13 15:45:00
sigurdne Exp $
+ * @version $Id: class.svc_nextmatches.inc.php,v 1.7 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -90,7 +90,7 @@
}
}
unset($extra);
- $extra = (isset($new_extra)?$new_extra:'');
+ $extra = (isset($new_extra)?$new_extra:array());
unset($new_extra);
return $extra;
}
@@ -209,7 +209,7 @@
}
$extravar['order'] =$our_order;
- $extravar['sort']=$new_sort.$extra;
+ $extravar['sort']=$new_sort;
//$extravar =
$prog[1].'&order='.$our_order.'&sort='.$new_sort.$extra;
//echo 'show_sort_order_mail: $extravar
['.serialize($extravar).'] <br />';
@@ -218,7 +218,7 @@
// in thise cases the menuaction that appears in the
url remains from the PREVIOUS action, not the object call produced next page
//$link =
($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));
//$link =
$GLOBALS['phpgw']->link($program,'email.index.uiindex'.$extravar);
- $link = $GLOBALS['phpgw']->link($prog[0],$extravar);
+ $link =
$GLOBALS['phpgw']->link($prog[0],$extravar+$extra);
//echo 'show_sort_order_mail: $link
['.serialize($link).'] <br />';
return '<a href="' .$link .'">' .$text .'</a>';
Index: class.boindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.boindex.inc.php 13 Dec 2006 14:57:20 -0000 1.34
+++ class.boindex.inc.php 14 Dec 2006 15:09:30 -0000 1.35
@@ -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.boindex.inc.php,v 1.34 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.boindex.inc.php,v 1.35 2006/12/14 15:09:30
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -770,19 +770,19 @@
'3',
$this->xi['default_order'],
$GLOBALS['phpgw']->msg->get_arg_value('order'),
-
'/index.php?menuaction=email.uiindex.index',
- $this->xi['lang_subject'],
-
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum()
+
'/index.php?menuaction=email.uiindex.index', // Sigurd: keep this as string
+ $this->xi['lang_subject'],array(
+
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum())
);
$this->xi['hdr_date'] =
$this->svc_nextmatches->show_sort_order_mail
($GLOBALS['phpgw']->msg->get_arg_value('sort'),'1',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php?menuaction=email.uiindex.index',$this->xi['lang_date'],
-
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
$this->xi['hdr_size'] =
$this->svc_nextmatches->show_sort_order_mail($GLOBALS['phpgw']->msg->get_arg_value('sort'),'6',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php?menuaction=email.uiindex.index',$this->xi['lang_size'],
-
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
// are we IN THE SENT folder or not
//if (
$GLOBALS['phpgw']->msg->get_folder_short($GLOBALS['phpgw']->msg->get_arg_value('folder'))
@@ -799,15 +799,15 @@
{
// for every folder EXCEPT the sent folder, we
display FROM data in this column
$this->xi['hdr_from'] =
$this->svc_nextmatches->show_sort_order_mail($GLOBALS['phpgw']->msg->get_arg_value('sort'),'2',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php?menuaction=email.uiindex.index',$this->xi['lang_from'],
-
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
}
else
{
// this is for SENT FOLDER use only, where we
display "To" data instead of "From" as with all the other folders, SORTTO = 4
$this->xi['hdr_from'] =
$this->svc_nextmatches->show_sort_order_mail($GLOBALS['phpgw']->msg->get_arg_value('sort'),'4',$this->xi['default_order'],$GLOBALS['phpgw']->msg->get_arg_value('order'),'/index.php?menuaction=email.uiindex.index',$this->xi['lang_to'],
-
'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
-
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
+
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
+
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
}
$this->xi['hdr_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.bocompose.inc.php hook_notifywi...,
Sigurd Nes <=