friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix formatting in mod 

- 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

42
mod/api.php
View File

@ -6,7 +6,8 @@ use Friendica\Database\DBM;
require_once('include/api.php');
function oauth_get_client($request){
function oauth_get_client($request)
{
$params = $request->get_parameters();
@ -15,8 +16,7 @@ function oauth_get_client($request){
$r = q("SELECT `clients`.*
FROM `clients`, `tokens`
WHERE `clients`.`client_id`=`tokens`.`client_id`
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'",
dbesc($token));
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
if (!DBM::is_result($r))
return null;
@ -24,8 +24,8 @@ function oauth_get_client($request){
return $r[0];
}
function api_post(App $a) {
function api_post(App $a)
{
if (!local_user()) {
notice(t('Permission denied.') . EOL);
return;
@ -35,10 +35,10 @@ function api_post(App $a) {
notice(t('Permission denied.') . EOL);
return;
}
}
function api_content(App $a) {
function api_content(App $a)
{
if ($a->cmd == 'api/oauth/authorize') {
/*
* api/oauth/authorize interact with the user. return a standard page
@ -46,35 +46,35 @@ function api_content(App $a) {
$a->page['template'] = "minimal";
// get consumer/client from request token
try {
$request = OAuthRequest::from_request();
} catch (Exception $e) {
echo "<pre>"; var_dump($e); killme();
echo "<pre>";
var_dump($e);
killme();
}
if (x($_POST, 'oauth_yes')) {
$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']);
$verifier = md5($app['secret'] . local_user());
Config::set("oauth", $verifier, local_user());
if ($consumer->callback_url != null) {
$params = $request->get_parameters();
$glue = "?";
if (strstr($consumer->callback_url,$glue)) $glue="?";
if (strstr($consumer->callback_url, $glue)) {
$glue = "?";
}
goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
killme();
}
$tpl = get_markup_template("oauth_authorize_done.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Authorize application connection'),
@ -83,11 +83,8 @@ function api_content(App $a) {
));
return $o;
}
if (!local_user()) {
/// @TODO We need login form to redirect to this page
notice( t('Please login to continue.') . EOL );
@ -96,10 +93,9 @@ function api_content(App $a) {
//FKOAuth1::loginUser(4);
$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');
$o = replace_macros($tpl, array(

8
mod/bookmarklet.php
View File

@ -6,14 +6,16 @@ use Friendica\Core\System;
require_once('include/conversation.php');
require_once('include/items.php');
function bookmarklet_init(App $a) {
function bookmarklet_init(App $a)
{
$_GET["mode"] = "minimal";
}
function bookmarklet_content(App $a) {
function bookmarklet_content(App $a)
{
if (!local_user()) {
$o = '<h2>'.t('Login').'</h2>';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
$o = '<h2>' . t('Login') . '</h2>';
return $o;
}

167
mod/dfrn_request.php
View File

@ -1,4 +1,5 @@
<?php
/**
* @file mod/dfrn_request.php
* @brief Module: dfrn_request
@ -31,7 +32,6 @@ function dfrn_request_init(App $a)
return;
}
/**
* Function: dfrn_request_post
*
@ -47,36 +47,25 @@ function dfrn_request_init(App $a)
* 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))) {
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return;
}
if (x($_POST, 'cancel')) {
goaway(System::baseUrl());
}
/*
*
* 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).
* That brings us here:
*
*/
if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
/*
* Ensure this is a valid request
*/
// 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']));
$aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
@ -86,11 +75,7 @@ function dfrn_request_post(App $a) {
$pending = 1;
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",
intval(local_user()),
dbesc(normalise_link($dfrn_url))
@ -98,38 +83,24 @@ function dfrn_request_post(App $a) {
if (DBM::is_result($r)) {
if (strlen($r[0]['dfrn-id'])) {
/*
* We don't need to be here. It has already happened.
*/
// We don't need to be here. It has already happened.
notice(t("This introduction has already been accepted.") . EOL);
return;
}
else
} else
$contact_record = $r[0];
}
if (is_array($contact_record)) {
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d",
intval($aes_allow),
intval($hidden),
intval($contact_record['id'])
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", intval($aes_allow), intval($hidden), intval($contact_record['id'])
);
}
else {
/*
* Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
*/
} else {
// Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
$parms = Probe::profile($dfrn_url);
if (!count($parms)) {
notice(t('Profile location is not valid or does not contain profile information.') . EOL);
return;
}
else {
} else {
if (!x($parms, 'fn')) {
notice(t('Warning: profile location has no identifiable owner name.') . EOL);
}
@ -138,9 +109,7 @@ function dfrn_request_post(App $a) {
}
$invalid = Probe::validDfrn($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 );
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;
}
}
@ -152,10 +121,7 @@ function dfrn_request_post(App $a) {
// Escape the entire array
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`,
`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)",
@ -202,10 +168,7 @@ function dfrn_request_post(App $a) {
$forwardurl = System::baseUrl() . "/contacts";
}
/*
* Allow the blocked remote notification to complete
*/
// Allow the blocked remote notification to complete
if (is_array($contact_record)) {
$dfrn_request = $contact_record['request'];
}
@ -215,17 +178,13 @@ function dfrn_request_post(App $a) {
}
// (ignore reply, nothing we can do it failed)
// Old: goaway(zrl($dfrn_url));
goaway($forwardurl);
return; // NOTREACHED
}
}
// invalid/bogus request
notice(t('Unrecoverable protocol error.') . EOL);
goaway(System::baseUrl());
return; // NOTREACHED
@ -252,7 +211,6 @@ function dfrn_request_post(App $a) {
* in $a->argv[1] and we should have their complete info in $a->profile.
*
*/
if (!(is_array($a->profile) && count($a->profile))) {
notice(t('Profile unavailable.') . EOL);
return;
@ -268,13 +226,8 @@ function dfrn_request_post(App $a) {
$blocked = 1;
$pending = 1;
if (x($_POST, 'dfrn_url')) {
/*
* Block friend request spam
*/
// Block friend request spam
if ($maxreq) {
$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
dbesc(datetime_convert('UTC', 'UTC', 'now - 24 hours')),
@ -288,12 +241,9 @@ function dfrn_request_post(App $a) {
}
}
/*
*
* 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
*/
$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
@ -312,7 +262,7 @@ 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']);
if (!strlen($url)) {
@ -330,7 +280,6 @@ function dfrn_request_post(App $a) {
$url = Probe::webfingerDfrn($url, $hcard);
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus.
// We do this even if it is not OStatus.
// we only need to pass this through another section of the code.
@ -355,12 +304,10 @@ function dfrn_request_post(App $a) {
if (strlen($ret[0]['issued-id'])) {
notice(t('You have already introduced yourself here.') . EOL);
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);
return;
}
else {
} else {
$contact_record = $ret[0];
$parms = array('dfrn-request' => $ret[0]['request']);
}
@ -375,8 +322,7 @@ function dfrn_request_post(App $a) {
dbesc($issued_id),
intval($contact_record['id'])
);
}
else {
} else {
$url = validate_url($url);
if (!$url) {
notice(t('Invalid profile URL.') . EOL);
@ -401,8 +347,7 @@ function dfrn_request_post(App $a) {
if (!count($parms)) {
notice(t('Profile location is not valid or does not contain profile information.') . EOL);
goaway(System::baseUrl() . '/' . $a->cmd);
}
else {
} else {
if (!x($parms, 'fn')) {
notice(t('Warning: profile location has no identifiable owner name.') . EOL);
}
@ -411,15 +356,12 @@ function dfrn_request_post(App $a) {
}
$invalid = Probe::validDfrn($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 );
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;
}
}
$parms['url'] = $url;
$parms['issued-id'] = $issued_id;
$photo = $parms["photo"];
@ -461,7 +403,6 @@ function dfrn_request_post(App $a) {
Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
}
}
}
if ($r === false) {
notice(t('Failed to update contact record.') . EOL);
@ -483,13 +424,11 @@ 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.
if (!$failed) {
info(t('Your introduction has been sent.') . EOL);
}
// "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
@ -502,20 +441,17 @@ function dfrn_request_post(App $a) {
// END $network === NETWORK_DFRN
} 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
*
*/
// Diaspora needs the uri in the format user@domain.tld
// Diaspora will support the remote subscription in a future version
if ($network == NETWORK_DIASPORA) {
$uri = $nickname . '@' . $a->get_hostname();
if ($a->get_path())
if ($a->get_path()) {
$uri .= '/' . $a->get_path();
}
$uri = urlencode($uri);
} else {
@ -530,23 +466,18 @@ function dfrn_request_post(App $a) {
notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
return;
}
} return;
}
function dfrn_request_content(App $a) {
function dfrn_request_content(App $a)
{
if (($a->argc != 2) || (!count($a->profile))) {
return "";
}
// "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.
if (x($_GET, 'dfrn_url')) {
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 */
@ -556,15 +487,14 @@ function dfrn_request_content(App $a) {
// 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]) {
notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
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'])));
$aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
$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") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
@ -595,20 +525,15 @@ function dfrn_request_content(App $a) {
'dfrn_rawurl' => $_GET['dfrn_url']
));
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.
$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
dbesc($_GET['confirm_key'])
);
if (DBM::is_result($intro)) {
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d LIMIT 1",
intval($intro[0]['contact-id'])
@ -617,11 +542,11 @@ function dfrn_request_content(App $a) {
$auto_confirm = false;
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;
}
if (!$auto_confirm) {
notification(array(
'type' => NOTIFY_INTRO,
'notify_flags' => $r[0]['notify-flags'],
@ -650,7 +575,6 @@ function dfrn_request_content(App $a) {
);
dfrn_confirm_post($a, $handsfree);
}
}
if (!$auto_confirm) {
@ -666,13 +590,8 @@ function dfrn_request_content(App $a) {
killme();
return; // NOTREACHED
}
else {
/*
* Normal web request. Display our user's introduction form.
*/
} 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')) {
notice(t('Public access denied.') . EOL);
@ -680,11 +599,7 @@ function dfrn_request_content(App $a) {
}
}
/*
* Try to auto-fill the profile address
*/
// Try to auto-fill the profile address
// At first look if an address was provided
// Otherwise take the local address
if (x($_GET, 'addr') && ($_GET['addr'] != "")) {
@ -704,15 +619,10 @@ function dfrn_request_content(App $a) {
$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
* it doesn't matter if they know you or not.
*
*/
if ($a->profile['page-flags'] == PAGE_NORMAL) {
$tpl = get_markup_template('dfrn_request.tpl');
} else {
@ -731,9 +641,6 @@ function dfrn_request_content(App $a) {
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
'$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' => sprintf( t('Does %s know you?'),$a->profile['name']),
'$yes' => t('Yes'),
'$no' => t('No'), */
'$add_note' => t('Add a personal note:'),
'$page_desc' => $page_desc,
'$friendica' => t('Friendica'),