X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=aa14bc473dddd54b1ba40267b53e6ba42e0a52b6;hb=7011f71e8f3e6de89dae2d46d4dece0d02a78351;hp=ce83001b480de9ae6bd4800ae84a880b0b33830f;hpb=e921b97a7f4e6f16e499eb7a8dd496f88d18277a;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ce83001b48..aa14bc473d 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -142,12 +142,13 @@ function dfrn_request_post(&$a) { * 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`, `network`, `aes_allow`) - VALUES ( %d, '%s', '%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'], @@ -156,6 +157,7 @@ function dfrn_request_post(&$a) { $parms['dfrn-confirm'], $parms['dfrn-notify'], $parms['dfrn-poll'], + $parms['dfrn-poco'], dbesc(NETWORK_DFRN), intval($aes_allow) ); @@ -250,12 +252,41 @@ function dfrn_request_post(&$a) { * * 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 `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE "); + 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']) { @@ -269,6 +300,7 @@ function dfrn_request_post(&$a) { } } + $url = trim($_POST['dfrn_url']); if(! strlen($url)) { notice( t("Invalid locator") . EOL ); @@ -277,14 +309,15 @@ function dfrn_request_post(&$a) { // 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); @@ -342,7 +375,7 @@ function dfrn_request_post(&$a) { 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 ); @@ -369,12 +402,13 @@ function dfrn_request_post(&$a) { dbesc_array($parms); - $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`, - `request`, `confirm`, `notify`, `poll`, `network` ) - VALUES ( %d, '%s', '%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'], @@ -384,6 +418,7 @@ function dfrn_request_post(&$a) { $parms['dfrn-confirm'], $parms['dfrn-notify'], $parms['dfrn-poll'], + $parms['dfrn-poco'], dbesc(NETWORK_DFRN) ); @@ -533,24 +568,24 @@ function dfrn_request_content(&$a) { if(count($r)) { if($r[0]['page-flags'] != PAGE_NORMAL) $auto_confirm = true; - if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) { - $email_tpl = get_intltext_template('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'], + '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'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - - // This is a redundant notification - no point throwing errors if it fails. } + if($auto_confirm) { require_once('mod/dfrn_confirm.php'); $handsfree = array( @@ -634,14 +669,14 @@ function dfrn_request_content(&$a) { $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), - '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'), + '$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' => 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, - '$friendika' => t('Friendika'), + '$friendika' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), '$diasnote' => t('- please share from your own site as noted above'),