From: skodak <skodak>
Date: Mon, 2 Jun 2008 21:25:40 +0000 (+0000)
Subject: MDL-14679 converted some insert_records()
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1829e015e6e6eb266dfc6e061f642ab022bc9706;p=moodle.git

MDL-14679 converted some insert_records()
---

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 2b59f6e8ea..51bd76faeb 100644
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -1206,7 +1206,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         $newsite->students = get_string("defaultcoursestudents");
         $newsite->timemodified = time();
         
-        if ($newid = insert_record('course', $newsite)) {
+        if ($newid = $DB->insert_record('course', $newsite)) {
             // Site created, add blocks for it
             $page = page_create_object(PAGE_COURSE_VIEW, $newid);
             blocks_repopulate_page($page); // Return value not checked because you can always edit later
@@ -1214,7 +1214,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
             $cat = new Object();
             $cat->name = get_string('miscellaneous');
             $cat->depth = 1;
-            if ($catid = insert_record('course_categories', $cat)) {
+            if ($catid = $DB->insert_record('course_categories', $cat)) {
                 // make sure category context exists
                 get_context_instance(CONTEXT_COURSECAT, $catid);
                 mark_context_dirty('/'.SYSCONTEXTID);
diff --git a/admin/mnet/adminlib.php b/admin/mnet/adminlib.php
index 11885f5a00..c2308faedb 100644
--- a/admin/mnet/adminlib.php
+++ b/admin/mnet/adminlib.php
@@ -104,7 +104,7 @@ function mnet_get_functions($type, $parentname) {
             $dataobject->enabled = $record_exists->enabled;
             $DB->update_record('mnet_rpc', $dataobject);
         } else {
-            $dataobject->id = insert_record('mnet_rpc', $dataobject, true);
+            $dataobject->id = $DB->insert_record('mnet_rpc', $dataobject, true);
         }
 
         foreach($servicearray as $service) {
@@ -114,7 +114,7 @@ function mnet_get_functions($type, $parentname) {
                 $serviceobj->name        = $service['name'];
                 $serviceobj->apiversion  = $service['apiversion'];
                 $serviceobj->offer       = 1;
-                $serviceobj->id          = insert_record('mnet_service', $serviceobj, true);
+                $serviceobj->id          = $DB->insert_record('mnet_service', $serviceobj, true);
             }
 
             if (false == $DB->get_record('mnet_service2rpc', array('rpcid'=>$dataobject->id, 'serviceid'=>$serviceobj->id))) {
diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index f2971a9a97..bc43e9371a 100644
--- a/admin/mnet/enr_course_enrol.php
+++ b/admin/mnet/enr_course_enrol.php
@@ -148,7 +148,7 @@
 
         if ($user->wehaverecord == 0) {
             $dataobj->enroltime = $all_enrolled_users[$user->username]['timemodified'];
-            $dataobj->id = insert_record('mnet_enrol_assignments', $dataobj);
+            $dataobj->id = $DB->insert_record('mnet_enrol_assignments', $dataobj);
         } elseif (array_key_exists($user->username, $all_enrolled_users)) {
             $dataobj->id    = $user->enrolid;
             $DB->update_record('mnet_enrol_assignments', $dataobj);
diff --git a/course/request.php b/course/request.php
index 28e5a56d8c..752c4c43f6 100644
--- a/course/request.php
+++ b/course/request.php
@@ -33,10 +33,10 @@
 
         redirect($CFG->wwwroot);
 
-    }elseif ($data = $requestform->get_data()) {
+    }elseif ($data = $requestform->get_data(false)) {
         $data->requester = $USER->id;
 
-        if (insert_record('course_request', $data)) {
+        if ($DB->insert_record('course_request', $data)) {
             notice(get_string('courserequestsuccess'));
         } else {
             notice(get_string('courserequestfailed'));
diff --git a/search/indexlib.php b/search/indexlib.php
index 8f76c47039..44168750af 100644
--- a/search/indexlib.php
+++ b/search/indexlib.php
@@ -229,18 +229,19 @@ class IndexDBControl {
         }
                 
         // object to insert into db
+        $doc = new object();
         $doc->doctype   = $document->doctype;
         $doc->docid     = $document->docid;
         $doc->itemtype  = $document->itemtype;
-        $doc->title     = search_escape_string($document->title);
-        $doc->url       = search_escape_string($document->url);
+        $doc->title     = $document->title;
+        $doc->url       = $document->url;
         $doc->updated   = time();
         $doc->docdate   = $document->date;
         $doc->courseid  = $document->course_id;
         $doc->groupid   = $document->group_id;
         
         //insert summary into db
-        $id = insert_record(SEARCH_DATABASE_TABLE, $doc);
+        $id = $DB->insert_record(SEARCH_DATABASE_TABLE, $doc);
         
         return $id;
     } 
diff --git a/user/profile/index.php b/user/profile/index.php
index 61acf9facb..93f940092f 100644
--- a/user/profile/index.php
+++ b/user/profile/index.php
@@ -97,11 +97,11 @@ admin_externalpage_print_header();
 print_heading(get_string('profilefields', 'admin'));
 
 /// Check that we have at least one category defined
-if (count_records('user_info_category') == 0) {
+if ($DB->count_records('user_info_category') == 0) {
     $defaultcategory = new object();
     $defaultcategory->name = $strdefaultcategory;
     $defaultcategory->sortorder = 1;
-    insert_record('user_info_category', $defaultcategory);
+    $DB->insert_record('user_info_category', $defaultcategory);
     redirect($redirect);
 }