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

Issue #1433 Remove confusion about image attachments in forum posts. PDF files now added to default filetypes during install.

Browse Source
This commit is contained in:
Cameron
2016-03-21 10:45:01 -07:00
parent c0501146ae
commit 4db14510de
5 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -113,12 +113,15 @@ $output = str_replace("{e_PLUGIN_ABS}", e_PLUGIN_ABS, $text);
$wy = new wysiwyg();
$gen = $wy->renderConfig();
$config = varset($_GET['config'],false); // e_QUERY;
$gen = $wy->renderConfig($config);
define('USE_GZIP', true);
if(ADMIN && e_QUERY == 'debug')
if(ADMIN && e_QUERY == 'debug' || !empty($_GET['debug']))
{
define('e_IFRAME', true);
require_once(HEADERF);
@@ -309,23 +312,37 @@ class wysiwyg
$tp = e107::getParser();
$fl = e107::getFile();
if(getperms('0'))
if($config !== false)
{
$template = "mainadmin.xml";
}
elseif(ADMIN)
{
$template = "admin.xml";
}
elseif(USER)
{
$template = "member.xml";
$template = $tp->filter($config).".xml";
}
else
{
$template = "public.xml";
if(getperms('0'))
{
$template = "mainadmin.xml";
}
elseif(ADMIN)
{
$template = "admin.xml";
}
elseif(USER)
{
$template = "member.xml";
}
else
{
$template = "public.xml";
}
}
if(($template == 'mainadmin.xml' && !getperms('0')) || ($template == 'admin.xml' && !ADMIN))
{
$template = 'public.xml';
}
$configPath = (is_readable(THEME."templates/tinymce/".$template)) ? THEME."templates/tinymce/".$template : e_PLUGIN."tinymce4/templates/".$template;
$config = e107::getXml()->loadXMLfile($configPath, true);