Fixed issue #8083: Token attributes being mapped to the CPDB cannot b…

…e properly used
LimeSurvey · Jan 22, 2014 · 85ca290 · 85ca290
1 parent f188b85
commit 85ca290
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1909,17 +1909,9 @@ function import($iSurveyId)
                 foreach ($tokenlistarray as $buffer)
                 {
                     $buffer = @mb_convert_encoding($buffer, "UTF-8", $uploadcharset);
-                    $firstname = "";
-                    $lastname = "";
-                    $email = "";
-                    $emailstatus = "OK";
-                    $token = "";
-                    $language = "";
-                    $attribute1 = "";
-                    $attribute2 = ""; //Clear out values from the last path, in case the next line is missing a value
                     if ($recordcount == 0)
                     {
-                        // Pick apart the first line
+                        // Parse first line (header) from CSV 
                         $buffer = removeBOM($buffer);
                         $allowedfieldnames = array('firstname', 'lastname', 'email', 'emailstatus', 'token', 'language', 'validfrom', 'validuntil', 'usesleft');
                         $allowedfieldnames = array_merge($attrfieldnames, $allowedfieldnames);
@@ -1942,7 +1934,7 @@ function import($iSurveyId)
                         $firstline = convertCSVRowToArray($buffer, $separator, '"');
                         $firstline = array_map('trim', $firstline);
                         $ignoredcolumns = array();
-                        //now check the first line for invalid fields
+                        // Now check the first line for invalid fields
                         foreach ($firstline as $index => $fieldname)
                         {
                             $firstline[$index] = preg_replace("/(.*) <[^,]*>$/", "$1", $fieldname);
@@ -1996,10 +1988,7 @@ function import($iSurveyId)
                                 $duplicatelist[] = Yii::app()->db->quoteValue($writearray['firstname']) . " " . Yii::app()->db->quoteValue($writearray['lastname']) . " (" . Yii::app()->db->quoteValue($writearray['email']) . ")";
                             }
                         }
-
-
                         $writearray['email'] = trim($writearray['email']);
-
                         //treat blank emails
                         if ($filterblankemail && $writearray['email'] == '')
                         {

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -299,8 +299,7 @@ public function getTokenAttributes()
             $ls->save();
             $attdescriptiondata = $fields;
         }
-
-
+        $aCompleteData=array();
         foreach ($attdescriptiondata as $sKey=>$aValues)
         {                                   
             if (!is_array($aValues)) $aValues=array();