configurable format for date input selectors

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index dd0172243589c249c1bad2cd0e93710bb09ee558..0dc96f8a7647e725931bce33b1ce10e169d50336 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
 require_once('include/items.php');
 require_once('include/event.php');
 
@@ -154,6 +154,31 @@ function dfrn_notify_post(&$a) {
        $feed->enable_order_by_date(false);
        $feed->init();
 
+       $reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
+       if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
+               $base = $reloc[0]['child'][NAMESPACE_DFRN];
+               $newloc = array();
+               $newloc['uid'] = $importer['importer_uid'];
+               $newloc['cid'] = $importer['id'];
+               $newloc['name'] = notags(unxmlify($base['name'][0]['data']));
+               $newloc['photo'] = notags(unxmlify($base['photo'][0]['data']));
+               $newloc['url'] = notags(unxmlify($base['url'][0]['data']));
+               $newloc['request'] = notags(unxmlify($base['request'][0]['data']));
+               $newloc['confirm'] = notags(unxmlify($base['confirm'][0]['data']));
+               $newloc['notify'] = notags(unxmlify($base['notify'][0]['data']));
+               $newloc['poll'] = notags(unxmlify($base['poll'][0]['data']));
+               $newloc['site-pubkey'] = notags(unxmlify($base['site-pubkey'][0]['data']));
+               $newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
+               $newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));
+               
+               // TODO
+               // merge with current record, current contents have priority
+               // update record, set url-updated
+               // update profile photos
+               // schedule a scan?
+
+       }
+
        // handle friend suggestion notification
 
        $sugg = $feed->get_feed_tags( NAMESPACE_DFRN, 'suggest' );
@@ -165,13 +190,14 @@ function dfrn_notify_post(&$a) {
                $fsugg['name'] = notags(unxmlify($base['name'][0]['data']));
                $fsugg['photo'] = notags(unxmlify($base['photo'][0]['data']));
                $fsugg['url'] = notags(unxmlify($base['url'][0]['data']));
+               $fsugg['request'] = notags(unxmlify($base['request'][0]['data']));
                $fsugg['body'] = escape_tags(unxmlify($base['note'][0]['data']));
 
                // Does our member already have a friend matching this description?
 
                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($fsugg['name']),
-                       dbesc($fsuff['url']),
+                       dbesc($fsugg['url']),
                        intval($fsugg['uid'])
                );
                if(count($r))
@@ -180,24 +206,25 @@ function dfrn_notify_post(&$a) {
                // Do we already have an fcontact record for this person?
 
                $fid = 0;
-               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `photo` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
                        dbesc($fsugg['url']),
-                       dbesc($fsuff['name']),
-                       dbesc($fsugg['photo'])
+                       dbesc($fsugg['name']),
+                       dbesc($fsugg['request'])
                );
                if(count($r)) {
                        $fid = $r[0]['id'];
                }
                if(! $fid)
-                       $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo` ) VALUES ( '%s', '%s', '%s' ) ",
-                       dbesc($fsuff['name']),
+                       $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+                       dbesc($fsugg['name']),
                        dbesc($fsugg['url']),
-                       dbesc($fsugg['photo'])
+                       dbesc($fsugg['photo']),
+                       dbesc($fsugg['request'])
                );
-               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `photo` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
                        dbesc($fsugg['url']),
-                       dbesc($fsuff['name']),
-                       dbesc($fsugg['photo'])
+                       dbesc($fsugg['name']),
+                       dbesc($fsugg['request'])
                );
                if(count($r)) {
                        $fid = $r[0]['id'];
@@ -720,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'];