if(x($dfrn_url)) {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
- intval($_SESSION['uid']),
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+ intval(local_user()),
dbesc($dfrn_url)
);
if(count($r)) {
if(strlen($r[0]['dfrn-id'])) {
- notice("This introduction has already been accepted." . EOL );
+ notice( t("This introduction has already been accepted.") . EOL );
return;
}
else
$parms = scrape_dfrn($dfrn_url);
if(! count($parms)) {
- notice( '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;
}
else {
if(! x($parms,'fn'))
- notice( 'Warning: profile location has no identifiable owner name.' . EOL );
+ notice( t('Warning: profile location has no identifiable owner name.') . EOL );
if(! x($parms,'photo'))
- notice( 'Warning: profile location has no profile photo.' . EOL );
+ notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms);
if($invalid) {
- notice( $invalid . ' required parameter'
- . (($invalid == 1) ? " was " : "s were " )
- . "not found at the given location." . EOL ) ;
+ notice( $invalid . t(' required parameter')
+ . (($invalid == 1) ? t(" was ") : t("s were ") )
+ . t("not found at the given location.") . EOL ) ;
return;
}
}
dbesc_array($parms);
- $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `photo`, `site-pubkey`,
+ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `aes_allow`)
- VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', %d)",
- intval($_SESSION['uid']),
+ VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+ intval(local_user()),
datetime_convert(),
dbesc($dfrn_url),
$parms['fn'],
+ $parms['nick'],
$parms['photo'],
$parms['key'],
$parms['dfrn-request'],
}
if($r) {
- notice( "Introduction complete." . EOL);
+ notice( t("Introduction complete.") . EOL);
}
// Allow the blocked remote notification to complete
// invalid/bogus request
- notice( "Unrecoverable protocol error." . EOL );
+ notice( t('Unrecoverable protocol error.') . EOL );
goaway($a->get_baseurl());
return; // NOTREACHED
}
// in $a->argv[1] and we should have their complete info in $a->profile.
if(! (is_array($a->profile) && count($a->profile))) {
- notice("Profile unavailable." . EOL);
+ notice( t('Profile unavailable.') . EOL);
return;
}
$url = trim($_POST['dfrn_url']);
if(! strlen($url)) {
- notice( "Invalid URL" . EOL );
+ notice( t("Invalid locator") . EOL );
return;
}
- // Is this an email-style DFRN locator?
+ // Canonicalise email-style profile locator
- if(strstr($url,'@')) {
- $username = substr($url,0,strpos($url,'@'));
- $hostname = substr($url,strpos($url,'@') + 1);
- require_once('Scrape.php');
-
-
- $parms = scrape_meta('https://' . $url);
- if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
- $url = sprintf($parms['dfrn-template'],$username);
- }
- else {
- $parms = scrape_meta('http://' . $url);
- if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
- $url = sprintf($parms['dfrn-template'],$username);
- }
- else {
- $url = '';
- }
- }
+ $url = webfinger_dfrn($url);
+ if(substr($url,0,5) === 'stat:') {
+ $network = 'stat';
+ $url = substr($url,5);
+ }
+ else {
+ $network = 'dfrn';
}
+ logger('dfrn_request: url: ' . $url);
+
if(! strlen($url)) {
- notice("Unable to resolve your name at the provided location." . EOL);
+ notice( t("Unable to resolve your name at the provided location.") . EOL);
return;
}
- $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
- intval($uid),
- dbesc($url)
- );
- if(count($ret)) {
- if(strlen($ret[0]['issued-id'])) {
- notice( 'You have already introduced yourself here.' . EOL );
- return;
- }
- else {
- $contact_record = $ret[0];
- $parms = array('dfrn-request' => $ret[0]['request']);
- }
- }
- $issued_id = random_string();
-
- if(is_array($contact_record)) {
- // There is a contact record but no issued-id, so this
- // is a reciprocal introduction from a known contact
- $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
- dbesc($issued_id),
- intval($contact_record['id'])
+ if($network === 'dfrn') {
+ $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+ intval($uid),
+ dbesc($url)
);
- }
- else {
-
- require_once('Scrape.php');
- $parms = scrape_dfrn($url);
+ if(count($ret)) {
+ if(strlen($ret[0]['issued-id'])) {
+ notice( t('You have already introduced yourself here.') . EOL );
+ return;
+ }
+ elseif($ret[0]['rel'] == REL_BUD) {
+ notice( t('Apparently you are already friends with .') . $a->profile['name'] . EOL);
+ return;
+ }
+ else {
+ $contact_record = $ret[0];
+ $parms = array('dfrn-request' => $ret[0]['request']);
+ }
+ }
+
+ $issued_id = random_string();
- if(! count($parms)) {
- notice( 'Profile location is not valid or does not contain profile information.' . EOL );
- killme();
+ if(is_array($contact_record)) {
+ // There is a contact record but no issued-id, so this
+ // is a reciprocal introduction from a known contact
+ $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
+ dbesc($issued_id),
+ intval($contact_record['id'])
+ );
}
else {
- if(! x($parms,'fn'))
- notice( 'Warning: profile location has no identifiable owner name.' . EOL );
- if(! x($parms,'photo'))
- notice( 'Warning: profile location has no profile photo.' . EOL );
- $invalid = validate_dfrn($parms);
- if($invalid) {
- notice( $invalid . ' required parameter'
- . (($invalid == 1) ? " was " : "s were " )
- . "not found at the given location." . EOL ) ;
+ if(! validate_url($url)) {
+ notice( t('Invalid profile URL.') . EOL);
+ goaway($a->get_baseurl() . '/' . $a->cmd);
+ return; // NOTREACHED
+ }
- return;
+ if(! allowed_url($url)) {
+ notice( t('Disallowed profile URL.') . EOL);
+ goaway($a->get_baseurl() . '/' . $a->cmd);
+ return; // NOTREACHED
}
- }
+
+
+ require_once('Scrape.php');
+ $parms = scrape_dfrn($url);
- $parms['url'] = $url;
- $parms['issued-id'] = $issued_id;
+ if(! count($parms)) {
+ notice( t('Profile location is not valid or does not contain profile information.') . EOL );
+ goaway($a->get_baseurl() . '/' . $a->cmd);
+ }
+ else {
+ if(! x($parms,'fn'))
+ 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);
+ if($invalid) {
+ notice( $invalid . t(' required parameter')
+ . (($invalid == 1) ? t(" was ") : t("s were ") )
+ . t("not found at the given location.") . EOL ) ;
+
+ return;
+ }
+ }
- dbesc_array($parms);
- $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
- intval($uid),
- datetime_convert(),
- $parms['url'],
- $parms['fn'],
- $parms['issued-id'],
- $parms['photo'],
- $parms['key'],
- $parms['dfrn-request'],
- $parms['dfrn-confirm'],
- $parms['dfrn-notify'],
- $parms['dfrn-poll']
- );
+ $parms['url'] = $url;
+ $parms['issued-id'] = $issued_id;
- // find the contact record we just created
- if($r) {
- $r = q("SELECT `id` FROM `contact`
- WHERE `uid` = '%s' AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
+
+ dbesc_array($parms);
+ $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+ `request`, `confirm`, `notify`, `poll` )
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($uid),
+ datetime_convert(),
$parms['url'],
- $parms['issued-id']
+ $parms['fn'],
+ $parms['nick'],
+ $parms['issued-id'],
+ $parms['photo'],
+ $parms['key'],
+ $parms['dfrn-request'],
+ $parms['dfrn-confirm'],
+ $parms['dfrn-notify'],
+ $parms['dfrn-poll']
);
- if(count($r))
- $contact_record = $r[0];
- }
-
- }
- if($r === false) {
- notice( 'Failed to update contact record.' . EOL );
- return;
- }
-
- $hash = random_string() . (string) time(); // Generate a confirm_key
- if(is_array($contact_record)) {
- $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
- VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
- intval($uid),
- intval($contact_record['id']),
- ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
- dbesc(trim($_POST['dfrn-request-message'])),
- dbesc($hash),
- dbesc(datetime_convert())
- );
- }
+ // find the contact record we just created
+ if($r) {
+ $r = q("SELECT `id` FROM `contact`
+ WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
+ intval($uid),
+ $parms['url'],
+ $parms['issued-id']
+ );
+ if(count($r))
+ $contact_record = $r[0];
+ }
+ }
+ if($r === false) {
+ notice( t('Failed to update contact record.') . EOL );
+ return;
+ }
- // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
+ $hash = random_string() . (string) time(); // Generate a confirm_key
+
+ if(is_array($contact_record)) {
+ $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
+ VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
+ intval($uid),
+ intval($contact_record['id']),
+ ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
+ dbesc(notags(trim($_POST['dfrn-request-message']))),
+ dbesc($hash),
+ dbesc(datetime_convert())
+ );
+ }
+
+ // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
- if(! $failed)
- notice( "Your introduction has been sent." . EOL );
+ if(! $failed)
+ notice( 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($a->get_baseurl() . "/profile/$nickname");
- $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
+ $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
+ $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
- goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : ""));
- return; // NOTREACHED
+ goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&confirm_key=' . $hash
+ . (($aes_allow) ? "&aes_allow=1" : "")
+ );
+ // NOTREACHED
+ // END $network === 'dfrn'
+ }
+ elseif($network === 'stat') {
+
+ /**
+ *
+ * OStatus network
+ * Check contact existence
+ * Try and scrape together enough information to create a contact record, with us as REL_VIP
+ * Substitute our user's feed URL into $url template
+ * Send the subscriber home to subscribe
+ *
+ **/
+
+ $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
+ goaway($url);
+ // NOTREACHED
+ // END $network === 'stat'
+ }
- }
- return;
+ } return;
}}
if(x($_GET,'dfrn_url')) {
if(! local_user()) {
- notice( "Please login to confirm introduction." . EOL );
+ notice( t("Please login to confirm introduction.") . EOL );
return login();
}
// but not as the person who needs to deal with this request.
if ($a->user['nickname'] != $a->argv[1]) {
- notice( "Incorrect identity currently logged in. Please login to <strong>this</strong> profile." . EOL);
+ notice( t("Incorrect identity currently logged in. Please login to <strong>this</strong> profile.") . EOL);
return login();
}
$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'] : "");
- $o .= file_get_contents("view/dfrn_req_confirm.tpl");
+ $o .= load_view_file("view/dfrn_req_confirm.tpl");
$o = replace_macros($o,array(
'$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
WHERE `contact`.`id` = %d LIMIT 1",
intval($intro[0]['contact-id'])
);
- if(count($r)) {
- if($r[0]['notify-flags'] & NOTIFY_INTRO) {
- $email_tpl = file_get_contents('view/request_notify_eml.tpl');
+ $auto_confirm = false;
+
+ if(count($r)) {
+ if($r[0]['page-flags'] != PAGE_NORMAL)
+ $auto_confirm = true;
+ if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
+ $email_tpl = load_view_file('view/request_notify_eml.tpl');
$email = replace_macros($email_tpl, array(
- '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : '[Name Withheld]'),
+ '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'$url' => stripslashes($r[0]['url']),
'$myname' => $r[0]['username'],
'$siteurl' => $a->get_baseurl(),
'$sitename' => $a->config['sitename']
));
- $res = mail($r[0]['email'],"Introduction received at {$a->config['sitename']}",$email,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+ $res = mail($r[0]['email'],
+ t("Introduction received at ") . $a->config['sitename'],
+ $email,
+ 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
// This is a redundant notification - no point throwing errors if it fails.
}
+ if($auto_confirm) {
+ require_once('mod/dfrn_confirm.php');
+ $handsfree = array(
+ 'uid' => $r[0]['uid'],
+ 'node' => $r[0]['nickname'],
+ 'dfrn_id' => $r[0]['issued-id'],
+ 'intro_id' => $intro[0]['id'],
+ 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0)
+ );
+ dfrn_confirm_post($a,$handsfree);
+ }
+
}
- $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1",
- dbesc($_GET['confirm_key'])
- );
+ if(! $auto_confirm) {
+
+ // If we are auto_confirming, this record will have already been nuked
+ // in dfrn_confirm_post()
+ $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1",
+ dbesc($_GET['confirm_key'])
+ );
+ }
}
killme();
return; // NOTREACHED
}
else {
-
+ $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
// Normal web request. Display our user's introduction form.
-
- $o = file_get_contents("view/dfrn_request.tpl");
- $o = replace_macros($o,array('$nickname' => $a->argv[1]));
+ if($a->profile['page-flags'] == PAGE_NORMAL)
+ $tpl = load_view_file('view/dfrn_request.tpl');
+ else
+ $tpl = load_view_file('view/auto_request.tpl');
+ $o .= replace_macros($tpl,array(
+ '$nickname' => $a->argv[1],
+ '$name' => $a->profile['name'],
+ '$myaddr' => $myaddr
+ ));
return $o;
}
+
return; // Somebody is fishing.
}}
\ No newline at end of file
projects / friendica.git / blobdiff