aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorWave <tuscanhobbit@users.noreply.github.com>2015-10-19 10:28:17 +0200
committerWave <tuscanhobbit@users.noreply.github.com>2015-10-19 10:28:17 +0200
commit3e9b6a330d157ac8aa4831b57d33ec495345a9c7 (patch)
tree8c2539297a17b3f1409536b94dd4558c5a32bd08 /include/identity.php
parent319b02a757ced679d0eaf141cc40db585fa6f84b (diff)
parentb54c4df74dd370c74d5822cdd00e0cf1ff52493f (diff)
downloadvolse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.tar.gz
volse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.tar.bz2
volse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.zip
Merge pull request #1 from redmatrix/master
Update to latest hubzilla
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php24
1 files changed, 24 insertions, 0 deletions
diff --git a/include/identity.php b/include/identity.php
index 47738a8fa..0c4a9df45 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -631,6 +631,30 @@ function identity_basic_export($channel_id, $items = false) {
if($r)
$ret['likes'] = $r;
+
+ $r = q("select * from conv where uid = %d",
+ intval($channel_id)
+ );
+ if($r) {
+ for($x = 0; $x < count($r); $x ++) {
+ $r[$x]['subject'] = base64url_decode(str_rot47($r[$x]['subject']));
+ }
+ $ret['conv'] = $r;
+ }
+
+
+ $r = q("select * from mail where mail.uid = %d",
+ intval($channel_id)
+ );
+ if($r) {
+ $m = array();
+ foreach($r as $rr) {
+ xchan_mail_query($rr);
+ $m[] = mail_encode($rr,true);
+ }
+ $ret['mail'] = $m;
+ }
+
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
intval($channel_id)
);