### Eclipse Workspace Patch 1.0 #P limesurvey Index: admin/tokens.php =================================================================== --- admin/tokens.php (revision 8931) +++ admin/tokens.php (working copy) @@ -2373,6 +2373,13 @@ { $tokenoutput .= "
".$clang->gT("Failed to open the uploaded file!")."

\n"; } + if (!isset($_POST['filterduplicatefields']) || (isset($_POST['filterduplicatefields']) && count($_POST['filterduplicatefields'])==0)) + { + $filterduplicatefields=array('firstname','lastname','email'); + } else { + $filterduplicatefields=$_POST['filterduplicatefields']; + } + $separator = returnglobal('separator'); foreach ($tokenlistarray as $buffer) { $buffer=@mb_convert_encoding($buffer,"UTF-8",$uploadcharset); @@ -2383,7 +2390,20 @@ $buffer=removeBOM($buffer); $allowedfieldnames=array('firstname','lastname','email','emailstatus','token','language', 'validfrom', 'validuntil'); $allowedfieldnames=array_merge($attrfieldnames,$allowedfieldnames); - $firstline = convertCSVRowToArray($buffer,',','"'); + + switch ($separator) { + case 'comma': + $separator = ','; + break; + case 'semicolon': + $separator = ';'; + break; + default: + $comma = substr_count($buffer,','); + $semicolon = substr_count($buffer,';'); + if ($semicolon>$comma) $separator = ';'; else $separator = ','; + } + $firstline = convertCSVRowToArray($buffer,$separator,'"'); $firstline=array_map('trim',$firstline); $ignoredcolumns=array(); //now check the first line for invalid fields @@ -2407,7 +2427,7 @@ else { - $line = convertCSVRowToArray($buffer,',','"'); + $line = convertCSVRowToArray($buffer,$separator,'"'); if (count($firstline)!=count($line)) { @@ -2427,14 +2447,6 @@ if ($filterduplicatetoken!=false) { - if (!isset($_POST['filterduplicatefields']) || (isset($_POST['filterduplicatefields']) && count($_POST['filterduplicatefields'])==0)) - { - $filterduplicatefields=array('firstname','lastname','email'); - } - else - { - $filterduplicatefields=$_POST['filterduplicatefields']; - } $dupquery = "SELECT tid from ".db_table_name("tokens_$surveyid")." where 1=1"; foreach($filterduplicatefields as $field) { @@ -2802,9 +2814,19 @@ if ($charset=='auto') {$charsetsout.=" selected ='selected'";} $charsetsout.=">$title ($charset)"; } + $separator = returnglobal('separator'); + if (empty($separator) || $separator == 'auto') $selected = " selected = 'selected'"; else $selected = ''; + $separatorout = ""; + if ($separator == 'comma') $selected = " selected = 'selected'"; else $selected = ''; + $separatorout .= ""; + if ($separator == 'semicolon') $selected = " selected = 'selected'"; else $selected = ''; + $separatorout .= ""; $tokenoutput .= "