[pLog-svn] r4915 - in plog/branches/lifetype-1.2: . class/file locale locale/admin

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-03-02 10:18:42 -0500 (Fri, 02 Mar 2007)
New Revision: 4915

Added:
   plog/branches/lifetype-1.2/locale/admin/locale_en_US.php
Modified:
   plog/branches/lifetype-1.2/class/file/file.class.php
   plog/branches/lifetype-1.2/locale/locale_en_US.php
   plog/branches/lifetype-1.2/wizard.php
Log:
merged changes 4910, 4912, 4913 from the trunk, exluding the locations and my password

Modified: plog/branches/lifetype-1.2/class/file/file.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-02 15:02:13 UTC (rev 4914)
+++ plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-02 15:18:42 UTC (rev 4915)
@@ -269,7 +269,7 @@
 				if( File::isDir( $file ) && array_search(basename( $file ), $excludedFiles) === false) {
 					// perform a recursive call if we were allowed to do so
 					if( $recursive ) {
-						File::deleteDir( $file, $recursive, $onlyFiles );
+						File::deleteDir( $file, $recursive, $onlyFiles, $excludedFiles );
 					}
 				}
 

Copied: plog/branches/lifetype-1.2/locale/admin/locale_en_US.php (from rev 4910, plog/trunk/locale/admin/locale_en_US.php)
===================================================================
--- plog/branches/lifetype-1.2/locale/admin/locale_en_US.php	                        (rev 0)
+++ plog/branches/lifetype-1.2/locale/admin/locale_en_US.php	2007-03-02 15:18:42 UTC (rev 4915)
@@ -0,0 +1,11 @@
+<?php
+
+// include UK messages, and then just change the ones we don't like
+include(PLOG_CLASS_PATH . "locale/admin/locale_en_UK.php" );  
+
+// British guys spell "center" as "centre"
+$messages['resourceCenter'] = 'Resource Center';
+$messages['controlCenter'] = 'Control Center';
+$messages['pluginCenter'] = 'Plugin Center';
+
+?>

Modified: plog/branches/lifetype-1.2/locale/locale_en_US.php
===================================================================
--- plog/branches/lifetype-1.2/locale/locale_en_US.php	2007-03-02 15:02:13 UTC (rev 4914)
+++ plog/branches/lifetype-1.2/locale/locale_en_US.php	2007-03-02 15:18:42 UTC (rev 4915)
@@ -8,9 +8,4 @@
 // As dumb as it is, Americans like the month/day/year format
 $messages['date_format'] = '%m/%d/%Y %H:%M';
 
-// British guys spell "center" as "centre"
-$messages['resourceCenter'] = 'Resource Center';
-$messages['controlCenter'] = 'Control Center';
-$messages['pluginCenter'] = 'Plugin Center';
-
 ?>

Modified: plog/branches/lifetype-1.2/wizard.php
===================================================================
--- plog/branches/lifetype-1.2/wizard.php	2007-03-02 15:02:13 UTC (rev 4914)
+++ plog/branches/lifetype-1.2/wizard.php	2007-03-02 15:18:42 UTC (rev 4915)
@@ -158,7 +158,7 @@
 		function cleanTmpFolder()
 		{
 			// remove the files recursively, but only files, do not do anything to directories
-			File::deleteDir( TEMP_FOLDER, true, true );
+			File::deleteDir( TEMP_FOLDER, true, true, array(".svn", ".htaccess") );
 		}
     }
 
@@ -1293,8 +1293,7 @@
             $cache =& CacheManager::getCache();
             $cache->clearCache();
 
-			// clean up the tmp/ folder
-			File::deleteDir( TEMP_FOLDER, true, true );
+            WizardTools::cleanTmpFolder();
 
             $this->_view = new WizardView( "step5" );
             $this->_view->setValue( "message", $message );
@@ -1775,11 +1774,13 @@
 				$destFileName = $galleryFolder.$row["owner_id"]."/".$row["file_name"];
 				
                     //print( "Renaming file: $fileName --- $destFileName<br/>" );
-				
-				if( !File::rename( $fileName, $destFileName )) {
-					$this->message .= "Error updating resource file with id ".$row["id"].", while attempting to rename file from $fileName to $destFileName<br/>";
+
+                    // skip the rename if we already did it
+                if( !File::exists( $destFileName)) {
+                    if( !File::rename( $fileName, $destFileName )) {
+                        $this->message .= "Error updating resource file with id ".$row["id"].", while attempting to rename file from $fileName to $destFileName<br/>";
+                    }
 				}
-				
 
 				
 				// if it's an image, we also need to process the previews
@@ -1806,8 +1807,12 @@
 					//print(" -- renaming preview: $previewFileName -- $destPreviewFileName<br/>");
 					//print(" -- renaming medium preview: $medPreviewFileName -- $destMedPreviewFileName<br/>");					
 					
-					File::rename( $previewFileName, $destPreviewFileName );
-					File::rename( $medPreviewFileName, $destMedPreviewFileName );
+                    if( !File::exists( $destPreviewFileName)) {
+                        File::rename( $previewFileName, $destPreviewFileName );
+                    }
+                    if( !File::exists( $destMedPreviewFileName)) {
+                        File::rename( $medPreviewFileName, $destMedPreviewFileName );
+                    }
 				}
 				
 				
@@ -1950,7 +1955,7 @@
 						include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
 						$config =& Config::getConfig();
 						$tmpFolder = $config->getValue( "temp_folder", TEMP_FOLDER );
-						File::deleteDir( $tmpFolder, true, true );
+                        WizardTools::cleanTmpFolder();
 
                         $this->_view = new WizardView( "update4" );
                     }