Index: lib/form/filemanager.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/form/filemanager.php,v
retrieving revision 1.7
diff -u -r1.7 filemanager.php
--- lib/form/filemanager.php	18 Mar 2009 08:30:13 -0000	1.7
+++ lib/form/filemanager.php	31 Mar 2009 04:29:23 -0000
@@ -161,7 +161,7 @@
         if (empty($draftitemid)) {
             // no existing area info provided - let's use fresh new draft area
             require_once("$CFG->libdir/filelib.php");
-            $this->setValue(file_get_new_draftitemid());
+            $this->setValue(file_get_new_draft_itemid());
             $draftitemid = $this->getValue();
         }
 
Index: lib/form/editor.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/form/editor.php,v
retrieving revision 1.8
diff -u -r1.8 editor.php
--- lib/form/editor.php	18 Feb 2009 02:18:06 -0000	1.8
+++ lib/form/editor.php	31 Mar 2009 04:29:23 -0000
@@ -166,7 +166,7 @@
             if (empty($draftitemid)) {
                 // no existing area info provided - let's use fresh new draft area
                 require_once("$CFG->libdir/filelib.php");
-                $this->setValue(array('itemid'=>file_get_new_draftitemid()));
+                $this->setValue(array('itemid'=>file_get_new_draft_itemid()));
                 $draftitemid = $this->_values['itemid'];
             }
             $str .= '<div><input type="hidden" name="'.$elname.'[itemid]" value="'.$draftitemid.'" /></div>';
Index: lib/filelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/filelib.php,v
retrieving revision 1.129
diff -u -r1.129 filelib.php
--- lib/filelib.php	12 Mar 2009 08:02:51 -0000	1.129
+++ lib/filelib.php	31 Mar 2009 04:29:23 -0000
@@ -73,7 +73,7 @@
  * Returns empty user upload draft area information
  * @return int draftareaid
  */
-function file_get_new_draftitemid() {
+function file_get_new_draft_itemid() {
     global $DB, $USER;
 
     if (isguestuser() or !isloggedin()) {
@@ -104,7 +104,7 @@
  * @param boolean $forcehttps force https
  * @return string text with relative links starting with @@PLUGINFILE@@
  */
-function file_prepare_draftarea(&$draftitemid, $contextid, $filearea, $itemid, $subdirs=false, $text=null, $forcehttps=false) {
+function prepare_draft_area(&$draftitemid, $contextid, $filearea, $itemid, $subdirs=false, $text=null, $forcehttps=false) {
     global $CFG, $USER;
 
     $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
@@ -112,7 +112,7 @@
 
     if (empty($draftitemid)) {
         // create a new area and copy existing files into
-        $draftitemid = file_get_new_draftitemid();
+        $draftitemid = file_get_new_draft_itemid();
         $file_record = array('contextid'=>$usercontext->id, 'filearea'=>'user_draft', 'itemid'=>$draftitemid);
         if (!is_null($itemid) and $files = $fs->get_area_files($contextid, $filearea, $itemid)) {
             foreach ($files as $file) {
@@ -131,7 +131,7 @@
     }
 
     /// relink embedded files - editor can not handle @@PLUGINFILE@@ !
-    return file_convert_relative_pluginfiles($text, 'draftfile.php', "$usercontext->id/user_draft/$draftitemid/", $forcehttps);
+    return rewrite_pluginfile_urls($text, 'draftfile.php', "$usercontext->id/user_draft/$draftitemid/", $forcehttps);
 }
 
 /**
@@ -143,13 +143,13 @@
  * @return string text with absolute links
  *
  */
-function file_convert_relative_pluginfiles($text, $file, $pluginstub, $forcehttps=false) {
+function rewrite_pluginfile_urls($text, $file, $pluginstub, $forcehttps=false) {
     global $CFG;
 
     if ($CFG->slasharguments) {
         $draftbase = "$CFG->wwwroot/$file/$pluginstub";
     } else {
-        $draftbase = "$CFG->wwwroot/draftfile.php?file=/$pluginstub";
+        $draftbase = "$CFG->wwwroot/$file?file=/$pluginstub";
     }
 
     if ($forcehttps) {
@@ -164,7 +164,7 @@
  * @param <type> $draftitemid 
  * @return array TODO: count=>n
  */
-function get_draftarea_info($draftitemid) {
+function get_draft_area_info($draftitemid) {
 
     global $CFG, $USER;
 
@@ -182,7 +182,7 @@
  * @param string $elname name of formlib editor element
  * @return int 0 if not submitted yet
  */
-function file_get_submitted_draftitemid($elname) {
+function get_submitted_draft_itemid($elname) {
     if (!empty($_REQUEST[$elname]['itemid']) and confirm_sesskey()) {
         return (int)$_REQUEST[$elname]['itemid'];
     }
@@ -200,7 +200,7 @@
  * @param boolean $forcehttps force https
  * @return string text with relative links starting with @@PLUGINFILE@@
  */
-function file_convert_draftarea($draftitemid, $contextid, $filearea, $itemid, $subdirs=false, $text=null, $forcehttps=false) {
+function save_files_from_draft_area($draftitemid, $contextid, $filearea, $itemid, $subdirs=false, $text=null, $forcehttps=false) {
     global $CFG, $USER;
 
     $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
Index: course/format/weeks/format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/format/weeks/format.php,v
retrieving revision 1.88
diff -u -r1.88 format.php
--- course/format/weeks/format.php	17 Feb 2009 16:18:05 -0000	1.88
+++ course/format/weeks/format.php	31 Mar 2009 04:29:22 -0000
@@ -126,7 +126,7 @@
         echo '<div class="summary">';
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        $summarytext = file_convert_relative_pluginfiles($thissection->summary, 'pluginfile.php', "$coursecontext->id/course_section/$thissection->id/");
+        $summarytext = rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', "$coursecontext->id/course_section/$thissection->id/");
         $summaryformatoptions = new object();
         $summaryformatoptions->noclean = true;
         echo format_text($summarytext, FORMAT_HTML, $summaryformatoptions);
Index: index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/index.php,v
retrieving revision 1.225
diff -u -r1.225 index.php
--- index.php	3 Mar 2009 01:03:56 -0000	1.225
+++ index.php	31 Mar 2009 04:29:21 -0000
@@ -146,7 +146,7 @@
             }
 
             $context = get_context_instance(CONTEXT_COURSE, SITEID);
-            $summarytext = file_convert_relative_pluginfiles($section->summary, 'pluginfile.php', "$context->id/course_section/$section->id/");
+            $summarytext = rewrite_pluginfile_urls($section->summary, 'pluginfile.php', "$context->id/course_section/$section->id/");
             $summaryformatoptions = new object();
             $summaryformatoptions->noclean = true;
 
Index: course/format/topics/format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/format/topics/format.php,v
retrieving revision 1.95
diff -u -r1.95 format.php
--- course/format/topics/format.php	17 Feb 2009 16:18:06 -0000	1.95
+++ course/format/topics/format.php	31 Mar 2009 04:29:21 -0000
@@ -136,7 +136,7 @@
         echo '<div class="summary">';
 
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        $summarytext = file_convert_relative_pluginfiles($thissection->summary, 'pluginfile.php', "$coursecontext->id/course_section/$thissection->id/");
+        $summarytext = rewrite_pluginfile_urls($thissection->summary, 'pluginfile.php', "$coursecontext->id/course_section/$thissection->id/");
         $summaryformatoptions = new object();
         $summaryformatoptions->noclean = true;
         echo format_text($summarytext, FORMAT_HTML, $summaryformatoptions);
Index: mod/forum/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
retrieving revision 1.777
diff -u -r1.777 lib.php
--- mod/forum/lib.php	26 Mar 2009 21:15:12 -0000	1.777
+++ mod/forum/lib.php	31 Mar 2009 04:29:26 -0000
@@ -2972,7 +2972,7 @@
 
     $post->course = $course->id;
     $post->forum  = $forum->id;
-    $post->message = file_convert_relative_pluginfiles($post->message, 'pluginfile.php', "$modcontext->id/forum_post/$post->id/");
+    $post->message = rewrite_pluginfile_urls($post->message, 'pluginfile.php', "$modcontext->id/forum_post/$post->id/");
 
     // caching
     if (!isset($cm->cache)) {
@@ -4136,9 +4136,9 @@
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-    $info = get_draftarea_info($post->attachments);
+    $info = get_draft_area_info($post->attachments);
     $present = ($info['filecount']>0) ? '1' : '';
-    file_convert_draftarea($post->attachments, $context->id, 'forum_attachment', $post->id, false);
+    save_files_from_draft_area($post->attachments, $context->id, 'forum_attachment', $post->id, false);
 
     $DB->set_field('forum_posts', 'attachment', $present, array('id'=>$post->id));
 
@@ -4166,7 +4166,7 @@
         return false;
     }
 
-    $message = file_convert_draftarea($post->itemid, $context->id, 'forum_post', $post->id, true, $message);
+    $message = save_files_from_draft_area($post->itemid, $context->id, 'forum_post', $post->id, true, $message);
     $DB->set_field('forum_posts', 'message', $message, array('id'=>$post->id));
     forum_add_attachment($post, $forum, $cm, $mform, $message);
 
@@ -4206,7 +4206,7 @@
         $discussion->timestart = $post->timestart;
         $discussion->timeend   = $post->timeend;
     }
-    $post->message = file_convert_draftarea($post->itemid, $context->id, 'forum_post', $post->id, true, $post->message);
+    $post->message = save_files_from_draft_area($post->itemid, $context->id, 'forum_post', $post->id, true, $post->message);
     $DB->set_field('forum_posts', 'message', $post->message, array('id'=>$post->id));
 
     if (!$DB->update_record('forum_discussions', $discussion)) {
@@ -4257,7 +4257,7 @@
         return 0;
     }
 
-    $text = file_convert_draftarea($discussion->itemid, $context->id, 'forum_post', $post->id, true, $post->message);
+    $text = save_files_from_draft_area($discussion->itemid, $context->id, 'forum_post', $post->id, true, $post->message);
     $DB->set_field('forum_posts', 'message', $text, array('id'=>$post->id));
 
     // Now do the main entry for the discussion, linking to this first post
Index: mod/forum/post.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v
retrieving revision 1.182
diff -u -r1.182 post.php
--- mod/forum/post.php	26 Mar 2009 02:52:59 -0000	1.182
+++ mod/forum/post.php	31 Mar 2009 04:29:27 -0000
@@ -459,7 +459,7 @@
 
     $mform_post = new mod_forum_post_form('post.php', array('course'=>$course, 'cm'=>$cm, 'coursecontext'=>$coursecontext, 'modcontext'=>$modcontext, 'forum'=>$forum, 'post'=>$post));
 
-    file_prepare_draftarea($draftitemid, $modcontext->id, 'forum_attachment', empty($post->id)?null:$post->id , false);
+    prepare_draft_area($draftitemid, $modcontext->id, 'forum_attachment', empty($post->id)?null:$post->id , false);
 
     //load data into form NOW!
 
@@ -496,8 +496,8 @@
         $subscribe = !empty($USER->autosubscribe);
     }
 
-    $draftid_editor = file_get_submitted_draftitemid('message');
-    $currenttext = file_prepare_draftarea($draftid_editor, $modcontext->id, 'forum_post', empty($post->id) ? null : $post->id, true, $post->message);
+    $draftid_editor = get_submitted_draft_itemid('message');
+    $currenttext = prepare_draft_area($draftid_editor, $modcontext->id, 'forum_post', empty($post->id) ? null : $post->id, true, $post->message);
     $mform_post->set_data(array(        'attachments'=>$draftitemid,
                                         'general'=>$heading,
                                         'subject'=>$post->subject,
Index: course/editsection.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/editsection.php,v
retrieving revision 1.34
diff -u -r1.34 editsection.php
--- course/editsection.php	17 Feb 2009 16:18:05 -0000	1.34
+++ course/editsection.php	31 Mar 2009 04:29:21 -0000
@@ -20,8 +20,8 @@
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
     require_capability('moodle/course:update', $context);
 
-    $draftitemid = file_get_submitted_draftitemid('summary');
-    $currenttext = file_prepare_draftarea($draftitemid, $context->id, 'course_section', $section->id, true, $section->summary);
+    $draftitemid = get_submitted_draft_itemid('summary');
+    $currenttext = prepare_draft_area($draftitemid, $context->id, 'course_section', $section->id, true, $section->summary);
     
     $mform = new editsection_form(null, $course);
     $data = array('id'=>$section->id, 'summary'=>array('text'=>$currenttext, 'format'=>FORMAT_HTML, 'itemid'=>$draftitemid));
@@ -33,7 +33,7 @@
 
     } else if ($data = $mform->get_data()) {
 
-        $text = file_convert_draftarea($data->summary['itemid'], $context->id, 'course_section', $section->id, true, $data->summary['text']);
+        $text = save_files_from_draft_area($data->summary['itemid'], $context->id, 'course_section', $section->id, true, $data->summary['text']);
         $DB->set_field("course_sections", "summary", $text, array("id"=>$section->id));
         add_to_log($course->id, "course", "editsection", "editsection.php?id=$section->id", "$section->section");
         redirect("view.php?id=$course->id");