[Fmsystem-commits] [11346] property: data export

[Sigurd Nes]

Revision: 11346
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11346
Author:   sigurdne
Date:     2013-10-04 11:20:11 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
property: data export

Modified Paths:
--------------
    trunk/property/inc/class.bocommon.inc.php
    trunk/property/inc/class.botts.inc.php

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2013-09-30 13:47:35 UTC (rev 
11345)
+++ trunk/property/inc/class.bocommon.inc.php   2013-10-04 11:20:11 UTC (rev 
11346)
@@ -1704,10 +1704,11 @@
                        {
                                if ( !isset($input_type[$i]) || $input_type[$i] 
!= 'hidden' )
                                {
-                                       $header[] = 
$this->utf2ascii($descr[$i]);
+                               //      $header[] = 
$this->utf2ascii($descr[$i]);
+                                       $header[] = $descr[$i];
                                }
                        }
-                       fputcsv($fp, $header);
+                       fputcsv($fp, $header, ';');
                        unset($header);
 
                        if ( is_array($list) )
@@ -1722,7 +1723,7 @@
                                                        $row[] = 
preg_replace("/\r\n/", ' ', $entry[$name[$i]]);
                                                }
                                        }
-                                       fputcsv($fp, $row);
+                                       fputcsv($fp, $row, ';');
                                }
                        }
                        fclose($fp);

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2013-09-30 13:47:35 UTC (rev 
11345)
+++ trunk/property/inc/class.botts.inc.php      2013-10-04 11:20:11 UTC (rev 
11346)
@@ -585,11 +585,13 @@
                                }
                                $ticket['finnish_date'] = 
(isset($ticket['finnish_date']) && $ticket['finnish_date'] ? 
$GLOBALS['phpgw']->common->show_date($ticket['finnish_date'],$this->dateformat):'');
 
+/*
                                if ($ticket['status'] == 'X')
                                {
                                        $history_values = 
$this->historylog->return_array(array(),array('X'),'history_timestamp','DESC',$ticket['id']);
                                        $ticket['timestampclosed'] = 
$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'],$this->dateformat);
                                }
+*/
                                if ($ticket['new_ticket'])
                                {
                                        $ticket['new_ticket'] = '*';