From 979425b58486319953b0e9a3a649f574f0b05678 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 13 Jun 2009 18:04:21 +0000 Subject: [PATCH] MDL-18293 removed obsoleted checking of return values from insert and update_record + unused strings cleanup --- auth/mnet/auth.php | 16 ++++------------ lang/en_utf8/hotpot.php | 1 - mod/data/import.php | 4 +--- mod/data/restorelib.php | 9 ++------- mod/hotpot/attempt.php | 12 ++---------- mod/hotpot/view.php | 3 --- question/type/numerical/questiontype.php | 5 +---- 7 files changed, 10 insertions(+), 40 deletions(-) diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index fb3e924f7f..cf83619313 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -210,18 +210,14 @@ class auth_plugin_mnet extends auth_plugin_base { $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout; $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime'); $mnet_session->session_id = session_id(); - if (! $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session)) { - print_error('databaseerror', 'mnet'); - } + $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session); } else { $mnet_session->useragent = sha1($_SERVER['HTTP_USER_AGENT']); $mnet_session->token = $this->generate_token(); $mnet_session->confirm_timeout = time() + $this->config->rpc_negotiation_timeout; $mnet_session->expires = time() + (integer)ini_get('session.gc_maxlifetime'); $mnet_session->session_id = session_id(); - if (false == $DB->update_record('mnet_session', $mnet_session)) { - print_error('databaseerror', 'mnet'); - } + $DB->update_record('mnet_session', $mnet_session); } // construct the redirection URL @@ -299,9 +295,7 @@ class auth_plugin_mnet extends auth_plugin_base { print_error('nolocaluser', 'mnet'); } $remoteuser->mnethostid = $remotehost->id; - if (! $DB->insert_record('user', $remoteuser)) { - print_error('databaseerror', 'mnet'); - } + $DB->insert_record('user', $remoteuser); $firsttime = true; if (! $localuser = $DB->get_record('user', array('username'=>$remoteuser->username, 'mnethostid'=>$remotehost->id))) { print_error('nolocaluser', 'mnet'); @@ -390,9 +384,7 @@ class auth_plugin_mnet extends auth_plugin_base { $mnet_session->confirm_timeout = time(); $mnet_session->expires = time() + (integer)$session_gc_maxlifetime; $mnet_session->session_id = session_id(); - if (! $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session)) { - print_error('databaseerror', 'mnet'); - } + $mnet_session->id = $DB->insert_record('mnet_session', $mnet_session); } else { $mnet_session->expires = time() + (integer)$session_gc_maxlifetime; $DB->update_record('mnet_session', $mnet_session); diff --git a/lang/en_utf8/hotpot.php b/lang/en_utf8/hotpot.php index 5b0bb345ca..070dc4bfa5 100644 --- a/lang/en_utf8/hotpot.php +++ b/lang/en_utf8/hotpot.php @@ -15,7 +15,6 @@ $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)'; -$stirng['cannotinsertattempt'] = 'Could not insert attempt record: $a'; $string['checks'] = 'Checks'; $string['clickreporting'] = 'Enable click reporting'; $string['clues'] = 'Clues'; diff --git a/mod/data/import.php b/mod/data/import.php index b665814ef3..b802154ef7 100755 --- a/mod/data/import.php +++ b/mod/data/import.php @@ -128,9 +128,7 @@ $content = new object(); $content->recordid = $recordid; $content->fieldid = $field->id; - if (! $DB->insert_record('data_content', $content)) { - print_error('cannotinsertrecord', '', '', $recordid); - } + $DB->insert_record('data_content', $content); } // Fill data_content with the values imported from the CSV file: foreach ($record as $key => $value) { diff --git a/mod/data/restorelib.php b/mod/data/restorelib.php index 44c4fc4dab..a1aeb64133 100644 --- a/mod/data/restorelib.php +++ b/mod/data/restorelib.php @@ -387,9 +387,7 @@ function data_ratings_restore_mods ($oldid, $newid, $info, $rec_info) { $rating -> userid = backup_todb($rat_info['#']['USERID']['0']['#']); $rating -> rating = backup_todb($rat_info['#']['RATING']['0']['#']); - if (! $DB->insert_record ("data_ratings",$rating)) { - $status = false; - } + $DB->insert_record("data_ratings", $rating); } return $status; } @@ -414,10 +412,7 @@ function data_comments_restore_mods ($oldid, $newid, $info, $rec_info) { $comment -> content = backup_todb($com_info['#']['CONTENT']['0']['#']); $comment -> created = backup_todb($com_info['#']['CREATED']['0']['#']); $comment -> modified = backup_todb($com_info['#']['MODIFIED']['0']['#']); - if (! $DB->insert_record ("data_comments",$comment)) { - $status = false; - } - + $DB->insert_record("data_comments", $comment); } return $status; diff --git a/mod/hotpot/attempt.php b/mod/hotpot/attempt.php index 8fab8e9678..5cf79bd659 100644 --- a/mod/hotpot/attempt.php +++ b/mod/hotpot/attempt.php @@ -81,18 +81,12 @@ unset ($attempt->id); $attempt->id = $DB->insert_record("hotpot_attempts", $attempt); - if (empty($attempt->id)) { - print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error()); - } - // add attempt details record, if necessary if (!empty($attempt->details)) { $details = new object(); $details->attempt = $attempt->id; $details->details = $attempt->details; - if (! $DB->insert_record("hotpot_details", $details, false)) { - print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error()); - } + $DB->insert_record("hotpot_details", $details, false); } } else { // remove previous responses for this attempt, if required @@ -131,9 +125,7 @@ $details = new object(); $details->attempt = $attempt->id; $details->details = $attempt->details; - if (! $DB->insert_record("hotpot_details", $details)) { - print_error('cannotinsertattempt', 'hotpot', $next_url, $DB->get_last_error()); - } + $DB->insert_record("hotpot_details", $details); } } diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php index 909a2aefd6..5efd2b34d3 100644 --- a/mod/hotpot/view.php +++ b/mod/hotpot/view.php @@ -145,9 +145,6 @@ add_to_log($course->id, "hotpot", "view", "view.php?id=$cm->id", "$hotpot->id", "$cm->id"); $attemptid = hotpot_add_attempt($hotpot->id); - if (! is_numeric($attemptid)) { - print_error('cannotinsertattempt', 'hotpot', '', $DB->get_last_error()); - } } $hp->adjust_media_urls(); if (empty($frameset)) { diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php index e08a90826b..45886361a2 100644 --- a/question/type/numerical/questiontype.php +++ b/question/type/numerical/questiontype.php @@ -207,10 +207,7 @@ class question_numerical_qtype extends question_shortanswer_qtype { $units[$i]->question = $question->id; $units[$i]->multiplier = $this->apply_unit($question->multiplier[$i], array()); $units[$i]->unit = $question->unit[$i]; - if (! $DB->insert_record('question_numerical_units', $units[$i])) { - $result->error = 'Unable to save unit ' . $units[$i]->unit . ' to the Databse'; - return $result; - } + $DB->insert_record('question_numerical_units', $units[$i]); } } unset($question->multiplier, $question->unit); -- 2.39.5