optimise the commented date view

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 6b9558b86f4b506e9d32e94cfa6b16b6751482fe..5d789f480bb31cd34ddf3472004351eb1faf2321 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -12,10 +12,6 @@
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               return;
-       }
-
        if($a->argc > 1)
                $which = $a->argv[1];
 
@@ -147,8 +143,8 @@ function dfrn_request_post(&$a) {
                                         */
 
                                        $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)",
+                                               `request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`) 
+                                               VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
                                                intval(local_user()),
                                                datetime_convert(),
                                                dbesc($dfrn_url),
@@ -160,6 +156,7 @@ function dfrn_request_post(&$a) {
                                                $parms['dfrn-confirm'],
                                                $parms['dfrn-notify'],
                                                $parms['dfrn-poll'],
+                                               dbesc(NETWORK_DFRN),
                                                intval($aes_allow)
                                        );
                                }
@@ -280,14 +277,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);
@@ -298,7 +296,7 @@ function dfrn_request_post(&$a) {
                }
 
 
-               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)
@@ -309,7 +307,7 @@ function dfrn_request_post(&$a) {
                                        notice( t('You have already introduced yourself here.') . EOL );
                                        return;
                                }
-                               elseif($ret[0]['rel'] == REL_BUD) {
+                               elseif($ret[0]['rel'] == CONTACT_IS_FRIEND) {
                                        notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
                                        return;
                                }
@@ -345,7 +343,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 );
@@ -373,8 +371,8 @@ 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` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+                                       `request`, `confirm`, `notify`, `poll`, `network` )
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
                                        intval($uid),
                                        datetime_convert(),
                                        $parms['url'],
@@ -386,7 +384,8 @@ function dfrn_request_post(&$a) {
                                        $parms['dfrn-request'],
                                        $parms['dfrn-confirm'],
                                        $parms['dfrn-notify'],
-                                       $parms['dfrn-poll']
+                                       $parms['dfrn-poll'],
+                                       dbesc(NETWORK_DFRN)
                                );
 
                                // find the contact record we just created
@@ -437,15 +436,16 @@ function dfrn_request_post(&$a) {
                                . (($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
                         *
@@ -454,7 +454,7 @@ function dfrn_request_post(&$a) {
                        $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
                        goaway($url);
                        // NOTREACHED
-                       // END $network === 'stat'
+                       // END $network === NETWORK_OSTATUS
                }
 
        }       return;
@@ -466,8 +466,6 @@ function dfrn_request_post(&$a) {
 if(! function_exists('dfrn_request_content')) {
 function dfrn_request_content(&$a) {
 
-       
-
        if(($a->argc != 2) || (! count($a->profile)))
                return "";
 
@@ -578,6 +576,7 @@ function dfrn_request_content(&$a) {
                                );
                        }
                }
+
                killme();
                return; // NOTREACHED
        }
@@ -613,6 +612,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
@@ -626,6 +628,11 @@ 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'),
@@ -634,11 +641,11 @@ function dfrn_request_content(&$a) {
                        '$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:"),
+                       '$page_desc' => $page_desc,
                        '$friendika' => t('Friendika'),
                        '$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'),