[Phpgroupware-cvs] CVS: email addressbook.php,1.32,1.32.2.1 filters.php,1.5,NONE

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/email
In directory subversions:/tmp/cvs-serv13086

Modified Files:
      Tag: Version-0_9_14-branch
        addressbook.php 
Removed Files:
      Tag: Version-0_9_14-branch
        filters.php 
Log Message:
merging in the HEAD code after discussion and vote in irc channel had skeeter, 
milosch and myself in agreement with this action. A strongly worded email will 
be sent explaining that new features wont be accepted again like this

Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/addressbook.php,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** addressbook.php     11 Dec 2001 01:56:07 -0000      1.32
--- addressbook.php     14 Feb 2002 06:42:43 -0000      1.32.2.1
***************
*** 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 = '&nbsp;'; }
                $lastname = $entries[$i]['n_family'];
!               if (!$lastname) { $lastname = '&nbsp;'; }
!               $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 = '&nbsp;';
!               }
                $lastname = $entries[$i]['n_family'];
!               if (!$lastname)
!               {
!                       $lastname = '&nbsp;';
!               }
!               
!               $personal_firstname = '';
!               $personal_lastname = '';
!               $personal_part = '';
!               if ((isset($firstname))
!               && ($firstname != '')
!               && ($firstname != '&nbsp;'))
!               {
!                       $personal_firstname = $firstname.' ';
!               }
!               if ((isset($lastname))
!               && ($lastname != '')
!               && ($lastname != '&nbsp;'))
!               {
!                       $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  = '&quot;'.$personal_part.'&quot; 
&lt;'.$entries[$i]['email'].'&gt;';
!                       }
!                       else
!                       {
!                               $email  = $entries[$i]['email'];
!                       }
!                       if ((isset($entries[$i]['email_home']))
!                       && (trim($entries[$i]['email_home']) != ''))
!                       {
!                               $hemail = '&quot;'.$personal_part.'&quot; 
&lt;'.$entries[$i]['email_home'].'&gt;';
!                       }
!                       else
!                       {
!                               $hemail = $entries[$i]['email_home'];
!                       }
!               }
!               
                // --------------------- template declaration for list records 
--------------------------
                $GLOBALS['phpgw']->template->set_var(array(

--- filters.php DELETED ---