DBA: Nothing really done ..

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index a354b345751a7b934ed88ea9fe832fb5f35acf84..ae8cb200c74f68f1d70f1a1440e20038f2f8e50d 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,7 +2,7 @@
 
 require_once('Scrape.php');
 
-function follow_post(&$a) {
+function follow_init(&$a) {
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -10,7 +10,7 @@ function follow_post(&$a) {
                // NOTREACHED
        }
 
-       $url = $orig_url = notags(trim($_POST['url']));
+       $url = $orig_url = notags(trim($_REQUEST['url']));
 
        // remove ajax junk, e.g. Twitter
 
@@ -22,6 +22,14 @@ function follow_post(&$a) {
                // NOTREACHED
        }
 
+
+       if(! $url) {
+               notice( t('Connect URL missing.') . EOL);
+               goaway($_SESSION['return_url']);
+               // NOTREACHED
+       }
+
+
        $ret = probe_url($url);
 
        if($ret['network'] === NETWORK_DFRN) {
@@ -34,6 +42,18 @@ function follow_post(&$a) {
                
                // NOTREACHED
        }
+       else {
+               if(get_config('system','dfrn_only')) {
+                       notice( t('This site is not configured to allow communications with other networks.') . EOL);
+                       notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+                       goaway($_SESSION['return_url']);
+               }
+       }
+       
+       // This just confuses things, remove it
+       if($ret['network'] === NETWORK_DIASPORA)
+               $ret['url'] = str_replace('?absolute=true','',$ret['url']);
+
 
        // do we have enough information?
        
@@ -50,16 +70,25 @@ function follow_post(&$a) {
                goaway($_SESSION['return_url']);
        }
 
+       if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
+               notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
+               $ret['notify'] = '';
+       }
 
        if(! $ret['notify']) {
                notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
        }
 
        $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+       $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+
        if($ret['network'] === NETWORK_MAIL) {
                $writeable = 1;
                
        }
+       if($ret['network'] === NETWORK_DIASPORA)
+               $writeable = 1;
+
        // check if we already have a contact
        // the poll url is more reliable than the profile url, as we may have
        // indirect links or webfinger links
@@ -71,33 +100,43 @@ function follow_post(&$a) {
 
        if(count($r)) {
                // update contact
-               if($r[0]['rel'] == REL_VIP) {
+               if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
                        q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                               intval(REL_BUD),
+                               intval(CONTACT_IS_FRIEND),
                                intval($r[0]['id']),
                                intval(local_user())
                        );
                }
        }
        else {
+
+               $new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+               if($ret['network'] === NETWORK_DIASPORA)
+                       $new_relation = CONTACT_IS_FOLLOWER;
+
                // create contact record 
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-                       `writable`, `blocked`, `readonly`, `pending` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+                       `writable`, `hidden`, `blocked`, `readonly`, `pending` )
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
                        intval(local_user()),
                        dbesc(datetime_convert()),
                        dbesc($ret['url']),
+                       dbesc(normalise_link($ret['url'])),
                        dbesc($ret['addr']),
                        dbesc($ret['alias']),
+                       dbesc($ret['batch']),
                        dbesc($ret['notify']),
                        dbesc($ret['poll']),
+                       dbesc($ret['poco']),
                        dbesc($ret['name']),
                        dbesc($ret['nick']),
                        dbesc($ret['photo']),
                        dbesc($ret['network']),
-                       intval(($ret['network'] === NETWORK_MAIL) ? REL_BUD : REL_FAN),
+                       dbesc($ret['pubkey']),
+                       intval($new_relation),
                        intval($ret['priority']),
-                       intval($writeable)
+                       intval($writeable),
+                       intval($hidden)
                );
        }
 
@@ -164,12 +203,21 @@ function follow_post(&$a) {
                        intval(local_user())
        );
 
-
-       if((count($r)) && (x($contact,'notify')) && (strlen($contact['notify']))) {
-               require_once('include/salmon.php');
-               slapper($r[0],$contact['notify'],$slap);
+       if(count($r)) {
+               if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+                       require_once('include/salmon.php');
+                       slapper($r[0],$contact['notify'],$slap);
+               }
+               if($contact['network'] == NETWORK_DIASPORA) {
+                       require_once('include/diaspora.php');
+                       $ret = diaspora_share($a->user,$contact);
+                       logger('mod_follow: diaspora_share returns: ' . $ret);
+               }
        }
 
+       if(strstr($_SESSION['return_url'],'contacts'))
+               goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
        goaway($_SESSION['return_url']);
        // NOTREACHED
 }