ability to link contacts that are "really me, but on another system/network".

diff --git a/boot.php b/boot.php
index c95e24dc1c889e7c0d00e8ca7c571e0d99213984..8d2d313078ad6df4459fd6a9a2eef404ac5b532b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -6,7 +6,7 @@ ini_set('pcre.backtrack_limit', 250000);
 
 define ( 'FRIENDIKA_VERSION',      '2.2.1032' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1073      );
+define ( 'DB_UPDATE_VERSION',      1074      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 4952e7c62394374239af1d1c7055c5417a6d00bd..b11e72f6ce0d993c698675de1cb1cd65e080854f 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -52,6 +52,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `uid` int(11) NOT NULL COMMENT 'owner uid',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `self` tinyint(1) NOT NULL DEFAULT '0',
+  `remote_self` tinyint(1) NOT NULL DEFAULT '0',
   `rel` tinyint(1) NOT NULL DEFAULT '0',
   `duplex` tinyint(1) NOT NULL DEFAULT '0',
   `network` char(255) NOT NULL,

diff --git a/include/items.php b/include/items.php
index 9cafaea629b1f76dc8f97182cb965b24f6d373f2..6593647bacbe9625991d619520efea1c69980f69 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1260,6 +1260,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                if(! x($datarray,'author-avatar'))
                                        $datarray['author-avatar'] = $contact['thumb'];
 
+
                                $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
                                        dbesc($item_id),
                                        intval($importer['uid'])
@@ -1416,6 +1417,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
                                        $datarray['last-child'] = 0;
                                }
 
+                               // This is my contact on another system, but it's really me.
+                               // Turn this into a wall post.
+
+                               if($contact['remote_self'])
+                                       $datarray['wall'] = 1;
+
                                $datarray['parent-uri'] = $item_id;
                                $datarray['uid'] = $importer['uid'];
                                $datarray['contact-id'] = $contact['id'];

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 90d2e40045846457a837514c5244e5e1784e5859..0dc96f8a7647e725931bce33b1ce10e169d50336 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -747,6 +747,12 @@ function dfrn_notify_post(&$a) {
                                continue;
                        }
 
+                       // This is my contact on another system, but it's really me.
+                       // Turn this into a wall post.
+
+                       if($contact['remote_self'])
+                               $datarray['wall'] = 1;
+
                        $datarray['parent-uri'] = $item_id;
                        $datarray['uid'] = $importer['importer_uid'];
                        $datarray['contact-id'] = $importer['id'];

diff --git a/update.php b/update.php
index 08f1e6854e79c0269cf47f6b1efb85044ed0b64b..66908b8d344eacf93686f40e161ba7fa688ccc27 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1073 );
+define( 'UPDATE_VERSION' , 1074 );
 
 /**
  *
@@ -585,3 +585,8 @@ function update_1072() {
        q("ALTER TABLE `item` ADD `starred` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` ");
        q("ALTER TABLE `item` ADD INDEX ( `starred` ) ");
 }
+
+function update_1073() {
+       q("ALTER TABLE `contact` ADD `remote_self` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `self` ");
+}
+