From a157004f4aefaa5e2265f852f9432becedee1d66 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sun, 23 Jul 2017 11:46:54 +0200
Subject: handle failed db queries in Db class

---
 includes/controller/event_config_controller.php  |  6 +-----
 includes/controller/shift_entries_controller.php |  5 +----
 includes/controller/shifts_controller.php        |  5 +----
 includes/controller/shifttypes_controller.php    | 10 +++-------
 includes/controller/users_controller.php         |  5 +----
 5 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'includes/controller')

diff --git a/includes/controller/event_config_controller.php b/includes/controller/event_config_controller.php
index dcdcf54a..7d11ecb4 100644
--- a/includes/controller/event_config_controller.php
+++ b/includes/controller/event_config_controller.php
@@ -91,7 +91,7 @@ function event_config_edit_controller()
         }
 
         if ($valid) {
-            $result = EventConfig_update(
+            EventConfig_update(
                 $event_name,
                 $buildup_start_date,
                 $event_start_date,
@@ -100,10 +100,6 @@ function event_config_edit_controller()
                 $event_welcome_msg
             );
 
-            if ($result === false) {
-                engelsystem_error('Unable to update event config.');
-            }
-
             engelsystem_log(
                 'Changed event config: $event_name, $event_welcome_msg, '
                 . date('Y-m-d', $buildup_start_date) . ', ' . date('Y-m-d', $event_start_date) . ', '
diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index 38aad5bb..54c57332 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -130,7 +130,7 @@ function shift_entry_add_controller()
         }
 
         $comment = strip_request_item_nl('comment');
-        $result = ShiftEntry_create([
+        ShiftEntry_create([
             'SID'              => $shift_id,
             'TID'              => $selected_type_id,
             'UID'              => $user_id,
@@ -138,9 +138,6 @@ function shift_entry_add_controller()
             'freeloaded'       => $freeloaded,
             'freeload_comment' => $freeload_comment
         ]);
-        if ($result === false) {
-            engelsystem_error('Unable to create shift entry.');
-        }
 
         if (
             $type['restricted'] == 0
diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 21c6e160..b3ebd18b 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -135,10 +135,7 @@ function shift_edit_controller()
             $shift['start'] = $start;
             $shift['end'] = $end;
 
-            $result = Shift_update($shift);
-            if ($result === false) {
-                engelsystem_error('Unable to update shift.');
-            }
+            Shift_update($shift);
             NeededAngelTypes_delete_by_shift($shift_id);
             $needed_angel_types_info = [];
             foreach ($needed_angel_types as $type_id => $count) {
diff --git a/includes/controller/shifttypes_controller.php b/includes/controller/shifttypes_controller.php
index acdeb982..790bbb56 100644
--- a/includes/controller/shifttypes_controller.php
+++ b/includes/controller/shifttypes_controller.php
@@ -93,17 +93,13 @@ function shifttype_edit_controller()
 
         if ($valid) {
             if ($shifttype_id) {
-                $result = ShiftType_update($shifttype_id, $name, $angeltype_id, $description);
-                if ($result === false) {
-                    engelsystem_error('Unable to update shifttype.');
-                }
+                ShiftType_update($shifttype_id, $name, $angeltype_id, $description);
+
                 engelsystem_log('Updated shifttype ' . $name);
                 success(_('Updated shifttype.'));
             } else {
                 $shifttype_id = ShiftType_create($name, $angeltype_id, $description);
-                if ($shifttype_id === false) {
-                    engelsystem_error('Unable to create shifttype.');
-                }
+
                 engelsystem_log('Created shifttype ' . $name);
                 success(_('Created shifttype.'));
             }
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index b747cc83..f441c8af 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -166,10 +166,7 @@ function user_edit_vouchers_controller()
         if ($valid) {
             $user_source['got_voucher'] = $vouchers;
 
-            $result = User_update($user_source);
-            if ($result === false) {
-                engelsystem_error('Unable to update user.');
-            }
+            User_update($user_source);
 
             success(_('Saved the number of vouchers.'));
             engelsystem_log(User_Nick_render($user_source) . ': ' . sprintf('Got %s vouchers',
-- 
cgit v1.2.3-54-g00ecf