From f6ea87298643a1fb1b948ed78b059c39d1c070f2 Mon Sep 17 00:00:00 2001
From: Michael Vogel
Date: Thu, 9 Apr 2015 00:10:21 +0200
Subject: [PATCH] The behaviour when following a new contact is now unified.
---
include/follow.php | 4 +-
mod/dfrn_request.php | 15 ++++++
mod/follow.php | 84 +++++++++++++++++++++++++++++++--
view/templates/auto_request.tpl | 13 ++++-
view/templates/dfrn_request.tpl | 13 ++++-
view/templates/follow.tpl | 2 +-
6 files changed, 121 insertions(+), 10 deletions(-)
mode change 100644 => 100755 mod/follow.php
diff --git a/include/follow.php b/include/follow.php
index ba036cd48d..287a38b6bf 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -15,7 +15,7 @@
function new_contact($uid,$url,$interactive = false) {
- $result = array('success' => false,'message' => '');
+ $result = array('cid' => -1, 'success' => false,'message' => '');
$a = get_app();
@@ -208,7 +208,7 @@ function new_contact($uid,$url,$interactive = false) {
$contact = $r[0];
$contact_id = $r[0]['id'];
-
+ $result['cid'] = $contact_id;
$g = q("select def_gid from user where uid = %d limit 1",
intval($uid)
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index aee8c0306f..62b6f4bd70 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -664,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,
diff --git a/mod/follow.php b/mod/follow.php
old mode 100644
new mode 100755
index 5c2c764c7c..b9401ee825
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -3,7 +3,7 @@
require_once('include/Scrape.php');
require_once('include/follow.php');
-function follow_init(&$a) {
+function follow_content(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
@@ -11,10 +11,85 @@ function follow_init(&$a) {
// NOTREACHED
}
+ $uid = local_user();
+ $url = notags(trim($_REQUEST['url']));
+
+ $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') LIMIT 1",
+ intval(local_user()), dbesc(normalise_link($url)), dbesc(normalise_link($url)), dbesc($url));
+
+ if ($r) {
+ notice(t('You already added this contact.').EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+ $ret = probe_url($url);
+
+ if($ret['network'] === NETWORK_DFRN) {
+ $request = $ret["request"];
+ $tpl = get_markup_template('dfrn_request.tpl');
+ } else {
+ $request = $a->get_baseurl()."/follow";
+ $tpl = get_markup_template('auto_request.tpl');
+ }
+
+ $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
+
+ if (!$r) {
+ notice( t('Permission denied.') . EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+ $myaddr = $r[0]["url"];
+
+ // Makes the connection request for friendica contacts easier
+ $_SESSION["fastlane"] = $ret["url"];
+
+ $o = replace_macros($tpl,array(
+ '$header' => $ret["name"]." (".$ret["addr"].")",
+ '$photo' => $ret["photo"],
+ '$desc' => "",
+ '$pls_answer' => t('Please answer the following:'),
+ '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
+ '$add_note' => t('Add a personal note:'),
+ '$page_desc' => "",
+ '$friendica' => "",
+ '$statusnet' => "",
+ '$diaspora' => "",
+ '$diasnote' => "",
+ '$your_address' => t('Your Identity Address:'),
+ '$invite_desc' => "",
+ '$emailnet' => "",
+ '$submit' => t('Submit Request'),
+ '$cancel' => t('Cancel'),
+ '$nickname' => "",
+ '$name' => $ret["name"],
+ '$url' => $ret["url"],
+ '$myaddr' => $myaddr,
+ '$request' => $request
+ ));
+ return $o;
+}
+
+function follow_post(&$a) {
+
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+ if ($_REQUEST['cancel'])
+ goaway($_SESSION['return_url']);
+
$uid = local_user();
$url = notags(trim($_REQUEST['url']));
$return_url = $_SESSION['return_url'];
+ // Makes the connection request for friendica contacts easier
+ // This is just a precaution if maybe this page is called somewhere directly via POST
+ $_SESSION["fastlane"] = $url;
$result = new_contact($uid,$url,true);
@@ -22,12 +97,13 @@ function follow_init(&$a) {
if($result['message'])
notice($result['message']);
goaway($return_url);
- }
+ } elseif ($result['cid'])
+ goaway($a->get_baseurl().'/contacts/'.$result['cid']);
- info( t('Contact added') . EOL);
+ info( t('Contact added').EOL);
if(strstr($return_url,'contacts'))
- goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+ goaway($a->get_baseurl().'/contacts/'.$contact_id);
goaway($return_url);
// NOTREACHED
diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
index b987b7849c..56653c6550 100644
--- a/view/templates/auto_request.tpl
+++ b/view/templates/auto_request.tpl
@@ -20,16 +20,27 @@
{{/if}}
+{{if $request}}
+
+{{else}}
+{{/if}}
+
+{{if $photo}}
+
+{{/if}}
{{if $myaddr}}
{{$myaddr}}
-
+
{{else}}
{{/if}}
+ {{if $url}}
+
+ {{/if}}
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 44c8ef1e6a..6c63c53315 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -1,5 +1,3 @@
-
-
{{$header}}
{{if $myaddr}}
@@ -19,7 +17,15 @@
{{/if}}
+{{if $request}}
+
+{{else}}
+{{/if}}
+
+{{if $photo}}
+
+{{/if}}
@@ -29,6 +35,9 @@
{{else}}
{{/if}}
+ {{if $url}}
+
+ {{/if}}
diff --git a/view/templates/follow.tpl b/view/templates/follow.tpl
index c4d1887657..ece5ed17b8 100644
--- a/view/templates/follow.tpl
+++ b/view/templates/follow.tpl
@@ -2,7 +2,7 @@