Added dbexport to export output. Initial import code.

4 files changed, 134 insertions, 11 deletions

diff --git a/apps/admin_export/appinfo/app.php b/apps/admin_export/appinfo/app.php
index beebb4864e9..4e896abd6ac 100644
--- a/apps/admin_export/appinfo/app.php
+++ b/apps/admin_export/appinfo/app.php
@@ -5,6 +5,8 @@
 *
 * @author Dominik Schmidt
 * @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
+* @author Tom Needham
+* @copyright 2012 Tom Needham tom@owncloud.com
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/admin_export/appinfo/info.xml b/apps/admin_export/appinfo/info.xml
index df8a07c2f5b..e434705c9a6 100644
--- a/apps/admin_export/appinfo/info.xml
+++ b/apps/admin_export/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>Import/Export your owncloud data</description>
 	<version>0.1</version>
 	<licence>AGPL</licence>
-	<author>Thomas Schmidt</author>
+	<author>Thomas Schmidt and Tom Needham</author>
 	<require>2</require>
 	<default_enable/>
 </info>
diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php
index cafd35570c6..62b4b68ca09 100644
--- a/apps/admin_export/settings.php
+++ b/apps/admin_export/settings.php
@@ -25,11 +25,15 @@
 OC_Util::checkAdminUser();
 OC_Util::checkAppEnabled('admin_export');
 
+define('DS', '/');
+
+
 
 if (isset($_POST['admin_export'])) {
     $root = OC::$SERVERROOT . "/";
     $zip = new ZipArchive();
-    $filename = get_temp_dir() . "/owncloud_export_" . date("y-m-d_H-i-s") . ".zip";
+    $tempdir = get_temp_dir();
+    $filename = $tempdir . "/owncloud_export_" . date("y-m-d_H-i-s") . ".zip";
     OC_Log::write('admin_export',"Creating export file at: " . $filename,OC_Log::INFO);
     if ($zip->open($filename, ZIPARCHIVE::CREATE) !== TRUE) {
 		exit("Cannot open <$filename>\n");
@@ -40,37 +44,79 @@ if (isset($_POST['admin_export'])) {
 	OC_Log::write('admin_export',"Adding owncloud system files to export",OC_Log::INFO);
 	zipAddDir($root, $zip, false);
 	foreach (array(".git", "3rdparty", "apps", "core", "files", "l10n", "lib", "ocs", "search", "settings", "tests") as $dirname) {
-	    zipAddDir($root . $dirname, $zip, true, basename($root) . "/");
+	    zipAddDir($root . $dirname, $zip, true, "/");
 	}
     }
 
     if (isset($_POST['owncloud_config'])) {
 	// adding owncloud config
 	// todo: add database export
+	$dbfile = $tempdir . "/dbexport.xml";
+	OC_DB::getDbStructure( $file, 'MDB2_SCHEMA_DUMP_ALL');
+	$zip->addFile($dbfile, "dbexport.xml");
+
 	OC_Log::write('admin_export',"Adding owncloud config to export",OC_Log::INFO);
-	zipAddDir($root . "config/", $zip, true, basename($root) . "/");
-	$zip->addFile($root . '/data/.htaccess', basename($root) . "/data/owncloud.db");
+	zipAddDir($root . "config/", $zip, true, "/");
+	$zip->addFile($root . '/data/.htaccess', "data/owncloud.db");
     }
 
     if (isset($_POST['user_files'])) {
     // needs to handle data outside of the default data dir.
 	// adding user files
-	$zip->addFile($root . '/data/.htaccess', basename($root) . "/data/.htaccess");
-	$zip->addFile($root . '/data/index.html', basename($root) . "/data/index.html");
+	$zip->addFile($root . '/data/.htaccess', "data/.htaccess");
+	$zip->addFile($root . '/data/index.html', "data/index.html");
 	foreach (OC_User::getUsers() as $i) {
 		OC_Log::write('admin_export',"Adding owncloud user files of $i to export",OC_Log::INFO);
-	    zipAddDir($root . "data/" . $i, $zip, true, basename($root) . "/data/");
+	    zipAddDir($root . "data/" . $i, $zip, true, "/data/");
 	}
     }
-
     $zip->close();
-
     header("Content-Type: application/zip");
     header("Content-Disposition: attachment; filename=" . basename($filename));
     header("Content-Length: " . filesize($filename));
     @ob_end_clean();
     readfile($filename);
     unlink($filename);
+    unlink($dbfile);
+} else if( isset($_POST['admin_import']) ){
+	
+	$root = OC::$SERVERROOT . "/";
+	$importname = "owncloud_import_" . date("y-m-d_H-i-s");
+	
+	// Save data dir for later
+	$datadir = OC_Config::getValue( 'datadirectory' );
+	
+	// Copy the uploaded file
+	$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);
+		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);
+		exit();
+	}
+	$zip->extractTo(get_temp_dir().'/'.$importname.'/');
+	$zip->close();
+	
+	// Delete uploaded file
+	unlink( get_temp_dir() . '/' . $importname . '.zip' );
+	
+	// Delete current data folder.
+	OC_Log::write('admin_export',"Deleting current data dir",OC_Log::INFO);
+	unlinkRecursive( $datadir, false );
+	
+	// Copy over data
+	if( !copy_r( get_temp_dir() . '/' . $importname . '/data', $datadir ) ){
+		OC_Log::write('admin_export',"Failed to copy over data directory",OC_Log::INFO);
+		exit();	
+	}
+	
+	// TODO: Import db		
 } else {
 // fill template
     $tmpl = new OC_Template('admin_export', 'settings');
@@ -99,3 +145,68 @@ function zipAddDir($dir, $zip, $recursive=true, $internalDir='') {
 		OC_Log::write('admin_export',"Was not able to open directory: " . $dir,OC_Log::ERROR);
     }
 }
+
+function unlinkRecursive($dir, $deleteRootToo) 
+{ 
+    if(!$dh = @opendir($dir)) 
+    { 
+        return; 
+    } 
+    while (false !== ($obj = readdir($dh))) 
+    { 
+        if($obj == '.' || $obj == '..') 
+        { 
+            continue; 
+        } 
+
+        if (!@unlink($dir . '/' . $obj)) 
+        { 
+            unlinkRecursive($dir.'/'.$obj, true); 
+        } 
+    } 
+
+    closedir($dh); 
+    
+    if ($deleteRootToo) 
+    { 
+        @rmdir($dir); 
+    } 
+    
+    return; 
+} 
+ 
+
+    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 == ".." )
+                        continue;
+                    // go on
+                    if( is_dir( $path.DS.$file ) )
+                    {
+                        copy_r( $path.DS.$file, $dest.DS.$file );
+                    }
+                    else
+                    {
+                        copy( $path.DS.$file, $dest.DS.$file );
+                    }
+                }
+            }
+            return true;
+        }
+        elseif( is_file($path) )
+        {
+            return copy($path, $dest);
+        }
+        else
+        {
+            return false;
+        }
+    }
diff --git a/apps/admin_export/templates/settings.php b/apps/admin_export/templates/settings.php
index 47689facbbc..9f0845bf55f 100644
--- a/apps/admin_export/templates/settings.php
+++ b/apps/admin_export/templates/settings.php
@@ -8,6 +8,16 @@
             <input type="checkbox" id="owncloud_system" name="owncloud_system" value="true"><label for="owncloud_system"><?php echo $l->t('ownCloud system files');?></label><br/>
             <input type="checkbox" id="owncloud_config" name="owncloud_config" value="true"><label for="owncloud_config"><?php echo $l->t('ownCloud configuration');?></label>
         </p>
-        <input type="submit" name="admin_export" value="Export" />
+        <input type="submit" name="admin_export" value="<?php echo $l->t('Export'); ?>" />
+    </fieldset>
+</form>
+<form id="import" action="#" method="post" enctype="multipart/form-data">
+    <fieldset class="personalblock">
+        <legend><strong><?php echo $l->t('Import an ownCloud instance THIS WILL DELETE ALL CURRENT OWNCLOUD DATA');?></strong></legend>
+        <p><?php echo $l->t('All current ownCloud data will be replaced by the ownCloud instance that is uploaded.');?>
+        </p>
+        <p><input type="file" id="owncloud_import" name="owncloud_import"><label for="owncloud_import"><?php echo $l->t('ownCloud Export Zip File');?></label>
+        </p>
+        <input type="submit" name="admin_import" value="<?php echo $l->t('Import'); ?>" />
     </fieldset>
 </form>