Fixed issue #09803: When importing token data from CSV file the remin…

…der date is ignored Dev: in $aReplacedFields ...
LimeSurvey · Jul 31, 2015 · b9754d4 · b9754d4
1 parent 71ec2ac
commit b9754d4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -2031,11 +2031,14 @@ function import($iSurveyId)
                         // Parse first line (header) from CSV
                         $buffer = removeBOM($buffer);
                         // We alow all field except tid because this one is really not needed.
-                        $aAllowedFieldNames = array('participant_id','firstname','lastname','email','emailstatus','token','language','blacklisted','sent','remindersent','remindercount','validfrom','validuntil','completed','usesleft');
-                        $aAllowedFieldNames = array_merge($aAttrFieldNames, $aAllowedFieldNames);
+                        $aAllowedFieldNames=Token::model($iSurveyId)->tableSchema->getColumnNames();
+                        if(($kTid = array_search('tid', $aAllowedFieldNames)) !== false) {
+                            unset($aAllowedFieldNames[$kTid]);
+                        }
                         // Some header don't have same column name
                         $aReplacedFields=array(
-                            'invited'=>'sent'
+                            'invited'=>'sent',
+                            'reminded'=>'remindersent',
                         );
                         switch ($sSeparator)
                         {
@@ -2178,7 +2181,6 @@ function import($iSurveyId)
                             {
                                     $oToken->$key=$value;
                             }
-
                             if (!$oToken->save())
                             {
                                 tracevar($oToken->getErrors());