diff options
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/mod/import.php b/mod/import.php index 088c5cb61..02f4133d5 100644 --- a/mod/import.php +++ b/mod/import.php @@ -38,6 +38,15 @@ function import_post(&$a) { if($src) { + + // This is OS specific and could also fail if your tmpdir isn't very large + // mostly used for Diaspora which exports gzipped files. + + if(strpos($filename,'.gz')){ + @rename($src,$src . '.gz'); + @system('gunzip ' . escapeshellarg($src . '.gz')); + } + if($filesize) { $data = @file_get_contents($src); } @@ -84,6 +93,13 @@ function import_post(&$a) { $data = json_decode($data,true); + if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) { + require_once('include/Import/import_diaspora.php'); + import_diaspora($data); + return; + } + + // logger('import: data: ' . print_r($data,true)); // print_r($data); @@ -308,7 +324,7 @@ function import_post(&$a) { dbesc($photos[2]), dbesc($photos[3]), dbesc($photodate), - dbesc($xchan_hash) + dbesc($xchan['xchan_hash']) ); } |