diff --git a/module/editor/model.php b/module/editor/model.php index d907876ba2..da1effae7b 100644 --- a/module/editor/model.php +++ b/module/editor/model.php @@ -11,6 +11,8 @@ */ class editorModel extends model { + private $pathFix = DIRECTORY_SEPARATOR; + /** * Get all modules * @@ -46,7 +48,7 @@ class editorModel extends model foreach($moduleFiles as $moduleFile) { if($moduleFile == '.' or $moduleFile == '..' or $moduleFile == '.svn') continue; - $moduleFullFile = $moduleFullDir . '/' . $moduleFile; + $moduleFullFile = $moduleFullDir . $this->pathFix . $moduleFile; if($moduleFile == 'control.php' or $moduleFile == 'model.php') { $allModules[$moduleFullDir][$moduleFullFile] = $this->analysis($moduleFullFile); @@ -58,7 +60,7 @@ class editorModel extends model elseif(is_dir($moduleFullFile)) { $ext = ($moduleFile == 'js' or $moduleFile == 'css') ? $moduleFile : 'php'; - foreach(glob($moduleFullFile . '/' . "*.$ext") as $fileName) $allModules[$moduleFullDir][$moduleFullFile][$fileName] = basename($fileName); + foreach(glob($moduleFullFile . $this->pathFix . "*.$ext") as $fileName) $allModules[$moduleFullDir][$moduleFullFile][$fileName] = basename($fileName); } else { @@ -83,7 +85,7 @@ class editorModel extends model foreach($extensionDirs as $extensionDir) { if($extensionDir == '.' or $extensionDir == '..' or $extensionDir == '.svn') continue; - $extensionFullDir = $extPath . '/' . $extensionDir; + $extensionFullDir = $extPath . $this->pathFix . $extensionDir; if(is_dir($extensionFullDir)) { $extensionList[$extensionFullDir] = array(); @@ -98,7 +100,7 @@ class editorModel extends model foreach($extensionFiles as $extensionFile) { if($extensionFile == '.' or $extensionFile == '..' or $extensionFile == '.svn') continue; - $extensionFullFile = $extensionFullDir . '/' . $extensionFile; + $extensionFullFile = $extensionFullDir . $this->pathFix . $extensionFile; $extensionList[$extensionFullDir][$extensionFullFile] = $extensionFile; } } @@ -123,7 +125,7 @@ class editorModel extends model if(!$isExtension) $moduleFiles = $moduleFiles[$filePath]; foreach($this->config->editor->$sort as $sort) { - $sortKey = empty($sort) ? $filePath : $filePath . '/' . $sort; + $sortKey = empty($sort) ? $filePath : $filePath . $this->pathFix . $sort; if(array_key_exists($sortKey, $moduleFiles)) $sortModules[$sortKey] = $moduleFiles[$sortKey]; } return $sortModules; @@ -143,7 +145,7 @@ class editorModel extends model foreach($langDirs as $langDir) { if($langDir == '.' or $langDir == '..' or $langDir == '.svn') continue; - $langFullDir = $extensionFullDir . '/' . $langDir; + $langFullDir = $extensionFullDir . $this->pathFix . $langDir; $fileList[$langFullDir] = array(); if(is_dir($langFullDir)) { @@ -151,7 +153,7 @@ class editorModel extends model foreach($langFiles as $langFile) { if($langFile == '.' or $langFile == '..' or $langFile == '.svn') continue; - $langFullFile = $langFullDir . '/' . $langFile; + $langFullFile = $langFullDir . $this->pathFix . $langFile; $fileList[$langFullDir][$langFullFile] = $langFile; } } @@ -169,8 +171,8 @@ class editorModel extends model public function analysis($fileName) { $classMethod = array(); - $class = strstr($fileName, '/module/'); - $class = substr($class, 0, strpos($class, '/', 9)); + $class = strstr($fileName, $this->pathFix . 'module' . $this->pathFix); + $class = substr($class, 0, strpos($class, $this->pathFix, 9)); $class = basename($class); if(strpos($fileName, 'model.php') !== false) $class .= 'Model'; if(!class_exists($class)) include $fileName; @@ -180,7 +182,7 @@ class editorModel extends model $methodName = $method->name; if($method->getFileName() != $fileName) continue; if($methodName == '__construct') continue; - $classMethod[$fileName . '/' . $methodName] = $methodName; + $classMethod[$fileName . $this->pathFix . $methodName] = $methodName; } return $classMethod; } @@ -198,7 +200,7 @@ class editorModel extends model $tree = $isRoot ? "