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 4463c713f97fcc0807c9bfaba57ceaeb6ac097ba..79070604b796251f89447e27a77aba92f630f57d 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -12,6 +12,10 @@
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               return;
+       }
+
        if($a->argc > 1)
                $which = $a->argv[1];
 
@@ -44,7 +48,7 @@ function dfrn_request_post(&$a) {
 
 
        if($_POST['cancel']) {
-               goaway($a->get_baseurl());
+               goaway(z_root());
        } 
 
 
@@ -161,7 +165,7 @@ function dfrn_request_post(&$a) {
                                }
 
                                if($r) {
-                                       notice( t("Introduction complete.") . EOL);
+                                       info( t("Introduction complete.") . EOL);
                                }
 
                                /**
@@ -186,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
        }
 
@@ -305,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;
                                }
@@ -420,7 +424,7 @@ function dfrn_request_post(&$a) {
                        // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 
                        if(! $failed) 
-                               notice( t('Your introduction has been sent.') . EOL );
+                               info( t('Your introduction has been sent.') . EOL );
 
                        // "Homecoming" - send the requestor back to their site to record the introduction.
 
@@ -441,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
                         *
@@ -474,7 +478,7 @@ function dfrn_request_content(&$a) {
        if(x($_GET,'dfrn_url')) {
 
                if(! local_user()) {
-                       notice( t("Please login to confirm introduction.") . EOL );
+                       info( t("Please login to confirm introduction.") . EOL );
 
                        /* setup the return URL to come back to this page if they use openid */
 
@@ -495,8 +499,8 @@ function dfrn_request_content(&$a) {
                $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
                $aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0);
                $confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
-               $o .= load_view_file("view/dfrn_req_confirm.tpl");
-               $o  = replace_macros($o,array(
+               $tpl = get_markup_template("dfrn_req_confirm.tpl");
+               $o  = replace_macros($tpl,array(
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$confirm_key' => $confirm_key,
@@ -533,7 +537,7 @@ function dfrn_request_content(&$a) {
                                if($r[0]['page-flags'] != PAGE_NORMAL)
                                        $auto_confirm = true;                           
                                if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
-                                       $email_tpl = load_view_file('view/request_notify_eml.tpl');
+                                       $email_tpl = get_intltext_template('request_notify_eml.tpl');
                                        $email = replace_macros($email_tpl, array(
                                                '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
                                                '$url' => stripslashes($r[0]['url']),
@@ -583,6 +587,12 @@ function dfrn_request_content(&$a) {
                 * Normal web request. Display our user's introduction form.
                 */
  
+               if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+                       notice( t('Public access denied.') . EOL);
+                       return;
+               }
+
+
                /**
                 * Try to auto-fill the profile address
                 */
@@ -592,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')) {
@@ -612,15 +622,15 @@ function dfrn_request_content(&$a) {
                 */
 
                if($a->profile['page-flags'] == PAGE_NORMAL)
-                       $tpl = load_view_file('view/dfrn_request.tpl');
+                       $tpl = get_markup_template('dfrn_request.tpl');
                else
-                       $tpl = load_view_file('view/auto_request.tpl');
+                       $tpl = get_markup_template('auto_request.tpl');
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
                        '$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' => t('Does $name know you?'),
+                       '$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
                        '$yes' => t('Yes'),
                        '$no' => t('No'),
                        '$add_note' => t('Add a personal note:'),
@@ -640,4 +650,4 @@ function dfrn_request_content(&$a) {
        }
 
        return; // Somebody is fishing.
-}}
\ No newline at end of file
+}}