From 8506d6d27e3b926521007064abcdcc2f69c6aa06 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sat, 21 Jan 2017 23:07:20 +0100
Subject: Refactoring: Config cleanup / moved to class

---
 includes/controller/shifts_controller.php | 4 ++--
 includes/controller/users_controller.php  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 71459a10..a1801de6 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -329,9 +329,9 @@ function shift_next_controller()
  */
 function shifts_json_export_all_controller()
 {
-    global $api_key;
+    $api_key = config('api_key');
 
-    if ($api_key == '') {
+    if (empty($api_key)) {
         engelsystem_error('Config contains empty apikey.');
     }
 
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index b80fdb4d..84b6bbda 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -282,7 +282,6 @@ function users_list_controller()
  */
 function user_password_recovery_set_new_controller()
 {
-    global $min_password_length;
     $user_source = User_by_password_recovery_token($_REQUEST['token']);
     if ($user_source == null) {
         error(_('Token is not correct.'));
@@ -292,7 +291,10 @@ function user_password_recovery_set_new_controller()
     if (isset($_REQUEST['submit'])) {
         $valid = true;
 
-        if (isset($_REQUEST['password']) && strlen($_REQUEST['password']) >= $min_password_length) {
+        if (
+            isset($_REQUEST['password'])
+            && strlen($_REQUEST['password']) >= config('min_password_length')
+        ) {
             if ($_REQUEST['password'] != $_REQUEST['password2']) {
                 $valid = false;
                 error(_('Your passwords don\'t match.'));
-- 
cgit v1.2.3-54-g00ecf