X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=spec%2Fdfrn2_contact_request.svg;h=d32718271b844cee8171fafa21afff9cd36eea7a;hb=d0d4245dc020a3c8076dad6cc435017caeb231ad;hp=5f76067f186dfc4a1d1cfde549785b1603e3ca1f;hpb=ac39928e5da8d7576b92202a4e30f4daa6e0d080;p=friendica.git
diff --git a/spec/dfrn2_contact_request.svg b/spec/dfrn2_contact_request.svg
index 5f76067f18..d32718271b 100644
--- a/spec/dfrn2_contact_request.svg
+++ b/spec/dfrn2_contact_request.svg
@@ -31,20 +31,20 @@ text { font:12px Dialog; }
----------------------------------------------
- Cleanup old introductions that remain blocked + Cleanup
any old email intros - which will have a greater lifetime
-- probe_url Bobs posted dfrn_url and get the network with
+- Probe::uri Bobs posted dfrn_url and get the network with
webfinger_dfrn
- try to select all contact data of Bob (contact table) by the
url ($_POST['dfrn_url] and profile uid ($a->profile['uid'])
where self = 0 to look if this contact is already there (if
issued-id or rel is already available return here because it
seems that we are already connected)
-- create a issued-id with $issued_id = random_string();
+- create a issued-id with $issued_id = Strings::getRandomHex();
- if we already found a contact record above update the
issued-id with the one we have created
- otherwise if Bob is not already in the contact table scrape
Bobs profile and create a new contact with this data (e.g.
the scraped issued-id / profiles pubkey becomes contacts
-site-pubkey) in the contact table
+site-pubkey) in the contact table (blocked = 1, pending = 1)
- select this created contact from contact table and create
an intro in the intro table (blocked = 1)
@@ -65,8 +65,8 @@ text { font:12px Dialog; }
dfrn_request.php
-
-
+
+
http://example.com/dfrn_request/bob?
dfrn_url=
687474703a2f2f6b6172656e686f6d65706167652e
@@ -80,7 +80,7 @@ text { font:12px Dialog; }
($_POST['localconfirm'] == 1)
-----------------------------------------------------------------------
- if(local_user() && ($a->user['nickname'] == $a-
->argv[1]) && (x($_POST,'dfrn_url')))
+>argv[1]) && !empty($_POST['dfrn_url']))
->
- $confirm_key comes from $_POST
- get data for contact Karen (contact table) by
@@ -91,11 +91,11 @@ text { font:12px Dialog; }
tabel, scrape Karens profile page to pick up the dfrn
links, key, fn, and photo
- create a contact for Karen in the contact table with
-the scraped data (Karens pubkey becomes the contact
-site-pubkey)
-- fetch_url($dfrn_request . '?confirm_key=' .
+the scraped data with blocked = 1 and pending = 1
+(Karens pubkey becomes the contact site-pubkey)
+- Network::fetchUrl($dfrn_request . '?confirm_key=' .
$confirm_key);
-- fetch_url(http://karenhomepage.com/dfrn_request?
+- Network::fetchUrl(http://karenhomepage.com/dfrn_request?
confirm_key=âABC123â)
@@ -104,7 +104,7 @@ text { font:12px Dialog; }
http://karenhomepage.com/dfrn_request?confirm_key=âABC123â
dfrn_request_content() -
-(elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) )
+elseif (!empty($_GET['confirm_key']))
----------------------------------------------------------------------------------------------
- select the intro by confirm_key (intro table) -> get contact id
- use the intro contact id to get the contact in the contact table
@@ -166,26 +166,26 @@ text { font:12px Dialog; }
redirict to bobs dfrn_request page
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://karenhomepage.com/dfrn_request?confirm_key=âABC123â
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://karenhomepage.com/dfrn_request?confirm_key=âABC123â
@@ -193,11 +193,11 @@ text { font:12px Dialog; }
-
+
-
+
-
+