[pLog-svn] r5257 - in plog/branches/lifetype-1.2/class: file gallery/dao

[mark at devel.lifetype.net]

Author: mark
Date: 2007-04-02 14:18:33 -0400 (Mon, 02 Apr 2007)
New Revision: 5257

Modified:
   plog/branches/lifetype-1.2/class/file/fileuploads.class.php
   plog/branches/lifetype-1.2/class/gallery/dao/galleryresourcestorage.class.php
Log:
According to lss's suggestion, I change the rawurlencode(getFileName) to basename(getTmpName) ..

It can save some cpu time. :P

Modified: plog/branches/lifetype-1.2/class/file/fileuploads.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/file/fileuploads.class.php	2007-04-02 18:01:03 UTC (rev 5256)
+++ plog/branches/lifetype-1.2/class/file/fileuploads.class.php	2007-04-02 18:18:33 UTC (rev 5257)
@@ -52,13 +52,9 @@
             if( $destinationFolder[strlen($destinationFolder)-1] != "/" )
             	$destinationFolder .= "/";
 				
-			// encoding the filename if "encoded_file_name" enabled
-			if( $config->getValue( "resources_naming_rule" ) == "encoded_file_name" )
-				$fileName = rawurlencode($upload->getFileName());
-			else
-				$fileName = $upload->getFileName();
+			$destFileName = basename( $upload->getTmpName() );
 
-			if( $this->my_move_uploaded_file( $upload->getTmpName(), $destinationFolder.$fileName ) ) {
+			if( $this->my_move_uploaded_file( $upload->getTmpName(), $destinationFolder.$destFileName ) ) {
                	$upload->setFolder( $destinationFolder );
 				$error = 0;
             }
@@ -97,13 +93,9 @@
         	foreach( $this->_files as $file ) {
                 $upload = new FileUpload( $file );
 
-				// encoding the filename if "encoded_file_name" enabled
-				if( $config->getValue( "resources_naming_rule" ) == "encoded_file_name" )
-					$fileName = rawurlencode($upload->getFileName());
-				else
-					$fileName = $upload->getFileName();
+				$destFileName = basename( $upload->getTmpName() );
 
-                if( $this->my_move_uploaded_file( $upload->getTmpName(), $destinationFolder.$fileName ) ) {
+                if( $this->my_move_uploaded_file( $upload->getTmpName(), $destinationFolder.$destFileName ) ) {
                 	$upload->setFolder( $destinationFolder );
                     $upload->setError( 0 );
                 }

Modified: plog/branches/lifetype-1.2/class/gallery/dao/galleryresourcestorage.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/dao/galleryresourcestorage.class.php	2007-04-02 18:01:03 UTC (rev 5256)
+++ plog/branches/lifetype-1.2/class/gallery/dao/galleryresourcestorage.class.php	2007-04-02 18:18:33 UTC (rev 5257)
@@ -240,17 +240,13 @@
             	return $result;
             }
 
-            // rename it while it's there
-			if( $config->getValue( "resources_naming_rule" ) == "encoded_file_name" )
-				$origFile = $tmpFolder."/".rawurlencode($upload->getFileName());
-			else
-				$origFile = $tmpFolder."/".basename($upload->getFileName());
+			$origFile = $tmpFolder."/".basename( $upload->getTmpName() );
 
 			//do not use storeFile method because I have change filename in $tmpFolder.
 			//$destFile = $this->storeFile( $resourceId, $ownerId, $origFile, RESOURCE_STORAGE_STORE_MOVE );
 			//$destFile use $filePath and $fileName generated above.
-
 			//$destFile = $filePath.$fileName;
+
 			if( $config->getValue( "resources_naming_rule" ) == "encoded_file_name" ) {
 				$fileName = $upload->getFileName();
 	            // new name for the file