From a2714c13f3b520bc41559c07b8f304e412ca1ec1 Mon Sep 17 00:00:00 2001
From: michaelpenne <michaelpenne>
Date: Thu, 26 May 2005 23:41:50 +0000
Subject: [PATCH] now creates lesson directory in moddata for the images.  also
 supports the different slasharguments for files

---
 mod/lesson/importppt.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index d16f37f2eae..d1f8231a38c 100644
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -162,23 +162,30 @@ function extract_data($pages, $courseid, $lessonname) {
     
     global $CFG;
     global $matches;
-    
+
     $extratedpages = array();
     
     // directory for images
-    make_mod_upload_directory($courseid); // we store our images in a subfolder in here
-
-    $imagedir = $CFG->dataroot.'/'.$courseid.'/moddata';
-    $imagelink = $CFG->wwwroot.'/file.php/'.$courseid.'/moddata/';
+    make_mod_upload_directory($courseid); // make sure moddata is made
+    make_upload_directory($courseid.'/moddata/lesson', false);  // we store our images in a subfolder in here 
+    
+    $imagedir = $CFG->dataroot.'/'.$courseid.'/moddata/lesson';
+    
+    if ($CFG->slasharguments) {
+        $imagelink = $CFG->wwwroot.'/file.php/'.$courseid.'/moddata/lesson';
+    } else {
+        $imagelink = $CFG->wwwroot.'/file.php?file=/'.$courseid.'/moddata/lesson';
+    }
     
     // try to make a unique subfolder to store the images
+    $lessonname = str_replace(' ', '_', $lessonname); // get rid of spaces
     $i = 0;
     while(true) {
         if (!file_exists($imagedir.'/'.$lessonname.$i)) {
             // ok doesnt exist so make the directory and update our paths
             mkdir($imagedir.'/'.$lessonname.$i);
             $imagedir = $imagedir.'/'.$lessonname.$i;
-            $imagelink = $imagelink.$lessonname.$i;
+            $imagelink = $imagelink.'/'.$lessonname.$i;
             break;
         }
         $i++;