[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.30.2.2,1.30.2.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.30.2.2,1.30.2.3 class.bopreferences.inc.php,1.23.2.1,1.23.2.2 class.html_widgets.inc.php,1.3.2.1,1.3.2.2 class.mail_msg_base.inc.php,1.78.2.2,1.78.2.3 hook_preferences.inc.php,1.14.2.3,1.14.2.4 |
|
Date: |
Sun, 06 Apr 2003 06:09:14 -0400 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv17140
Modified Files:
Tag: Version-0_9_16-branch
class.boindex.inc.php class.bopreferences.inc.php
class.html_widgets.inc.php class.mail_msg_base.inc.php
hook_preferences.inc.php
Log Message:
fixed handling for prefixes, prefix was not uses for saveing the prefs
Index: class.boindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -C2 -r1.30.2.2 -r1.30.2.3
*** class.boindex.inc.php 6 Apr 2003 00:00:44 -0000 1.30.2.2
--- class.boindex.inc.php 6 Apr 2003 10:09:11 -0000 1.30.2.3
***************
*** 580,586 ****
*/
$acctnum = $GLOBALS['phpgw']->msg->get_acctnum();
! $this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
!
'/preferences/preferences.php','appname=email'.
!
($acctnum?"&prefix=ex_accounts/$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');
--- 580,587 ----
*/
$acctnum = $GLOBALS['phpgw']->msg->get_acctnum();
! $this->xi['email_prefs_link'] =
$GLOBALS['phpgw']->link('/preferences/preferences.php',array(
! 'appname' => 'email',
! 'prefix' => $acctnum ? 'ex_accounts/'.$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');
***************
*** 1071,1076 ****
'menuaction=email.uipreferences.preferences');
*/
! $this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
!
'/preferences/preferences.php','appname=email');
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/filters.php');
--- 1072,1081 ----
'menuaction=email.uipreferences.preferences');
*/
! $acctnum = $GLOBALS['phpgw']->msg->get_acctnum();
! $this->xi['email_prefs_link'] =
$GLOBALS['phpgw']->link('/preferences/preferences.php',array(
! 'appname' => 'email',
! 'prefix' => $acctnum ? 'ex_accounts/'.$acctnum
: ''
! ));
!
$this->xi['filters_link'] = $GLOBALS['phpgw']->link(
'/'.$GLOBALS['phpgw_info']['flags']['currentapp'].'/filters.php');
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bopreferences.inc.php,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -r1.23.2.1 -r1.23.2.2
*** class.bopreferences.inc.php 31 Mar 2003 01:18:06 -0000 1.23.2.1
--- class.bopreferences.inc.php 6 Apr 2003 10:09:11 -0000 1.23.2.2
***************
*** 1872,1878 ****
.'&ex_acctnum='.$this_acctnum);
*/
! $return_list[$next_pos]['edit_url'] =
$GLOBALS['phpgw']->link(
!
'/preferences/preferences.php',
!
'appname=email&prefix=ex_accounts/'.$this_acctnum);
$return_list[$next_pos]['edit_href'] =
'<a href="'.$return_list[$next_pos]['edit_url'].'">'.lang('Edit').'</a>';
--- 1872,1879 ----
.'&ex_acctnum='.$this_acctnum);
*/
! $return_list[$next_pos]['edit_url'] =
$GLOBALS['phpgw']->link('/preferences/preferences.php',array(
! 'appname' => 'email',
! 'prefix' => $this_acctnum ?
'ex_accounts/'.$this_acctnum : ''
! ));
$return_list[$next_pos]['edit_href'] =
'<a href="'.$return_list[$next_pos]['edit_url'].'">'.lang('Edit').'</a>';
Index: class.html_widgets.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** class.html_widgets.inc.php 31 Mar 2003 01:18:06 -0000 1.3.2.1
--- class.html_widgets.inc.php 6 Apr 2003 10:09:11 -0000 1.3.2.2
***************
*** 959,964 ****
*/
$acctnum = $GLOBALS['phpgw']->msg->get_acctnum();
! $email_prefs_link =
$GLOBALS['phpgw']->link('/preferences/preferences.php',
!
'appname=email'.($acctnum?"&prefix=ex_accounts/$acctnum":''));
// Check to see if mailserver supports folders.
$has_folders =
$GLOBALS['phpgw']->msg->get_mailsvr_supports_folders();
--- 959,966 ----
*/
$acctnum = $GLOBALS['phpgw']->msg->get_acctnum();
! $email_prefs_link =
$GLOBALS['phpgw']->link('/preferences/preferences.php',array(
! 'appname' => 'email',
! 'prefix' => $acctnum ? 'ex_accounts/'.$acctnum
: ''
! ));
// Check to see if mailserver supports folders.
$has_folders =
$GLOBALS['phpgw']->msg->get_mailsvr_supports_folders();
Index: class.mail_msg_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_msg_base.inc.php,v
retrieving revision 1.78.2.2
retrieving revision 1.78.2.3
diff -C2 -r1.78.2.2 -r1.78.2.3
*** class.mail_msg_base.inc.php 31 Mar 2003 01:18:06 -0000 1.78.2.2
--- class.mail_msg_base.inc.php 6 Apr 2003 10:09:11 -0000 1.78.2.3
***************
*** 1905,1910 ****
}
*/
! $go_somewhere_url =
$GLOBALS['phpgw']->link('/preferences/preferences.php',
!
'appname=email'.($acctnum?"&prefix=ex_accounts/$acctum":''));
$go_somewhere_text = lang('click here to edit
the settings for this email account.');
$widgets->prop_go_somewhere_link($go_somewhere_url, $go_somewhere_text);
--- 1905,1912 ----
}
*/
! $go_somewhere_url =
$GLOBALS['phpgw']->link('/preferences/preferences.php',array(
! 'appname' => 'email',
! 'prefix' => $acctnum ?
'ex_accounts/'.$acctnum : ''
! ));
$go_somewhere_text = lang('click here to edit
the settings for this email account.');
$widgets->prop_go_somewhere_link($go_somewhere_url, $go_somewhere_text);
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_preferences.inc.php,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -C2 -r1.14.2.3 -r1.14.2.4
*** hook_preferences.inc.php 3 Apr 2003 21:27:18 -0000 1.14.2.3
--- hook_preferences.inc.php 6 Apr 2003 10:09:12 -0000 1.14.2.4
***************
*** 16,20 ****
$file = Array(
//TEST-RALFBECKER 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=email'),
'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
--- 16,20 ----
$file = Array(
//TEST-RALFBECKER 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=email&prefix='),
// need empty prefix
'Extra E-Mail Accounts' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.ex_accounts_list'),
'E-Mail Filters' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uifilters.filters_list')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.30.2.2,1.30.2.3 class.bopreferences.inc.php,1.23.2.1,1.23.2.2 class.html_widgets.inc.php,1.3.2.1,1.3.2.2 class.mail_msg_base.inc.php,1.78.2.2,1.78.2.3 hook_preferences.inc.php,1.14.2.3,1.14.2.4,
Ralf Becker <address@hidden> <=