Index: moodlelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
retrieving revision 1.933
diff -c -r1.933 moodlelib.php
*** moodlelib.php	31 Aug 2007 03:46:00 -0000	1.933
--- moodlelib.php	1 Sep 2007 17:59:05 -0000
***************
*** 2369,2390 ****
      }
  
      if ($CFG->fullnamedisplay == 'firstname lastname') {
!         return $user->firstname .' '. $user->lastname;
  
      } else if ($CFG->fullnamedisplay == 'lastname firstname') {
          return $user->lastname .' '. $user->firstname;
  
      } else if ($CFG->fullnamedisplay == 'firstname') {
          if ($override) {
              return get_string('fullnamedisplay', '', $user);
          } else {
!             return $user->firstname;
          }
      }
  
      return get_string('fullnamedisplay', '', $user);
  }
  
  /**
   * Sets a moodle cookie with an encrypted string
   *
--- 2369,2413 ----
      }
  
      if ($CFG->fullnamedisplay == 'firstname lastname') {
!         if ($CFG->titlecasename == '1') {
!             return nametotitlecase($user->firstname) .' '. nametotitlecase($user->lastname);
!         } else {
!             return $user->firstname .' '. $user->lastname;
!         }
  
      } else if ($CFG->fullnamedisplay == 'lastname firstname') {
+     if ($CFG->titlecasename == '1') {
+         return nametotitlecase($user->lastname) .' '. nametotitlecase($user->firstname);
+     } else {
          return $user->lastname .' '. $user->firstname;
+     }
  
      } else if ($CFG->fullnamedisplay == 'firstname') {
          if ($override) {
              return get_string('fullnamedisplay', '', $user);
          } else {
!             if ($CFG->titlecasename == '1') {
!                 return $user->firstname;
!             } else {
!                 return nametotitlecase($user->firstname);
!             }
          }
      }
  
      return get_string('fullnamedisplay', '', $user);
  }
  
+ 
+ function nametotitlecase($name) {
+     $name = strtolower($name);
+     $name = join("'", array_map('ucwords', explode("'", $name)));
+     $name = join("-", array_map('ucwords', explode("-", $name)));
+     $name = join("Mac", array_map('ucwords', explode("Mac", $name)));
+     $name = join("Mc", array_map('ucwords', explode("Mc", $name)));
+     return $name;
+ }
+ 
+ 
  /**
   * Sets a moodle cookie with an encrypted string
   *