Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/io.php
===================================================================
diff -u -r2868 -r3585
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/io.php (.../io.php) (revision 2868)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/io.php (.../io.php) (revision 3585)
@@ -35,9 +35,10 @@
// $sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '\\' ;
$sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '/' ;
// Ensure that the directory exists.
- CreateServerFolder( $sResourceTypePath ) ;
- // Return the resource type directory combined with the required path.
-// return $sResourceTypePath . str_replace( '/', '\\', RemoveFromStart( $folderPath, '/' ) ) ;
+ if ($resourceType == 'Special') {
+ $sResourceTypePath = $GLOBALS["UserFilesDirectory"]. '/';
+ } else
+ CreateServerFolder( $sResourceTypePath ) ;
return $sResourceTypePath . RemoveFromStart( $folderPath, '/' ) ;
}
function GetParentFolder( $folderPath )
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php
===================================================================
diff -u -r3582 -r3585
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 3582)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/commands.php (.../commands.php) (revision 3585)
@@ -223,7 +223,6 @@
{
if ( is_dir( $sServerDir . $sFile ) )
$aFolders[]=$sFile;
- //$sFolders .= '' ;
else
{
$iFileSize = filesize( $sServerDir . $sFile ) ;
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php
===================================================================
diff -u -r3565 -r3585
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php (.../config.php) (revision 3565)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php (.../config.php) (revision 3585)
@@ -45,7 +45,7 @@
$Config['DeniedExtensions']['Images'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
$Config['AllowedExtensions']['Flash'] = array('swf','fla') ;
$Config['DeniedExtensions']['Flash'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg') ;
-$Config['AllowedExtensions']['Media'] = array('swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg','mov','mp4') ;
+$Config['AllowedExtensions']['Media'] = array('asf','asx','avi','wav','wax','wma','wm','wmv','m3u','mp2v','mpg','mpeg','m1v','mp2','mp3','mpa','mpe','mpv2','mp4','mid','midi','rmi','qt','aif','aifc','aiff','mov','flv','rm','svcd','swf','vcd') ;
$Config['DeniedExtensions']['Media'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
$Config['AllowedExtensions']['Documents'] = array('doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','zip') ;
$Config['DeniedExtensions']['Documents'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/test.html
===================================================================
diff -u -r1455 -r3585
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/test.html (.../test.html) (revision 1455)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/test.html (.../test.html) (revision 3585)
@@ -105,7 +105,7 @@
-
+
|
Current Folder
@@ -118,6 +118,7 @@
+
|
|
Server Path
|