friendika-z initial implementation

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 15dffa594ca98a783477eab0684061cf3c241dfd..4265ce80174f5d40ca05b53872cd6262566c166c 100644 (file)
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -431,6 +431,10 @@ function facebook_post_hook(&$a,&$b) {
 
        if((local_user()) && (local_user() == $b['uid'])) {
 
+               // Facebook is not considered a private network
+               if($b['prvnets'])
+                       return;
+
                if($b['parent']) {
                        $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($b['parent']),

diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 85024631ce0185768130213c678d2d9c980e0b77..22f7dc8f9e391575dae8ed9963641e85c199a453 100644 (file)
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -303,10 +303,14 @@ function statusnet_post_hook(&$a,&$b) {
 
        if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (!$b['parent']) ) {
 
-                load_pconfig(local_user(), 'statusnet');
+               // Status.Net is not considered a private network
+               if($b['prvnets'])
+                       return;
+
+               load_pconfig(local_user(), 'statusnet');
             
-                $api     = get_pconfig(local_user(), 'statusnet', 'baseapi');
-                $ckey    = get_pconfig(local_user(), 'statusnet', 'consumerkey'  );
+               $api     = get_pconfig(local_user(), 'statusnet', 'baseapi');
+               $ckey    = get_pconfig(local_user(), 'statusnet', 'consumerkey'  );
                $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
                $otoken  = get_pconfig(local_user(), 'statusnet', 'oauthtoken'  );
                $osecret = get_pconfig(local_user(), 'statusnet', 'oauthsecret' );

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index aeb9cc9376f765a643a77090d5865d3b2a203ea8..7829799bc1a9129ff1abfd9b2c0f081f577a7d41 100644 (file)
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -195,6 +195,11 @@ function twitter_post_hook(&$a,&$b) {
 
        if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent']) ) {
 
+               // Twitter is not considered a private network
+               if($b['prvnets'])
+                       return;
+
+
                load_pconfig(local_user(), 'twitter');
 
                $ckey    = get_config('twitter', 'consumerkey'  );

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 90fdf9c1c984e5bfcd12ff564e232704a8d29ffc..921a8275bbe4b8778c101d6726b65317496aa1fb 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -64,6 +64,8 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
                $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) ";
        }
 
+
+
        if($privmail)
                $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
        else 

diff --git a/include/notifier.php b/include/notifier.php
index 5de6eafd10eafb9f19b08803bb8f87b514553a9d..842e1108093d7cc5acf5bd06b5c094f6f866b0b3 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -106,7 +106,8 @@ function notifier_run($argv, $argc){
                        $top_level = true;
        }
 
-       $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
+       $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
+               `user`.`page-flags`, `user`.`prvnets`
                FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
                intval($uid)
@@ -329,7 +330,8 @@ function notifier_run($argv, $argc){
                                        }
                                        break;
                                case 'stat':
-
+                                       if($owner['prvnets'])
+                                               break;
                                        if($followup && $contact['notify']) {
                                                logger('notifier: slapdelivery: ' . $contact['name']);
                                                $deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -373,6 +375,7 @@ function notifier_run($argv, $argc){
                                                }
                                        }
                                        break;
+
                                case 'mail':
                                                
                                        // WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -447,9 +450,9 @@ function notifier_run($argv, $argc){
                                                mail($addr, $subject, $message, $headers);
                                        }
                                        break;
-                               case 'dspr':
                                case 'feed':
                                case 'face':
+                               case 'dspr':
                                default:
                                        break;
                        }

diff --git a/mod/item.php b/mod/item.php
index 84fe237b3d8d762b7b986ffb14902775cade6a14..9d7b954a84465a41d505a8b27d2d82c514817f2d 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -445,6 +445,7 @@ function item_post(&$a) {
 
        $datarray['parent']        = $parent;
        $datarray['self']          = $self;
+       $datarray['prvnets']       = $user['prvnets'];
 
        if($orig_post)
                $datarray['edit']      = true;