[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9.2.4
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9.2.4,1.123.2.9.2.5 |
Date: |
Sat, 03 May 2003 17:50:28 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv11147
Modified Files:
Tag: Version-0_9_16-branch
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.123.2.9.2.4
retrieving revision 1.123.2.9.2.5
diff -C2 -r1.123.2.9.2.4 -r1.123.2.9.2.5
*** class.common.inc.php 3 May 2003 10:43:46 -0000 1.123.2.9.2.4
--- class.common.inc.php 3 May 2003 21:50:25 -0000 1.123.2.9.2.5
***************
*** 391,394 ****
--- 391,400 ----
}
+ $display =
$GLOBALS['phpgw_info']['user']['preferences']['common']['account_display'];
+
+ if (!$firstname && !$lastname || $display == 'username')
+ {
+ return $lid;
+ }
if ($lastname)
{
***************
*** 401,423 ****
}
! if(isset($a))
{
! switch(count($a))
! {
! case 0:
! return $lid;
! break;
! case 1:
! return '<' . $lid . '> '
. $a[0];
! break;
! case 2:
! return '<' . $lid . '> '
. implode(', ',$a);
! break;
! }
! }
! else
! {
! return $lid;
}
}
--- 407,424 ----
}
! switch($display)
{
! case 'all':
! $name = "<$lid> ";
! // fall-through
! case 'lastname':
! $name .= implode(', ',$a);
! break;
! case 'firstname':
! default:
! $name = $firstname . ' ' . $lastname;
! break;
}
+ return $name;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.9.2.4,1.123.2.9.2.5,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: sitemgr/templates/default edit_properties.tpl,1.1,1.1.2.1 manage_content.tpl,1.1,1.1.2.1 manage_modules.tpl,1.1,1.1.2.1 sitemgr_footer.tpl,1.5,1.5.2.1 sitemgr_preferences.tpl,1.4,1.4.2.1
- Next by Date:
[Phpgroupware-cvs] CVS: preferences/setup phpgw_de.lang,1.6.2.7.2.5,1.6.2.7.2.6 phpgw_en.lang,1.7.2.9.2.5,1.7.2.9.2.6
- Previous by thread:
[Phpgroupware-cvs] CVS: sitemgr/templates/default edit_properties.tpl,1.1,1.1.2.1 manage_content.tpl,1.1,1.1.2.1 manage_modules.tpl,1.1,1.1.2.1 sitemgr_footer.tpl,1.5,1.5.2.1 sitemgr_preferences.tpl,1.4,1.4.2.1
- Next by thread:
[Phpgroupware-cvs] CVS: preferences/setup phpgw_de.lang,1.6.2.7.2.5,1.6.2.7.2.6 phpgw_en.lang,1.7.2.9.2.5,1.7.2.9.2.6
- Index(es):