Changeset 413

Show
Ignore:
Timestamp:
2007-07-07 12:19:05 (17 months ago)
Author:
alfonsoml
Message:

Land on the trunk the unified connectors from #454.

Location:
FCKeditor/trunk
Files:
42 added
2 removed
7 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor/trunk/editor/filemanager/browser/default/browser.css

    r132 r413  
    4747 
    4848        background-color: #ffffff; 
     49        margin: 10px; 
    4950} 
    5051 

  • FCKeditor/trunk/editor/filemanager/browser/default/browser.html

    r220 r413  
    6969        if ( params ) sUrl += '&' + params ; 
    7070 
     71        // Add a random salt to avoid getting a cached version of the command execution 
     72        sUrl += '&uuid=' + new Date().getTime() ; 
     73 
    7174        var oXML = new FCKXml() ; 
    7275 
    … …  
    135138                return 'default.icon' ; 
    136139} 
     140 
     141function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) 
     142{ 
     143        window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ; 
     144} 
     145 
    137146                </script> 
    138147        </head> 

  • FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html

    r132 r413  
    167167        { 
    168168                var sFolderName = oNodes[i].attributes.getNamedItem('name').value ; 
    169                 oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ; 
     169                oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + '/' ) ; 
    170170        } 
    171171 

  • FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html

    r357 r413  
    3535} 
    3636 
     37function ProtectPath(path) 
     38{ 
     39        path = path.replace( /\\/g, '\\\\') ; 
     40        path = path.replace( /'/g, '\\\'') ; 
     41        return path ; 
     42} 
     43 
    3744oListManager.GetFolderRowHtml = function( folderName, folderPath ) 
    3845{ 
    3946        // Build the link to view the folder. 
    40         var sLink = '<a href="#" onclick="OpenFolder(\'' + folderPath.replace( /'/g, '\\\'') + '\');return false;">' ; 
     47        var sLink = '<a href="#" onclick="OpenFolder(\'' + ProtectPath( folderPath ) + '\');return false;">' ; 
    4148 
    4249        return '<tr>' + 
    4350                        '<td width="16">' + 
    4451                                sLink + 
    45                                 '<img alt="" src="images/Folder.gif" width="16" height="16" border="0"></a>' + 
    46                         '</td><td nowrap colspan="2">&nbsp;' + 
     52                                '<img alt="" src="images/Folder.gif" width="16" height="16" border="0"><\/a>' + 
     53                        '<\/td><td nowrap colspan="2">&nbsp;' + 
    4754                                sLink + 
    4855                                folderName + 
    49                                 '</a>' + 
    50                 '</td></tr>' ; 
     56                                '<\/a>' + 
     57                '<\/td><\/tr>' ; 
    5158} 
    5259 
    … …  
    5461{ 
    5562        // Build the link to view the folder. 
    56         var sLink = '<a href="#" onclick="OpenFile(\'' + fileUrl.replace( /'/g, '\\\'') + '\');return false;">' ; 
     63        var sLink = '<a href="#" onclick="OpenFile(\'' + ProtectPath( fileUrl ) + '\');return false;">' ; 
    5764 
    5865        // Get the file icon. 
    … …  
    6269                        '<td width="16">' + 
    6370                                sLink + 
    64                                 '<img alt="" src="images/icons/' + sIcon + '.gif" width="16" height="16" border="0"></a>' + 
    65                         '</td><td>&nbsp;' + 
     71                                '<img alt="" src="images/icons/' + sIcon + '.gif" width="16" height="16" border="0"><\/a>' + 
     72                        '<\/td><td>&nbsp;' + 
    6673                                sLink + 
    6774                                fileName + 
    68                                 '</a>' + 
    69                         '</td><td align="right" nowrap>&nbsp;' + 
     75                                '<\/a>' + 
     76                        '<\/td><td align="right" nowrap>&nbsp;' + 
    7077                                fileSize + 
    7178                                ' KB' + 
    72                 '</td></tr>' ; 
     79                '<\/td><\/tr>' ; 
    7380} 
    7481 
    … …  
    156163        </script> 
    157164</head> 
    158 <body class="FileArea" bottommargin="10" leftmargin="10" topmargin="10" rightmargin="10"> 
     165<body class="FileArea"> 
    159166</body> 
    160167</html> 

  • FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html

    r132 r413  
    2424<html xmlns="http://www.w3.org/1999/xhtml"> 
    2525        <head> 
     26                <title>File Upload</title> 
    2627                <link href="browser.css" type="text/css" rel="stylesheet" /> 
    2728                <script type="text/javascript" src="js/common.js"></script> 
    … …  
    5758        window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ; 
    5859 
    59         // Reset the upload form (On IE we must do a little trick to avout problems). 
     60        // Reset the upload form (On IE we must do a little trick to avoid problems). 
    6061        if ( document.all ) 
    6162                document.getElementById('NewFile').outerHTML = '<input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file">' ; 

  • FCKeditor/trunk/fckconfig.js

    r411 r413  
    188188// Custom implementations should just ignore it. 
    189189var _FileBrowserLanguage        = 'asp' ;       // asp | aspx | cfm | lasso | perl | php | py 
    190 var _QuickUploadLanguage        = 'asp' ;       // asp | aspx | cfm | lasso | php 
     190var _QuickUploadLanguage        = 'asp' ;       // asp | aspx | cfm | lasso | perl | php 
    191191 
    192192// @Packager.Remove.Start 
    … …  
    201201 
    202202FCKConfig.LinkBrowser = true ; 
    203 FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     203FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    204204FCKConfig.LinkBrowserWindowWidth        = FCKConfig.ScreenWidth * 0.7 ;         // 70% 
    205205FCKConfig.LinkBrowserWindowHeight       = FCKConfig.ScreenHeight * 0.7 ;        // 70% 
    206206 
    207207FCKConfig.ImageBrowser = true ; 
    208 FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     208FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    209209FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;      // 70% ; 
    210210FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;     // 70% ; 
    211211 
    212212FCKConfig.FlashBrowser = true ; 
    213 FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
     213FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ; 
    214214FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;      //70% ; 
    215215FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;     //70% ; 
    216216 
    217217FCKConfig.LinkUpload = true ; 
    218 FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; 
     218FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; 
    219219FCKConfig.LinkUploadAllowedExtensions   = "" ;                  // empty for all 
    220220FCKConfig.LinkUploadDeniedExtensions    = ".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis|sh|shtml|shtm|phtm)$" ;  // empty for no one 
    221221 
    222222FCKConfig.ImageUpload = true ; 
    223 FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ; 
     223FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ; 
    224224FCKConfig.ImageUploadAllowedExtensions  = ".(jpg|gif|jpeg|png|bmp)$" ;          // empty for all 
    225225FCKConfig.ImageUploadDeniedExtensions   = "" ;                                                  // empty for no one 
    226226 
    227227FCKConfig.FlashUpload = true ; 
    228 FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ; 
     228FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ; 
    229229FCKConfig.FlashUploadAllowedExtensions  = ".(swf|fla)$" ;               // empty for all 
    230230FCKConfig.FlashUploadDeniedExtensions   = "" ;                                  // empty for no one 

  • FCKeditor/trunk/_whatsnew.html

    r401 r413  
    4545                        file has been renamed to ".htaccess" as it doesn't bring security concerns, being 
    4646                        active out of the box.</li> 
     47                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/454">#454</a>] The file browser and upload 
     48                        connectors have been unified so they can reuse the same configuration settings.<br> 
     49                        The asp and php connectors have been improved so it's easy to select the location of the destination  
     50                        folder for each  file type, and it's no longer neccesary to use the "file", "image", "flash" subfolders<br> 
     51                        <span style="color: #ff0000">Attention:</span> The location of all the connectors have been changed in  
     52                        the fckconfig.js file. Please check your settings to match the current ones. Also review carefully the  
     53                        config file for your server language. 
     54                        </li> 
     55                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/688">#688</a>] Now the Perl quik upload is  
     56                        available.</li> 
     57                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/561">#561</a>] The asp connector provides an 
     58                        AbsolutePath setting so it's possible to set the url to a full domain or a relative path and specify that 
     59                        way the physical folder where the files are stored..</li> 
    4760        </ul> 
    4861        <p> 
    … …  
    5972                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/497">#497</a>] Fixed EMBED 
    6073                        attributes handling in IE.</li> 
     74                <li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1315722&group_id=75348&atid=543655">SF  
     75                        Patch 1315722</a>] Avoid getting a cached version of the folder contents after uploading a file</li> 
     76                <li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1386086&group_id=75348&atid=543655">SF  
     77                        Patch 1386086</a>] The php connector has been protected so mkdir doesn't fail if there are double slashes.</li> 
     78                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/943">#943</a>] The PHP connector now specifies  
     79                        that the included files are relative to the current path.</li> 
     80                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/560">#560</a>] The PHP connector will work better if the 
     81                        connector or the userfiles folder is a symlink.</li> 
    6182        </ul> 
    6283        <h3>