1 files changed, 31 insertions, 8 deletions
diff --git a/libbe/ui/util/user.py b/libbe/ui/util/user.py
index 35665e4..261ecdf 100644
--- a/libbe/ui/util/user.py
+++ b/libbe/ui/util/user.py
@@ -1,4 +1,5 @@
-# Copyright (C) 2009-2011 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2009-2011 Chris Ball <cjb@laptop.org>
+#                         W. Trevor King <wking@drexel.edu>
 #
 # This file is part of Bugs Everywhere.
 #
@@ -28,32 +29,54 @@ are human-readable tags refering to objects.
 
 try:
     from email.utils import formataddr, parseaddr
-except ImportErrror: # adjust to old python < 2.5
+except ImportErrror:  # adjust to old python < 2.5
     from email.Utils import formataddr, parseaddr
 import os
+try:
+    import pwd
+except ImportError:  # handle non-Unix systems
+    pwd = None
 import re
 from socket import gethostname
 
 import libbe
 import libbe.storage.util.config
 
+
 def get_fallback_username():
     """Return a username extracted from environmental variables.
     """
     name = None
-    for env in ["LOGNAME", "USERNAME"]:
+    for env in ['LOGNAME', 'USERNAME']:
+        if os.environ.has_key(env):
+            name = os.environ[env]
+            break
+    if name is None and pwd:
+        pw_ent = pwd.getpwuid(os.getuid())
+        name = pw_ent.pw_name
+    assert name is not None
+    return name
+
+def get_fallback_fullname():
+    """Return a full name extracted from environmental variables.
+    """
+    name = None
+    for env in ['FULLNAME']:
         if os.environ.has_key(env):
             name = os.environ[env]
             break
-    assert name != None
+    if pwd and not name:
+        pw_ent = pwd.getpwuid(os.getuid())
+        name = pw_ent.pw_gecos.split(',', 1)[0]
+    if not name:
+        name = get_fallback_username()
     return name
 
 def get_fallback_email():
     """Return an email address extracted from environmental variables.
     """
-    hostname = gethostname()
-    name = get_fallback_username()
-    return "%s@%s" % (name, hostname)
+    return os.getenv('EMAIL') or '%s@%s' % (
+        get_fallback_username(), gethostname())
 
 def create_user_id(name, email=None):
     """Create a user ID string from given `name` and `email` strings.
@@ -122,7 +145,7 @@ def get_user_id(storage=None):
         user = storage.get_user_id()
         if user != None:
             return user
-    name = get_fallback_username()
+    name = get_fallback_fullname()
     email = get_fallback_email()
     user = create_user_id(name, email)
     return user