[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] api/class.prefs.php, 1.1.1.1.2.19
From: |
nomail |
Subject: |
[Phpgroupware-cvs] api/class.prefs.php, 1.1.1.1.2.19 |
Date: |
Tue, 6 Jul 2004 09:24:00 +0200 |
Update of /api
Modified Files:
Branch: proposal-branch
class.prefs.php
date: 2004/07/06 07:24:00; author: jengo; state: Exp; lines: +33 -33
Log Message:
Initial work to ACL, more info is in the wiki journal
=====================================================================
Index: api/class.prefs.php
diff -u api/class.prefs.php:1.1.1.1.2.18 api/class.prefs.php:1.1.1.1.2.19
--- api/class.prefs.php:1.1.1.1.2.18 Wed May 19 04:01:19 2004
+++ api/class.prefs.php Tue Jul 6 07:24:00 2004
@@ -260,41 +260,41 @@
$lastname =
$GLOBALS['phpgw_data']['user']['lastname'];
}
- if (! $firstname && ! $lastname ||
$GLOBALS['phpgw_data']['prefs']['api.account_display'] == 'username')
- {
- return $loginid;
- }
-
- if ($lastname)
- {
- $a[] = $lastname;
- }
-
- if ($firstname)
- {
- $a[] = $firstname;
- }
+ if (! $firstname && ! $lastname ||
$GLOBALS['phpgw_data']['prefs']['api.account_display'] == 'username')
+ {
+ return $loginid;
+ }
+
+ if ($lastname)
+ {
+ $a[] = $lastname;
+ }
+
+ if ($firstname)
+ {
+ $a[] = $firstname;
+ }
switch
($GLOBALS['phpgw_data']['prefs']['api.account_display'])
{
- case 'all':
- if ($id)
- {
- $name = '[' . $id . '] ';
- }
- // fall-through
- case 'lastname':
- $name .= implode(', ',$a);
- break;
- case 'firstall':
- if ($id)
- {
- $name = ' [' . $id . ']';
- }
- // fall-through
- case 'firstname':
- default:
- $name = $firstname . ' ' . $lastname .
$name;
+ case 'all':
+ if ($id)
+ {
+ $name = '[' . $id . '] ';
+ }
+ // fall-through
+ case 'lastname':
+ $name .= implode(', ',$a);
+ break;
+ case 'firstall':
+ if ($id)
+ {
+ $name = ' [' . $id . ']';
+ }
+ // fall-through
+ case 'firstname':
+ default:
+ $name = $firstname . ' ' . $lastname .
$name;
}
return $name;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] api/class.prefs.php, 1.1.1.1.2.19,
nomail <=