[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email compose.php index.php inc/class.boaction....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email compose.php index.php inc/class.boaction.... |
|
Date: |
Fri, 15 Dec 2006 15:24:45 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/15 15:24:45
Modified files:
. : compose.php index.php
inc : class.boaction.inc.php class.bocompose.inc.php
class.bofilters.inc.php class.bofolder.inc.php
class.boindex.inc.php class.bomessage.inc.php
class.email_service.inc.php
class.html_widgets.inc.php
class.mail_dcom.inc.php
class.mail_msg_base.inc.php
class.mail_msg_display.inc.php
class.mail_msg_wrappers.inc.php
class.so_mail_msg.inc.php
class.svc_nextmatches.inc.php
class.ui_mail_debug.inc.php
class.uicompose.inc.php class.uifilters.inc.php
class.uifolder.inc.php class.uiindex.inc.php
class.uijsaddressbook.inc.php
class.uimessage.inc.php
class.uipreferences.inc.php
class.uisearch.inc.php hook_home.inc.php
hook_notifywindow.inc.php
templates/base : index_main_b0_l2.tpl
Log message:
Rollback 3 weeks of intence work
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/compose.php?cvsroot=phpgroupware&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/email/index.php?cvsroot=phpgroupware&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boaction.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bofilters.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bofolder.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.boindex.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.bomessage.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.email_service.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.html_widgets.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_dcom.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_display.inc.php?cvsroot=phpgroupware&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.so_mail_msg.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.svc_nextmatches.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.ui_mail_debug.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifilters.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uifolder.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uiindex.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uijsaddressbook.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uimessage.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uipreferences.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.uisearch.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/email/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/email/inc/hook_notifywindow.inc.php?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/email/templates/base/index_main_b0_l2.tpl?cvsroot=phpgroupware&r1=1.4&r2=1.5
Patches:
Index: compose.php
===================================================================
RCS file: /sources/phpgroupware/email/compose.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- compose.php 15 Dec 2006 10:44:17 -0000 1.55
+++ compose.php 15 Dec 2006 15:24:44 -0000 1.56
@@ -9,7 +9,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: compose.php,v 1.55 2006/12/15 10:44:17 sigurdne Exp $
+ * @version $Id: compose.php,v 1.56 2006/12/15 15:24:44 sigurdne Exp $
* @internal Based on Aeromail http://the.cushman.net/
*/
@@ -39,41 +39,40 @@
// time limit should be controlled elsewhere
//@set_time_limit(0);
- $pass_the_ball_uri = array();
+ $pass_the_ball_uri = '';
if ($GLOBALS['phpgw']->msg->get_isset_arg('fldball'))
{
$my_fldball = $GLOBALS['phpgw']->msg->get_arg_value('fldball');
- $pass_the_ball_uri =
array('fldball[folder]'=>$my_fldball['folder'],
-
'fldball[acctnum]'=>$my_fldball['acctnum']);
+ $pass_the_ball_uri = '&fldball[folder]='.$my_fldball['folder']
+
.'&fldball[acctnum]='.$my_fldball['acctnum'];
}
elseif ($GLOBALS['phpgw']->msg->get_isset_arg('msgball'))
{
$my_msgball = $GLOBALS['phpgw']->msg->get_arg_value('msgball');
- $pass_the_ball_uri =
array('msgball[folder]'=>$my_msgball['folder'],
-
'msgball[acctnum]'=>$my_msgball['acctnum'],
-
'msgball[msgnum]'=>$my_msgball['msgnum']);
+ $pass_the_ball_uri = '&msgball[folder]='.$my_msgball['folder']
+
.'&msgball[acctnum]='.$my_msgball['acctnum']
+
.'&msgball[msgnum]='.$my_msgball['msgnum'];
}
else
{
- $pass_the_ball_uri = array('fldball[folder]'=>'INBOX',
- 'fldball[acctnum]'=>'0');
+ $pass_the_ball_uri = '&fldball[folder]=INBOX'
+ .'&fldball[acctnum]=0';
}
- $GLOBALS['phpgw']->redirect_link(
- '/index.php',array(
- 'menuaction'=>'email.uicompose.compose',
- 'to'=>$to,
- 'cc'=>$cc,
- 'bcc'=>$bcc,
- 'subject'=>$subject,
- 'body'=>$body,
- 'personal'=>$personal,
- 'sort'=>$sort,
- 'order'=>$order,
- 'start'=>$start)
- +$pass_the_ball_uri
- );
+ header('Location: '.$GLOBALS['phpgw']->link(
+ '/index.php',
+ 'menuaction=email.uicompose.compose'.
+ $pass_the_ball_uri.
+ '&to='.$to.
+ '&cc='.$cc.
+ '&bcc='.$bcc.
+ '&subject='.$subject.
+ '&body='.$body.
+ '&personal='.$personal.
+ '&sort='.$sort.
+ '&order='.$order.
+ '&start='.$start));
if (is_object($GLOBALS['phpgw']->msg))
{
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/email/index.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- index.php 15 Dec 2006 10:44:17 -0000 1.95
+++ index.php 15 Dec 2006 15:24:44 -0000 1.96
@@ -9,7 +9,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: index.php,v 1.95 2006/12/15 10:44:17 sigurdne Exp $
+ * @version $Id: index.php,v 1.96 2006/12/15 15:24:44 sigurdne Exp $
* @internal Based on Aeromail http://the.cushman.net/
*/
@@ -46,6 +46,7 @@
if ($simple_redirect == True)
{
+ //header('Location:
'.$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'email.uiindex.index'));
if (is_object($GLOBALS['phpgw']->msg))
{
Index: inc/class.boaction.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boaction.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- inc/class.boaction.inc.php 14 Dec 2006 15:09:30 -0000 1.21
+++ inc/class.boaction.inc.php 15 Dec 2006 15:24:44 -0000 1.22
@@ -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.21 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.boaction.inc.php,v 1.22 2006/12/15 15:24:44
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=array();
+ var $no_fmt='';
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',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')));
+
'/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'));
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',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')));
+ '/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'));
/*
// 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 = array('no_fmt'=>1);
+ $this->no_fmt = '&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',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']);
+ '/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);
}
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',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')));
+ '/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'));
}
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 =
array('msgball[msgnum]'=>$new_args_env['msgball']['msgnum'],
+ $new_uri_element =
'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: inc/class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bocompose.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.bocompose.inc.php 14 Dec 2006 15:09:30 -0000 1.12
+++ inc/class.bocompose.inc.php 15 Dec 2006 15:24:44 -0000 1.13
@@ -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.12 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.bocompose.inc.php,v 1.13 2006/12/15 15:24:44
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -82,23 +82,24 @@
// 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',array(
-
'menuaction'=>$menuaction_target,
- //'action'=>'forward',
-
'action'=>$GLOBALS['phpgw']->msg->get_arg_value('action'),
+ '/index.php',
+ 'menuaction='.$menuaction_target
+ //.'&action=forward'
+
.'&action='.$GLOBALS['phpgw']->msg->get_arg_value('action')
+ .'&'.$msgball['uri']
// 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())
- +$msgball['uri']
+
.'&orig_action='.$GLOBALS['phpgw']->msg->recall_desired_action()
);
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['fwd_proc'] =
$GLOBALS['phpgw']->msg->get_arg_value('fwd_proc');
+ $send_btn_action = $send_btn_action
+
.'&fwd_proc='.$GLOBALS['phpgw']->msg->get_arg_value('fwd_proc');
}
}
elseif
($GLOBALS['phpgw']->msg->get_isset_arg('fldball'))
@@ -116,16 +117,16 @@
// it never holds a "msgnum" value.
$fldball =
$GLOBALS['phpgw']->msg->get_arg_value('fldball');
$send_btn_action = $GLOBALS['phpgw']->link(
- '/index.php',array(
-
'menuaction'=>$menuaction_target,
+ '/index.php',
+ '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
@@ -136,16 +137,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',array(
-
'menuaction'=>$menuaction_target,
+ '/index.php',
+ '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: inc/class.bofilters.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bofilters.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- inc/class.bofilters.inc.php 14 Dec 2006 15:09:30 -0000 1.18
+++ inc/class.bofilters.inc.php 15 Dec 2006 15:24:44 -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.bofilters.inc.php,v 1.18 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.bofilters.inc.php,v 1.19 2006/12/15 15:24:44
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',array(
-
'menuaction'=>'email.uifilters.filters_list'));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.uifilters.filters_list'));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.uifilters.filters_list'));
+
'/index.php',
+
'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',array(
-
//'menuaction'=>'email.uifilters.filters_list'));
-
'menuaction'=>'email.uiindex.index'));
+
'/index.php',
+
//'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',array('menuaction'=>'email.uiindex.mlist')));
+
$this->template->set_var('mlist_submit_form_action',
$GLOBALS['phpgw']->link('/index.php','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: inc/class.bofolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bofolder.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- inc/class.bofolder.inc.php 14 Dec 2006 15:09:30 -0000 1.12
+++ inc/class.bofolder.inc.php 15 Dec 2006 15:24:45 -0000 1.13
@@ -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.12 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.bofolder.inc.php,v 1.13 2006/12/15 15:24:45
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',array(
-
'menuaction'=>'email.uiindex.index',
-
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out($folder_long),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+ '/index.php',
+
'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',array(
- 'menuaction'=>'email.uifolder.folder'));
+ '/index.php',
+ '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,18 +426,13 @@
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',array(
-
'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',
+ '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',array(
-
'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',
+ '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: inc/class.boindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- inc/class.boindex.inc.php 15 Dec 2006 14:02:38 -0000 1.37
+++ inc/class.boindex.inc.php 15 Dec 2006 15:24:45 -0000 1.38
@@ -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.37 2006/12/15 14:02:38
sigurdne Exp $
+ * @version $Id: class.boindex.inc.php,v 1.38 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -195,13 +195,13 @@
}
$tpl_vars = Array(
- //'stats_backcolor' =>
$GLOBALS['phpgw_info']['theme']['em_folder'],
+ 'stats_backcolor' =>
$GLOBALS['phpgw_info']['theme']['em_folder'],
//'stats_backcolor_class' => 'th',
'stats_backcolor_class' => 'email_folder',
'stats_font' =>
$GLOBALS['phpgw_info']['theme']['font'],
'stats_font_size' => '2',
'stats_foldername_size' => '3',
- //'stats_color' =>
$GLOBALS['phpgw_info']['theme']['em_folder_text'],
+ 'stats_color' =>
$GLOBALS['phpgw_info']['theme']['em_folder_text'],
//'stats_color_class' => 'th_text',
'stats_color_class' => 'email_folder',
//'stats_folder' =>
$GLOBALS['phpgw']->msg->get_folder_short($GLOBALS['phpgw']->msg->get_arg_value('folder')),
@@ -312,7 +312,7 @@
//{form_folder_switch_closetag}
$my_widgets->new_form();
$my_widgets->set_form_name('folder_switch');
-
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')));
+
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
$my_widgets->set_form_method('post');
$tpl->set_var('form_folder_switch_opentag',
$my_widgets->get_form());
$tpl->set_var('folder_switch_combobox',
$my_widgets->all_folders_combobox('folder_switch'));
@@ -380,19 +380,19 @@
$this->xi['report_this'] =
$GLOBALS['phpgw']->msg->report_moved_or_deleted();
// some fonts and font sizes
- // $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['ctrl_bar_font_size'] = '2';
- // $this->xi['stats_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['stats_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['stats_font_size'] = '2';
$this->xi['stats_foldername_size'] = '3';
- // $this->xi['mlist_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['mlist_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['mlist_font_size'] = '2';
$this->xi['mlist_font_size_sm'] = '1';
//$this->xi['mlist_font_size_sm'] = '0.6em';
- // $this->xi['hdr_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['hdr_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['hdr_font_size'] = '2';
$this->xi['hdr_font_size_sm'] = '1';
- // $this->xi['ftr_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['ftr_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
//Empty Trash added by skwashd - move it if you want
$this->xi['empty_trash_link'] =
$GLOBALS['phpgw']->link('/index.php',
@@ -412,8 +412,8 @@
$this->xi['current_fldball_fake_uri'] =
'&folder='.$GLOBALS['phpgw']->msg->prep_folder_out()
.'&acctnum='.$GLOBALS['phpgw']->msg->get_acctnum();
$this->xi['show_num_new'] = False;
- $this->icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$GLOBALS['phpgw']->msg->get_acctnum());
- $this->icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$GLOBALS['phpgw']->msg->get_acctnum());
+ $this->icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$acctnum);
+ $this->icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$acctnum);
//echo "icon size is ".$this->icon_size."<br />\r\n";
/* MOVED TO FUNCTION ABOVE
@@ -482,9 +482,10 @@
$this->xi['folder_info'] =
$GLOBALS['phpgw']->msg->get_folder_status_info();
}
$this->xi['arrows_form_action'] =
$GLOBALS['phpgw']->link(
-
'/index.php',array('menuaction'=>'email.uiindex.index'));
+ '/index.php',
+
'menuaction=email.uiindex.index');
$this->xi['arrows_form_name'] = 'arrownav';
- // $this->xi['arrows_backcolor'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
+ $this->xi['arrows_backcolor'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['arrows_backcolor_class'] = 'row_off';
//$this->xi['arrows_td_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['arrows_td_backcolor'] = '';
@@ -494,12 +495,12 @@
$this->xi['current_start'] =
$GLOBALS['phpgw']->msg->get_arg_value('start');
$nav_common_uri = $GLOBALS['phpgw']->link(
-
'/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')));
+ '/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'));
$nav_args = Array (
'start' =>
$GLOBALS['phpgw']->msg->get_arg_value('start'),
@@ -518,37 +519,37 @@
'/index.php',
$GLOBALS['phpgw']->msg->get_arg_value('start'),
$this->xi['folder_info']['number_all'],
-
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')));
+
'&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'));
// depreciated, only for template 1
$this->xi['td_next_arrows'] = $this->nextmatchs->right(
'/index.php',
$GLOBALS['phpgw']->msg->get_arg_value('start'),
$this->xi['folder_info']['number_all'],
-
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')));
+
'&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'));
- // $this->xi['ctrl_bar_back2'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
+ $this->xi['ctrl_bar_back2'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['compose_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uicompose.compose',
+ '/index.php',
+
'menuaction=email.uicompose.compose'
// this data
tells us where to return to after sending a message
-
'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'));
$this->xi['compose_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/compose-message-'.$this->icon_size,'_on'),$this->xi['compose_txt'],'','','0');
$this->xi['ilnk_compose'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['compose_link'],$this->xi['compose_img']);
- switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$GLOBALS['phpgw']->msg->get_acctnum())){
+ switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$acctnum)){
case 'text':
$this->xi['compose_clickme'] = '<a
href="'.$this->xi['compose_link'].'">'.$this->xi['compose_txt'].'</a>';
break;
@@ -563,11 +564,11 @@
if ($this->xi['mailsvr_supports_folders'])
{
$this->xi['folders_link'] =
$GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uifolder.folder',
+ '/index.php',
+
'menuaction=email.uifolder.folder'
// going to the
folder list page, we only need log into the INBOX folder
-
'fldball[folder]'=>'INBOX',
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+
.'&fldball[folder]='.'INBOX'
+
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
$this->xi['folders_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/folder-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_folders'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['folders_link'],$this->xi['folders_img']);
@@ -584,7 +585,8 @@
}
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array('menuaction'=>'email.uifilters.filters_list'));
+ '/index.php',
+
'menuaction=email.uifilters.filters_list');
$this->xi['filters_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/filters-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_filters'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['filters_link'],$this->xi['filters_img']);
@@ -593,9 +595,9 @@
// FIXME
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uipreferences.preferences',
-
'ex_acctnum'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+ '/index.php',
+
'menuaction=email.uipreferences.preferences'
+
.'&ex_acctnum='.$GLOBALS['phpgw']->msg->get_acctnum());
$this->xi['email_prefs_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/customize-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_email_prefs'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['email_prefs_link'],$this->xi['email_prefs_img']);
@@ -606,8 +608,8 @@
//
'menuaction=email.uipreferences.ex_accounts'
// .'&acctnum=1');
$this->xi['accounts_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uipreferences.ex_accounts_list'));
+ '/index.php',
+
'menuaction=email.uipreferences.ex_accounts_list');
$this->xi['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/accounts-'.$this->icon_size,'_on'),$this->xi['folders_txt1'],'','','0');
$this->xi['ilnk_accounts'] =
$GLOBALS['phpgw']->msg->href_maketag($this->xi['accounts_link'],$this->xi['accounts_img']);
@@ -649,7 +651,7 @@
.'&start=');
$this->xi['ctrl_bar_acct_1_link'] = '<a
href="'.$this->xi['ctrl_bar_acct_1_link'].'">'.'goto extra 1'.'</a>';
*/
- // $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
$sort_selected = Array(
0 => '',
@@ -667,8 +669,8 @@
.'<option value="6"' .$sort_selected[6]
.'>'.$this->xi['lang_size'].'</option>' ."\r\n";
$this->xi['sortbox_action'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uiindex.index'));
+ '/index.php',
+
'menuaction=email.uiindex.index');
$this->xi['sortbox_on_change'] =
'document.sortbox.submit()';
$this->xi['sortbox_select_name'] = 'sort';
@@ -770,19 +772,19 @@
'3',
$this->xi['default_order'],
$GLOBALS['phpgw']->msg->get_arg_value('order'),
-
'/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())
+
'/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()
);
$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'],
-
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+
'&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'],
-
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+
'&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,18 +801,18 @@
{
// 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'],
-
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+
'&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'],
-
array('fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+
'&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'];
+ $this->xi['hdr_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['hdr_backcolor_class'] = 'th';
$this->xi['mlist_newmsg_char'] = '<strong>*</strong>';
$this->xi['mlist_newmsg_color'] = '#ff0000';
@@ -894,8 +896,8 @@
}
// user may select individual messages to move, make
combobox to select destination folder
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.boaction.delmov'));
+ '/index.php',
+
'menuaction=email.boaction.delmov');
$this->xi['frm_delmov_name'] = 'delmov';
if ($this->xi['mailsvr_supports_folders'])
{
@@ -929,7 +931,7 @@
//$this->xi['delmov_image'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->common->image_on('email',$icon_theme.'-trash-'.$icon_size,'_on'),$this->xi['lang_delete'],'','','0');
//$this->xi['delmov_image'] =
$GLOBALS['phpgw']->msg->img_maketag($this->xi['image_dir'].'/'.$this->icon_theme.'-trash-'.$this->icon_size.'.png',$this->xi['lang_delete'],'','','0');
$delmov_onclick = "javascript:do_action('delall')";
- switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$GLOBALS['phpgw']->msg->get_acctnum())){
+ switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type',$acctnum)){
case 'text':
$this->xi['delmov_button'] = '<a
href="'.$delmov_onclick.'">'.$this->xi['lang_delete'].'</a>';
break;
@@ -941,7 +943,7 @@
break;
}
- // $this->xi['ftr_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ $this->xi['ftr_backcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['ftr_backcolor_class'] = 'th';
}
@@ -1082,10 +1084,10 @@
$this->xi['ctrl_bar_back2'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
$this->xi['compose_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uicompose.compose',
-
'fldball[folder]'=>$GLOBALS['phpgw']->msg->prep_folder_out(),
-
'fldball[acctnum]'=>$GLOBALS['phpgw']->msg->get_acctnum()));
+ '/index.php',
+
'menuaction=email.uicompose.compose'
+
.'&fldball[folder]='.$GLOBALS['phpgw']->msg->prep_folder_out()
+
.'&fldball[acctnum]='.$GLOBALS['phpgw']->msg->get_acctnum());
if ($this->xi['mailsvr_supports_folders'])
{
@@ -1104,8 +1106,8 @@
$this->xi['folders_btn'] = ' ';
}
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uipreferences.preferences'));
+ '/index.php',
+
'menuaction=email.uipreferences.preferences');
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/filters.php');
$this->xi['filters_href'] = '<a
href="'.$this->xi['filters_link'].'">'.$this->xi['filters_txt'].'</a>';
@@ -1279,8 +1281,8 @@
// NOT YET IMPLEMENTED IN MLIST
// user may select individual messages to move, make
combobox to select destination folder
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uiindex.index'));
+ '/index.php',
+
'menuaction=email.uiindex.index');
$this->xi['frm_delmov_name'] = 'delmov';
if ($this->xi['mailsvr_supports_folders'])
{
Index: inc/class.bomessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- inc/class.bomessage.inc.php 15 Dec 2006 14:02:38 -0000 1.21
+++ inc/class.bomessage.inc.php 15 Dec 2006 15:24:45 -0000 1.22
@@ -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.21 2006/12/15 14:02:38
sigurdne Exp $
+ * @version $Id: class.bomessage.inc.php,v 1.22 2006/12/15 15:24:45
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=array();
+ var $no_fmt='';
// maximum number of TO and CC addresses to show, too many will
error message display
var $max_to_loops = 15;
@@ -206,12 +206,12 @@
&& ($GLOBALS['phpgw']->msg->get_arg_value('no_fmt') !=
'')
&& ($this->preserve_no_fmt == True))
{
- $this->no_fmt = array('no_fmt'=>1);
+ $this->no_fmt = '&no_fmt=1';
}
// ---- TOOL BAR / MENU BAR ----
- // $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['ctrl_bar_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
$this->xi['ctrl_bar_font_size'] = '-1';
- // $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ $this->xi['ctrl_bar_back1'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
// ---- Fill Some Important Variables -----
$svr_image_dir = PHPGW_IMAGES_DIR;
@@ -238,10 +238,9 @@
);
$this->xi['acctbox_listbox'] =
$GLOBALS['phpgw']->msg->all_ex_accounts_listbox($feed_args);
$this->xi['accounts_link'] =
$GLOBALS['phpgw']->link(
-
'/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['accounts_img'] =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on($this->icon_theme.'/accounts-24','_on'),'','','','0');
+ '/index.php',
+
'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']);
}
else
@@ -252,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',array(
-
'menuaction'=>'email.uiindex.index'));
+ '/index.php',
+
'menuaction=email.uiindex.index');
// ---- Move Message Box ----
// borrow code from boindex and uiindex for this
functionality
@@ -270,8 +269,8 @@
$this->xi['mlist_checkbox_name'] = 'delmov_list[]';
$this->xi['frm_delmov_action'] =
$GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.boaction.delmov')+$this->no_fmt);
+ '/index.php',
+
'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"]');
@@ -312,7 +311,7 @@
// ---- Fill Some Important Variables -----
- $sm_envelope_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/address-conduit-16','_on'),lang('add
to address book'),'','','0');
+ $sm_envelope_img =
$GLOBALS['phpgw']->msg->img_maketag($GLOBALS['phpgw']->msg->_image_on('email',$this->icon_theme.'/address-conduit-16','_on'),$this->xi['land_add_to_address_book'],'','','0');
$not_set = $GLOBALS['phpgw']->msg->not_set;
@@ -412,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',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']);
+ '/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);
address@hidden(0);
@@ -469,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',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'))),
+ '/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')),
//$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,17 +491,14 @@
// ---- "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',
-
'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_uri);
-
+ '/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);
$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);
@@ -521,16 +517,14 @@
// 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',
-
'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_uri);
+ '/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);
$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);
@@ -570,24 +564,24 @@
{
// 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',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'))
+ '/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')
// 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
);
}
// ---- Labels and Colors for From, To, CC, Files, and
Subject -----
- // $this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ $this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
$this->xi['tofrom_labels_class'] = 'th';
//$this->xi['tofrom_labels_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_off'];
//$this->xi['tofrom_labels_class'] = 'row_off';
- // $this->xi['tofrom_data_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ $this->xi['tofrom_data_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
$this->xi['tofrom_data_class'] = 'row_on';
// ---- From: Message Data -----
@@ -615,9 +609,6 @@
}
// escape certain undesirable chars before HTML
display
$from_personal =
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($from_personal);
- $from_personal =
$GLOBALS['phpgw']->msg->ascii2utf($from_personal);
- $from_plain =
$GLOBALS['phpgw']->msg->ascii2utf($from_plain);
-
// display "From" according to user preferences
if
(($GLOBALS['phpgw']->msg->get_isset_pref('show_addresses'))
&&
($GLOBALS['phpgw']->msg->get_pref_value('show_addresses') != 'none')
@@ -637,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',array(
-
'menuaction'=>'email.uicompose.compose',
+ '/index.php',
+
'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
@@ -700,9 +691,6 @@
}
// escape certain undesirable chars
before HTML display
$to_personal =
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($to_personal);
- $to_personal =
$GLOBALS['phpgw']->msg->ascii2utf($to_personal);
- $to_plain =
$GLOBALS['phpgw']->msg->ascii2utf($to_plain);
-
if
(($GLOBALS['phpgw']->msg->get_pref_value('show_addresses') != 'none')
&& ($to_personal != $to_plain))
{
@@ -717,17 +705,17 @@
$to_real_name =
$GLOBALS['phpgw']->msg->href_maketag(
$GLOBALS['phpgw']->link(
- '/index.php',array(
-
'menuaction'=>'email.uicompose.compose',
+ '/index.php',
+
'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..
@@ -736,11 +724,11 @@
$to_addybook_add =
$GLOBALS['phpgw']->msg->href_maketag(
$GLOBALS['phpgw']->link(
- '/index.php',array(
-
'menuaction'=>'addressbook.uiaddressbook.add_email',
-
'add_email'=>urlencode($to_plain),
-
'name'=>urlencode($to_personal),
-
'referer'=>urlencode($get_back_here_url))),
+ '/index.php',
+
'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;
@@ -775,9 +763,6 @@
}
// escape certain undesirable chars
before HTML display
$cc_personal =
$GLOBALS['phpgw']->msg->htmlspecialchars_encode($cc_personal);
- $cc_personal =
$GLOBALS['phpgw']->msg->ascii2utf($cc_personal);
- $cc_plain =
$GLOBALS['phpgw']->msg->ascii2utf($cc_plain);
-
//if
(($GLOBALS['phpgw_info']['user']['preferences']['email']['show_addresses'] !=
'none')
if
(($GLOBALS['phpgw']->msg->get_pref_value('show_addresses') != 'none')
&& ($cc_personal != $cc_plain))
@@ -791,27 +776,27 @@
$cc_extra_info = ' ';
}
$cc_real_name =
$GLOBALS['phpgw']->msg->href_maketag($GLOBALS['phpgw']->link(
- '/index.php',array(
-
'menuaction'=>'email.uicompose.compose',
+ '/index.php',
+
'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',array(
-
'menuaction'=>'addressbook.uiaddressbook.add_email',
-
'add_email'=>urlencode($cc_plain),
-
'name'=>urlencode($cc_personal),
-
'referer'=>urlencode($get_back_here_url))),
+ '/index.php',
+
'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
@@ -869,26 +854,26 @@
}
// ---- Reply to First Presentable Part (needed for
Reply, ReplyAll, and Forward below) -----
- $first_presentable = array();
+ $first_presentable = '';
// 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')
- && (count($first_presentable) == 0)
+ && ($first_presentable == '')
&& ($this->part_nice[$i]['bytes'] > 5))
{
- $first_presentable =
array('msgball[part_no]'=>$this->part_nice[$i]['m_part_num_mime']);
+ $first_presentable =
'&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['encoding']='qprint';
+ $first_presentable =
$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['encoding']='base64';
+ $first_presentable =
$first_presentable .'&encoding=base64';
}
// also check for this mess...
if
(stristr($this->part_nice[$i]['m_keywords'], 'html'))
@@ -896,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['subtype']='html';
+ $first_presentable =
$first_presentable .'&subtype=html';
}
break;
}
@@ -918,79 +903,79 @@
// ---- 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',array(
- 'menuaction'=>'email.uicompose.compose',
- 'action'=>'reply',
+ '/index.php',
+ 'menuaction=email.uicompose.compose'
+ .'&action=reply'
+ .'&'.$msgball['uri']
+ .$first_presentable
// 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'))
- +$msgball['uri']
- +$first_presentable);
+
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
+
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
+
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
$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',array(
- 'menuaction'=>'email.uicompose.compose',
- 'action'=>'replyall',
+ '/index.php',
+ 'menuaction=email.uicompose.compose'
+ .'&action=replyall'
+ .'&'.$msgball['uri']
+ .$first_presentable
// 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'))
- +$msgball['uri']
- +$first_presentable);
+
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
+
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
+
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
$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',array(
-
'menuaction'=>'email.uicompose.compose',
- 'action'=>'forward',
- 'fwd_proc'=>$fwd_proc,
+ '/index.php',
+ 'menuaction=email.uicompose.compose'
+ .'&action=forward'
+ .'&'.$msgball['uri']
+ .'&fwd_proc='.$fwd_proc
+ .$first_presentable
// 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'))
- +$msgball['uri']
- +$first_presentable);
+
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
+
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
+
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
$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',array(
- 'menuaction'=>'email.boaction.delmov',
- 'what'=>'delete_single_msg',
+ '/index.php',
+ 'menuaction=email.boaction.delmov'
+ .'&what=delete_single_msg'
+ .'&'.$msgball['uri']
// 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
- +$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);
$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',array(
-
'menuaction'=>'email.uicompose.compose',
- 'action'=>'edit',
+ '/index.php',
+ 'menuaction=email.uicompose.compose'
+ .'&action=edit'
+ .'&'.$msgball['uri']
+ .$first_presentable
// 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'))
- +$msgball['uri']
- +$first_presentable);
+
.'&sort='.$GLOBALS['phpgw']->msg->get_arg_value('sort')
+
.'&order='.$GLOBALS['phpgw']->msg->get_arg_value('order')
+
.'&start='.$GLOBALS['phpgw']->msg->get_arg_value('start'));
$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);
- // $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
- // $this->xi['reply_btns_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
- // $this->xi['reply_btns_text'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
+ $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['reply_btns_bkcolor'] =
$GLOBALS['phpgw_info']['theme']['em_folder'];
+ $this->xi['reply_btns_text'] =
$GLOBALS['phpgw_info']['theme']['em_folder_text'];
$this->xi['lnk_goback_folder'] = $lnk_goback_folder;
$this->xi['go_back_to'] = $this->xi['lang_go_back_to'];
$this->xi['href_reply'] = $href_reply;
@@ -1142,9 +1127,9 @@
// ----- Message_Display Template Handles it from here
-------
- // $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
- // $this->xi['theme_th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
- // $this->xi['theme_row_on'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
+ $this->xi['theme_font'] =
$GLOBALS['phpgw_info']['theme']['font'];
+ $this->xi['theme_th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ $this->xi['theme_row_on'] =
$GLOBALS['phpgw_info']['theme']['row_on'];
// ---- so called "little toolbar (not the real
toolbar) between the msg header data and the message siaplay
// (1) "view formatted/unformatted" link goes there,
(MAYBE CALL IT "PLAIN TEXT" INSTEAD?)
@@ -1156,14 +1141,13 @@
// 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',array(
- 'menuaction'=>'email.uimessage.message',
+ '/index.php',
+ 'menuaction=email.uimessage.message'
+ .'&'.$msgball['uri']
// 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'),
- )
- +$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')
);
// (2) view headers option
@@ -1171,14 +1155,13 @@
$this_msgball = $msgball;
$this_msgball['part_no'] = 0;
$view_headers_url = $GLOBALS['phpgw']->link(
- '/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']
+ '/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'
);
$view_headers_href = '<a href="'.$view_headers_url.'"
target="new">'.$this->xi['lang_view_headers'].'</a>';
$this->xi['view_headers_href'] = $view_headers_href;
@@ -1190,14 +1173,13 @@
$this_msgball = $msgball;
$this_msgball['part_no'] = 'raw_message';
$view_raw_message_url = $GLOBALS['phpgw']->link(
- '/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']
+ '/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'
);
$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;
@@ -1207,9 +1189,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',array(
- 'menuaction'=>'email.uimessage.printable')
- +$msgball['uri']
+ '/index.php',
+ '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;
@@ -1256,8 +1238,11 @@
// Fallback Value
$done_processing = False;
+
+
+
+
$count_part_nice = count($this->part_nice);
- $d1_num_parts = $count_part_nice; // Sigurd: not
totally shore on this one
for ($i = 0; $i < $count_part_nice; $i++)
{
if ($this->debug > 2) {
$this->msg->dbug->out('email.bomessage.message_data('.__LINE__.'): disp loop:
'.($i+1).' of '.$count_part_nice.'<br />'); }
@@ -1524,9 +1509,9 @@
// -- View As HTML
Button With Special HTML RELATED handling
$view_html_form_action
= $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.boaction.view_html')
- +$msgball['uri']
+ '/index.php',
+
'menuaction=email.boaction.view_html'
+
.'&'.$msgball['uri']
);
// this means we *may*
have replaced, a guess, but better security
@@ -1567,11 +1552,11 @@
$part_encoding
= '';
}
$view_html_form_action
= $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.boaction.get_attach',
-
'msgball[part_no]'=>$this->part_nice[$i]['m_part_num_mime'],
-
'encoding'=>$part_encoding)
-
+$msgball['uri']);
+
'/index.php',
+
'menuaction=email.boaction.get_attach'
+
.'&'.$msgball['uri']
+
.'&msgball[part_no]='.$this->part_nice[$i]['m_part_num_mime']
+
.'&encoding=' .$part_encoding);
$dsp =
'<p>'
@@ -1799,12 +1784,9 @@
if ($this->debug > 2) {
$this->msg->dbug->out('email.bomessage.message_data('.__LINE__.'): d_loop: part
is presentable image <br />'); }
$title_text =
$this->xi['lang_section'].': '.$this->part_nice[$i]['m_part_num_mime'];
- $title_text =
$GLOBALS['phpgw']->msg->ascii2utf($title_text);
$display_str =
$GLOBALS['phpgw']->msg->decode_header_string($this->part_nice[$i]['ex_part_name'])
.' - '
.$GLOBALS['phpgw']->msg->format_byte_size((int)$this->part_nice[$i]['bytes'])
.' -
'.$this->xi['lang_keywords'].': ' .$this->part_nice[$i]['m_keywords'];
- $display_str =
$GLOBALS['phpgw']->msg->ascii2utf($display_str);
-
$this->part_nice[$i]['title_text'] =
$title_text;
$this->part_nice[$i]['display_str'] =
$display_str;
// we add an href that points to the
exact msg_number/mime_part number that is the image
@@ -1915,7 +1897,7 @@
}
// used to show in calendar-notifications the event and
allow to except it there
- if(isset($application) && $application)
+ if($application)
{
if(strstr($msgtype,'"; Id="'))
{
Index: inc/class.email_service.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.email_service.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.email_service.inc.php 26 Nov 2006 14:16:48 -0000 1.5
+++ inc/class.email_service.inc.php 15 Dec 2006 15:24:45 -0000 1.6
@@ -19,7 +19,6 @@
{
var $msg_bootstrap; //email.msg_bootstrap
var $bopreferences;
- var $debug;
/**
* Constructor
@@ -94,10 +93,10 @@
// parse link to view email folder
$folderName =
$GLOBALS['phpgw']->msg->prep_folder_out($folder_list_i[$j]['folder_long']);
- $folderLink =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index',
-
'fldball[folder]'=>$folderName,
-
'fldball[acctnum]'=>$account_list[$i]['acctnum']
-
));
+ $folderLink =
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'.
+
'&fldball[folder]='.$folderName.
+
'&fldball[acctnum]='.$account_list[$i]['acctnum']
+ );
$id =
'email_'.$account_list[$i]['acctnum'].'_'.$path[count($path)-1];
$return[$id] = array('text' =>
$path[count($path)-1],
Index: inc/class.html_widgets.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.html_widgets.inc.php 15 Dec 2006 14:02:38 -0000 1.9
+++ inc/class.html_widgets.inc.php 15 Dec 2006 15:24:45 -0000 1.10
@@ -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.html_widgets.inc.php,v 1.9 2006/12/15 14:02:38
sigurdne Exp $
+ * @version $Id: class.html_widgets.inc.php,v 1.10 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -917,8 +917,8 @@
$this->tpl->set_var('report_this',
$GLOBALS['phpgw']->msg->report_moved_or_deleted());
- $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$GLOBALS['phpgw']->msg->get_acctnum());
- $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$GLOBALS['phpgw']->msg->get_acctnum());
+ $icon_theme =
$GLOBALS['phpgw']->msg->get_pref_value('icon_theme',$acctnum);
+ $icon_size =
$GLOBALS['phpgw']->msg->get_pref_value('icon_size',$acctnum);
$svr_image_dir = PHPGW_IMAGES_DIR;
$image_dir = PHPGW_IMAGES;
@@ -950,7 +950,7 @@
// this data
tells us what folder and account was last active
'fldball[folder]' => $GLOBALS['phpgw']->msg->prep_folder_out(),
'fldball[acctnum]' => $GLOBALS['phpgw']->msg->get_acctnum()));
- $accounts_link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uipreferences.ex_accounts_list'));
+ $accounts_link =
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list');
$email_prefs_link =
$GLOBALS['phpgw']->link('/index.php',array(
'menuaction' =>
'email.uipreferences.preferences',
'ex_acctnum' =>
$GLOBALS['phpgw']->msg->get_acctnum()));
@@ -1121,7 +1121,7 @@
{
$this->new_form();
$this->set_form_name('folders_cbox');
-
$this->set_form_action($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')));
+
$this->set_form_action($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
$this->set_form_method('post');
$this->tpl->set_var('form_folders_cbox_opentag', $this->get_form());
$this->tpl->set_var('folders_combobox',
$this->all_folders_combobox());
@@ -1140,7 +1140,7 @@
// <form name="acctbox"
action="/mail/index.php?menuaction=email.uiindex.index" method="post">
$this->new_form();
$this->set_form_name('accounts_cbox');
-
$this->set_form_action($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'email.uiindex.index')));
+
$this->set_form_action($GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index'));
$this->set_form_method('post');
$this->tpl->set_var('form_acctbox_opentag',
$this->get_form());
$this->tpl->set_var('acctbox_combobox',
$this->all_accounts_combobox());
Index: inc/class.mail_dcom.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_dcom.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- inc/class.mail_dcom.inc.php 26 Nov 2006 14:16:48 -0000 1.14
+++ inc/class.mail_dcom.inc.php 15 Dec 2006 15:24:45 -0000 1.15
@@ -9,7 +9,7 @@
* @copyright Copyright (C) 2001-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_dcom.inc.php,v 1.14 2006/11/26 14:16:48
sigurdne Exp $
+ * @version $Id: class.mail_dcom.inc.php,v 1.15 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -45,7 +45,7 @@
{
if ($debug_dcom) { echo 'DCOM DEBUG: did NOT find class feed
arg $p1 ['.serialize($p1).']<br />'; }
//{ echo 'DCOM DEBUG: did NOT find class feed arg $p1
['.serialize($p1).']<br />'; }
- $mail_server_type =
(isset($GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'])?$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type']:'');
+ $mail_server_type =
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'];
}
/* ----- is IMAP compiled into PHP */
Index: inc/class.mail_msg_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- inc/class.mail_msg_base.inc.php 15 Dec 2006 10:44:17 -0000 1.88
+++ inc/class.mail_msg_base.inc.php 15 Dec 2006 15:24:45 -0000 1.89
@@ -9,7 +9,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_base.inc.php,v 1.88 2006/12/15 10:44:17
sigurdne Exp $
+ * @version $Id: class.mail_msg_base.inc.php,v 1.89 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Originally Based on Aeromail http://the.cushman.net/
*/
@@ -338,8 +338,6 @@
//var $skip_args_special_handlers = 'get_folder_list';
var $skip_args_special_handlers = '';
- var $newsmode = '';
-
/*!
@function mail_msg_base
@abstract CONSTRUCTOR place holder, does nothing
@@ -476,9 +474,7 @@
{
if (is_object($GLOBALS['phpgw']->xslttpl))
{
-// $this->phpgw_before_xslt = False; //
disable xslt-version for now (seems to have issues with utf)
- $this->phpgw_before_xslt = true;
-
+ $this->phpgw_before_xslt = False;
}
else
{
@@ -1644,12 +1640,12 @@
// now we have folder, sort and order, make a
URI for auto-refresh use
// we can NOT put "start" in auto refresh or
user may not see the 1st index page on refresh
- $this_index_refresh_uri = array(
- 'menuaction'=>'email.uiindex.index',
-
'fldball[folder]'=>$this->prep_folder_out(),
-
'fldball[acctnum]'=>$this->get_acctnum(),
- 'sort'=>$this->get_arg_value('sort'),
- 'order'=>$this->get_arg_value('order'));
+ $this_index_refresh_uri =
+ 'menuaction=email.uiindex.index'
+
.'&fldball[folder]='.$this->prep_folder_out()
+
.'&fldball[acctnum]='.$this->get_acctnum()
+ .'&sort='.$this->get_arg_value('sort')
+
.'&order='.$this->get_arg_value('order');
if ($this->debug_logins > 1) {
$this->dbug->out('mail_msg.begin_request('.__LINE__.'): about to call
$this->set_arg_value(index_refresh_uri, $this_index_refresh_uri,
$acctnum(='.$acctnum.')); ; where $this_index_refresh_uri:
'.htmlspecialchars($this_index_refresh_uri).'<br />'); }
$this->set_arg_value('index_refresh_uri',
$this_index_refresh_uri, $acctnum);
@@ -1664,12 +1660,12 @@
// EXPERIMENTAL since we did not login can we
still get a good refresh URI?
// now we have folder, sort and order, make a
URI for auto-refresh use
// we can NOT put "start" in auto refresh or
user may not see the 1st index page on refresh
- $this_index_refresh_uri = array(
- 'menuaction'=>'email.uiindex.index',
-
'fldball[folder]'=>$this->prep_folder_out(),
-
'fldball[acctnum]'=>$this->get_acctnum(),
- 'sort'=>$this->get_arg_value('sort'),
- 'order'=>$this->get_arg_value('order'));
+ $this_index_refresh_uri =
+ 'menuaction=email.uiindex.index'
+
.'&fldball[folder]='.$this->prep_folder_out()
+
.'&fldball[acctnum]='.$this->get_acctnum()
+ .'&sort='.$this->get_arg_value('sort')
+
.'&order='.$this->get_arg_value('order');
if ($this->debug_logins > 1) {
$this->dbug->out('mail_msg.begin_request('.__LINE__.'): about to call
$this->set_arg_value(index_refresh_uri, $this_index_refresh_uri,
$acctnum(='.$acctnum.')); ; where $this_index_refresh_uri:
'.htmlspecialchars($this_index_refresh_uri).'<br />'); }
$this->set_arg_value('index_refresh_uri',
$this_index_refresh_uri, $acctnum);
@@ -3147,7 +3143,7 @@
// check if class dcom reports that the folder list has
changed
// is this accounts dcom object has not been created
yet, then obviously we did not just change its folder list
// NOTE THIS IS OBSOLETED - THE DCOM CLASS NOW USES
CALLBACK FUNCTION "folder_list_change_callback"
- if ((isset($GLOBALS['phpgw_dcom_'.$acctnum]->dcom) &&
is_object($GLOBALS['phpgw_dcom_'.$acctnum]->dcom))
+ if ((is_object($GLOBALS['phpgw_dcom_'.$acctnum]->dcom))
&&
($GLOBALS['phpgw_dcom_'.$acctnum]->dcom->folder_list_changed == True))
{
// class dcom recorded a change in the folder
list
@@ -3211,7 +3207,7 @@
}
// if there's no data we'll get back a FALSE
- if ($cached_data && is_array($cached_data))
+ if ($cached_data)
{
//if
($this->debug_args_special_handlers > 1) { echo 'mail_msg: get_folder_list:
using *Prefs DB* cached folder list data<br />';}
if ($this->debug_args_special_handlers
> 1) { $this->dbug->out('mail_msg: get_folder_list: using appsession cached
folder list data<br />'); }
@@ -3678,7 +3674,7 @@
*/
function decrypt_email_passwd($data)
{
- if(!isset($this->crypto) || !is_object($this->crypto))
+ if(!is_object($this->crypto))
{
$cryptovars[0] =
md5($GLOBALS['phpgw_info']['server']['encryptkey']);
$cryptovars[1] =
$GLOBALS['phpgw_info']['server']['mcrypt_iv'];
@@ -4764,27 +4760,6 @@
preg_match('/&.*[-]/',$string);
}
-
- /*!
- @function ascii2utf
- @abstract from version .18 of the all text are required to be
utf8
- @discussion Encodes an ISO-8859-1 string to UTF-8
- @param $string
- @return string utf8 encoded string
- @author Sigurd
- */
- function ascii2utf($text = '')
- {
- if ($text == utf8_encode($text))
- {
- return $text;
- }
- else
- {
- return utf8_encode($text);
- }
- }
-
// PHP "htmpspecialchars" is unreliable sometimes, and does not
encode single quotes (unless told to)
// this is a somewhat more reliable version of that PHP function
// with a corresponding 'decode' function below it
Index: inc/class.mail_msg_display.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- inc/class.mail_msg_display.inc.php 15 Dec 2006 14:02:38 -0000 1.50
+++ inc/class.mail_msg_display.inc.php 15 Dec 2006 15:24:45 -0000 1.51
@@ -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.50 2006/12/15
14:02:38 sigurdne Exp $
+ * @version $Id: class.mail_msg_display.inc.php,v 1.51 2006/12/15
15:24:45 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -753,7 +753,7 @@
if ((!isset($ex_folder))
|| ((string)$ex_folder == ''))
{
- $ex_folder =
$this->prep_folder_out($this->get_arg_value('folder', $this->get_acctnum()));
+ $ex_folder =
$this->prep_folder_out($this->get_arg_value('folder', $acctnum));
}
// TESTING this gets a verified non stale msgball_list and puts
it in cache, or uses the one in cache if it passes verified and not stale test
//$this->get_msgball_list($ex_acctnum, $ex_folder);
@@ -782,31 +782,14 @@
}
else
{
- $this_pageview_msgball['uri'] = array(
-
'msgball[msgnum]'=>$this_pageview_msgball['msgnum'],
-
'msgball[folder]'=>$this_pageview_msgball['folder'],
-
'msgball[acctnum]'=>$this_pageview_msgball['acctnum']);
+ $this_pageview_msgball['uri'] =
+
'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']);
- // 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;
- }
- }
- }
+ $nav_data['msgnum_idx'] =
array_search($this_pageview_msgball['uri'],$nav_data['msgball_list']);
// NOTE: msgnum_idx int 0 is NOT to be confused with "empty"
nor "boolean False"
if ((isset($nav_data['msgnum_idx']))
@@ -1063,10 +1046,9 @@
{
$subject = $this->decode_header_string($msg->Subject);
}
-
- // Now all text has to be utf8
- $subject = $this->ascii2utf($subject);
-
+ // non-us-ascii chars in headers MUST be specially encoded, so
decode them (if any) now
+ // $personal = $this->qprint_rfc_header($personal);
+ $personal = $this->decode_header_string($personal);
// do we add a prefix like Re: or Fw:
if ($desired_prefix != '')
{
@@ -1116,10 +1098,6 @@
$personal = $this->htmlspecialchars_encode($personal);
$personal = $personal .'
('.$from->mailbox.'@'.$from->host.')';
}
-
- // Now all text has to be utf8
- $personal = $this->ascii2utf($personal);
-
return $personal;
}
@@ -1670,7 +1648,7 @@
elseif (
($part_nice[$i]['type'] == 'text')
&& ($part_nice[$i]['subtype'] == 'plain')
- &&
(isset($part_nice[$presentable_parent_idx]['ex_parent_flat_idx']) &&
$part_nice[$presentable_parent_idx]['ex_parent_flat_idx'] == $not_set)
+ &&
($part_nice[$presentable_parent_idx]['ex_parent_flat_idx'] == $not_set)
&& (stristr($struct->type, 'multipart'))
// SHOULD BE THIS && ((string)$struct->type
== '1') // "1" = "multipart"
&& (stristr($struct->subtype, 'alternative'))
@@ -2313,19 +2291,17 @@
$url_part_name = urlencode($part_name);
// ex_part_href
$ex_part_href = $GLOBALS['phpgw']->link(
- '/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']);
+ '/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);
// 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
$href_part_name =
$this->htmlspecialchars_encode($href_part_name);
- $href_part_name = $this->ascii2utf($href_part_name);
// ex_part_clickable
$ex_part_clickable = '<a
href="'.$ex_part_href.'">'.$href_part_name.'</a>';
// put these two vars in an array, and pass it back to the
calling process
@@ -2351,7 +2327,6 @@
return $data;
}
- $newText = '';
$lines = split("\n",$data);
while ( list ($key,$line) = each ($lines))
@@ -2363,7 +2338,7 @@
$line = eregi_replace("(ftp://[^ )\r\n]+)","<A
href=\"\\1\" target=\"_new\">\\1</A>",$line);
$line = eregi_replace("(irc://[^ )\r\n]+)","<A
href=\"\\1\">\\1</A>",$line);//added by skwashd for chatzilla :)
$line =
eregi_replace("([-a-z0-9_]+(\.[_a-z0-9-]+)*@([a-z0-9-]+(\.[a-z0-9-]+)+))",
- "<a
href=\"".$GLOBALS['phpgw']->link("/".$GLOBALS['phpgw_info']['flags']['currentapp']."/compose.php",array('folder'=>$this->prep_folder_out($folder)))
+ "<a
href=\"".$GLOBALS['phpgw']->link("/".$GLOBALS['phpgw_info']['flags']['currentapp']."/compose.php","folder=".$this->prep_folder_out($folder))
."&to=\\1\">\\1</a>", $line);
$newText .= $line . "\n";
@@ -2774,7 +2749,7 @@
}
// ROW BACK COLOR
- // $msg_list_display[$x]['back_color'] = (($i + 1)/2 ==
floor(($i + 1)/2)) ? $GLOBALS['phpgw_info']['theme']['row_off'] :
$GLOBALS['phpgw_info']['theme']['row_on'];
+ $msg_list_display[$x]['back_color'] = (($i + 1)/2 ==
floor(($i + 1)/2)) ? $GLOBALS['phpgw_info']['theme']['row_off'] :
$GLOBALS['phpgw_info']['theme']['row_on'];
$msg_list_display[$x]['back_color_class'] = (($i + 1)/2
== floor(($i + 1)/2)) ? 'row_off' : 'row_on';
////$msg_list_display[$x]['back_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($msg_list_display[$x-1]['back_color']);
@@ -2866,14 +2841,12 @@
// NOTE: the acctnum MUST be matched to this individual
message and folder
$msg_list_display[$x]['subject'] =
$this->get_subject($hdr_envelope,'');
$msg_list_display[$x]['subject_link'] =
$GLOBALS['phpgw']->link(
- '/index.php',array
- (
-
'menuaction'=>'email.uimessage.message',
-
'sort'=>$this->get_arg_value('sort'),
-
'order'=>$this->get_arg_value('order'),
-
'start'=>$this->get_arg_value('start')
- )
- +
$this_loop_msgball['uri']);
+ '/index.php',
+
'menuaction=email.uimessage.message'
+
.'&'.$this_loop_msgball['uri']
+
.'&sort='.$this->get_arg_value('sort')
+
.'&order='.$this->get_arg_value('order')
+
.'&start='.$this->get_arg_value('start'));
// SIZE
if ($this->newsmode)
@@ -2961,7 +2934,7 @@
"ReplyTo" header in the From String the user wants to
see.
*/
$from = $hdr_envelope->from[0];
- if (!isset($from->personal) || !$from->personal)
+ if (!$from->personal)
{
// no "personal" info available, only can show
plain address
$personal = $from->mailbox.'@'.$from->host;
@@ -2976,7 +2949,6 @@
}
// escape certain undesirable chars before HTML display
$personal = $this->htmlspecialchars_encode($personal);
- $personal = $this->ascii2utf($personal);
if (($this->get_pref_value('show_addresses') == 'from')
&& ($personal != $from->mailbox.'@'.$from->host))
@@ -3036,13 +3008,11 @@
// said button is in the "show the message contents"
page, email/message.php
$msg_list_display[$x]['from_link'] =
$GLOBALS['phpgw']->link(
'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/compose.php',
- array(
-
'sort'=>$this->get_arg_value('sort'),
-
'order'=>$this->get_arg_value('order'),
-
'start'=>$this->get_arg_value('start'),
-
'to'=>urlencode($msg_list_display[$x]['who_to'])
- )
-
+$this_loop_msgball['uri']);
+
$this_loop_msgball['uri']
+
.'&sort='.$this->get_arg_value('sort')
+
.'&order='.$this->get_arg_value('order')
+
.'&start='.$this->get_arg_value('start')
+
.'&to='.urlencode($msg_list_display[$x]['who_to']));
if ($personal != $from->mailbox.'@'.$from->host)
{
$msg_list_display[$x]['from_link'] =
$msg_list_display[$x]['from_link'] .'&personal='.urlencode($personal);
@@ -3104,7 +3074,6 @@
}
// escape certain undesirable chars
before HTML display
$to_person =
$this->htmlspecialchars_encode($to_person);
- $to_person =
$this->ascii2utf($to_person);
$to_data_array[$z] = $to_person;
}
// throw a spacer comma in between addresses,
if more than one
@@ -3136,7 +3105,7 @@
{
//$prefer_ext = '.gif';
$prefer_ext = '.png';
- return
$GLOBALS['phpgw_info']['server']['webserver_url'].'/email/templates/base/images/'.$image.$prefer_ext;
+ return
$GLOBALS['phpgw_info']['server']['webserver_url'].'/email/templates/default/images/'.$image.$prefer_ext;
}
} // end class mail_msg
Index: inc/class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- inc/class.mail_msg_wrappers.inc.php 15 Dec 2006 10:44:17 -0000 1.48
+++ inc/class.mail_msg_wrappers.inc.php 15 Dec 2006 15:24:45 -0000 1.49
@@ -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.48 2006/12/15
10:44:17 sigurdne Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.49 2006/12/15
15:24:45 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -732,10 +732,13 @@
for($i=0;$i<$loops;$i++)
{
// NEW - try making the
msgball_list URI DATA ONLY
- $msgball_list[$i] = array(
-
'msgball[msgnum]'=>$server_msgnum_list[$i],
-
'msgball[folder]'=>$msg_folder,
-
'msgball[acctnum]'=>$acctnum);
+ // 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;
}
}
@@ -1067,25 +1070,25 @@
if (($this->debug_session_caching > 2) ||
($this->debug_wrapper_dcom_calls > 2)) { $this->dbug->out('mail_msg(_wrappers):
get_folder_status_info: ('.__LINE__.') ->dcom->status returns: $mailbox_status
DUMP', $mailbox_status); }
// cache validity data - will be used to cache
msg_list_array data, which is good until UID_NEXT changes
- $return_data['uidnext'] =
(isset($mailbox_status->uidnext)?$mailbox_status->uidnext:'');
- $return_data['uidvalidity'] =
(isset($mailbox_status->uidvalidity)?$mailbox_status->uidvalidity:'');
+ $return_data['uidnext'] = $mailbox_status->uidnext;
+ $return_data['uidvalidity'] =
$mailbox_status->uidvalidity;
$mail_server_type =
$this->get_pref_value('mail_server_type', $fldball['acctnum']);
if (($mail_server_type == 'imap')
|| ($mail_server_type == 'imaps'))
{
$return_data['is_imap'] = True;
- $return_data['number_new'] =
(isset($mailbox_status->unseen)?$mailbox_status->unseen:'');
- $return_data['number_all'] =
(isset($mailbox_status->messages)?$mailbox_status->messages:'');
- if (isset($mailbox_status->unseen) &&
$mailbox_status->unseen == 1)
+ $return_data['number_new'] =
$mailbox_status->unseen;
+ $return_data['number_all'] =
$mailbox_status->messages;
+ if ($mailbox_status->unseen == 1)
{
$return_data['alert_string'] .=
lang('You have 1 new message!');
}
- if (isset($mailbox_status->unseen) &&
$mailbox_status->unseen > 1)
+ if ($mailbox_status->unseen > 1)
{
$return_data['alert_string'] .=
lang('You have %1 new messages!',$mailbox_status->unseen);
}
- if (isset($mailbox_status->unseen) &&
$mailbox_status->unseen == 0)
+ if ($mailbox_status->unseen == 0)
{
$return_data['alert_string'] .=
lang('You have no new messages');
}
@@ -1726,20 +1729,12 @@
// 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)
@@ -1776,19 +1771,12 @@
// 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)
@@ -3000,18 +2988,15 @@
{
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 (isset($uri_ball_data['fldball[folder]']) &&
$uri_ball_data['fldball[folder]'])
+ if (stristr($uri_ball_data,'fldball[folder]'))
{
- // $return_struct = $return_struct['fldball'];
- $return_struct['folder'] =
$uri_ball_data['fldball[folder]'];
+ $return_struct = $return_struct['fldball'];
}
- // elseif (stristr($uri_ball_data,'msgball[folder]'))
- elseif (isset($uri_ball_data['msgball[folder]']) &&
$uri_ball_data['msgball[folder]'])
+ elseif (stristr($uri_ball_data,'msgball[folder]'))
{
- $return_struct['folder'] =
$uri_ball_data['msgball[folder]'];
+ $return_struct = $return_struct['msgball'];
}
else
{
@@ -3033,14 +3018,7 @@
// 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['msgnum'] =
$uri_ball_data['msgball[msgnum]'];
- $return_struct['acctnum'] =
$uri_ball_data['msgball[acctnum]'];
- $return_struct['uri'] = $uri_ball_data;
-
+ $return_struct['uri'] =
'msgball[msgnum]='.$return_struct['msgnum'].'&msgball[folder]='.$return_struct['folder'].'&msgball[acctnum]='.$return_struct['acctnum'];
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;
@@ -3342,10 +3320,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'] = 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']);
+
$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'];
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: inc/class.so_mail_msg.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.so_mail_msg.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.so_mail_msg.inc.php 15 Dec 2006 10:44:17 -0000 1.8
+++ inc/class.so_mail_msg.inc.php 15 Dec 2006 15:24:45 -0000 1.9
@@ -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.so_mail_msg.inc.php,v 1.8 2006/12/15 10:44:17
sigurdne Exp $
+ * @version $Id: class.so_mail_msg.inc.php,v 1.9 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -262,7 +262,7 @@
else
{
// WIPE CLEAN THE CACHE
- $account_id =
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+ $account_id =
get_account_id($accountid,$GLOBALS['phpgw']->session->account_id);
$query = "DELETE FROM
phpgw_app_sessions WHERE loginid = '".$account_id."'"
." AND app = 'email'";
$GLOBALS['phpgw']->db->query($query);
@@ -642,7 +642,7 @@
*/
function so_delete_data($data_key)
{
- $account_id =
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+ $account_id =
get_account_id($accountid,$GLOBALS['phpgw']->session->account_id);
$data_key =
$GLOBALS['phpgw']->db->db_addslashes($data_key);
$GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_anglemail "
. " WHERE account_id='" . $account_id . "' AND
data_key='" . $data_key . "'",__LINE__,__FILE__);
@@ -655,7 +655,7 @@
*/
function so_clear_all_data_this_user()
{
- $account_id =
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+ $account_id =
get_account_id($accountid,$GLOBALS['phpgw']->session->account_id);
$GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_anglemail "
. " WHERE account_id='" . $account_id .
"'",__LINE__,__FILE__);
$this->so_clear_data_group();
@@ -811,7 +811,7 @@
$data_key_mailsvr_namespace = '';
}
- $account_id =
get_account_id((isset($accountid)?$accountid:''),$GLOBALS['phpgw']->session->account_id);
+ $account_id =
get_account_id($accountid,$GLOBALS['phpgw']->session->account_id);
//if (($data_key)
//&& ($data_key_msgball)
//&& ($data_key_folder_status_info))
Index: inc/class.svc_nextmatches.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.svc_nextmatches.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- inc/class.svc_nextmatches.inc.php 14 Dec 2006 15:09:30 -0000 1.7
+++ inc/class.svc_nextmatches.inc.php 15 Dec 2006 15:24:45 -0000 1.8
@@ -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.7 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.svc_nextmatches.inc.php,v 1.8 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -75,27 +75,6 @@
}
/*!
- @function extras_to_array
- @abstract ?
- */
- function extras_to_array($extra)
- {
- $extra = explode('&', $extra);
- foreach( $extra as $v )
- {
- $b = split('=', $v);
- if(isset($b[0]) && $b[0])
- {
- $new_extra[$b[0]] = $b[1];
- }
- }
- unset($extra);
- $extra = (isset($new_extra)?$new_extra:array());
- unset($new_extra);
- return $extra;
- }
-
- /*!
@function page
@abstract ?
*/
@@ -141,10 +120,9 @@
*/
function
show_sort_order_mail($old_sort,$new_sort,$default_order,$order,$program,$text,$extra='')
{
- if(!is_array($extra))
+ if(is_array($extra))
{
- // $extra = $this->extras_to_string($extra);
- $extra = $this->extras_to_array($extra);
+ $extra = $this->extras_to_string($extra);
}
if($old_sort == $new_sort)
{
@@ -187,38 +165,14 @@
//echo 'show_sort_order_mail: $extra
['.serialize($extra).'] <br />';
$prog = explode('?',$program);
//echo 'show_sort_order_mail: $prog
['.serialize($prog).'] <br />';
-
- $extravar = $prog[1];
-
- if ( !is_array($extravar) )
- {
-// parse_str($params, $new_params);
-// $params =& $new_params;
- $extravar = explode('&', $extravar);
- foreach( $extravar as $v )
- {
- $b = split('=', $v);
- if(isset($b[0]) && $b[0])
- {
- $new_extravar[$b[0]] = $b[1];
- }
- }
- unset($extravar);
- $extravar =
(isset($new_extravar)?$new_extravar:'');
- unset($new_extravar);
- }
-
- $extravar['order'] =$our_order;
- $extravar['sort']=$new_sort;
-
- //$extravar =
$prog[1].'&order='.$our_order.'&sort='.$new_sort.$extra;
+ $extravar =
$prog[1].'&order='.$our_order.'&sort='.$new_sort.$extra;
//echo 'show_sort_order_mail: $extravar
['.serialize($extravar).'] <br />';
// this was b0rking menuaction when NOT using redirect,
instead using direct object calls to goto the next page
// 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+$extra);
+ $link = $GLOBALS['phpgw']->link($prog[0],$extravar);
//echo 'show_sort_order_mail: $link
['.serialize($link).'] <br />';
return '<a href="' .$link .'">' .$text .'</a>';
Index: inc/class.ui_mail_debug.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.ui_mail_debug.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.ui_mail_debug.inc.php 14 Dec 2006 15:09:30 -0000 1.6
+++ inc/class.ui_mail_debug.inc.php 15 Dec 2006 15:24:45 -0000 1.7
@@ -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.6 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.ui_mail_debug.inc.php,v 1.7 2006/12/15 15:24:45
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?array('menuaction'=>'email.ui_mail_debug.index
+ @example /index.php?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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'phpinfo')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'get_defined_constants')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_dump')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'common.debug_list_core_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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_dump')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_info_dump')));
+
$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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'globals_phpgw_session_dump')));
+
//$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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'ref_session_dump')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'msg_object_dump')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'preferences_object_dump')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'copyinteresting')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'env_test')));
+
$this->widgets->set_href_link($GLOBALS['phpgw']->link('/index.php','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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_make_table')));
+
$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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_rm_table')));
+
$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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_admin_clear_entire_table')));
+
$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_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',array('menuaction'=>'email.ui_mail_debug.index','dfunc'=>'db_am_table_exists')));
+
$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_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?array('menuaction'=>'email.uiindex.index&fldball[folder]=INBOX&fldball[acctnum]=4&sort=1&order=1&start=0';
+ //$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?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: inc/class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uicompose.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.uicompose.inc.php 13 Dec 2006 14:57:20 -0000 1.9
+++ inc/class.uicompose.inc.php 15 Dec 2006 15:24:45 -0000 1.10
@@ -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.uicompose.inc.php,v 1.9 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uicompose.inc.php,v 1.10 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -76,8 +76,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
Index: inc/class.uifilters.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifilters.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- inc/class.uifilters.inc.php 14 Dec 2006 15:09:30 -0000 1.19
+++ inc/class.uifilters.inc.php 15 Dec 2006 15:24:45 -0000 1.20
@@ -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.19 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.uifilters.inc.php,v 1.20 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -83,8 +83,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
@@ -173,22 +172,19 @@
//
'menuaction=email.uifilters.filters_edit');
$form_edit_filter_action = $GLOBALS['phpgw']->link(
'/index.php',
-
array('menuaction'=>'email.bofilters.process_submitted_data'));
+
'menuaction=email.bofilters.process_submitted_data');
$form_cancel_action = $GLOBALS['phpgw']->link(
'/index.php',
-
array('menuaction'=>'email.uifilters.filters_list'));
+
'menuaction=email.uifilters.filters_list');
$apply_this_filter_url = $GLOBALS['phpgw']->link(
-
'/index.php',array('menuaction'=>'email.bofilters.do_filter',
-
'filter_num'=>$filter_num));
+ '/index.php',
+
'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 = $GLOBALS['phpgw']->link(
-
'/index.php',array('menuaction'=>'email.bofilters.do_filter',
-
'filter_num'=>$filter_num,
-
'filter_test'=>1));
-
+ $test_this_filter_url =
$apply_this_filter_url.'&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);
@@ -663,8 +659,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
@@ -741,17 +736,17 @@
if ($i != 0)
{
$filters_list[$i]['move_up_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.bofilters.move_up',
-
'filter_num'=>$i));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.bofilters.move_up',
-
'filter_num'=>$i));
+
'/index.php',
+
'menuaction=email.bofilters.move_up'
+
.'&filter_num='.$i);
$filters_list[$i]['move_up_href'] = '<a
href="'.$filters_list[$i]['move_up_url'].'"></a>';
}
@@ -759,31 +754,31 @@
if ($i != $loops-1)
{
$filters_list[$i]['move_down_url'] = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.bofilters.move_down',
-
'filter_num'=>$i));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.bofilters.move_down',
-
'filter_num'=>$i));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.uifilters.filters_edit',
-
'filter_num'=>$i));
+
'/index.php',
+
'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',array(
-
'menuaction'=>'email.bofilters.delete_filter',
-
'filter_num'=>$i));
+
'/index.php',
+
'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);
@@ -809,9 +804,9 @@
}
$add_new_filter_url = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uifilters.filters_edit',
-
'filter_num'=>$this->bo->add_new_filter_token));
+
'/index.php',
+
'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);
@@ -822,16 +817,12 @@
// TEST AND APPLY LINKS
$run_all_filters_url = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.bofilters.do_filter'));
+
'/index.php',
+
'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 = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.bofilters.do_filter',
-
'filter_test'=>1));
-
+ $test_all_filters_url =
$run_all_filters_url.'&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: inc/class.uifolder.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uifolder.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/class.uifolder.inc.php 13 Dec 2006 14:57:20 -0000 1.9
+++ inc/class.uifolder.inc.php 15 Dec 2006 15:24:45 -0000 1.10
@@ -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.uifolder.inc.php,v 1.9 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uifolder.inc.php,v 1.10 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -56,8 +56,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
}
Index: inc/class.uiindex.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uiindex.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.uiindex.inc.php 15 Dec 2006 14:02:38 -0000 1.28
+++ inc/class.uiindex.inc.php 15 Dec 2006 15:24:45 -0000 1.29
@@ -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.uiindex.inc.php,v 1.28 2006/12/15 14:02:38
sigurdne Exp $
+ * @version $Id: class.uiindex.inc.php,v 1.29 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -87,7 +87,6 @@
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
// later: What does that mean ?
@@ -100,7 +99,6 @@
'T_index_blocks' => 'index_blocks.tpl',
'T_index_main' =>
'index_main_b'.$this->bo->xi['my_browser'].'_l'.$this->bo->xi['my_layout'].
'.tpl'
));
-
$this->tpl->set_block('T_index_main','B_action_report','V_action_report');
//$this->tpl->set_block('T_index_main','B_show_size','V_show_size');
//$this->tpl->set_block('T_index_main','B_get_size','V_get_size');
@@ -121,16 +119,16 @@
// fonts and font sizes
// 'ctrl_bar_font' =>
$this->bo->xi['ctrl_bar_font'],
// 'ctrl_bar_font_size' =>
$this->bo->xi['ctrl_bar_font_size'],
- // 'mlist_font' =>
$this->bo->xi['mlist_font'],
+ 'mlist_font' =>
$this->bo->xi['mlist_font'],
'mlist_font_size' =>
$this->bo->xi['mlist_font_size'],
'mlist_font_size_sm' =>
$this->bo->xi['mlist_font_size_sm'],
- // 'stats_font' =>
$this->bo->xi['stats_font'],
+ 'stats_font' =>
$this->bo->xi['stats_font'],
'stats_font_size' =>
$this->bo->xi['stats_font_size'],
'stats_foldername_size' =>
$this->bo->xi['stats_foldername_size'],
- // 'hdr_font' =>
$this->bo->xi['hdr_font'],
+ 'hdr_font' =>
$this->bo->xi['hdr_font'],
'hdr_font_size' =>
$this->bo->xi['hdr_font_size'],
'hdr_font_size_sm' =>
$this->bo->xi['hdr_font_size_sm'],
- // 'ftr_font' =>
$this->bo->xi['ftr_font'],
+ 'ftr_font' =>
$this->bo->xi['ftr_font'],
// other message list stuff, we parse the mlist
block before the rest of the tpl vars are needed
'mlist_newmsg_char' =>
$this->bo->xi['mlist_newmsg_char'],
'mlist_newmsg_color' =>
$this->bo->xi['mlist_newmsg_color'],
@@ -140,7 +138,7 @@
'attach_img' =>
$this->bo->xi['attach_img'],
'check_image' =>
$this->bo->xi['check_image'],
'delmov_image' =>
$this->bo->xi['delmov_image'],
- // 'compose_text' =>
$this->bo->xi['compose_text'],
+ 'compose_text' =>
$this->bo->xi['compose_text'],
'compose_link' =>
$this->bo->xi['compose_link'],
'compose_img' =>
$this->bo->xi['compose_img'],
'compose_clickme' =>
$this->bo->xi['compose_clickme'],
@@ -268,8 +266,8 @@
// in every folder EXCEPT
"Sent" folder, we show who the message came from
$tpl_vars = Array(
// new checkbox value,
new fake_uri method of embedding coumpound data in a single HTML element
- 'mlist_embedded_uri' =>
http_build_query($this->bo->xi['msg_list_dsp'][$i]['uri']),
- // 'mlist_backcolor'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color'],
+ 'mlist_embedded_uri' =>
$this->bo->xi['msg_list_dsp'][$i]['uri'],
+ 'mlist_backcolor'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color'],
'mlist_backcolor_class'
=> $this->bo->xi['msg_list_dsp'][$i]['back_color_class'],
'mlist_subject'
=> $this->bo->xi['msg_list_dsp'][$i]['subject'],
'mlist_subject_link'
=> $this->bo->xi['msg_list_dsp'][$i]['subject_link'],
@@ -363,7 +361,7 @@
// old version of first prev next last arrows
for "layout 1"
'prev_arrows' =>
$this->bo->xi['td_prev_arrows'],
'next_arrows' =>
$this->bo->xi['td_next_arrows'],
- // 'arrows_backcolor' =>
$this->bo->xi['arrows_backcolor'],
+ 'arrows_backcolor' =>
$this->bo->xi['arrows_backcolor'],
'arrows_backcolor_class' =>
$this->bo->xi['arrows_backcolor_class'],
'arrows_td_backcolor' =>
$this->bo->xi['arrows_td_backcolor'],
// part of new first prev next last arrows data
block for "layout 2"
@@ -373,11 +371,11 @@
'prev_page' => $this->bo->xi['prev_page'],
'next_page' => $this->bo->xi['next_page'],
'last_page' => $this->bo->xi['last_page'],
- // 'stats_backcolor' =>
$this->bo->xi['stats_backcolor'],
- // 'stats_color' => $this->bo->xi['stats_color'],
- // 'stats_folder' =>
$this->bo->xi['stats_folder'],
- // 'stats_saved' => $this->bo->xi['stats_saved'],
- // 'stats_new' => $this->bo->xi['stats_new'],
+ 'stats_backcolor' =>
$this->bo->xi['stats_backcolor'],
+ 'stats_color' => $this->bo->xi['stats_color'],
+ 'stats_folder' =>
$this->bo->xi['stats_folder'],
+ 'stats_saved' => $this->bo->xi['stats_saved'],
+ 'stats_new' => $this->bo->xi['stats_new'],
'lang_new' => $this->bo->xi['lang_new'],
'lang_new2' => $this->bo->xi['lang_new2'],
'lang_total' => $this->bo->xi['lang_total'],
@@ -385,15 +383,15 @@
'lang_size' => $this->bo->xi['lang_size'],
'lang_size2' => $this->bo->xi['lang_size2'],
'stats_to_txt' =>
$this->bo->xi['stats_to_txt'],
- // 'stats_first' => $this->bo->xi['stats_first'],
- // 'hdr_backcolor' =>
$this->bo->xi['hdr_backcolor'],
+ 'stats_first' => $this->bo->xi['stats_first'],
+ 'hdr_backcolor' =>
$this->bo->xi['hdr_backcolor'],
'hdr_backcolor_class' =>
$this->bo->xi['hdr_backcolor_class'],
'hdr_subject' => $this->bo->xi['hdr_subject'],
'hdr_from' => $this->bo->xi['hdr_from'],
'hdr_date' => $this->bo->xi['hdr_date'],
'hdr_size' => $this->bo->xi['hdr_size'],
'app_images' =>
$this->bo->xi['image_dir'],
- // 'ftr_backcolor' =>
$this->bo->xi['ftr_backcolor'],
+ 'ftr_backcolor' =>
$this->bo->xi['ftr_backcolor'],
'ftr_backcolor_class' =>
$this->bo->xi['ftr_backcolor_class'],
'delmov_button' => $this->bo->xi['lang_delete'],
'delmov_button' =>
$this->bo->xi['delmov_button'],
@@ -591,7 +589,6 @@
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw']->common->phpgw_header();
- $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
// NOTE: as of Dec 10, 2001 a call from menuaction
defaults to NOT modular
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header and navbar,
(go figure... :)
Index: inc/class.uijsaddressbook.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uijsaddressbook.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- inc/class.uijsaddressbook.inc.php 13 Dec 2006 14:57:20 -0000 1.8
+++ inc/class.uijsaddressbook.inc.php 15 Dec 2006 15:24:45 -0000 1.9
@@ -9,7 +9,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.uijsaddressbook.inc.php,v 1.8 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uijsaddressbook.inc.php,v 1.9 2006/12/15 15:24:45
sigurdne Exp $
*/
@@ -215,8 +215,7 @@
//$this->template->set_root(PHPGW_SERVER_ROOT."/email/templates/".$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']);
// (angles) fix suggested by Dave Hall allows email app
compose page to be used with any template,
// fixes bug where email app compose page needed an
(empty) template named dir in the email dir tree to use said named template
-
//$this->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('email'));
- $this->template->set_root(PHPGW_APP_TPL);
+
$this->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('email'));
$this->template->set_file(array(
'mainframe_t' =>
'addressbook-js-frameset.tpl'
));
Index: inc/class.uimessage.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/class.uimessage.inc.php 15 Dec 2006 14:02:38 -0000 1.16
+++ inc/class.uimessage.inc.php 15 Dec 2006 15:24:45 -0000 1.17
@@ -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.uimessage.inc.php,v 1.16 2006/12/15 14:02:38
sigurdne Exp $
+ * @version $Id: class.uimessage.inc.php,v 1.17 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -65,8 +65,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
// HOWEVER still this class must NOT invoke
$GLOBALS['phpgw']->common->phpgw_header()
// even though we had to output the header (go
figure... :)
}
@@ -138,9 +137,9 @@
//'ilnk_next_msg' =>
$this->bo->xi['ilnk_next_msg'],
// ---- Labels and Colors for From, To, CC,
Files, and Subject -----
- // 'tofrom_labels_bkcolor' =>
$this->bo->xi['tofrom_labels_bkcolor'],
+ 'tofrom_labels_bkcolor' =>
$this->bo->xi['tofrom_labels_bkcolor'],
'tofrom_labels_class' =>
$this->bo->xi['tofrom_labels_class'],
- // 'tofrom_data_bkcolor' =>
$this->bo->xi['tofrom_data_bkcolor'],
+ 'tofrom_data_bkcolor' =>
$this->bo->xi['tofrom_data_bkcolor'],
'tofrom_data_class' =>
$this->bo->xi['tofrom_data_class'],
'lang_inbox_folder' =>
$this->bo->xi['lang_inbox'],
@@ -191,11 +190,11 @@
$tpl_vars = Array(
// ---- Images and Hrefs For Reply, ReplyAll,
Forward, and Delete -----
- // 'theme_font' =>
$this->bo->xi['theme_font'],
- // 'theme_th_bg' =>
$this->bo->xi['theme_th_bg'],
- // 'theme_row_on' =>
$this->bo->xi['theme_row_on'],
- // 'reply_btns_bkcolor' =>
$this->bo->xi['reply_btns_bkcolor'],
- // 'reply_btns_text' =>
$this->bo->xi['reply_btns_text'],
+ 'theme_font' =>
$this->bo->xi['theme_font'],
+ 'theme_th_bg' =>
$this->bo->xi['theme_th_bg'],
+ 'theme_row_on' =>
$this->bo->xi['theme_row_on'],
+ 'reply_btns_bkcolor' =>
$this->bo->xi['reply_btns_bkcolor'],
+ 'reply_btns_text' =>
$this->bo->xi['reply_btns_text'],
'go_back_to' =>
$this->bo->xi['lang_go_back_to'],
'lnk_goback_folder' =>
$this->bo->xi['lnk_goback_folder'],
@@ -221,9 +220,9 @@
}
// ----- Message_Display Template Handles it from here
-------
- //
$this->tpl->set_var('theme_font',$this->bo->xi['theme_font']);
- //
$this->tpl->set_var('theme_th_bg',$this->bo->xi['theme_th_bg']);
- //
$this->tpl->set_var('theme_row_on',$this->bo->xi['theme_row_on']);
+
$this->tpl->set_var('theme_font',$this->bo->xi['theme_font']);
+
$this->tpl->set_var('theme_th_bg',$this->bo->xi['theme_th_bg']);
+
$this->tpl->set_var('theme_row_on',$this->bo->xi['theme_row_on']);
// ---- so called "TOOLBAR" between the msg header
data and the message siaplay
switch
($GLOBALS['phpgw']->msg->get_pref_value('button_type'))
@@ -341,7 +340,7 @@
{
$this->tpl->set_var('title_text',$this->bo->part_nice[$i]['title_text']);
$this->tpl->set_var('display_str',$this->bo->part_nice[$i]['display_str']);
-
$this->tpl->set_var('message_body',$GLOBALS['phpgw']->msg->ascii2utf($this->bo->part_nice[$i]['message_body']));
+
$this->tpl->set_var('message_body',$this->bo->part_nice[$i]['message_body']);
//$this->tpl->parse('V_display_part','B_display_part', True);
//if
($GLOBALS['phpgw']->msg->phpgw_before_xslt)
//{
@@ -374,7 +373,7 @@
// ----- Echo This Data Directly to
the Client
// since the php version of this of
b0rked for large msgs, perhaps use sockets code?
echo '<pre>';
- echo
$GLOBALS['phpgw']->msg->ascii2utf($GLOBALS['phpgw']->msg->phpgw_fetchbody($msgball));
+ echo
$GLOBALS['phpgw']->msg->phpgw_fetchbody($msgball);
echo '</pre>';
// ----- Close Table
$this->tpl->set_var('V_setup_echo_dump','');
@@ -387,6 +386,7 @@
}
}
//@set_time_limit(0);
+
//if ($GLOBALS['phpgw']->msg->phpgw_before_xslt ==
False)
//{
// // fix a b0rk in template showing last item 2
times under XSLT
@@ -429,7 +429,7 @@
}
// ralfbecker patch dated 021124
- if (isset($this->bo->xi['application']) &&
$this->bo->xi['application'])
+ if (isset($this->bo->xi['application']))
{
global $calendar_id;
$calendar_id = $this->bo->xi['calendar_id'];
Index: inc/class.uipreferences.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uipreferences.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.uipreferences.inc.php 13 Dec 2006 14:57:20 -0000 1.22
+++ inc/class.uipreferences.inc.php 15 Dec 2006 15:24:45 -0000 1.23
@@ -9,7 +9,7 @@
* @copyright Copyright (C) 2003-2006 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.uipreferences.inc.php,v 1.22 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.uipreferences.inc.php,v 1.23 2006/12/15 15:24:45
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Based on Aeromail http://the.cushman.net/
*/
@@ -368,8 +368,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
@@ -547,8 +546,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
@@ -722,8 +720,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader']
= True;
$GLOBALS['phpgw_info']['flags']['noappfooter']
= True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
- $this->tpl->set_root(PHPGW_APP_TPL);
+ $GLOBALS['phpgw']->common->phpgw_header();
}
else
{
@@ -802,9 +799,9 @@
}
}
$add_new_acct_url = $GLOBALS['phpgw']->link(
-
'/index.php',array(
-
'menuaction'=>'email.uipreferences.ex_accounts_edit',
-
'ex_acctnum'=>$this->bo->add_new_account_token));
+
'/index.php',
+
'menuaction=email.uipreferences.ex_accounts_edit'
+
.'&ex_acctnum='.$this->bo->add_new_account_token);
$add_new_acct_href = '<a
href="'.$add_new_acct_url.'">'.lang('New Account').'</a>';
$this->tpl->set_var('add_new_acct_href',$add_new_acct_href);
Index: inc/class.uisearch.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.uisearch.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.uisearch.inc.php 14 Dec 2006 15:09:30 -0000 1.6
+++ inc/class.uisearch.inc.php 15 Dec 2006 15:24:45 -0000 1.7
@@ -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.6 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: class.uisearch.inc.php,v 1.7 2006/12/15 15:24:45
sigurdne Exp $
*/
@@ -70,7 +70,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
+ $GLOBALS['phpgw']->common->phpgw_header();
//$GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
//$GLOBALS['phpgw']->msg->begin_request(
array("do_login" => True) );
@@ -88,7 +88,6 @@
$month_date = $this->get_week_date(5);
$t = $GLOBALS['phpgw']->template;
- $t->set_root(PHPGW_APP_TPL);
$t->set_file("frmhandle", "search_form.tpl");
# make a "fldball" to remember what account and folder
we came from initially
@@ -276,7 +275,7 @@
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw_info']['flags']['noappheader'] = True;
$GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
- $GLOBALS['phpgw']->common->phpgw_header(true);
+ $GLOBALS['phpgw']->common->phpgw_header();
//$GLOBALS['phpgw']->msg =
CreateObject('email.mail_msg');
//$GLOBALS['phpgw']->msg->begin_request(
array("do_login" => True) );
@@ -288,7 +287,6 @@
# output the javascript stuff
$jst = $GLOBALS['phpgw']->template;
- $jst->set_root(PHPGW_APP_TPL);
$jst->set_file('search_js', 'search_results_js.tpl');
$jst->pparse('output', 'search_js');
@@ -377,7 +375,7 @@
$t->set_var('form_name',
'delmov_'.$search_vars['fldball']['folder']);
# set form action
- $t->set_var('delmov_action',
$GLOBALS['phpgw']->link('/index.php',
array('menuaction'=>'email.boaction.delmov')));
+ $t->set_var('delmov_action',
$GLOBALS['phpgw']->link('/index.php', 'menuaction=email.boaction.delmov'));
$t->set_var("folder",
$search_vars['fldball']['folder']);
@@ -396,7 +394,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',
array('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',
'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: inc/hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/hook_home.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- inc/hook_home.inc.php 13 Dec 2006 20:30:11 -0000 1.61
+++ inc/hook_home.inc.php 15 Dec 2006 15:24:45 -0000 1.62
@@ -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.61 2006/12/13 20:30:11 sigurdne
Exp $
+ * @version $Id: hook_home.inc.php,v 1.62 2006/12/15 15:24:45 sigurdne
Exp $
*/
@@ -81,22 +81,22 @@
$data[] = array(
'text' => $subject,
'link' => $GLOBALS['phpgw']->link(
- '/index.php',array(
-
'menuaction'=>'email.uimessage.message')
- +$this_loop_msgball['uri']
+ '/index.php',
+
'menuaction=email.uimessage.message'
+ .'&'.$this_loop_msgball['uri']
)
);
}
// COMPOSE NEW email link
$compose_link = $GLOBALS['phpgw']->link(
- '/index.php',array(
- 'menuaction'=>'email.uicompose.compose',
+ '/index.php',
+ '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',array('menuaction'=>'email.uiindex.index')));
+
$my_widgets->set_form_action($GLOBALS['phpgw']->link('/index.php','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,8 +166,6 @@
{
$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)
@@ -223,7 +221,6 @@
$app_id =
$GLOBALS['phpgw']->applications->name2id('email');
$GLOBALS['portal_order'][] = $app_id;
-
$GLOBALS['phpgw']->portalbox->set_params(
array(
'app_id' => $app_id,
Index: inc/hook_notifywindow.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/hook_notifywindow.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- inc/hook_notifywindow.inc.php 14 Dec 2006 15:09:30 -0000 1.15
+++ inc/hook_notifywindow.inc.php 15 Dec 2006 15:24:45 -0000 1.16
@@ -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.15 2006/12/14 15:09:30
sigurdne Exp $
+ * @version $Id: hook_notifywindow.inc.php,v 1.16 2006/12/15 15:24:45
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',array('menuaction'=>'email.uiindex.index')).'";'."\n";
+ echo '
window.opener.document.location.href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=email.uiindex.index').'";'."\n";
echo ' }'."\n";
echo ' //-->'."\n";
echo ' </script>'."\n";
Index: templates/base/index_main_b0_l2.tpl
===================================================================
RCS file: /sources/phpgroupware/email/templates/base/index_main_b0_l2.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- templates/base/index_main_b0_l2.tpl 13 Dec 2006 14:57:21 -0000 1.4
+++ templates/base/index_main_b0_l2.tpl 15 Dec 2006 15:24:45 -0000 1.5
@@ -34,16 +34,6 @@
}
</script>
-<!-- BEGIN B_action_report -->
-<table border="0" cellpadding="0" cellspacing="0" width="100%" align="center">
-<tr>
- <td colspan="7" align="center">
- <font face="{stats_font}"
size="{stats_font_size}">{report_this}</font>
- </td>
-</tr>
-</table>
-<!-- END B_action_report -->
-
{auto_refresh_widget}
{widget_toolbar}
- [Phpgroupware-cvs] email compose.php index.php inc/class.boaction....,
Sigurd Nes <=