From 34e13a0bf0d2bfecb6061022288ca99bf6f4512f Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Thu, 17 Sep 2026 12:52:29 +0100 Subject: [PATCH] M3 Security Fixes for Pass 39 --- Modules/M3/Console/DeleteOldLabels.php | 2 +- Modules/M3/Console/GenerateGS1Cmd.php | 1 - .../M3/Http/Controllers/API/CloseShipment.php | 2 -- .../M3/Http/Controllers/API/M3Controller.php | 2 -- .../M3GetPDFFromCacheController.php | 18 ++++-------------- .../M3/Http/Controllers/MFOrdersController.php | 1 - .../Http/Controllers/execSummaryController.php | 2 -- .../M3/Http/Controllers/fillBOLController.php | 4 ---- .../Controllers/pendingClosureController.php | 9 +++++---- .../Http/Controllers/userControlController.php | 7 ------- .../M3/Http/Controllers/utilitiesContoller.php | 18 ------------------ .../assets/demo/chart-area-demo.js | 2 +- .../assets/demo/chart-bar-demo.js | 2 +- .../assets/demo/chart-pie-demo.js | 2 +- .../public/liberty-theme/css/styles.css | 8 -------- resources/css/app.css | 3 --- 16 files changed, 13 insertions(+), 70 deletions(-) diff --git a/Modules/M3/Console/DeleteOldLabels.php b/Modules/M3/Console/DeleteOldLabels.php index d5a0811b..8adba97a 100644 --- a/Modules/M3/Console/DeleteOldLabels.php +++ b/Modules/M3/Console/DeleteOldLabels.php @@ -49,7 +49,7 @@ class DeleteOldLabels extends Command $daysOld = 180; // Number of days to consider a file old : 180 =Six Months $filesToDeleteArr = []; - foreach ($subFolders as $key => $subFolder) { + foreach ($subFolders as $subFolder) { $labelsDirectory = $labelsDirectoryTmp . $subFolder; $this->info('Getting Files From Directory: ' . $labelsDirectory); diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php index 99d69a97..10dd2182 100644 --- a/Modules/M3/Console/GenerateGS1Cmd.php +++ b/Modules/M3/Console/GenerateGS1Cmd.php @@ -153,7 +153,6 @@ class GenerateGS1Cmd extends Command // If remainder is 0, check digit is 0; otherwise, subtract remainder from 10 $checkDigit = ($remainder == 0) ? 0 : 10 - $remainder; - $gs1_128_bc = $gs1_128_bc_1 . $checkDigit; $gs1_128_bc_desc = '(00)' . $packageType . $manufactID . $gS1SEQUENCEID . $checkDigit; $data = [ diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php index 192db343..21584239 100644 --- a/Modules/M3/Http/Controllers/API/CloseShipment.php +++ b/Modules/M3/Http/Controllers/API/CloseShipment.php @@ -173,7 +173,6 @@ class CloseShipment extends Controller } $iCM695M1TMP = $iCM695M1PREP->get(); - // Log::channel('dailyCron')->info($iCM695M1TMP); // PFC if MACKPKR already Closed : Case 671 $iCM695M1TMPCOL = collect($iCM695M1TMP); @@ -383,7 +382,6 @@ class CloseShipment extends Controller $commoditiesTmp = isset($responseData->commodities) ? $responseData->commodities : ''; if ($commoditiesTmp != '') { $commodities = $commoditiesTmp; // json_encode($commoditiesTmp); - // dump( $commodities); } else { $commodities = ''; $errorMsgs = $errorMsgs . ' Could not find Commodities; '; diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index ff2075ff..8f9b5b5a 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -251,7 +251,6 @@ class M3Controller extends Controller } // Get Products : commodities And Write ICM666M - $tmpProd = ''; $products = $jsonFile['Contents']['Commodities']; foreach ($products as $key => $product) { $quantity = isset($product['Quantity']) ? $product['Quantity'] : ''; @@ -418,7 +417,6 @@ class M3Controller extends Controller // Call PGM ICM700CSBM if ($warehouse != '' && $pickerNumber != '' && $company != '') { $pGMERRORS = ''; - $aWREQN = ''; // connect to toolkit using DB2 credentials (can also leave blank for default authority) try { diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php index e49e6462..f26d01d9 100644 --- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php +++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php @@ -75,10 +75,6 @@ class M3GetPDFFromCacheController extends Controller $aggmsg = "This delivery note is part of aggregation $aggno "; $iCM688M1 = DB::connection(config('m3.connection', 'pgsql'))->select("select A4MACPKR from ICM688M1 where A4SHPAGGCD='$aggno'"); - // foreach($iCM688M1 as $key => $ICM688M1R) { - // $aggmsg.=' '.$ICM688M1R->A4MACPKR.''; - // } - // $aggmsg.=" )"; // 654 add 'AYSPR15A01', 'AYSPR30A01', 'AYTRUCK' carrier and tracking# and agg# $iCM695M1 = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m1') @@ -102,12 +98,10 @@ class M3GetPDFFromCacheController extends Controller ->get(); } - $allLabels = []; - if (count($iCM695M1) > 0) { $tmpCacheArr = $carrier = $trackingno = []; // Loop the Results from $ICM595M1TMP - foreach ($iCM695M1 as $key => $ICM695M1R) { + foreach ($iCM695M1 as $ICM695M1R) { $wHS = trim($ICM695M1R->AYWHS); $cOMPANY = trim($ICM695M1R->AYCO); $aYMACPKR = trim($ICM695M1R->AYMACPKR); @@ -119,13 +113,10 @@ class M3GetPDFFromCacheController extends Controller // Make Key and Test Validity if ($aYMACPKR != '' && $cOMPANY != '' && $wHS != '') { - $carrierLabel = ''; $contentLabel = ''; - $packingList = ''; - $cacheKeyPackingList = $cacheKeyCarrierLabel = $cacheKeyContentLabel = ''; // Get Unique Keys - foreach ($docTypes as $key => $value) { + foreach ($docTypes as $value) { // Check Parcel vs LTL if ($value == 'ContentLabel') { $dOCNUMT = $dOCNUM; @@ -166,7 +157,7 @@ class M3GetPDFFromCacheController extends Controller // Get unique values from array $pDFArray $tmpCacheArr = collect($tmpCacheArr)->unique(); - foreach ($tmpCacheArr as $key => $value) { + foreach ($tmpCacheArr as $value) { $pdfFileName = $pdfFilePath . $value . '.pdf'; if (File::exists($pdfFileName)) { @@ -183,9 +174,8 @@ class M3GetPDFFromCacheController extends Controller } } } catch (\Throwable $th) { + report($th); } - // dump($iC670M); - // dump($iCM695M1); return view('m3::liberty-theme.pages.M3GetPDF', ['IC670M' => $iC670M, 'PDFArray' => $pDFArray, 'AYMACPKR' => $aYMACPKR, 'WHDDA' => $wHDDA, 'aggmsg' => $aggmsg, 'carrier' => $carrier, 'trackingno' => $trackingno, 'ICM688M1' => $iCM688M1, 'COMPANY' => $cOMPANY, 'PLANT' => $pLANT, 'WHS' => $wHS]); // compact('IC670M','ViewTitle') diff --git a/Modules/M3/Http/Controllers/MFOrdersController.php b/Modules/M3/Http/Controllers/MFOrdersController.php index a3179c42..8cd76460 100644 --- a/Modules/M3/Http/Controllers/MFOrdersController.php +++ b/Modules/M3/Http/Controllers/MFOrdersController.php @@ -18,7 +18,6 @@ class MFOrdersController extends Controller ->select('R428US', 'R428CO', 'R428WH', 'R428PL') ->where('R428US', '=', strtoupper(m3_user())) ->first(); - $user = $iCM428M->R428US; $co = $iCM428M->R428CO; $whs = $iCM428M->R428WH; $plant = $iCM428M->R428PL; diff --git a/Modules/M3/Http/Controllers/execSummaryController.php b/Modules/M3/Http/Controllers/execSummaryController.php index cb8eff6a..7a2a5c8e 100644 --- a/Modules/M3/Http/Controllers/execSummaryController.php +++ b/Modules/M3/Http/Controllers/execSummaryController.php @@ -107,7 +107,6 @@ class execSummaryController extends Controller $reportDate = $firstDay->modify('first day of this month')->format('Ymd'); $toreportDate = $firstDay->modify('last day of this month')->format('Ymd'); - // $toreportDate =$lastDay->modify('last day of this month')->format('Ymd'); // Build SQL $selectContent = "with tempfile as ( @@ -127,7 +126,6 @@ class execSummaryController extends Controller $selectContent = ''; break; } - // dump($toreportDate); $execSummaryRes = DB::connection(config('m3.connection', 'pgsql'))->select($selectContent); } else { diff --git a/Modules/M3/Http/Controllers/fillBOLController.php b/Modules/M3/Http/Controllers/fillBOLController.php index cba7bbbc..e891afe3 100644 --- a/Modules/M3/Http/Controllers/fillBOLController.php +++ b/Modules/M3/Http/Controllers/fillBOLController.php @@ -31,8 +31,6 @@ class fillBOLController extends Controller dd($error); } - // dd($test); - $newfile = "BOL-{$bOL['BOL_number']}.pdf"; var_dump($newfile); @@ -43,8 +41,6 @@ class fillBOLController extends Controller dd($error); } - // dd($test); - $result = $pdf->fillForm([ 'DTESHIPED.1' => date('d/m/Y'), 'invoice_number' => $bOL['BOL_number'], diff --git a/Modules/M3/Http/Controllers/pendingClosureController.php b/Modules/M3/Http/Controllers/pendingClosureController.php index 97a29473..9033f344 100644 --- a/Modules/M3/Http/Controllers/pendingClosureController.php +++ b/Modules/M3/Http/Controllers/pendingClosureController.php @@ -32,7 +32,7 @@ class pendingClosureController extends Controller $iCM698Ma = []; $iCM699Ma = []; - foreach ($iCM705M1 as $key => $val) { + foreach ($iCM705M1 as $val) { $sqlstmt1 = "select LGUSER,LGCONFDT,LGCONFTM from ICM698M where LGCO='$val->APCO' and LGWHS='$val->APWHS'and LGURL='op605api.php' @@ -42,7 +42,7 @@ class pendingClosureController extends Controller $iCM698Ma[$val->APMANIFEST]['TMSUSER'] = ''; $iCM698Ma[$val->APMANIFEST]['TMSDATE'] = ''; $iCM698Ma[$val->APMANIFEST]['TMSTIME'] = ''; - foreach ($iCM698M as $key2 => $val2) { + foreach ($iCM698M as $val2) { $iCM698Ma[$val->APMANIFEST]['TMSUSER'] = $val2->LGUSER; $iCM698Ma[$val->APMANIFEST]['TMSDATE'] = $val2->LGCONFDT; $iCM698Ma[$val->APMANIFEST]['TMSTIME'] = $val2->LGCONFTM; @@ -52,7 +52,7 @@ class pendingClosureController extends Controller WHERE SHMACPKR='$val->APMANIFEST' AND SHCO='$co' AND SHWHS='$whs' AND SHSOURCE='CloseShipmentCoChargeAPI' AND SHERROR='' AND SHTYPE='M3-Req-out' limit 1"; $iCM699MSel = DB::connection(config('m3.connection', 'pgsql'))->select($iCM699MSel1); - foreach ($iCM699MSel as $key2 => $val2) { + foreach ($iCM699MSel as $val2) { $iCM699Ma[$val2->SHMACPKR]['SHDT'] = $val2->SHDT; $iCM699Ma[$val2->SHMACPKR]['SHTIME'] = $val2->SHTIME; } @@ -73,7 +73,7 @@ class pendingClosureController extends Controller // AND APSPARE2!='' // dump($sqlstmt3); $uproccessedOrders = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt3); - foreach ($uproccessedOrders as $key => $UproccessedOrder) { + foreach ($uproccessedOrders as $UproccessedOrder) { $unprocessedArr[] = ' ' . trim($UproccessedOrder->APMANIFEST) . ''; } @@ -107,6 +107,7 @@ class pendingClosureController extends Controller 'message' => 'Manifest Closing submitted', ]); } catch (\Throwable $th) { + report($th); } } diff --git a/Modules/M3/Http/Controllers/userControlController.php b/Modules/M3/Http/Controllers/userControlController.php index 96c07fe6..68edb831 100644 --- a/Modules/M3/Http/Controllers/userControlController.php +++ b/Modules/M3/Http/Controllers/userControlController.php @@ -228,7 +228,6 @@ class userControlController extends Controller } // Successful Call else { - // $AWREQN = $result['io_param']["var0"]; if ($request->ACTION == 'P') { echo ""; } @@ -257,18 +256,12 @@ class userControlController extends Controller $pGMERRORS = ''; - // echo "request="; var_dump($request); - // echo "B3
"; // connect to toolkit using DB2 credentials (can also leave blank for default authority) try { $conn = app(PostgresProgramBridge::class); // echo "B4
"; } catch (\Throwable $e) { - // echo "B5
"; - // Determine reason for failure. - // Probably database authentication error or invalid or unreachable database. - // ## $conn->setOptions(array('persistent' => false, 'stateless' => true, 'debug' => true,'debugLogFile' => '/www/sentm3test/htdocs/storage/logs/toolkit_debug.log')); $code = $e->getCode(); $msg = $e->getMessage(); diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php index d7e29393..97bddd0f 100644 --- a/Modules/M3/Http/Controllers/utilitiesContoller.php +++ b/Modules/M3/Http/Controllers/utilitiesContoller.php @@ -9,7 +9,6 @@ use DB; use Dompdf\Dompdf; use File; use Illuminate\Http\Request; -use Illuminate\Http\Response; use Log; use Modules\M3\Services\PostgresProgramBridge; use PDF; @@ -25,7 +24,6 @@ class utilitiesContoller extends Controller // Get The Next ID by Calling POM002C $pGMERRORS = ''; - $aWREQN = ''; // connect to toolkit using DB2 credentials (can also leave blank for default authority) try { @@ -85,7 +83,6 @@ class utilitiesContoller extends Controller if ($pGMERRORS != '') { dump($pGMERRORS); - } else { } // Get Execution Time $time = microtime(true) - $start; @@ -101,10 +98,6 @@ class utilitiesContoller extends Controller // Parse PDF file and build necessary objects. $parser = new Parser; - // $text = $pdf->getText(); - // dump("Text Only"); - // dump($text); - $pdfFile = File::get('/www/sentm3test/htdocs/labels/' . $pdfFileName . '.pdf'); // Transform content to base64 @@ -413,17 +406,6 @@ class utilitiesContoller extends Controller { print_r('>>> Generate PDF'); - // $builder->setFilename('barcode.png'); - // $builder->setImageFormat('png'); - // $builder->setWidth(500); - // $builder->setHeight(150); - // $builder->setFontPath('FreeSans.ttf'); - // $builder->setFontSize(15); - // $builder->setBackgroundColor(255, 255, 255); - // $builder->setPaintColor(0, 0, 0); - // Barcode\Builder::build()->setWidth(600)->setBackgroundColor(100, 100, 100)->output('(10)123456(400)11'); - // return response($image)->header('Content-Type', 'image/png'); - $data = [ 'from' => 'Any Vendor
123 Any Street
SomeTown, ST 01234', 'ship_to' => 'True Value Hardware
123 Any Street
SomeTown, ST 01234', diff --git a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-area-demo.js b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-area-demo.js index 2844cfc9..7a1da791 100644 --- a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-area-demo.js +++ b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-area-demo.js @@ -5,7 +5,7 @@ Chart.defaults.global.defaultFontColor = '#292b2c'; // Area Chart Example let ctx = document.getElementById("myAreaChart"); if (ctx) { -let myLineChart = new Chart(ctx, { +new Chart(ctx, { type: 'line', data: { labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"], diff --git a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-bar-demo.js b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-bar-demo.js index 8120b033..f205f718 100644 --- a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-bar-demo.js +++ b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-bar-demo.js @@ -5,7 +5,7 @@ Chart.defaults.global.defaultFontColor = '#292b2c'; // Bar Chart Example let ctx = document.getElementById("myBarChart"); if (ctx) { -let myLineChart = new Chart(ctx, { +new Chart(ctx, { type: 'bar', data: { labels: ["January", "February", "March", "April", "May", "June"], diff --git a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-pie-demo.js b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-pie-demo.js index 18ad995e..6ce90f7e 100644 --- a/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-pie-demo.js +++ b/Modules/M3/Resources/public/liberty-theme/assets/demo/chart-pie-demo.js @@ -5,7 +5,7 @@ Chart.defaults.global.defaultFontColor = '#292b2c'; // Pie Chart Example let ctx = document.getElementById("myPieChart"); if (ctx){ -let myPieChart = new Chart(ctx, { +new Chart(ctx, { type: 'pie', data: { labels: ["Blue", "Red", "Yellow", "Green"], diff --git a/Modules/M3/Resources/public/liberty-theme/css/styles.css b/Modules/M3/Resources/public/liberty-theme/css/styles.css index 3b469c3e..95c0c8aa 100644 --- a/Modules/M3/Resources/public/liberty-theme/css/styles.css +++ b/Modules/M3/Resources/public/liberty-theme/css/styles.css @@ -436,14 +436,6 @@ legend + * { -webkit-appearance: textfield; } -/* rtl:raw: -[type="tel"], -[type="url"], -[type="email"], -[type="number"] { - direction: ltr; -} -*/ ::-webkit-search-decoration { -webkit-appearance: none; } diff --git a/resources/css/app.css b/resources/css/app.css index 9b718698..c81a0567 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -63,9 +63,6 @@ select:focus[data-flux-control] { @apply outline-hidden ring-2 ring-accent ring-offset-2 ring-offset-accent-foreground; } -/* \[:where(&)\]:size-4 { - @apply size-4; -} */ @layer components { .wms-app-shell {