From 4ba42bc06a1166ea8bb902ded8c02ad1763c6d4a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 27 Sep 2020 10:24:15 +0000 Subject: [PATCH 1/2] Issue 9281: User export now exports data --- src/Module/Settings/UserExport.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 132505371..c70662f39 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -27,6 +27,7 @@ use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\Database\DBStructure; use Friendica\DI; +use Friendica\Model\Item; use Friendica\Module\BaseSettings; /** @@ -115,10 +116,13 @@ class UserExport extends BaseSettings while ($row = DBA::fetch($rows)) { $p = []; foreach ($dbStructure[$table]['fields'] as $column => $field) { + if (!isset($row[$column])) { + continue; + } if ($field['type'] == 'datetime') { - $p[$column] = $v ?? DBA::NULL_DATETIME; + $p[$column] = $row[$column] ?? DBA::NULL_DATETIME; } else { - $p[$column] = $v; + $p[$column] = $row[$column]; } } $result[] = $p; @@ -140,6 +144,9 @@ class UserExport extends BaseSettings foreach ($r as $rr) { foreach ($rr as $k => $v) { + if (empty($dbStructure[$table]['fields'][$k])) { + continue; + } switch ($dbStructure[$table]['fields'][$k]['type']) { case 'datetime': $result[$k] = $v ?? DBA::NULL_DATETIME; @@ -238,13 +245,8 @@ class UserExport extends BaseSettings // chunk the output to avoid exhausting memory for ($x = 0; $x < $total; $x += 500) { - $r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d", - intval(local_user()), - intval($x), - intval(500) - ); - - $output = ['item' => $r]; + $items = Item::selectToArray(Item::ITEM_FIELDLIST, ['uid' => local_user()], ['limit' => [$x, 500]]); + $output = ['item' => $items]; echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR). "\n"; } } From 845ab4b76420845dc9f625b8cd5f79a28e0c5ce4 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 27 Sep 2020 10:27:31 +0000 Subject: [PATCH 2/2] Prevent empty fields on contact export via CSV --- src/Module/Settings/UserExport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index c70662f39..25e305e42 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -169,9 +169,9 @@ class UserExport extends BaseSettings // write the table header (like Mastodon) echo "Account address, Show boosts\n"; // get all the contacts - $contacts = DBA::select('contact', ['addr'], ['uid' => $_SESSION['uid'], 'self' => false, 'rel' => [1,3], 'deleted' => false]); + $contacts = DBA::select('contact', ['addr', 'url'], ['uid' => $_SESSION['uid'], 'self' => false, 'rel' => [1,3], 'deleted' => false]); while ($contact = DBA::fetch($contacts)) { - echo $contact['addr'] . ", true\n"; + echo ($contact['addr'] ? $contact['addr'] : $contact['url']) . ", true\n"; } DBA::close($contacts); }