Merge photo-template into develop

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 5e19a1ffc1d25a0a9ca96e0e1a8d6e875063029c..62b6f4bd700f80aaea4dc69729e57eeb238d2f1e 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -648,12 +648,8 @@ function dfrn_request_content(&$a) {
 
                if(! local_user()) {
                        info( t("Please login to confirm introduction.") . EOL );
-
                        /* setup the return URL to come back to this page if they use openid */
-
-                       $stripped = str_replace('q=','',$a->query_string);
-                       $_SESSION['return_url'] = trim($stripped,'/');
-
+                       $_SESSION['return_url'] = $a->query_string;
                        return login();
                }
 
@@ -668,6 +664,21 @@ 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'] : "");
+
+               // Checking fastlane for validity
+               if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+                       $_POST["dfrn_url"] = $dfrn_url;
+                       $_POST["confirm_key"] = $confirm_key;
+                       $_POST["localconfirm"] = 1;
+                       $_POST["hidden-contact"] = 0;
+                       $_POST["submit"] = t('Confirm');
+
+                       dfrn_request_post($a);
+
+                       killme();
+                       return; // NOTREACHED
+               }
+
                $tpl = get_markup_template("dfrn_req_confirm.tpl");
                $o  = replace_macros($tpl,array(
                        '$dfrn_url' => $dfrn_url,