backfill fixes from 65957e7 to address pterodactyl#470 in active release

Author: DaneEveritt

app/Http/Controllers/Admin/OptionController.php

@@ -209,7 +209,7 @@ public function editVariable(Request $request, $option, $variable)
 
         try {
             if ($request->input('action') !== 'delete') {
-                $variable = $repo->update($variable, $request->intersect([
+                $variable = $repo->update($variable, $request->only([
                     'name', 'description', 'env_variable',
                     'default_value', 'options', 'rules',
                 ]));

app/Repositories/VariableRepository.php

@@ -123,12 +123,11 @@ public function update($id, array $data)
         $variable = ServiceVariable::findOrFail($id);
 
         $validator = Validator::make($data, [
-            'name' => 'sometimes|required|string|min:1|max:255',
-            'description' => 'sometimes|nullable|string',
-            'env_variable' => 'sometimes|required|regex:/^[\w]{1,255}$/',
-            'default_value' => 'string',
+            'name' => 'required|string|min:1|max:255',
+            'description' => 'nullable|string',
+            'env_variable' => 'required|regex:/^[\w]{1,255}$/',
+            'rules' => 'bail|required|string',
             'options' => 'sometimes|required|array',
-            'rules' => 'bail|sometimes|required|string|min:1',
         ]);
 
         // Ensure the default value is allowed by the rules provided.