Merge pull request #5 from fabrixxm/master

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 98901e9f56c80c4e10745c0e9d4a0eb4128ab37d..9755895ced0220cb398342798a0256f1dbab10c2 100644 (file)
--- 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)
                                        );
@@ -277,14 +279,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 +345,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 +372,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 +388,7 @@ function dfrn_request_post(&$a) {
                                        $parms['dfrn-confirm'],
                                        $parms['dfrn-notify'],
                                        $parms['dfrn-poll'],
+                                       $parms['dfrn-poco'],
                                        dbesc(NETWORK_DFRN)
                                );
 
@@ -611,6 +616,9 @@ function dfrn_request_content(&$a) {
                        $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
@@ -624,19 +632,24 @@ function dfrn_request_content(&$a) {
                else
                        $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 social networks:");
+
                $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' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
-                       '$friendika' => t('Friendika'),
+                       '$page_desc' => $page_desc,
+                       '$friendika' => t('Friendica'),
                        '$statusnet' => t('StatusNet/Federated Social Web'),
-                       '$private_net' => t("Private \x28secure\x29 network"),
-                       '$public_net' => t("Public \x28insecure\x29 network"),
+                       '$diaspora' => t('Diaspora'),
+                       '$diasnote' => t('- please share from your own site as noted above'),
                        '$your_address' => t('Your Identity Address:'),
                        '$submit' => t('Submit Request'),
                        '$cancel' => t('Cancel'),