MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix formatting in mod

Browse source 
- mod/api
- mod/bookmarklet
- mod/dfrn_request
This commit is contained in:
Hypolite Petovan 2017-12-16 20:13:10 -05:00
parent 1724dd3841
commit 2cfcf433a3
3 changed files with 164 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
mod/api.php
View file

@ -6,7 +6,8 @@ use Friendica\Database\DBM;
require_once('include/api.php'); require_once('include/api.php');
function oauth_get_client($request){ function oauth_get_client($request)
{
$params = $request->get_parameters(); $params = $request->get_parameters();
@ -15,8 +16,7 @@ function oauth_get_client($request){
$r = q("SELECT `clients`.* $r = q("SELECT `clients`.*
FROM `clients`, `tokens` FROM `clients`, `tokens`
WHERE `clients`.`client_id`=`tokens`.`client_id` WHERE `clients`.`client_id`=`tokens`.`client_id`
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
dbesc($token));
if (!DBM::is_result($r)) if (!DBM::is_result($r))
return null; return null;
@ -24,57 +24,57 @@ function oauth_get_client($request){
return $r[0]; return $r[0];
} }
function api_post(App $a) { function api_post(App $a)
{
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
} }
function api_content(App $a) { function api_content(App $a)
if ($a->cmd=='api/oauth/authorize'){ {
if ($a->cmd == 'api/oauth/authorize') {
/* /*
* api/oauth/authorize interact with the user. return a standard page * api/oauth/authorize interact with the user. return a standard page
*/ */
$a->page['template'] = "minimal"; $a->page['template'] = "minimal";
// get consumer/client from request token // get consumer/client from request token
try { try {
$request = OAuthRequest::from_request(); $request = OAuthRequest::from_request();
} catch(Exception $e) { } catch (Exception $e) {
echo "<pre>"; var_dump($e); killme(); echo "<pre>";
var_dump($e);
killme();
} }
if (x($_POST, 'oauth_yes')) {
if (x($_POST,'oauth_yes')){
$app = oauth_get_client($request); $app = oauth_get_client($request);
if (is_null($app)) return "Invalid request. Unknown token."; if (is_null($app)) {
return "Invalid request. Unknown token.";
}
$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
$verifier = md5($app['secret'].local_user()); $verifier = md5($app['secret'] . local_user());
Config::set("oauth", $verifier, local_user()); Config::set("oauth", $verifier, local_user());
if ($consumer->callback_url != null) {
if ($consumer->callback_url!=null) {
$params = $request->get_parameters(); $params = $request->get_parameters();
$glue="?"; $glue = "?";
if (strstr($consumer->callback_url,$glue)) $glue="?"; if (strstr($consumer->callback_url, $glue)) {
goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier)); $glue = "?";
}
goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
killme(); killme();
} }
$tpl = get_markup_template("oauth_authorize_done.tpl"); $tpl = get_markup_template("oauth_authorize_done.tpl");
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'), '$title' => t('Authorize application connection'),
@ -83,12 +83,9 @@ function api_content(App $a) {
)); ));
return $o; return $o;
} }
if (!local_user()) {
if (! local_user()) {
/// @TODO We need login form to redirect to this page /// @TODO We need login form to redirect to this page
notice( t('Please login to continue.') . EOL ); notice( t('Please login to continue.') . EOL );
return login(false,$request->get_parameters()); return login(false,$request->get_parameters());
@ -96,18 +93,17 @@ function api_content(App $a) {
//FKOAuth1::loginUser(4); //FKOAuth1::loginUser(4);
$app = oauth_get_client($request); $app = oauth_get_client($request);
if (is_null($app)) return "Invalid request. Unknown token."; if (is_null($app)) {
return "Invalid request. Unknown token.";
}
$tpl = get_markup_template('oauth_authorize.tpl'); $tpl = get_markup_template('oauth_authorize.tpl');
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'), '$title' => t('Authorize application connection'),
'$app' => $app, '$app' => $app,
'$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'), '$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
'$yes' => t('Yes'), '$yes' => t('Yes'),
'$no' => t('No'), '$no' => t('No'),
)); ));
return $o; return $o;

16
mod/bookmarklet.php
View file

@ -6,19 +6,21 @@ use Friendica\Core\System;
require_once('include/conversation.php'); require_once('include/conversation.php');
require_once('include/items.php'); require_once('include/items.php');
function bookmarklet_init(App $a) { function bookmarklet_init(App $a)
{
$_GET["mode"] = "minimal"; $_GET["mode"] = "minimal";
} }
function bookmarklet_content(App $a) { function bookmarklet_content(App $a)
{
if (!local_user()) { if (!local_user()) {
$o = '<h2>'.t('Login').'</h2>';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
$o = '<h2>' . t('Login') . '</h2>';
return $o; return $o;
} }
$referer = normalise_link($_SERVER["HTTP_REFERER"]); $referer = normalise_link($_SERVER["HTTP_REFERER"]);
$page = normalise_link(System::baseUrl()."/bookmarklet"); $page = normalise_link(System::baseUrl() . "/bookmarklet");
if (!strstr($referer, $page)) { if (!strstr($referer, $page)) {
$content = add_page_info($_REQUEST["url"]); $content = add_page_info($_REQUEST["url"]);
@ -30,7 +32,7 @@ function bookmarklet_content(App $a) {
'nickname' => $a->user['nickname'], 'nickname' => $a->user['nickname'],
'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'), 'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'),
'default_perms' => get_acl_permissions($a->user), 'default_perms' => get_acl_permissions($a->user),
'acl' => populate_acl($a->user,true), 'acl' => populate_acl($a->user, true),
'bang' => '', 'bang' => '',
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),
@ -38,10 +40,10 @@ function bookmarklet_content(App $a) {
'title' => trim($_REQUEST["title"], "*"), 'title' => trim($_REQUEST["title"], "*"),
'content' => $content 'content' => $content
); );
$o = status_editor($a,$x, 0, false); $o = status_editor($a, $x, 0, false);
$o .= "<script>window.resizeTo(800,550);</script>"; $o .= "<script>window.resizeTo(800,550);</script>";
} else { } else {
$o = '<h2>'.t('The post was created').'</h2>'; $o = '<h2>' . t('The post was created') . '</h2>';
$o .= "<script>window.close()</script>"; $o .= "<script>window.close()</script>";
} }

337
mod/dfrn_request.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/dfrn_request.php * @file mod/dfrn_request.php
* @brief Module: dfrn_request * @brief Module: dfrn_request
@ -31,7 +32,6 @@ function dfrn_request_init(App $a)
return; return;
} }
/** /**
* Function: dfrn_request_post * Function: dfrn_request_post
* *
@ -47,100 +47,69 @@ function dfrn_request_init(App $a)
* After logging in, we click 'submit' to approve the linkage. * After logging in, we click 'submit' to approve the linkage.
* *
*/ */
function dfrn_request_post(App $a) { function dfrn_request_post(App $a)
{
if(($a->argc != 2) || (! count($a->profile))) { if (($a->argc != 2) || (!count($a->profile))) {
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile)); logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return; return;
} }
if (x($_POST, 'cancel')) {
if(x($_POST, 'cancel')) {
goaway(System::baseUrl()); goaway(System::baseUrl());
} }
/* /*
*
* Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell * 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: * That brings us here:
*
*/ */
if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) { // Ensure this is a valid request
if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
/* $dfrn_url = notags(trim($_POST['dfrn_url']));
* Ensure this is a valid request $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
*/ $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
$hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
if(local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
$dfrn_url = notags(trim($_POST['dfrn_url']));
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
$contact_record = null; $contact_record = null;
$blocked = 1; $blocked = 1;
$pending = 1; $pending = 1;
if(x($dfrn_url)) { if (x($dfrn_url)) {
// Lookup the contact based on their URL (which is the only unique thing we have at the moment)
/*
* Lookup the contact based on their URL (which is the only unique thing we have at the moment)
*/
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
intval(local_user()), intval(local_user()),
dbesc(normalise_link($dfrn_url)) dbesc(normalise_link($dfrn_url))
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
if(strlen($r[0]['dfrn-id'])) { if (strlen($r[0]['dfrn-id'])) {
// We don't need to be here. It has already happened.
/* notice(t("This introduction has already been accepted.") . EOL);
* We don't need to be here. It has already happened.
*/
notice( t("This introduction has already been accepted.") . EOL );
return; return;
} } else
else
$contact_record = $r[0]; $contact_record = $r[0];
} }
if(is_array($contact_record)) { if (is_array($contact_record)) {
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", intval($aes_allow), intval($hidden), intval($contact_record['id'])
intval($aes_allow),
intval($hidden),
intval($contact_record['id'])
); );
} } else {
else { // Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
/*
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
$parms = Probe::profile($dfrn_url); $parms = Probe::profile($dfrn_url);
if (! count($parms)) { if (!count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL ); notice(t('Profile location is not valid or does not contain profile information.') . EOL);
return; return;
} } else {
else { if (!x($parms, 'fn')) {
if (! x($parms,'fn')) { notice(t('Warning: profile location has no identifiable owner name.') . EOL);
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
} }
if (! x($parms,'photo')) { if (!x($parms, 'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice(t('Warning: profile location has no profile photo.') . EOL);
} }
$invalid = Probe::validDfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", 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);
"%d required parameters were not found at the given location",
$invalid), $invalid) . EOL );
return; return;
} }
} }
@ -152,10 +121,7 @@ function dfrn_request_post(App $a) {
// Escape the entire array // Escape the entire array
DBM::esc_array($parms); DBM::esc_array($parms);
/* // Create a contact record on our site for the other person
* Create a contact record on our site for the other person
*/
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)", VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
@ -182,7 +148,7 @@ function dfrn_request_post(App $a) {
} }
if ($r) { if ($r) {
info( t("Introduction complete.") . EOL); info(t("Introduction complete.") . EOL);
} }
$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1", $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
@ -197,15 +163,12 @@ function dfrn_request_post(App $a) {
Contact::updateAvatar($photo, local_user(), $r[0]["id"], true); Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
} }
$forwardurl = System::baseUrl()."/contacts/".$r[0]['id']; $forwardurl = System::baseUrl() . "/contacts/" . $r[0]['id'];
} else { } else {
$forwardurl = System::baseUrl()."/contacts"; $forwardurl = System::baseUrl() . "/contacts";
} }
/* // Allow the blocked remote notification to complete
* Allow the blocked remote notification to complete
*/
if (is_array($contact_record)) { if (is_array($contact_record)) {
$dfrn_request = $contact_record['request']; $dfrn_request = $contact_record['request'];
} }
@ -215,18 +178,14 @@ function dfrn_request_post(App $a) {
} }
// (ignore reply, nothing we can do it failed) // (ignore reply, nothing we can do it failed)
// Old: goaway(zrl($dfrn_url)); // Old: goaway(zrl($dfrn_url));
goaway($forwardurl); goaway($forwardurl);
return; // NOTREACHED return; // NOTREACHED
} }
} }
// invalid/bogus request // invalid/bogus request
notice(t('Unrecoverable protocol error.') . EOL);
notice( t('Unrecoverable protocol error.') . EOL );
goaway(System::baseUrl()); goaway(System::baseUrl());
return; // NOTREACHED return; // NOTREACHED
} }
@ -252,9 +211,8 @@ function dfrn_request_post(App $a) {
* in $a->argv[1] and we should have their complete info in $a->profile. * in $a->argv[1] and we should have their complete info in $a->profile.
* *
*/ */
if (!(is_array($a->profile) && count($a->profile))) {
if(! (is_array($a->profile) && count($a->profile))) { notice(t('Profile unavailable.') . EOL);
notice( t('Profile unavailable.') . EOL);
return; return;
} }
@ -268,32 +226,24 @@ function dfrn_request_post(App $a) {
$blocked = 1; $blocked = 1;
$pending = 1; $pending = 1;
if (x($_POST, 'dfrn_url')) {
if( x($_POST,'dfrn_url')) { // Block friend request spam
if ($maxreq) {
/*
* Block friend request spam
*/
if($maxreq) {
$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d", $r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
dbesc(datetime_convert('UTC','UTC','now - 24 hours')), dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')),
intval($uid) intval($uid)
); );
if (DBM::is_result($r) && count($r) > $maxreq) { if (DBM::is_result($r) && count($r) > $maxreq) {
notice( sprintf( t('%s has received too many connection requests today.'), $a->profile['name']) . EOL); notice(sprintf(t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
notice( t('Spam protection measures have been invoked.') . EOL); notice(t('Spam protection measures have been invoked.') . EOL);
notice( t('Friends are advised to please try again in 24 hours.') . EOL); notice(t('Friends are advised to please try again in 24 hours.') . EOL);
return; 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 * Also remove the contact record, but only if there is no existing relationship
*/ */
$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` 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
@ -301,7 +251,7 @@ function dfrn_request_post(App $a) {
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if(! $rr['rel']) { if (!$rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`", q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid']) intval($rr['cid'])
); );
@ -312,11 +262,11 @@ function dfrn_request_post(App $a) {
} }
} }
$real_name = (x($_POST,'realname') ? notags(trim($_POST['realname'])) : ''); $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
$url = trim($_POST['dfrn_url']); $url = trim($_POST['dfrn_url']);
if(! strlen($url)) { if (!strlen($url)) {
notice( t("Invalid locator") . EOL ); notice(t("Invalid locator") . EOL);
return; return;
} }
@ -327,10 +277,9 @@ function dfrn_request_post(App $a) {
$network = $data["network"]; $network = $data["network"];
// Canonicalise email-style profile locator // Canonicalise email-style profile locator
$url = Probe::webfingerDfrn($url,$hcard); $url = Probe::webfingerDfrn($url, $hcard);
if (substr($url,0,5) === 'stat:') {
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus. // Every time we detect the remote subscription we define this as OStatus.
// We do this even if it is not OStatus. // We do this even if it is not OStatus.
// we only need to pass this through another section of the code. // we only need to pass this through another section of the code.
@ -338,29 +287,27 @@ function dfrn_request_post(App $a) {
$network = NETWORK_OSTATUS; $network = NETWORK_OSTATUS;
} }
$url = substr($url,5); $url = substr($url, 5);
} else { } else {
$network = NETWORK_DFRN; $network = NETWORK_DFRN;
} }
logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG); logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
if($network === NETWORK_DFRN) { 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), intval($uid),
dbesc($url) dbesc($url)
); );
if (DBM::is_result($ret)) { if (DBM::is_result($ret)) {
if(strlen($ret[0]['issued-id'])) { if (strlen($ret[0]['issued-id'])) {
notice( t('You have already introduced yourself here.') . EOL ); notice(t('You have already introduced yourself here.') . EOL);
return; return;
} } elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) { notice(sprintf(t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
return; return;
} } else {
else {
$contact_record = $ret[0]; $contact_record = $ret[0];
$parms = array('dfrn-request' => $ret[0]['request']); $parms = array('dfrn-request' => $ret[0]['request']);
} }
@ -368,58 +315,53 @@ function dfrn_request_post(App $a) {
$issued_id = random_string(); $issued_id = random_string();
if(is_array($contact_record)) { if (is_array($contact_record)) {
// There is a contact record but no issued-id, so this // There is a contact record but no issued-id, so this
// is a reciprocal introduction from a known contact // is a reciprocal introduction from a known contact
$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
dbesc($issued_id), dbesc($issued_id),
intval($contact_record['id']) intval($contact_record['id'])
); );
} } else {
else {
$url = validate_url($url); $url = validate_url($url);
if (! $url) { if (!$url) {
notice( t('Invalid profile URL.') . EOL); notice(t('Invalid profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (! allowed_url($url)) { if (!allowed_url($url)) {
notice( t('Disallowed profile URL.') . EOL); notice(t('Disallowed profile URL.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
if (blocked_url($url)) { if (blocked_url($url)) {
notice( t('Blocked domain') . EOL); notice(t('Blocked domain') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
return; // NOTREACHED return; // NOTREACHED
} }
$parms = Probe::profile(($hcard) ? $hcard : $url); $parms = Probe::profile(($hcard) ? $hcard : $url);
if (! count($parms)) { if (!count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL ); notice(t('Profile location is not valid or does not contain profile information.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd); goaway(System::baseUrl() . '/' . $a->cmd);
} } else {
else { if (!x($parms, 'fn')) {
if (! x($parms,'fn')) { notice(t('Warning: profile location has no identifiable owner name.') . EOL);
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
} }
if (! x($parms,'photo')) { if (!x($parms, 'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice(t('Warning: profile location has no profile photo.') . EOL);
} }
$invalid = Probe::validDfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", 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);
"%d required parameters were not found at the given location",
$invalid), $invalid) . EOL );
return; return;
} }
} }
$parms['url'] = $url; $parms['url'] = $url;
$parms['issued-id'] = $issued_id; $parms['issued-id'] = $issued_id;
$photo = $parms["photo"]; $photo = $parms["photo"];
@ -461,10 +403,9 @@ function dfrn_request_post(App $a) {
Contact::updateAvatar($photo, $uid, $contact_record["id"], true); Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
} }
} }
} }
if ($r === false) { if ($r === false) {
notice( t('Failed to update contact record.') . EOL ); notice(t('Failed to update contact record.') . EOL);
return; return;
} }
@ -483,43 +424,38 @@ function dfrn_request_post(App $a) {
} }
// This notice will only be seen by the requestor if the requestor and requestee are on the same server. // 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);
info( t('Your introduction has been sent.') . EOL );
} }
// "Homecoming" - send the requestor back to their site to record the introduction. // "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname); $dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash . '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "") . (($aes_allow) ? "&aes_allow=1" : "")
); );
// NOTREACHED // NOTREACHED
// END $network === NETWORK_DFRN // END $network === NETWORK_DFRN
} elseif (($network != NETWORK_PHANTOM) && ($url != "")) { } elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
/* /* Substitute our user's feed URL into $url template
*
* Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe * Send the subscriber home to subscribe
*
*/ */
// Diaspora needs the uri in the format user@domain.tld // Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version // Diaspora will support the remote subscription in a future version
if ($network == NETWORK_DIASPORA) { if ($network == NETWORK_DIASPORA) {
$uri = $nickname.'@'.$a->get_hostname(); $uri = $nickname . '@' . $a->get_hostname();
if ($a->get_path()) if ($a->get_path()) {
$uri .= '/'.$a->get_path(); $uri .= '/' . $a->get_path();
}
$uri = urlencode($uri); $uri = urlencode($uri);
} else { } else {
$uri = System::baseUrl().'/profile/'.$nickname; $uri = System::baseUrl() . '/profile/' . $nickname;
} }
$url = str_replace('{uri}', $uri, $url); $url = str_replace('{uri}', $uri, $url);
@ -527,28 +463,23 @@ function dfrn_request_post(App $a) {
// NOTREACHED // NOTREACHED
// END $network != NETWORK_PHANTOM // END $network != NETWORK_PHANTOM
} else { } else {
notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.").EOL); notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
return; return;
} }
} return;
} return;
} }
function dfrn_request_content(App $a)
function dfrn_request_content(App $a) { {
if (($a->argc != 2) || (!count($a->profile))) {
if (($a->argc != 2) || (! count($a->profile))) {
return ""; return "";
} }
// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button // "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
// to send us to the post section to record the introduction. // to send us to the post section to record the introduction.
if (x($_GET, 'dfrn_url')) {
if (x($_GET,'dfrn_url')) { if (!local_user()) {
info(t("Please login to confirm introduction.") . EOL);
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 */ /* setup the return URL to come back to this page if they use openid */
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
return login(); return login();
@ -556,15 +487,14 @@ function dfrn_request_content(App $a) {
// 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. // but not as the person who needs to deal with this request.
if ($a->user['nickname'] != $a->argv[1]) { if ($a->user['nickname'] != $a->argv[1]) {
notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
return login(); return login();
notice(t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
} }
$dfrn_url = notags(trim(hex2bin($_GET['dfrn_url']))); $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
$aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0); $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : ""); $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
// Checking fastlane for validity // Checking fastlane for validity
if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) { if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
@ -581,34 +511,29 @@ function dfrn_request_content(App $a) {
} }
$tpl = get_markup_template("dfrn_req_confirm.tpl"); $tpl = get_markup_template("dfrn_req_confirm.tpl");
$o = replace_macros($tpl,array( $o = replace_macros($tpl, array(
'$dfrn_url' => $dfrn_url, '$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ), '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
'$hidethem' => t('Hide this contact'), '$hidethem' => t('Hide this contact'),
'$hidechecked' => '', '$hidechecked' => '',
'$confirm_key' => $confirm_key, '$confirm_key' => $confirm_key,
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']), '$welcome' => sprintf(t('Welcome home %s.'), $a->user['username']),
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url), '$please' => sprintf(t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
'$submit' => t('Confirm'), '$submit' => t('Confirm'),
'$uid' => $_SESSION['uid'], '$uid' => $_SESSION['uid'],
'$nickname' => $a->user['nickname'], '$nickname' => $a->user['nickname'],
'dfrn_rawurl' => $_GET['dfrn_url'] 'dfrn_rawurl' => $_GET['dfrn_url']
)); ));
return $o; 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 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 // 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. // 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", $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
dbesc($_GET['confirm_key']) dbesc($_GET['confirm_key'])
); );
if (DBM::is_result($intro)) { if (DBM::is_result($intro)) {
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d LIMIT 1", WHERE `contact`.`id` = %d LIMIT 1",
intval($intro[0]['contact-id']) intval($intro[0]['contact-id'])
@ -617,11 +542,11 @@ function dfrn_request_content(App $a) {
$auto_confirm = false; $auto_confirm = false;
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) if ($r[0]['page-flags'] != PAGE_NORMAL && $r[0]['page-flags'] != PAGE_PRVGROUP) {
$auto_confirm = true; $auto_confirm = true;
}
if(! $auto_confirm) { if (!$auto_confirm) {
notification(array( notification(array(
'type' => NOTIFY_INTRO, 'type' => NOTIFY_INTRO,
'notify_flags' => $r[0]['notify-flags'], 'notify_flags' => $r[0]['notify-flags'],
@ -638,7 +563,7 @@ function dfrn_request_content(App $a) {
)); ));
} }
if($auto_confirm) { if ($auto_confirm) {
require_once 'mod/dfrn_confirm.php'; require_once 'mod/dfrn_confirm.php';
$handsfree = array( $handsfree = array(
'uid' => $r[0]['uid'], 'uid' => $r[0]['uid'],
@ -646,14 +571,13 @@ function dfrn_request_content(App $a) {
'dfrn_id' => $r[0]['issued-id'], 'dfrn_id' => $r[0]['issued-id'],
'intro_id' => $intro[0]['id'], 'intro_id' => $intro[0]['id'],
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend')) 'activity' => intval(PConfig::get($r[0]['uid'], 'system', 'post_newfriend'))
); );
dfrn_confirm_post($a,$handsfree); dfrn_confirm_post($a, $handsfree);
} }
} }
if(! $auto_confirm) { if (!$auto_confirm) {
// If we are auto_confirming, this record will have already been nuked // If we are auto_confirming, this record will have already been nuked
// in dfrn_confirm_post() // in dfrn_confirm_post()
@ -666,53 +590,39 @@ function dfrn_request_content(App $a) {
killme(); killme();
return; // NOTREACHED return; // NOTREACHED
} } else {
else { // Normal web request. Display our user's introduction form.
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
/* if (!Config::get('system', 'local_block')) {
* Normal web request. Display our user's introduction form. notice(t('Public access denied.') . EOL);
*/
if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
if(! Config::get('system','local_block')) {
notice( t('Public access denied.') . EOL);
return; return;
} }
} }
// Try to auto-fill the profile address
/*
* Try to auto-fill the profile address
*/
// At first look if an address was provided // At first look if an address was provided
// Otherwise take the local address // Otherwise take the local address
if (x($_GET,'addr') && ($_GET['addr'] != "")) { if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
$myaddr = hex2bin($_GET['addr']); $myaddr = hex2bin($_GET['addr']);
} elseif (x($_GET,'address') && ($_GET['address'] != "")) { } elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
$myaddr = $_GET['address']; $myaddr = $_GET['address'];
} elseif (local_user()) { } elseif (local_user()) {
if (strlen($a->path)) { if (strlen($a->path)) {
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname']; $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
} else { } else {
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 ); $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
} }
} else { } else {
// last, try a zrl // last, try a zrl
$myaddr = get_my_url(); $myaddr = get_my_url();
} }
$target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 ); $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
/* The auto_request form only has the profile address
/*
*
* 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. * it doesn't matter if they know you or not.
*
*/ */
if ($a->profile['page-flags'] == PAGE_NORMAL) { if ($a->profile['page-flags'] == PAGE_NORMAL) {
$tpl = get_markup_template('dfrn_request.tpl'); $tpl = get_markup_template('dfrn_request.tpl');
} else { } else {
@ -726,20 +636,17 @@ function dfrn_request_content(App $a) {
get_server() get_server()
); );
$o = replace_macros($tpl,array( $o = replace_macros($tpl, array(
'$header' => t('Friend/Connection Request'), '$header' => t('Friend/Connection Request'),
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'), '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
'$pls_answer' => t('Please answer the following:'), '$pls_answer' => t('Please answer the following:'),
'$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))), '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'), $a->profile['name']), false, '', array(t('No'), t('Yes'))),
/*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
'$no' => t('No'), */
'$add_note' => t('Add a personal note:'), '$add_note' => t('Add a personal note:'),
'$page_desc' => $page_desc, '$page_desc' => $page_desc,
'$friendica' => t('Friendica'), '$friendica' => t('Friendica'),
'$statusnet' => t('GNU Social (Pleroma, Mastodon)'), '$statusnet' => t('GNU Social (Pleroma, Mastodon)'),
'$diaspora' => t('Diaspora (Socialhome, Hubzilla)'), '$diaspora' => t('Diaspora (Socialhome, Hubzilla)'),
'$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$diasnote' => sprintf(t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'), $target_addr),
'$your_address' => t('Your Identity Address:'), '$your_address' => t('Your Identity Address:'),
'$invite_desc' => $invite_desc, '$invite_desc' => $invite_desc,
'$submit' => t('Submit Request'), '$submit' => t('Submit Request'),