diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php index cda7915af..588d06292 100644 --- a/include/lib/ac_common.php +++ b/include/lib/ac_common.php @@ -1802,32 +1802,3 @@ function sanitize_filename($filename) return $new_filename; } -/** - * @brief convert some csv string (content of a file) into HTML table, - * @param $string CSV files - * @return void - */ -function csv2table ($string) -{ - $a_field=[';',',']; - $sep_field=$a_field[$_SESSION[SESSION_KEY.'csv_fieldsep']]; - $a_field=['.',',']; - $sep_dec=$a_field[$_SESSION[SESSION_KEY.'csv_decimal']]; - $encoding=$_SESSION[SESSION_KEY.'csv_encoding']; - - $aRow=explode("\r\n", $string); - - echo ''; - foreach ($aRow as $row) { - echo ''; - $aCol=explode($sep_field, $row); - foreach ($aCol as $col) { - echo ''; - } - echo ''; - - } - echo '
'; - echo h($col); - echo '
'; -} \ No newline at end of file diff --git a/include/lib/noalyss_csv.class.php b/include/lib/noalyss_csv.class.php index f7b448264..11dcbb700 100644 --- a/include/lib/noalyss_csv.class.php +++ b/include/lib/noalyss_csv.class.php @@ -297,5 +297,32 @@ class Noalyss_Csv $this->size = $size; return $this; } + /** + * @brief convert CSV strings (content of a file) into HTML table, + * @param $string CSV files + */ + static function csv2table ($string) + { + $a_field=[';',',']; + $sep_field=$a_field[$_SESSION[SESSION_KEY.'csv_fieldsep']]; + $a_field=['.',',']; + $sep_dec=$a_field[$_SESSION[SESSION_KEY.'csv_decimal']]; + $encoding=$_SESSION[SESSION_KEY.'csv_encoding']; + $aRow=explode("\r\n", $string); + + echo ''; + foreach ($aRow as $row) { + echo ''; + $aCol=explode($sep_field, $row); + foreach ($aCol as $col) { + echo ''; + } + echo ''; + + } + echo '
'; + echo h($col); + echo '
'; + } } diff --git a/scenario/EXPORT/export-export_histo_csv.php-1730456264.php b/scenario/EXPORT/export-export_histo_csv.php-1730456264.php index ec6a53623..5bdc8ede6 100644 --- a/scenario/EXPORT/export-export_histo_csv.php-1730456264.php +++ b/scenario/EXPORT/export-export_histo_csv.php-1730456264.php @@ -24,7 +24,8 @@ if (trim($result) != '') { echo p('result failed','class="notice"'); } echo h1('Tous les journaux'); -csv2table($result); + +\Noalyss_Csv::csv2table($result); echo h1('Achat 01.01.2019 - 31.12.2019');