network filter is now a permission group

diff --git a/boot.php b/boot.php
index f976ef6368c98b26c2c874d0196bce383048320f..d2619e8870b5dc4a3c1c5dfdf90c2f568d29d1ed 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1289' );
+define ( 'FRIENDICA_VERSION',      '2.3.1290' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1133      );
 

diff --git a/mod/network.php b/mod/network.php
index 9ec8c23b5904ed81850afb2ee8a8986e19b0c07c..a5958259c48328d7ad822b8c95548fc871066d08 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -250,6 +250,20 @@ function network_content(&$a, $update = 0) {
        if($cid)
                $def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
+       if($nets) {
+               $r = q("select id from contact where uid = %d and network = '%s' and self = 0",
+                       intval(local_user()),
+                       dbesc($nets)
+               );
+
+               $str = '';
+               if(count($r))
+                       foreach($r as $rr)
+                               $str .= '<' . $rr['id'] . '>';
+               if(strlen($str))
+                       $def_acl = array('allow_cid' => $str);
+       }
+
        if(! $update) {
                if($group) {
                        if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -270,7 +284,7 @@ function network_content(&$a, $update = 0) {
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-                       'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
+                       'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
                        'bang' => (($group || $cid) ? '!' : ''),
                        'visitor' => 'block',
                        'profile_uid' => local_user()