[pLog-svn] r5210 - plog/branches/lifetype-1.2/class/file

[Jon Daley]

I think something is going on that we don't understand and adding the @ is 
just hiding it.

Do we need a check to see if we are getting a "." or ".."?  I think we 
probably don't, but that's how you'd do it in C on Windows.

I can look into this more, and do some debugging on it to see if I can 
track it down.

A separate question:
What is $onlyFiles supposed to do?  The documentation says it won't delete 
the top-level folder, but all subdirectories will be deleted.  This is not 
what it does (at least from reading the code).  I think the recursive call 
to File::deleteDir should have $onlyFiles always set to false to achieve 
this behavior.



On Wed, 28 Mar 2007, mark at devel.lifetype.net wrote:

> Author: mark
> Date: 2007-03-28 12:50:56 -0400 (Wed, 28 Mar 2007)
> New Revision: 5210
>
> Modified:
>   plog/branches/lifetype-1.2/class/file/file.class.php
> Log:
> Weird! the error message still there. Revert the last modification in svn rev 5209. And add @ before unlink and rmdir to avoid annoying error messages.
>
> Modified: plog/branches/lifetype-1.2/class/file/file.class.php
> ===================================================================
> --- plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 14:15:40 UTC (rev 5209)
> +++ plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 16:50:56 UTC (rev 5210)
> @@ -224,9 +224,9 @@
>                 return false;
>
> 			 if( File::isDir( $file ))
> -				 $result = rmdir( $file );
> +				 $result = @rmdir( $file );
> 			 else
> -				 $result = unlink( $file );
> +				 $result = @unlink( $file );
>
> 			 return $result;
> 		 }
> @@ -272,13 +272,12 @@
> 						File::deleteDir( $file, $recursive, $onlyFiles, $excludedFiles );
> 					}
> 				}
> -				else {
> -					// check if the filename is in the list of files we must not delete
> -					if(array_search(basename( $file ), $excludedFiles) === false) {
> -					    // File::delete can remove empty folders as well as files
> -					    if( File::isReadable( $file )) {
> -						    File::delete( $file );
> -						}
> +
> +				// check if the filename is in the list of files we must not delete
> +				if(array_search(basename( $file ), $excludedFiles) === false) {
> +				    // File::delete can remove empty folders as well as files
> +				    if( File::isReadable( $file )) {
> +					    File::delete( $file );
> 					}
> 				}
> 			}
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://limedaley.com/mailman/listinfo/plog-svn
>

-- 
Jon Daley
http://jon.limedaley.com/

The church is consciously inadequate persons who gather
because they are weak, and scatter to serve because
unity with each other and Christ has made them bold.
-- Elton Trueblood