[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,1.30.2.1 cl
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.30,1.30.2.1 class.bopreferences.inc.php,1.23,1.23.2.1 class.html_widgets.inc.php,1.3,1.3.2.1 class.mail_msg_base.inc.php,1.78.2.1,1.78.2.2 class.uipreferences.inc.php,1.16,1.16.2.1 hook_preferences.inc.php,1.14,1.14.2.1 |
|
Date: |
Sun, 30 Mar 2003 20:18:09 -0500 |
Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv30853/inc
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
class.uipreferences.inc.php hook_preferences.inc.php
Log Message:
added 3-level preferences (user/default/forced) via the preferences app,
This is not completly finished by now, angles has some extra functionalty in
the prefs which is not yet ported.
Index: class.boindex.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.boindex.inc.php,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** class.boindex.inc.php 14 Mar 2003 04:00:10 -0000 1.30
--- class.boindex.inc.php 31 Mar 2003 01:18:06 -0000 1.30.2.1
***************
*** 573,580 ****
--- 573,586 ----
// FIXME
+ /* TEST-RALFBECKER
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
'/index.php',
'menuaction=email.uipreferences.preferences'
.'&ex_acctnum='.$GLOBALS['phpgw']->msg->get_acctnum());
+ */
+ $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');
***************
*** 1060,1066 ****
--- 1066,1076 ----
$this->xi['folders_btn'] = ' ';
}
+ /* TEST-RALFBECKER
$this->xi['email_prefs_link'] = $GLOBALS['phpgw']->link(
'/index.php',
'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');
Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bopreferences.inc.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** class.bopreferences.inc.php 14 Mar 2003 04:00:15 -0000 1.23
--- class.bopreferences.inc.php 31 Mar 2003 01:18:06 -0000 1.23.2.1
***************
*** 1867,1873 ****
--- 1867,1878 ----
// NEXT: control action links
+ /* TEST-RALFBECKER
$return_list[$next_pos]['edit_url'] =
$GLOBALS['phpgw']->link(
'/index.php',
'menuaction=email.uipreferences.ex_accounts_edit'
.'&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>';
Index: class.html_widgets.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.html_widgets.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** class.html_widgets.inc.php 14 Mar 2003 04:00:42 -0000 1.3
--- class.html_widgets.inc.php 31 Mar 2003 01:18:06 -0000 1.3.2.1
***************
*** 1,127 ****
! <?php
!
/**************************************************************************\
! * AngleMail - E-Mail Module for phpGroupWare
*
! * http://www.anglemail.org
*
! * http://www.phpgroupware.org
*
! */
!
/**************************************************************************\
! * AngleMail - HTML Widgets
*
! * This file written by "Angles" Angelo Puglisi <address@hidden> *
! * Email related HTML Widgets and Utility Functions
*
[...3226 lines suppressed...]
! {
! // we have no URI to reload
! $reload_js = '';
! }
! // returning $reload_js which may be '' if we did not
have enough info
! return $reload_js;
! }
/**************************************************************************\
***************
*** 1750,1753 ****
}
! }
! ?>
--- 1755,1758 ----
}
! }
! ?>
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.1
retrieving revision 1.78.2.2
diff -C2 -r1.78.2.1 -r1.78.2.2
*** class.mail_msg_base.inc.php 29 Mar 2003 23:14:26 -0000 1.78.2.1
--- class.mail_msg_base.inc.php 31 Mar 2003 01:18:06 -0000 1.78.2.2
***************
*** 1890,1894 ****
$widgets->init_error_report_values();
$widgets->prop_error_report_text($error_text_formatted);
!
if ((string)$acctnum == '0')
{
--- 1890,1894 ----
$widgets->init_error_report_values();
$widgets->prop_error_report_text($error_text_formatted);
! /* TEST-RALFBECKER
if ((string)$acctnum == '0')
{
***************
*** 1904,1907 ****
--- 1904,1910 ----
'show_help' => '1'));
}
+ */
+ $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);
Index: class.uipreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uipreferences.inc.php,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** class.uipreferences.inc.php 14 Mar 2003 04:01:48 -0000 1.16
--- class.uipreferences.inc.php 31 Mar 2003 01:18:07 -0000 1.16.2.1
***************
*** 67,70 ****
--- 67,71 ----
function create_prefs_block($feed_prefs='')
{
+ //echo "feed_prefs=<pre>"; print_r($feed_prefs); echo "</pre>\n";
if ($this->debug > 0 ) { echo
'email.uipreferences.create_prefs_block: ENTERING, $this->bo->account_group:
['.$this->bo->account_group.']; $this->bo->acctnum:
['.$this->bo->acctnum.']<br>'; }
$return_block = '';
Index: hook_preferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/hook_preferences.inc.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** hook_preferences.inc.php 14 Mar 2003 04:01:54 -0000 1.14
--- hook_preferences.inc.php 31 Mar 2003 01:18:07 -0000 1.14.2.1
***************
*** 15,50 ****
$title = $appname;
$file = Array(
! 'E-Mail Preferences' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=email.uipreferences.preferences'),
'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')
);
! $this_ver = $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
! $pre_xslt_ver = '0.9.14.0.1.1';
! if (function_exists(amorethanb))
! {
! if (($this_ver)
! && (amorethanb($this_ver, $pre_xslt_ver)))
! {
! // this is the xslt template era
! display_section($appname,$file);
! }
! else
! {
! display_section($appname,$title,$file);
! }
! }
! else
! {
! if (($this_ver)
! && ($GLOBALS['phpgw']->common->cmp_version_long($this_ver,
$pre_xslt_ver)))
! {
! // this is the xslt template era
! display_section($appname,$file);
! }
! else
! {
! display_section($appname,$title,$file);
! }
! }
}
?>
--- 15,24 ----
$title = $appname;
$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')
);
! display_section($appname,$file);
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email/inc class.boindex.inc.php,1.30,1.30.2.1 class.bopreferences.inc.php,1.23,1.23.2.1 class.html_widgets.inc.php,1.3,1.3.2.1 class.mail_msg_base.inc.php,1.78.2.1,1.78.2.2 class.uipreferences.inc.php,1.16,1.16.2.1 hook_preferences.inc.php,1.14,1.14.2.1,
Ralf Becker <address@hidden> <=