Changeset 2078 for FCKpackager/trunk/fckpackager.php

Timestamp:

2008-06-17 15:48:08 (7 months ago)

Author:

fredck

Message:

Updated the copyright notices and "compiled" the "all in one" PHP version as well as the executable version.

Files:

• FCKpackager/trunk/fckpackager.php (modified) (6 diffs)

FCKpackager/trunk/fckpackager.php

@@ -48 +48 @@
 ?>
 
-<?php
+<?php
 
 
@@ -59 +59 @@
 function StrEndsWith( $str, $sub )
 {
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
+        return ( substr( $str, strlen( $str ) - strlen( $sub ) ) == $sub ) ;
 }
 
@@ -72 +72 @@
 function CreateDir($path, $rights = 0777)
 {
-        $folder_path = array(
-                strstr( $path, '.' ) ? dirname( $path ) : $path ) ;
-
-        while ( !@is_dir( dirname( end( $folder_path ) ) )
-                        && dirname( end( $folder_path ) ) != '/'
-                        && dirname( end( $folder_path ) ) != '.'
-                        && dirname( end( $folder_path ) ) != '' )
-        {
-                $folder_path[] = dirname( end( $folder_path ) ) ;
-        }
-
-        while ( $parent_folder_path = array_pop( $folder_path ) )
-        {
-                if ( !@mkdir( $parent_folder_path, $rights ) )
-                        ExitError( "Can't create folder \"$parent_folder_path\"." ) ;
+        $dirParts = explode( '/', $path ) ;
+
+        $currentDir = '' ;
+
+        foreach ( $dirParts as $dirPart )
+        {
+                $currentDir .= $dirPart . '/' ;
+
+                if ( strlen( $dirPart ) > 0 && !is_dir( $currentDir ) )
+                        mkdir( $currentDir, $rights ) ;
         }
 }
@@ -100 +95 @@
                 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 ) ;
 
@@ -359 +337 @@
                         ' ', $script ) ;
 
-                // Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
-                $script = preg_replace(
-                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
+                // Concatenate lines that end with "}" using a ";", except for "else",
+                // "while", "catch" and "finally" cases, or when followed by, "'", ";",
+                // "}" or ")".
+                $script = preg_replace(
+                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
                         '};', $script ) ;
 
@@ -669 +649 @@
         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.