MDL-15911 - reverting previous change to odslib - needs a proper rework to use files...

diff --git a/lib/odslib.class.php b/lib/odslib.class.php
index 59832780fb87fddf9ff5600b721df044426c7f1f..4d70c1b8d16e73153799c02074f5387e981385e4 100644 (file)
--- a/lib/odslib.class.php
+++ b/lib/odslib.class.php
@@ -36,11 +36,9 @@
 class MoodleODSWorkbook {
     var $worksheets = array();
     var $filename;
-    var $send;
 
-    function MoodleODSWorkbook($filename, $send=true) {
+    function MoodleODSWorkbook($filename) {
         $this->filename = $filename;
-        $this->send = $send;
     }
 
     /* Create one Moodle Worksheet
@@ -97,22 +95,15 @@ class MoodleODSWorkbook {
         $files[] = "$dir/META-INF";
 
         $filename = "$dir/result.ods";
-        if (!$this->send) {
-            $filename = $this->filename;
-        }
         zip_files($files, $filename);
 
-        if ($this->send) {
-            $handle = fopen($filename, 'rb');
-            $contents = fread($handle, filesize($filename));
-            fclose($handle);
+        $handle = fopen($filename, 'rb');
+        $contents = fread($handle, filesize($filename));
+        fclose($handle);
 
-            remove_dir($dir); // cleanup the temp directory
+        remove_dir($dir); // cleanup the temp directory
 
-            send_file($contents, $this->filename, 0, 0, true, true, 'application/vnd.oasis.opendocument.spreadsheet');
-            return;
-        }
-        return $this->filename;
+        send_file($contents, $this->filename, 0, 0, true, true, 'application/vnd.oasis.opendocument.spreadsheet');
     }
 
     /* Not required to use