From: Tom Needham <needham.thomas@gmail.com>
Date: Tue, 13 Mar 2012 17:08:20 +0000 (+0000)
Subject: fix structure of user export zip
X-Git-Tag: v4.0.0beta~422
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e3b35a57c53b6e90cb8560d7b4c90e3aba2a3b5;p=nextcloud-server.git

fix structure of user export zip
---

diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
index edad7357a2a..00f46660cf5 100644
--- a/apps/user_migrate/settings.php
+++ b/apps/user_migrate/settings.php
@@ -53,15 +53,11 @@ if (isset($_POST['user_export'])) {
 	
 	// Migrate the app info
 	$info = json_encode( OC_Migrate::export( $user ) );
-	$infofile = $exportdir . '/exportinfo.json';
-	if( !file_put_contents( $infofile, $info ) ){
-		die('Failed to save the export info');	
-	}
-	$zip->addFile( $infofile, "exportinfo.json");
-	$zip->addFile(OC::$SERVERROOT . '/data/' . $user . '/migration.db', "migration.db");
+	$infofile = OC::$SERVERROOT . '/data/' . $user . '/exportinfo.json';
+	file_put_contents( $infofile, $info );
 
-	// Add the data dir
-	zipAddDir(OC::$SERVERROOT . "/data/" . $user, $zip, true, "files/");
+	// Add the data dir (which includes migration.db and exportinfo.json)
+	zipAddDir(OC::$SERVERROOT . "/data/" . $user, $zip, true, "/");
 	
 	// Save the zip
     $zip->close();