git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1167 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index d542f488f4379043637216051824274108d50b63..c36be425ec6d80b6d9b2d4f88bdcc52169137ef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * UI/SOGoUI/UIxComponent.m ([UIxComponent
+       -shortUserNameForDisplay]): simplified method.
+       ([-user]): removed method since [context activeUser] is as useful.
+
 2007-09-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage -logoffAction]):

diff --git a/UI/SOGoUI/UIxComponent.h b/UI/SOGoUI/UIxComponent.h
index ff59968427a7e5f3da0bc478c85f6a6766196244..4435c7303686880e30fcb7d1e0b962ab2be74136 100644 (file)
--- a/UI/SOGoUI/UIxComponent.h
+++ b/UI/SOGoUI/UIxComponent.h
@@ -75,7 +75,6 @@
 - (UIxComponent *) jsCloseWithRefreshMethod: (NSString *) methodName;
 
 /* SoUser */
-- (SoUser *)user;
 - (NSString *)shortUserNameForDisplay;
 
 /* labels */

diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 0e8e45cdbd2ba47a7f33024f9784e77e873adea2..83eb9b18f3d4467a1c04ba3e743a81adcc1a925b 100644 (file)
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -418,35 +418,9 @@ static BOOL uixDebugEnabled = NO;
 
 /* SoUser */
 
-- (SoUser *) user
-{
-  WOContext *ctx;
-  
-  ctx = context;
-
-  return [[[self clientObject] authenticatorInContext: ctx] userInContext: ctx];
-}
-
 - (NSString *) shortUserNameForDisplay
 {
-  // TODO: better use a SoUser formatter?
-  // TODO: who calls that?
-  NSString *s;
-  NSRange  r;
-  
-  // TODO: USE USER MANAGER INSTEAD!
-  
-  s = [[self user] login];
-  if ([s length] < 10)
-    return s;
-    
-  // TODO: algorithm might be inappropriate, depends on the actual UID
-    
-  r = [s rangeOfString:@"."];
-  if (r.length == 0)
-    return s;
-    
-  return [s substringToIndex:r.location];
+  return [[context activeUser] login];
 }
 
 /* labels */