[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] email/inc class.html_widgets.inc.php class.mail...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] email/inc class.html_widgets.inc.php class.mail... |
|
Date: |
Wed, 13 Dec 2006 15:45:00 +0000 |
CVSROOT: /sources/phpgroupware
Module name: email
Changes by: Sigurd Nes <sigurdne> 06/12/13 15:45:00
Modified files:
inc : class.html_widgets.inc.php
class.mail_msg_base.inc.php
class.mail_msg_display.inc.php
class.mail_msg_wrappers.inc.php
class.svc_nextmatches.inc.php
Log message:
links
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.html_widgets.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_base.inc.php?cvsroot=phpgroupware&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_display.inc.php?cvsroot=phpgroupware&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.mail_msg_wrappers.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/email/inc/class.svc_nextmatches.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
Patches:
Index: class.html_widgets.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.html_widgets.inc.php 25 Sep 2006 13:07:06 -0000 1.7
+++ class.html_widgets.inc.php 13 Dec 2006 15:45:00 -0000 1.8
@@ -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.7 2006/09/25 13:07:06
skwashd Exp $
+ * @version $Id: class.html_widgets.inc.php,v 1.8 2006/12/13 15:45:00
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -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','menuaction=email.uipreferences.ex_accounts_list');
+ $accounts_link =
$GLOBALS['phpgw']->link('/index.php',array('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','menuaction=email.uiindex.index'));
+
$this->set_form_action($GLOBALS['phpgw']->link('/index.php',array('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','menuaction=email.uiindex.index'));
+
$this->set_form_action($GLOBALS['phpgw']->link('/index.php',array('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: class.mail_msg_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- class.mail_msg_base.inc.php 13 Dec 2006 14:57:20 -0000 1.86
+++ class.mail_msg_base.inc.php 13 Dec 2006 15:45:00 -0000 1.87
@@ -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.86 2006/12/13 14:57:20
sigurdne Exp $
+ * @version $Id: class.mail_msg_base.inc.php,v 1.87 2006/12/13 15:45:00
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
* @internal Originally Based on Aeromail http://the.cushman.net/
*/
@@ -1642,12 +1642,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 =
- '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 = 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'));
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);
@@ -1662,12 +1662,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 =
- '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 = 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'));
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);
Index: class.mail_msg_display.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_display.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- class.mail_msg_display.inc.php 16 Aug 2006 14:50:08 -0000 1.45
+++ class.mail_msg_display.inc.php 13 Dec 2006 15:45:00 -0000 1.46
@@ -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.45 2006/08/16
14:50:08 skwashd Exp $
+ * @version $Id: class.mail_msg_display.inc.php,v 1.46 2006/12/13
15:45:00 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -2841,12 +2841,14 @@
// 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',
-
'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'));
+ '/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']);
// SIZE
if ($this->newsmode)
@@ -3008,11 +3010,13 @@
// 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',
-
$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']));
+ 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']);
if ($personal != $from->mailbox.'@'.$from->host)
{
$msg_list_display[$x]['from_link'] =
$msg_list_display[$x]['from_link'] .'&personal='.urlencode($personal);
Index: class.mail_msg_wrappers.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.mail_msg_wrappers.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- class.mail_msg_wrappers.inc.php 30 Aug 2006 16:25:28 -0000 1.42
+++ class.mail_msg_wrappers.inc.php 13 Dec 2006 15:45:00 -0000 1.43
@@ -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.42 2006/08/30
16:25:28 skwashd Exp $
+ * @version $Id: class.mail_msg_wrappers.inc.php,v 1.43 2006/12/13
15:45:00 sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -3018,7 +3018,9 @@
// 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'] =
'msgball[msgnum]='.$return_struct['msgnum'].'&msgball[folder]='.$return_struct['folder'].'&msgball[acctnum]='.$return_struct['acctnum'];
+ $return_struct['uri'] =
array('msgball[msgnum]'=>$return_struct['msgnum'],
+
'msgball[folder]'=>$return_struct['folder'],
+
'msgball[acctnum]'=>$return_struct['acctnum']);
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;
Index: class.svc_nextmatches.inc.php
===================================================================
RCS file: /sources/phpgroupware/email/inc/class.svc_nextmatches.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- class.svc_nextmatches.inc.php 11 May 2005 18:06:59 -0000 1.5
+++ class.svc_nextmatches.inc.php 13 Dec 2006 15:45:00 -0000 1.6
@@ -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.5 2005/05/11 18:06:59
powerstat Exp $
+ * @version $Id: class.svc_nextmatches.inc.php,v 1.6 2006/12/13 15:45:00
sigurdne Exp $
* @internal Based on AngleMail http://www.anglemail.org/
*/
@@ -75,6 +75,27 @@
}
/*!
+ @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:'');
+ unset($new_extra);
+ return $extra;
+ }
+
+ /*!
@function page
@abstract ?
*/
@@ -120,9 +141,10 @@
*/
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_string($extra);
+ $extra = $this->extras_to_array($extra);
}
if($old_sort == $new_sort)
{
@@ -165,7 +187,31 @@
//echo 'show_sort_order_mail: $extra
['.serialize($extra).'] <br />';
$prog = explode('?',$program);
//echo 'show_sort_order_mail: $prog
['.serialize($prog).'] <br />';
- $extravar =
$prog[1].'&order='.$our_order.'&sort='.$new_sort.$extra;
+
+ $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.$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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] email/inc class.html_widgets.inc.php class.mail...,
Sigurd Nes <=