diff options
| author | friendica <info@friendica.com> | 2015-01-13 18:30:30 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-13 18:30:30 -0800 |
| commit | dfdef0af0d045bdb0eb6e5ed557579966891e1a0 (patch) | |
| tree | 9d5ce7fd4305daf12d32170d522fdd20ec1dc1ba /include | |
| parent | 98acefe22837a916d9a2330ceec250b0572b65d2 (diff) | |
| download | volse-hubzilla-dfdef0af0d045bdb0eb6e5ed557579966891e1a0.tar.gz volse-hubzilla-dfdef0af0d045bdb0eb6e5ed557579966891e1a0.tar.bz2 volse-hubzilla-dfdef0af0d045bdb0eb6e5ed557579966891e1a0.zip | |
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index 6b579e35c..18ef22d28 100644 --- a/include/text.php +++ b/include/text.php @@ -92,10 +92,10 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') { return escape_tags($s); if($type == 'text/plain') return escape_tags($s); - $r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", + $r = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval($channel_id) ); - if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) { + if($r && (($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { if(local_user() && (get_account_id() == $r[0]['account_id'])) { return $s; } @@ -1584,13 +1584,13 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { 'text/plain' ); - $r = q("select account_id, account_roles from account left join channel on account_id = channel_account_id where + $r = q("select account_id, account_roles, channel_pageflags from account left join channel on account_id = channel_account_id where channel_id = %d limit 1", intval($channel_id) ); if($r) { - if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { + if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) { if(local_user() && get_account_id() == $r[0]['account_id']) $x[] = 'application/x-php'; } |