Changeset 355

Timestamp:

2007-06-03 13:43:12 (20 months ago)

Author:

fredck

Message:

Fixed #431 : PHP - The File Browser now displays an error message when it is not able to created the configured target directory for files (instead of sending broken XML responses).

Location:

FCKeditor/trunk

Files:

• editor/filemanager/browser/default/connectors/php/basexml.php (modified) (2 diffs)
• editor/filemanager/browser/default/connectors/php/io.php (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -55 +55 @@
         // Add the current folder node.
         echo '<CurrentFolder path="' . ConvertToXmlAttribute( $currentFolder ) . '" url="' . ConvertToXmlAttribute( GetUrlFromPath( $resourceType, $currentFolder ) ) . '" />' ;
+
+        $GLOBALS['HeaderSent'] = true ;
 }
 
@@ -69 +71 @@
         echo '<?xml version="1.0" encoding="utf-8" ?>' ;
 
-        echo '<Connector><Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" /></Connector>' ;
+        echo '<Connector>' ;
+        
+        SendErrorNode(  $number, $text ) ;
+        
+        echo '</Connector>' ;
 
         exit ;
 }
+
+function SendErrorNode(  $number, $text )
+{
+        echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
+}
 ?>

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

@@ -42 +42 @@
 
         // Ensure that the directory exists.
-        CreateServerFolder( $sResourceTypePath ) ;
+        $sErrorMsg = CreateServerFolder( $sResourceTypePath ) ;
+        if ( $sErrorMsg != '' )
+        {
+                if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
+                { 
+                        SendErrorNode( 1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})" ) ;
+                        CreateXmlFooter() ;
+                        exit ;
+                }
+                else
+                {
+                        SendError( 1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})" ) ;
+                }
+        }
 
         // Return the resource type directory combined with the required path.

FCKeditor/trunk/_whatsnew.html

@@ -153 +153 @@
                         BUG-1721787</a>] If the editor is run from a virtual dir, the PHP connector will detect that
                         and avoid generating a wrong folder.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/431">#431</a>] PHP: The
+                        File Browser now displays an error message when it is not able to created the configured
+                        target directory for files (instead of sending broken XML responses).</li>
         </ul>
         <h3>