Skip to content

Forum quickreply templatization #5414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Forum quickreply templatization #5414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
66abefb
Update view_shortcodes.php
rica-carv Jan 28, 2025
9f7ed10
Update view_shortcodes.php
rica-carv Jan 28, 2025
90ce61e
Update forum_viewtopic_template.php
rica-carv Jan 28, 2025
f4ed973
Update view_shortcodes.php
rica-carv Jan 29, 2025
ad4fc46
Update forum_viewtopic_template.php
rica-carv Jan 29, 2025
bef5115
Update view_shortcodes.php
rica-carv Jan 30, 2025
9652fcb
Update forum_viewtopic_template.php
rica-carv Jan 30, 2025
1173170
Update view_shortcodes.php
rica-carv Jan 30, 2025
b6d8ef9
Merge branch 'e107inc:master' into forrum_quickreply_templatization
rica-carv Jan 30, 2025
83e444d
Update view_shortcodes.php
rica-carv Jan 31, 2025
629768e
Update view_shortcodes.php
rica-carv Feb 1, 2025
59a8913
Merge branch 'e107inc:master' into forrum_quickreply_templatization
rica-carv Feb 1, 2025
f09def6
Merge branch 'master' into forrum_quickreply_templatization
rica-carv May 1, 2025
7fb6ed2
Merge branch 'e107inc:master' into forrum_quickreply_templatization
rica-carv May 8, 2025
5c74c23
Merge branch 'e107inc:master' into forrum_quickreply_templatization
rica-carv Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion e107_plugins/faqs/templates/faqs_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

$FAQS_TEMPLATE['caption'] = "{FAQ_CAPTION} <small>{FAQ_COUNT}</small>";


$FAQS_TEMPLATE['schema'] = '
{
"@context": "https://schema.org",
Expand Down
110 changes: 71 additions & 39 deletions e107_plugins/forum/shortcodes/batch/view_shortcodes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,8 +1319,7 @@ function sc_message()

function sc_quickreply()
{

global $forum, $forum_quickreply, $thread;
global $forum_quickreply, $FORUM_VIEWTOPIC_TEMPLATE;

// Define which tinymce4 template should be used, depending if the current user is registered or a guest
if(!deftrue('e_TINYMCE_TEMPLATE'))
Expand All @@ -1333,50 +1332,22 @@ function sc_quickreply()
//XXX Show only on the last page??
if(!vartrue($forum_quickreply))
{
$ajaxInsert = ($thread->pages == $thread->page || $thread->pages == 0) ? 1 : 0;
// $ajaxInsert = ($thread->pages == $thread->page || $thread->pages == 0) ? 1 : 0;
// $ajaxInsert = 1;
// echo "AJAX-INSERT=".$ajaxInsert ."(".$thread->pages." vs ".$thread->page.")";
//Orphan $frm variable???? $frm = e107::getForm();

$urlParms = array('f' => 'rp', 'id' => $this->var['thread_id'], 'post' => $this->var['thread_id']);
$url = e107::url('forum', 'post', null, array('query' => $urlParms));; // ."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadInfo['thread_id'];
// $url = e107::url('forum', 'post', null, array('query' => $urlParms)); // ."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadInfo['thread_id'];

$qr = e107::getPlugPref('forum', 'quickreply', 'default');
if($qr == 'default')
{
// DEFAULT TEMPLATE LEFT HERE FOR LEGACY PURPOSES....
$template = $FORUM_VIEWTOPIC_TEMPLATE['quickreply']??e107::getTemplate('forum','forum_viewtopic', 'quickreply', false);

return "
<form action='" . $url . "' method='post'>
<div class='form-group'>
<textarea cols='80' placeholder='" . LAN_FORUM_2007 . "' rows='4' id='forum-quickreply-text' class='tbox input-xxlarge form-control' name='post' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
</div>
<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_2007 . "' class='btn btn-success button' />
<input type='hidden' name='thread_id' value='" . $this->var['thread_id'] . "' />
</div>

</form>";
}
else
{
$editor = varset($this->pref['editor'], null);
$editor = is_null($editor) ? 'default' : $editor;
$text = "
<form action='" . $url . "' method='post'>
<div class='form-group'>" .
// 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 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='hidden' name='thread_id' value='" . $this->var['thread_id'] . "' />
</div>

</form>";

return $text;
if (!strpos($template, "{QR_HIDDEN}")){
$template .= "{QR_HIDDEN}";
}


return "<form action='".e107::url('forum', 'post', null, array('query' => $urlParms))."' method='post'>".e107::getParser()->parseTemplate($template, true, $this)."</form>";
// Preview should be reserved for the full 'Post reply' page. <input type='submit' name='fpreview' value='" . Preview . "' /> &nbsp;
}
//---- else
Expand All @@ -1385,8 +1356,69 @@ function sc_quickreply()
//---- }
}
}
function sc_qr_textarea($parms = null)
{
$qr = e107::getPlugPref('forum', 'quickreply', 'default');

$textarea = "<textarea cols='80' placeholder='".($parms['placeholder']??LAN_FORUM_2007)."' rows='4' id='forum-quickreply-text' class='tbox input-xxlarge form-control' name='post' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>";

if($qr != 'default')
// {

/*
return "
<form action='" . $url . "' method='post'>
<div class='form-group'>
<textarea cols='80' placeholder='" . LAN_FORUM_2007 . "' rows='4' id='forum-quickreply-text' class='tbox input-xxlarge form-control' name='post' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
</div>
<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_2007 . "' class='btn btn-success button' />
<input type='hidden' name='thread_id' value='" . $this->var['thread_id'] . "' />
</div>

</form>";
*/
// $template = $FORUM_VIEWTOPIC_TEMPLATE['quickreply'];
// }
// else
{
$editor = varset($this->pref['editor'], null);
$editor = is_null($editor) ? 'default' : $editor;

$textarea = e107::getForm()->bbarea('post', '', 'forum', 'forum', 'medium', array('id' => 'forum-quickreply-text', 'wysiwyg' => $editor));
// $template = preg_replace("~(?s)<textarea.*?</textarea>~", $textarea, $FORUM_VIEWTOPIC_TEMPLATE['quickreply']);
// $template = preg_replace("~(?s)<textarea.*?</textarea>~", $textarea, $template);

/*
$text = "
<form action='" . $url . "' method='post'>
<div class='form-group'>" .
// 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 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='hidden' name='thread_id' value='" . $this->var['thread_id'] . "' />
</div>

</form>";
*/

// return $text;
}

}
return $textarea;
}

function sc_qr_sbutton($parms = null)
{
global $thread;

return "<input type='submit' data-token='".defset('e_TOKEN')."' data-forum-insert='".(($thread->pages == $thread->page || $thread->pages == 0) ? 1 : 0)."' data-forum-post='".$this->var['thread_forum_id']."' data-forum-thread='".$this->var['thread_id']."' data-forum-action='quickreply' name='reply' value='".($parms['value']??LAN_FORUM_2007)."' class='btn btn-success button'>";
}

function sc_qr_hidden($parms = null)
{
return "<input type='hidden' name='thread_id' value='".$this->var['thread_id']."' />";
}
}
11 changes: 9 additions & 2 deletions e107_plugins/forum/templates/forum_viewtopic_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,15 @@

";



$FORUM_VIEWTOPIC_TEMPLATE['quickreply'] = "
<div class='form-group'>
{QR_TEXTAREA}
</div>
<div class='center text-center form-group'>
{QR_SBUTTON}
{QR_HIDDEN}
</div>
";

$FORUM_VIEWTOPIC_WRAPPER['thread']['ATTACHMENTS'] = "<div class='forum-viewtopic-attachments'>{---}</div>";
$FORUM_VIEWTOPIC_WRAPPER['thread']['CUSTOMTITLE'] = "<span class='forum-viewtopic-customtitle'><small>{---}</small></span>";
Expand Down
3 changes: 1 addition & 2 deletions e107_tests/tests/unit/plugins/siteinfo/siteinfo_shortcodesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@ public function testSc_sitelogo()
self::assertStringContainsString('http', $result2);
self::assertStringContainsString('logo', $result2);

$result3 = $this->sc->sc_sitelogo(['type'=>'email']);
$result3 = $this->sc->sc_sitelogo(['type'=>'email']);
self::assertStringContainsString('IMAGE}', $result3);


}

public function testSc_logo()
Expand Down
Loading