diff options
author | msquare <msquare@notrademark.de> | 2016-11-17 14:40:21 +0100 |
---|---|---|
committer | msquare <msquare@notrademark.de> | 2016-11-17 14:40:21 +0100 |
commit | 7b8d1918087b1d16519037afe61fd6ff09c68f94 (patch) | |
tree | ab450f444fc6fcc8bd39583d834e3cc005a2a92d | |
parent | 9c4636f5c4dd5d3b7ff12effb553172f8235cfe6 (diff) |
reduce complexity of user driver license
-rw-r--r-- | includes/controller/user_driver_licenses_controller.php | 6 | ||||
-rw-r--r-- | includes/model/UserDriverLicenses_model.php | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/includes/controller/user_driver_licenses_controller.php b/includes/controller/user_driver_licenses_controller.php index 818ff86b..8e90e39e 100644 --- a/includes/controller/user_driver_licenses_controller.php +++ b/includes/controller/user_driver_licenses_controller.php @@ -88,7 +88,7 @@ function user_driver_license_edit_controller() { $user_driver_license = UserDriverLicense($user_source['UID']); if ($user_driver_license == null) { $wants_to_drive = false; - $user_driver_license = UserDriverLicense_new($user_source); + $user_driver_license = UserDriverLicense_new(); } else { $wants_to_drive = true; } @@ -105,8 +105,8 @@ function user_driver_license_edit_controller() { $user_driver_license['has_license_forklift'] = isset($_REQUEST['has_license_forklift']); if (UserDriverLicense_valid($user_driver_license)) { - if ($user_driver_license == null) { - UserDriverLicenses_create($user_driver_license); + if ($user_driver_license['user_id'] == null) { + $user_driver_license = UserDriverLicenses_create($user_driver_license, $user); } else { UserDriverLicenses_update($user_driver_license); } diff --git a/includes/model/UserDriverLicenses_model.php b/includes/model/UserDriverLicenses_model.php index 6a3f14ab..6caa3589 100644 --- a/includes/model/UserDriverLicenses_model.php +++ b/includes/model/UserDriverLicenses_model.php @@ -4,9 +4,9 @@ * Returns a new empty UserDriverLicense * FIXME entity object needed */ -function UserDriverLicense_new($user) { +function UserDriverLicense_new() { return [ - 'user_id' => $user['UID'], + 'user_id' => null, 'has_car' => false, 'has_license_car' => false, 'has_license_3_5t_transporter' => false, @@ -51,7 +51,8 @@ function UserDriverLicense($user_id) { * @param UserDriverLicense $user_driver_license * The UserDriverLicense to create */ -function UserDriverLicenses_create($user_driver_license) { +function UserDriverLicenses_create($user_driver_license, $user) { + $user_driver_license['user_id'] = $user['UID']; $result = sql_query(" INSERT INTO `UserDriverLicenses` SET `user_id`=" . sql_escape($user_driver_license['user_id']) . ", @@ -64,7 +65,7 @@ function UserDriverLicenses_create($user_driver_license) { if ($result === false) { engelsystem_error('Unable to create user driver license'); } - return $result; + return $user_driver_license; } /** |