Merge "Replace DIRECTORY_SEPERATOR with / for windows compatability"

htdocs/artefact/blog/import/leap/lib.php

@@ -231,7 +231,7 @@ class LeapImportBlog extends LeapImportArtefactPlugin {
         $importer->trace($blogpostlink);
         $pathname = urldecode((string)$blogpostlink['href']);
         $dir = dirname($importer->get('filename'));
-        $pathname = $dir . DIRECTORY_SEPARATOR . $pathname;
+        $pathname = $dir . '/' . $pathname;
         if (!file_exists($pathname)) {
             return false;
         }

htdocs/artefact/file/import/leap/lib.php

@@ -276,7 +276,7 @@ class LeapImportFile extends LeapImportArtefactPlugin {
             $data->parent = $parent;
         }
 
-        $pathname = $dir . DIRECTORY_SEPARATOR . $pathname;
+        $pathname = $dir . '/' . $pathname;
 
         // This API sucks, but that's not my problem
         if (!$id = ArtefactTypeFile::save_file($pathname, $data, $importer->get('usrobj'), true)) {

htdocs/auth/saml/init.php

@@ -69,7 +69,7 @@ $CFG = (object)array_merge((array)$cfg, (array)$CFG);
 
 // Fix up paths in $CFG
 foreach (array('docroot', 'dataroot') as $path) {
-    $CFG->{$path} = (substr($CFG->{$path}, -1) != DIRECTORY_SEPARATOR) ? $CFG->{$path} . DIRECTORY_SEPARATOR : $CFG->{$path};
+    $CFG->{$path} = (substr($CFG->{$path}, -1) != '/') ? $CFG->{$path} . '/' : $CFG->{$path};
 }
 
 // xmldb stuff

htdocs/import/leap/lib.php

@@ -1364,7 +1364,7 @@ class PluginImportLeap extends PluginImport {
         $this->trace($link);
         $pathname = urldecode((string)$link['href']);
         $dir = dirname($this->get('filename'));
-        $pathname = $dir . DIRECTORY_SEPARATOR . $pathname;
+        $pathname = $dir . '/' . $pathname;
         if (!file_exists($pathname)) {
             return false;
         }

htdocs/init.php

@@ -65,7 +65,7 @@ $CFG = (object)array_merge((array)$cfg, (array)$CFG);
 
 // Fix up paths in $CFG
 foreach (array('docroot', 'dataroot') as $path) {
-    $CFG->{$path} = (substr($CFG->{$path}, -1) != DIRECTORY_SEPARATOR) ? $CFG->{$path} . DIRECTORY_SEPARATOR : $CFG->{$path};
+    $CFG->{$path} = (substr($CFG->{$path}, -1) != '/') ? $CFG->{$path} . '/' : $CFG->{$path};
 }
 
 // xmldb stuff

htdocs/lib/file.php

@@ -720,7 +720,7 @@ function rmdirr($dirname)
         }
  
         // Recurse
-        rmdirr($dirname . DIRECTORY_SEPARATOR . $entry);
+        rmdirr($dirname . '/' . $entry);
     }
  
     // Clean up

htdocs/lib/function.dirsize.php

@@ -15,8 +15,8 @@ function dirsize($path)
     $size = 0;
 
     // Trailing slash
-    if (substr($path, -1, 1) !== DIRECTORY_SEPARATOR) {
-        $path .= DIRECTORY_SEPARATOR;
+    if (substr($path, -1, 1) !== '/') {
+        $path .= '/';
     }
 
     // Sanity check
@@ -43,7 +43,7 @@ function dirsize($path)
                 // Get list of directories or filesizes
                 $path = $queue[$i] . $entry;
                 if (is_dir($path)) {
-                    $path .= DIRECTORY_SEPARATOR;
+                    $path .= '/';
                     $subdirs[] = $path;
                 } elseif (is_file($path)) {
                     $size += filesize($path);

htdocs/lib/web.php

@@ -726,7 +726,7 @@ class Theme {
 
     private function _get_path($filename, $all, $plugindirectory, $returnprefix) {
         $list = array();
-        $plugindirectory = ($plugindirectory && substr($plugindirectory, -1) != DIRECTORY_SEPARATOR) ? $plugindirectory . DIRECTORY_SEPARATOR : $plugindirectory;
+        $plugindirectory = ($plugindirectory && substr($plugindirectory, -1) != '/') ? $plugindirectory . '/' : $plugindirectory;
 
         foreach ($this->inheritance as $themedir) {
             if (is_readable(get_config('docroot') . $plugindirectory . 'theme/' . $themedir . '/static/' . $filename)) {