mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 03:10:50 +02:00
Code Issues Releases Wiki Activity

Null checks for e107TinyMceParserTest

Browse Source 
- FIX: Do not redefine e_ADMIN_AREA in parser.php
- FIX: Null checks for e107TinyMceParser
- FIX: Array type check for e_bbcode::imgToBBcode()
- FIX: Optional query string in e_parse::thumbUrlDecode()
- FIX: Don't redefine TINYMCE_UNIT_TEST
This commit is contained in:
Nick Liu
2020-01-17 19:45:59 +01:00
parent c604b3019c
commit b2bd6763de
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_handlers/bbcode_handler.php
View File

@@ -735,6 +735,7 @@ class e_bbcode
print_a($arr); print_a($arr);
} }
$arr['img'] = isset($arr['img']) && is_array($arr['img']) ? $arr['img'] : [];
foreach($arr['img'] as $img) foreach($arr['img'] as $img)
{ {
if(/*substr($img['src'],0,4) == 'http' ||*/ strpos($img['src'], e_IMAGE_ABS.'emotes/')!==false) // dont resize external images or emoticons. if(/*substr($img['src'],0,4) == 'http' ||*/ strpos($img['src'], e_IMAGE_ABS.'emotes/')!==false) // dont resize external images or emoticons.

2
e107_handlers/e_parse_class.php
View File

@@ -2914,7 +2914,7 @@ class e_parse extends e_parser
*/ */
function thumbUrlDecode($src) function thumbUrlDecode($src)
{ {
list($url,$qry) = explode("?",$src); list($url,$qry) = array_pad(explode("?",$src), 2, null);
$ret = array(); $ret = array();

18
e107_plugins/tinymce4/plugins/e107/parser.php
View File

@@ -19,7 +19,7 @@ $_E107['no_menus'] = true;
$_E107['no_forceuserupdate'] = true; $_E107['no_forceuserupdate'] = true;
$_E107['no_maintenance'] = true; $_E107['no_maintenance'] = true;
define('e_ADMIN_AREA', true); if (!defined('e_ADMIN_AREA')) define('e_ADMIN_AREA', true);
if(!defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST')) if(!defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST'))
{ {
require_once("../../../../class2.php"); require_once("../../../../class2.php");
@@ -42,6 +42,9 @@ class e107TinyMceParser
*/ */
function __construct() function __construct()
{ {
$_POST['mode'] = isset($_POST['mode']) ? $_POST['mode'] : 'tohtml';
$_POST['content'] = isset($_POST['content']) ? $_POST['content'] : '';
$html = ''; $html = '';
if(defined('TINYMCE_DEBUG') || defined('TINYMCE_UNIT_TEST')) if(defined('TINYMCE_DEBUG') || defined('TINYMCE_UNIT_TEST'))
@@ -70,7 +73,6 @@ class e107TinyMceParser
TEMPL; TEMPL;
} }
$_POST['content'] = $text; $_POST['content'] = $text;
$_POST['mode'] = 'tohtml';
} }
else else
{ {
@@ -119,7 +121,7 @@ TEMPL;
$content = stripslashes($content); $content = stripslashes($content);
// $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($this->getMediaCategory());
if(check_class($pref['post_html'])) // raw HTML within [html] tags. if(check_class($pref['post_html'])) // raw HTML within [html] tags.
{ {
@@ -197,7 +199,7 @@ TEMPL;
$pref = e107::getPref(); $pref = e107::getPref();
// $tp = e107::getParser(); // $tp = e107::getParser();
e107::getBB()->setClass($_SESSION['media_category']); e107::getBB()->setClass($this->getMediaCategory());
$content = stripslashes($content); $content = stripslashes($content);
@@ -231,6 +233,14 @@ TEMPL;
} }
/**
* @return mixed|null
*/
private function getMediaCategory()
{
return isset($_SESSION['media_category']) ? $_SESSION['media_category'] : null;
}

2
e107_tests/tests/unit/plugins/e107TinyMceParserTest.php
View File

@@ -17,7 +17,7 @@
protected function _before() protected function _before()
{ {
define('TINYMCE_UNIT_TEST', true); @define('TINYMCE_UNIT_TEST', true);
require_once(e_PLUGIN."tinymce4/plugins/e107/parser.php"); require_once(e_PLUGIN."tinymce4/plugins/e107/parser.php");
try try
{ {