diff options
author | Tom Needham <needham.thomas@gmail.com> | 2012-11-07 00:59:59 +0400 |
---|---|---|
committer | Tom Needham <needham.thomas@gmail.com> | 2012-11-09 01:38:04 +0400 |
commit | 7d246ab638f2e81ff4833938626468e96ea210b5 (patch) | |
tree | dca41540b59d80cc173f805c986a2b990f64204c /lib/migrate.php | |
parent | 3a5298287bc1730ce5bfca2f2b359c9285afd028 (diff) |
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
Diffstat (limited to 'lib/migrate.php')
-rw-r--r-- | lib/migrate.php | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/lib/migrate.php b/lib/migrate.php index 870e16e1261..41ea200abdb 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -199,8 +199,8 @@ class OC_Migrate{ // Get export_info.json $scan = scandir( $extractpath ); // Check for export_info.json - if( !in_array( 'export_info.json', $scan ) ){ - OC_Log::write( 'migration', 'Invalid import file, export_info.json note found', OC_Log::ERROR ); + if( !in_array( 'export_info.json', $scan ) ) { + OC_Log::write( 'migration', 'Invalid import file, export_info.json not found', OC_Log::ERROR ); return json_encode( array( 'success' => false ) ); } $json = json_decode( file_get_contents( $extractpath . 'export_info.json' ) ); @@ -312,37 +312,6 @@ class OC_Migrate{ } /** - * @brief copies recursively - * @param $path string path to source folder - * @param $dest string path to destination - * @return bool - */ - private static function copy_r( $path, $dest ){ - if( is_dir($path) ){ - @mkdir( $dest ); - $objects = scandir( $path ); - if( sizeof( $objects ) > 0 ){ - foreach( $objects as $file ){ - if( $file == "." || $file == ".." || $file == ".htaccess") - continue; - // go on - if( is_dir( $path . '/' . $file ) ){ - self::copy_r( $path .'/' . $file, $dest . '/' . $file ); - } else { - copy( $path . '/' . $file, $dest . '/' . $file ); - } - } - } - return true; - } - elseif( is_file( $path ) ){ - return copy( $path, $dest ); - } else { - return false; - } - } - - /** * @brief tries to extract the import zip * @param $path string path to the zip * @return string path to extract location (with a trailing slash) or false on failure |