From b8ca1e7717ed3fe125914820dd741b06fc329748 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Thu, 17 Sep 2026 12:36:37 +0100 Subject: [PATCH] M3 Security Fixes for Pass 37 --- Modules/M3/Console/DeleteOldLabels.php | 2 -- Modules/M3/Console/GenerateGS1Cmd.php | 4 +--- Modules/M3/Helpers/Helper.php | 4 +--- Modules/M3/Http/Controllers/API/CloseShipment.php | 2 +- Modules/M3/Http/Controllers/API/M3Controller.php | 2 -- Modules/M3/Http/Controllers/API/TransferAPI.php | 2 +- Modules/M3/Http/Controllers/BoxPackToPalletController.php | 4 +--- Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php | 1 - Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php | 1 - Modules/M3/Http/Controllers/carrierMaintController.php | 2 -- Modules/M3/Http/Controllers/execSummaryController.php | 3 +-- Modules/M3/Http/Controllers/execSummaryLineController.php | 2 +- Modules/M3/Http/Controllers/palletQtyController.php | 4 ---- Modules/M3/Http/Controllers/pendingClosureController.php | 1 - Modules/M3/Http/Controllers/sentinelController.php | 2 +- Modules/M3/Http/Controllers/userControlController.php | 2 -- Modules/M3/Http/Controllers/userPickingStats4.php | 2 +- Modules/M3/Http/Controllers/utilitiesContoller.php | 6 ------ Modules/M3/Providers/M3ServiceProvider.php | 4 +--- 19 files changed, 10 insertions(+), 40 deletions(-) diff --git a/Modules/M3/Console/DeleteOldLabels.php b/Modules/M3/Console/DeleteOldLabels.php index 8ce4a710..d5a0811b 100644 --- a/Modules/M3/Console/DeleteOldLabels.php +++ b/Modules/M3/Console/DeleteOldLabels.php @@ -75,8 +75,6 @@ class DeleteOldLabels extends Command } } - // dump($filesToDeleteArr); - // Delete Old Files File::delete($filesToDeleteArr); diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php index 31bf02e6..99d69a97 100644 --- a/Modules/M3/Console/GenerateGS1Cmd.php +++ b/Modules/M3/Console/GenerateGS1Cmd.php @@ -2,7 +2,6 @@ namespace Modules\M3\Console; -use App; use Ayeo\Barcode; use Cache; use Config; @@ -54,7 +53,7 @@ class GenerateGS1Cmd extends Command // Get the Calling User $userId = $this->argument('user'); - $sHUSER = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP'); + $sHUSER = $userId ?? (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP'); $this->info('User: ' . $sHUSER); // Get Manifest Array @@ -223,7 +222,6 @@ class GenerateGS1Cmd extends Command } $html .= ' '; - // App::call('App\Http\Controllers\utilitiesContoller@generateGS128'); ob_start(); diff --git a/Modules/M3/Helpers/Helper.php b/Modules/M3/Helpers/Helper.php index d80d71b8..67c3a503 100644 --- a/Modules/M3/Helpers/Helper.php +++ b/Modules/M3/Helpers/Helper.php @@ -232,7 +232,6 @@ class Helper ini_set('max_execution_time', Config::get('arrays.PHPTimeOut')); DB::connection(config('m3.connection', 'pgsql'))->table('ICM699M')->insert($data); - // dump($insertSQL); } // Get Substring in string between 2 Substrings @@ -246,9 +245,8 @@ class Helper if ($endPos === false) { return ''; } - $substring = substr($string, $startPos + strlen($start), $endPos - ($startPos + strlen($start))); - return $substring; + return substr($string, $startPos + strlen($start), $endPos - ($startPos + strlen($start))); } public static function checkLength($jsonFields, $dbFields, $type) diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php index a015dec9..192db343 100644 --- a/Modules/M3/Http/Controllers/API/CloseShipment.php +++ b/Modules/M3/Http/Controllers/API/CloseShipment.php @@ -519,7 +519,7 @@ class CloseShipment extends Controller } // Check Packages array before proceeding with CloseShipment - if (count($pACKAGES) > 0) { + if (! empty($pACKAGES)) { // Get Packlist $packingList = ''; $dOCTYPE = 'PackingList'; diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index 2f151a75..ff2075ff 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -19,7 +19,6 @@ class M3Controller extends Controller // Split Data and Write to ICM666M2 public function insertToICM666M2($dataSplit, $commentData) { - // dump($dataSplit); $commentDataSS = explode("\n", $dataSplit); $aXLINENO = 1; @@ -410,7 +409,6 @@ class M3Controller extends Controller $hazMat = isset($iCM709MSEL->AT9WRN) ? $iCM709MSEL->AT9WRN : ''; $insertArray['A1MATWRN'] = $hazMat; - // $insertArray['A1USRN01']=$palletQty; // } // SQL Insert to ICM666M diff --git a/Modules/M3/Http/Controllers/API/TransferAPI.php b/Modules/M3/Http/Controllers/API/TransferAPI.php index 8a0adb9b..21ce6aa1 100644 --- a/Modules/M3/Http/Controllers/API/TransferAPI.php +++ b/Modules/M3/Http/Controllers/API/TransferAPI.php @@ -480,7 +480,7 @@ class TransferAPI extends Controller } // A4SPR15A01 Exists : proceed - if ($a4SPR15A01 != '' && count($allMacpkrs) > 0) { + if ($a4SPR15A01 != '' && ! empty($allMacpkrs)) { $jSON = json_encode([ 'DIVI' => $dIVI, 'WHS' => $wHS, diff --git a/Modules/M3/Http/Controllers/BoxPackToPalletController.php b/Modules/M3/Http/Controllers/BoxPackToPalletController.php index 46a1af6a..cbf12346 100644 --- a/Modules/M3/Http/Controllers/BoxPackToPalletController.php +++ b/Modules/M3/Http/Controllers/BoxPackToPalletController.php @@ -280,13 +280,11 @@ class BoxPackToPalletController extends Controller $uSERWH = isset($iCM428M->R428WH) ? $iCM428M->R428WH : ''; $r428PL = isset($iCM428M->R428PL) ? $iCM428M->R428PL : ''; - $userWhsCoPlant = [ + return [ 'R428US' => $r428US, 'USERCO' => $uSERCO, 'USERWHS' => $uSERWH, 'USERPL' => $r428PL, ]; - - return $userWhsCoPlant; } } diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php index 4e3bd13b..e49e6462 100644 --- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php +++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php @@ -184,7 +184,6 @@ class M3GetPDFFromCacheController extends Controller } } catch (\Throwable $th) { } - // dump($aYMACPKR); // dump($iC670M); // dump($iCM695M1); diff --git a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php index 0f57f42c..40fdeda0 100644 --- a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php +++ b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php @@ -181,7 +181,6 @@ class OrderLinesOfClosedOrder extends Controller $urlParams = count($request->all()) > 0 ? $request->all() : ''; $reportDate = isset($urlParams['REPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['REPORTDATE']))->format('Ymd') : today()->format('Ymd'); $toreportDate = isset($urlParams['TOREPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['TOREPORTDATE']))->format('Ymd') : today()->format('Ymd'); - // dd($toreportDate); $reportDateWD = isset($urlParams['REPORTDATE']) ? trim($urlParams['REPORTDATE']) : today()->format('Y-m-d'); $toreportDateWD = isset($urlParams['TOREPORTDATE']) ? trim($urlParams['TOREPORTDATE']) : today()->format('Y-m-d'); diff --git a/Modules/M3/Http/Controllers/carrierMaintController.php b/Modules/M3/Http/Controllers/carrierMaintController.php index 0f669b2f..d8499cc1 100644 --- a/Modules/M3/Http/Controllers/carrierMaintController.php +++ b/Modules/M3/Http/Controllers/carrierMaintController.php @@ -37,7 +37,6 @@ class carrierMaintController extends Controller { $currentUser = Helper::getUserCOWHSPLT(); $userCO = $currentUser['UserCO'] ?? ''; - // $UserPL = $currentUser['UserPL'] ?? ''; // Insert record to ICM160M // Verify record does not already exist in ICM160M @@ -65,7 +64,6 @@ class carrierMaintController extends Controller { $currentUser = Helper::getUserCOWHSPLT(); $userCO = $currentUser['UserCO'] ?? ''; - // $UserPL = $currentUser['UserPL'] ?? ''; // Insert record to ICM160M if ($request->CANUM == null) { diff --git a/Modules/M3/Http/Controllers/execSummaryController.php b/Modules/M3/Http/Controllers/execSummaryController.php index 13deb074..cb8eff6a 100644 --- a/Modules/M3/Http/Controllers/execSummaryController.php +++ b/Modules/M3/Http/Controllers/execSummaryController.php @@ -35,7 +35,7 @@ class execSummaryController extends Controller $checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on $checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on - if (count($wHArr) > 0 && $cO != '' && $reportPeriod != '') { + if (! empty($wHArr) && $cO != '' && $reportPeriod != '') { switch ($reportPeriod) { case 'year': // Set Dates based on reportPeriod type @@ -128,7 +128,6 @@ class execSummaryController extends Controller break; } // dump($toreportDate); - // dump($selectContent); $execSummaryRes = DB::connection(config('m3.connection', 'pgsql'))->select($selectContent); } else { diff --git a/Modules/M3/Http/Controllers/execSummaryLineController.php b/Modules/M3/Http/Controllers/execSummaryLineController.php index 02bafa0f..5eaac123 100644 --- a/Modules/M3/Http/Controllers/execSummaryLineController.php +++ b/Modules/M3/Http/Controllers/execSummaryLineController.php @@ -35,7 +35,7 @@ class execSummaryLineController extends Controller $checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on $checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on - if (count($wHArr) > 0 && $cO != '' && $reportPeriod != '') { + if (! empty($wHArr) && $cO != '' && $reportPeriod != '') { switch ($reportPeriod) { case 'year': // Set Dates based on reportPeriod type diff --git a/Modules/M3/Http/Controllers/palletQtyController.php b/Modules/M3/Http/Controllers/palletQtyController.php index e031330e..044eed50 100644 --- a/Modules/M3/Http/Controllers/palletQtyController.php +++ b/Modules/M3/Http/Controllers/palletQtyController.php @@ -38,7 +38,6 @@ class palletQtyController extends Controller // Insert record to ICM709M // var_dump($request); - // console.log($request); // Verify record does not already exist in ICM709M $icm709m = DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'"); @@ -64,7 +63,6 @@ class palletQtyController extends Controller // Insert record to ICM709M // var_dump($request); - // console.log($request); // Verify record does not already exist in ICM709M // DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY) // values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY')"); @@ -86,8 +84,6 @@ class palletQtyController extends Controller public static function saveQtyEdit(Request $request) { - // console.log($request); - // where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'"); // var_dump($icm709m); diff --git a/Modules/M3/Http/Controllers/pendingClosureController.php b/Modules/M3/Http/Controllers/pendingClosureController.php index 239e213f..97a29473 100644 --- a/Modules/M3/Http/Controllers/pendingClosureController.php +++ b/Modules/M3/Http/Controllers/pendingClosureController.php @@ -89,7 +89,6 @@ class pendingClosureController extends Controller { // Get URL PARAMS $urlParams = count($request->all()) > 0 ? $request->all() : ''; - // $SHUSER = isset($urlParams["SHUSER"]) ? $urlParams["SHUSER"] : ''; $mANIFEST = isset($urlParams['MANIFEST']) ? $urlParams['MANIFEST'] : ''; $aPCO = isset($urlParams['APCO']) ? $urlParams['APCO'] : ''; $aPWHS = isset($urlParams['APWHS']) ? $urlParams['APWHS'] : ''; diff --git a/Modules/M3/Http/Controllers/sentinelController.php b/Modules/M3/Http/Controllers/sentinelController.php index 4ec9a214..9deeab11 100644 --- a/Modules/M3/Http/Controllers/sentinelController.php +++ b/Modules/M3/Http/Controllers/sentinelController.php @@ -25,7 +25,7 @@ class sentinelController extends Controller ->where('AYSTATUS', '') ->first(); - $allowDeletion = isset($iCM695M1Sel->AYSENTPKR) ? ($iCM695M1Sel->AYSENTPKR != '' ? true : false) : false; + $allowDeletion = ! empty($iCM695M1Sel->AYSENTPKR); if ($allowDeletion) { $timestamp = date('Y-m-d H:i:s.u'); diff --git a/Modules/M3/Http/Controllers/userControlController.php b/Modules/M3/Http/Controllers/userControlController.php index d787787c..96c07fe6 100644 --- a/Modules/M3/Http/Controllers/userControlController.php +++ b/Modules/M3/Http/Controllers/userControlController.php @@ -229,7 +229,6 @@ class userControlController extends Controller // Successful Call else { // $AWREQN = $result['io_param']["var0"]; - // return "success"; if ($request->ACTION == 'P') { echo ""; } @@ -289,7 +288,6 @@ class userControlController extends Controller } // $params[] = $conn->AddParameterChar('in', 10, 'userid','USRPRF',$request->USERID); - // $params[] = $conn->AddParameterChar('in', 10, 'pwd','PASSWORD',$request->PASSWORD); // $params[] = $conn->AddParameterChar('in', 9, 'sts','STATUS','*ENABLED'); // $params[] = $conn->AddParameterChar('in', 4, 'pwdexp','PWDEXP','*NO'); diff --git a/Modules/M3/Http/Controllers/userPickingStats4.php b/Modules/M3/Http/Controllers/userPickingStats4.php index 60c0b752..5260d2e2 100644 --- a/Modules/M3/Http/Controllers/userPickingStats4.php +++ b/Modules/M3/Http/Controllers/userPickingStats4.php @@ -286,7 +286,7 @@ class userPickingStats4 extends Controller // display webpage of statistic version 4 $request->ports = Config::get('arrays.env_ports'); $no_data = 'N'; - if (count($statistic4) == 0 && $_SERVER['REQUEST_URI'] != '/userPickingStats4') { + if (empty($statistic4) && $_SERVER['REQUEST_URI'] != '/userPickingStats4') { $no_data = 'Y'; } diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php index 032588b2..d7e29393 100644 --- a/Modules/M3/Http/Controllers/utilitiesContoller.php +++ b/Modules/M3/Http/Controllers/utilitiesContoller.php @@ -101,7 +101,6 @@ class utilitiesContoller extends Controller // Parse PDF file and build necessary objects. $parser = new Parser; - // dump($pdf); // $text = $pdf->getText(); // dump("Text Only"); // dump($text); @@ -164,7 +163,6 @@ class utilitiesContoller extends Controller ->get(); foreach ($iCM688M2SLTMP as $key => $ICM688M2SL) { - // $counter == 10 ? exit : ''; $a5MACPKR = isset($ICM688M2SL->A5MACPKR) ? $ICM688M2SL->A5MACPKR : ''; $a5SENTPKR = isset($ICM688M2SL->A5SENTPKR) ? $ICM688M2SL->A5SENTPKR : ''; @@ -415,9 +413,6 @@ class utilitiesContoller extends Controller { print_r('>>> Generate PDF'); - // $image = $builder->output('(10)123456(400)11(3906)333333'); - - // $builder->setBarcodeType('gs1-128'); // $builder->setFilename('barcode.png'); // $builder->setImageFormat('png'); // $builder->setWidth(500); @@ -594,7 +589,6 @@ class utilitiesContoller extends Controller $response = $controller->processShipment($myRequest); $responseData = $response->getData(); - // $responseJSON = json_encode($responseData); // dump($responseJSON); $error = isset($responseData->error) ? $responseData->error : ''; diff --git a/Modules/M3/Providers/M3ServiceProvider.php b/Modules/M3/Providers/M3ServiceProvider.php index 21e3c706..741dac5d 100644 --- a/Modules/M3/Providers/M3ServiceProvider.php +++ b/Modules/M3/Providers/M3ServiceProvider.php @@ -79,9 +79,7 @@ class M3ServiceProvider extends ServiceProvider $commandPath = __DIR__ . '/../Console'; $commands = collect(File::allFiles($commandPath)) ->map(function ($file) { - $class = 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension(); - - return $class; + return 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension(); }) ->filter(function ($class) { return class_exists($class);