mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Security Fixes for Pass 39

Browse Source
This commit is contained in:
Mark Gregory
2026-09-17 12:52:29 +01:00
parent b8ca1e7717
commit 34e13a0bf0
16 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
+4 -14
View File
@@ -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.=' <a href="M3GetPDFFromCache?MACPKR='.$ICM688M1R->A4MACPKR.'&COMPANY='.$cOMPANY.'&PLANT='.$pLANT.'&WHS='.$wHS.'">'.$ICM688M1R->A4MACPKR.'</a>';
// }
// $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')