2 commits - lib/client lib/locale

[Jeroen van Meeuwen]

 lib/client/kolab_client_task_user.php |   12 ++++++------
 lib/locale/en_US.php                  |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2cde289d262b423b4a8c931893470a4dd673ad9f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:39:42 2012 +0200

    Move loginshell to the system tab

diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 184fbf6..66d4e7b 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -214,6 +214,7 @@ class kolab_client_task_user extends kolab_client_task
             'ou'                        => 'personal',
             'preferredlanguage'         => 'personal',
 
+            'alias'                     => 'contact_info',
             'c'                         => 'contact_info',
             'facsimiletelephonenumber'  => 'contact_info',
             'homephone'                 => 'contact_info',
@@ -228,17 +229,17 @@ class kolab_client_task_user extends kolab_client_task
             'street'                    => 'contact_info',
             'telephonenumber'           => 'contact_info',
 
-            'uid'                       => 'system',
             'userpassword'              => 'system',
             'userpassword2'             => 'system',
-            'alias'                     => 'system',
-            'mailhost'                  => 'system',
-            'kolabhomeserver'           => 'system',
-            'uidnumber'                 => 'system',
             'gidnumber'                 => 'system',
             'homedirectory'             => 'system',
+            'kolabhomeserver'           => 'system',
+            'loginshell'                => 'system',
+            'mailhost'                  => 'system',
             'nsrole'                    => 'system',
             'nsroledn'                  => 'system',
+            'uid'                       => 'system',
+            'uidnumber'                 => 'system',
 
             'mailquota'                 => 'config',
             'cyrususerquota'            => 'config',
@@ -247,7 +248,6 @@ class kolab_client_task_user extends kolab_client_task
             'kolabdelegate'             => 'config',
             'kolaballowsmtprecipient'   => 'config',
             'kolaballowsmtpsender'      => 'config',
-            'shell'                     => 'config',
         );
 
         // Prepare fields


commit 4fa4f5fb8a68f7bbde2a5d8122a85eadbc876553
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:37:18 2012 +0200

    Rename user.shell -> user.loginshell

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index 3e7fd71..ab9e9cc 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -105,7 +105,7 @@ $LANG['user.edit.success'] = 'User edited successfully.';
 $LANG['user.preferredlanguage'] = 'Native tongue';
 $LANG['user.gidnumber'] = 'Primary group number';
 $LANG['user.homedirectory'] = 'Home directory';
-$LANG['user.shell'] = 'Shell';
+$LANG['user.loginshell'] = 'Shell';
 $LANG['user.uidnumber'] = 'User ID number';
 
 $LANG['group.add'] = 'Add Group';