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

Forum: Added missing breadcrumbs to report and move pages.

Browse Source
This commit is contained in:
Cameron
2016-05-04 09:25:44 -07:00
parent 1ad918eb65
commit b05785dd01
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/forum/forum_class.php
View File

@@ -507,7 +507,7 @@ class e107forum
{ {
if($tmp = e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->retrieve('forum_perms')) if($tmp = e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->retrieve('forum_perms'))
{ {
e107::getMessage()->addDebug("Using Permlist cache: True"); e107::getDebug()->log("Using Permlist cache: True");
$this->permList = e107::unserialize($tmp); $this->permList = e107::unserialize($tmp);
@@ -516,7 +516,7 @@ class e107forum
} }
else else
{ {
e107::getMessage()->addDebug("Using Permlist cache: False"); e107::getDebug()->log("Using Permlist cache: False");
$this->_getForumPermList(); $this->_getForumPermList();
$tmp = e107::serialize($this->permList, false); $tmp = e107::serialize($this->permList, false);
e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->set('forum_perms', $tmp); e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->set('forum_perms', $tmp);

22
e107_plugins/forum/forum_post.php
View File

@@ -666,6 +666,14 @@ class forum_post_handler
} }
private function renderBreadcrumb()
{
$sc = e107::getScBatch('post', 'forum')->setScVar('forum', $this->forumObj)->setScVar('threadInfo', vartrue($this->data))->setVars($this->data);
return e107::getParser()->parseTemplate("<div class='row-fluid'><div>{FORUM_POST_BREADCRUMB}</div></div>",true,$sc);
}
private function renderFormSplit() private function renderFormSplit()
{ {
if(!deftrue('MODERATOR')) if(!deftrue('MODERATOR'))
@@ -679,9 +687,8 @@ class forum_post_handler
$tp = e107::getParser(); $tp = e107::getParser();
$ns = e107::getRender(); $ns = e107::getRender();
$sc = e107::getScBatch('post', 'forum')->setScVar('forum', $this->forumObj)->setScVar('threadInfo', vartrue($this->data))->setVars($this->data);
$text = $tp->parseTemplate("<div class='row-fluid'><div>{FORUM_POST_BREADCRUMB}</div></div>",true,$sc);
$text = $this->renderBreadcrumb();
$text .= e107::getMessage()->setTitle("Warning!",E_MESSAGE_ERROR)->addError("This post, and every post below it will be moved into a new thread/topic.")->render(); $text .= e107::getMessage()->setTitle("Warning!",E_MESSAGE_ERROR)->addError("This post, and every post below it will be moved into a new thread/topic.")->render();
@@ -792,11 +799,12 @@ class forum_post_handler
$tp = e107::getParser(); $tp = e107::getParser();
$ns = e107::getRender(); $ns = e107::getRender();
$text = $this->renderBreadcrumb();
$text = " $text .= "
<form class='forum-horizontal' method='post' action='".e_REQUEST_URI."'> <form class='forum-horizontal' method='post' action='".e_REQUEST_URI."'>
<div> <div>
<table class='table table-striped' style='".ADMIN_WIDTH."'> <table class='table table-striped'>
<tr> <tr>
<td>".LAN_FORUM_3011.": </td> <td>".LAN_FORUM_3011.": </td>
<td> <td>
@@ -882,7 +890,9 @@ class forum_post_handler
if(deftrue('BOOTSTRAP')) //v2.x if(deftrue('BOOTSTRAP')) //v2.x
{ {
$text = $frm->open('forum-report-thread','post'); $text = $this->renderBreadcrumb();
$text .= $frm->open('forum-report-thread','post');
$text .= " $text .= "
<div> <div>
<div class='alert alert-block alert-warning'> <div class='alert alert-block alert-warning'>
@@ -895,7 +905,7 @@ class forum_post_handler
</div> </div>
<div class='form-group' > <div class='form-group' >
<div class='col-md-12'> <div class='col-md-12'>
".$frm->textarea('report_add','',10,35,array('size'=>'xxlarge'))." ".$frm->textarea('report_add','',10,35,array('size'=>'xxlarge', 'placeholder'=>LAN_FORUM_2038))."
</div> </div>
</div> </div>
<div class='form-group'> <div class='form-group'>