[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php io.php, 1.2, 1.3
Blaine Lang
blaine at qs1489.pair.com
Sun Aug 10 12:46:37 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/connectors/php
Modified Files:
io.php
Log Message:
Upgrade to FCKeditor ver 2.6.3
Index: io.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/io.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** io.php 5 May 2008 00:35:25 -0000 1.2
--- io.php 10 Aug 2008 16:46:32 -0000 1.3
***************
*** 155,158 ****
--- 155,160 ----
}
$sRealPath = realpath( './' ) ;
+ // #2124 ensure that no slash is at the end
+ $sRealPath = rtrim($sRealPath,"\\/");
$sSelfPath = $_SERVER['PHP_SELF'] ;
***************
*** 278,315 ****
function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
{
echo <<<EOF
<script type="text/javascript">
! (function()
! {
! var d = document.domain ;
!
! while ( true )
! {
! // Test if we can access a parent property.
! try
! {
! var test = window.top.opener.document.domain ;
! break ;
! }
! catch( e ) {}
!
! // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! d = d.replace( /.*?(?:\.|$)/, '' ) ;
!
! if ( d.length == 0 )
! break ; // It was not able to detect the domain.
!
! try
! {
! document.domain = d ;
! }
! catch (e)
! {
! break ;
! }
! }
! })() ;
!
EOF;
$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
--- 280,290 ----
function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
{
+ // Minified version of the document.domain automatic fix script (#1919).
+ // The original script can be found at _dev/domain_fix_template.js
echo <<<EOF
<script type="text/javascript">
! (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
EOF;
+
$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
More information about the geeklog-cvs
mailing list