Changeset 226 for FCKreleaser/trunk

Timestamp:

2007-03-27 17:58:03 (21 months ago)

Author:

fredck

Message:

Fixed #279 : Corrected the releaser to include the UTF-8 BOM only in the necessary files.

Location:

FCKreleaser/trunk

Files:

• fckreleaser.php (modified) (5 diffs)
• _source/includes/fckpackager/common.inc (modified) (4 diffs)
• _source/includes/fckpackager/fckpreprocessor.inc (modified) (1 diff)

FCKreleaser/trunk/fckreleaser.php

@@ -349 +349 @@
 function StrEndsWith( $str, $sub )
 {
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
+        return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
 }
 
@@ -363 +363 @@
 {
         $dirParts = explode( '/', $path ) ;
-        
+
         $currentDir = '' ;
 
@@ -369 +369 @@
         {
                 $currentDir .= $dirPart . '/' ;
-                
+
                 if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) )
                         mkdir( $currentDir, $rights ) ;
@@ -385 +385 @@
                 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 ) ;
 
@@ -954 +937 @@
         function ProcessFile( $sourceFilePath, $destinationFilePath, $onlyHeader = FALSE )
         {
-                SaveStringToUtf8File(
+                SaveStringToFile(
                         FCKPreProcessor::Process( file_get_contents( $sourceFilePath ), $onlyHeader ),
                         $destinationFilePath,
-                        ( !StrEndsWith( $sourceFilePath, '.asp' ) && !StrEndsWith( $sourceFilePath, '.js' ) ) ) ;       // Only ASP and JavaScript files require the BOM.
+                        ( StrEndsWith( $sourceFilePath, '.asp' ) || StrEndsWith( $sourceFilePath, '.js' ) ) ) ; // Only ASP and JavaScript files require the BOM.
 
                 // Set the destination file Last Access and Last Write times.

FCKreleaser/trunk/_source/includes/fckpackager/common.inc

@@ -29 +29 @@
 function StrEndsWith( $str, $sub )
 {
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
+        return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
 }
 
@@ -43 +43 @@
 {
         $dirParts = explode( '/', $path ) ;
-        
+
         $currentDir = '' ;
 
@@ -49 +49 @@
         {
                 $currentDir .= $dirPart . '/' ;
-                
+
                 if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) )
                         mkdir( $currentDir, $rights ) ;
@@ -65 +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 ) ;
 

FCKreleaser/trunk/_source/includes/fckpackager/fckpreprocessor.inc

@@ -29 +29 @@
         function ProcessFile( $sourceFilePath, $destinationFilePath, $onlyHeader = FALSE )
         {
-                SaveStringToUtf8File(
+                SaveStringToFile(
                         FCKPreProcessor::Process( file_get_contents( $sourceFilePath ), $onlyHeader ),
                         $destinationFilePath,
-                        ( !StrEndsWith( $sourceFilePath, '.asp' ) && !StrEndsWith( $sourceFilePath, '.js' ) ) ) ;       // Only ASP and JavaScript files require the BOM.
+                        ( StrEndsWith( $sourceFilePath, '.asp' ) || StrEndsWith( $sourceFilePath, '.js' ) ) ) ; // Only ASP and JavaScript files require the BOM.
 
                 // Set the destination file Last Access and Last Write times.