Merge remote-tracking branch 'upstream/master'

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 872c34da95ae936e25619889cf7fa1d5b35cd07c..ba7bff791aefb66d9fea45c0fc98dd874bc950a2 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -321,7 +321,7 @@ function network_query_get_sel_net() {
        if(x($_GET,'nets')) {
                $network = $_GET['nets'];
        }
-       
+
        return $network;
 }
 
@@ -382,14 +382,14 @@ function network_content(&$a, $update = 0) {
        // item filter tabs
        // TODO: fix this logic, reduce duplication
        //$a->page['content'] .= '<div class="tabs-wrapper">';
-       
+
        list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
        // if no tabs are selected, defaults to comments
        if ($no_active=='active') $all_active='active';
        //echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
 
        $cmd = (($datequery) ? '' : $a->cmd);
-       $len_naked_cmd = strlen(str_replace('/new','',$cmd));           
+       $len_naked_cmd = strlen(str_replace('/new','',$cmd));
 
        // tabs
        $tabs = array(
@@ -435,10 +435,10 @@ function network_content(&$a, $update = 0) {
 //                     'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
 //                     'sel'=> $spam_active,
 //                     'title' => t('Posts flagged as SPAM'),
-//             ),      
+//             ),
 
        );
-       
+
        if(feature_enabled(local_user(),'personal_tab')) {
                $tabs[] = array(
                        'label' => t('Personal'),
@@ -560,10 +560,12 @@ function network_content(&$a, $update = 0) {
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((($group) || ($cid) || ($nets) || (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'),
+                       'default_perms' => get_acl_permissions($a->user),
                        'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
                        'bang' => (($group || $cid || $nets) ? '!' : ''),
                        'visitor' => 'block',
-                       'profile_uid' => local_user()
+                       'profile_uid' => local_user(),
+                       'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
                );
 
                $o .= status_editor($a,$x);
@@ -571,11 +573,11 @@ function network_content(&$a, $update = 0) {
        }
 
 
-       // We don't have to deal with ACL's on this page. You're looking at everything
+       // We don't have to deal with ACLs on this page. You're looking at everything
        // that belongs to you, hence you can see all of it. We will filter by group if
        // desired. 
 
-       
+
        $sql_options  = (($star) ? " and starred = 1 " : '');
        $sql_options .= (($bmark) ? " and bookmark = 1 " : '');