MDL-26028 fix invalid separator constant and support root dirs in ali…

…ases Credit goes to Loic Jeannin, thanks.
Jaswinder00 · Apr 30, 2012 · e61f888 · e61f888
1 parent f7d26a0
commit e61f888
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/xsendfilelib.php b/lib/xsendfilelib.php
@@ -52,7 +52,14 @@ function xsendfile($filepath) {
     $aliased = false;
     if (!empty($CFG->xsendfilealiases) and is_array($CFG->xsendfilealiases)) {
         foreach ($CFG->xsendfilealiases as $alias=>$dir) {
-            $dir = realpath($dir).PATH_SEPARATOR;
+            $dir = realpath($dir);
+            if ($dir === false) {
+                continue;
+            }
+            if (substr($dir, -1) !== DIRECTORY_SEPARATOR) {
+                // add trailing dir separator
+                $dir .= DIRECTORY_SEPARATOR;
+            }
             if (strpos($filepath, $dir) === 0) {
                 $filepath = $alias.substr($filepath, strlen($dir));
                 $aliased = true;