Refactoring: Config cleanup / moved to class

8 files changed, 45 insertions, 19 deletions

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 275f50ba..8cb66e6e 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -15,7 +15,8 @@ function admin_active_title()
  */
 function admin_active()
 {
-    global $tshirt_sizes, $shift_sum_formula;
+    $tshirt_sizes = config('tshirt_sizes');
+    $shift_sum_formula = config('shift_sum_formula');
 
     $msg = '';
     $search = '';
@@ -208,7 +209,7 @@ function admin_active()
 
     $shirt_statistics = [];
     foreach (array_keys($tshirt_sizes) as $size) {
-        if ($size != '') {
+        if (!empty($size)) {
             $sc = DB::select(
                 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Gekommen`=1',
                 [$size]
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 192becb0..2ab40cca 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -15,7 +15,14 @@ function admin_user_title()
  */
 function admin_user()
 {
-    global $user, $tshirt_sizes, $privileges;
+    global $user, $privileges;
+    $tshirt_sizes = config('tshirt_sizes');
+
+    foreach ($tshirt_sizes as $key => $size) {
+        if (empty($size)) {
+            unset($tshirt_sizes[$key]);
+        }
+    }
 
     $html = '';
 
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,
diff --git a/includes/pages/guest_stats.php b/includes/pages/guest_stats.php
index 4add3e97..6b6f0572 100644
--- a/includes/pages/guest_stats.php
+++ b/includes/pages/guest_stats.php
@@ -4,10 +4,10 @@ use Engelsystem\Database\DB;
 
 function guest_stats()
 {
-    global $api_key;
+    $apiKey = config('api_key');
 
     if (isset($_REQUEST['api_key'])) {
-        if ($_REQUEST['api_key'] == $api_key) {
+        if ($_REQUEST['api_key'] == $apiKey && !empty($apiKey)) {
             $stats = [];
 
             list($user_count) = DB::select('SELECT count(*) AS `user_count` FROM `User`');
diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 3c4b631d..5574e8eb 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -7,7 +7,7 @@ use Engelsystem\Database\DB;
  */
 function user_atom()
 {
-    global $user, $display_news;
+    global $user;
 
     if (!isset($_REQUEST['key']) || !preg_match('/^[\da-f]{32}$/', $_REQUEST['key'])) {
         engelsystem_error('Missing key.');
@@ -27,7 +27,7 @@ function user_atom()
         FROM `News` 
         ' . (empty($_REQUEST['meetings']) ? '' : 'WHERE `Treffen` = 1 ') . '
         ORDER BY `ID`
-        DESC LIMIT ' . (int)$display_news
+        DESC LIMIT ' . (int)config('display_news')
     );
 
     $output = make_atom_entries_from_news($news);
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index acb78875..62d87d27 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -17,7 +17,6 @@ function myshifts_title()
  */
 function user_myshifts()
 {
-    global $last_unsubscribe;
     global $user, $privileges;
 
     if (
@@ -144,7 +143,10 @@ function user_myshifts()
         );
         if (count($shift) > 0) {
             $shift = array_shift($shift);
-            if (($shift['start'] > time() + $last_unsubscribe * 3600) || in_array('user_shifts_admin', $privileges)) {
+            if (
+                ($shift['start'] > time() + config('last_unsubscribe') * 3600)
+                || in_array('user_shifts_admin', $privileges)
+            ) {
                 $result = ShiftEntry_delete($user_id);
                 if ($result === false) {
                     engelsystem_error('Unable to delete shift entry.');
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index 69d20e69..b1e337b6 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -31,8 +31,7 @@ function meetings_title()
  */
 function user_meetings()
 {
-    global $display_news;
-
+    $display_news = config('display_news');
     $html = '<div class="col-md-12"><h1>' . meetings_title() . '</h1>' . msg();
 
     if (isset($_REQUEST['page']) && preg_match('/^\d{1,}$/', $_REQUEST['page'])) {
@@ -178,7 +177,8 @@ function user_news_comments()
  */
 function user_news()
 {
-    global $display_news, $privileges, $user;
+    global $privileges, $user;
+    $display_news = config('display_news');
 
     $html = '<div class="col-md-12"><h1>' . news_title() . '</h1>' . msg();
 
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 5d4ba368..a2a486f4 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -97,13 +97,12 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
  */
 function user_settings_password($user_source)
 {
-    global $min_password_length;
     if (
         !isset($_REQUEST['password'])
         || !verify_password($_REQUEST['password'], $user_source['Passwort'], $user_source['UID'])
     ) {
         error(_('-> not OK. Please try again.'));
-    } elseif (strlen($_REQUEST['new_password']) < $min_password_length) {
+    } elseif (strlen($_REQUEST['new_password']) < config('min_password_length')) {
         error(_('Your password is to short (please use at least 6 characters).'));
     } elseif ($_REQUEST['new_password'] != $_REQUEST['new_password2']) {
         error(_('Your passwords don\'t match.'));
@@ -195,8 +194,11 @@ function user_settings_locale($user_source, $locales)
  */
 function user_settings()
 {
-    global $enable_tshirt_size, $tshirt_sizes, $themes, $locales;
-    global $user;
+    global $themes, $user;
+
+    $enable_tshirt_size = config('enable_tshirt_size');
+    $tshirt_sizes = config('tshirt_sizes');
+    $locales = config('locales');
 
     $buildup_start_date = null;
     $teardown_end_date = null;
@@ -210,6 +212,12 @@ function user_settings()
         }
     }
 
+    foreach ($tshirt_sizes as $key => $size) {
+        if (empty($size)) {
+            unset($tshirt_sizes[$key]);
+        }
+    }
+
     $user_source = $user;
 
     if (isset($_REQUEST['submit'])) {