From a4fd6709f4f67ffc51803c8e8ad3eb81b09f423c Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Thu, 17 Sep 2026 12:28:47 +0100 Subject: [PATCH] M3 Security Fixes for Pass 35 --- Modules/M3/Console/ClosedOrderSaveXls.php | 11 +++++------ Modules/M3/Console/DeleteOldLabels.php | 2 +- Modules/M3/Console/GenerateGS1Cmd.php | 2 +- Modules/M3/Console/UtilitiesCmd.php | 2 +- Modules/M3/Console/WHSMetricsSaveXls.php | 2 +- Modules/M3/Http/Controllers/API/M3Controller.php | 2 +- .../Http/Controllers/ReplenishSettingsController.php | 1 - Modules/M3/Http/Controllers/utilitiesContoller.php | 3 --- 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Modules/M3/Console/ClosedOrderSaveXls.php b/Modules/M3/Console/ClosedOrderSaveXls.php index 3fb45fa0..a8ba70b4 100644 --- a/Modules/M3/Console/ClosedOrderSaveXls.php +++ b/Modules/M3/Console/ClosedOrderSaveXls.php @@ -32,7 +32,7 @@ class ClosedOrderSaveXls extends Command * * @return void */ -/** + /** * Execute the console command. * * @return int @@ -95,7 +95,7 @@ class ClosedOrderSaveXls extends Command str_replace('-', '', $to), $file, ! Storage::disk('publicCL')->exists($file), - 'Last Month' + 'Last Month', ); } @@ -117,7 +117,7 @@ class ClosedOrderSaveXls extends Command str_replace('-', '', $to), $file, true, - 'Current Month' + 'Current Month', ); } @@ -129,7 +129,7 @@ class ClosedOrderSaveXls extends Command string $to, string $file, bool $shouldGenerate, - string $label + string $label, ): void { $this->info('From Date: ' . $from); $this->info('To Date: ' . $to); @@ -217,8 +217,7 @@ SQL; Log::channel('dailyCron')->info( 'Maximum allowed records for Excel export is: ' . number_format($maxRecords) - . ' current records: ' . number_format($count) + . ' current records: ' . number_format($count), ); } - } diff --git a/Modules/M3/Console/DeleteOldLabels.php b/Modules/M3/Console/DeleteOldLabels.php index 447d3066..8ce4a710 100644 --- a/Modules/M3/Console/DeleteOldLabels.php +++ b/Modules/M3/Console/DeleteOldLabels.php @@ -28,7 +28,7 @@ class DeleteOldLabels extends Command * * @return void */ -/** + /** * Execute the console command. * * @return int diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php index 934c343d..31bf02e6 100644 --- a/Modules/M3/Console/GenerateGS1Cmd.php +++ b/Modules/M3/Console/GenerateGS1Cmd.php @@ -36,7 +36,7 @@ class GenerateGS1Cmd extends Command * * @return void */ -/** + /** * Execute the console command. * * @return int diff --git a/Modules/M3/Console/UtilitiesCmd.php b/Modules/M3/Console/UtilitiesCmd.php index 61860958..62e77b0d 100644 --- a/Modules/M3/Console/UtilitiesCmd.php +++ b/Modules/M3/Console/UtilitiesCmd.php @@ -29,7 +29,7 @@ class UtilitiesCmd extends Command * * @return void */ -/** + /** * Execute the console command. * * @return int diff --git a/Modules/M3/Console/WHSMetricsSaveXls.php b/Modules/M3/Console/WHSMetricsSaveXls.php index 32506bda..d4efbfa4 100644 --- a/Modules/M3/Console/WHSMetricsSaveXls.php +++ b/Modules/M3/Console/WHSMetricsSaveXls.php @@ -29,7 +29,7 @@ class WHSMetricsSaveXls extends Command * * @return void */ -/** + /** * Execute the console command. * * @return int diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index 30268b8b..2f151a75 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -5,7 +5,6 @@ namespace Modules\M3\Http\Controllers\API; use Config; use DB; use Illuminate\Http\Request; -use Log; use Modules\M3\Helpers\Helper; use Modules\M3\Http\Controllers\Controller; use Modules\M3\Services\PostgresProgramBridge; @@ -14,6 +13,7 @@ use Str; class M3Controller extends Controller { private const FIELD_PREFIX = 'Field: '; + private const M3_LIST_SUFFIX = ' M3-Lis-JSN'; // Split Data and Write to ICM666M2 diff --git a/Modules/M3/Http/Controllers/ReplenishSettingsController.php b/Modules/M3/Http/Controllers/ReplenishSettingsController.php index d9e5a350..ed890136 100644 --- a/Modules/M3/Http/Controllers/ReplenishSettingsController.php +++ b/Modules/M3/Http/Controllers/ReplenishSettingsController.php @@ -176,7 +176,6 @@ class ReplenishSettingsController extends Controller // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt); // dd($rEFCAT658); - return Datatables::of($rEFCAT658)->addIndexColumn()->make(true); } } diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php index d1c123b8..032588b2 100644 --- a/Modules/M3/Http/Controllers/utilitiesContoller.php +++ b/Modules/M3/Http/Controllers/utilitiesContoller.php @@ -66,7 +66,6 @@ class utilitiesContoller extends Controller // Add Delivery Note Param $params[] = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn', '', '00000087125'); - // Start Time Tracking $start = microtime(true); @@ -402,7 +401,6 @@ class utilitiesContoller extends Controller // DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3') // ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]); - return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]); } catch (\Throwable $th) { @@ -519,7 +517,6 @@ class utilitiesContoller extends Controller '; - // Initialize Dompdf $dompdf = new Dompdf; $dompdf->loadHtml($html);