Changeset 357

Timestamp:

2007-06-03 18:48:59 (18 months ago)

Author:

fredck

Message:

Small corrections on alert texts for the File Browser.

Location:

FCKeditor/trunk/editor/filemanager/browser/default

Files:

• connectors/php/basexml.php (modified) (1 diff)
• connectors/php/io.php (modified) (1 diff)
• frmresourceslist.html (modified) (1 diff)
• js/fckxml.js (modified) (1 diff)

FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/basexml.php

@@ -40 +40 @@
 
         // Set the response format.
-        header( 'Content-Type:text/xml; charset=utf-8' ) ;
+        header( 'Content-Type: text/xml; charset=utf-8' ) ;
 }
 

FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/io.php

@@ -112 +112 @@
         // Get the slash according to the filesystem
         $slash = ( strpos( $sRealPath, '/' ) === false ) ? '\\' : '/' ;
-        $sSelfPath = str_replace('/', $slash, $sSelfPath) ;
+        $sSelfPath = str_replace( '/', $slash, $sSelfPath ) ;
         
-        $position = strpos($sRealPath, $sSelfPath) ;
+        $position = strpos( $sRealPath, $sSelfPath ) ;
 
         // This can check only that this script isn't run from a virtual dir
         // But it avoids problems the problems that arise if it isn't checked
         if ( $position === false || $position <> strlen( $sRealPath ) - strlen( $sSelfPath ) )
-                SendError( 1, "Sorry, can't map 'UserFilesPath' to a physical path. You must set the 'UserFilesAbsolutePath' value " . $position) ;
+                SendError( 1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/browser/default/connectors/php/config.php".' ) ;
 
         return substr( $sRealPath, 0, $position ) ;

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

@@ -108 +108 @@
         if ( oFolderNode == null )
         {
-                alert( 'The server didn\'t reply with a proper XML file\r\nCheck your configuration.' ) ;
+                alert( 'The server didn\'t reply with a proper XML data. Please check your configuration.' ) ;
                 return ;
         }

FCKeditor/trunk/editor/filemanager/browser/default/js/fckxml.js

@@ -62 +62 @@
                         if ( oXmlHttp.readyState == 4 )
                         {
-                                if ( oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null)
+                                if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) || oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null )
                                 {
-                                        alert( 'The server didn\'t send back a proper XML response.\r\n\r\n' +
-                                                        'Requested URL: ' + urlToCall + '\r\n' +
-                                                        'Response text:\r\n' + oXmlHttp.responseText ) ;
+                                        alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
+                                                        'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')\n\n' +
+                                                        'Requested URL:\n' + urlToCall + '\n\n' +
+                                                        'Response text:\n' + oXmlHttp.responseText ) ;
                                         return ;
                                 }
+
                                 oFCKXml.DOMDocument = oXmlHttp.responseXML ;
-                                if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
-                                        asyncFunctionPointer( oFCKXml ) ;
-                                else
-                                        alert( 'XML request error: ' + oXmlHttp.statusText + ' (' + oXmlHttp.status + ')' ) ;
+                                asyncFunctionPointer( oFCKXml ) ;
                         }
                 }