From a8f3a651c0251d278e677891e5a0b00682d78e08 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 13 Jun 2009 18:16:08 +0000
Subject: [PATCH] MDL-18293 removed obsoleted checking of return values from
 insert and update_record + unused strings cleanup

---
 admin/generator.php                    | 18 ++++++----------
 backup/restorelib.php                  |  9 ++------
 course/format/topics/format.php        |  4 +---
 course/format/weeks/format.php         |  4 +---
 enrol/authorize/authorizenet.class.php |  5 +----
 grade/import/csv/index.php             |  7 +-----
 lang/en_utf8/hotpot.php                |  3 ---
 lib/accesslib.php                      | 10 +++------
 lib/moodlelib.php                      |  4 +---
 lib/questionlib.php                    | 10 ++-------
 mod/data/lib.php                       |  9 ++------
 mod/feedback/lib.php                   | 12 +++--------
 mod/forum/lib.php                      | 23 +++++---------------
 mod/forum/post.php                     |  4 +---
 mod/hotpot/lib.php                     | 13 +++--------
 mod/lesson/action/continue.php         |  4 +---
 mod/lesson/lib.php                     |  4 +---
 mod/lesson/locallib.php                | 30 ++++++--------------------
 mod/quiz/startattempt.php              |  4 +---
 mod/scorm/lib.php                      |  4 +---
 20 files changed, 42 insertions(+), 139 deletions(-)

diff --git a/admin/generator.php b/admin/generator.php
index 9f8516e68d..90ac64db41 100755
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -236,18 +236,12 @@ class generator {
             $user->lang        = $CFG->lang;
             $user->timemodified= time();
 
-            if (!$user->id = $DB->insert_record("user", $user)) {
-                $this->verbose("Error inserting a user in the database! Aborting the script!");
-                if (!$this->get('ignore_errors')) {
-                    die();
-                }
-            } else {
-                $users_count++;
-                $users[] = $user->id;
-                $next_user_id = $user->id + 1;
-                $this->verbose("Inserted $user->firstname $user->lastname into DB "
-                    ."(username=$user->username, password=password).");
-            }
+            $user->id = $DB->insert_record("user", $user);
+            $users_count++;
+            $users[] = $user->id;
+            $next_user_id = $user->id + 1;
+            $this->verbose("Inserted $user->firstname $user->lastname into DB "
+                ."(username=$user->username, password=password).");
         }
 
         if (!$this->get('quiet')) {
diff --git a/backup/restorelib.php b/backup/restorelib.php
index 9dfc0c0d55..ea169ebbbd 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -866,9 +866,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                         $blockinstance->pagetype = PAGE_COURSE_VIEW;
                         $blockinstance->position = $blockposition;
                         $blockinstance->weight   = $blockweight;
-                        if(!$status = $DB->insert_record('block_instance', $blockinstance)) {
-                            $status = false;
-                        }
+                        $DB->insert_record('block_instance', $blockinstance);
                         ++$blockweight;
                     }
                 }
@@ -3626,10 +3624,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
 
                 } else {
                     //The structure is equal to the db, so insert the grouping
-                    if (!$newid = $DB->insert_record('groupings', $gro)) {
-                        $status = false;
-                        continue;
-                    }
+                    $newid = $DB->insert_record('groupings', $gro);
                 }
 
                 //We have the newid, update backup_ids
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 6971c2d5a6..67dee6735c 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -177,9 +177,7 @@
             $thissection->section = $section;
             $thissection->summary  = '';
             $thissection->visible  = 1;
-            if (!$thissection->id = $DB->insert_record('course_sections', $thissection)) {
-                notify('Error inserting new topic!');
-            }
+            $thissection->id = $DB->insert_record('course_sections', $thissection);
         }
 
         $showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections);
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 25143e7ab2..5f90f45844 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -177,9 +177,7 @@
             $thissection->section = $section;
             $thissection->summary = '';
             $thissection->visible = 1;
-            if (!$thissection->id = $DB->insert_record('course_sections', $thissection)) {
-                notify('Error inserting new week!');
-            }
+            $thissection->id = $DB->insert_record('course_sections', $thissection);
         }
 
         $showsection = (has_capability('moodle/course:viewhiddensections', $context) or $thissection->visible or !$course->hiddensections);
diff --git a/enrol/authorize/authorizenet.class.php b/enrol/authorize/authorizenet.class.php
index 9ee6b6f4bf..18a7ae80ff 100644
--- a/enrol/authorize/authorizenet.class.php
+++ b/enrol/authorize/authorizenet.class.php
@@ -308,10 +308,7 @@ class AuthorizeNet
                         $extra->status = AN_STATUS_CREDIT;
                         $extra->transid = $transid;
                         $extra->settletime = self::getsettletime(time());
-                        if (! $extra->id = $DB->insert_record('enrol_authorize_refunds', $extra)) {
-                            unset($extra->id);
-                            message_to_admin("Error while trying to insert data into table enrol_authorize_refunds. Please add manually this record:", $extra);
-                        }
+                        $extra->id = $DB->insert_record('enrol_authorize_refunds', $extra);
                     }
                     break;
 
diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index be8d90af08..8d1ccf9263 100755
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -313,12 +313,7 @@ if ($formdata = $mform->get_data()) {
                             $newgradeitem->importer   = $USER->id;
 
                             // failed to insert into new grade item buffer
-                            if (!$newgradeitems[$key] = $DB->insert_record('grade_import_newitem', $newgradeitem)) {
-                                $status = false;
-                                import_cleanup($importcode);
-                                notify(get_string('importfailed', 'grades'));
-                                break 3;
-                            }
+                            $newgradeitems[$key] = $DB->insert_record('grade_import_newitem', $newgradeitem);
                             // add this to grade_import_newitem table
                             // add the new id to $newgradeitem[$key]
                         }
diff --git a/lang/en_utf8/hotpot.php b/lang/en_utf8/hotpot.php
index 070dc4bfa5..bf749d1e6c 100644
--- a/lang/en_utf8/hotpot.php
+++ b/lang/en_utf8/hotpot.php
@@ -11,9 +11,6 @@ $string['attemptsbest'] = 'Best attempt';
 $string['attemptsfirst'] = 'First attempt';
 $string['attemptslast'] = 'Last attempt';
 $string['average'] = 'Average';
-$string['cannotaddquestionrecord'] = 'Could not add question record';
-$string['cannotaddresprecord'] = 'Could not add response record';
-$string['cannotaddstrrecord'] = 'Could not add string record';
 $string['cannotfindmethod'] = 'Template block expand method not found: ($a)';
 $string['checks'] = 'Checks';
 $string['clickreporting'] = 'Enable click reporting';
diff --git a/lib/accesslib.php b/lib/accesslib.php
index d0684dfeb0..f61ccf9a14 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2319,11 +2319,9 @@ function get_system_context($cache=true) {
         $context->path         = NULL; //not known before insert
 
         try {
-            if (!$context->id = $DB->insert_record('context', $context)) {
-            // can not create context yet, sorry
-                return null;
-            }
+            $context->id = $DB->insert_record('context', $context);
         } catch (dml_exception $e) {
+            // can not create context yet, sorry
             return null;
         }
     }
@@ -3021,9 +3019,7 @@ function role_assign($roleid, $userid, $groupid, $contextid, $timestart=0, $time
         $ra->timemodified = $timemodified;
         $ra->modifierid = empty($USER->id) ? 0 : $USER->id;
 
-        if (!$ra->id = $DB->insert_record('role_assignments', $ra)) {
-            return false;
-        }
+        $ra->id = $DB->insert_record('role_assignments', $ra);
 
     } else {                      // We already have one, just update it
         $ra->id = $ra->id;
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index f378bf34d9..4286a86195 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6637,9 +6637,7 @@ function endecrypt ($pwd, $data, $case) {
 
     $event->timemodified = time();
 
-    if (!$event->id = $DB->insert_record('event', $event)) {
-        return false;
-    }
+    $event->id = $DB->insert_record('event', $event);
 
     if (!empty($CFG->calendar)) { // call the add_event function of the selected calendar
         if (file_exists($CFG->dirroot .'/calendar/'. $CFG->calendar .'/lib.php')) {
diff --git a/lib/questionlib.php b/lib/questionlib.php
index 326dbf126f..3690e9c3f9 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -782,9 +782,7 @@ function question_save_from_deletion($questionids, $newcontextid, $oldplace, $ne
         $newcategory->info = get_string('questionsrescuedfrominfo', 'question', $oldplace);
         $newcategory->sortorder = 999;
         $newcategory->stamp = make_unique_id_code();
-        if (!$newcategory->id = $DB->insert_record('question_categories', $newcategory)) {
-            return false;
-        }
+        $newcategory->id = $DB->insert_record('question_categories', $newcategory);
     }
 
     // Move any remaining questions to the 'saved' category.
@@ -1322,11 +1320,7 @@ function save_question_session($question, $state) {
     if (!empty($state->update)) { // this forces the old state record to be overwritten
         $DB->update_record('question_states', $state);
     } else {
-        if (!$state->id = $DB->insert_record('question_states', $state)) {
-            unset($state->id);
-            unset($state->answer);
-            return false;
-        }
+        $state->id = $DB->insert_record('question_states', $state);
     }
 
     // create or update the session
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 1359d52874..9d85061e93 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -184,10 +184,7 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
             return false;
         }
 
-        if (!$this->field->id = $DB->insert_record('data_fields',$this->field)){
-            notify('Insertion of new field failed!');
-            return false;
-        }
+        $this->field->id = $DB->insert_record('data_fields',$this->field);
         return true;
     }
 
@@ -843,9 +840,7 @@ function data_add_instance($data) {
 
     $data->timemodified = time();
 
-    if (! $data->id = $DB->insert_record('data', $data)) {
-        return false;
-    }
+    $data->id = $DB->insert_record('data', $data);
 
     data_grade_item_update($data);
 
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 776e189b01..2b6a8b1cf5 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -96,9 +96,7 @@ function feedback_add_instance($feedback) {
     }
 
     //saving the feedback in db
-    if (!$feedbackid = $DB->insert_record("feedback", $feedback)) {
-        return false;
-    }
+    $feedbackid = $DB->insert_record("feedback", $feedback);
 
     $feedback->id = $feedbackid;
 
@@ -1603,9 +1601,7 @@ function feedback_create_values($data, $usrid, $timemodified, $tmp = false, $gue
     $completed->timemodified       = $timemodified;
     $completed->anonymous_response = $data['anonymous_response'];
 
-    if (!$completedid = $DB->insert_record('feedback_completed'.$tmpstr, $completed)) {
-        return false;
-    }
+    $completedid = $DB->insert_record('feedback_completed'.$tmpstr, $completed);
 
     $completed = $DB->get_record('feedback_completed'.$tmpstr, array('id'=>$completedid));
 
@@ -1629,9 +1625,7 @@ function feedback_create_values($data, $usrid, $timemodified, $tmp = false, $gue
             //the kind of values can be absolutely different so we run create_value directly by the item-class
             $value->value = $itemobj->create_value($data[$key]);
 
-            if (!$DB->insert_record('feedback_value'.$tmpstr, $value)) {
-                $errcount++;
-            }
+            $DB->insert_record('feedback_value'.$tmpstr, $value);
         }
     }
 
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 990bc3ddf7..bd64cc7068 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -78,9 +78,7 @@ function forum_add_instance($forum) {
         $forum->assesstimefinish = 0;
     }
 
-    if (!$forum->id = $DB->insert_record('forum', $forum)) {
-        return false;
-    }
+    $forum->id = $DB->insert_record('forum', $forum);
 
     if ($forum->type == 'single') {  // Create related discussion.
         $discussion = new object();
@@ -4480,9 +4478,7 @@ function forum_add_new_post($post, $mform, &$message) {
     $post->userid     = $USER->id;
     $post->attachment = "";
 
-    if (! $post->id = $DB->insert_record("forum_posts", $post)) {
-        return false;
-    }
+    $post->id = $DB->insert_record("forum_posts", $post);
     $message = file_save_draft_area_files($post->itemid, $context->id, 'forum_post', $post->id, array('subdirs'=>true), $message);
     $DB->set_field('forum_posts', 'message', $message, array('id'=>$post->id));
     forum_add_attachment($post, $forum, $cm, $mform, $message);
@@ -4583,9 +4579,7 @@ function forum_add_discussion($discussion, $mform=null, &$message=null) {
     $post->course        = $forum->course; // speedup
     $post->mailnow       = $discussion->mailnow;
 
-    if (! $post->id = $DB->insert_record("forum_posts", $post) ) {
-        return 0;
-    }
+    $post->id = $DB->insert_record("forum_posts", $post);
 
     $text = file_save_draft_area_files($discussion->itemid, $context->id, 'forum_post', $post->id, array('subdirs'=>true), $post->message);
     $DB->set_field('forum_posts', 'message', $text, array('id'=>$post->id));
@@ -4597,17 +4591,10 @@ function forum_add_discussion($discussion, $mform=null, &$message=null) {
     $discussion->usermodified = $post->userid;
     $discussion->userid       = $USER->id;
 
-    if (! $post->discussion = $DB->insert_record("forum_discussions", $discussion) ) {
-        $DB->delete_records("forum_posts", array("id"=>$post->id));
-        return 0;
-    }
+    $post->discussion = $DB->insert_record("forum_discussions", $discussion);
 
     // Finally, set the pointer on the post.
-    if (! $DB->set_field("forum_posts", "discussion", $post->discussion, array("id"=>$post->id))) {
-        $DB->delete_records("forum_posts", array("id"=>$post->id));
-        $DB->delete_records("forum_discussions", array("id"=>$post->discussion));
-        return 0;
-    }
+    $DB->set_field("forum_posts", "discussion", $post->discussion, array("id"=>$post->id));
 
     if (!empty($cm->id)) {
         forum_add_attachment($post, $forum, $cm, $mform, $message);
diff --git a/mod/forum/post.php b/mod/forum/post.php
index e58c900a43..54b9c0efb6 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -380,9 +380,7 @@
             $newdiscussion->timestart    = $discussion->timestart;
             $newdiscussion->timeend      = $discussion->timeend;
 
-            if (!$newid = $DB->insert_record('forum_discussions', $newdiscussion)) {
-                print_error('cannotcreatediscussion', 'forum');
-            }
+            $newid = $DB->insert_record('forum_discussions', $newdiscussion);
 
             $newpost = new object();
             $newpost->id      = $post->id;
diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
index 1b37f5d210..49ce746d1c 100644
--- a/mod/hotpot/lib.php
+++ b/mod/hotpot/lib.php
@@ -2566,9 +2566,7 @@ function hotpot_add_response(&$attempt, &$question, &$response) {
         $question->md5key = md5($question->name);
         if (!$question->id = $DB->get_field('hotpot_questions', 'id', array('hotpot'=>$attempt->hotpot, 'md5key'=>$question->md5key, 'name'=>$question->name))) {
             // add question record
-            if (!$question->id = $DB->insert_record('hotpot_questions', $question)) {
-                print_error('cannotaddquestionrecord', 'hotpot', $next_url);
-            }
+            $question->id = $DB->insert_record('hotpot_questions', $question);
         }
 
         if ($DB->record_exists('hotpot_responses', array('attempt'=>$attempt->id, 'question'=>$question->id))) {
@@ -2591,9 +2589,7 @@ function hotpot_add_response(&$attempt, &$question, &$response) {
             $response->question = $question->id;
 
             // add response record
-            if(!$response->id = $DB->insert_record('hotpot_responses', $response)) {
-                print_error('cannotaddresprecord', 'hotpot', $next_url);
-            }
+            $response->id = $DB->insert_record('hotpot_responses', $response);
 
             // we can stop looping now
             $looping = false;
@@ -2762,10 +2758,7 @@ function hotpot_string_id($str) {
             $record->md5key = $md5key;
 
             // try and add the new string record
-            if (!$id = $DB->insert_record('hotpot_strings', $record)) {
-                global $DB;
-                print_error('cannotaddstrrecord', 'hotpot');
-            }
+            $id = $DB->insert_record('hotpot_strings', $record);
         }
     }
     return $id;
diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php
index 4b5bf4b190..622ac3d57f 100644
--- a/mod/lesson/action/continue.php
+++ b/mod/lesson/action/continue.php
@@ -568,9 +568,7 @@
             if (isset($USER->modattempts[$lesson->id])) {
                 $attempt->retry = $nretakes - 1; // they are going through on review, $nretakes will be too high
             }
-            if (!$newattemptid = $DB->insert_record("lesson_attempts", $attempt)) {
-                print_error("Continue: attempt not inserted");
-            }
+            $newattemptid = $DB->insert_record("lesson_attempts", $attempt);
             // "number of attempts remaining" message if $lesson->maxattempts > 1
             // displaying of message(s) is at the end of page for more ergonomic display
             if (!$correctanswer and ($newpageid == 0)) {
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 5ea746a9f7..a371b35e74 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -45,9 +45,7 @@ function lesson_add_instance($lesson) {
 
     lesson_process_pre_save($lesson);
 
-    if (!$lesson->id = $DB->insert_record("lesson", $lesson)) {
-        return false; // bad
-    }
+    $lesson->id = $DB->insert_record("lesson", $lesson);
 
     lesson_process_post_save($lesson);
 
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index d263d29510..d475e1b2df 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -674,10 +674,7 @@ function lesson_save_question_options($question) {
                     $answer->grade = $question->fraction[$key] * 100;
                     $answer->answer   = $dataanswer;
                     $answer->response = $question->feedback[$key];
-                    if (!$answer->id = $DB->insert_record("lesson_answers", $answer)) {
-                        $result->error = "Could not insert shortanswer quiz answer!";
-                        return $result;
-                    }
+                    $answer->id = $DB->insert_record("lesson_answers", $answer);
                     $answers[] = $answer->id;
                     if ($question->fraction[$key] > $maxfraction) {
                         $maxfraction = $question->fraction[$key];
@@ -714,10 +711,7 @@ function lesson_save_question_options($question) {
                     $answer->answer   = $min.":".$max;
                     // $answer->answer   = $question->min[$key].":".$question->max[$key]; original line for min/max
                     $answer->response = $question->feedback[$key];
-                    if (!$answer->id = $DB->insert_record("lesson_answers", $answer)) {
-                        $result->error = "Could not insert numerical quiz answer!";
-                        return $result;
-                    }
+                    $answer->id = $DB->insert_record("lesson_answers", $answer);
                     
                     $answers[] = $answer->id;
                     if ($question->fraction[$key] > $maxfraction) {
@@ -749,10 +743,7 @@ function lesson_save_question_options($question) {
             if (isset($question->feedbacktrue)) {
                 $answer->response = $question->feedbacktrue;
             }
-            if (!$true->id = $DB->insert_record("lesson_answers", $answer)) {
-                $result->error = "Could not insert quiz answer \"true\")!";
-                return $result;
-            }
+            $true->id = $DB->insert_record("lesson_answers", $answer);
 
             // the lie    
             $answer = new stdClass;
@@ -767,10 +758,7 @@ function lesson_save_question_options($question) {
             if (isset($question->feedbackfalse)) {
                 $answer->response = $question->feedbackfalse;
             }
-            if (!$false->id = $DB->insert_record("lesson_answers", $answer)) {
-                $result->error = "Could not insert quiz answer \"false\")!";
-                return $result;
-            }
+            $false->id = $DB->insert_record("lesson_answers", $answer);
 
           break;
 
@@ -803,10 +791,7 @@ function lesson_save_question_options($question) {
                     // end Replace
                     $answer->answer   = $dataanswer;
                     $answer->response = $question->feedback[$key];
-                    if (!$answer->id = $DB->insert_record("lesson_answers", $answer)) {
-                        $result->error = "Could not insert multichoice quiz answer! ";
-                        return $result;
-                    }
+                    $answer->id = $DB->insert_record("lesson_answers", $answer);
                     // for Sanity checks
                     if ($question->fraction[$key] > 0) {                 
                         $totalfraction += $question->fraction[$key];
@@ -853,10 +838,7 @@ function lesson_save_question_options($question) {
                         // first answer contains the correct answer jump
                         $answer->jumpto = LESSON_NEXTPAGE;
                     }
-                    if (!$subquestion->id = $DB->insert_record("lesson_answers", $answer)) {
-                        $result->error = "Could not insert quiz match subquestion!";
-                        return $result;
-                    }
+                    $subquestion->id = $DB->insert_record("lesson_answers", $answer);
                     $subquestions[] = $subquestion->id;
                     $i++;
                 }
diff --git a/mod/quiz/startattempt.php b/mod/quiz/startattempt.php
index 82d234f7b6..2967aebd98 100644
--- a/mod/quiz/startattempt.php
+++ b/mod/quiz/startattempt.php
@@ -95,9 +95,7 @@ quiz_delete_previews($quiz, $USER->id);
 $attempt = quiz_create_attempt($quiz, $attemptnumber, $lastattempt, time(), $quizobj->is_preview_user());
 
 /// Save the attempt in the database.
-if (!$attempt->id = $DB->insert_record('quiz_attempts', $attempt)) {
-    quiz_error($quiz, 'newattemptfail');
-}
+$attempt->id = $DB->insert_record('quiz_attempts', $attempt);
 
 /// Log the new attempt.
 if ($attempt->preview) {
diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index a894d71932..3f294ab112 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -73,9 +73,7 @@ function scorm_add_instance($scorm, $mform=null) {
     }
     $scorm->grademethod = ($scorm->whatgrade * 10) + $scorm->grademethod;
 
-    if (!$id = $DB->insert_record('scorm', $scorm)) {
-        return false;
-    }
+    $id = $DB->insert_record('scorm', $scorm);
 
 /// update course module record - from now on this instance properly exists and all function may be used
     $DB->set_field('course_modules', 'instance', $id, array('id'=>$cmid));
-- 
2.39.5