Preparations for statusnet connector import

diff --git a/boot.php b/boot.php
index 55318e1ec563a5364ad6ad47e771ff5ee12dce86..139564ec551b81f3df4279379c1657a30344777e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -142,6 +142,7 @@ define ( 'NETWORK_GPLUS',            'goog');    // Google+
 define ( 'NETWORK_PUMPIO',           'pump');    // pump.io
 define ( 'NETWORK_TWITTER',          'twit');    // Twitter
 define ( 'NETWORK_DIASPORA2',        'dspc');    // Diaspora connector
+define ( 'NETWORK_STATUSNET',        'stac');    // Statusnet connector
 
 define ( 'NETWORK_PHANTOM',          'unkn');    // Place holder
 
@@ -167,6 +168,7 @@ $netgroup_ids = array(
        NETWORK_PUMPIO   => (-13),
        NETWORK_TWITTER  => (-14),
        NETWORK_DIASPORA2 => (-15),
+       NETWORK_STATUSNET => (-16),
 
        NETWORK_PHANTOM  => (-127),
 );

diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 5e35ecd7e1df41faaa9f2563d1a60f3a23ad111e..dfdd2fa38f27ced6e6690ff7ddefb9596a938bfa 100644 (file)
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -86,7 +86,9 @@ function network_to_name($s) {
                NETWORK_MAIL2    => t('Email'),
                NETWORK_GPLUS    => t('Google+'),
                NETWORK_PUMPIO   => t('pump.io'),
-               NETWORK_TWITTER  => t('Twitter')
+               NETWORK_TWITTER  => t('Twitter'),
+               NETWORK_DIASPORA2 => t('Diaspora Connector'),
+               NETWORK_STATUSNET => t('Statusnet')
        );
 
        call_hooks('network_to_name', $nets);

diff --git a/mod/item.php b/mod/item.php
index 346f1a0564a6db344f3d60c1fcb698e2892967dd..08145d5a0f613fd9f5b2e9a39a39dc011e7e8463 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1127,7 +1127,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                        if(count($r)) {
                                $profile = $r[0]['url'];
                                //set newname to nick, find alias
-                               if(($r[0]['network'] === NETWORK_OSTATUS) OR ($r[0]['network'] === NETWORK_TWITTER)) {
+                               if(($r[0]['network'] === NETWORK_OSTATUS) OR ($r[0]['network'] === NETWORK_TWITTER) OR ($r[0]['network'] === NETWORK_STATUSNET)) {
                                        $newname = $r[0]['nick'];
                                        $stat = true;
                                        if($r[0]['alias'])