A free open source IT asset/license management system
Reports (legacy): Fixed FD-55739 - Use CSV escaping on legacy depreciation and license reports
snipe5658cd6dd468
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex 76557f2ed6..efcfb0aa6a 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -36,8 +36,6 @@ use Illuminate\Support\Facades\Gate;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;use League\Csv\EscapeFormula;-use League\Csv\Reader;-use League\Csv\Writer;use Symfony\Component\HttpFoundation\StreamedResponse;/**@@ -173,74 +171,80 @@ class ReportsController extends Controller** @since [v1.0]*/- public function exportDeprecationReport(): Response+ public function exportDeprecationReport(): StreamedResponse{$this->authorize('reports.view');- // Grab all the assets- $assets = Asset::with('model', 'assignedTo', 'status', 'defaultLoc', 'assetlog')- ->orderBy('created_at', 'DESC')->get();- $csv = Writer::createFromFileObject(new \SplTempFileObject);- $csv->setOutputBOM(Reader::BOM_UTF16_BE);-- $rows = [];-- // Create the header row- $header = [- trans('admin/hardware/table.asset_tag'),- trans('admin/hardware/table.title'),- trans('admin/hardware/table.serial'),- trans('admin/hardware/table.checkoutto'),- trans('admin/hardware/table.location'),- trans('admin/hardware/table.purchase_date'),- trans('admin/hardware/table.purchase_cost'),- trans('admin/hardware/table.book_value'),- trans('admin/hardware/table.diff'),- ];+ $response = new StreamedResponse(function () {+ $handle = fopen('php://output', 'w');+ $formatter = new EscapeFormula('`');- // we insert the CSV header- $csv->insertOne($header);+ $header = [+ trans('admin/hardware/table.asset_tag'),+ trans('admin/hardware/table.title'),+ trans('admin/hardware/table.serial'),+ trans('admin/hardware/table.checkoutto'),+ trans('admin/hardware/table.location'),+ trans('admin/hardware/table.purchase_date'),+ trans('admin/hardware/table.purchase_cost'),+ trans('admin/hardware/table.book_value'),+ trans('admin/hardware/table.diff'),+ ];+ fputcsv($handle, $header);- // Create a row per asset- foreach ($assets as $asset) {- $row = [];- $row[] = e($asset->asset_tag);- $row[] = e($asset->name);- $row[] = e($asset->serial);+ Asset::with('model', 'assignedTo', 'status', 'defaultLoc', 'assetlog')+ ->orderBy('created_at', 'DESC')+ ->chunk(500, function ($assets) use ($handle, $formatter) {+ foreach ($assets as $asset) {+ $currency = $asset->location+ ? $asset->location->currency+ : Setting::getSettings()->default_currency;++ if ($target = $asset->assignedTo) {+ $assignedTo = $target->display_name;+ } else {+ $assignedTo = '';+ }- if ($target = $asset->assignedTo) {- $row[] = e($target->display_name);- } else {- $row[] = ''; // Empty string if unassigned- }+ if (($asset->assigned_to > 0) && ($location = $asset->location)) {+ if ($location->city) {+ $locationStr = $location->city.', '.$location->state;+ } elseif ($location->name) {+ $locationStr = $location->name;+ } else {+ $locationStr = '';+ }+ } else {+ $locationStr = '';+ }- if (($asset->assigned_to > 0) && ($location = $asset->location)) {- if ($location->city) {- $row[] = e($location->city).', '.e($location->state);- } elseif ($location->name) {- $row[] = e($location->name);- } else {- $row[] = '';- }- } else {- $row[] = ''; // Empty string if location is not set- }+ $row = [+ $asset->asset_tag,+ $asset->name,+ $asset->serial,+ $assignedTo,+ $locationStr,+ Helper::getFormattedDateObject($asset->purchase_date, 'date', false),+ $currency.Helper::formatCurrencyOutput($asset->purchase_cost),+ $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue()),+ $currency.Helper::formatCurrencyOutput($asset->purchase_cost - $asset->getDepreciatedValue()),+ ];- if ($asset->location) {- $currency = e($asset->location->currency);- } else {- $currency = e(Setting::getSettings()->default_currency);- }+ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $row);+ } else {+ fputcsv($handle, $formatter->escapeRecord($row));+ }+ }+ });- $row[] = Helper::getFormattedDateObject($asset->purchase_date, 'date', false);- $row[] = $currency.Helper::formatCurrencyOutput($asset->purchase_cost);- $row[] = $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue());- $row[] = $currency.Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));- $csv->insertOne($row);- }+ fclose($handle);+ }, 200, [+ 'Content-Type' => 'text/csv',+ 'Content-Disposition' => 'attachment; filename="depreciation-report-'.date('Y-m-d-his').'.csv"',+ ]);- $csv->output('depreciation-report-'.date('Y-m-d').'.csv');- exit;+ return $response;}/**@@ -405,45 +409,52 @@ class ReportsController extends Controller** @since [v1.0]*/- public function exportLicenseReport(): Response+ public function exportLicenseReport(): StreamedResponse{$this->authorize('reports.view');- $licenses = License::orderBy('created_at', 'DESC')->get();- $rows = [];- $header = [- trans('admin/licenses/table.title'),- trans('admin/licenses/table.serial'),- trans('admin/licenses/form.seats'),- trans('admin/licenses/form.remaining_seats'),- trans('admin/licenses/form.expiration'),- trans('general.purchase_date'),- trans('general.depreciation'),- trans('general.purchase_cost'),- ];+ $response = new StreamedResponse(function () {+ $handle = fopen('php://output', 'w');+ $formatter = new EscapeFormula('`');- $header = array_map('trim', $header);- $rows[] = implode(', ', $header);-- // Row per license- foreach ($licenses as $license) {- $row = [];- $row[] = e($license->name);- $row[] = e($license->serial);- $row[] = e($license->seats);- $row[] = $license->remaincount();- $row[] = $license->expiration_date;- $row[] = $license->purchase_date;- $row[] = ($license->depreciation != '') ? e($license->depreciation->name) : '';- $row[] = '"'.Helper::formatCurrencyOutput($license->purchase_cost).'"';-- $rows[] = implode(',', $row);- }+ $header = [+ trans('admin/licenses/table.title'),+ trans('admin/licenses/table.serial'),+ trans('admin/licenses/form.seats'),+ trans('admin/licenses/form.remaining_seats'),+ trans('admin/licenses/form.expiration'),+ trans('general.purchase_date'),+ trans('general.depreciation'),+ trans('general.purchase_cost'),+ ];+ fputcsv($handle, $header);- $csv = implode("\n", $rows);- $response = response()->make($csv, 200);- $response->header('Content-Type', 'text/csv');- $response->header('Content-disposition', 'attachment;filename=report.csv');+ License::orderBy('created_at', 'DESC')->chunk(500, function ($licenses) use ($handle, $formatter) {+ foreach ($licenses as $license) {+ $row = [+ $license->name,+ $license->serial,+ $license->seats,+ $license->remaincount(),+ $license->expiration_date,+ $license->purchase_date,+ ($license->depreciation != '') ? $license->depreciation->name : '',+ Helper::formatCurrencyOutput($license->purchase_cost),+ ];++ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $row);+ } else {+ fputcsv($handle, $formatter->escapeRecord($row));+ }+ }+ });++ fclose($handle);+ }, 200, [+ 'Content-Type' => 'text/csv',+ 'Content-Disposition' => 'attachment; filename="licenses-report-'.date('Y-m-d-his').'.csv"',+ ]);return $response;}@@ -1182,56 +1193,60 @@ class ReportsController extends Controller** @version v1.0*/- public function exportMaintenancesReport(): Response+ public function exportMaintenancesReport(): StreamedResponse{$this->authorize('reports.view');- // Grab all the improvements- $Maintenances = Maintenance::with('asset', 'supplier')- ->orderBy('created_at', 'DESC')- ->get();- $rows = [];+ $response = new StreamedResponse(function () {+ $handle = fopen('php://output', 'w');+ $formatter = new EscapeFormula('`');- $header = [- trans('admin/hardware/table.asset_tag'),- trans('admin/maintenances/table.asset_name'),- trans('general.supplier'),- trans('admin/maintenances/form.asset_maintenance_type'),- trans('admin/maintenances/form.title'),- trans('admin/maintenances/form.start_date'),- trans('admin/maintenances/form.completion_date'),- trans('admin/maintenances/form.asset_maintenance_time'),- trans('admin/maintenances/form.cost'),- ];+ $header = [+ trans('admin/hardware/table.asset_tag'),+ trans('admin/maintenances/table.asset_name'),+ trans('general.supplier'),+ trans('admin/maintenances/form.asset_maintenance_type'),+ trans('admin/maintenances/form.title'),+ trans('admin/maintenances/form.start_date'),+ trans('admin/maintenances/form.completion_date'),+ trans('admin/maintenances/form.asset_maintenance_time'),+ trans('admin/maintenances/form.cost'),+ ];+ fputcsv($handle, $header);- $header = array_map('trim', $header);- $rows[] = implode(',', $header);+ Maintenance::with('asset', 'supplier')+ ->orderBy('created_at', 'DESC')+ ->chunk(500, function ($maintenances) use ($handle, $formatter) {+ foreach ($maintenances as $maintenance) {+ $improvementTime = is_null($maintenance->asset_maintenance_time)+ ? (int) Carbon::now()->diffInDays(Carbon::parse($maintenance->start_date), true)+ : (int) $maintenance->asset_maintenance_time;- foreach ($Maintenances as $maintenance) {- $row = [];- $row[] = str_replace(',', '', e($maintenance->asset->asset_tag));- $row[] = str_replace(',', '', e($maintenance->asset->name));- $row[] = str_replace(',', '', e($maintenance->supplier->name));- $row[] = e($maintenance->improvement_type);- $row[] = e($maintenance->name);- $row[] = e($maintenance->start_date);- $row[] = e($maintenance->completion_date);- if (is_null($maintenance->asset_maintenance_time)) {- $improvementTime = (int) Carbon::now()- ->diffInDays(Carbon::parse($maintenance->start_date), true);- } else {- $improvementTime = (int) $maintenance->asset_maintenance_time;- }- $row[] = $improvementTime;- $row[] = trans('general.currency').Helper::formatCurrencyOutput($maintenance->cost);- $rows[] = implode(',', $row);- }+ $row = [+ $maintenance->asset->asset_tag,+ $maintenance->asset->name,+ $maintenance->supplier->name,+ $maintenance->improvement_type,+ $maintenance->name,+ $maintenance->start_date,+ $maintenance->completion_date,+ $improvementTime,+ trans('general.currency').Helper::formatCurrencyOutput($maintenance->cost),+ ];- // spit out a csv- $csv = implode("\n", $rows);- $response = response()->make($csv, 200);- $response->header('Content-Type', 'text/csv');- $response->header('Content-disposition', 'attachment;filename=report.csv');+ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $row);+ } else {+ fputcsv($handle, $formatter->escapeRecord($row));+ }+ }+ });++ fclose($handle);+ }, 200, [+ 'Content-Type' => 'text/csv',+ 'Content-Disposition' => 'attachment; filename="maintenances-report-'.date('Y-m-d-his').'.csv"',+ ]);return $response;}