aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-11 22:35:36 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-11 22:35:36 -0700
commit2d9d4dfeb37f66d502e41ff47312aa4c257a3641 (patch)
treec115ef0f6f094e27da5d232df50a359927a190e8 /mod
parent0e8991fec2bc27f0bfab308cc9b04406e42c6dd8 (diff)
parentd882b3274bd3b2479b924683b75b03c7854ad453 (diff)
downloadvolse-hubzilla-2d9d4dfeb37f66d502e41ff47312aa4c257a3641.tar.gz
volse-hubzilla-2d9d4dfeb37f66d502e41ff47312aa4c257a3641.tar.bz2
volse-hubzilla-2d9d4dfeb37f66d502e41ff47312aa4c257a3641.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: doc/history.md mod/import.php
Diffstat (limited to 'mod')
-rw-r--r--mod/import.php51
1 files changed, 51 insertions, 0 deletions
diff --git a/mod/import.php b/mod/import.php
index 92de33059..2b1bdb138 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -437,10 +437,61 @@ function import_post(&$a) {
// FIXME - ensure we have an xchan if somebody is trying to pull a fast one
+<<<<<<< HEAD
if($completed < 8) {
$friends = 0;
$feeds = 0;
+=======
+
+ $friends = 0;
+ $feeds = 0;
+
+ // import contacts
+ $abooks = $data['abook'];
+ if($abooks) {
+ foreach($abooks as $abook) {
+ if(array_key_exists('abook_blocked',$abook) && intval($abook['abook_blocked'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_BLOCKED;
+ }
+ if(array_key_exists('abook_ignored',$abook) && intval($abook['abook_ignored'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_IGNORED;
+ }
+ if(array_key_exists('abook_hidden',$abook) && intval($abook['abook_hidden'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_HIDDEN;
+ }
+ if(array_key_exists('abook_archived',$abook) && intval($abook['abook_archived'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_ARCHIVED;
+ }
+ if(array_key_exists('abook_pending',$abook) && intval($abook['abook_pending'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_PENDING;
+ }
+ if(array_key_exists('abook_unconnected',$abook) && intval($abook['abook_unconnected'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_UNCONNECTED;
+ }
+ if(array_key_exists('abook_self',$abook) && intval($abook['abook_self'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_SELF;
+ }
+ if(array_key_exists('abook_feed',$abook) && intval($abook['abook_feed'])) {
+ $abook['abook_flags'] |= ABOOK_FLAG_FEED;
+ }
+
+ if(! ( $abook['abook_flags'] & ABOOK_FLAG_SELF)) {
+ if($max_friends !== false && $friends > $max_friends)
+ continue;
+ if($max_feeds !== false && ($abook['abook_flags'] & ABOOK_FLAG_FEED) && $feeds > $max_feeds)
+ continue;
+ }
+ unset($abook['abook_id']);
+ $abook['abook_account'] = get_account_id();
+ $abook['abook_channel'] = $channel['channel_id'];
+ dbesc_array($abook);
+ $r = dbq("INSERT INTO abook (`"
+ . implode("`, `", array_keys($abook))
+ . "`) VALUES ('"
+ . implode("', '", array_values($abook))
+ . "')" );
+>>>>>>> d882b3274bd3b2479b924683b75b03c7854ad453
// import contacts
$abooks = $data['abook'];