[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: email addressbook.php,1.32,1.33
From: |
Angelo Tony Puglisi <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: email addressbook.php,1.32,1.33 |
Date: |
Mon, 14 Jan 2002 15:51:41 -0500 |
Update of /cvsroot/phpgroupware//email
In directory subversions:/tmp/cvs-serv5685/email
Modified Files:
addressbook.php
Log Message:
add bcc, real names in address book to compose page, download raw email, bug
fixes I cant remember, like rfc default to type text instead of unknown, move
messages and change accounts from the message view page itself, other stuff
Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware//email/addressbook.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** addressbook.php 11 Dec 2001 01:56:07 -0000 1.32
--- addressbook.php 14 Jan 2002 20:51:36 -0000 1.33
***************
*** 1,14 ****
<?php
! /**************************************************************************\
! * phpGroupWare - email/addressbook *
! * http://www.phpgroupware.org *
! * Written by Bettina Gille address@hidden *
! * ----------------------------------------------- *
! * This program is free software; you can redistribute it and/or modify it *
! * under the terms of the GNU General Public License as published by the *
! * Free Software Foundation; either version 2 of the License, or (at your *
! * option) any later version. *
! \**************************************************************************/
! /* $Id$ */
$GLOBALS['phpgw_info']['flags'] = array(
--- 1,15 ----
<?php
!
/**************************************************************************\
! * phpGroupWare - email/addressbook
*
! * http://www.phpgroupware.org
*
! * Written by Bettina Gille address@hidden *
! * -----------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
$GLOBALS['phpgw_info']['flags'] = array(
***************
*** 30,34 ****
$c = CreateObject('phpgwapi.categories');
$c->app_name = 'addressbook';
!
$charset = $GLOBALS['phpgw']->translation->translate('charset');
$GLOBALS['phpgw']->template->set_var('charset',$charset);
--- 31,38 ----
$c = CreateObject('phpgwapi.categories');
$c->app_name = 'addressbook';
!
! $include_personal = True;
! //$include_personal = False;
!
$charset = $GLOBALS['phpgw']->translation->translate('charset');
$GLOBALS['phpgw']->template->set_var('charset',$charset);
***************
*** 42,63 ****
$GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select
category'));
! if (! $start) { $start = 0; }
! if (!$filter) { $filter = 'none'; }
if (!$cat_id)
{
! if ($filter == 'none') { $qfilter = 'tid=n'; }
! elseif ($filter == 'private') { $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id']; }
! else { $qfilter = 'tid=n,owner='.$filter; }
}
else
{
! if ($filter == 'none') { $qfilter = 'tid=n,cat_id='.$cat_id; }
! elseif ($filter == 'private') { $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'].',cat_id='.$cat_id;
}
! else { $qfilter = 'tid=n,owner='.$filter.'cat_id='.$cat_id; }
}
! if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{
$offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 46,92 ----
$GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select
category'));
! if (! $start)
! {
! $start = 0;
! }
! if (!$filter)
! {
! $filter = 'none';
! }
if (!$cat_id)
{
! if ($filter == 'none')
! {
! $qfilter = 'tid=n';
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'];
! }
! else
! {
! $qfilter = 'tid=n,owner='.$filter;
! }
}
else
{
! if ($filter == 'none')
! {
! $qfilter = 'tid=n,cat_id='.$cat_id;
! }
! elseif ($filter == 'private')
! {
! $qfilter =
'tid=n,owner='.$GLOBALS['phpgw_info']['user']['account_id'].',cat_id='.$cat_id;
! }
! else
! {
! $qfilter = 'tid=n,owner='.$filter.'cat_id='.$cat_id;
! }
}
! if
(($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'])
! &&
($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0))
{
$offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
***************
*** 111,120 ****
$GLOBALS['phpgw']->template->set_var(tr_color,$tr_color);
$firstname = $entries[$i]['n_given'];
! if (!$firstname) { $firstname = ' '; }
$lastname = $entries[$i]['n_family'];
! if (!$lastname) { $lastname = ' '; }
! $id = $entries[$i]['id'];
! $email = $entries[$i]['email'];
! $hemail = $entries[$i]['email_home'];
// --------------------- template declaration for list records
--------------------------
$GLOBALS['phpgw']->template->set_var(array(
--- 140,200 ----
$GLOBALS['phpgw']->template->set_var(tr_color,$tr_color);
$firstname = $entries[$i]['n_given'];
! if (!$firstname)
! {
! $firstname = ' ';
! }
$lastname = $entries[$i]['n_family'];
! if (!$lastname)
! {
! $lastname = ' ';
! }
!
! $personal_firstname = '';
! $personal_lastname = '';
! $personal_part = '';
! if ((isset($firstname))
! && ($firstname != '')
! && ($firstname != ' '))
! {
! $personal_firstname = $firstname.' ';
! }
! if ((isset($lastname))
! && ($lastname != '')
! && ($lastname != ' '))
! {
! $personal_lastname = $lastname;
! }
! $personal_part = $personal_firstname.$personal_lastname;
!
! if (($personal_part == '')
! || ($include_personal == False))
! {
! $id = $entries[$i]['id'];
! $email = $entries[$i]['email'];
! $hemail = $entries[$i]['email_home'];
! }
! else
! {
! $id = $entries[$i]['id'];
! if ((isset($entries[$i]['email']))
! && (trim($entries[$i]['email']) != ''))
! {
! $email = '"'.$personal_part.'"
<'.$entries[$i]['email'].'>';
! }
! else
! {
! $email = $entries[$i]['email'];
! }
! if ((isset($entries[$i]['email_home']))
! && (trim($entries[$i]['email_home']) != ''))
! {
! $hemail = '"'.$personal_part.'"
<'.$entries[$i]['email_home'].'>';
! }
! else
! {
! $hemail = $entries[$i]['email_home'];
! }
! }
!
// --------------------- template declaration for list records
--------------------------
$GLOBALS['phpgw']->template->set_var(array(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: email addressbook.php,1.32,1.33,
Angelo Tony Puglisi <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: email/templates/default addressbook.tpl,1.7,1.8 compose.tpl,1.2,1.3 message_main.tpl,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php,1.11,1.12 class.bocompose.inc.php,1.1,1.2 class.boindex.inc.php,1.20,1.21 class.bomessage.inc.php,1.5,1.6 class.bosend.inc.php,1.6,1.7 class.mail_msg_base.inc.php,1.61,1.62 class.mail_msg_display.inc.php,1.31,1.32 class.mail_msg_wrappers.inc.php,1.23,1.24 class.uicompose.inc.php,1.1,1.2 class.uimessage.inc.php,1.2,1.3 class.uipreferences.inc.php,1.9,1.10 hook_home.inc.php,1.48,1.49
- Previous by thread:
[Phpgroupware-cvs] CVS: email/templates/default addressbook.tpl,1.7,1.8 compose.tpl,1.2,1.3 message_main.tpl,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: email/inc class.boaction.inc.php,1.11,1.12 class.bocompose.inc.php,1.1,1.2 class.boindex.inc.php,1.20,1.21 class.bomessage.inc.php,1.5,1.6 class.bosend.inc.php,1.6,1.7 class.mail_msg_base.inc.php,1.61,1.62 class.mail_msg_display.inc.php,1.31,1.32 class.mail_msg_wrappers.inc.php,1.23,1.24 class.uicompose.inc.php,1.1,1.2 class.uimessage.inc.php,1.2,1.3 class.uipreferences.inc.php,1.9,1.10 hook_home.inc.php,1.48,1.49
- Index(es):