diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:24:23 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 13:24:23 +0000 |
| commit | b48d7492a207f1d0ba4cd1435f189cf9e1c54301 (patch) | |
| tree | 8e91fffd9ac1555d39c44a15a2a1ff00e961d487 /phpBB/includes/bbcode.php | |
| parent | 0b5852208840ee41d7f883d58cd1887b2da46539 (diff) | |
| download | forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.gz forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.bz2 forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.tar.xz forums-b48d7492a207f1d0ba4cd1435f189cf9e1c54301.zip | |
Enable view limiting functions ... Ashe, not sure if this is compatible with your thinking for bbcode but it seems the "logical" way to handle disabling of bbcode/flash in this manner. Fixed issue with automatic url handling of local links
git-svn-id: file:///svn/phpbb/trunk@4028 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 601150aed8..3564fc04bf 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -96,6 +96,8 @@ class bbcode // function bbcode_cache_init() { + global $user; + $sql = ''; $bbcode_ids = array(); @@ -173,12 +175,23 @@ class bbcode ); break; case 4: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[img:$uid\](.*?)\[/img:$uid\]#s' => '<img src="\1" border="0" />' - ) - ); - break; + if ($user->data['user_viewimg']) + { + $this->bbcode_cache[$bbcode_id] = array( + 'preg' => array( + '#\[img:$uid\](.*?)\[/img:$uid\]#s' => '<img src="\1" border="0" />' + ) + ); + } + else + { + $this->bbcode_cache[$bbcode_id] = array( + 'preg' => array( + '#\[img:$uid\](.*?)\[/img:$uid\]#s' => '<a href="\1">[ img ]</a>' + ) + ); + } + break; case 5: $this->bbcode_cache[$bbcode_id] = array( 'preg' => array( @@ -232,12 +245,23 @@ class bbcode ); break; case 11: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[flash:$uid\](.*?)\[/flash:$uid\]#' => $this->bbcode_tpl('flash') - ) - ); - break; + if ($user->data['user_viewimages']) + { + $this->bbcode_cache[$bbcode_id] = array( + 'preg' => array( + '#\[flash:$uid\](.*?)\[/flash:$uid\]#' => $this->bbcode_tpl('flash') + ) + ); + } + else + { + $this->bbcode_cache[$bbcode_id] = array( + 'preg' => array( + '#\[flash:$uid\](.*?)\[/flash:$uid\]#s' => '<a href="\1">[ flash ]</a>' + ) + ); + } + break; default: if (isset($rowset[$bbcode_id])) { |