Merge branch 'release/0.8.74'

Author: ljonesfl

.version.json

@@ -2,6 +2,6 @@
   "strategy": "semver",
   "major": 0,
   "minor": 8,
-  "patch": 73,
+  "patch": 74,
   "build": 0
 }

resources/config/neuron.yaml.example

@@ -216,12 +216,26 @@ maintenance:
 # Field properties:
 #   name        input name (also the stored payload key)
 #   label       display label
-#   type        text | email | tel | textarea | select | checkbox
-#   required    true|false
-#   options     list of allowed values (select only)
-#   rules       optional: length: { min, max }, pattern: "/regex/"
+#   type        text | email | tel | textarea | select | checkbox | checkboxes | multiselect
+#   required    true|false (for checkboxes/multiselect: at least one selection)
+#   options     list of allowed values (select / checkboxes / multiselect)
+#               each option may be a plain string or { value, label }
+#   groups      checkboxes/multiselect only: list of { label, options } to
+#               render grouped choices (values must be unique across groups)
+#   rules       optional: length: { min, max }, pattern: "/regex/",
+#               count: { min, max } (checkboxes/multiselect selection count)
 #   reply_to    true -> this field supplies the reply-to email address
 #   sender_name true -> this field supplies the reply-to display name
+#
+# Example multi-select (grouped checkboxes):
+#   - name: opportunities
+#     label: "Volunteer opportunities"
+#     type: checkboxes
+#     groups:
+#       - label: "Sessions"
+#         options:
+#           - { value: judge, label: "Judge" }
+#           - { value: jury,  label: "Jury Monitor" }
 contact:
   default_form: general  # Form rendered by a bare [contact] shortcode
   forms:

resources/config/services.yaml

@@ -80,6 +80,9 @@ services:
   Neuron\Cms\Repositories\DatabaseRevisionRepository:
     type: autowire
 
+  Neuron\Cms\Repositories\DatabaseContactSubmissionRepository:
+    type: autowire
+
 
   # ============================================================================
   # REPOSITORIES - Interface Bindings
@@ -129,6 +132,10 @@ services:
     type: alias
     target: Neuron\Cms\Repositories\DatabaseRevisionRepository
 
+  Neuron\Cms\Repositories\IContactSubmissionRepository:
+    type: alias
+    target: Neuron\Cms\Repositories\DatabaseContactSubmissionRepository
+
 
   # ============================================================================
   # AUTHENTICATION SERVICES

resources/views/admin/contact_submissions/show.php

@@ -1,13 +1,32 @@
 <?php
-$labelFor = static function( string $name ) use ( $fields ): string {
+$fieldFor = static function( string $name ) use ( $fields ): ?array {
 	foreach( ( $fields ?? [] ) as $field )
 	{
 		if( ( $field['name'] ?? null ) === $name )
 		{
-			return $field['label'] ?? $name;
+			return $field;
 		}
 	}
-	return $name;
+	return null;
+};
+
+$labelFor = static function( string $name ) use ( $fieldFor ): string {
+	$field = $fieldFor( $name );
+	return $field['label'] ?? $name;
+};
+
+$displayValue = static function( string $name, mixed $value ) use ( $fieldFor ): string {
+	if( is_array( $value ) )
+	{
+		$field  = $fieldFor( $name );
+		$labels = $field !== null
+			? \Neuron\Cms\Services\Contact\FieldOptions::labelsFor( $field, $value )
+			: array_map( 'strval', $value );
+
+		return implode( "\n", $labels );
+	}
+
+	return (string) $value;
 };
 
 // Order values by configured fields first, then any extra payload keys.
@@ -94,7 +113,7 @@
 						<dl class="row mb-0">
 							<?php foreach( $orderedKeys as $name ): ?>
 								<dt class="col-sm-3"><?= htmlspecialchars( $labelFor( $name ) ) ?></dt>
-								<dd class="col-sm-9" style="white-space: pre-wrap;"><?= htmlspecialchars( (string) ( $payload[ $name ] ?? '' ) ) ?></dd>
+								<dd class="col-sm-9" style="white-space: pre-wrap;"><?= htmlspecialchars( $displayValue( $name, $payload[ $name ] ?? '' ) ) ?></dd>
 							<?php endforeach; ?>
 						</dl>
 					<?php endif; ?>

resources/views/emails/contact.php

@@ -48,7 +48,11 @@
 					}
 					$label = $field['label'] ?? $name;
 					$value = $values[ $name ] ?? '';
-					if( !is_scalar( $value ) )
+					if( is_array( $value ) )
+					{
+						$value = implode( "\n", \Neuron\Cms\Services\Contact\FieldOptions::labelsFor( $field, $value ) );
+					}
+					elseif( !is_scalar( $value ) )
 					{
 						$value = json_encode( $value );
 					}

src/Cms/Controllers/Contact.php

@@ -7,6 +7,7 @@
 use Neuron\Cms\Services\Auth\CsrfToken;
 use Neuron\Cms\Services\Contact\ContactFormValidator;
 use Neuron\Cms\Services\Contact\ContactService;
+use Neuron\Cms\Services\Contact\FieldOptions;
 use Neuron\Cms\Services\Widget\ContactFormWidget;
 use Neuron\Data\Settings\SettingManager;
 use Neuron\Log\Log;
@@ -197,20 +198,69 @@ private function collectValues( array $fields, Request $request ): array
 				continue;
 			}
 
-			if( ( $field['type'] ?? 'text' ) === 'checkbox' )
+			$type = $field['type'] ?? 'text';
+
+			if( $type === 'checkbox' )
 			{
 				$raw = $request->post( $name, '' );
 				$values[ $name ] = ( $raw === 'on' || $raw === '1' || $raw === 1 || $raw === true ) ? '1' : '';
 				continue;
 			}
 
+			if( $type === 'checkboxes' || $type === 'multiselect' )
+			{
+				$values[ $name ] = $this->collectMultiValues( $field, $name, $request );
+				continue;
+			}
+
 			$raw = $request->post( $name, '' );
 			$values[ $name ] = is_string( $raw ) ? trim( $raw ) : $raw;
 		}
 
 		return $values;
 	}
 
+	/**
+	 * Collect and sanitize the selected values for a multi-select field.
+	 *
+	 * Only values present in the field's configured option set are kept, so a
+	 * crafted request cannot inject arbitrary selections into storage/email.
+	 *
+	 * @param array $field
+	 * @param string $name
+	 * @param Request $request
+	 * @return array<int, string>
+	 */
+	private function collectMultiValues( array $field, string $name, Request $request ): array
+	{
+		$raw = $request->post( $name, [] );
+
+		if( !is_array( $raw ) )
+		{
+			$raw = ( $raw === '' || $raw === null ) ? [] : [ $raw ];
+		}
+
+		$allowed  = FieldOptions::allowedValues( $field );
+		$selected = [];
+
+		foreach( $raw as $value )
+		{
+			if( !is_scalar( $value ) )
+			{
+				continue;
+			}
+
+			$value = trim( (string) $value );
+
+			if( $value !== '' && in_array( $value, $allowed, true ) && !in_array( $value, $selected, true ) )
+			{
+				$selected[] = $value;
+			}
+		}
+
+		return $selected;
+	}
+
 	/**
 	 * Build the thank-you message for a form.
 	 *

src/Cms/Services/Contact/ContactFormValidator.php

@@ -41,7 +41,35 @@ public function validate( array $fieldDefs, array $values ): array
 
 			$label    = $field['label'] ?? $name;
 			$required = (bool) ( $field['required'] ?? false );
+			$type     = $field['type'] ?? 'text';
 			$raw      = $values[ $name ] ?? null;
+
+			if( $type === 'checkboxes' || $type === 'multiselect' )
+			{
+				$selected = is_array( $raw )
+					? $raw
+					: ( ( $raw === null || $raw === '' ) ? [] : [ $raw ] );
+
+				if( empty( $selected ) )
+				{
+					if( $required )
+					{
+						$errors[ $name ] = "{$label} is required.";
+					}
+
+					continue;
+				}
+
+				$error = $this->validateMultiple( $field, $label, $selected );
+
+				if( $error !== null )
+				{
+					$errors[ $name ] = $error;
+				}
+
+				continue;
+			}
+
 			$value    = is_string( $raw ) ? trim( $raw ) : $raw;
 			$isEmpty  = ( $value === null || $value === '' || $value === [] );
 
@@ -90,11 +118,11 @@ private function validateField( array $field, string $label, string $value ): ?s
 			return "{$label} must be a valid phone number.";
 		}
 
-		if( $type === 'select' )
+		if( $type === 'select' || $type === 'radio' )
 		{
-			$options = $field['options'] ?? [];
+			$allowed = FieldOptions::allowedValues( $field );
 
-			if( !empty( $options ) && !new IsInSet( $options )->isValid( $value ) )
+			if( !empty( $allowed ) && !new IsInSet( $allowed )->isValid( $value ) )
 			{
 				return "{$label} is not a valid selection.";
 			}
@@ -119,6 +147,45 @@ private function validateField( array $field, string $label, string $value ): ?s
 		return null;
 	}
 
+	/**
+	 * Validate the selected values of a multi-select (checkboxes/multiselect)
+	 * field: every selection must belong to the configured option set, and an
+	 * optional count rule (rules.count.min/max) is enforced.
+	 *
+	 * @param array $field Field definition
+	 * @param string $label Display label
+	 * @param array $selected Selected values
+	 * @return string|null Error message, or null when valid
+	 */
+	private function validateMultiple( array $field, string $label, array $selected ): ?string
+	{
+		$allowed = FieldOptions::allowedValues( $field );
+
+		foreach( $selected as $value )
+		{
+			if( !is_scalar( $value ) || !in_array( (string) $value, $allowed, true ) )
+			{
+				return "{$label} contains an invalid selection.";
+			}
+		}
+
+		$rules = $field['rules'] ?? [];
+
+		if( isset( $rules['count'] ) )
+		{
+			$min   = (int) ( $rules['count']['min'] ?? 0 );
+			$max   = (int) ( $rules['count']['max'] ?? PHP_INT_MAX );
+			$count = count( $selected );
+
+			if( $count < $min || $count > $max )
+			{
+				return "Please select between {$min} and {$max} options for {$label}.";
+			}
+		}
+
+		return null;
+	}
+
 	/**
 	 * Lenient phone validation suitable for a public contact form.
 	 *

src/Cms/Services/Contact/ContactService.php

@@ -210,7 +210,17 @@ private function buildPlainBody( array $fieldDefs, array $values ): string
 
 			$label = $field['label'] ?? $name;
 			$value = $values[ $name ] ?? '';
-			$lines[] = $label . ': ' . ( is_scalar( $value ) ? (string) $value : json_encode( $value ) );
+
+			if( is_array( $value ) )
+			{
+				$value = implode( ', ', FieldOptions::labelsFor( $field, $value ) );
+			}
+			elseif( !is_scalar( $value ) )
+			{
+				$value = json_encode( $value );
+			}
+
+			$lines[] = $label . ': ' . $value;
 		}
 
 		return implode( "\n", $lines );