aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-24 01:33:50 -0700
committerfriendica <info@friendica.com>2012-03-24 01:33:50 -0700
commitdb5ec588631fe2a50eecb193c8ffdd65283254a4 (patch)
treeb423709851cf5b08d96d8bf07d56d585fe42a3a0
parentb23ad806ec8cedbc94d721279fd5615f79c4a4c6 (diff)
downloadvolse-hubzilla-db5ec588631fe2a50eecb193c8ffdd65283254a4.tar.gz
volse-hubzilla-db5ec588631fe2a50eecb193c8ffdd65283254a4.tar.bz2
volse-hubzilla-db5ec588631fe2a50eecb193c8ffdd65283254a4.zip
network filter is now a permission group
-rwxr-xr-xboot.php2
-rwxr-xr-xmod/network.php16
2 files changed, 16 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index f976ef636..d2619e887 100755
--- 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 9ec8c23b5..a5958259c 100755
--- 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()