3 commits - lib/client lib/locale

[Jeroen van Meeuwen]

 lib/client/kolab_client_task_user.php |   16 ++++++++++++++++
 lib/locale/en_US.php                  |   14 ++++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit 94c79cd9c3f96a01409d16fc2a1b3219c110cfac
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 25 09:34:42 2012 +0100

    Add asterisk attributes to an asterisk sip user tab

diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index f21a041..2e81b65 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -197,6 +197,7 @@ class kolab_client_task_user extends kolab_client_task
             'contact_info'  => 'user.contact_info',
             'system'        => 'user.system',
             'config'        => 'user.config',
+            'asterisk'      => 'user.asterisk',
             'other'         => 'user.other',
         );
 
@@ -257,6 +258,21 @@ class kolab_client_task_user extends kolab_client_task
             'kolabdelegate'             => 'config',
             'kolaballowsmtprecipient'   => 'config',
             'kolaballowsmtpsender'      => 'config',
+
+            /* Asterisk Settings */
+            'astaccountallowedcodec'    => 'asterisk',
+            'astaccountcallerid'        => 'asterisk',
+            'astaccountcontext'         => 'asterisk',
+            'astaccountdeny'            => 'asterisk',
+            'astaccounthost'            => 'asterisk',
+            'astaccountnat'             => 'asterisk',
+            'astaccountname'            => 'asterisk',
+            'astaccountqualify'         => 'asterisk',
+            'astaccountrealmedpassword' => 'asterisk',
+            'astaccountsecret'          => 'asterisk',
+            'astaccounttype'            => 'asterisk',
+            'astcontext'                => 'asterisk',
+            'astextension'              => 'asterisk',
         );
 
         // Prepare fields


commit c0b1b1be79618dbd5d971a8e97a78a64d0297ce0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 25 09:32:08 2012 +0100

    Add the tab label as well

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index c25fe9a..db04bef 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -113,6 +113,7 @@ $LANG['user.astaccountrealmedpassword'] = 'Realmed Account Password';
 $LANG['user.astaccountsecret'] = 'Plaintext Password';
 $LANG['user.astaccounttype'] = 'Account Type';
 $LANG['user.astcontext'] = 'Asterisk Context';
+$LANG['user.asterisk'] = 'Asterisk SIP';
 $LANG['user.astextension'] = 'Asterisk Extension';
 $LANG['user.c'] = 'Country';
 $LANG['user.city'] = 'City';


commit 1e043aed3d4dcd3e10f6d93d4565e669350dc2b5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 25 09:30:57 2012 +0100

    Add lables for Asterisk LDAP Schema extensions

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index c647c80..c25fe9a 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -101,6 +101,19 @@ $LANG['submit.button'] = 'Submit';
 $LANG['user.add'] = 'Add User';
 $LANG['user.add.success'] = 'User created successfully.';
 $LANG['user.alias'] = 'Secondary Email Address(es)';
+$LANG['user.astaccountallowedcodec'] = 'Allowed codec(s)';
+$LANG['user.astaccountcallerid'] = 'Caller ID';
+$LANG['user.astaccountcontext'] = 'Account Context';
+$LANG['user.astaccountdeny'] = 'Account deny';
+$LANG['user.astaccounthost'] = 'Asterisk Host';
+$LANG['user.astaccountnat'] = 'Account uses NAT';
+$LANG['user.astaccountname'] = 'Asterisk Account Name';
+$LANG['user.astaccountqualify'] = 'Account Qualify';
+$LANG['user.astaccountrealmedpassword'] = 'Realmed Account Password';
+$LANG['user.astaccountsecret'] = 'Plaintext Password';
+$LANG['user.astaccounttype'] = 'Account Type';
+$LANG['user.astcontext'] = 'Asterisk Context';
+$LANG['user.astextension'] = 'Asterisk Extension';
 $LANG['user.c'] = 'Country';
 $LANG['user.city'] = 'City';
 $LANG['user.cn'] = 'Common name';