X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=7e5b67b7c2b1ff2024c7a5ceb0cd760097bd25ce;hb=16da708e071bb2a41024c4268d963938f850dfb9;hp=6f6ce61a987fb6238a60b4d363e64919f764974f;hpb=d23d26f44dab28d527fb186159303689db883d80;p=friendica.git
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 6f6ce61a98..7e5b67b7c2 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -9,6 +9,8 @@
*
*/
+require_once('include/enotify.php');
+
if(! function_exists('dfrn_request_init')) {
function dfrn_request_init(&$a) {
@@ -45,13 +47,13 @@ function dfrn_request_post(&$a) {
if(x($_POST, 'cancel')) {
goaway(z_root());
- }
+ }
/**
*
* Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell
- * to confirm the request, and then we've clicked submit (perhaps after logging in).
+ * to confirm the request, and then we've clicked submit (perhaps after logging in).
* That brings us here:
*
*/
@@ -145,7 +147,7 @@ function dfrn_request_post(&$a) {
*/
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
+ `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
intval(local_user()),
datetime_convert(),
@@ -183,7 +185,9 @@ function dfrn_request_post(&$a) {
require_once('include/group.php');
group_add_member(local_user(),'',$r[0]['id'],$g[0]['def_gid']);
}
- }
+ $forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
+ } else
+ $forwardurl = $a->get_baseurl()."/contacts";
/**
* Allow the blocked remote notification to complete
@@ -197,7 +201,8 @@ function dfrn_request_post(&$a) {
// (ignore reply, nothing we can do it failed)
- goaway(zrl($dfrn_url));
+ // Old: goaway(zrl($dfrn_url));
+ goaway($forwardurl);
return; // NOTREACHED
}
@@ -213,17 +218,17 @@ function dfrn_request_post(&$a) {
/**
* Otherwise:
- *
+ *
* Scenario 1:
- * We are the requestee. A person from a remote cell has made an introduction
- * on our profile web page and clicked submit. We will use their DFRN-URL to
- * figure out how to contact their cell.
+ * We are the requestee. A person from a remote cell has made an introduction
+ * on our profile web page and clicked submit. We will use their DFRN-URL to
+ * figure out how to contact their cell.
*
* Scrape the originating DFRN-URL for everything we need. Create a contact record
* and an introduction to show our user next time he/she logs in.
* Finally redirect back to the requestor so that their site can record the request.
- * If our user (the requestee) later confirms this request, a record of it will need
- * to exist on the requestor's cell in order for the confirmation process to complete..
+ * If our user (the requestee) later confirms this request, a record of it will need
+ * to exist on the requestor's cell in order for the confirmation process to complete..
*
* It's possible that neither the requestor or the requestee are logged in at the moment,
* and the requestor does not yet have any credentials to the requestee profile.
@@ -263,19 +268,19 @@ function dfrn_request_post(&$a) {
notice( t('Spam protection measures have been invoked.') . EOL);
notice( t('Friends are advised to please try again in 24 hours.') . EOL);
return;
- }
+ }
}
/**
*
- * Cleanup old introductions that remain blocked.
+ * Cleanup old introductions that remain blocked.
* Also remove the contact record, but only if there is no existing relationship
* Do not remove email contacts as these may be awaiting email verification
*/
- $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
+ $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
- WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
+ WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
AND `contact`.`network` != '%s'
AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
dbesc(NETWORK_MAIL2)
@@ -398,13 +403,13 @@ function dfrn_request_post(&$a) {
$photo = avatar_img($addr);
- $r = q("UPDATE `contact` SET
- `photo` = '%s',
+ $r = q("UPDATE `contact` SET
+ `photo` = '%s',
`thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s',
+ `micro` = '%s',
+ `name-date` = '%s',
+ `uri-date` = '%s',
+ `avatar-date` = '%s',
`hidden` = 0,
WHERE `id` = %d
",
@@ -461,7 +466,7 @@ function dfrn_request_post(&$a) {
if($network === NETWORK_DFRN) {
- $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+ $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid),
dbesc($url)
);
@@ -503,7 +508,7 @@ function dfrn_request_post(&$a) {
goaway($a->get_baseurl() . '/' . $a->cmd);
return; // NOTREACHED
}
-
+
require_once('include/Scrape.php');
@@ -518,12 +523,12 @@ function dfrn_request_post(&$a) {
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
if(! x($parms,'photo'))
notice( t('Warning: profile location has no profile photo.') . EOL );
- $invalid = validate_dfrn($parms);
+ $invalid = validate_dfrn($parms);
if($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location",
"%d required parameters were not found at the given location",
$invalid), $invalid) . EOL );
-
+
return;
}
}
@@ -588,7 +593,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)
+ if(! $failed)
info( t('Your introduction has been sent.') . EOL );
// "Homecoming" - send the requestor back to their site to record the introduction.
@@ -596,21 +601,21 @@ function dfrn_request_post(&$a) {
$dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
- goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
- . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
- . '&confirm_key=' . $hash
+ goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "")
);
// NOTREACHED
// END $network === NETWORK_DFRN
}
elseif($network === NETWORK_OSTATUS) {
-
+
/**
*
* OStatus network
* Check contact existence
- * Try and scrape together enough information to create a contact record,
+ * 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
@@ -643,16 +648,12 @@ 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();
}
- // Edge case, but can easily happen in the wild. This person is authenticated,
+ // Edge case, but can easily happen in the wild. This person is authenticated,
// but not as the person who needs to deal with this request.
if ($a->user['nickname'] != $a->argv[1]) {
@@ -663,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,
@@ -680,11 +696,11 @@ function dfrn_request_content(&$a) {
return $o;
}
- elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
+ elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
// we are the requestee and it is now safe to send our user their introduction,
- // We could just unblock it, but first we have to jump through a few hoops to
- // send an email, or even to find out if we need to send an email.
+ // We could just unblock it, but first we have to jump through a few hoops to
+ // send an email, or even to find out if we need to send an email.
$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
dbesc($_GET['confirm_key'])
@@ -704,7 +720,7 @@ function dfrn_request_content(&$a) {
$auto_confirm = true;
if(! $auto_confirm) {
- require_once('include/enotify.php');
+
notification(array(
'type' => NOTIFY_INTRO,
'notify_flags' => $r[0]['notify-flags'],
@@ -755,7 +771,7 @@ function dfrn_request_content(&$a) {
/**
* Normal web request. Display our user's introduction form.
*/
-
+
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
if(! get_config('system','local_block')) {
notice( t('Public access denied.') . EOL);
@@ -790,7 +806,7 @@ function dfrn_request_content(&$a) {
/**
*
* The auto_request form only has the profile address
- * because nobody is going to read the comments and
+ * because nobody is going to read the comments and
* it doesn't matter if they know you or not.
*
*/
@@ -820,7 +836,10 @@ function dfrn_request_content(&$a) {
//$emailnet = (($mail_disabled) ? '' : t("Connect as an email follower \x28Coming soon\x29"));
$emailnet = "";
- $invite_desc = t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.');
+ $invite_desc = sprintf(
+ t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.'),
+ get_server()
+ );
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),