From 3d95f6b8b0ac0bb5fb3710b0962c13e09a2d0733 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 28 Apr 2017 12:23:56 +0300
Subject: [PATCH] Standardize file names and fixed aging report export

---
 app/Http/Controllers/ExportController.php | 4 ++--
 app/Http/Controllers/ReportController.php | 7 +++++--
 app/Libraries/Utils.php                   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 9a8e54f59d17..bef47f2386a6 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -37,7 +37,7 @@ class ExportController extends BaseController
 
         // set the filename based on the entity types selected
         if ($request->include == 'all') {
-            $fileName = "invoice-ninja-{$date}";
+            $fileName = "{$date}-invoiceninja";
         } else {
             $fields = $request->all();
             $fields = array_filter(array_map(function ($key) {
@@ -47,7 +47,7 @@ class ExportController extends BaseController
                     return null;
                 }
             }, array_keys($fields), $fields));
-            $fileName = 'invoice-ninja-' . implode('-', $fields) . "-{$date}";
+            $fileName = $date. '-invoiceninja-' . implode('-', $fields);
         }
 
         if ($format === 'JSON') {
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 6e2f43a59306..d879e8a1f5b5 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -129,11 +129,14 @@ class ReportController extends BaseController
         }
 
         $output = fopen('php://output', 'w') or Utils::fatalError();
-        $reportType = trans("texts.{$reportType}s");
         $date = date('Y-m-d');
 
+        $columns = array_map(function($key, $val) {
+            return is_array($val) ? $key : $val;
+        }, array_keys($columns), $columns);
+
         header('Content-Type:application/csv');
-        header("Content-Disposition:attachment;filename={$date}_Ninja_{$reportType}.csv");
+        header("Content-Disposition:attachment;filename={$date}-invoiceninja-{$reportType}-report.csv");
 
         Utils::exportData($output, $data, Utils::trans($columns));
 
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index bc77e248af9b..4d9cd1d70bdc 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -1248,5 +1248,5 @@ class Utils
        $contents = fread($handle, 32);
        fclose($handle);
        return( ord($contents[28]) != 0 );
-    }    
+    }
 }