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/pages/admin_import.php   | 4 +---
 includes/pages/admin_rooms.php    | 4 +---
 includes/pages/user_myshifts.php  | 5 +----
 includes/pages/user_questions.php | 6 ++----
 includes/pages/user_settings.php  | 6 +++---
 5 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'includes/pages')

diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
index 3cbed9f9..959a9d2e 100644
--- a/includes/pages/admin_import.php
+++ b/includes/pages/admin_import.php
@@ -251,9 +251,7 @@ function admin_import()
             list($rooms_new, $rooms_deleted) = prepare_rooms($import_file);
             foreach ($rooms_new as $room) {
                 $result = Room_create($room, true, true);
-                if ($result === false) {
-                    engelsystem_error('Unable to create room.');
-                }
+                
                 $rooms_import[trim($room)] = $result;
             }
             foreach ($rooms_deleted as $room) {
diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php
index 3045242b..ad8eab83 100644
--- a/includes/pages/admin_rooms.php
+++ b/includes/pages/admin_rooms.php
@@ -147,9 +147,7 @@ function admin_rooms()
                         );
                     } else {
                         $room_id = Room_create($name, $from_pentabarf, $public, $number);
-                        if ($room_id === false) {
-                            engelsystem_error('Unable to create room.');
-                        }
+
                         engelsystem_log(
                             'Room created: ' . $name
                             . ', pentabarf import: '
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 14b5b8ee..94116fc9 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -93,15 +93,12 @@ function user_myshifts()
                 $user_source = User($shift['UID']);
 
                 if ($valid) {
-                    $result = ShiftEntry_update([
+                    ShiftEntry_update([
                         'id'               => $user_id,
                         'Comment'          => $comment,
                         'freeloaded'       => $freeloaded,
                         'freeload_comment' => $freeload_comment
                     ]);
-                    if ($result === false) {
-                        engelsystem_error('Unable to update shift entry.');
-                    }
 
                     engelsystem_log(
                         'Updated ' . User_Nick_render($user_source) . '\'s shift ' . $shift['name']
diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index fdf76aee..e90ea011 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -39,15 +39,13 @@ function user_questions()
             case 'ask':
                 $question = strip_request_item_nl('question');
                 if ($question != '') {
-                    $result = DB::insert('
+                    DB::insert('
                         INSERT INTO `Questions` (`UID`, `Question`)
                         VALUES (?, ?)
                         ',
                         [$user['UID'], $question]
                     );
-                    if (!$result) {
-                        engelsystem_error(_('Unable to save question.'));
-                    }
+
                     success(_('You question was saved.'));
                     redirect(page_link_to('user_questions'));
                 } else {
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index 667e73d9..7edee7b5 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -84,6 +84,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
 
     if ($valid) {
         User_update($user_source);
+        
         success(_('Settings saved.'));
         redirect(page_link_to('user_settings'));
     }
@@ -108,10 +109,9 @@ function user_settings_password($user_source)
         error(_('Your password is to short (please use at least 6 characters).'));
     } elseif ($request->post('new_password') != $request->post('new_password2')) {
         error(_('Your passwords don\'t match.'));
-    } elseif (set_password($user_source['UID'], $request->post('new_password'))) {
-        success(_('Password saved.'));
     } else {
-        error(_('Failed setting password.'));
+        set_password($user_source['UID'], $request->post('new_password'));
+        success(_('Password saved.'));
     }
     redirect(page_link_to('user_settings'));
 }
-- 
cgit v1.2.3-70-g09d2