diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 12fb2e244db..74155c243b2 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -31,11 +31,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -114,14 +114,14 @@
     $completedscount = feedback_get_completeds_group_count($feedback, $mygroupid);
 
     //show the group, if available
-    if($mygroupid and $group = get_record('groups', 'id', $mygroupid)) {
+    if($mygroupid and $group = $DB->get_record('groups', array('id'=>$mygroupid))) {
         echo '<b>'.get_string('group').': '.$group->name. '</b><br />';
     }
     //show the count
     echo '<b>'.get_string('completed_feedbacks', 'feedback').': '.$completedscount. '</b><br />';
 
     // get the items of the feedback
-    $items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
+    $items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1), 'position');
     //show the count
     if(is_array($items)){
         echo '<b>'.get_string('questions', 'feedback').': ' .sizeof($items). ' </b><hr />';
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index fa2409e3d75..8901d48373e 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -31,11 +31,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -88,7 +88,7 @@
     echo '<b>'.get_string('completed_feedbacks', 'feedback').': '.$completedscount. '</b><br />';
     
     // get the items of the feedback
-    $items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
+    $items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1), 'position');
     //show the count
     if(is_array($items)){
     	echo '<b>'.get_string('questions', 'feedback').': ' .sizeof($items). ' </b><hr />';
@@ -104,14 +104,13 @@
         if ($CFG->dbtype == 'postgres7') {
              $avgvalue = 'avg(cast (value as integer))';
         }
-        if ($courses = get_records_sql ('select fv.course_id, c.shortname, '.$avgvalue.' as avgvalue '.
-                                                  'from '.$CFG->prefix.'feedback_value fv, '.$CFG->prefix.'course c, '.
-                                                  $CFG->prefix.'feedback_item fi '.
-                                                  'where fv.course_id = c.id '.
-                                                  'and fi.id = fv.item and fi.typ = \''.$courseitemfiltertyp.'\' and fv.item = \''.
-                                                  $courseitemfilter.'\' '.
-                                                  'group by course_id, shortname order by avgvalue desc')) {
-             $item = get_record('feedback_item', 'id', $courseitemfilter);
+        if ($courses = $DB->get_records_sql ("SELECT fv.course_id, c.shortname, $avgvalue AS avgvalue
+                                                FROM {feedback_value} fv, {course} c, {feedback_item} fi
+                                               WHERE fv.course_id = c.id AND fi.id = fv.item AND fi.typ = ? AND fv.item = ?
+                                            GROUP BY course_id, shortname
+                                            ORDER BY avgvalue desc",
+                                              array($courseitemfiltertyp, $courseitemfilter))) {
+             $item = $DB->get_record('feedback_item', array('id'=>$courseitemfilter));
              echo '<tr><th colspan="2">'.$item->name.'</th></tr>';
              echo '<tr><td><table align="left">';
              echo '<tr><th>Course</th><th>Average</th></tr>';
diff --git a/mod/feedback/analysis_to_excel.php b/mod/feedback/analysis_to_excel.php
index aaa68ff2183..1dd558b2d09 100644
--- a/mod/feedback/analysis_to_excel.php
+++ b/mod/feedback/analysis_to_excel.php
@@ -21,11 +21,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -106,7 +106,7 @@
     }
 
     //get the questions (item-names)
-    $items = get_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1', 'position');
+    $items = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'hasvalue'=>1, 'position'));
     if(is_array($items)){
         $rowOffset1++;
         $worksheet1->write_string($rowOffset1, 0, $fstring->questions.': '. strval(sizeof($items)));
@@ -193,17 +193,17 @@
     }
     
     function feedback_excelprint_detailed_items(&$worksheet, $completed, $items, $rowOffset) {
-        global $fstring;
+        global $DB, $fstring;
         
         if(!$items) return;
         $colOffset = 0;
         $courseid = 0;
         
-        $feedback = get_record('feedback', 'id', $completed->feedback);
+        $feedback = $DB->get_record('feedback', array('id'=>$completed->feedback));
         //get the username
         //anonymous users are separated automatically because the userid in the completed is "0"
         $worksheet->setFormat('<l><f><ru2>');
-        if($user = get_record('user', 'id', $completed->userid)) {
+        if($user = $DB->get_record('user', array('id'=>$completed->userid))) {
             if ($completed->anonymous_response == FEEDBACK_ANONYMOUS_NO) {
                 $worksheet->write_string($rowOffset, $colOffset, $user->idnumber);
                 $colOffset++;
@@ -229,7 +229,7 @@
         
         $colOffset++;
         foreach($items as $item) {
-            $value = get_record('feedback_value', 'item', $item->id, 'completed', $completed->id);
+            $value = $DB->get_record('feedback_value', array('item'=>$item->id, 'completed'=>$completed->id));
             
             $itemclass = 'feedback_item_'.$item->typ;
             $itemobj = new $itemclass();
@@ -248,7 +248,7 @@
         }
         $worksheet->write_number($rowOffset, $colOffset, $courseid);
         $colOffset++;
-        if(isset($courseid) AND $course = get_record('course', 'id', $courseid)){
+        if(isset($courseid) AND $course = $DB->get_record('course', array('id'=>$courseid))) {
             $worksheet->write_string($rowOffset, $colOffset, $course->shortname);
         }
         return $rowOffset + 1;
diff --git a/mod/feedback/backuplib.php b/mod/feedback/backuplib.php
index aabbbc9a45e..2b56b9ec995 100644
--- a/mod/feedback/backuplib.php
+++ b/mod/feedback/backuplib.php
@@ -28,12 +28,12 @@
 
     //This function executes all the backup procedure about this mod
    function feedback_backup_mods($bf,$preferences) {
-      global $CFG;
+      global $CFG, $DB;
 
       $status = true;
 
       //Iterate over feedback table
-      $feedbacks = get_records ("feedback","course",$preferences->backup_course,"id");
+      $feedbacks = $DB->get_records ("feedback", array("course"=>$preferences->backup_course), "id");
       if ($feedbacks) {
          foreach ($feedbacks as $feedback) {
             if (backup_mod_selected($preferences,'feedback',$feedback->id)) {
@@ -45,10 +45,10 @@
    }
 
    function feedback_backup_one_mod($bf,$preferences,$feedback) {
-      global $CFG;
+      global $CFG, $DB;
     
       if (is_numeric($feedback)) {
-         $feedback = get_record('feedback','id',$feedback);
+         $feedback = $DB->get_record('feedback', array('id'=>$feedback));
       }
       
       $status = true;
@@ -79,9 +79,10 @@
    }
    
    function feedback_backup_data($bf, $preferences, $feedbackid) {
-      global $CFG;
+      global $CFG, $DB;
+
       $status = true;
-      $feedbackitems = get_records('feedback_item', 'feedback', $feedbackid);
+      $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedbackid));
       if(function_exists('backup_userdata_selected')) { //compatibility-hack for moodle 1.5.x
          $backup_userdata = backup_userdata_selected($preferences,'feedback',$feedbackid);
       }else {
@@ -104,7 +105,7 @@
             
             if ($backup_userdata) {
                //backup the values of items
-               $feedbackvalues = get_records('feedback_value', 'item', $feedbackitem->id);
+               $feedbackvalues = $DB->get_records('feedback_value', array('item'=>$feedbackitem->id));
                if($feedbackvalues) {
                   $status =fwrite ($bf,start_tag("FBVALUES",6,true));
                   foreach($feedbackvalues as $feedbackvalue) {
@@ -130,7 +131,7 @@
       
       if($backup_userdata) {
          //backup of feedback-completeds
-         $feedbackcompleteds = get_records('feedback_completed', 'feedback', $feedbackid);
+         $feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedbackid));
          if($feedbackcompleteds) {
             fwrite ($bf,start_tag("COMPLETEDS",4,true));
             foreach ($feedbackcompleteds as $feedbackcompleted) {
@@ -151,7 +152,7 @@
          }
          
          //backup of tracking-data
-         $feedbacktrackings = get_records('feedback_tracking', 'feedback', $feedbackid);
+         $feedbacktrackings = $DB->get_records('feedback_tracking', array('feedback'=>$feedbackid));
          if($feedbacktrackings) {
             fwrite ($bf,start_tag("TRACKINGS",4,true));
             foreach ($feedbacktrackings as $feedbacktracking) {
@@ -175,9 +176,10 @@
 
 
    function feedback_backup_template_data($bf, $templateid, $userinfo) {
-      global $CFG;
+      global $CFG, $DB;
+
       $status = true;
-      $templateitems = get_records('feedback_item', 'template', $templateid);
+      $templateitems = $DB->get_records('feedback_item', array('template'=>$templateid));
 
       if ($templateitems) {
          $status =fwrite ($bf,start_tag("ITEMS",5,true));
@@ -228,6 +230,8 @@
 
    ////Return an array of info (name,value)
    function feedback_check_backup_mods_instances($instance,$backup_unique_code) {
+      global $DB;
+
       //First the course data
       $info[$instance->id.'0'][0] = '<b>'.$instance->name.'</b>';
       $info[$instance->id.'0'][1] = '';
@@ -235,7 +239,7 @@
       //Now, if requested, the user_data
       if (!empty($instance->userdata)) {
          $info[$instance->id.'1'][0] = get_string("responses","feedback");
-         if ($responses_count = count_records ('feedback_completed', 'feedback', $instance->id)) {
+         if ($responses_count = $DB->count_records ('feedback_completed', array('feedback'=>$instance->id))) {
                $info[$instance->id.'1'][1] = $responses_count;
          } else {
                $info[$instance->id.'1'][1] = 0;
@@ -251,18 +255,20 @@
 
    //Returns an array of feedbacks ids 
    function feedback_count ($course) {
-      global $CFG;
-      return count_records('feedback', 'course', $course);
+      global $DB;
+
+      return $DB->count_records('feedback', array('course'=>$course));
    }
    
    function feedback_completed_count($course) {
-      global $CFG;
+      global $DB;
+
       $count = 0;
       //get all feedbacks
-      $feedbacks = get_records('feedback', 'course', $course);
+      $feedbacks = $DB->get_records('feedback', array('course'=>$course));
       if($feedbacks) {
          foreach($feedbacks as $feedback) {
-            $count += count_records('feedback_completed', 'feedback', $feedback->id);
+            $count += $DB->count_records('feedback_completed', array('feedback'=>$feedback->id));
          }
       }
       return $count;
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index c0ea3790e9a..c869083347f 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -60,11 +60,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -86,9 +86,9 @@
     }
     
     if($courseid AND $courseid != SITEID) {
-        $course2 = get_record('course', 'id', $courseid);
+        $course2 = $DB->get_record('course', array('id'=>$courseid));
         require_course_login($course2); //this overwrites the object $course :-(
-        $course = get_record("course", "id", $cm->course); // the workaround
+        $course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
     }
     
     if(!$capabilities->complete) {
@@ -179,7 +179,7 @@
             }else{
                 $feedbackcompleted = false;
             }
-            $feedbackcompletedtmp = get_record('feedback_completedtmp', 'id', $completedid);
+            $feedbackcompletedtmp = $DB->get_record('feedback_completedtmp', array('id'=>$completedid));
             //fake saving for switchrole
             $is_switchrole = feedback_check_is_switchrole();
             if($is_switchrole) {
@@ -194,11 +194,11 @@
                     feedback_send_email_anonym($cm, $feedback, $course, $userid);
                 }
                 //tracking the submit
-                $tracking = null;
+                $tracking = new object();
                 $tracking->userid = $USER->id;
                 $tracking->feedback = $feedback->id;
                 $tracking->completed = $new_completed_id;
-                insert_record('feedback_tracking', $tracking);
+                $DB->insert_record('feedback_tracking', $tracking);
                 unset($SESSION->feedback->is_started);
                 
             }else {
@@ -222,16 +222,16 @@
         }
         
         //get the feedbackitems after the last shown pagebreak
-        $feedbackitems = get_records_select('feedback_item', 'feedback = '.$feedback->id.' AND position > '.$startposition, 'position');
+        $feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position');
         
         //get the first pagebreak
-        if($pagebreaks = get_records_select('feedback_item', "feedback = ".$feedback->id." AND typ = 'pagebreak'", 'position')) {
+        if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) {
             $pagebreaks = array_values($pagebreaks);
             $firstpagebreak = $pagebreaks[0];
         }else {
             $firstpagebreak = false;
         }
-        $maxitemcount = count_records('feedback_item', 'feedback', $feedback->id);
+        $maxitemcount = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
         
         //get the values of completeds before done. Anonymous user can not get these values.
         if((!isset($SESSION->feedback->is_started)) AND (!isset($savereturn)) AND ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO)) {
@@ -267,6 +267,7 @@
                 }
             }
             if($feedback->site_after_submit) {
+var_dump($feedback->site_after_submit);
                 print_continue(feedback_encode_target_url($feedback->site_after_submit));
             }else {
                 if($courseid) {
@@ -304,13 +305,13 @@
                         break;
                 }
                 //check, if there exists required-elements
-                $countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
+                $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
                 if($countreq > 0) {
                     echo '<tr><td colspan="3"><font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font></td></tr>';
                 }
                 
                 unset($startitem);
-                $itemnr = count_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1 AND position < '.$startposition);
+                $itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
                 foreach($feedbackitems as $feedbackitem){
                     if(!isset($startitem)) {
                         //avoid showing double pagebreaks
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 658d2d9d524..1bd14f1494f 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -58,11 +58,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -89,9 +89,9 @@
     require_course_login($course);
     
     if($courseid AND $courseid != SITEID) {
-        $course2 = get_record('course', 'id', $courseid);
+        $course2 = $DB->get_record('course', array('id'=>$courseid));
         require_course_login($course2); //this overwrites the object $course :-(
-        $course = get_record("course", "id", $cm->course); // the workaround
+        $course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
     }
     
     if(!$capabilities->complete) {
@@ -136,7 +136,7 @@
     //additional check for multiple-submit (prevent browsers back-button). the main-check is in view.php
     $feedback_can_submit = true;
     if($feedback->multiple_submit == 0 ) {
-        // if($multiple_count = get_record('feedback_tracking', 'userid', $USER->id, 'feedback', $feedback->id)) {
+        // if($multiple_count = $DB->get_record('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
         if(feedback_is_already_submitted($feedback->id, $courseid)) {
             $feedback_can_submit = false;
         }
@@ -177,7 +177,7 @@
             //exists there any pagebreak, so there are values in the feedback_valuetmp
             $userid = $USER->id; //arb changed from 0 to $USER->id - no strict anonymous feedbacks - if it is a guest taking it then I want to know that it was a guest (at least in the data saved in the feedback tables)
 
-            $feedbackcompletedtmp = get_record('feedback_completedtmp', 'id', $completedid);
+            $feedbackcompletedtmp = $DB->get_record('feedback_completedtmp', array('id'=>$completedid));
             
             //fake saving for switchrole
             $is_switchrole = feedback_check_is_switchrole();
@@ -209,15 +209,15 @@
         }
         
         //get the feedbackitems after the last shown pagebreak
-        $feedbackitems = get_records_select('feedback_item', 'feedback = '.$feedback->id.' AND position > '.$startposition, 'position');
+        $feedbackitems = $DB->get_records_select('feedback_item', 'feedback = ? AND position > ?', array($feedback->id, $startposition), 'position');
         //get the first pagebreak
-        if($pagebreaks = get_records_select('feedback_item', "feedback = ".$feedback->id." AND typ = 'pagebreak'", 'position')) {
+        if($pagebreaks = $DB->get_records('feedback_item', array('feedback'=>$feedback->id, 'typ'=>'pagebreak'), 'position')) {
             $pagebreaks = array_values($pagebreaks);
             $firstpagebreak = $pagebreaks[0];
         }else {
             $firstpagebreak = false;
         }
-        $maxitemcount = count_records('feedback_item', 'feedback', $feedback->id);
+        $maxitemcount = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
         $feedbackcompletedtmp = feedback_get_current_completed($feedback->id, true, $courseid, $USER->sesskey);
 
         /// Print the main part of the page
@@ -280,13 +280,13 @@
                         &nbsp;
                       </td></tr>';
                 //check, if there exists required-elements
-                $countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
+                $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id, 'required'=>1));
                 if($countreq > 0) {
                     echo '<tr><td colspan="3"><font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font></td></tr>';
                 }
                 
                 unset($startitem);
-                $itemnr = count_records_select('feedback_item', 'feedback = '. $feedback->id . ' AND hasvalue = 1 AND position < '.$startposition);
+                $itemnr = $DB->count_records_select('feedback_item', 'feedback = ? AND hasvalue = 1 AND position < ?', array($feedback->id, $startposition));
                 foreach($feedbackitems as $feedbackitem){
                     if(!isset($startitem)) {
                         //avoid showing double pagebreaks
diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index 964ccdc8c8c..7d303bd4a2e 100644
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -24,11 +24,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -53,7 +53,7 @@
     }
     
     if(isset($formdata->confirmdelete) AND $formdata->confirmdelete == 1){
-        if($completed = get_record('feedback_completed', 'id', $completedid)) {
+        if($completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) {
             feedback_delete_completed($completedid);
             add_to_log($course->id, 'feedback', 'delete', 'view.php?id='.$cm->id, $feedback->id,$cm->id);
             redirect('show_entries.php?id='.$id.'&do_show=showentries');
diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index e1d0e5c25a8..77cd3ec01cf 100644
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -20,11 +20,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index ac26405d90b..7f29f36923d 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -34,11 +34,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 0f66ab7ab36..433c10b8748 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -33,11 +33,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -51,21 +51,21 @@
 
     //move up/down items
     if($moveupitem){
-        $item = get_record('feedback_item', 'id', $moveupitem);
+        $item = $DB->get_record('feedback_item', array('id'=>$moveupitem));
         feedback_moveup_item($item);
     }
     if($movedownitem){
-        $item = get_record('feedback_item', 'id', $movedownitem);
+        $item = $DB->get_record('feedback_item', array('id'=>$movedownitem));
         feedback_movedown_item($item);
     }
     
     //moving of items
     if($movehere && isset($SESSION->feedback->moving->movingitem)){
-        $item = get_record('feedback_item', 'id', intval($SESSION->feedback->moving->movingitem));
+        $item = $DB->get_record('feedback_item', array('id'=>$SESSION->feedback->moving->movingitem));
         feedback_move_item($item, intval($movehere));
     }
     if($moveitem){
-        $item = get_record('feedback_item', 'id', $moveitem);
+        $item = $DB->get_record('feedback_item', array('id'=>$moveitem));
         $SESSION->feedback->moving->shouldmoving = 1;
         $SESSION->feedback->moving->movingitem = $moveitem;
     } else {
@@ -73,7 +73,7 @@
     }
     
     if($switchitemrequired) {
-        $item = get_record('feedback_item', 'id', $switchitemrequired);
+        $item = $DB->get_record('feedback_item', array('id'=>$switchitemrequired));
         @feedback_switch_item_required($item);
         redirect($ME.'?'.feedback_edit_get_default_query($id, $do_show));
         exit;
@@ -110,7 +110,7 @@
 
     //get the feedbackitems
     $lastposition = 0;
-    $feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
+    $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
     if(is_array($feedbackitems)){
         $feedbackitems = array_values($feedbackitems);
         if(count($feedbackitems) > 0) {
@@ -219,7 +219,7 @@
             print_box_start('generalbox boxaligncenter boxwidthwide');
             
             //check, if there exists required-elements
-            $countreq = count_records('feedback_item', 'feedback', $feedback->id, 'required', 1);
+            $countreq = $DB->count_records('feedback_item', array('feedback'=>$feedback->id), 'required', 1);
             if($countreq > 0) {
                 // echo '<font color="red">(*)' . get_string('items_are_required', 'feedback') . '</font>';
                 echo '<span class="feedback_required_mark">(*)' . get_string('items_are_required', 'feedback') . '</span>';
diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 197a48d7a53..cd628833937 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -30,11 +30,11 @@
             error("Course Module ID was incorrect");
         }
         
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
         
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -55,7 +55,7 @@
     
     //get the existing item or create it
     // $formdata->itemid = isset($formdata->itemid) ? $formdata->itemid : NULL;
-    if($itemid and $item = get_record('feedback_item', 'id', $itemid)){
+    if($itemid and $item = $DB->get_record('feedback_item', array('id'=>$itemid))) {
         $typ = $item->typ;
         $position = $item->position;
     }else {
@@ -82,7 +82,7 @@
         if (!$newitemid = feedback_create_item($formdata)) {
             $SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback');
         }else {
-            $newitem = get_record('feedback_item', 'id', $newitemid);
+            $newitem = $DB->get_record('feedback_item', array('id'=>$newitemid));
             if (!feedback_move_item($newitem, $newposition)){
                 $SESSION->feedback->errors[] = get_string('item_creation_failed', 'feedback');
             }else {
@@ -148,7 +148,7 @@
     $i_form->addElement('hidden', 'feedbackid', $feedback->id);
     
 
-    $lastposition = count_records('feedback_item', 'feedback', $feedback->id);    
+    $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));    
     if($position == -1){
         $i_formselect_last = $lastposition + 1;
         $i_formselect_value = $lastposition + 1;
@@ -195,7 +195,7 @@
         echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'" />';
     
     //choose the position
-    $lastposition = count_records('feedback_item', 'feedback', $feedback->id);
+    $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
     echo get_string('position', 'feedback').'&nbsp;';
     echo '<select name="position">';
         //Dropdown-Items for choosing the position
diff --git a/mod/feedback/export.php b/mod/feedback/export.php
index 9793c382e4a..e0b5644fb28 100644
--- a/mod/feedback/export.php
+++ b/mod/feedback/export.php
@@ -20,11 +20,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -48,9 +48,11 @@
     exit;
   
     function feedback_get_xml_data($feedbackid) {
+        global $DB;
+
         $space = '     ';
         //get all items of the feedback
-        if(!$items = get_records('feedback_item', 'feedback', $feedbackid, 'position')) {
+        if(!$items = $DB->get_records('feedback_item', array('feedback'=>$feedbackid), 'position')) {
             return false;
         }
         
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index cf49496bfae..7766b89d6df 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -25,11 +25,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -155,7 +155,7 @@
     }
     
     function feedback_import_loaded_data(&$data, $feedbackid){
-        global $CFG;
+        global $CFG, $DB;
         
         $deleteolditems = optional_param('deleteolditems', 0, PARAM_INT);
         
@@ -174,7 +174,7 @@
             $position = 0;
         } else {
             //items will be add to the end of the existing items
-            $position = count_records('feedback_item', 'feedback', $feedbackid);
+            $position = $DB->count_records('feedback_item', array('feedback'=>$feedbackid));
         }
         
         foreach($data as $item) {
@@ -202,7 +202,7 @@
             }
             $newitem->required = intval($item['@']['REQUIRED']);
             $newitem->position = $position;
-            if(!insert_record('feedback_item', $newitem)) {
+            if (!$DB->insert_record('feedback_item', $newitem)) {
                 $error->stat = false;
                 $error->msg[] = 'item ('.$newitem->name.') not imported';
             }
diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index b94735d5ff4..43f0db5e66f 100644
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -47,7 +47,7 @@ class feedback_item_captcha extends feedback_item_base {
     }
 
     function print_item($item, $value = false, $readonly = false, $edit = false, $highlightrequire = false){
-        global $SESSION, $CFG;
+        global $SESSION, $CFG, $DB;
         
         $align = get_string('thisdirection') == 'ltr' ? 'left' : 'right';
         
@@ -58,7 +58,7 @@ class feedback_item_captcha extends feedback_item_base {
         if(!$readonly) {
             $feedbackid = $item->feedback;
             if($feedbackid > 0) {
-                $feedback = get_record('feedback', 'id', $feedbackid);
+                $feedback = $DB->get_record('feedback', array('id'=>$feedbackid));
                 if($cm = get_coursemodule_from_instance("feedback", $feedback->id, $feedback->course)) {
                     $cmid = $cm->id;
                 }
diff --git a/mod/feedback/item/captcha/print_captcha.php b/mod/feedback/item/captcha/print_captcha.php
index 8a3111a5285..388c515ec7e 100644
--- a/mod/feedback/item/captcha/print_captcha.php
+++ b/mod/feedback/item/captcha/print_captcha.php
@@ -8,11 +8,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 8acc3aff29c..73282305ebd 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -38,10 +38,12 @@ class feedback_item_numeric extends feedback_item_base {
 
     //liefert eine Struktur ->name, ->data = array(mit Antworten)
     function get_analysed($item, $groupid = false, $courseid = false) {
+        global $DB;
+
         $analysed = null;
         $analysed->data = array();
         $analysed->name = $item->name;
-        //$values = get_records('feedback_value', 'item', $item->id);
+        //$values = $DB->get_records('feedback_value', array('item'=>$item->id));
         $values = feedback_get_group_values($item, $groupid, $courseid);
         
         $avg = 0.0;
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index bbe9fbe4417..58bc125b12f 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -36,10 +36,12 @@ class feedback_item_textarea extends feedback_item_base {
 
     //liefert eine Struktur ->name, ->data = array(mit Antworten)
     function get_analysed($item, $groupid, $courseid = false) {
+        global $DB;
+
         $aVal = null;
         $aVal->data = array();
         $aVal->name = $item->name;
-        //$values = get_records('feedback_value', 'item', $item->id);
+        //$values = $DB->get_records('feedback_value', array('item'=>$item->id));
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if($values) {
             $data = array();
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 998f477160a..f41dca31d61 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -36,10 +36,12 @@ class feedback_item_textfield extends feedback_item_base {
 
     //liefert eine Struktur ->name, ->data = array(mit Antworten)
     function get_analysed($item, $groupid = false, $courseid = false) {
+        global $DB;
+
         $aVal = null;
         $aVal->data = null;
         $aVal->name = $item->name;
-        //$values = get_records('feedback_value', 'item', $item->id);
+        //$values = $DB->get_records('feedback_value', array('item'=>$item->id));
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if($values) {
             $data = array();
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index c0735f4341d..27376cf2f9b 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -130,8 +130,10 @@ function feedback_delete_instance($id) {
 * @return boolean
 */
 function feedback_delete_course($course) {
+    global $DB;
+
     //delete all templates of given course
-    return delete_records('feedback_template', 'course', $course->id);
+    return $DB->delete_records('feedback_template', array('course'=>$course->id));
 }
 
 /**
@@ -147,8 +149,7 @@ function feedback_delete_course($course) {
 * @return object
 */
 function feedback_user_outline($course, $user, $mod, $feedback) {
-
-    return $return;
+    return null;
 }
 
 /**
@@ -161,7 +162,6 @@ function feedback_user_outline($course, $user, $mod, $feedback) {
 * @return object
 */
 function feedback_user_complete($course, $user, $mod, $feedback) {
-
     return true;
 }
 
@@ -171,19 +171,15 @@ function feedback_cron () {
 }
 
 function feedback_grades($feedbackid) {
-
     return NULL;
 }
 
 function feedback_get_participants($feedbackid) {
-
     return false;
 }
 
 function feedback_scale_used ($feedbackid,$scaleid) {
-    $return = false;
-
-    return $return;
+    return false;
 }
 
 /**
@@ -194,7 +190,7 @@ function feedback_scale_used ($feedbackid,$scaleid) {
  * @return array status array
  */
 function feedback_reset_userdata($data) {
-    global $CFG;
+    global $CFG, $DB;
     
     $resetfeedbacks = array();
     $dropfeedbacks = array();
@@ -221,7 +217,7 @@ function feedback_reset_userdata($data) {
     
     //reset the selected feedbacks
     foreach($resetfeedbacks as $id) {
-        $feedback = get_record('feedback', 'id', $id);
+        $feedback = $DB->get_record('feedback', array('id'=>$id));
         feedback_delete_all_completeds($id);
         $status[] = array('component'=>$componentstr.':'.$feedback->name, 'item'=>get_string('resetting_data','feedback'), 'error'=>false);
     }
@@ -241,10 +237,11 @@ function feedback_reset_userdata($data) {
  * @param $mform form passed by reference
  */
 function feedback_reset_course_form_definition(&$mform) {
-    global $COURSE;
+    global $COURSE, $DB;
+
     $mform->addElement('header', 'feedbackheader', get_string('modulenameplural', 'feedback'));
     
-    if(!$feedbacks = get_records('feedback', 'course', $COURSE->id, 'name')){
+    if(!$feedbacks = $DB->get_records('feedback', array('course'=>$COURSE->id), 'name')){
         return;
     }
 
@@ -259,8 +256,10 @@ function feedback_reset_course_form_definition(&$mform) {
  * Course reset form defaults.
  */
 function feedback_reset_course_form_defaults($course) {
+    global $DB;
+
     $return = array();
-    if(!$feedbacks = get_records('feedback', 'course', $course->id, 'name')){
+    if(!$feedbacks = $DB->get_records('feedback', array('course'=>$course->id), 'name')){
         return;
     }
     foreach($feedbacks as $feedback) {
@@ -278,8 +277,12 @@ function feedback_reset_course_form_defaults($course) {
  * @return void
  */
 function feedback_reset_course_form($course) {
+    global $DB;
+
     echo get_string('resetting_feedbacks', 'feedback'); echo ':<br />';
-    if(!$feedbacks = get_records('feedback', 'course', $course->id, 'name'))return;
+    if (!$feedbacks = $DB->get_records('feedback', array('course'=>$course->id), 'name')) {
+        return;
+    }
     
     foreach($feedbacks as $feedback) {
         echo '<p>';
@@ -349,10 +352,12 @@ function feedback_set_events($feedback) {
  *  @return boolean
  */
 function feedback_delete_course_module($id) {
-    if (!$cm = get_record('course_modules', 'id', $id)) {
+    global $DB;
+
+    if (!$cm = $DB->get_record('course_modules', array('id'=>$id))) {
         return true;
     }
-    return delete_records('course_modules', 'id', $cm->id);
+    return $DB->delete_records('course_modules', array('id'=>$cm->id));
 }
 
 
@@ -515,13 +520,14 @@ function feedback_get_receivemail_users($cmid, $groups = false) {
  *  @return int the new templateid
  */
 function feedback_create_template($courseid, $name, $ispublic = 0) {
-    $templ->id = '';
-    $templ->course = $courseid;
-    
-    $templ->name = addslashes($name);
-    
+    global $DB;
+
+    $templ = new object();
+    $templ->course   = $courseid;
+    $templ->name     = $name;
     $templ->ispublic = $ispublic;
-    return insert_record('feedback_template', $templ);
+
+    return $DB->insert_record('feedback_template', $templ);
 }
 
 /** 
@@ -534,22 +540,21 @@ function feedback_create_template($courseid, $name, $ispublic = 0) {
  *  @return boolean
  */
 function feedback_save_as_template($feedback, $name, $ispublic = 0) {
-    $feedbackitems = get_records('feedback_item', 'feedback', $feedback->id);
-    if(!is_array($feedbackitems)){
+    global $DB;
+
+    if (!$feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id))) {
         return false;
     }
     
-    if(!$newtempl = feedback_create_template($feedback->course, $name, $ispublic)) {
+    if (!$newtempl = feedback_create_template($feedback->course, $name, $ispublic)) {
         return false;
     }
     //create items of this new template
     foreach($feedbackitems as $item) {
-        $item->id = '';
+        unset($item->id);
         $item->feedback = 0;
-        $item->template = $newtempl;
-        $item->name = addslashes($item->name);
-        $item->presentation = addslashes($item->presentation);
-        insert_record('feedback_item', $item);
+        $item->template     = $newtempl;
+        $DB->insert_record('feedback_item', $nitem);
     }
     return true;
 }
@@ -560,8 +565,10 @@ function feedback_save_as_template($feedback, $name, $ispublic = 0) {
  *  @return void
  */
 function feedback_delete_template($id) {
-    @delete_records("feedback_item", "template", $id);
-    @delete_records("feedback_template", "id", $id);
+    global $DB;
+
+    $DB->delete_records("feedback_item", array("template"=>$id));
+    $DB->delete_records("feedback_template", array("id"=>$id));
 }
 
 /** 
@@ -573,39 +580,40 @@ function feedback_delete_template($id) {
  *  @param boolean $deleteold
  */
 function feedback_items_from_template($feedback, $templateid, $deleteold = false) {
+    global $DB;
+
     //get all templateitems
-    if(!$templitems = get_records('feedback_item', 'template', $templateid)) {
+    if(!$templitems = $DB->get_records('feedback_item', array('template'=>$templateid))) {
         return false;
     }
     
     //if deleteold then delete all old items before
     //get all items
     if($deleteold) {
-        if($feedbackitems = get_records('feedback_item', 'feedback', $feedback->id)){
+        if($feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id))) {
             //delete all items of this feedback
             foreach($feedbackitems as $item) {
                 feedback_delete_item($item->id, false);
             }
             //delete tracking-data
-            @delete_records('feedback_tracking', 'feedback', $feedback->id);
-            @delete_records('feedback_completed', 'feedback', $feedback->id);
-            @delete_records('feedback_completedtmp', 'feedback', $feedback->id);
+            $DB->delete_records('feedback_tracking', array('feedback'=>$feedback->id));
+            $DB->delete_records('feedback_completed', array('feedback'=>$feedback->id));
+            $DB->delete_records('feedback_completedtmp', array('feedback'=>$feedback->id));
             $positionoffset = 0;
         }
-    }else {
+    } else {
         //if the old items are kept the new items will be appended
         //therefor the new position has an offset
-        $positionoffset = count_records('feedback_item', 'feedback', $feedback->id);
+        $positionoffset = $DB->count_records('feedback_item', array('feedback'=>$feedback->id));
     }
     
     foreach($templitems as $newitem) {
-        $newitem->id = '';
+        unset($newitem->id);
         $newitem->feedback = $feedback->id;
         $newitem->template = 0;
-        $newitem->name = addslashes($newitem->name);
-        $newitem->presentation = addslashes($newitem->presentation);
         $newitem->position = $newitem->position + $positionoffset;
-        insert_record('feedback_item', $newitem);
+
+        $DB->insert_record('feedback_item', $newitem);
     }
 }
 
@@ -618,10 +626,12 @@ function feedback_items_from_template($feedback, $templateid, $deleteold = false
  *  @return array the template recordsets
  */
 function feedback_get_template_list($course, $onlyown = false) {
-    if($onlyown) {
-        $templates = get_records('feedback_template', 'course', $course->id);
+    global $DB;
+
+    if ($onlyown) {
+        $templates = $DB->get_records('feedback_template', array('course'=>$course->id));
     } else {
-        $templates = get_records_select('feedback_template', 'course = ' . $course->id . ' OR ispublic = 1');
+        $templates = $DB->get_records_select('feedback_template', 'course = ? OR ispublic = 1', array($course->id));
     }
     return $templates;
 }
@@ -678,9 +688,10 @@ function feedback_load_feedback_items_options() {
  *  @return int the new itemid
  */
 function feedback_create_item($data) {
+    global $DB;
+
     $item = new object;
-    $item->id = '';
-    $item->feedback = intval($data->feedbackid);
+    $item->feedback = $data->feedbackid;
 
     $item->template=0;
     if (isset($data->templateid)) {
@@ -688,13 +699,13 @@ function feedback_create_item($data) {
     }    
 
     $itemname = trim($data->itemname);
-    $item->name = addslashes($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
+    $item->name = ($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
     
     //get the used class from item-typ
     $itemclass = 'feedback_item_'.$data->typ;
     //get the instance of the item class
     $itemobj = new $itemclass();
-    $item->presentation = addslashes($itemobj->get_presentation($data));
+    $item->presentation = $itemobj->get_presentation($data);
     
     $item->hasvalue = $itemobj->get_hasvalue();
     
@@ -706,7 +717,7 @@ function feedback_create_item($data) {
 	    	$item->required=$data->required;
     }    
 
-    return insert_record('feedback_item', $item);
+    return $DB->insert_record('feedback_item', $item);
 }
 
 /** 
@@ -716,26 +727,28 @@ function feedback_create_item($data) {
  *  @return boolean
  */
 function feedback_update_item($item, $data = null){
+    global $DB;
+
     if($data != null){
         $itemname = trim($data->itemname);
-        $item->name = addslashes($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
+        $item->name = ($itemname ? $data->itemname : get_string('no_itemname', 'feedback'));
     
         //get the used class from item-typ
         $itemclass = 'feedback_item_'.$data->typ;
         //get the instance of the item class
         $itemobj = new $itemclass();
-        $item->presentation = addslashes($itemobj->get_presentation($data));
+        $item->presentation = $itemobj->get_presentation($data);
 
         $item->required=0;
         if (isset($data->required)) {
 	    	$item->required=$data->required;
         } 
     }else {
-        $item->name = addslashes($item->name);
-        $item->presentation = addslashes($item->presentation);
+        $item->name = $item->name;
+        $item->presentation = $item->presentation;
     }
 
-    return update_record("feedback_item", $item);
+    return $DB->update_record("feedback_item", $item);
 }
 
 /** 
@@ -745,10 +758,12 @@ function feedback_update_item($item, $data = null){
  *  @return void
  */
 function feedback_delete_item($itemid, $renumber = true){
-    $item = get_record('feedback_item', 'id', $itemid);
-    @delete_records("feedback_value", "item", $itemid);
-    @delete_records("feedback_valuetmp", "item", $itemid);
-    delete_records("feedback_item", "id", $itemid);
+    global $DB;
+
+    $item = $DB->get_record('feedback_item', array('id'=>$itemid));
+    $DB->delete_records("feedback_value", array("item"=>$itemid));
+    $DB->delete_records("feedback_valuetmp", array("item"=>$itemid));
+    $DB->delete_records("feedback_item", array("id"=>$itemid));
     if($renumber) {
         feedback_renumber_items($item->feedback);
     }
@@ -760,14 +775,16 @@ function feedback_delete_item($itemid, $renumber = true){
  *  @return void
  */
 function feedback_delete_all_items($feedbackid){
-    if(!$items = get_records('feedback_item', 'feedback', $feedbackid)) {
+    global $DB;
+
+    if(!$items = $DB->get_records('feedback_item', array('feedback'=>$feedbackid))) {
         return;
     }
     foreach($items as $item) {
         feedback_delete_item($item->id, false);
     }
-    @delete_records('feedback_completedtmp', 'feedback', $feedbackid);
-    @delete_records('feedback_completed', 'feedback', $feedbackid);
+    $DB->delete_records('feedback_completedtmp', array('feedback'=>$feedbackid));
+    $DB->delete_records('feedback_completed', array('feedback'=>$feedbackid));
 }
 
 /** 
@@ -776,14 +793,16 @@ function feedback_delete_all_items($feedbackid){
  *  @return boolean
  */
 function feedback_switch_item_required($item) {
+    global $DB;
+
     if($item->required == 1) {
         $item->required = 0;
     } else {
         $item->required = 1;
     }
-    $item->name = addslashes($item->name);
-    $item->presentation = addslashes($item->presentation);
-    return update_record('feedback_item', $item);
+    $item->name = $item->name;
+    $item->presentation = $item->presentation;
+    return $DB->update_record('feedback_item', $item);
 }
 
 /** 
@@ -792,7 +811,9 @@ function feedback_switch_item_required($item) {
  *  @return void
  */
 function feedback_renumber_items($feedbackid){
-    $items = get_records('feedback_item', 'feedback', $feedbackid, 'position');
+    global $DB;
+
+    $items = $DB->get_records('feedback_item', array('feedback'=>$feedbackid), 'position');
     $pos = 1;
     if($items) {
         foreach($items as $item){
@@ -809,8 +830,10 @@ function feedback_renumber_items($feedbackid){
  *  @return void
  */
 function feedback_moveup_item($item){
+    global $DB;
+
     if($item->position == 1) return;
-    $item_before = get_record_select('feedback_item', 'feedback = '.$item->feedback.' AND position = '.$item->position . ' - 1');
+    $item_before = $DB->get_record('feedback_item', array('feedback'=>$item->feedback, 'position'=>$item->position-1));
     $item_before->position = $item->position;
     $item->position--;
     feedback_update_item($item_before);
@@ -823,8 +846,9 @@ function feedback_moveup_item($item){
  *  @return void
  */
 function feedback_movedown_item($item){
-    if(!$item_after = get_record_select('feedback_item', 'feedback = '.$item->feedback.' AND position = '.$item->position . ' + 1'))
-    {
+    global $DB;
+
+    if(!$item_after = $DB->get_record('feedback_item', array('feedback'=>$item->feedback, 'position'=>$item->position+1))) {
         return;
     }
     
@@ -841,11 +865,15 @@ function feedback_movedown_item($item){
  *  @return boolean
  */
 function feedback_move_item($moveitem, $pos){
-    if($moveitem->position == $pos) return true;
-    if(!$allitems = get_records('feedback_item', 'feedback', $moveitem->feedback, 'position')){
+    global $DB;
+
+    if ($moveitem->position == $pos) {
+        return true;
+    }
+    if (!$allitems = $DB->get_records('feedback_item', array('feedback'=>$moveitem->feedback), 'position')) {
         return false;
     }
-    if(is_array($allitems)) {
+    if (is_array($allitems)) {
         $index = 1;
         foreach($allitems as $item) {
             if($item->id == $moveitem->id) continue; //the moving item is handled special
@@ -896,27 +924,28 @@ function feedback_print_item($item, $value = false, $readonly = false, $edit = f
  *  @param object $feedbackcompleted
  *  @return object temporary saved completed-record
  */
-function feedback_set_tmp_values($feedbackcompleted){
+function feedback_set_tmp_values($feedbackcompleted) {
+    global $DB;
+
     //first we create a completedtmp
     $tmpcpl = new object();
     foreach($feedbackcompleted as $key => $value) {
         $tmpcpl->{$key} = $value;
     }
     // $tmpcpl = $feedbackcompleted;
-    $tmpcpl->id = '';
+    unset($tmpcpl->id);
     $tmpcpl->timemodified = time();
-    if(!$tmpcpl->id = insert_record('feedback_completedtmp', $tmpcpl)) {
+    if(!$tmpcpl->id = $DB->insert_record('feedback_completedtmp', $tmpcpl)) {
         error('failed create completedtmp');
     }
     //get all values of original-completed
-    if(!$values = get_records('feedback_value', 'completed', $feedbackcompleted->id)) {
+    if(!$values = $DB->get_records('feedback_value', array('completed'=>$feedbackcompleted->id))) {
         return;
     }
     foreach($values as $value) {
-        $value->id = '';
+        unset($value->id);
         $value->completed = $tmpcpl->id;
-        $value->value = addslashes($value->value);
-        insert_record('feedback_valuetmp', $value);
+        $DB->insert_record('feedback_valuetmp', $value);
     }
     return $tmpcpl;
 }
@@ -929,6 +958,8 @@ function feedback_set_tmp_values($feedbackcompleted){
  *  @return int the id of the completed
  */
 function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $userid) {
+    global $DB;
+
     $tmpcplid = $feedbackcompletedtmp->id;
     if(!$feedbackcompleted) {
 
@@ -938,45 +969,46 @@ function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $us
             $newcpl->{$key} = $value;
         }
 
-        $newcpl->id = '';
+        unset($newcpl->id);
         $newcpl->userid = $userid;
         $newcpl->timemodified = time();
-        if(!$newcpl->id = insert_record('feedback_completed', $newcpl)) {
+        if(!$newcpl->id = $DB->insert_record('feedback_completed', $newcpl)) {
             error('failed create completed');
         }
         //get all values of tmp-completed
-        if(!$values = get_records('feedback_valuetmp', 'completed', $feedbackcompletedtmp->id)) {
+        if(!$values = $DB->get_records('feedback_valuetmp', array('completed'=>$feedbackcompletedtmp->id))) {
             return false;
         }
 
         foreach($values as $value) {
-            $value->id = '';
+            unset($value->id);
             $value->completed = $newcpl->id;
-            insert_record('feedback_value', $value);
+            $DB->insert_record('feedback_value', $value);
         }
         //drop all the tmpvalues
-        delete_records('feedback_valuetmp', 'completed', $tmpcplid);
-        delete_records('feedback_completedtmp', 'id', $tmpcplid);
+        $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
+        $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
         return $newcpl->id;
-    }else {
+
+    } else {
         //first drop all existing values
-        delete_records('feedback_value', 'completed', $feedbackcompleted->id);
+        $DB->delete_records('feedback_value', array('completed'=>$feedbackcompleted->id));
         //update the current completed
         $feedbackcompleted->timemodified = time();
-        update_record('feedback_completed', $feedbackcompleted);
+        $DB->update_record('feedback_completed', $feedbackcompleted);
         //save all the new values from feedback_valuetmp
         //get all values of tmp-completed
-        if(!$values = get_records('feedback_valuetmp', 'completed', $feedbackcompletedtmp->id)) {
+        if(!$values = $DB->get_records('feedback_valuetmp', array('completed'=>$feedbackcompletedtmp->id))) {
             return false;
         }
         foreach($values as $value) {
-            $value->id = '';
+            unset($value->id);
             $value->completed = $feedbackcompleted->id;
-            insert_record('feedback_value', $value);
+            $DB->insert_record('feedback_value', $value);
         }
         //drop all the tmpvalues
-        delete_records('feedback_valuetmp', 'completed', $tmpcplid);
-        delete_records('feedback_completedtmp', 'id', $tmpcplid);
+        $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
+        $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
         return $feedbackcompleted->id;
     }
 }
@@ -987,8 +1019,10 @@ function feedback_save_tmp_values($feedbackcompletedtmp, $feedbackcompleted, $us
  *  @return void
  */
 function feedback_delete_completedtmp($tmpcplid) {
-        delete_records('feedback_valuetmp', 'completed', $tmpcplid);
-        delete_records('feedback_completedtmp', 'id', $tmpcplid);
+    global $DB;
+
+    $DB->delete_records('feedback_valuetmp', array('completed'=>$tmpcplid));
+    $DB->delete_records('feedback_completedtmp', array('id'=>$tmpcplid));
 }
 
 ////////////////////////////////////////////////
@@ -1004,14 +1038,15 @@ function feedback_delete_completedtmp($tmpcplid) {
  *  @return mixed false if there already is a pagebreak on last position or the id of the pagebreak-item
  */
 function feedback_create_pagebreak($feedbackid) {
+    global $DB;
+
     //check if there already is a pagebreak on the last position
-    $lastposition = count_records('feedback_item', 'feedback', $feedbackid);
+    $lastposition = $DB->count_records('feedback_item', array('feedback'=>$feedbackid));
     if($lastposition == feedback_get_last_break_position($feedbackid)) {
         return false;
     }
     
     $item = new object();
-    $item->id = '';
     $item->feedback = $feedbackid;
 
     $item->template=0;
@@ -1026,7 +1061,7 @@ function feedback_create_pagebreak($feedbackid) {
 
     $item->required=0;
 
-    return insert_record('feedback_item', $item);
+    return $DB->insert_record('feedback_item', $item);
 }
 
 /** 
@@ -1059,37 +1094,41 @@ function feedback_get_last_break_position($feedbackid) {
  *  @return int the position to continue
  */
 function feedback_get_page_to_continue($feedbackid, $courseid = false, $guestid) {
-    global $CFG, $USER;
+    global $CFG, $USER, $DB;
     
     //is there any break?
     
     if(!$allbreaks = feedback_get_all_break_positions($feedbackid)) return false;
-    
+
+    $params = array();
     if($courseid) {
-        $courseselect = "fv.course_id = ".$courseid;
+        $courseselect = "fv.course_id = :courseid";
+        $params['courseid'] = $courseid;
     }else {
         $courseselect = "1";
     }
     
     if($guestid) {
-        $userselect = "AND fc.guestid = '".$guestid."'";
+        $userselect = "AND fc.guestid = :guestid";
         $usergroup = "GROUP BY fc.guestid";
+        $params['guestid'] = $guestid;
     }else {
-        $userselect = "AND fc.userid = ".$USER->id;
+        $userselect = "AND fc.userid = :userid";
         $usergroup = "GROUP BY fc.userid";
+        $params['userid'] = $USER->id;
     }
-    
-    
+
     $sql =  "SELECT MAX(fi.position)
-                FROM ".$CFG->prefix."feedback_completedtmp AS fc, ".$CFG->prefix."feedback_valuetmp AS fv, ".$CFG->prefix."feedback_item AS fi
-                WHERE fc.id = fv.completed
-                    ".$userselect."
-                    AND fc.feedback = ".$feedbackid."
-                    AND ".$courseselect."
+               FROM {feedback_completedtmp} AS fc, {feedback_valuetmp} AS fv, {feedback_item} AS fi
+              WHERE fc.id = fv.completed
+                    $userselect
+                    AND fc.feedback = :feedbackid
+                    AND $courseselect
                     AND fi.id = fv.item
-                ".$usergroup;
-    
-    $lastpos = get_field_sql($sql);
+         $usergroup";
+    $params['feedbackid'] = $feedbackid;
+
+    $lastpos = $DB->get_field_sql($sql, $params);
 
     //the index of found pagebreak is the searched pagenumber
     foreach($allbreaks as $pagenr => $br) {
@@ -1115,6 +1154,8 @@ function feedback_get_page_to_continue($feedbackid, $courseid = false, $guestid)
  *  @return mixed false on error or the completeid
  */
 function feedback_save_values($data, $usrid, $tmp = false) {
+    global $DB;
+
     $tmpstr = $tmp ? 'tmp' : '';
          $time = time(); //arb
          $timemodified = mktime(0, 0, 0, date('m', $time),date('d', $time),date('Y', $time)); //arb
@@ -1122,7 +1163,7 @@ function feedback_save_values($data, $usrid, $tmp = false) {
     if($usrid == 0) {
         return feedback_create_values($data, $usrid, $timemodified, $tmp);
     }
-    if(!$data['completedid'] or !$completed = get_record('feedback_completed'.$tmpstr, 'id', $data['completedid'])){
+    if(!$data['completedid'] or !$completed = $DB->get_record('feedback_completed'.$tmpstr, array('id'=>$data['completedid']))) {
         return feedback_create_values($data, $usrid, $timemodified, $tmp);
     }else{
         $completed->timemodified = $timemodified;
@@ -1137,8 +1178,10 @@ function feedback_save_values($data, $usrid, $tmp = false) {
  *  @return mixed false on error or the completeid
  */
 function feedback_save_guest_values($data, $guestid) {
+    global $DB;
+
     $timemodified = time();
-    if(!$completed = get_record('feedback_completedtmp', 'id', $data['completedid'])){
+    if(!$completed = $DB->get_record('feedback_completedtmp', array('id'=>$data['completedid']))) {
         return feedback_create_values($data, 0, $timemodified, true, $guestid);
     }else {
         $completed->timemodified = $timemodified;
@@ -1155,8 +1198,10 @@ function feedback_save_guest_values($data, $guestid) {
  *  @return mixed the value, the type depends on plugin-definition
  */
 function feedback_get_item_value($completedid, $itemid, $tmp = false) {
+    global $DB;
+
     $tmpstr = $tmp ? 'tmp' : '';
-    return get_field('feedback_value'.$tmpstr, 'value', 'completed', $completedid, 'item', $itemid);
+    return $DB->get_field('feedback_value'.$tmpstr, 'value', array('completed'=>$completedid, 'item'=>$itemid));
 }
 
 /** 
@@ -1170,12 +1215,15 @@ function feedback_get_item_value($completedid, $itemid, $tmp = false) {
  *  @return boolean
  */
 function feedback_check_values($data, $firstitem, $lastitem) {
+    global $DB;
+
     //get all items between the first- and lastitem
-    $select = "feedback = ".intval($data['feedbackid'])."
-                    AND position >= ".$firstitem."
-                    AND position <= ".$lastitem."
+    $select = "feedback = ?
+                    AND position >= ?
+                    AND position <= ?
                     AND hasvalue = 1";
-    if(!$feedbackitems = get_records_select('feedback_item', $select)) {
+    $params = array(intval($data['feedbackid']), $firstitem, $lastitem);
+    if(!$feedbackitems = $DB->get_records_select('feedback_item', $select, $params)) {
         //if no values are given so no values can be wrong ;-)
         return true;
     }
@@ -1219,22 +1267,22 @@ function feedback_check_values($data, $firstitem, $lastitem) {
  *  @return mixed false on error or the completedid
  */
 function feedback_create_values($data, $usrid, $timemodified, $tmp = false, $guestid = false){
+    global $DB;
+
     $tmpstr = $tmp ? 'tmp' : '';
     //first we create a new completed record
-    $completed = null;
-    $completed->id = '';
-    $completed->feedback = $data['feedbackid'];
-    $completed->userid = $usrid;
-    $completed->guestid = $guestid;
-    $completed->timemodified = $timemodified;
+    $completed = new object();
+    $completed->feedback           = $data['feedbackid'];
+    $completed->userid             = $usrid;
+    $completed->guestid            = $guestid;
+    $completed->timemodified       = $timemodified;
     $completed->anonymous_response = $data['anonymous_response'];
     
-    if(!$completedid = insert_record('feedback_completed'.$tmpstr, $completed)) {
+    if (!$completedid = $DB->insert_record('feedback_completed'.$tmpstr, $completed)) {
         return false;
     }
     
-    $completed = null;
-    $completed = get_record('feedback_completed'.$tmpstr, 'id', $completedid);
+    $completed = $DB->get_record('feedback_completed'.$tmpstr, array('id'=>$completedid));
 
     //$data includes an associative array. the keys are in the form like abc_xxx
     //with explode we make an array with(abc, xxx) and (abc=typ und xxx=itemnr)
@@ -1243,9 +1291,8 @@ function feedback_create_values($data, $usrid, $timemodified, $tmp = false, $gue
     foreach($keys as $key){
         //ensure the keys are what we want
         if(eregi('([a-z0-9]{1,})_([0-9]{1,})',$key)){            
-            $value = null;
+            $value = new object();
             $itemnr = explode('_', $key);
-            $value->id = '';
             $value->item = intval($itemnr[1]);
             $value->completed = $completed->id;
             $value->course_id = intval($data['courseid']);
@@ -1257,7 +1304,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(!insert_record('feedback_value'.$tmpstr, $value)) {
+            if (!$DB->insert_record('feedback_value'.$tmpstr, $value)) {
                 $errcount++;
             }
         }
@@ -1275,12 +1322,14 @@ function feedback_create_values($data, $usrid, $timemodified, $tmp = false, $gue
  *  @param boolean $tmp
  *  @return int the completedid
  */
-function feedback_update_values($data, $completed, $tmp = false){
+function feedback_update_values($data, $completed, $tmp = false) {
+    global $DB;
+
     $tmpstr = $tmp ? 'tmp' : '';
     
-    update_record('feedback_completed'.$tmpstr, $completed);
+    $DB->update_record('feedback_completed'.$tmpstr, $completed);
     //get the values of this completed
-    $values = get_records('feedback_value'.$tmpstr,'completed', $completed->id);
+    $values = $DB->get_records('feedback_value'.$tmpstr, array('completed'=>$completed->id));
     
     //$data includes an associative array. the keys are in the form like abc_xxx
     //with explode we make an array with(abc, xxx) and (abc=typ und xxx=itemnr)
@@ -1290,11 +1339,10 @@ function feedback_update_values($data, $completed, $tmp = false){
         if(eregi('([a-z0-9]{1,})_([0-9]{1,})',$key)){            
             //build the new value to update([id], item, completed, value)
             $itemnr = explode('_', $key);
-            $newvalue = null;
-            $newvalue->id = '';
-            $newvalue->item = intval($itemnr[1]);
+            $newvalue = new object();
+            $newvalue->item      = $itemnr[1];
             $newvalue->completed = $completed->id;
-            $newvalue->course_id = intval($data['courseid']);
+            $newvalue->course_id = $data['courseid'];
             
             //get the class of item-typ
             $itemclass = 'feedback_item_'.$itemnr[0];
@@ -1313,9 +1361,9 @@ function feedback_update_values($data, $completed, $tmp = false){
                 }
             }
             if($exist){
-                update_record('feedback_value'.$tmpstr, $newvalue);
+                $DB->update_record('feedback_value'.$tmpstr, $newvalue);
             }else {
-                insert_record('feedback_value'.$tmpstr, $newvalue);
+                $DB->insert_record('feedback_value'.$tmpstr, $newvalue);
             }
             
         }
@@ -1333,26 +1381,27 @@ function feedback_update_values($data, $completed, $tmp = false){
  *  @return array the value-records
  */
 function feedback_get_group_values($item, $groupid = false, $courseid = false){
-    global $CFG;
+    global $CFG, $DB;
 
     //if the groupid is given?
-    if(intval($groupid) > 0) {
+    if (intval($groupid) > 0) {
         $query = 'SELECT fbv .  *
-                        FROM '.$CFG->prefix . 'feedback_value AS fbv, '.$CFG->prefix . 'feedback_completed AS fbc, '.$CFG->prefix . 'groups_members AS gm
-                        WHERE fbv.item = '.$item->id . '
-                             AND fbv.completed = fbc.id 
-                             AND fbc.userid = gm.userid 
-                             AND gm.groupid = '.$groupid . '
-                        ORDER BY fbc.timemodified';
-        $values = get_records_sql($query);
-    }else {
+                    FROM {feedback_value} AS fbv, {feedback_completed} AS fbc, {groups_members} AS gm
+                   WHERE fbv.item = ?
+                         AND fbv.completed = fbc.id 
+                         AND fbc.userid = gm.userid 
+                         AND gm.groupid = ?
+                ORDER BY fbc.timemodified';
+        $values = $DB->get_records_sql($query, array($item->id, $groupid));
+
+    } else {
         if ($courseid) {
-             $values = get_records_select('feedback_value', "item = '$item->id' and course_id = '$courseid'");
+             $values = $DB->get_records('feedback_value', array('item'=>$item->id, 'course_id'=>$courseid));
         } else {
-             $values = get_records('feedback_value', 'item', $item->id);
+             $values = $DB->get_records('feedback_value', array('item'=>$item->id));
         }
     }    
-    if(get_field('feedback', 'anonymous', 'id', $item->feedback) == FEEDBACK_ANONYMOUS_YES) {
+    if ($DB->get_field('feedback', 'anonymous', array('id'=>$item->feedback)) == FEEDBACK_ANONYMOUS_YES) {
         if(is_array($values))
             shuffle($values);
     }
@@ -1393,36 +1442,42 @@ function feedback_is_already_submitted($feedbackid, $courseid = false) {
  *  return int the id of the found completed
  */
 function feedback_get_current_completed($feedbackid, $tmp = false, $courseid = false, $guestid = false) {
-    global $USER, $CFG;
+    global $USER, $CFG, $DB;
     
     $tmpstr = $tmp ? 'tmp' : '';
     
     if(!$courseid) {
         if($guestid) {
-            return get_record('feedback_completed'.$tmpstr,'feedback', $feedbackid, 'guestid', $guestid);
+            return $DB->get_record('feedback_completed'.$tmpstr, array('feedback'=>$feedbackid, 'guestid'=>$guestid));
         }else {
-            return get_record('feedback_completed'.$tmpstr,'feedback', $feedbackid, 'userid', $USER->id);
+            return $DB->get_record('feedback_completed'.$tmpstr, array('feedback'=>$feedbackid, 'userid'=>$USER->id));
         }
     }
     
-    $courseid = intval($courseid);
+    $params = array();
     
-    if($guestid) {
-        $userselect = "AND fc.guestid = '".$guestid."'";
+    if ($guestid) {
+        $userselect = "AND fc.guestid = :guestid";
+        $params['guestid'] = $guestid;
     }else {
-        $userselect = "AND fc.userid = ".$USER->id;
+        $userselect = "AND fc.userid = :userid";
+        $params['userid'] = $USER->id;
     }
     //if courseid is set the feedback is global. there can be more than one completed on one feedback
-    $sql =  "SELECT fc.* FROM
-                    ".$CFG->prefix."feedback_value".$tmpstr." AS fv, ".$CFG->prefix."feedback_completed".$tmpstr." AS fc
-                WHERE fv.course_id = ".$courseid."
+    $sql =  "SELECT fc.*
+               FROM {feedback_value{$tmpstr}} AS fv, {feedback_completed{$tmpstr}} AS fc
+              WHERE fv.course_id = :courseid
                     AND fv.completed = fc.id
-                    ".$userselect."
-                    AND fc.feedback = ".$feedbackid;
+                    $userselect
+                    AND fc.feedback = :feedbackid";
+    $params['courseid']   = intval($courseid);
+    $params['feedbackid'] = $feedbackid;
 
-    if(!$sqlresult = get_records_sql($sql)) return false;
+    if (!$sqlresult = $DB->get_records_sql($sql)) {
+        return false;
+    }
     foreach($sqlresult as $r) {
-        return get_record('feedback_completed'.$tmpstr, 'id', $r->id);
+        return $DB->get_record('feedback_completed'.$tmpstr, array('id'=>$r->id));
     }
 }
 
@@ -1433,20 +1488,25 @@ function feedback_get_current_completed($feedbackid, $tmp = false, $courseid = f
  *  @return mixed array of found completeds otherwise false
  */
 function feedback_get_completeds_group($feedback, $groupid = false) {
-    global $CFG;
-    if(intval($groupid) > 0){
-        $query = 'SELECT fbc.*
-                        FROM '.$CFG->prefix . 'feedback_completed AS fbc, '.$CFG->prefix . 'groups_members AS gm
-                        WHERE  fbc.feedback = '.$feedback->id . '
-                            AND gm.groupid = '.$groupid . '
-                            AND fbc.userid = gm.userid';
-        if($values = get_records_sql($query)) {
+    global $CFG, $DB;
+
+    if (intval($groupid) > 0){
+        $query = "SELECT fbc.*
+                    FROM {feedback_completed} AS fbc, {groups_members} AS gm
+                   WHERE fbc.feedback = ?
+                         AND gm.groupid = ?
+                         AND fbc.userid = gm.userid";
+        if ($values = $DB->get_records_sql($query, array($feedback->id, $groupid))) {
             return $values;
-        }else {return false;}
-    }else {
-        if($values = get_records('feedback_completed', 'feedback', $feedback->id)){
+        } else {
+            return false;
+        }
+    } else {
+        if ($values = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id))) {
             return $values;
-        }else{return false;}
+        } else {
+            return false;
+        }
     }
 }
 
@@ -1458,13 +1518,14 @@ function feedback_get_completeds_group($feedback, $groupid = false) {
  *  @return mixed count of completeds or false
  */
 function feedback_get_completeds_group_count($feedback, $groupid = false, $courseid = false) {
-    global $CFG;
-    if($courseid > 0 AND !$groupid <= 0) {
-        $sql = 'SELECT id, COUNT( item ) ci
-                    FROM  '.$CFG->prefix . 'feedback_value 
-                    WHERE  course_id  = '.$courseid.'
-                    GROUP  BY  item ORDER BY ci DESC';
-        if($foundrecs = get_records_sql($sql)) {
+    global $CFG, $DB;
+
+    if ($courseid > 0 AND !$groupid <= 0) {
+        $sql = "SELECT id, COUNT(item) AS ci
+                  FROM {feedback_value} 
+                 WHERE course_id  = ?
+              GROUP BY item ORDER BY ci DESC";
+        if ($foundrecs = $DB->get_records_sql($sql, array($courseid))) {
             $foundrecs = array_values($foundrecs);
             return $foundrecs[0]->ci;
         }
@@ -1501,7 +1562,11 @@ function feedback_get_groupid($course, $cm) {
  *  @return void
  */
 function feedback_delete_all_completeds($feedbackid) {
-    if(!$completeds = get_records('feedback_completed', 'feedback', $feedbackid)) return;
+    global $DB;
+
+    if (!$completeds = $DB->get_records('feedback_completed', array('feedback'=>$feedbackid))) {
+        return;
+    }
     foreach($completeds as $completed) {
         feedback_delete_completed($completed->id);
     }
@@ -1514,19 +1579,21 @@ function feedback_delete_all_completeds($feedbackid) {
  *  @return boolean
  */
 function feedback_delete_completed($completedid) {
-    if(!$completed = get_record('feedback_completed', 'id', $completedid)) {
+    global $DB;
+
+    if (!$completed = $DB->get_record('feedback_completed', array('id'=>$completedid))) {
         return false;
     }
     //first we delete all related values
-    @delete_records('feedback_value', 'completed', $completed->id);
+    $DB->delete_records('feedback_value', array('completed'=>$completed->id));
     
     //now we delete all tracking data
-    if($tracking = get_record_select('feedback_tracking', " completed = ".$completed->id." AND feedback = ".$completed->feedback." ")) {
-        @delete_records('feedback_tracking', 'completed', $completed->id);
+    if($tracking = $DB->get_record('feedback_tracking', array('completed'=>$completed->id, 'feedback'=>$completed->feedback))) {
+        $DB->delete_records('feedback_tracking', array('completed'=>$completed->id));
     }
         
     //last we delete the completed-record
-    return delete_records('feedback_completed', 'id', $completed->id);
+    return $DB->delete_records('feedback_completed', array('id'=>$completed->id));
 }
 
 ////////////////////////////////////////////////
@@ -1542,8 +1609,8 @@ function feedback_delete_completed($completedid) {
  *  @return int the count of records
  */
 function feedback_is_course_in_sitecourse_map($feedbackid, $courseid) {
-    global $CFG;
-    return count_records('feedback_sitecourse_map', 'feedbackid', $feedbackid, 'courseid', $courseid);
+    global $DB;
+    return $DB->count_records('feedback_sitecourse_map', array('feedbackid'=>$feedbackid, 'courseid'=>$courseid));
 }
 
 /** 
@@ -1552,8 +1619,8 @@ function feedback_is_course_in_sitecourse_map($feedbackid, $courseid) {
  *  @return boolean
  */
 function feedback_is_feedback_in_sitecourse_map($feedbackid) {
-    global $CFG;
-    return record_exists('feedback_sitecourse_map', 'feedbackid', $feedbackid);
+    global $Db;
+    return $DB->record_exists('feedback_sitecourse_map', array('feedbackid'=>$feedbackid));
 }
 
 /** 
@@ -1566,35 +1633,35 @@ function feedback_is_feedback_in_sitecourse_map($feedbackid) {
  *  @return array the feedback-records
  */
 function feedback_get_feedbacks_from_sitecourse_map($courseid) {
-    global $CFG;
+    global $DB;
     
     //first get all feedbacks listed in sitecourse_map with named courseid
-    $sql = "SELECT f.id as id, cm.id as cmid, f.name as name, f.timeopen as timeopen, f.timeclose as timeclose
-              FROM {$CFG->prefix}feedback f, {$CFG->prefix}course_modules cm, {$CFG->prefix}feedback_sitecourse_map sm, {$CFG->prefix}modules m
-              WHERE f.id = cm.instance
-                AND f.course = '".SITEID."'
-                AND m.id = cm.module 
-                AND m.name = 'feedback'
-                AND sm.courseid = $courseid 
-                AND sm.feedbackid = f.id";
+    $sql = "SELECT f.id AS id, cm.id AS cmid, f.name AS name, f.timeopen AS timeopen, f.timeclose AS timeclose
+              FROM {feedback} f, {course_modules} cm, {feedback_sitecourse_map} sm, {modules} m
+             WHERE f.id = cm.instance
+                   AND f.course = '".SITEID."'
+                   AND m.id = cm.module 
+                   AND m.name = 'feedback'
+                   AND sm.courseid = ? 
+                   AND sm.feedbackid = f.id";
     
-    if(!$feedbacks1 = get_records_sql($sql)) {
+    if (!$feedbacks1 = $DB->get_records_sql($sql, array($courseid))) {
         $feedbacks1 = array();
     }
     
     //second get all feedbacks not listed in sitecourse_map
     $feedbacks2 = array();
-    $sql = "SELECT f.id as id, cm.id as cmid, f.name as name, f.timeopen as timeopen, f.timeclose as timeclose
-              FROM {$CFG->prefix}feedback f, {$CFG->prefix}course_modules cm, {$CFG->prefix}modules m
-              WHERE f.id = cm.instance
-                AND f.course = '".SITEID."'
-                AND m.id = cm.module
-                AND m.name = 'feedback'";
-    if(!$allfeedbacks = get_records_sql($sql)) {
+    $sql = "SELECT f.id AS id, cm.id AS cmid, f.name AS name, f.timeopen AS timeopen, f.timeclose AS timeclose
+              FROM {feedback} f, {course_modules} cm, {modules} m
+             WHERE f.id = cm.instance
+                   AND f.course = '".SITEID."'
+                   AND m.id = cm.module
+                   AND m.name = 'feedback'";
+    if (!$allfeedbacks = $DB->get_records_sql($sql)) {
         $allfeedbacks = array();
     }
     foreach($allfeedbacks as $a) {
-        if(!record_exists('feedback_sitecourse_map', 'feedbackid', $a->id)) {
+        if(!$DB->record_exists('feedback_sitecourse_map', array('feedbackid'=>$a->id))) {
             $feedbacks2[] = $a;
         }
     }
@@ -1609,15 +1676,15 @@ function feedback_get_feedbacks_from_sitecourse_map($courseid) {
  *  @return array the course-records
  */
 function feedback_get_courses_from_sitecourse_map($feedbackid) {
-    global $CFG;
+    global $DB;
     
-    $sql = "select f.id, f.courseid, c.fullname, c.shortname
-                from {$CFG->prefix}feedback_sitecourse_map f, {$CFG->prefix}course c
-                where c.id = f.courseid
-                and f.feedbackid = $feedbackid
-                order by c.fullname";
+    $sql = "SELECT f.id, f.courseid, c.fullname, c.shortname
+              FROM {feedback_sitecourse_map} f, {course} c
+             WHERE c.id = f.courseid
+                   AND f.feedbackid = ?
+          ORDER BY c.fullname";
     
-    return get_records_sql($sql);
+    return $DB->get_records_sql($sql, array($feedbackid));
     
 }
 
@@ -1628,14 +1695,16 @@ function feedback_get_courses_from_sitecourse_map($feedbackid) {
  *  @return void
  */
 function feedback_clean_up_sitecourse_map() {
-    $maps = get_records('feedback_sitecourse_map');
+    global $DB;
+
+    $maps = $DB->get_records('feedback_sitecourse_map');
     foreach($maps as $map) {
-        if(!get_record('course', 'id', $map->courseid)) {
-            delete_records('feedback_sitecourse_map', 'courseid', $map->courseid, 'feedbackid', $map->feedbackid);
+        if (!$DB->get_record('course', array('id'=>$map->courseid))) {
+            $DB->delete_records('feedback_sitecourse_map', array('courseid'=>$map->courseid, 'feedbackid'=>$map->feedbackid));
             continue;
         }
-        if(!get_record('feedback', 'id', $map->feedbackid)) {
-            delete_records('feedback_sitecourse_map', 'courseid', $map->courseid, 'feedbackid', $map->feedbackid);
+        if (!$DB->get_record('feedback', array('id'=>$map->feedbackid))) {
+            $DB->delete_records('feedback_sitecourse_map', array('courseid'=>$map->courseid, 'feedbackid'=>$map->feedbackid));
             continue;
         }
         
@@ -1682,7 +1751,7 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
         return;
     }
     
-    $user = get_record('user', 'id', $userid);
+    $user = $DB->get_record('user', array('id'=>$userid));
     
     if (groupmode($course, $cm) == SEPARATEGROUPS) {    // Separate groups are being used
         $groups = $DB->get_records_sql_menu("SELECT g.name, g.id
@@ -1706,7 +1775,7 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
         $printusername = $feedback->anonymous == FEEDBACK_ANONYMOUS_NO ? fullname($user) : get_string('anonymous_user', 'feedback');
         
         foreach ($teachers as $teacher) {
-            unset($info);
+            $info = new object();
             $info->username = $printusername;
             $info->feedback = format_string($feedback->name,true);
             $info->url = $CFG->wwwroot.'/mod/feedback/show_entries.php?id='.$cm->id.'&userid='.$userid.'&do_show=showentries';
@@ -1732,7 +1801,6 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
  *  @return void
  */
 function feedback_send_email_anonym($cm, $feedback, $course) {
-    
     global $CFG;
     
     if ($feedback->email_notification == 0) {             // No need to do anything
@@ -1749,7 +1817,7 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
         $printusername = get_string('anonymous_user', 'feedback');
         
         foreach ($teachers as $teacher) {
-            unset($info);
+            $info = new object();
             $info->username = $printusername;
             $info->feedback = format_string($feedback->name,true);
             $info->url = $CFG->wwwroot.'/mod/feedback/show_entries_anonym.php?id='.$cm->id;
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index aab310cedf9..9ba95bc5a0c 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -29,11 +29,11 @@
             error("Course Module ID was incorrect");
         }
     
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
         
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -49,8 +49,10 @@
         $map->feedbackid = $feedback->id;
         $map->courseid = $coursefilter;
         // insert a map only if it does exists yet
-        $sql = "select id, feedbackid from {$CFG->prefix}feedback_sitecourse_map where feedbackid = $map->feedbackid and courseid = $map->courseid";
-        if (!get_records_sql($sql) && !insert_record('feedback_sitecourse_map', $map)) {
+        $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)) {
             error("Database problem, unable to map feedback = $feedback->id to course = $course->id");
         }
     }
@@ -64,7 +66,7 @@
     // if ($course->category) {
         // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$course->id).'">'.$course->shortname.'</a> ->';
     // }else if ($courseid > 0 AND $courseid != SITEID) {
-        // $usercourse = get_record('course', 'id', $courseid);
+        // $usercourse = $DB->get_record('course', array('id'=>$courseid));
         // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$usercourse->id).'">'.$usercourse->shortname.'</a> ->';
         // $feedbackindex = '';
     // }
diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index 7a452c4ef00..e4c9a3aa332 100644
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -20,11 +20,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -59,7 +59,7 @@
 
     feedback_print_errors();
     
-    $feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
+    $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
     if(is_array($feedbackitems)){
         $itemnr = 0;
         
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 62e91bf22f9..1673ddea4ce 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -42,11 +42,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -77,8 +77,8 @@
     ////////////////////////////////////////////////////////
     if($do_show == 'showoneentry') {
         //get the feedbackitems
-        $feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
-        $feedbackcompleted = get_record_select('feedback_completed','feedback='.$feedback->id.' AND userid='.$formdata->userid.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO); //arb
+        $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
+        $feedbackcompleted = $DB->get_record('feedback_completed', array('feedback'=>$feedback->id, 'userid'=>$formdata->userid, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO)); //arb
     }
     
     /// Print the page header
@@ -174,13 +174,13 @@
                 }
             } else{
                 echo print_string('non_anonymous_entries', 'feedback');
-                echo ' ('.count_records_select('feedback_completed', 'feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO).')<hr />';
+                echo ' ('.$DB->count_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO)).')<hr />';
 
                 foreach ($students as $student){
-                    $completedCount = count_records_select('feedback_completed', 'userid = ' . $student->id . ' AND feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO);
+                    $completedCount = $DB->count_records('feedback_completed', array('userid'=>$student->id, 'feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO));
                     if($completedCount > 0) {
                      // Are we assuming that there is only one response per user? Should westep through a feedbackcompleteds? I added the addition anonymous check to the select so that only non-anonymous submissions are retrieved. 
-                        $feedbackcompleted = get_record_select('feedback_completed','feedback='.$feedback->id.' AND userid='.$student->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_NO);
+                        $feedbackcompleted = $DB->get_record('feedback_completed', array('feedback'=>$feedback->id, ' userid'=>$student->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_NO));
                     ?>
                         <table width="100%">
                             <tr>
@@ -223,7 +223,7 @@
             <table width="100%">
                 <tr>
                     <td align="left" colspan="2">
-                        <?php print_string('anonymous_entries', 'feedback');?>&nbsp;(<?php echo count_records_select('feedback_completed', 'feedback = ' . $feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES);?>)
+                        <?php print_string('anonymous_entries', 'feedback');?>&nbsp;(<?php echo $DB->count_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES));?>)
                     </td>
                     <td align="right">
                         <?php
@@ -250,7 +250,7 @@
         
         //print the items
         if(is_array($feedbackitems)){
-            $usr = get_record('user', 'id', $formdata->userid);
+            $usr = $DB->get_record('user', array('id'=>$formdata->userid));
             if($feedbackcompleted) {
                 echo '<p align="center">'.UserDate($feedbackcompleted->timemodified).'<br />('.fullname($usr).')</p>';
             } else {
@@ -264,7 +264,7 @@
             $itemnr = 0;
             foreach($feedbackitems as $feedbackitem){
                 //get the values
-                $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
+                $value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
                 echo '<tr>';
                 if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                     $itemnr++;
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 74f3e4e602f..1e94ade7f08 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -26,11 +26,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -45,18 +45,18 @@
 
     //get the completeds
     // if a new anonymous record has not been assigned a random response number
-    if ($feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND random_response=0 AND anonymous_response='.FEEDBACK_ANONYMOUS_YES, 'random_response')){ //arb
+    if ($feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'random_response'=>0, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response')){ //arb
         //then get all of the anonymous records and go through them  
-        $feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES,'id'); //arb
+        $feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'id'); //arb
         shuffle($feedbackcompleteds);
         $num = 1;
         foreach($feedbackcompleteds as $compl){
             $compl->random_response = $num;
-            update_record('feedback_completed', $compl);
+            $DB->update_record('feedback_completed', $compl);
             $num++;
         }
     }
-    $feedbackcompleteds = get_records_select('feedback_completed','feedback='.$feedback->id.' AND anonymous_response='.FEEDBACK_ANONYMOUS_YES, 'random_response'); //arb
+    $feedbackcompleteds = $DB->get_records('feedback_completed', array('feedback'=>$feedback->id, 'anonymous_response'=>FEEDBACK_ANONYMOUS_YES), 'random_response'); //arb
 
     /// Print the page header
     $strfeedbacks = get_string("modulenameplural", "feedback");
@@ -131,8 +131,8 @@
     //print the items
     if(isset($formdata->showanonym) && $formdata->showanonym == FEEDBACK_ANONYMOUS_YES) {
         //get the feedbackitems
-        $feedbackitems = get_records('feedback_item', 'feedback', $feedback->id, 'position');
-        $feedbackcompleted = get_record('feedback_completed', 'id', $formdata->completedid);
+        $feedbackitems = $DB->get_records('feedback_item', array('feedback'=>$feedback->id), 'position');
+        $feedbackcompleted = $DB->get_record('feedback_completed', array('id'=>$formdata->completedid));
         if(is_array($feedbackitems)){
             if($feedbackcompleted) {
                 echo '<p align="center">'.get_string('chosen_feedback_response', 'feedback').'<br />('.get_string('anonymous', 'feedback').')</p>';//arb
@@ -147,7 +147,7 @@
             $itemnr = 0;
             foreach($feedbackitems as $feedbackitem){
                 //get the values
-                $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
+                $value = $DB->get_record('feedback_value', array('completed'=>$feedbackcompleted->id, 'item'=>$feedbackitem->id));
                 echo '<tr>';
                 if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                     $itemnr++;
diff --git a/mod/feedback/unmapcourse.php b/mod/feedback/unmapcourse.php
index 2b73bfc2aa5..3cfd773c70f 100644
--- a/mod/feedback/unmapcourse.php
+++ b/mod/feedback/unmapcourse.php
@@ -19,11 +19,11 @@
             error("Course Module ID was incorrect");
         }
 
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
         
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -37,7 +37,7 @@
     // cleanup all lost entries after deleting courses or feedbacks
     feedback_clean_up_sitecourse_map();
 
-    if (delete_records('feedback_sitecourse_map', 'id', $cmapid)) {
+    if ($DB->delete_records('feedback_sitecourse_map', array('id'=>$cmapid))) {
         redirect (htmlspecialchars('mapcourse.php?id='.$id));
     } else {
         error('Database problem, unable to unmap');
diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index 39053ac13c0..5580922db4d 100644
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -25,11 +25,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -88,7 +88,7 @@
     // print_simple_box_end();
     print_box_end();
 
-    $templateitems = get_records('feedback_item', 'template', $templateid, 'position');
+    $templateitems = $DB->get_records('feedback_item', array('template'=>$templateid), 'position');
     if(is_array($templateitems)){
         $templateitems = array_values($templateitems);
     }
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 0190d086871..762dc167b2e 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -21,11 +21,11 @@
             error("Course Module ID was incorrect");
         }
      
-        if (! $course = get_record("course", "id", $cm->course)) {
+        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
             error("Course is misconfigured");
         }
      
-        if (! $feedback = get_record("feedback", "id", $cm->instance)) {
+        if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
             error("Course module is incorrect");
         }
     }
@@ -96,7 +96,7 @@
     }
     
     if( (intval($feedback->publish_stats) == 1) AND !( $capabilities->viewreports) ) {
-        if($multiple_count = count_records('feedback_tracking', 'userid', $USER->id, 'feedback', $feedback->id)) {
+        if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
             echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
             echo get_string('completed_feedbacks', 'feedback').'</a>';
             echo '</div>';