mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Added more missing data from page vars. Precaution for if mb_convert_encoding() is missing. TinyMce member template added.

Browse Source
This commit is contained in:
Cameron
2016-02-29 22:01:58 -08:00
parent 0898cc272e
commit 881adeeeda
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/e_parse_class.php
View File

@@ -4157,8 +4157,11 @@ return;
$doc = $this->domObj; $doc = $this->domObj;
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
// @$doc->loadHTML($html); // @$doc->loadHTML($html);
$html = mb_convert_encoding($html, 'HTML-ENTITIES', "UTF-8"); if(function_exists('mb_convert_encoding'))
@$doc->loadHTML($html); {
$html = mb_convert_encoding($html, 'HTML-ENTITIES', "UTF-8");
}
@$doc->loadHTML($html);
// $doc->encoding = 'UTF-8'; // $doc->encoding = 'UTF-8';
// $doc->resolveExternals = true; // $doc->resolveExternals = true;

24
e107_plugins/tinymce4/templates/member.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0"?>
<tinymce name="Main Admin" version="4">
<plugins>advlist autolink autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars fullscreen
insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor </plugins>
<menubar>edit view insert table tools</menubar>
<toolbar1>undo redo | removeformat | styleselect | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image template | smileys | preview</toolbar1>
<external_plugins>e107 compat3x</external_plugins>
<image_advtab>false</image_advtab>
<extended_valid_elements>i[*], bbcode[*]</extended_valid_elements>
<templates>[
{
title: "Bootstrap table",
url: "{e_PLUGIN}tinymce4/snippets/bootstrap_table.htm",
description: "Adds a Bootstrap 3 table"
},
{
title: "Example",
content: "Example Content",
description: "Adds an example."
}
]
</templates>
<table_default_attributes>{ class: 'table table-striped table-bordered' }</table_default_attributes>
</tinymce>

8
page.php
View File

@@ -438,7 +438,7 @@ class pageClass
//$bookId = $row['chapter_parent']; //$bookId = $row['chapter_parent'];
$bookSef = $this->getSef($row['chapter_parent']); $bookSef = $this->getSef($row['chapter_parent']);
$bookTitle = $this->getName($row['chapter_parent']); $bookTitle = $this->getName($row['chapter_parent']);
$urlData = array( $urlData = array(
'chapter_id' => $row['chapter_id'], 'chapter_id' => $row['chapter_id'],
'chapter_name' => $tp->toHtml($row['chapter_name']), 'chapter_name' => $tp->toHtml($row['chapter_name']),
@@ -490,10 +490,14 @@ class pageClass
'title' => $page['page_title'], 'title' => $page['page_title'],
'text' => $tp->toHtml($page['page_text'],true) 'text' => $tp->toHtml($page['page_text'],true)
);*/ );*/
$page['chapter_id'] = $page['page_chapter'];
$page['chapter_name'] = $this->getName($page['page_chapter']);
$page['chapter_parent'] = $this->getParent($page['page_chapter']); $page['chapter_parent'] = $this->getParent($page['page_chapter']);
$page['chapter_sef'] = $this->getSef($page['page_chapter']); // $chapter_sef; $page['chapter_sef'] = $this->getSef($page['page_chapter']); // $chapter_sef;
$page['book_id'] = $page['chapter_parent'];
$page['book_name'] = $this->getName($page['chapter_parent']);
$page['book_sef'] = $bookSef; $page['book_sef'] = $bookSef;
$page['book_id'] = $this->getParent($page['chapter_parent']);
// $this->page = $page; // $this->page = $page;
$this->batch->setVars($page); $this->batch->setVars($page);