Enable netmail forwarding for users that receive messages directed at clrghouz

app/Http/Controllers/UserController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
+use App\Http\Requests\UserRequest;
 use App\Models\{Address,User};
 
 class UserController extends Controller
@@ -14,25 +15,10 @@ class UserController extends Controller
 	/**
 	 * Add or edit a node
 	 */
-	public function add_edit(Request $request,User $o)
+	public function add_edit(UserRequest $request,User $o)
 	{
 		if ($request->post()) {
-			$this->authorize('admin',$o);
-
-			$request->validate([
-				'email' => 'required|email|unique:users,email,'.($o->exists ? $o->id : 0),
-				'name' => 'required|min:3',
-				'pgp_pubkey' => [
-					'nullable',
-					'min:64',
-					//function ($attribute,$value,$fail) { return $fail('Not this time'); }
-				],
-				'alias' => 'nullable|min:1',
-				'active' => 'required|boolean',
-				'admin' => 'required|boolean',
-			]);
-
-			foreach (['name','email','pgp_pubkey','active','admin','alias'] as $key)
+			foreach (['name','email','pgp_pubkey','active','admin','alias','system_id'] as $key)
 				$o->{$key} = $request->post($key);
 
 			if (! $o->exists)

app/Http/Requests/UserRequest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
+
+use App\Models\User;
+
+class UserRequest extends FormRequest
+{
+	public function authorize()
+	{
+		return Gate::allows( 'admin');
+	}
+
+	public function rules(Request $request)
+	{
+		if (! $request->isMethod('post'))
+			return [];
+
+		$o = $this->route('o');
+		return [
+			'email' => 'required|email|unique:users,email,'.($o->exists ? $o->id : 0),
+			'name' => 'required|min:3',
+			'pgp_pubkey' => [
+				'nullable',
+				'min:64',
+				//function ($attribute,$value,$fail) { return $fail('Not this time'); }
+			],
+			'alias' => 'nullable|min:1',
+			'active' => 'required|boolean',
+			'admin' => 'required|boolean',
+			'system_id' => [
+				'nullable',
+				Rule::in($o->systems->pluck('id')),
+			],
+		];
+	}
+}