Dev Some minor text changes

LimeSurvey · Oct 11, 2017 · e8a9d72 · e8a9d72
1 parent 9b6c11c
commit e8a9d72
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -93,9 +93,6 @@
 
 $config['maxemails']          = 50;               // The maximum number of emails to send in one go (this is to prevent your mail server or script from timeouting when sending mass mail)
 
-// Enable or Disable LDAP feature
-$config['enableLdap'] = false;
-
 // Experimental parameters, only change if you know what you're doing
 //
 // filterout_incomplete_answers

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1962,7 +1962,7 @@ public function importldap($iSurveyId)
                                 if (isset($responseGroup[$j][$ldap_queries[$ldapq]['language']]))
                                     $mylanguage = ldap_readattr($responseGroup[$j][$ldap_queries[$ldapq]['language']]);
 
-                                // In case Ldap Server encoding isn't UTF-8, let's translate
+                                // In case LDAP Server encoding isn't UTF-8, let's translate
                                 // the strings to UTF-8
                                 if ($ldapencoding != '')
                                 {

diff --git a/application/core/plugins/AuthLDAP/AuthLDAP.php b/application/core/plugins/AuthLDAP/AuthLDAP.php
@@ -17,7 +17,7 @@ class AuthLDAP extends ls\pluginmanager\AuthPluginBase
     protected $settings = array(
         'server' => array(
             'type' => 'string',
-            'label' => 'Ldap server',
+            'label' => 'LDAP server',
             'help' => 'e.g. ldap://ldap.example.com or ldaps://ldap.example.com'
         ),
         'ldapport' => array(

diff --git a/application/helpers/ldap_helper.php b/application/helpers/ldap_helper.php
@@ -109,7 +109,7 @@ function ldap_doTokenSearch($ds, $ldapq, &$ResArray, $surveyid) {
     $userattrs=array();
 
     // First let's lowercase the ldap query values
-    prepareLdapQuery($ldapq);
+    prepareLDAPQuery($ldapq);
 
     // Retrieve the ldap user attribute-list to read
     $userparams = array('firstname_attr','lastname_attr',
@@ -308,7 +308,7 @@ function ldap_doTokenSearch($ds, $ldapq, &$ResArray, $surveyid) {
     return $totalrescount;
 }
 
-function prepareLdapQuery($queryId)
+function prepareLDAPQuery($queryId)
 {
     $ldap_queries = Yii::app()->getConfig('ldap_queries');
     $QueryName=$ldap_queries[$queryId]['name'];