diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-03-16 21:09:36 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-03-16 21:09:36 +0000 |
| commit | c442a06a0217afa8ff284333b0560aeb87db7a55 (patch) | |
| tree | 58008384e36a52f90d3dabc8890c54c83b025574 /apps | |
| parent | 50233d075c47c86a5a26d4f946f8aa09f703cb15 (diff) | |
| download | nextcloud-server-c442a06a0217afa8ff284333b0560aeb87db7a55.tar.gz nextcloud-server-c442a06a0217afa8ff284333b0560aeb87db7a55.zip | |
Fix export for admin and users. Added 3 admin export types
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/admin_export/settings.php | 9 | ||||
| -rw-r--r-- | apps/admin_export/templates/settings.php | 2 | ||||
| -rw-r--r-- | apps/user_migrate/settings.php | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php index 9db1d75db96..33fca26630a 100644 --- a/apps/admin_export/settings.php +++ b/apps/admin_export/settings.php @@ -40,12 +40,12 @@ if (isset($_POST['admin_export'])) { header("Content-Disposition: attachment; filename=" . basename($path)); header("Content-Length: " . filesize($path)); @ob_end_clean(); - readfile($path); - OC_Migrate::cleanUp( $path ); + readfile( $path ); + unlink( $path ); } // Import? } else if( isset($_POST['admin_import']) ){ - + /* $root = OC::$SERVERROOT . "/"; $importname = "owncloud_import_" . date("y-m-d_H-i-s"); @@ -85,7 +85,8 @@ if (isset($_POST['admin_export'])) { exit(); } - OC_DB::replaceDB( get_temp_dir() . '/' . $importname . '/dbexport.xml' ); + OC_DB::replaceDB( get_temp_dir() . '/' . $importname . '/dbexport.xml' ); + */ } else { // fill template $tmpl = new OC_Template('admin_export', 'settings'); diff --git a/apps/admin_export/templates/settings.php b/apps/admin_export/templates/settings.php index 15a19b7c633..6d848048c45 100644 --- a/apps/admin_export/templates/settings.php +++ b/apps/admin_export/templates/settings.php @@ -8,7 +8,7 @@ <p> <input type="radio" name="export_type" value="instance" /> ownCloud instance ( suitable for import )<br /> <input type="radio" name="export_type" value="system" /> ownCloud system files<br /> - <input type="radio" name="export_type" value="userfiles" /> Just user files + <input type="radio" name="export_type" value="userfiles" /> Just user files<br /> <input type="submit" name="admin_export" value="<?php echo $l->t('Export'); ?>" /> </fieldset> </form> diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php index d862ac5a82a..2d200c0f769 100644 --- a/apps/user_migrate/settings.php +++ b/apps/user_migrate/settings.php @@ -36,7 +36,7 @@ if (isset($_POST['user_export'])) { header("Content-Length: " . filesize($path)); @ob_end_clean(); readfile($path); - OC_Migrate::cleanUp( $path ); + unlink( $path ); } } if( isset( $_POST['user_import'] ) ){ // TODO |