Merge pull request #58 from univietw/57_fix

fix #57: file encoding problems

Author: Friederike-cil

classes/output/index.php

@@ -60,7 +60,7 @@ public function __construct($pdfannotator, $capabilities, $file) {
         $component = $file->get_component();
         $filearea = $file->get_filearea();
         $itemid = $file->get_itemid();
-        $filename = $file->get_filename();
+        $filename = urlencode($file->get_filename());
 
         $this->printurl = "$CFG->wwwroot/pluginfile.php/$contextid/$component/$filearea/$itemid/$filename?forcedownload=1";
 

lib.php

@@ -368,7 +368,7 @@ function pdfannotator_pluginfile($course, $cm, $context, $filearea, $args, $forc
     array_shift($args); // Ignore revision - designed to prevent caching problems only.
 
     $fs = get_file_storage();
-    $relativepath = implode('/', $args);
+    $relativepath = urldecode(implode('/', $args));
     $fullpath = rtrim("/$context->id/mod_pdfannotator/$filearea/0/$relativepath", '/');
     do {
         if (!$file = $fs->get_file_by_hash(sha1($fullpath))) {