]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-18293 removed obsoleted checking of return values from insert and update_record...
authorskodak <skodak>
Sat, 13 Jun 2009 18:34:43 +0000 (18:34 +0000)
committerskodak <skodak>
Sat, 13 Jun 2009 18:34:43 +0000 (18:34 +0000)
20 files changed:
backup/lib.php
backup/restorelib.php
course/lib.php
enrol/paypal/ipn.php
grade/import/csv/index.php
grade/import/xml/lib.php
lib/questionlib.php
message/output/email/db/install.php
message/output/email/lib.php
message/output/jabber/db/install.php
message/output/jabber/lib.php
message/output/popup/db/install.php
message/output/popup/lib.php
message/output/popup/message_output_popup.php
mod/feedback/import.php
mod/feedback/mapcourse.php
mod/forum/lib.php
mod/lesson/action/continue.php
mod/quiz/lib.php
question/type/questiontype.php

index 060203042dc2939048d8e9e71314a746278e2efd..ee782391c1b92d14ba31cccc87f774c284147157 100644 (file)
             $rec->new_id = ($new_id === null? 0 : $new_id);
             $rec->info = $info_to_save;
 
-            if (!$DB->insert_record('backup_ids', $rec, false)) {
-                $status = false;
-            }
+            $DB->insert_record('backup_ids', $rec, false);
         }
         return $status;
     }
index ea169ebbbd83144ee9eaafc6aa0d4ce2bdb67071..837346ae535709f43b3a53f8ca61d49169b3b491 100644 (file)
@@ -1265,13 +1265,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                     }
 
                     // Add record
-                    if(!$DB->insert_record('course_modules_completion',$data)) {
-                        if (!defined('RESTORE_SILENTLY')) {
-                            echo "<p>Failed to insert completion data record.</p>";
-                        }
-                        $status=false;
-                        continue;
-                    }
+                    $DB->insert_record('course_modules_completion',$data);
                 }
             }
 
@@ -1306,13 +1300,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                     // Grade id is not converted (convert later)
 
                     // Add record
-                    if(!$DB->insert_record('course_modules_availability',$data)) {
-                        if (!defined('RESTORE_SILENTLY')) {
-                            echo "<p>Failed to insert availability data record.</p>";
-                        }
-                        $status=false;
-                        continue;
-                    }
+                    $DB->insert_record('course_modules_availability',$data);
                 }
             }
         } else {
@@ -3565,9 +3553,8 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             //The structure is equal to the db, so insert the groups_members
             if ($DB->record_exists("groups_members", array('groupid'=>$group_member->groupid, 'userid'=>$group_member->userid))) {
                 // user already member
-            } else if (!$DB->insert_record ("groups_members", $group_member)) {
-                $status = false;
-                continue;
+            } else {
+                $DB->insert_record ("groups_members", $group_member);
             }
 
             //Do some output
@@ -3689,9 +3676,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                 $gro_member->groupid    = $group->new_id;
                 $gro_member->groupingid = $grouping->new_id;
                 if (!$DB->get_record('groupings_groups', array('groupid'=>$gro_member->groupid, 'groupingid'=>$gro_member->groupingid))) {
-                    if (!$DB->insert_record('groupings_groups', $gro_member)) {
-                        $status = false;
-                    }
+                    $DB->insert_record('groupings_groups', $gro_member);
                 }
             }
         }
index dc523667e5183f3e08e499a2cb3982aff7dd5124..3bc4d30e54ee7519660fbe9df9e82c8227875773 100644 (file)
@@ -1155,9 +1155,7 @@ function course_set_display($courseid, $display=0) {
         $record->userid = $USER->id;
         $record->course = $courseid;
         $record->display = $display;
-        if (!$DB->insert_record("course_display", $record)) {
-            notify("Could not save your course display!");
-        }
+        $DB->insert_record("course_display", $record);
     }
 
     return $USER->display[$courseid] = $display;  // Note: = not ==
index dede345be1df94b53a8419e7ebdabeed525df584..bcfba8fe398aeeaa7b3de5a45188d0b16c8d1e1f 100644 (file)
 
             // ALL CLEAR !
 
-            if (!$DB->insert_record("enrol_paypal", $data)) {       // Insert a transaction record
-                message_paypal_error_to_admin("Error while trying to insert valid transaction", $data);
-            }
+            $DB->insert_record("enrol_paypal", $data);
 
             if (!enrol_into_course($course, $user, 'paypal')) {
                 message_paypal_error_to_admin("Error while trying to enrol ".fullname($user)." in '$course->fullname'", $data);
index 8d1ccf9263c3c284d5a73dfe65e3443a86ae59ec..87948834d1af858aa8856a5438b74b11c9eef6b3 100755 (executable)
@@ -447,13 +447,7 @@ if ($formdata = $mform->get_data()) {
                     $newgrade->importcode = $importcode;
                     $newgrade->userid     = $studentid;
                     $newgrade->importer   = $USER->id;
-                    if (!$DB->insert_record('grade_import_values', $newgrade)) {
-                        // could not insert into temporary table
-                        $status = false;
-                        import_cleanup($importcode);
-                        notify(get_string('importfailed', 'grades'));
-                        break 2;
-                    }
+                    $DB->insert_record('grade_import_values', $newgrade);
                 }
             }
 
index 3cbce136ad54bad1d71c41ef20f9f5abc0879e3b..c4e707d86432e21c42ece58905626085f01ab799 100644 (file)
@@ -110,12 +110,7 @@ function import_xml_grades($text, $course, &$error) {
             }
 
             // insert this grade into a temp table
-            if (!$DB->insert_record('grade_import_values', $newgrade)) {
-                $status = false;
-                // could not insert into temp table
-                $error = get_string('importfailed', 'grades');
-                break;
-            }
+            $DB->insert_record('grade_import_values', $newgrade);
         }
 
     } else {
index 3690e9c3f905d0fe8ccb7f026b31347ee9b74b68..a83d09bc8664a52b9be405b8b703b8267befb761 100644 (file)
@@ -1335,9 +1335,7 @@ function save_question_session($question, $state) {
         $session->sumpenalty = $state->sumpenalty;
         $session->manualcomment = $state->manualcomment;
         $session->flagged = !empty($state->newflaggedstate);
-        if (!$DB->insert_record('question_sessions', $session)) {
-            return false;
-        }
+        $DB->insert_record('question_sessions', $session);
     } else {
         $session->newest = $state->id;
         if (question_state_is_graded($state) or $state->event == QUESTION_EVENTOPEN) {
index 16592382fa61de2ad892f25306e506d794005bb4..d5b09a224b50ea9bbb085271fe25accf16f8bcc3 100644 (file)
@@ -6,8 +6,6 @@ function xmldb_message_email_install() {
 
     $provider = new object();
     $provider->name  = 'email';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
index 31c25c77c5e2566e365013e68bdd3649a49a5755..f5ae20fabcd6d40b064c7ae41e73b477e08d87ff 100644 (file)
@@ -41,8 +41,6 @@ function email_install(){
 
     $provider = new object();
     $provider->name  = 'email';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
index 6396f49d8caf10a082bed32385de306473682e4d..cfd363e5b0d8bebfa422cd148dff76b0539bc96c 100644 (file)
@@ -6,8 +6,6 @@ function xmldb_message_jabber_install(){
 
     $provider = new object();
     $provider->name  = 'jabber';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
index c5c4903f8ded7f24efa0eb4ce69765fd74db4f7e..e4be9ceded63916241bc75021e5445b8c3dbd0c0 100644 (file)
@@ -42,8 +42,6 @@ function jabber_install(){
 
     $provider = new object();
     $provider->name  = 'jabber';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
index 95ed1b8a719ffd994a731a951dc300d1cf462918..8d64bbf2e08e6f928e0b269873fffd11d1834d91 100644 (file)
@@ -7,8 +7,6 @@ function xmldb_message_popup_install() {
 
     $provider = new object();
     $provider->name  = 'popup';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
index dc5859b18920cf79d10c2e142485f76dee1820b0..add746c14a61a9f189e8678eca59cad4bea7262f 100644 (file)
@@ -42,9 +42,7 @@ function popup_install(){
 
     $provider = new object();
     $provider->name  = 'popup';
-    if (!$DB->insert_record('message_processors', $provider)) {
-        $return = false;
-    }
+    $DB->insert_record('message_processors', $provider);
     return $result;
 }
 
index 16986d99de098321594e5327ad708bff30c34a68..ea4e537f53bfb4a0805f7f51419af1c794aa126e 100644 (file)
@@ -54,9 +54,7 @@ class message_output_popup extends message_output{
         $procmessage->unreadmessageid = $message->id;
         $procmessage->processorid     = $processor->id;
 
-        if ( !$DB->insert_record('message_working', $procmessage) ) {
-            return false;
-        }
+        $DB->insert_record('message_working', $procmessage);
 
         //should only save this message for later delivery
         return true;
index 67966cef8a76c286acac87afad6275abf47f75f4..15d82c3a2c4e156c5f08e56f0115fa838dd2d6e5 100644 (file)
             }
             $newitem->required = intval($item['@']['REQUIRED']);
             $newitem->position = $position;
-            if (!$DB->insert_record('feedback_item', $newitem)) {
-                $error->stat = false;
-                $error->msg[] = 'item ('.$newitem->name.') not imported';
-            }
+            $DB->insert_record('feedback_item', $newitem);
         }
         return $error;
     }
index dd02aba9c3311b82db3be971c639559af51f9736..4bae07453bd71f19a0c1a22c7d187cbadc312ff6 100644 (file)
@@ -52,8 +52,8 @@
         $sql = "SELECT id, feedbackid
                   FROM {feedback_sitecourse_map}
                  WHERE feedbackid = ? AND courseid = ?";
-        if (!$DB->get_records_sql($sql, array($map->feedbackid, $map->courseid)) && !$DB->insert_record('feedback_sitecourse_map', $map)) {
-            print_error('cannotmapfeedback', 'feedback');
+        if (!$DB->get_records_sql($sql, array($map->feedbackid, $map->courseid))) {
+            $DB->insert_record('feedback_sitecourse_map', $map);
         }
     }
     
index bd64cc7068ab014c0bf923a13f920b95b34bef61..e3bb1242401cba4adc46e0c74bd7005fb0fcddd0 100644 (file)
@@ -573,9 +573,7 @@ function forum_cron() {
                     $queue->discussionid = $discussion->id;
                     $queue->postid       = $post->id;
                     $queue->timemodified = $post->created;
-                    if (!$DB->insert_record('forum_queue', $queue)) {
-                        mtrace("Error: mod/forum/cron.php: Could not queue for digest mail for id $post->id to user $userto->id ($userto->email) .. not trying again.");
-                    }
+                    $DB->insert_record('forum_queue', $queue);
                     continue;
                 }
 
index 622ac3d57f3f9072a4656c26ffefa4e3f219a363..afa2ed2e01a1ebc9c6513a01b27e97a58505196a 100644 (file)
             $branch->flag = $branchflag;
             $branch->timeseen = time();
         
-            if (!$DB->insert_record("lesson_branch", $branch)) {
-                print_error("Error: could not insert row into lesson_branch table");
-            }
+            $DB->insert_record("lesson_branch", $branch);
 
             //  this is called when jumping to random from a branch table
             if($newpageid == LESSON_UNSEENBRANCHPAGE) {
index 7e627a00985c474a368f9af34a7a0b363f0642f1..58b7e1a832012b068630c5e352e5b5edcb71f307 100644 (file)
@@ -1058,9 +1058,7 @@ function quiz_after_add_or_update($quiz) {
         $feedback->feedbacktext = $quiz->feedbacktext[$i];
         $feedback->mingrade = $quiz->feedbackboundaries[$i];
         $feedback->maxgrade = $quiz->feedbackboundaries[$i - 1];
-        if (!$DB->insert_record('quiz_feedback', $feedback, false)) {
-            return "Could not save quiz feedback.";
-        }
+        $DB->insert_record('quiz_feedback', $feedback, false);
     }
 
     // Update the events relating to this quiz.
index 5cd7ed9094d583d77325a529a4596b1a41f2f16d..b4054f35ef70b05d376a8975b585ec0fca6a257a 100644 (file)
@@ -1688,11 +1688,7 @@ class default_questiontype {
             foreach ($extraquestionfields as $field) {
                 $record->$field = backup_todb($recordinfo['#'][strtoupper($field)]['0']['#']);
             }
-            if (!$DB->insert_record($questionextensiontable, $record)) {
-                echo "Can't insert record in $questionextensiontable when restoring " .
-                                $this->name() . ' question id ' . $question;
-                $status = false;
-            }
+            $DB->insert_record($questionextensiontable, $record);
         }
         //TODO restore extra data in answers
         return $status;