[geeklog-hg] geeklog: Fixed a bug where Filemanager didn't work with IIS

[geeklog-cvs at lists.geeklog.net]

changeset 9450:ec1bd5197e06
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ec1bd5197e06
user: Kenji ITO <mystralkk at gmail.com>
date: Sat Jan 25 19:54:46 2014 +0900
description:
Fixed a bug where Filemanager didn't work with IIS

diffstat:

 public_html/filemanager/index.php |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (45 lines):

diff -r 99699ad86679 -r ec1bd5197e06 public_html/filemanager/index.php
--- a/public_html/filemanager/index.php	Sat Jan 25 18:14:29 2014 +0900
+++ b/public_html/filemanager/index.php	Sat Jan 25 19:54:46 2014 +0900
@@ -8,7 +8,7 @@
 // |                                                                           |
 // | Filemanager browser                                                       |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2013 by the following authors:                              |
+// | Copyright (C) 2014 by the following authors:                              |
 // |                                                                           |
 // | Authors: Riaan Los       - mail AT riaanlos DOT nl                        |
 // |          Simon Georget   - simon AT linea21 DOT com                       |
@@ -67,8 +67,8 @@
         'fileSorting' => 'default',
         'chars_only_latin' => true,
         'dateFormat' => 'd M Y H:i',
-        'serverRoot' => false,
-        'fileRoot' => true,
+        'serverRoot' => true,
+        'fileRoot' => false,
         'relPath' => false,
         'logger' => false,
         'capabilities' => array('select', 'download', 'rename', 'move', 'delete'),
@@ -172,10 +172,8 @@
     $type = 'Image';
 }
 
-$fileRoot   = $_CONF['path_html'] . $relPaths[$type];
-$fileRoot   = str_replace('\\', '/', $fileRoot);
-$docRoot    = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
-$serverRoot = (stripos($fileRoot, $docRoot) === 0);
+$fileRoot = $_CONF['path_html'] . $relPaths[$type];
+$fileRoot = str_replace('\\', '/', $fileRoot);
 
 if (preg_match('@\Ahttps?://[^/]+(/.*/)filemanager/index\.php at i', COM_getCurrentURL(), $match)) {
     $relPath = $match[1];
@@ -195,7 +193,7 @@
 $_FM_CONF['options']['fileSorting']        = $_CONF['filemanager_file_sorting'];
 $_FM_CONF['options']['chars_only_latin']   = $_CONF['filemanager_chars_only_latin'];
 $_FM_CONF['options']['dateFormat']         = $_CONF['filemanager_date_format'];
-$_FM_CONF['options']['serverRoot']         = $serverRoot;
+$_FM_CONF['options']['serverRoot']         = false;
 $_FM_CONF['options']['fileRoot']           = $fileRoot;
 $_FM_CONF['options']['relPath']            = $relPath;
 $_FM_CONF['options']['logger']             = $_CONF['filemanager_logger'];