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

Merge pull request #2132 from rica-carv/rica-carv-patch-btn_forum

Browse Source 
Forum: Fixes #2126
This commit is contained in:
Cameron
2016-12-13 13:32:31 -08:00
committed by GitHub
parent f66b3e572e 3dff03b6be
commit d5f9b9ac5e
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -797,13 +797,15 @@ function sc_buttonsx()
{ {
global $forum, $thread; global $forum, $thread;
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'])
{ {
$url = e107::url('forum','post')."?f=rp&id=".$this->var['thread_id']."&post=".$thread->threadId; $url = e107::url('forum','post')."?f=rp&id=".$this->var['thread_id']."&post=".$thread->threadId;
// $url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId)); // $url = e107::getUrl()->create('forum/thread/reply', array('id' => $thread->threadId));
$replyUrl = "<a class='btn btn-primary' href='".$url."'>".LAN_FORUM_2006."</a>";
} }
$replyUrl = "<a class='btn btn-primary".($url ?"":" disabled")."' "
.($url?"":" data-toggle='tooltip' title='".LAN_FORUM_0046."'
style='cursor: not-allowed; pointer-events: all !important;'")." href='".($url ?:"#")."'>".LAN_FORUM_2006."</a>";
if ($forum->checkPerm($this->var['thread_forum_id'], 'post')) 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::url('forum','post')."?f=nt&amp;id=". $this->var['thread_forum_id'];
@@ -828,10 +830,21 @@ function sc_buttonsx()
} }
/*
$text = '<div class="btn-group"> $text = '<div class="btn-group">
'.($replyUrl?:LAN_FORUM_1003." ".LAN_FORUM_8013).' '.($replyUrl?:"").'
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
'.($replyUrl?"":LAN_FORUM_1003." ".LAN_FORUM_8013).'<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right">
';
*/
$text = '<div class="btn-group">
'.$replyUrl.'
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button> </button>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
'; ';

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

@@ -81,10 +81,24 @@
$jumpList = $forum->forumGetAllowed('view'); $jumpList = $forum->forumGetAllowed('view');
$text = '<div class="btn-group">'; $text = '<div class="btn-group">';
/*
$text .= $text .=
($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' : LAN_FORUM_1001." ".LAN_FORUM_8013). ($this->var['ntUrl'] ? '<a href="'.$this->var['ntUrl'].'" class="btn btn-primary">'.LAN_FORUM_1018.'</a>' :'').
'<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"> '<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
'.($this->var['ntUrl'] ? '' : LAN_FORUM_1001." ".LAN_FORUM_8013).'<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu pull-right">
';
*/
$text .=
'<a href="'.($this->var['ntUrl'] ?:"#").
'" class="btn btn-primary'.($this->var['ntUrl'] ?"":" disabled").'"'
.($this->var['ntUrl'] ?"":" data-toggle='tooltip' title='".LAN_FORUM_0006."'
style='cursor: not-allowed; pointer-events: all !important;'").'>'.LAN_FORUM_1018.'</a>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button> </button>
<ul class="dropdown-menu pull-right"> <ul class="dropdown-menu pull-right">
'; ';
@@ -336,7 +350,7 @@
// Initial ideia, to have a separate shortcode var ($subsc).... // Initial ideia, to have a separate shortcode var ($subsc)....
//global $forum, $forumId, $threadFrom, $view; //global $forum, $forumId, $threadFrom, $view;
global $sc, $forum, $forumId; global $forum, $forumId;
// var_dump ($forumId); // var_dump ($forumId);
// var_dump (vartrue($forumId)); // var_dump (vartrue($forumId));
//var_dump ($forum->forumGetSubs(vartrue($forum_id))); //var_dump ($forum->forumGetSubs(vartrue($forum_id)));
@@ -429,12 +443,12 @@
// Initial ideia, to have a separate shortcode var ($subsc).... // Initial ideia, to have a separate shortcode var ($subsc)....
// $subsc->setVars($subInfo); // $subsc->setVars($subInfo);
// Use setVars or addVars??? // Use setVars or addVars???
$sc->setVars($subInfo); $this->addVars($subInfo);
//echo "--------------------------------------"; //echo "--------------------------------------";
// Initial ideia, to have a separate shortcode var ($subsc).... // Initial ideia, to have a separate shortcode var ($subsc)....
// $sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $subsc); // $sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $subsc);
$sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $sc); $sub_info .= e107::getParser()->parseTemplate($FORUM_VIEW_SUB, false, $this);
//var_dump ($sc); //var_dump ($sc);