Ver código fonte

CSV Import: when using cut&paste, the character set is de facto utf-8 (no user choice)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2331 a333f486-631f-4898-b8df-5754b55c2be0
romainq 12 anos atrás
pai
commit
e8318fbd28
1 arquivos alterados com 2 adições e 12 exclusões
  1. 2 12
      pages/csvimport.php

+ 2 - 12
pages/csvimport.php

@@ -1374,18 +1374,8 @@ EOF
 		$sCSVData = utils::ReadParam('csvdata', '', false, 'raw_data');
 		$sPasteDataHtml = '<div><form enctype="multipart/form-data" method="post"><p>'.Dict::S('UI:CSVImport:PasteData').'</p>'.
 						  '<p><textarea cols="100" rows="30" name="csvdata">'.htmlentities($sCSVData, ENT_QUOTES, 'UTF-8').'</textarea></p>';
-		$sPasteDataHtml .= '<p>'.Dict::S('UI:CSVImport:Encoding').': ';
-		$sPasteDataHtml .= '<select name="encoding" style="font-family:Arial,Helvetica,Sans-serif"/>';  // IE8 has some troubles if the font is different
-		foreach($aPossibleEncodings as $sIconvCode => $sDisplayName )
-		{
-			$sSelected  = '';
-			if ($sEncoding == $sIconvCode)
-			{
-				$sSelected = ' selected';
-			}
-			$sPasteDataHtml .= '<option value="'.$sIconvCode.'"'.$sSelected.'>'.$sDisplayName.'</option>';
-		}
-		$sPasteDataHtml .= '</select></p>'.
+		$sPasteDataHtml .= '<hidden name="encoding" value="UTF-8">';
+		$sPasteDataHtml .=
 				'<p><input type="submit" value="'.Dict::S('UI:Button:Next').'"/></p>'.
 				'<input type="hidden" name="step" value="2"/>'.
 				'<input type="hidden" name="operation" value="csv_data"/>'.