mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

Bootstrap dialog warning added.

Browse Source
This commit is contained in:
Cameron
2013-03-19 04:33:35 -07:00
parent ff756111ae
commit c93a6b926e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/tinymce/plugins/e107bbcode/dialog.php
View File

@@ -131,10 +131,10 @@ class e_bootstrap
$text = "<div class='alert alert-warning'>Warning: These will only work if you have a bootstrap-based theme installed</div>";
$text .= '
$text = '
<ul class="nav nav-tabs">'; <ul class="nav nav-tabs">';
$text .= '<li class="active" ><a href="#mbuttons" data-toggle="tab">Buttons</a></li>'; $text .= '<li class="active" ><a href="#mbuttons" data-toggle="tab">Buttons</a></li>';

21
e107_plugins/tinymce/plugins/e107bbcode/parser.php
View File

@@ -32,8 +32,8 @@ if($_POST['mode'] == 'tohtml')
// $content = e107::getBB()->htmltoBBcode($content); //XXX This breaks inserted images from media-manager. :/ // $content = e107::getBB()->htmltoBBcode($content); //XXX This breaks inserted images from media-manager. :/
e107::getBB()->setClass($_SESSION['media_category']); e107::getBB()->setClass($_SESSION['media_category']);
if(check_class($pref['post_html'])) // raw HTML within [html] tags. if(check_class($pref['post_html'])) // raw HTML within [html] tags.
{ {
if(strstr($content,"[html]") === false) // BC - convert old BB code text to html. if(strstr($content,"[html]") === false) // BC - convert old BB code text to html.
@@ -41,7 +41,7 @@ if($_POST['mode'] == 'tohtml')
e107::getBB()->clearClass(); e107::getBB()->clearClass();
$content = str_replace('\r\n',"<br />",$content); $content = str_replace('\r\n',"<br />",$content);
$content = nl2br($content, true); // replace any that were missed. $content = nl2br($content, true);
$content = $tp->toHtml($content, true); $content = $tp->toHtml($content, true);
} }
@@ -74,18 +74,17 @@ if($_POST['mode'] == 'tobbcode')
if(check_class($pref['post_html'])) // Plain HTML mode. if(check_class($pref['post_html'])) // Plain HTML mode.
{ {
$srch = array('src="'.e_HTTP.'thumb.php?','src="/{e_MEDIA_IMAGE}'); $srch = array('src="'.e_HTTP.'thumb.php?','src="/{e_MEDIA_IMAGE}');
$repl = array('src="{e_BASE}thumb.php?','src="{e_BASE}thumb.php?src=e_MEDIA_IMAGE/'); $repl = array('src="{e_BASE}thumb.php?','src="{e_BASE}thumb.php?src=e_MEDIA_IMAGE/');
$content = str_replace($srch, $repl, $content);
$content = str_replace($srch, $repl, $content);
// resize the thumbnail to match wysiwyg width/height. // resize the thumbnail to match wysiwyg width/height.
$psrch = '/<img[^>]*src="{e_BASE}thumb.php\?src=([\S]*)w=([\d]*)&amp;h=([\d]*)"(.*)width="([\d]*)" height="([\d]*)"/i'; $psrch = '/<img[^>]*src="{e_BASE}thumb.php\?src=([\S]*)w=([\d]*)&amp;h=([\d]*)"(.*)width="([\d]*)" height="([\d]*)"/i';
$prepl = '<img src="{e_BASE}thumb.php?src=$1w=$5&amp;h=$6"$4width="$5" height="$6" '; $prepl = '<img src="{e_BASE}thumb.php?src=$1w=$5&amp;h=$6"$4width="$5" height="$6" ';
$content = preg_replace($psrch, $prepl, $content); $content = preg_replace($psrch, $prepl, $content);
$content = $tp->parseBBTags($content,true); // replace html with bbcode equivalent $content = $tp->parseBBTags($content,true); // replace html with bbcode equivalent
echo ($content) ? "[html]".$content."[/html]" : ""; // Add the tags before saving to DB. echo ($content) ? "[html]".$content."[/html]" : ""; // Add the tags before saving to DB.
} }