mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-02 18:27:52 +02:00
Code Issues Releases Wiki Activity

bbcode fixes

Browse Source
This commit is contained in:
CaMer0n 2012-06-17 04:08:09 +00:00
parent ff6214e4e8
commit ece6cdac0c
4 changed files with 15 additions and 6 deletions

2
e107_core/bbcodes/bb_h.php

@ -1,4 +1,4 @@
v<?php
<?php
/**
* Copyright (C) e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$

3
e107_core/bbcodes/blockquote.bb

@ -1,3 +1,4 @@
//<?
$class = e107::getBB()->getClass('blockquote');
return "<div class='indent {$class}'>{$code_text}</div>";
return "<blockquote class='indent {$class}'>{$code_text}</blockquote>";

14
e107_core/bbcodes/code.bb

@ -1,6 +1,8 @@
//<?php
$class = e107::getBB()->getClass('code');
global $pref, $e107cache, $tp;
if($pref['smiley_activate'])
@ -17,8 +19,12 @@ $search = array(E_NL,'&#092;','&#036;', '&lt;');
$replace = array("\r\n","\\",'$', '<');
$code_text = str_replace($search, $replace, $code_text);
if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/geshi.php")) {
$code_md5 = md5($code_text);
if(!$CodeCache = $e107cache->retrieve('GeshiParsed_'.$code_md5)) {
require_once(e_PLUGIN."geshi/geshi.php");
@ -34,14 +40,16 @@ if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/
$CodeCache = $geshi->parse_code();
$e107cache->set('GeshiParsed_'.$code_md5, $CodeCache);
}
$ret = "<div class='code_highlight code-box {$class}' style='unicode-bidi: embed; direction: ltr'>".str_replace("&amp;", "&", $CodeCache)."</div>";
$ret = "<code class='code_highlight code-box {$class}' style='unicode-bidi: embed; direction: ltr'>".str_replace("&amp;", "&", $CodeCache)."</code>";
}
else
{
$code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8');
$code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8');
$highlighted_text = highlight_string($code_text, TRUE);
$highlighted_text = str_replace(array("<code>","</code>"),"",$highlighted_text);
$divClass = ($parm) ? $parm : 'code_highlight';
$ret = "<div class='".$tp -> toAttribute($divClass)." code-box{$class}' style='unicode-bidi: embed; direction: ltr'>{$highlighted_text}</div>";
$ret = "<code class='".$tp -> toAttribute($divClass)." code-box {$class}' style='unicode-bidi: embed; direction: ltr'>{$highlighted_text}</code>";
}
$ret = str_replace("[", "&#091;", $ret);
return $ret;

2
e107_core/bbcodes/color.bb

@ -35,7 +35,7 @@ else
{
if(preg_match("/(#[a-fA-F0-9]{3,6})/", $parm, $matches))
{
return "<span class='{$class}' style='color:{$matches[1]}'>$code_text</span>";
return "<span class='{$class}' style='color:{$matches[1]};'>$code_text</span>";
}
}