Changeset 335 for FCKpackager/trunk/_source/includes/common.inc

Timestamp:

2007-05-30 21:36:32 (20 months ago)

Author:

fredck

Message:

Many fixes:

• \r\n will always be used for the compressed files generation.
• applied changes that were wrongly done exclusively on FCKrelease with [226].
• typos and small layout fixes.

Files:

• FCKpackager/trunk/_source/includes/common.inc (modified) (4 diffs)

FCKpackager/trunk/_source/includes/common.inc

@@ -1 @@
-<?php
+<?php
 /*
  * FCKpackager - JavaScript Packager and Compressor - http://www.fckeditor.net
@@ -29 +29 @@
 function StrEndsWith( $str, $sub )
 {
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
+        return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
 }
 
@@ -42 +42 @@
 function CreateDir($path, $rights = 0777)
 {
-        $folder_path = array(
-                strstr( $path, '.' ) ? dirname( $path ) : $path ) ;
+        $dirParts = explode( '/', $path ) ;
 
-        while ( !@is_dir( dirname( end( $folder_path ) ) )
-                        && dirname( end( $folder_path ) ) != '/'
-                        && dirname( end( $folder_path ) ) != '.'
-                        && dirname( end( $folder_path ) ) != '' )
+        $currentDir = '' ;
+
+        foreach ( $dirParts as $dirPart )
         {
-                $folder_path[] = dirname( end( $folder_path ) ) ;
-        }
+                $currentDir .= $dirPart . '/' ;
 
-        while ( $parent_folder_path = array_pop( $folder_path ) )
-        {
-                if ( !@mkdir( $parent_folder_path, $rights ) )
-                        ExitError( "Can't create folder \"$parent_folder_path\"." ) ;
+                if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) )
+                        mkdir( $currentDir, $rights ) ;
         }
 }
@@ -70 +65 @@
                 fwrite( $f, "\xEF\xBB\xBF" ) ;  // BOM
 
-        fwrite( $f, $strData ) ;
-        fclose( $f ) ;
-
-        return TRUE ;
-}
-
-function SaveStringToUtf8File( $strData, $filePath, $includeBom = TRUE )
-{
-        $f = @fopen( $filePath, 'wb' ) ;
-
-        if ( !$f )
-                return FALSE ;
-
-        if ( $includeBom )
-                fwrite( $f, "\xEF\xBB\xBF" ) ;  // BOM
-
-        fwrite( $f, ( $strData ) ) ;
-
+        fwrite( $f, StripUtf8Bom( $strData ) ) ;
         fclose( $f ) ;