Refactoring: Config cleanup / moved to class

1 files changed, 11 insertions, 3 deletions

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 66a06116..2ffa4b98 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -33,8 +33,10 @@ function logout_title()
  */
 function guest_register()
 {
-    global $tshirt_sizes, $enable_tshirt_size, $default_theme, $user, $min_password_length;
-
+    global $user;
+    $tshirt_sizes = config('tshirt_sizes');
+    $enable_tshirt_size = config('enable_tshirt_size');
+    $min_password_length = config('min_password_length');
     $event_config = EventConfig();
 
     $msg = '';
@@ -65,6 +67,12 @@ function guest_register()
         }
     }
 
+    foreach ($tshirt_sizes as $key => $size) {
+        if (empty($size)) {
+            unset($tshirt_sizes[$key]);
+        }
+    }
+
     if (isset($_REQUEST['submit'])) {
         $valid = true;
 
@@ -201,7 +209,7 @@ function guest_register()
                     VALUES  (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), ?, NULL, ?)
                 ',
                 [
-                    $default_theme,
+                    config('default_theme'),
                     $nick,
                     $preName,
                     $lastName,