[pLog-svn] r5260 - in plog/branches/lifetype-1.2/class: file gallery/resizers

[mark at devel.lifetype.net]

Author: mark
Date: 2007-04-03 11:05:45 -0400 (Tue, 03 Apr 2007)
New Revision: 5260

Modified:
   plog/branches/lifetype-1.2/class/file/file.class.php
   plog/branches/lifetype-1.2/class/gallery/resizers/gallerythumbnailgenerator.class.php
Log:
Add a new File::basename() to fixed basename() error when we use thumbnailgenerator to generate thubmnail from a image with CJK filename.

Modified: plog/branches/lifetype-1.2/class/file/file.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/file/file.class.php	2007-04-03 07:36:30 UTC (rev 5259)
+++ plog/branches/lifetype-1.2/class/file/file.class.php	2007-04-03 15:05:45 UTC (rev 5260)
@@ -469,5 +469,22 @@
 
              return touch($fileName);
          }
+
+         /** 
+          * returns the basename of a file
+          *
+          * @return basename of the file
+          * @see PHP Function basename()
+          *
+          */
+         function basename( $fileName = null )
+         {
+             if( $fileName == null )
+                 return false;
+
+             $basename = preg_replace( '/^.+[\\\\\\/]/', '', $fileName );
+
+             return $basename;
+         }         
 	 }
 ?>

Modified: plog/branches/lifetype-1.2/class/gallery/resizers/gallerythumbnailgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/resizers/gallerythumbnailgenerator.class.php	2007-04-03 07:36:30 UTC (rev 5259)
+++ plog/branches/lifetype-1.2/class/gallery/resizers/gallerythumbnailgenerator.class.php	2007-04-03 15:05:45 UTC (rev 5260)
@@ -61,7 +61,8 @@
 			$resizer = new GalleryResizer( $resFile );
 		    lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );			
 			GalleryResourceStorage::checkMediumSizePreviewsStorageFolder( $ownerId );
-			$outFile = GalleryResourceStorage::getMediumSizePreviewsFolder( $ownerId ).basename( $resFile );
+			lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+			$outFile = GalleryResourceStorage::getMediumSizePreviewsFolder( $ownerId ).File::basename( $resFile );
 			
 			// and finally, we can generate the preview!
 			$result = $resizer->generate( $outFile, $previewWidth, $previewHeight, $previewKeepAspectRatio );
@@ -96,7 +97,8 @@
 			$resizer = new GalleryResizer( $resFile );
 		    lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );			
 			GalleryResourceStorage::checkUserStorageFolder( $ownerId );
-			$outFile = GalleryResourceStorage::getUserFolder( $ownerId ).basename( $resFile );
+			lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+			$outFile = GalleryResourceStorage::getUserFolder( $ownerId ).File::basename( $resFile );
 			
 			// and finally, we can generate the preview!
 			$result = $resizer->generate( $outFile, $previewWidth, $previewHeight, $previewKeepAspectRatio );