Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Setup / js / AuthenticationPanel.js
index 93b1a0e..35c5488 100644 (file)
@@ -293,7 +293,7 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                             }, commonComboConfig), 
                             {
                                 name: 'authentication_Sql_accountDomainName',
-                                fieldLabel: this.app.i18n._('Account domain name ')
+                                fieldLabel: this.app.i18n._('Account domain name')
                             }, {
                                 name: 'authentication_Sql_accountDomainNameShort',
                                 fieldLabel: this.app.i18n._('Account domain short name')
@@ -343,6 +343,12 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                             fieldLabel: this.app.i18n._('Search filter')
                         }, 
                         Ext.applyIf({
+                            name: 'authentication_Ldap_tryUsernameSplit',
+                            fieldLabel: this.app.i18n._('Try to split username'),
+                            store: [['1', this.app.i18n._('Yes')], ['0', this.app.i18n._('No')]],
+                            value: '1'
+                        }, commonComboConfig),
+                        Ext.applyIf({
                             name: 'authentication_Ldap_accountCanonicalForm',
                             fieldLabel: this.app.i18n._('Account canonical form'),
                             store: [['2', 'ACCTNAME_FORM_USERNAME'], ['3', 'ACCTNAME_FORM_BACKSLASH'], ['4', 'ACCTNAME_FORM_PRINCIPAL']],
@@ -350,7 +356,7 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                         }, commonComboConfig), 
                         {
                             name: 'authentication_Ldap_accountDomainName',
-                            fieldLabel: this.app.i18n._('Account domain name ')
+                            fieldLabel: this.app.i18n._('Account domain name')
                         }, {
                             name: 'authentication_Ldap_accountDomainNameShort',
                             fieldLabel: this.app.i18n._('Account domain short name')
@@ -597,10 +603,10 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                 value: '1'
             }, commonComboConfig),
             Ext.applyIf({
-                name: 'accounts_' + type + 'useStartTls',
+                name: 'accounts_' + type + '_useStartTls',
                 fieldLabel: this.app.i18n._('Start TLS'),
-                store: [['0', this.app.i18n._('No')], ['1', this.app.i18n._('Yes')]],
-                value: '0'
+                store: [['1', this.app.i18n._('Yes')], ['0', this.app.i18n._('No')]],
+                value: '1'
             }, commonComboConfig),
             Ext.applyIf({
                 hidden: type === 'ActiveDirectory' ,
@@ -648,9 +654,9 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
                 value: '1'
             }, commonComboConfig), 
             Ext.applyIf({
-                name: 'accounts_' + type + (type === 'Ldap') ? '_useRfc2307bis' : '_useRfc2307',
+                name: 'accounts_' + type + ((type === 'Ldap') ? '_useRfc2307bis' : '_useRfc2307'),
                 fieldLabel: (type === 'Ldap') ? this.app.i18n._('Use Rfc 2307 bis') : this.app.i18n._('Maintain RFC 2307 attributes'),
-                store: [['0', this.app.i18n._('No')], ['1', this.app.i18n._('Yes')]],
+                store: [['1', this.app.i18n._('Yes')], ['0', this.app.i18n._('No')]],
                 value: '0'
             }, commonComboConfig), 
             {
@@ -780,4 +786,4 @@ Tine.Setup.AuthenticationPanel = Ext.extend(Tine.Tinebase.widgets.form.ConfigPan
         
         return result;
     }
-});
\ No newline at end of file
+});