extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Jose: sitemgr / wiki file upload from fckeditor.

Browse Source 
"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:
Cornelius Weiß 2007-02-23 08:38:24 +00:00
parent b2dedd114b
commit 9f2f7f6d4f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/js/fckeditor/editor/filemanager/browser/default/connectors/php/io.php
View File

@ -23,7 +23,8 @@ function GetUrlFromPath( $resourceType, $folderPath )
if ( $resourceType == '' ) if ( $resourceType == '' )
return RemoveFromEnd( $GLOBALS["UserFilesPath"], '/' ) . $folderPath ; return RemoveFromEnd( $GLOBALS["UserFilesPath"], '/' ) . $folderPath ;
else else
return $GLOBALS["UserFilesPath"] . $resourceType . $folderPath ; //INTEGRATION return $GLOBALS["UserFilesPath"] . $resourceType . $folderPath ;
return $GLOBALS["UserFilesPath"] . RemoveFromStart( $folderPath, '/' ) ;
} }
function RemoveExtension( $fileName ) function RemoveExtension( $fileName )
@ -34,7 +35,8 @@ function RemoveExtension( $fileName )
function ServerMapFolder( $resourceType, $folderPath ) function ServerMapFolder( $resourceType, $folderPath )
{ {
// Get the resource type directory. // Get the resource type directory.
$sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '/' ; //INTEGRATION $sResourceTypePath = $GLOBALS["UserFilesDirectory"] . $resourceType . '/' ;
$sResourceTypePath = $GLOBALS["UserFilesDirectory"] . '/' ;
// Ensure that the directory exists. // Ensure that the directory exists.
CreateServerFolder( $sResourceTypePath ) ; CreateServerFolder( $sResourceTypePath ) ;
@ -94,4 +96,4 @@ function GetRootPath()
return substr( $sRealPath, 0, strlen( $sRealPath ) - strlen( $sSelfPath ) ) ; return substr( $sRealPath, 0, strlen( $sRealPath ) - strlen( $sSelfPath ) ) ;
} }
?> ?>

8
phpgwapi/js/fckeditor/egw_integration.txt
View File

@ -1,7 +1,7 @@
Changes made to fckeditor to work properly on egroupware Changes made to fckeditor to work properly on egroupware
- fckconfig.js - fckconfig.js
- Added egw_* toolbars - 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) - Change hardcoded image dir from Image -> images (to respect the actual behavior in sitemgr)
- editor/filemanager/browser/default/frmresourcetype.html - editor/filemanager/browser/default/frmresourcetype.html
- Again change Image -> images - Again change Image -> images
@ -9,4 +9,8 @@ Changes made to fckeditor to work properly on egroupware
- Commented hardcoded Userdir path - Commented hardcoded Userdir path
- Enable the browser - Enable the browser
- editor/filemanager/upload/php/config.php - 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)