Skip to content
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

Forumjump enhancement #5402

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

Forumjump enhancement #5402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1dc4b4
Merge branch 'e107inc:master' into master
rica-carv Jan 10, 2025
41cd2dd
Merge branch 'e107inc:master' into master
rica-carv Jan 10, 2025
5bbd9e7
Merge branch 'e107inc:master' into master
rica-carv Jan 15, 2025
a8a4ee8
Merge branch 'e107inc:master' into master
rica-carv Jan 16, 2025
a55bc5a
Merge branch 'e107inc:master' into master
rica-carv Jan 19, 2025
bb30ee2
Update forum_class.php
rica-carv Jan 20, 2025
4957a0c
Update view_shortcodes.php
rica-carv Jan 20, 2025
300cf44
Update view_shortcodes.php
rica-carv Jan 20, 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
9 changes: 7 additions & 2 deletions e107_plugins/forum/forum_class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,7 +2008,7 @@ function forumGet($forum_id)
}


function forumGetAllowed($type='view')
function forumGetAllowed($type='view', $mode = null)
{
if(empty($this->permList[$type]))
{
Expand All @@ -2017,7 +2017,12 @@ function forumGetAllowed($type='view')

$sql = e107::getDb();
$forumList = implode(',', $this->permList[$type]);
$qry = "
$qry = $mode?"
SELECT f.forum_id, f.forum_name, f.forum_sef, pf.forum_name AS parent_name
FROM `#forum` AS f LEFT JOIN `#forum` AS pf
ON f.forum_parent = pf.forum_id
WHERE f.forum_id IN ({$forumList}) AND f.forum_parent != 0
ORDER BY pf.forum_id, f.forum_name":"
SELECT forum_id, forum_name, forum_sef FROM `#forum`
WHERE forum_id IN ({$forumList}) AND forum_parent != 0
";
Expand Down
4 changes: 2 additions & 2 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 @@ -1266,13 +1266,13 @@ function sc_buttonsx()
$text .= '<li>' . $val . '</li>';
}

$jumpList = $this->forum->forumGetAllowed();
$jumpList = $this->forum->forumGetAllowed('view', 'true');

$text .= "<li class='divider'><hr class='dropdown-divider'></li>";

foreach($jumpList as $key => $val)
{
$text .= '<li><a class="dropdown-item" href ="' . e107::url('forum', 'forum', $val) . '">' . LAN_FORUM_1017 . " " . $val['forum_name'] . '</a></li>';
$text .= '<li><a class="dropdown-item" href ="' . e107::url('forum', 'forum', $val) . '">' . LAN_FORUM_1017 . " " .($val['parent_name']?$val['parent_name']." - ":"") . $val['forum_name'] . '</a></li>';
}

$text .= '
Expand Down
Loading