[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.207,1.208

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv21741

Modified Files:
        class.common.inc.php 
Log Message:
account-display is now configurable via the prefs:
- Firstname Lastname (default)
- Lastname, Firstname
- username
- <username> Lastname, Firstname


Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -r1.207 -r1.208
*** class.common.inc.php        3 May 2003 10:59:16 -0000       1.207
--- class.common.inc.php        3 May 2003 22:22:02 -0000       1.208
***************
*** 411,419 ****
                        }
  
!                       if ($firstname)
                        {
!                               $a[] = $firstname;
                        }
- 
                        if ($lastname)
                        {
--- 411,420 ----
                        }
  
!                       $display = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['account_display'];
! 
!                       if (!$firstname && !$lastname || $display == 'username')
                        {
!                               return $lid;
                        }
                        if ($lastname)
                        {
***************
*** 421,443 ****
                        }
  
!                       if(isset($a))
                        {
!                               switch(count($a))
!                               {
!                                       case 0:
!                                               return $lid;
!                                               break;
!                                       case 1:
!                                               return $a[0] . ' <' . $lid . 
'>';
!                                               break;
!                                       case 2:
!                                               return $a[0] . ' ' . $a[1] .' 
<' . $lid . '>'; //implode(', ',$a);
!                                               break;
!                               }
                        }
!                       else
                        {
!                               return $lid;
                        }
                }
  
--- 422,444 ----
                        }
  
!                       if ($firstname)
                        {
!                               $a[] = $firstname;
                        }
! 
!                       switch($display)
                        {
!                               case 'all':
!                                       $name = "&lt;$lid&gt; ";
!                                       // fall-through
!                               case 'lastname':
!                                       $name .= implode(', ',$a);
!                                       break;
!                               case 'firstname':
!                               default:
!                                       $name = $firstname . ' ' . $lastname;
!                                       break;
                        }
+                       return $name;
                }