add diaspora support to dfrn_confirm (friendship confirmation)

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 338dc9cf1d5e2c21222da5f97760ca59894d6a51..79070604b796251f89447e27a77aba92f630f57d 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -48,7 +48,7 @@ function dfrn_request_post(&$a) {
 
 
        if($_POST['cancel']) {
-               goaway($a->get_baseurl());
+               goaway(z_root());
        } 
 
 
@@ -190,7 +190,7 @@ function dfrn_request_post(&$a) {
                // invalid/bogus request
 
                notice( t('Unrecoverable protocol error.') . EOL );
-               goaway($a->get_baseurl());
+               goaway(z_root());
                return; // NOTREACHED
        }
 
@@ -309,7 +309,7 @@ function dfrn_request_post(&$a) {
                                        notice( t('You have already introduced yourself here.') . EOL );
                                        return;
                                }
-                               elseif($ret[0]['rel'] == REL_BUD) {
+                               elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) {
                                        notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
                                        return;
                                }
@@ -445,7 +445,7 @@ function dfrn_request_post(&$a) {
                         *
                         * OStatus network
                         * Check contact existence
-                        * Try and scrape together enough information to create a contact record, with us as REL_VIP
+                        * Try and scrape together enough information to create a contact record, with us as CONTACT_IS_FOLLOWER
                         * Substitute our user's feed URL into $url template
                         * Send the subscriber home to subscribe
                         *
@@ -602,7 +602,7 @@ function dfrn_request_content(&$a) {
                                $myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
                        }
                        else {
-                               $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
+                               $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
                        }
                }
                elseif(x($_GET,'addr')) {
@@ -626,11 +626,9 @@ function dfrn_request_content(&$a) {
                else
                        $tpl = get_markup_template('auto_request.tpl');
 
-               $prv = get_config('system','strict_privacy');
-
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
-                       '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo') . (($prv) ? ', testuser@identi.ca' : ''),
+                       '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
                        '$pls_answer' => t('Please answer the following:'),
                        '$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
                        '$yes' => t('Yes'),
@@ -638,9 +636,9 @@ function dfrn_request_content(&$a) {
                        '$add_note' => t('Add a personal note:'),
                        '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
                        '$friendika' => t('Friendika'),
-                       '$statusnet' => (($prv) ? t('StatusNet/Federated Social Web') : ''),
+                       '$statusnet' => t('StatusNet/Federated Social Web'),
                        '$private_net' => t("Private \x28secure\x29 network"),
-                       '$public_net' => (($prv) ? t("Public \x28insecure\x29 network") : ''),
+                       '$public_net' => t("Public \x28insecure\x29 network"),
                        '$your_address' => t('Your Identity Address:'),
                        '$submit' => t('Submit Request'),
                        '$cancel' => t('Cancel'),