mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 17:14:44 +01:00
Patch from Jose: sitemgr / wiki file upload from fckeditor.
"Attached a small patch on fckeditor that leaves our url passed exact (from site pref), removes the append of file type"
This commit is contained in:
parent
b2dedd114b
commit
9f2f7f6d4f
@ -23,7 +23,8 @@ function GetUrlFromPath( $resourceType, $folderPath )
|
||||
if ( $resourceType == '' )
|
||||
return RemoveFromEnd( $GLOBALS["UserFilesPath"], '/' ) . $folderPath ;
|
||||
else
|
||||
return $GLOBALS["UserFilesPath"] . $resourceType . $folderPath ;
|
||||
//INTEGRATION return $GLOBALS["UserFilesPath"] . $resourceType . $folderPath ;
|
||||
return $GLOBALS["UserFilesPath"] . RemoveFromStart( $folderPath, '/' ) ;
|
||||
}
|
||||
|
||||
function RemoveExtension( $fileName )
|
||||
@ -34,7 +35,8 @@ function RemoveExtension( $fileName )
|
||||
function ServerMapFolder( $resourceType, $folderPath )
|
||||
{
|
||||
// Get the resource type directory.
|
||||
$sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '/' ;
|
||||
//INTEGRATION $sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '/' ;
|
||||
$sResourceTypePath = $GLOBALS["UserFilesDirectory"] . '/' ;
|
||||
|
||||
// Ensure that the directory exists.
|
||||
CreateServerFolder( $sResourceTypePath ) ;
|
||||
@ -94,4 +96,4 @@ function GetRootPath()
|
||||
|
||||
return substr( $sRealPath, 0, strlen( $sRealPath ) - strlen( $sSelfPath ) ) ;
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
@ -1,7 +1,7 @@
|
||||
Changes made to fckeditor to work properly on egroupware
|
||||
- fckconfig.js
|
||||
- Added egw_* toolbars
|
||||
- /editor/filemanager/browser/default/connectors/php/connector.php
|
||||
- editor/filemanager/browser/default/connectors/php/connector.php
|
||||
- Change hardcoded image dir from Image -> images (to respect the actual behavior in sitemgr)
|
||||
- editor/filemanager/browser/default/frmresourcetype.html
|
||||
- Again change Image -> images
|
||||
@ -9,4 +9,8 @@ Changes made to fckeditor to work properly on egroupware
|
||||
- Commented hardcoded Userdir path
|
||||
- Enable the browser
|
||||
- editor/filemanager/upload/php/config.php
|
||||
- Commented hardcoded Userdir path (is disabled by default)
|
||||
- Commented hardcoded Userdir path (is disabled by default)
|
||||
- editor/filemanager/browser/default/connectors/php/io.php
|
||||
- Remove the append of directory per type, example, for images the final url is base+serverpath+images (or type)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user