From 8373c5d2d522b56744e99da08799603ebfac4e81 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Thu, 11 Sep 2025 20:01:36 +0200
Subject: [PATCH] Form: reorder class properties and rework constructor

---
 models/Form.php | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/models/Form.php b/models/Form.php
index 020716a..b2202e6 100644
--- a/models/Form.php
+++ b/models/Form.php
@@ -10,26 +10,36 @@ class Form
 {
 	public $request_method;
 	public $request_url;
+
+	private $fields = [];
 	public $before_fields;
 	public $after_fields;
+
+	private $submit_caption;
 	public $buttons_extra;
-	private $fields = [];
+	private $trim_inputs;
+
 	private $data = [];
 	private $missing = [];
-	private $submit_caption;
-	private $trim_inputs;
 
 	// NOTE: this class does not verify the completeness of form options.
 	public function __construct($options)
 	{
-		$this->request_method = !empty($options['request_method']) ? $options['request_method'] : 'POST';
-		$this->request_url = !empty($options['request_url']) ? $options['request_url'] : BASEURL;
-		$this->fields = !empty($options['fields']) ? $options['fields'] : [];
-		$this->buttons_extra = !empty($options['buttons_extra']) ? $options['buttons_extra'] : null;
-		$this->before_fields = !empty($options['before_fields']) ? $options['before_fields'] : null;
-		$this->after_fields = !empty($options['after_fields']) ? $options['after_fields'] : null;
-		$this->submit_caption = !empty($options['submit_caption']) ? $options['submit_caption'] : 'Save information';
-		$this->trim_inputs = !empty($options['trim_inputs']);
+		static $optionKeys = [
+			'request_method' => 'POST',
+			'request_url' => BASEURL,
+
+			'fields' => [],
+			'before_fields' => null,
+			'after_fields' => null,
+
+			'submit_caption' => 'Save information',
+			'buttons_extra' => null,
+			'trim_inputs' => true,
+		];
+
+		foreach ($optionKeys as $optionKey => $default)
+			$this->$optionKey = !empty($options[$optionKey]) ? $options[$optionKey] : $default;
 	}
 
 	public function getFields()