Fixes to XLS routines that were causing some problems

diff --git a/course/grades.php b/course/grades.php
index 9a238610621c8b5a71b1dc48d3ff640b0794ed56..c329a86bed72da8cdfc8b0fc86fbfc341d256c16 100644 (file)
--- a/course/grades.php
+++ b/course/grades.php
@@ -3,9 +3,7 @@
 
        require("../config.php");
        require("lib.php");
-    require("$CFG->libdir/psxlsgen.php");
-
-
+    require("../lib/psxlsgen.php");
 
     require_variable($id);              // course id
     optional_variable($download, "");   // to download data 
@@ -29,6 +27,9 @@
 /// Get a list of all students
 
     if (!$students = get_course_students($course->id)) {
+           print_header("$course->shortname: $strgrades", "$course->fullname", 
+                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
+                      -> $strgrades");
         print_heading(get_string("nostudentsyet"));
         print_footer($course);
         exit;
@@ -131,7 +132,7 @@
             $myxls->InsertNumber($totals[$student->id]);
         }
 
-        $myxls->SendFile("$course->shortname $strgrades");
+        $myxls->SendFileName("$course->shortname $strgrades");
 
         exit;
 

diff --git a/lib/psxlsgen.php b/lib/psxlsgen.php
index e977d9cdbc23d8df068f2ebe4c93167bac88c89e..45c030166e05256af534fdc5fd9ad2a804da7b3b 100644 (file)
--- a/lib/psxlsgen.php
+++ b/lib/psxlsgen.php
@@ -139,7 +139,7 @@ if( !defined( "PHP_SIMPLE_XLS_GEN" ) ) {
      }\r
 \r
      // send generated xls as stream file\r
-     function SendFile( $filename )\r
+     function SendFileName( $filename )\r
      {\r
         $this->filename = $filename;\r
         $this->SendFile();\r
@@ -171,7 +171,7 @@ if( !defined( "PHP_SIMPLE_XLS_GEN" ) ) {
      }\r
 \r
      // Save generated xls file\r
-     function SaveFile( $filename )\r
+     function SaveFileName( $filename )\r
      {\r
         $this->filename = $filename;\r
         $this->SaveFile();\r

diff --git a/mod/survey/download.php b/mod/survey/download.php
index 68063f01af78b21acf8b02196f2843ff04d380ed..c400a17719acad280170350937f1e0859f6af477 100644 (file)
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -161,7 +161,7 @@
                 }
             }
         }
-        $myxls->SendFile("surveyreport");
+        $myxls->SendFileName("$survey->name");
 
         exit;
     }
@@ -171,7 +171,7 @@
 // Print header to force download
 
     header("Content-Type: application/download\n"); 
-    header("Content-Disposition: attachment; filename=\"$survey->name results.txt\"");
+    header("Content-Disposition: attachment; filename=\"$survey->name.txt\"");
 
 // Print names of all the fields