mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 17:01:43 +02:00
Code Issues Releases Wiki Activity

fixes #3656: Make the mediamanager icons available in the forum

Browse Source
This commit is contained in:
Achim Ennenbach
2019-02-08 13:01:38 +01:00
parent d4134c7f89
commit 8d7a0da0dc
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_plugins/forum/forum_post.php
View File

@@ -16,14 +16,15 @@ if(!defined('e107_INIT'))
require_once('../../class2.php'); require_once('../../class2.php');
} }
if(USER) // Now defined in shortcodes that handle the editors
{ // if(USER)
define('e_TINYMCE_TEMPLATE', 'member'); // allow images / videos. // {
} // define('e_TINYMCE_TEMPLATE', 'member'); // allow images / videos.
else // }
{ // else
define('e_TINYMCE_TEMPLATE', 'public'); // {
} // define('e_TINYMCE_TEMPLATE', 'public');
// }
define('NAVIGATION_ACTIVE','forum'); // ?? define('NAVIGATION_ACTIVE','forum'); // ??

11
e107_plugins/forum/shortcodes/batch/post_shortcodes.php
View File

@@ -153,7 +153,13 @@ class plugin_forum_post_shortcodes extends e_shortcode
{ {
$tp = e107::getParser(); $tp = e107::getParser();
// Define which tinymce4 template should be used, depending if the current user is registered or a guest
if (!deftrue('e_TINYMCE_TEMPLATE'))
{
define('e_TINYMCE_TEMPLATE', (USER ? 'member' : 'public')); // allow images / videos.
}
if(!empty($_POST['post'])) if(!empty($_POST['post']))
{ {
$text = $tp->post_toForm($_POST['post']); $text = $tp->post_toForm($_POST['post']);
@@ -182,7 +188,8 @@ class plugin_forum_post_shortcodes extends e_shortcode
//$wysiwyg = ($editor === 'bbcode') ? false : null; //$wysiwyg = ($editor === 'bbcode') ? false : null;
$wysiwyg = is_null($editor) ? 'default' : $editor; $wysiwyg = is_null($editor) ? 'default' : $editor;
return e107::getForm()->bbarea('post',$text,'forum','_common','large', array('wysiwyg' => $wysiwyg)); //return e107::getForm()->bbarea('post',$text,'forum','_common','large', array('wysiwyg' => $wysiwyg));
return e107::getForm()->bbarea('post',$text,'forum','forum','large', array('wysiwyg' => $wysiwyg));
} }

9
e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View File

@@ -1188,6 +1188,12 @@
{ {
global $forum, $forum_quickreply; global $forum, $forum_quickreply;
// Define which tinymce4 template should be used, depending if the current user is registered or a guest
if (!deftrue('e_TINYMCE_TEMPLATE'))
{
define('e_TINYMCE_TEMPLATE', (USER ? 'member' : 'public')); // allow images / videos.
}
if($forum->checkPerm($this->var['thread_forum_id'], 'post') && $this->var['thread_active']) if($forum->checkPerm($this->var['thread_forum_id'], 'post') && $this->var['thread_active'])
{ {
//XXX Show only on the last page?? //XXX Show only on the last page??
@@ -1224,7 +1230,8 @@
$text = " $text = "
<form action='" . $url . "' method='post'> <form action='" . $url . "' method='post'>
<div class='form-group'>" . <div class='form-group'>" .
e107::getForm()->bbarea('post','','forum', '_common', 'small', array('id' => 'forum-quickreply-text', 'wysiwyg' => $editor)) . // e107::getForm()->bbarea('post','','forum', '_common', 'small', array('id' => 'forum-quickreply-text', 'wysiwyg' => $editor)) .
e107::getForm()->bbarea('post','','forum', 'forum', 'medium', array('id' => 'forum-quickreply-text', 'wysiwyg' => $editor)) .
"</div> "</div>
<div class='center text-center form-group'> <div class='center text-center form-group'>
<input type='submit' data-token='" . e_TOKEN . "' data-forum-insert='" . $ajaxInsert . "' data-forum-post='" . $this->var['thread_forum_id'] . "' data-forum-thread='" . $this->var['thread_id'] . "' data-forum-action='quickreply' name='reply' value='" . LAN_FORUM_2006 . "' class='btn btn-success button' /> <input type='submit' data-token='" . e_TOKEN . "' data-forum-insert='" . $ajaxInsert . "' data-forum-post='" . $this->var['thread_forum_id'] . "' data-forum-thread='" . $this->var['thread_id'] . "' data-forum-action='quickreply' name='reply' value='" . LAN_FORUM_2006 . "' class='btn btn-success button' />

2
e107_plugins/tinymce4/templates/member.xml
View File

@@ -3,7 +3,7 @@
<plugins>advlist autosave lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualchars fullscreen <plugins>advlist 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> insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor </plugins>
<menubar>edit view insert format table tools</menubar> <menubar>edit view insert format table tools</menubar>
<toolbar1>undo redo | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent | link image media table | smileys | fullscreen</toolbar1> <toolbar1>undo redo | bold italic underline forecolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent | link image media table | e107-image e107-video e107-glyph smileys | fullscreen</toolbar1>
<external_plugins>e107</external_plugins> <external_plugins>e107</external_plugins>
<image_advtab>false</image_advtab> <image_advtab>false</image_advtab>
<media_alt_source>false</media_alt_source> <media_alt_source>false</media_alt_source>