aboutsummaryrefslogtreecommitdiffstats
path: root/mod/channel.php
diff options
context:
space:
mode:
Diffstat (limited to 'mod/channel.php')
-rw-r--r--mod/channel.php40
1 files changed, 17 insertions, 23 deletions
diff --git a/mod/channel.php b/mod/channel.php
index e5af91b53..2014cd08b 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -1,5 +1,14 @@
<?php
+require_once('include/contact_widgets.php');
+require_once('include/items.php');
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+require_once('include/permissions.php');
+
+
function channel_init(&$a) {
$which = null;
@@ -37,8 +46,6 @@ function channel_init(&$a) {
function channel_aside(&$a) {
- require_once('include/contact_widgets.php');
- require_once('include/items.php');
if(! $a->profile['profile_uid'])
return;
@@ -64,16 +71,6 @@ function channel_content(&$a, $update = 0, $load = false) {
$category = $datequery = $datequery2 = '';
- // if(argc() > 2) {
- // for($x = 2; $x < argc(); $x ++) {
- // if(is_a_date_arg(argv($x))) {
- // if($datequery)
- // $datequery2 = escape_tags(argv($x));
- // else
- // $datequery = escape_tags(argv($x));
- // }
- // }
- // }
$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
@@ -81,16 +78,6 @@ function channel_content(&$a, $update = 0, $load = false) {
return login();
}
-
-
- require_once("include/bbcode.php");
- require_once('include/security.php');
- require_once('include/conversation.php');
- require_once('include/acl_selectors.php');
- require_once('include/items.php');
- require_once('include/permissions.php');
-
-
$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
$groups = array();
@@ -131,6 +118,13 @@ function channel_content(&$a, $update = 0, $load = false) {
$o .= common_friends_visitor_widget($a->profile['profile_uid']);
+ $channel_acl = array(
+ 'allow_cid' => $channel['channel_allow_cid'],
+ 'allow_gid' => $channel['channel_allow_gid'],
+ 'deny_cid' => $channel['channel_deny_cid'],
+ 'deny_gid' => $channel['channel_deny_gid']
+ );
+
if($perms['post_wall']) {
@@ -140,7 +134,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''),
'nickname' => $a->profile['channel_address'],
'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
- 'acl' => (($is_owner) ? populate_acl($channel, false) : ''),
+ 'acl' => (($is_owner) ? populate_acl($channel_acl) : ''),
'showacl' => (($is_owner) ? 'yes' : ''),
'bang' => '',
'visitor' => (($is_owner || $observer) ? 'block' : 'none'),