← All changes | includes/Core/Database/FormEntryMetaModel.php +4 -3 3.1.1 → V3.3.2 View file →

		@@ -6,8 +6,9 @@
6	6
7	7	namespace BitCode\BitForm\Core\Database;
8	8
9	9	use BitCode\BitForm\Core\Util\FileHandler;
	10	+use BitCode\BitForm\Core\Util\IpTool;
10	11
11	12	/**
12	13	* Manages entry meta (per-field values) for each form submission.
13	14	*/
		@@ -407,9 +408,9 @@
407	408	private static function csvInjectionPrevent($value)
408	409	{
409	410	$formula = ['=', '-', '+', '@', "\t", "\r"];
410	411	$valueFilter = preg_replace('/[\]["]/i', '', $value);
411		- if (in_array(substr($value, 0, 1), $formula, true)) {
	412	+ if (in_array(substr($valueFilter, 0, 1), $formula, true)) {
412	413	$valueFilter = "'" . trim($valueFilter);
413	414	}
414	415
415	416	return $valueFilter;
		@@ -445,9 +446,9 @@
445	446	$value = trim($value);
446	447
447	448	// Get label from fieldMap or use key
448	449	$label = $fieldMap[$childKey]['adminLbl'] ?? $childKey;
449		- $formattedPairs[] = "$label: " . self::unescapeString($value);
	450	+ $formattedPairs[] = "$label: " . self::csvInjectionPrevent(self::unescapeString($value));
450	451	}
451	452
452	453	$rows[] = implode(', ', $formattedPairs);
453	454	}
		@@ -571,9 +572,9 @@
571	572	$allData[$key]['entry_id'] = preg_replace('/[\]["]/i', '', $value->entry_id);
572	573	if ('__user_id' === $formFieldName && intval($value->$formFieldName) > 0) {
573	574	$allData[$key][$formFieldName] = $userNames[$value->$formFieldName] ?? '';
574	575	} elseif ('__user_ip' === $formFieldName) {
575		- $allData[$key][$formFieldName] = long2ip((int) $value->$formFieldName);
	576	+ $allData[$key][$formFieldName] = IpTool::displayValue($value->$formFieldName);
576	577	} elseif ('__entry_status' === $formFieldName) {
577	578	$allData[$key][$formFieldName] = $entryStatus[$value->{$formFieldName}] ?? '';
578	579	} else {
579	580	$allData[$key][$formFieldName] = preg_replace('/[\]["]/i', '', $value->$formFieldName);