A free open source IT asset/license management system
Only write headers once
Marcus Moore6d5e68274da8
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex ef6340c77f..4102f55ba8 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -534,6 +534,33 @@ class UsersController extends Controller// Open output stream$handle = fopen('php://output', 'w');+ $headers = [+ // strtolower to prevent Excel from trying to open it as a SYLK file+ strtolower(trans('general.id')),+ trans('admin/companies/table.title'),+ trans('admin/users/table.title'),+ trans('general.employee_number'),+ trans('admin/users/table.first_name'),+ trans('admin/users/table.last_name'),+ trans('admin/users/table.name'),+ trans('admin/users/table.username'),+ trans('admin/users/table.email'),+ trans('admin/users/table.manager'),+ trans('admin/users/table.location'),+ trans('general.department'),+ trans('general.assets'),+ trans('general.licenses'),+ trans('general.accessories'),+ trans('general.consumables'),+ trans('general.groups'),+ trans('general.permissions'),+ trans('general.notes'),+ trans('admin/users/table.activated'),+ trans('general.created_at'),+ ];++ fputcsv($handle, $headers);+$users = User::with('assets','accessories',@@ -546,32 +573,6 @@ class UsersController extends Controller'company')->orderBy('created_at', 'DESC')->chunk(500, function ($users) use ($handle) {- $headers = [- // strtolower to prevent Excel from trying to open it as a SYLK file- strtolower(trans('general.id')),- trans('admin/companies/table.title'),- trans('admin/users/table.title'),- trans('general.employee_number'),- trans('admin/users/table.first_name'),- trans('admin/users/table.last_name'),- trans('admin/users/table.name'),- trans('admin/users/table.username'),- trans('admin/users/table.email'),- trans('admin/users/table.manager'),- trans('admin/users/table.location'),- trans('general.department'),- trans('general.assets'),- trans('general.licenses'),- trans('general.accessories'),- trans('general.consumables'),- trans('general.groups'),- trans('general.permissions'),- trans('general.notes'),- trans('admin/users/table.activated'),- trans('general.created_at'),- ];-- fputcsv($handle, $headers);$formatter = new EscapeFormula('`');