[Fmsystem-commits] [15510] property: add datetime to filenames for downloads

[sigurdne]

Revision: 15510
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15510
Author:   sigurdne
Date:     2016-08-25 17:21:42 +0000 (Thu, 25 Aug 2016)
Log Message:
-----------
property: add datetime to filenames for downloads

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

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2016-08-25 14:54:30 UTC (rev 
15509)
+++ trunk/property/inc/class.bocommon.inc.php   2016-08-25 17:21:42 UTC (rev 
15510)
@@ -1609,12 +1609,14 @@
                        if ($filename)
                        {
                                $filename_arr = explode('.', str_replace(' ', 
'_', basename($filename)));
-                               $filename = $filename_arr[0] . '.xlsx';
+                               $filename = $filename_arr[0];
                        }
                        else
                        {
-                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']) . '.xlsx';
+                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']);
                        }
+                       $date_time = str_replace(array(' ', '/'), '_', 
$GLOBALS['phpgw']->common->show_date(time()));
+                       $filename .= "_{$date_time}.xlsx";
 
                        $browser = CreateObject('phpgwapi.browser');
 //                     
$browser->content_header($filename,'application/vnd.ms-excel');
@@ -1721,7 +1723,9 @@
 
                function excel_out_old( $list, $name, $descr, $input_type = 
array() )
                {
-                       $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']) . '.xls';
+                       $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']);
+                       $date_time = str_replace(array(' ', '/'), '_', 
$GLOBALS['phpgw']->common->show_date(time()));
+                       $filename .= "_{$date_time}.xls";
 
                        $workbook = CreateObject('phpgwapi.excel', "-");
                        $browser = CreateObject('phpgwapi.browser');
@@ -1789,12 +1793,14 @@
                        if ($filename)
                        {
                                $filename_arr = explode('.', str_replace(' ', 
'_', basename($filename)));
-                               $filename = $filename_arr[0] . '.csv';
+                               $filename = $filename_arr[0];
                        }
                        else
                        {
-                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']) . '.csv';
+                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']);
                        }
+                       $date_time = str_replace(array(' ', '/'), '_', 
$GLOBALS['phpgw']->common->show_date(time()));
+                       $filename .= "_{$date_time}.csv";
 
                        $browser = CreateObject('phpgwapi.browser');
                        $browser->content_header($filename, 'application/csv');
@@ -1859,13 +1865,16 @@
                        if ($filename)
                        {
                                $filename_arr = explode('.', str_replace(' ', 
'_', basename($filename)));
-                               $filename = $filename_arr[0] . '.ods';
+                               $filename = $filename_arr[0];
                        }
                        else
                        {
-                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']) . '.ods';
+                               $filename = str_replace(' ', '_', 
$GLOBALS['phpgw_info']['user']['account_lid']);
                        }
 
+                       $date_time = str_replace(array(' ', '/'), '_', 
$GLOBALS['phpgw']->common->show_date(time()));
+                       $filename .= "_{$date_time}'.ods'";
+
                        $browser = CreateObject('phpgwapi.browser');
                        $browser->content_header($filename, 'application/ods');