A free open source IT asset/license management system
Added League\Csv\EscapeFormula for a few more reports
snipe7b7d2c87fbc9
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.phpindex d34fd3bbca..68ba1c2357 100755--- a/app/Http/Controllers/Licenses/LicensesController.php+++ b/app/Http/Controllers/Licenses/LicensesController.php@@ -12,6 +12,7 @@ use Illuminate\Contracts\View\View;use Illuminate\Http\RedirectResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;+use League\Csv\EscapeFormula;use Symfony\Component\HttpFoundation\StreamedResponse;/**@@ -388,6 +389,8 @@ class LicensesController extends Controllerfputcsv($handle, $headers);+ $formatter = new EscapeFormula('`');+foreach ($licenses as $license) {// Add a new row with data$values = [@@ -419,7 +422,14 @@ class LicensesController extends Controller$license->created_at,];- fputcsv($handle, $values);+ // CSV_ESCAPE_FORMULAS is set to false in the .env+ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $values);++ // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env+ } else {+ fputcsv($handle, $formatter->escapeRecord($values));+ }}});diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex 45dfc4357b..f31d436ace 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -252,6 +252,7 @@ class ReportsController extends Controller$response = new StreamedResponse(function () {Log::debug('Starting streamed response');+ Log::debug('CSV escaping is set to: '.config('app.escape_formulas'));// Open output stream$handle = fopen('php://output', 'w');@@ -287,6 +288,8 @@ class ReportsController extends ControllerLog::debug('Walking results: '.$executionTime);$count = 0;+ $formatter = new EscapeFormula('`');+foreach ($actionlogs as $actionlog) {$count++;$target_name = '';@@ -317,7 +320,15 @@ class ReportsController extends Controller$actionlog->action_source,$actionlog->log_meta,];- fputcsv($handle, $row);++ // CSV_ESCAPE_FORMULAS is set to false in the .env+ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $row);++ // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env+ } else {+ fputcsv($handle, $formatter->escapeRecord($row));+ }}});diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex a6c94129b4..50b6b2aa1f 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -26,6 +26,7 @@ use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;use Illuminate\Support\Facades\Password;+use League\Csv\EscapeFormula;use Symfony\Component\HttpFoundation\StreamedResponse;/**@@ -572,6 +573,8 @@ class UsersController extends Controllerfputcsv($handle, $headers);+ $formatter = new EscapeFormula('`');+foreach ($users as $user) {$user_groups = '';@@ -614,7 +617,14 @@ class UsersController extends Controller$user->created_at,];- fputcsv($handle, $values);+ // CSV_ESCAPE_FORMULAS is set to false in the .env+ if (config('app.escape_formulas') === false) {+ fputcsv($handle, $values);++ // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env+ } else {+ fputcsv($handle, $formatter->escapeRecord($values));+ }}});