From 0bcf8b6f0d8625789fcb4e63a1961ec0cb4d5bd1 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 13 Jun 2009 17:55:51 +0000 Subject: [PATCH] MDL-18293 removed obsoleted checking of return values from insert and update_record + unused strings cleanup --- enrol/authorize/authorizenet.class.php | 4 +-- mod/assignment/lib.php | 4 +-- .../type/offline/assignment.class.php | 4 +-- mod/data/lib.php | 4 +-- mod/data/rate.php | 4 +-- mod/forum/rate.php | 4 +-- mod/glossary/rate.php | 8 ++--- question/type/calculated/questiontype.php | 29 ++++--------------- .../type/calculatedsimple/questiontype.php | 23 +++------------ question/type/numerical/questiontype.php | 20 +++---------- 10 files changed, 21 insertions(+), 83 deletions(-) diff --git a/enrol/authorize/authorizenet.class.php b/enrol/authorize/authorizenet.class.php index a1c3bf8dfd..9ee6b6f4bf 100644 --- a/enrol/authorize/authorizenet.class.php +++ b/enrol/authorize/authorizenet.class.php @@ -323,9 +323,7 @@ class AuthorizeNet unset($order->paymentmethod); } $order->status = AN_STATUS_VOID; - if (! $DB->update_record($tableupdate, $order)) { - message_to_admin("Error while trying to update data in table $tableupdate. Please edit manually this record: ID=$order->id.", $order); - } + $DB->update_record($tableupdate, $order); } break; } diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index 6b7a70d197..73bc7543c6 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1497,9 +1497,7 @@ class assignment_base { // $submission->timemodified = time(); } - if (! $DB->update_record('assignment_submissions', $submission)) { - return false; - } + $DB->update_record('assignment_submissions', $submission); // triger grade event $this->update_grade($submission); diff --git a/mod/assignment/type/offline/assignment.class.php b/mod/assignment/type/offline/assignment.class.php index aeaf3e9b1d..671ace4287 100644 --- a/mod/assignment/type/offline/assignment.class.php +++ b/mod/assignment/type/offline/assignment.class.php @@ -85,9 +85,7 @@ class assignment_offline extends assignment_base { $submission->timemodified = time(); } - if (! $DB->update_record('assignment_submissions', $submission)) { - return false; - } + $DB->update_record('assignment_submissions', $submission); // triger grade event $this->update_grade($submission); diff --git a/mod/data/lib.php b/mod/data/lib.php index 47085a817f..1359d52874 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -873,9 +873,7 @@ function data_update_instance($data) { $data->notification = 0; } - if (! $DB->update_record('data', $data)) { - return false; - } + $DB->update_record('data', $data); data_grade_item_update($data); diff --git a/mod/data/rate.php b/mod/data/rate.php index 599a804f2c..939ec26a14 100755 --- a/mod/data/rate.php +++ b/mod/data/rate.php @@ -81,9 +81,7 @@ $newrating->userid = $USER->id; $newrating->recordid = $record->id; $newrating->rating = $rating; - if (! $DB->insert_record('data_ratings', $newrating)) { - print_error('cannotinsertrate', 'error', '', (object)array('id'=>$record->id, 'rating'=>$rating)); - } + $DB->insert_record('data_ratings', $newrating); data_update_grades($data, $record->userid); } } diff --git a/mod/forum/rate.php b/mod/forum/rate.php index 84f5e5dce4..3db0a72356 100644 --- a/mod/forum/rate.php +++ b/mod/forum/rate.php @@ -90,9 +90,7 @@ $newrating->post = $post->id; $newrating->rating = $rating; - if (! $DB->insert_record('forum_ratings', $newrating)) { - print_error('cannotinsertrate', 'error', '', (object)array('id'=>$postid, 'rating'=>$rating)); - } + $DB->insert_record('forum_ratings', $newrating); forum_update_grades($forum, $post->userid); } } diff --git a/mod/glossary/rate.php b/mod/glossary/rate.php index 2523422b40..83d892e2b4 100644 --- a/mod/glossary/rate.php +++ b/mod/glossary/rate.php @@ -88,9 +88,7 @@ } else if ($rating != $oldrating->rating) { $oldrating->rating = $rating; $oldrating->time = time(); - if (! $DB->update_record("glossary_ratings", $oldrating)) { - print_error('cannotinsertrate', 'error', '', (object)array('id'=>$entry->id, 'rating'=>$rating)); - } + $DB->update_record("glossary_ratings", $oldrating); glossary_update_grades($glossary, $entry->userid); } @@ -101,9 +99,7 @@ $newrating->entryid = $entry->id; $newrating->rating = $rating; - if (! $DB->insert_record("glossary_ratings", $newrating)) { - print_error('cannotinsertrate', 'error', '', (object)array('id'=>$entry->id, 'rating'=>$rating)); - } + $DB->insert_record("glossary_ratings", $newrating); glossary_update_grades($glossary, $entry->userid); } } diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index caecba8c18..c31aec4fd4 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -163,15 +163,9 @@ class question_calculated_qtype extends default_questiontype { if ($oldanswer = array_shift($oldanswers)) { // Existing answer, so reuse it $answer->id = $oldanswer->id; - if (! $DB->update_record("question_answers", $answer)) { - $result->error = get_string('errorupdatinganswer','question',$answer->id); - return $result; - } + $DB->update_record("question_answers", $answer); } else { // This is a completely new answer - if (! $answer->id = $DB->insert_record("question_answers", $answer)) { - $result->error = get_string('errorinsertinganswer','question'); - return $result; - } + $answer->id = $DB->insert_record("question_answers", $answer); } // Set up the options object @@ -187,18 +181,9 @@ class question_calculated_qtype extends default_questiontype { // Save options if (isset($options->id)) { // reusing existing record - if (! $DB->update_record('question_calculated', $options)) { - $mess->name = $this->name(); - $mess->id = $options->id ; - $result->error = get_string('errorupdatingoptions','question',$mess); - // $result->error = "Could not update question calculated options! (id=$options->id)"; - return $result; - } + $DB->update_record('question_calculated', $options); } else { // new options - if (! $DB->insert_record('question_calculated', $options)) { - $result->error = "Could not insert question calculated options!"; - return $result; - } + $DB->insert_record('question_calculated', $options); } } } @@ -870,11 +855,7 @@ class question_calculated_qtype extends default_questiontype { $options->tolerancetype = trim($fromform->tolerancetype[$key]); $options->correctanswerlength = trim($fromform->correctanswerlength[$key]); $options->correctanswerformat = trim($fromform->correctanswerformat[$key]); - if (! $DB->update_record('question_calculated', $options)) { - $mess->name = $this->name(); - $mess->id = $options->id ; - notify ( get_string('errorupdatingoptions','question',$mess)); - } + $DB->update_record('question_calculated', $options); } } } diff --git a/question/type/calculatedsimple/questiontype.php b/question/type/calculatedsimple/questiontype.php index 4fbe5dd08b..08fd8438ff 100644 --- a/question/type/calculatedsimple/questiontype.php +++ b/question/type/calculatedsimple/questiontype.php @@ -61,15 +61,9 @@ class question_calculatedsimple_qtype extends question_calculated_qtype { if ($oldanswer = array_shift($oldanswers)) { // Existing answer, so reuse it $answer->id = $oldanswer->id; - if (! $DB->update_record("question_answers", $answer)) { - $result->error = get_string('errorupdatinganswer','question',$answer->id); - return $result; - } + $DB->update_record("question_answers", $answer); } else { // This is a completely new answer - if (! $answer->id = $DB->insert_record("question_answers", $answer)) { - $result->error = get_string('errorinsertinganswer','question'); - return $result; - } + $answer->id = $DB->insert_record("question_answers", $answer); } // Set up the options object @@ -85,18 +79,9 @@ class question_calculatedsimple_qtype extends question_calculated_qtype { // Save options if (isset($options->id)) { // reusing existing record - if (! $DB->update_record('question_calculated', $options)) { - $mess->name = $this->name(); - $mess->id = $options->id ; - $result->error = get_string('errorupdatingoptions','question',$mess); - // $result->error = "Could not update question calculated options! (id=$options->id)"; - return $result; - } + $DB->update_record('question_calculated', $options); } else { // new options - if (! $DB->insert_record('question_calculated', $options)) { - $result->error = "Could not insert question calculated options!"; - return $result; - } + $DB->insert_record('question_calculated', $options); } } } diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php index a7cb3c9227..e08a90826b 100644 --- a/question/type/numerical/questiontype.php +++ b/question/type/numerical/questiontype.php @@ -137,15 +137,9 @@ class question_numerical_qtype extends question_shortanswer_qtype { if ($oldanswer = array_shift($oldanswers)) { // Existing answer, so reuse it $answer->id = $oldanswer->id; - if (! $DB->update_record("question_answers", $answer)) { - $result->error = "Could not update quiz answer! (id=$answer->id)"; - return $result; - } + $DB->update_record("question_answers", $answer); } else { // This is a completely new answer - if (! $answer->id = $DB->insert_record("question_answers", $answer)) { - $result->error = "Could not insert quiz answer!"; - return $result; - } + $answer->id = $DB->insert_record("question_answers", $answer); } // Set up the options object @@ -165,15 +159,9 @@ class question_numerical_qtype extends question_shortanswer_qtype { // Save options if (isset($options->id)) { // reusing existing record - if (! $DB->update_record('question_numerical', $options)) { - $result->error = "Could not update quiz numerical options! (id=$options->id)"; - return $result; - } + $DB->update_record('question_numerical', $options); } else { // new options - if (! $DB->insert_record('question_numerical', $options)) { - $result->error = "Could not insert quiz numerical options!"; - return $result; - } + $DB->insert_record('question_numerical', $options); } } // delete old answer records -- 2.39.5