feature: disable lastname+prename in config

3 files changed, 20 insertions, 13 deletions

diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index c71d5386..b708b38b 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -52,8 +52,10 @@ function admin_user()
         $html .= '  <tr><td>Last login</td><td><p class="help-block">'
             . ($user_source->last_login_at ? $user_source->last_login_at->format('Y-m-d H:i') : '-')
             . '</p></td></tr>' . "\n";
-        $html .= '  <tr><td>Name</td><td>' . '<input size="40" name="eName" value="' . $user_source->personalData->last_name . '" class="form-control"></td></tr>' . "\n";
-        $html .= '  <tr><td>Vorname</td><td>' . '<input size="40" name="eVorname" value="' . $user_source->personalData->first_name . '" class="form-control"></td></tr>' . "\n";
+        if (config('enable_user_name')) {
+            $html .= '  <tr><td>Name</td><td>' . '<input size="40" name="eName" value="' . $user_source->personalData->last_name . '" class="form-control"></td></tr>' . "\n";
+            $html .= '  <tr><td>Vorname</td><td>' . '<input size="40" name="eVorname" value="' . $user_source->personalData->first_name . '" class="form-control"></td></tr>' . "\n";
+        }
         $html .= '  <tr><td>Handy</td><td>' . '<input type= "tel" size="40" name="eHandy" value="' . $user_source->contact->mobile . '" class="form-control"></td></tr>' . "\n";
         if (config('enable_dect')) {
             $html .= '  <tr><td>DECT</td><td>' . '<input size="40" name="eDECT" value="' . $user_source->contact->dect . '" class="form-control"></td></tr>' . "\n";
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 3bc10fc3..280743e5 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -26,6 +26,7 @@ function guest_register()
     $authUser = auth()->user();
     $tshirt_sizes = config('tshirt_sizes');
     $enable_tshirt_size = config('enable_tshirt_size');
+    $enable_user_name = config('enable_user_name');
     $enable_dect = config('enable_dect');
     $enable_planned_arrival = config('enable_planned_arrival');
     $min_password_length = config('min_password_length');
@@ -151,10 +152,10 @@ function guest_register()
         }
 
         // Trivia
-        if ($request->has('lastname')) {
+        if ($enable_user_name && $request->has('lastname')) {
             $lastName = strip_request_item('lastname');
         }
-        if ($request->has('prename')) {
+        if ($enable_user_name && $request->has('prename')) {
             $preName = strip_request_item('prename');
         }
         if ($enable_dect && $request->has('dect')) {
@@ -338,14 +339,14 @@ function guest_register()
                             form_text('mobile', __('Mobile'), $mobile)
                         ]),
                     ]),
-                    div('row', [
+                    $enable_user_name ? div('row', [
                         div('col-sm-6', [
                             form_text('prename', __('First name'), $preName)
                         ]),
                         div('col-sm-6', [
                             form_text('lastname', __('Last name'), $lastName)
                         ])
-                    ]),
+                    ]) : '',
                     form_info(entry_required() . ' = ' . __('Entry required!'))
                 ])
             ]),
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index f6853191..e398e3a8 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -70,13 +70,17 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
     }
 
     // Trivia
-    $user_source->personalData->last_name = strip_request_item('lastname', $user_source->personalData->last_name);
-    $user_source->personalData->first_name = strip_request_item('prename', $user_source->personalData->first_name);
-    if (strlen(strip_request_item('dect')) <= 40) {
-        $user_source->contact->dect = strip_request_item('dect', $user_source->contact->dect);
-    } else {
-        $valid = false;
-        error(__('For dect numbers are only 40 digits allowed.'));
+    if(config('enable_user_name')) {
+        $user_source->personalData->last_name = strip_request_item('lastname', $user_source->personalData->last_name);
+        $user_source->personalData->first_name = strip_request_item('prename', $user_source->personalData->first_name);
+    }
+    if (config('enable_dect')) {
+        if (strlen(strip_request_item('dect')) <= 40) {
+            $user_source->contact->dect = strip_request_item('dect', $user_source->contact->dect);
+        } else {
+            $valid = false;
+            error(__('For dect numbers are only 40 digits allowed.'));
+        }
     }
     $user_source->contact->mobile = strip_request_item('mobile', $user_source->contact->mobile);