return;
- if($_POST['cancel']) {
- goaway($a->get_baseurl());
+ if(x($_POST, 'cancel')) {
+ goaway(z_root());
}
* 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 `url` = '%s' AND `self` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
intval(local_user()),
- dbesc($dfrn_url)
+ dbesc($dfrn_url),
+ dbesc(normalise_link($dfrn_url))
);
if(count($r)) {
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 ) ;
+ 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;
}
}
* Create a contact record on our site for the other person
*/
- $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', '%s', %d)",
+ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
+ `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`)
+ VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
intval(local_user()),
datetime_convert(),
dbesc($dfrn_url),
+ dbesc(normalise_link($dfrn_url)),
$parms['fn'],
$parms['nick'],
$parms['photo'],
$parms['dfrn-confirm'],
$parms['dfrn-notify'],
$parms['dfrn-poll'],
+ $parms['dfrn-poco'],
+ dbesc(NETWORK_DFRN),
intval($aes_allow)
);
}
if($r) {
- notice( t("Introduction complete.") . EOL);
+ info( t("Introduction complete.") . EOL);
}
/**
// invalid/bogus request
notice( t('Unrecoverable protocol error.') . EOL );
- goaway($a->get_baseurl());
+ goaway(z_root());
return; // NOTREACHED
}
intval($uid)
);
if(count($r) > $maxreq) {
- notice( $a->profile['name'] . t(' has received too many connection requests today.') . 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('Friends are advised to please try again in 24 hours.') . EOL);
return;
}
}
+ /**
+ *
+ * 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`
+ FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
+ WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
+ AND `contact`.`network` != '%s'
+ AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
+ dbesc(NETWORK_MAIL)
+ );
+ if(count($r)) {
+ foreach($r as $rr) {
+ if(! $rr['rel']) {
+ q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($rr['cid'])
+ );
+ }
+ q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
+ intval($rr['iid'])
+ );
+ }
+ }
+
+ /**
+ *
+ * Cleanup any old email intros - which will have a greater lifetime
+ */
+
+ $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
+ AND `contact`.`network` = '%s'
+ AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
+ dbesc(NETWORK_MAIL)
+ );
+ if(count($r)) {
+ foreach($r as $rr) {
+ if(! $rr['rel']) {
+ q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($rr['cid'])
+ );
+ }
+ q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
+ intval($rr['iid'])
+ );
+ }
+ }
+
+
$url = trim($_POST['dfrn_url']);
if(! strlen($url)) {
notice( t("Invalid locator") . EOL );
// Canonicalise email-style profile locator
- $url = webfinger_dfrn($url);
+ $hcard = '';
+ $url = webfinger_dfrn($url,$hcard);
if(substr($url,0,5) === 'stat:') {
- $network = 'stat';
+ $network = NETWORK_OSTATUS;
$url = substr($url,5);
}
else {
- $network = 'dfrn';
+ $network = NETWORK_DFRN;
}
logger('dfrn_request: url: ' . $url);
}
- if($network === 'dfrn') {
+ if($network === NETWORK_DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid),
dbesc($url)
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);
+ elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) {
+ notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
return;
}
else {
require_once('Scrape.php');
- $parms = scrape_dfrn($url);
+ $parms = scrape_dfrn(($hcard) ? $hcard : $url);
if(! count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL );
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 ) ;
+ 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;
}
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' )",
+ $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`,`name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
+ `request`, `confirm`, `notify`, `poll`, `poco`, `network` )
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($uid),
- datetime_convert(),
+ dbesc(datetime_convert()),
$parms['url'],
+ dbesc(normalise_link($parms['url'])),
$parms['fn'],
$parms['nick'],
$parms['issued-id'],
$parms['dfrn-request'],
$parms['dfrn-confirm'],
$parms['dfrn-notify'],
- $parms['dfrn-poll']
+ $parms['dfrn-poll'],
+ $parms['dfrn-poco'],
+ dbesc(NETWORK_DFRN)
);
// find the contact record we just created
// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if(! $failed)
- notice( 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.
. (($aes_allow) ? "&aes_allow=1" : "")
);
// NOTREACHED
- // END $network === 'dfrn'
+ // END $network === NETWORK_DFRN
}
- elseif($network === 'stat') {
+ elseif($network === NETWORK_OSTATUS) {
/**
*
* OStatus network
* Check contact existence
- * Try and scrape together enough information to create a contact record, with us as REL_VIP
+ * 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
*
$url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
goaway($url);
// NOTREACHED
- // END $network === 'stat'
+ // END $network === NETWORK_OSTATUS
}
} return;
if(! function_exists('dfrn_request_content')) {
function dfrn_request_content(&$a) {
-
-
if(($a->argc != 2) || (! count($a->profile)))
return "";
if(x($_GET,'dfrn_url')) {
if(! local_user()) {
- notice( t("Please login to confirm introduction.") . EOL );
+ 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,'/');
+
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 .= load_view_file("view/dfrn_req_confirm.tpl");
- $o = replace_macros($o,array(
+ $tpl = get_markup_template("dfrn_req_confirm.tpl");
+ $o = replace_macros($tpl,array(
'$dfrn_url' => $dfrn_url,
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
'$confirm_key' => $confirm_key,
- '$username' => $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),
+ '$submit' => t('Confirm'),
'$uid' => $_SESSION['uid'],
'$nickname' => $a->user['nickname'],
'dfrn_rawurl' => $_GET['dfrn_url']
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']) : t('[Name Withheld]')),
- '$url' => stripslashes($r[0]['url']),
- '$myname' => $r[0]['username'],
- '$siteurl' => $a->get_baseurl(),
- '$sitename' => $a->config['sitename']
+
+ if(! $auto_confirm) {
+ require_once('include/enotify.php');
+ notification(array(
+ 'type' => NOTIFY_INTRO,
+ 'notify_flags' => $r[0]['notify-flags'],
+ 'language' => $r[0]['language'],
+ 'to_name' => $r[0]['username'],
+ 'to_email' => $r[0]['email'],
+ 'uid' => $r[0]['uid'],
+ 'link' => $a->get_baseurl() . '/notifications/intros',
+ 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+ 'source_link' => $r[0]['url'],
+ 'source_photo' => $r[0]['photo'],
+ 'verb' => ACTIVITY_REQ_FRIEND,
+ 'otype' => 'intro'
));
- $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(
);
}
}
+
killme();
return; // NOTREACHED
}
* Normal web request. Display our user's introduction form.
*/
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ notice( t('Public access denied.') . EOL);
+ return;
+ }
+
+
/**
* Try to auto-fill the profile address
*/
$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
}
else {
- $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
+ $myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
}
}
- else {
- $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
+ elseif(x($_GET,'addr')) {
+ $myaddr = hex2bin($_GET['addr']);
+ }
+ else {
+ /* $_GET variables are already urldecoded */
+ $myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
}
+ $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+
+
/**
*
* The auto_request form only has the profile address
*/
if($a->profile['page-flags'] == PAGE_NORMAL)
- $tpl = load_view_file('view/dfrn_request.tpl');
+ $tpl = get_markup_template('dfrn_request.tpl');
else
- $tpl = load_view_file('view/auto_request.tpl');
+ $tpl = get_markup_template('auto_request.tpl');
+
+ $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'),
+ $target_addr) . EOL . EOL;
+
+ $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+
+ // see if we are allowed to have NETWORK_MAIL2 contacts
+
+ $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+ if(get_config('system','dfrn_only'))
+ $mail_disabled = 1;
+
+ if(! $mail_disabled) {
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ intval($a->profile['uid'])
+ );
+ if(! count($r))
+ $mail_disabled = 1;
+ }
+
+ $emailnet = (($mail_disabled) ? '' : t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"));
+
+ $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.');
$o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
+ '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
- '$does_know' => t('Does $name know you?'),
+ '$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' => t('Please enter your profile address from one of the following supported social networks:'),
- '$friendika' => t('Friendika'),
+ '$page_desc' => $page_desc,
+ '$friendica' => t('Friendica'),
'$statusnet' => t('StatusNet/Federated Social Web'),
- '$private_net' => t("Private \x28secure\x29 network"),
- '$public_net' => t("Public \x28insecure\x29 network"),
- '$your_address' => t('Your profile address:'),
+ '$diaspora' => t('Diaspora'),
+ '$diasnote' => t('- please share from your own site as noted above'),
+ '$your_address' => t('Your Identity Address:'),
+ '$invite_desc' => $invite_desc,
+ '$emailnet' => $emailnet,
'$submit' => t('Submit Request'),
'$cancel' => t('Cancel'),
'$nickname' => $a->argv[1],
}
return; // Somebody is fishing.
-}}
\ No newline at end of file
+}}
projects / friendica.git / blobdiff