aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-03-26 19:53:04 -0700
committerfriendica <info@friendica.com>2013-03-26 19:53:04 -0700
commitca605a8c838b28e89c611e1063456afa82e2fb33 (patch)
treeed5d02ced7681d810e1844960aab1855f0fce008
parentabd58bce6899aff274be2e24db08cca46c4b135b (diff)
downloadvolse-hubzilla-ca605a8c838b28e89c611e1063456afa82e2fb33.tar.gz
volse-hubzilla-ca605a8c838b28e89c611e1063456afa82e2fb33.tar.bz2
volse-hubzilla-ca605a8c838b28e89c611e1063456afa82e2fb33.zip
more doco
-rw-r--r--include/zot.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php
index 5fab76932..a06ae352b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -537,9 +537,6 @@ function import_xchan($arr) {
else
$new_flags = 0;
-
-
-
$x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags)
values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ",
@@ -760,6 +757,14 @@ function zot_fetch($arr) {
return $result;
}
+/**
+ * @function zot_import
+ *
+ * Process an incoming array of messages which were obtained via pickup, and
+ * import, update, delete as directed.
+ *
+ * The message types handled here are 'activity' (e.g. posts), 'mail' and 'profile'
+ */
function zot_import($arr) {
@@ -772,8 +777,6 @@ function zot_import($arr) {
return array();
}
-// logger('zot_import: data1: ' . print_r($data,true));
-
if(array_key_exists('iv',$data)) {
$data = json_decode(aes_unencapsulate($data,get_config('system','prvkey')),true);
}