Fixed issue #6597: Error during LDAP import

LimeSurvey · Sep 27, 2012 · 3100f58 · 3100f58
1 parent 2be65c6
commit 3100f58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1549,6 +1549,9 @@ public function importldap($iSurveyId)
         }
         else
         {
+            $filterduplicatetoken = (Yii::app()->request->getPost('filterduplicatetoken') && Yii::app()->request->getPost('filterduplicatetoken') == 'on');
+            $filterblankemail = (Yii::app()->request->getPost('filterblankemail') && Yii::app()->request->getPost('filterblankemail') == 'on');
+
             $ldap_queries = Yii::app()->getConfig('ldap_queries');
             $ldap_server = Yii::app()->getConfig('ldap_server');
 

diff --git a/application/views/admin/token/ldapform.php b/application/views/admin/token/ldapform.php
@@ -44,5 +44,5 @@
 
 <div class='messagebox ui-corner-all'>
     <div class='header ui-widget-header'><?php echo $clang->eT("Note"); ?></div><br />
-    <?php $clang->eT("LDAP queries are defined by the administrator in the config-ldap.php file."); ?>
+    <?php $clang->eT("LDAP queries are defined by the administrator in the configuration file /application/config/ldap.php ."); ?>
 </div>