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

Merge pull request #2052 from rica-carv/rica-carv-patch-viewforum

Browse Source 
Update forum_viewforum.php (replaces #2050)
This commit is contained in:
Cameron 2016-11-27 10:41:24 -08:00 committed by GitHub
commit 2fee484721
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e107_plugins/forum/forum_viewforum.php
View File

@ -281,7 +281,8 @@ if ($pages)
}
}
if($forum->checkPerm($forumId, 'thread')) //new thread access only.
//-- if($forum->checkPerm($forumId, 'thread')) //new thread access only.
if($forum->checkPerm($forumId, 'post')) //new thread access only.
{
$forumSCvars['ntUrl']= e107::url('forum','post')."?f=nt&id=". $forumId;
/*--

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

@ -804,7 +804,7 @@ function sc_buttonsx()
// $url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId));
$replyUrl = "<a class='btn btn-primary' href='".$url."'>".LAN_FORUM_2006."</a>";
}
if ($forum->checkPerm($this->var['thread_forum_id'], 'thread'))
if ($forum->checkPerm($this->var['thread_forum_id'], 'post'))
{
$ntUrl = e107::url('forum','post')."?f=nt&amp;id=". $this->var['thread_forum_id'];
// $ntUrl = e107::getUrl()->create('forum/thread/new', array('id' => $thread->threadInfo['thread_forum_id']));
@ -829,7 +829,7 @@ function sc_buttonsx()
$text = '<div class="btn-group">
'.$replyUrl.'
'.($replyUrl?:LAN_FORUM_1003." ".LAN_FORUM_8013).'
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>

21
e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View File

@ -80,20 +80,13 @@
global $forum;
$jumpList = $forum->forumGetAllowed('view');
$text = '<div class="btn-group">';
if(!empty($this->var['ntUrl']))
{
$text .= '<a href="' . $this->var['ntUrl'] . '" class="btn btn-primary">' . LAN_FORUM_1018 . '</a>';
}
$text .= '
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
';
$text = '<div class="btn-group">'.
($this->var['ntUrl']?<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>:LAN_FORUM_1001." ".LAN_FORUM_8013).
'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
';
//-- foreach($jumpList as $key => $val)
foreach($jumpList as $val)