From: skodak Date: Sat, 13 Jun 2009 18:34:43 +0000 (+0000) Subject: MDL-18293 removed obsoleted checking of return values from insert and update_record... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fc29e51b2d830f2d44dddde2e2d352ba8ceefe87;p=moodle.git MDL-18293 removed obsoleted checking of return values from insert and update_record + unused strings cleanup --- diff --git a/backup/lib.php b/backup/lib.php index 060203042d..ee782391c1 100644 --- a/backup/lib.php +++ b/backup/lib.php @@ -366,9 +366,7 @@ $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; } diff --git a/backup/restorelib.php b/backup/restorelib.php index ea169ebbbd..837346ae53 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -1265,13 +1265,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3); } // Add record - if(!$DB->insert_record('course_modules_completion',$data)) { - if (!defined('RESTORE_SILENTLY')) { - echo "

Failed to insert completion data record.

"; - } - $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 "

Failed to insert availability data record.

"; - } - $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); } } } diff --git a/course/lib.php b/course/lib.php index dc523667e5..3bc4d30e54 100644 --- a/course/lib.php +++ b/course/lib.php @@ -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 == diff --git a/enrol/paypal/ipn.php b/enrol/paypal/ipn.php index dede345be1..bcfba8fe39 100644 --- a/enrol/paypal/ipn.php +++ b/enrol/paypal/ipn.php @@ -167,9 +167,7 @@ // 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); diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 8d1ccf9263..87948834d1 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -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); } } diff --git a/grade/import/xml/lib.php b/grade/import/xml/lib.php index 3cbce136ad..c4e707d864 100644 --- a/grade/import/xml/lib.php +++ b/grade/import/xml/lib.php @@ -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 { diff --git a/lib/questionlib.php b/lib/questionlib.php index 3690e9c3f9..a83d09bc86 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -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) { diff --git a/message/output/email/db/install.php b/message/output/email/db/install.php index 16592382fa..d5b09a224b 100644 --- a/message/output/email/db/install.php +++ b/message/output/email/db/install.php @@ -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; } diff --git a/message/output/email/lib.php b/message/output/email/lib.php index 31c25c77c5..f5ae20fabc 100644 --- a/message/output/email/lib.php +++ b/message/output/email/lib.php @@ -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; } diff --git a/message/output/jabber/db/install.php b/message/output/jabber/db/install.php index 6396f49d8c..cfd363e5b0 100644 --- a/message/output/jabber/db/install.php +++ b/message/output/jabber/db/install.php @@ -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; } diff --git a/message/output/jabber/lib.php b/message/output/jabber/lib.php index c5c4903f8d..e4be9ceded 100644 --- a/message/output/jabber/lib.php +++ b/message/output/jabber/lib.php @@ -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; } diff --git a/message/output/popup/db/install.php b/message/output/popup/db/install.php index 95ed1b8a71..8d64bbf2e0 100644 --- a/message/output/popup/db/install.php +++ b/message/output/popup/db/install.php @@ -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; } diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php index dc5859b189..add746c14a 100644 --- a/message/output/popup/lib.php +++ b/message/output/popup/lib.php @@ -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; } diff --git a/message/output/popup/message_output_popup.php b/message/output/popup/message_output_popup.php index 16986d99de..ea4e537f53 100644 --- a/message/output/popup/message_output_popup.php +++ b/message/output/popup/message_output_popup.php @@ -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; diff --git a/mod/feedback/import.php b/mod/feedback/import.php index 67966cef8a..15d82c3a2c 100644 --- a/mod/feedback/import.php +++ b/mod/feedback/import.php @@ -248,10 +248,7 @@ } $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; } diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php index dd02aba9c3..4bae07453b 100644 --- a/mod/feedback/mapcourse.php +++ b/mod/feedback/mapcourse.php @@ -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); } } diff --git a/mod/forum/lib.php b/mod/forum/lib.php index bd64cc7068..e3bb124240 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -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; } diff --git a/mod/lesson/action/continue.php b/mod/lesson/action/continue.php index 622ac3d57f..afa2ed2e01 100644 --- a/mod/lesson/action/continue.php +++ b/mod/lesson/action/continue.php @@ -508,9 +508,7 @@ $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) { diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 7e627a0098..58b7e1a832 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -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. diff --git a/question/type/questiontype.php b/question/type/questiontype.php index 5cd7ed9094..b4054f35ef 100644 --- a/question/type/questiontype.php +++ b/question/type/questiontype.php @@ -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;