Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 747) +++ trunk/CHANGELOG (revision 748) @@ -10,8 +10,11 @@ # = Bugfix ! = Update/Change -------------------------------------- 2.7.0 ------------------------------------- -12-Mar-2008 Thomas Hornik +------------------------------------- 2.7.0 ------------------------------------- +12-Mar-2008 Christian Sommer +! added WB home folder fix proposed by the forum member spawnferkel (thanks) +! defined and instead of and as default tags +12-Mar-2008 Thomas Hornik + CAPTCHA: added parameter to call_captcha (can be one of: 'image', 'input' or 'text') 11-Mar-2008 Christian Sommer # fixed issue with output filter (all .@ in descriptive mailto part: >xxxxx were replaced; now restricted to emails) Index: trunk/wb/modules/fckeditor/README =================================================================== --- trunk/wb/modules/fckeditor/README (revision 747) +++ trunk/wb/modules/fckeditor/README (nonexistent) @@ -1,38 +0,0 @@ - ################################################################################################## - # OVERVIEW OF APPLIED CHANGES BASED ON FCKEDITOR v2.51 - # ------------------------------------------------------------------------------------------------ - # Symbols for changes applied to the original FCKEditor package - # + = Added - # - = Removed - # ! = Update/Change (the original FCKEditor files are renamed: xxx.extension.org) - ################################################################################################## - - /fckeditor/editor/filemanager/connectors/ - ! test.html - ! uploadtest.html - - /fckeditor/editor/filemanager/connectors/php/ - ! config.php - - /fckeditor/editor/filemanager/browser/default - ! frmresourcetype.html - - NOTE: - - files and folders starting with "_" contain source code or documentation and were removed - - - all files with extension: afp, asp, cfd, cfm, lasso, pl, py were removed - (only required to integrate FCKEditor in other programming languages than PHP) - - - /fckeditor/editor/filemanager/connectors/ - /asp, /aspx, /cfm, /lasso, /perl, /py (subfolders removed) - - + /fckeditor/editor/plugins/WBModules - - - ################################################################################################## - # CUSTOMISING FCKEDITOR TO YOUR NEEDS - # ------------------------------------------------------------------------------------------------ - # You can specify the appearance of FCKEditor to your needs via the files located in /my_config - # Open the file /my_config/my_fckconfig.js with a texteditor and follow the instructions - # in the textfile for customisation - ################################################################################################## \ No newline at end of file Property changes on: trunk/wb/modules/fckeditor/README ___________________________________________________________________ Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Id \ No newline at end of property Index: trunk/wb/modules/fckeditor/info.php =================================================================== --- trunk/wb/modules/fckeditor/info.php (revision 747) +++ trunk/wb/modules/fckeditor/info.php (revision 748) @@ -26,6 +26,11 @@ Authors: P. Widlund, S. Braunewell, M. Gallas (ruebenwurzel), Wouldlouper, C. Sommer (doc) Started to track applied changes in info.php from 27.03.2007 onwards (cs) ----------------------------------------------------------------------------------------------------------- + v2.83 (doc.. Christian Sommer; Mar 12, 2008) + + added the WB home folder fix found by the forum member spawnferkel + (see forum thread: http://forum.websitebaker2.org/index.php/topic,8978.msg53107.html#msg53107) + + defined and instead of and per default + v2.82 (doc.. Christian Sommer; Feb 20, 2008) + added the connector fix found by the forum member Luisehahne (see forum thread: http://forum.websitebaker2.org/index.php/topic,8240.msg51675.html#msg51675) @@ -97,10 +102,10 @@ $module_directory = 'fckeditor'; $module_name = 'FCKeditor'; $module_function = 'WYSIWYG'; -$module_version = '2.82'; +$module_version = '2.83'; $module_platform = '2.6.x'; $module_author = 'Christian Sommer, P. Widlund, S. Braunewell, M. Gallas, Wouldlouper'; $module_license = 'GNU General Public License'; -$module_description = 'This module allows you to edit the contents of a page using FCKeditor v2.51.'; +$module_description = 'This module allows you to edit the contents of a page using FCKeditor v2.51.'; ?> \ No newline at end of file Index: trunk/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php =================================================================== --- trunk/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php (revision 747) +++ trunk/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/php/config.php (revision 748) @@ -26,7 +26,7 @@ // SECURITY: You must explicitly enable this "connector". (Set it to "true"). // WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only -// authenticated users can access this file or use some kind of session checking. +// authenticated users can access this file or use some kind of session checking. $Config['Enabled'] = false ; /** @@ -50,6 +50,10 @@ // Path to user files relative to the document root. // $Config['UserFilesPath'] = '/userfiles/' ; $Config['UserFilesPath'] = WB_URL .MEDIA_DIRECTORY ; +// use home folder of current user as document root if available +if(isset($_SESSION['HOME_FOLDER']) && file_exists(WB_PATH .MEDIA_DIRECTORY .$_SESSION['HOME_FOLDER'])){ + $Config['UserFilesPath'] = $Config['UserFilesPath'].$_SESSION['HOME_FOLDER']; +} // Fill the following value it you prefer to specify the absolute path for the // user files directory. Useful if you are using a virtual directory, symbolic @@ -57,7 +61,10 @@ // Attention: The above 'UserFilesPath' must point to the same directory. // $Config['UserFilesAbsolutePath'] = '' ; $Config['UserFilesAbsolutePath'] = WB_PATH .MEDIA_DIRECTORY ; - +// use home folder of current user as document root if available +if(isset($_SESSION['HOME_FOLDER']) && file_exists(WB_PATH .MEDIA_DIRECTORY .$_SESSION['HOME_FOLDER'])){ + $Config['UserFilesAbsolutePath'] = $Config['UserFilesAbsolutePath'].$_SESSION['HOME_FOLDER']; +} // Due to security issues with Apache modules, it is recommended to leave the // following setting enabled. $Config['ForceSingleExtension'] = true ; Index: trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js =================================================================== --- trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js (revision 747) +++ trunk/wb/modules/fckeditor/wb_config/wb_fckconfig.js (revision 748) @@ -132,6 +132,56 @@ // make the offic2003 skin the default skin FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/office2003/' +// Do not add, rename or remove styles here. Only apply definition changes. +FCKConfig.CoreStyles = +{ + // Basic Inline Styles. + 'Bold' : { Element : 'strong', Overrides : 'b' }, + 'Italic' : { Element : 'em', Overrides : 'i' }, + 'Underline' : { Element : 'u' }, + 'StrikeThrough' : { Element : 'strike' }, + 'Subscript' : { Element : 'sub' }, + 'Superscript' : { Element : 'sup' }, + + // Basic Block Styles (Font Format Combo). + 'p' : { Element : 'p' }, + 'div' : { Element : 'div' }, + 'pre' : { Element : 'pre' }, + 'address' : { Element : 'address' }, + 'h1' : { Element : 'h1' }, + 'h2' : { Element : 'h2' }, + 'h3' : { Element : 'h3' }, + 'h4' : { Element : 'h4' }, + 'h5' : { Element : 'h5' }, + 'h6' : { Element : 'h6' }, + + // Other formatting features. + 'FontFace' : + { + Element : 'span', + Styles : { 'font-family' : '#("Font")' }, + Overrides : [ { Element : 'font', Attributes : { 'face' : null } } ] + }, + + 'Size' : + { + Element : 'span', + Styles : { 'font-size' : '#("Size","fontSize")' }, + Overrides : [ { Element : 'font', Attributes : { 'size' : null } } ] + }, + + 'Color' : + { + Element : 'span', + Styles : { 'color' : '#("Color","color")' }, + Overrides : [ { Element : 'font', Attributes : { 'color' : null } } ] + }, + + 'BackColor' : { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } } +}; + + + /* ----------------------------------------------------------------------------------------- Note: GENERAL HINTS ON CSS FORMATS AND XML FILES