summaryrefslogtreecommitdiffstats
path: root/apps/user_migrate
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-03-17 13:53:00 +0000
committerTom Needham <needham.thomas@gmail.com>2012-03-17 13:53:00 +0000
commit5234e66bab0ebc6fd7eeef8170cf9f61f035124d (patch)
treee8396be881f7faa441404d82ceb11ad44aac41a3 /apps/user_migrate
parent27bf34f7be0e7c3c1516cdf6c44877ee77962dca (diff)
downloadnextcloud-server-5234e66bab0ebc6fd7eeef8170cf9f61f035124d.tar.gz
nextcloud-server-5234e66bab0ebc6fd7eeef8170cf9f61f035124d.zip
Add exportinfo to user exports.
Diffstat (limited to 'apps/user_migrate')
-rw-r--r--apps/user_migrate/admin.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
index 56fe8875145..da2e53d2a15 100644
--- a/apps/user_migrate/admin.php
+++ b/apps/user_migrate/admin.php
@@ -1,10 +1,8 @@
<?php
/**
- * ownCloud - admin export
+ * ownCloud - user_migrate
*
- * @author Thomas Schmidt
- * @copyright 2011 Thomas Schmidt tom@opensuse.org
* @author Tom Needham
* @copyright 2012 Tom Needham tom@owncloud.com
*
@@ -26,7 +24,7 @@ OC_Util::checkAdminUser();
OC_Util::checkAppEnabled('user_migrate');
// Import?
-if (isset($_POST['userimport'])) {
+if (isset($_POST['user_import'])) {
$root = OC::$SERVERROOT . "/";
$importname = "owncloud_import_" . date("y-m-d_H-i-s");
@@ -38,14 +36,14 @@ if (isset($_POST['userimport'])) {
$from = $_FILES['owncloud_import']['tmp_name'];
$to = get_temp_dir().'/'.$importname.'.zip';
if( !move_uploaded_file( $from, $to ) ){
- OC_Log::write('admin_export',"Failed to copy the uploaded file",OC_Log::INFO);
+ OC_Log::write('migration',"Failed to copy the uploaded file",OC_Log::INFO);
exit();
}
// Extract zip
$zip = new ZipArchive();
if ($zip->open(get_temp_dir().'/'.$importname.'.zip') != TRUE) {
- OC_Log::write('admin_export',"Failed to open zip file",OC_Log::INFO);
+ OC_Log::write('migration',"Failed to open zip file",OC_Log::INFO);
exit();
}
$zip->extractTo(get_temp_dir().'/'.$importname.'/');