Merge pull request #98 from FreakDev/master

import fixes from other octave's projects

Author: FreakDev

library/Centurion/Contrib/translation/configs/module.ini

@@ -1,5 +1,7 @@
 [production]
 
+resources.view.helperPath.Translation_View_Helper_ = APPLICATION_PATH "/../library/Centurion/Contrib/translation/views/helpers"
+
 [pre-prod : production]
 
 [development : production]

library/Centurion/Controller/Action/Helper/Csv.php

@@ -26,9 +26,9 @@
  * @license     http://centurion-project.org/license/new-bsd     New BSD License
  * @author      Florent Messa <[email protected]>
  */
-class Centurion_Controller_Action_Helper_Csv extends Centurion_Controller_Action_Helper_Extract
+class Centurion_Controller_Action_Helper_Csv extends Zend_Controller_Action_Helper_Abstract
 {
-    const DEFAULT_FILENAME = 'export.csv';
+    const DEFAULT_FILENAME = 'export_columns.csv';
     const DEFAULT_DELIMITER = ';';
     const DEFAULT_ENCODING = 'UTF-16LE';
 
@@ -43,39 +43,31 @@ class Centurion_Controller_Action_Helper_Csv extends Centurion_Controller_Action
         'encoding'       =>  self::DEFAULT_ENCODING
     );
 
-
     /**
      * Convert a rowset to a CSV view.
      *
      * @param Centurion_Db_Table_Rowset_Abstract|array $rowset
      * @param array $columns Header of the file
      * @param string $options Override default options
-     * @param boolean $noSend : To return the file name rather than sending it to the client
      */
-    public function direct($rowset, array $columns, $options = array(), $header = null, $sendToBrowser = true)
+    public function direct($rowset, array $columns, $options = array(), $header = null)
     {
         if (!$rowset instanceof Centurion_Db_Table_Rowset_Abstract && !is_array($rowset)) {
             throw new Centurion_Exception('First parameter must be a Centurion valid rowset or an array');
         }
 
         $options = array_merge(self::$options, $options);
-        $handler = null;
-        $tmpName = null;
-
-        //To create a temp file
-        $tmpName = tempnam(sys_get_temp_dir(), 'csv-export_' . md5(rand()) . '.csv');
-        $handler = fopen($tmpName, 'w');
-
+        $handler = tmpfile();
         if (null !== $header) {
             fputcsv($handler, $this->_convertFields($header, $options['encoding']), $options['delimiter']);
         }
 
         $keys = array_keys($columns);
         fputcsv($handler, $this->_convertFields(array_values($columns), $options['encoding']), $options['delimiter']);
-        foreach ($rowset as $row) {
+        foreach ($rowset as $key => $row) {
             $fields = array();
             if ($row instanceof Centurion_Db_Table_Row_Abstract) {
-                foreach ($keys as $value) {
+                foreach ($keys as $key => $value) {
                     $fields[] = $row->{$value};
                 }
             } else {
@@ -87,11 +79,6 @@ public function direct($rowset, array $columns, $options = array(), $header = nu
             fputcsv($handler, $fields, $options['delimiter']);
         }
 
-        if (!$sendToBrowser){
-            fclose($handler);
-            return $tmpName;
-        }
-
         $this->getActionController()->getHelper('layout')->disableLayout();
         $this->getActionController()->getHelper('viewRenderer')->setNoRender(true);
 
@@ -100,14 +87,28 @@ public function direct($rowset, array $columns, $options = array(), $header = nu
         fseek($handler, 0);
 
         $this->getResponse()->setHeader('Content-disposition', sprintf('attachment; filename=%s', $options['filename']), true)
-                            ->setHeader('Content-Type', sprintf('application/force-download; charset=%s', $options['encoding']), true)
-                            ->setHeader('Content-Transfer-Encoding', 'application/octet-stream\n', true)
-                            ->setHeader('Content-Length', $size, true)
-                            ->setHeader('Pragma', 'no-cache', true)
-                            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0, public', true)
-                            ->setHeader('Expires', '0', true)
+                            ->setHeader('Content-Type', sprintf('application/force-download; charset=%s', $options['encoding']))
+                            ->setHeader('Content-Transfer-Encoding', 'application/octet-stream\n')
+                            ->setHeader('Content-Length', $size)
+                            ->setHeader('Pragma', 'no-cache')
+                            ->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0, public')
+                            ->setHeader('Expires', '0')
                             ->sendHeaders();
         fpassthru($handler);
         fclose($handler);
     }
-}
+
+    protected function _convertEncoding($string, $encoding)
+    {
+        return mb_convert_encoding($string, $encoding, 'UTF-8');
+    }
+
+    protected function _convertFields(array $fields, $encoding)
+    {
+        foreach ($fields as $key => &$value) {
+            $value = $this->_convertEncoding($value, $encoding);
+        }
+
+        return $fields;
+    }
+}