Fixes the code used to synchronize passwords back to Google Apps;

[platal.git] / modules / xnet.php

diff --git a/modules/xnet.php b/modules/xnet.php
index 9f7e6b3..6964996 100644 (file)
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -250,19 +250,24 @@ class XnetModule extends PLModule
                 }
             }
 
+            require_once 'emails.inc.php';
+            require_once 'name.func.inc.php';
+
             // Update user info
-            $full_name = Post::t('firstname') . ' ' . Post::t('lastname');
-            $directory_name = mb_strtoupper(Post::t('lastname')) . ' ' . Post::t('firstname');
+            $lastname = capitalize_name(Post::t('lastname'));
+            $firstname = capitalize_name(Post::t('firstname'));
+            $full_name = build_full_name($firstname, $lastname);
+            $directory_name = build_directory_name($firstname, $lastname);
+            $sort_name = build_sort_name($firstname, $lastname);
             XDB::query('UPDATE  accounts
-                           SET  full_name = {?}, directory_name = {?}, display_name = {?},
+                           SET  full_name = {?}, directory_name = {?}, sort_name = {?}, display_name = {?},
                                 firstname = {?}, lastname = {?}, sex = {?}
                          WHERE  uid = {?}',
-                       $full_name, $directory_name, Post::t('display_name'),
+                       $full_name, $directory_name, $sort_name, Post::t('display_name'),
                        Post::t('firstname'), Post::t('lastname'),
                        (Post::t('sex') == 'male') ? 'male' : 'female', $user->id());
 
             // Updates email.
-            require_once 'emails.inc.php';
             $new_email = strtolower(Post::t('email'));
             if (require_email_update($user, $new_email)) {
                     XDB::query('UPDATE  accounts