Merge https://github.com/redmatrix/redmatrix into pending_merge

include/identity.php

@@ -631,6 +631,31 @@ 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)
+		$ret['conv'] = $r;
+
+
+	$r = q("select mail.*, conv.guid as conv_guid from mail left join conv on mail.convid = conv.id where mail.uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		$m = array();
+		foreach($r as $rr) {
+			
+
+
+		
+		}
+		$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)
 	);

include/items.php

@@ -1559,7 +1559,7 @@ function encode_item_flags($item) {
 	return $ret;
 }
 
-function encode_mail($item) {
+function encode_mail($item,$extended = false) {
 	$x = array();
 	$x['type'] = 'mail';
 	$x['encoding'] = 'zot';
@@ -1592,6 +1592,18 @@ function encode_mail($item) {
 		$x['body']  = '';
 	}
 
+	if($extended) {
+		$x['conv_guid'] = $item['conv_guid'];
+		if($item['mail_flags'] & MAIL_DELETED)
+			$x['flags'][] = 'deleted';
+		if($item['mail_flags'] & MAIL_REPLIED)
+			$x['flags'][] = 'replied';
+		if($item['mail_flags'] & MAIL_ISREPLY)
+			$x['flags'][] = 'isreply';
+		if($item['mail_flags'] & MAIL_SEEN)
+			$x['flags'][] = 'seen';
+	}
+
 	return $x;
 }
 
@@ -1616,6 +1628,18 @@ function get_mail_elements($x) {
 		if(in_array('recalled',$x['flags'])) {
 			$arr['mail_recalled'] = 1;
 		}
+		if(in_array('replied',$x['flags'])) {
+			$arr['mail_flags'] |= MAIL_REPLIED;
+		}
+		if(in_array('isreply',$x['flags'])) {
+			$arr['mail_flags'] |= MAIL_ISREPLY;
+		}
+		if(in_array('seen',$x['flags'])) {
+			$arr['mail_flags'] |= MAIL_SEEN;
+		}
+		if(in_array('deleted',$x['flags'])) {
+			$arr['mail_flags'] |= MAIL_DELETED;
+		}
 	}
 
 	$key = get_config('system','pubkey');

version.inc

@@ -1 +1 @@
-2015-10-13.1184
+2015-10-14.1185