Trim URL and always use rawurlencode

remdex · remdex · commit 5ccbe3dece4c · 2025-12-17T01:47:15.000-05:00
diff --git a/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php b/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php
@@ -1286,10 +1286,10 @@ public static function makeRequest($host, $methodSettings, $paramsCustomer)
         $replaceVariablesURL = [];
 
         foreach ($replaceVariables as $keyVariable => $variableValue) {
-                $replaceVariablesURL['urlencode_' . $keyVariable] = urlencode((string)$variableValue);
+                $replaceVariablesURL['urlencode_' . $keyVariable] = rawurlencode((string)$variableValue);
         }
 
-        $url = rtrim($host) . str_replace(array_keys($replaceVariables), array_values($replaceVariables),str_replace(array_keys($replaceVariablesURL), array_values($replaceVariablesURL), (isset($methodSettings['suburl']) ? $methodSettings['suburl'] : ''))) . (!empty($queryArgsString) ? '?'.$queryArgsString : '');
+        $url = trim(rtrim($host) . str_replace(array_keys($replaceVariables), array_values($replaceVariables),str_replace(array_keys($replaceVariablesURL), array_values($replaceVariablesURL), (isset($methodSettings['suburl']) ? $methodSettings['suburl'] : ''))) . (!empty($queryArgsString) ? '?'.$queryArgsString : ''));
 
         if (!filter_var($url, FILTER_VALIDATE_URL)) {
 

Original file line number	Diff line number	Diff line change
`@@ -1286,10 +1286,10 @@ public static function makeRequest($host, $methodSettings, $paramsCustomer)`
`1286`	`1286`	`$replaceVariablesURL = [];`
`1287`	`1287`
`1288`	`1288`	`foreach ($replaceVariables as $keyVariable => $variableValue) {`
`1289`		`- $replaceVariablesURL['urlencode_' . $keyVariable] = urlencode((string)$variableValue);`
	`1289`	`+ $replaceVariablesURL['urlencode_' . $keyVariable] = rawurlencode((string)$variableValue);`
`1290`	`1290`	`}`
`1291`	`1291`
`1292`		`- $url = rtrim($host) . str_replace(array_keys($replaceVariables), array_values($replaceVariables),str_replace(array_keys($replaceVariablesURL), array_values($replaceVariablesURL), (isset($methodSettings['suburl']) ? $methodSettings['suburl'] : ''))) . (!empty($queryArgsString) ? '?'.$queryArgsString : '');`
	`1292`	`+ $url = trim(rtrim($host) . str_replace(array_keys($replaceVariables), array_values($replaceVariables),str_replace(array_keys($replaceVariablesURL), array_values($replaceVariablesURL), (isset($methodSettings['suburl']) ? $methodSettings['suburl'] : ''))) . (!empty($queryArgsString) ? '?'.$queryArgsString : ''));`
`1293`	`1293`
`1294`	`1294`	`if (!filter_var($url, FILTER_VALIDATE_URL)) {`
`1295`	`1295`