diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/contacts.php | 10 | ||||
| -rw-r--r-- | mod/dfrn_request.php | 8 | ||||
| -rw-r--r-- | mod/follow.php | 200 | ||||
| -rw-r--r-- | mod/xrd.php | 13 |
4 files changed, 225 insertions, 6 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index bd5bf8ea8..936063715 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -8,6 +8,14 @@ function contacts_init(&$a) { if($a->config['register_policy'] != REGISTER_CLOSED) $a->page['aside'] .= '<div class="side-invite-link-wrapper" id="side-invite-link-wrapper" ><a href="invite" class="side-invite-link" id="side-invite-link">' . t("Invite Friends") . '</a></div>'; + + $tpl = load_view_file('view/follow.tpl'); + $a->page['aside'] .= replace_macros($tpl,array( + '$label' => t('Connect/Follow [profile address]'), + '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$follow' => t('Follow') + )); + } function contacts_post(&$a) { @@ -150,6 +158,8 @@ function contacts_content(&$a) { return; } + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + require_once('view/contact_selectors.php'); $tpl = load_view_file("view/contact_edit.tpl"); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ddf495986..a7296fec0 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -472,13 +472,17 @@ function dfrn_request_content(&$a) { return; // NOTREACHED } else { - + $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : ''); // Normal web request. Display our user's introduction form. 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])); + $o .= replace_macros($tpl,array( + '$nickname' => $a->argv[1], + '$name' => $a->profile['name'], + '$myaddr' => $myaddr + )); return $o; } diff --git a/mod/follow.php b/mod/follow.php new file mode 100644 index 000000000..7ac9a50c3 --- /dev/null +++ b/mod/follow.php @@ -0,0 +1,200 @@ +<?php + +require_once('Scrape.php'); + +function follow_post(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + goaway($_SESSION['return_url']); + // NOTREACHED + } + + $url = notags(trim($_POST['url'])); + + if($url) { + $links = lrdd($url); + if(count($links)) { + foreach($links as $link) { + if($link['@attributes']['rel'] === NAMESPACE_DFRN) + $dfrn = $link['@attributes']['href']; + if($link['@attributes']['rel'] === 'salmon') + $notify = $link['@attributes']['href']; + if($link['@attributes']['rel'] === NAMESPACE_FEED) + $poll = $link['@attributes']['href']; + if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') + $hcard = $link['@attributes']['href']; + if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') + $profile = $link['@attributes']['href']; + + } + } + } + + // If we find a DFRN site, send our subscriber to the other person's + // dfrn_request page and all the other details will get sorted. + + if(strlen($dfrn)) { + $ret = scrape_dfrn($dfrn); + if(is_array($ret) && x($ret,'dfrn-request')) { + if(strlen($a->path)) + $myaddr = urlencode($a->get_baseurl() . '/profile/' . $a->user['nickname']); + else + $myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname()); + + goaway($ret['dfrn-request'] . "&address=$myaddr"); + + // NOTREACHED + } + } + + if($hcard) { + $vcard = scrape_vcard($hcard); + } + + if(! $profile) + $profile = $url; + + // do we have enough information? + + if(! x($vcard,'fn')) + if(x($vcard,'nick')) + $vcard['fn'] = $vcard['nick']; + + if(! ((x($vcard['fn'])) && ($poll) && ($notify) && ($profile))) { + notice( t('The profile address specified does not provide adequate information.') . EOL); + goaway($_SESSION['return_url']); + } + + if(! x($vcard,'photo')) + $vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; + + // check if we already have a contact + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1", + intval(local_user()), + dbesc($poll) + ); + if($r) { + // update contact + if($r[0]['rel'] == REL_VIP) { + q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval(REL_BUD), + intval($r[0]['id']), + intval(local_user()) + ); + } + } + else { + // create contact record + $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, + `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ", + intval(local_user()), + dbesc(datetime_convert()), + dbesc($profile), + dbesc($notify), + dbesc($poll), + dbesc($vcard['fn']), + dbesc($vcard['nick']), + dbesc($vcard['photo']), + dbesc('stat'), + intval(REL_FAN) + ); + } + $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", + dbesc($profile), + intval(local_user()) + ); + if(! count($r)) { + notice( t('Unable to retrieve contact information.') . EOL); + goaway($_SESSION['return_url']); + // NOTREACHED + } + + $contact = $r[0]; + $contact_id = $r[0]['id']; + + require_once("Photo.php"); + + $photo_failure = false; + + $filename = basename($vcard['photo']); + $img_str = fetch_url($vcard['photo'],true); + $img = new Photo($img_str); + if($img->is_valid()) { + + $img->scaleImageSquare(175); + + $hash = photo_new_resource(); + + $r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 4 ); + + if($r === false) + $photo_failure = true; + + $img->scaleImage(80); + + $r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 5 ); + + if($r === false) + $photo_failure = true; + + $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; + $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; + } + else + $photo_failure = true; + + if($photo_failure) { + $photo = $a->get_baseurl() . '/images/default-profile.jpg'; + $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; + } + + $r = q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' + WHERE `id` = %d LIMIT 1 + ", + dbesc($photo), + dbesc($thumb), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($contact_id) + ); + + + // pull feed and consume it, which should subscribe to the hub. + + + // create a follow slap + + $tpl = load_view_file('view/follow_slap.tpl'); + $slap = replace_macros($tpl, array( + '$name' => $a->user['username'], + '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'], + '$photo' => $a->contact['photo'], + '$thumb' => $a->contact['thumb'], + '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME), + '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(), + '$title' => '', + '$type' => 'text', + '$content' => t('following'), + '$nick' => $a->user['nickname'], + '$verb' => ACTIVITY_FOLLOW + )); + + $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` + WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", + intval(local_user()) + ); + + require_once('include/salmon.php'); + slapper($r[0],$contact,$slap); + + goaway($_SESSION['return_url']); + // NOTREACHED +} diff --git a/mod/xrd.php b/mod/xrd.php index 47516e8dd..0b4bd0d1e 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -5,11 +5,16 @@ require_once('salmon.php'); function xrd_content(&$a) { $uri = urldecode(notags(trim($_GET['uri']))); - $local = str_replace('acct:', '', $uri); - if(substr($local,0,2) == '//') - $local = substr($local,2); - $name = substr($local,0,strpos($local,'@')); + if(substr($uri,0,4) === 'http') + $name = basename($uri); + else { + $local = str_replace('acct:', '', $uri); + if(substr($local,0,2) == '//') + $local = substr($local,2); + + $name = substr($local,0,strpos($local,'@')); + } $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($name) |