[Fmsystem-commits] [11315] bkbooking: stavanger update

[Kjell Arne Espedal]

Revision: 11315
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11315
Author:   kjell
Date:     2013-09-24 09:25:21 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
bkbooking: stavanger update

Modified Paths:
--------------
    
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php

Modified: 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
  2013-09-24 09:24:21 UTC (rev 11314)
+++ 
branches/stavangerkommune/booking/inc/class.socompleted_reservation_export.inc.php
  2013-09-24 09:25:21 UTC (rev 11315)
@@ -982,8 +982,14 @@
                        if (count($export_info) == 0) {
                                return null;
                        }
+
+            if ($config->config_data['external_format_linebreak'] == 
'Windows') {
+                $file_format_linebreak = "\r\n";
+            } else {
+                $file_format_linebreak = "\n";
+            }    
                
-                       return array('data' => implode("\n", $output), 
'data_log' => implode("\n", $log), 'info' => $export_info, 'header_count' => 
$header_count);
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\n", $log), 'info' => $export_info, 
'header_count' => $header_count);
                }
                
                protected function get_agresso_row_template() {
@@ -1154,9 +1160,13 @@
                        if (count($export_info) == 0) {
                                return null;
                        }
-               
+            if ($config->config_data['external_format_linebreak'] == 
'Windows') {
+                $file_format_linebreak = "\r\n";
+            } else {
+                $file_format_linebreak = "\n";
+            }    
 
-                       return array('data' => implode("\r\n", $output), 
'data_log' => implode("\n", $log), 'info' => $export_info, 'header_count' => 
$header_count);
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\n", $log), 'info' => $export_info, 
'header_count' => $header_count);
 
                }