diff --git a/spec/dfrn2_contact_confirmation.png b/spec/dfrn2_contact_confirmation.png
index ed30c79554..843e7c7077 100644
Binary files a/spec/dfrn2_contact_confirmation.png and b/spec/dfrn2_contact_confirmation.png differ
diff --git a/spec/dfrn2_contact_confirmation.svg b/spec/dfrn2_contact_confirmation.svg
index 7468e1eb50..bb506a2328 100644
--- a/spec/dfrn2_contact_confirmation.svg
+++ b/spec/dfrn2_contact_confirmation.svg
@@ -90,14 +90,15 @@ text { font:12px Dialog; }
is prensent it is a duplicate)
- update dfrn-id and pubkey for Karens contact entry in the
contact table
-
-
- -> set the relation for the contact
+
+
+ -> set the relation for the contact and set pending = 0 and
+blocked = 0
- update the relationship of the contact Karen
-> if duplex delete the issued-id
--> set pending to 0
+-> set blocked = 0 and pending = 0
send a notification
@@ -134,12 +135,12 @@ text { font:12px Dialog; }
-
-
-
-
-
-
+
+
+
+
+
+
@@ -152,10 +153,10 @@ text { font:12px Dialog; }
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/spec/dfrn2_contact_request.png b/spec/dfrn2_contact_request.png
index 5d1df9f2b5..cf60094ae7 100644
Binary files a/spec/dfrn2_contact_request.png and b/spec/dfrn2_contact_request.png differ
diff --git a/spec/dfrn2_contact_request.svg b/spec/dfrn2_contact_request.svg
index 5f76067f18..d81323457e 100644
--- a/spec/dfrn2_contact_request.svg
+++ b/spec/dfrn2_contact_request.svg
@@ -44,7 +44,7 @@ text { font:12px Dialog; }
- 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
@@ -91,8 +91,8 @@ 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)
+the scraped data with blocked = 1 and pending = 1
+(Karens pubkey becomes the contact site-pubkey)
- fetch_url($dfrn_request . '?confirm_key=' .
$confirm_key);
- fetch_url(http://karenhomepage.com/dfrn_request?
@@ -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; }
-
+
-
+
-
+