torrentpier/torrentpier-lts
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier-lts.git synced 2025-02-28 15:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor improvements (#304)

Browse Source 
* Minor improvements

* Update admin_extensions.php

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2023-10-05 22:38:35 +07:00 committed by GitHub
parent ab318084dd
commit 01e450ed87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,7 +6,7 @@
**Merged pull requests:** **Merged pull requests:**
- Release v2.1.5-2023.10 🎉 - Release v2.1.5-2023.10 🎉
- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303) ([belomaxorka](https://github.com/belomaxorka)) - Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#304](https://github.com/torrentpier/torrentpier-lts/pull/304) ([belomaxorka](https://github.com/belomaxorka))
## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04) ## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04)
[Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09) [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09)

13
admin/admin_extensions.php
View File

@ -662,7 +662,7 @@ if ($e_mode == 'perm' && $group)
$forum_p = array(); $forum_p = array();
$act_id = 0; $act_id = 0;
$forum_p = auth_unpack($allowed_forums); $forum_p = auth_unpack($allowed_forums);
$sql = "SELECT forum_id, forum_name FROM " . BB_FORUMS . " WHERE forum_id IN (" . implode(', ', $forum_p) . ")"; $sql = "SELECT forum_id, forum_name, forum_parent FROM " . BB_FORUMS . " WHERE forum_id IN (" . implode(', ', $forum_p) . ") ORDER BY forum_order";
if (!($result = DB()->sql_query($sql))) if (!($result = DB()->sql_query($sql)))
{ {
bb_die('Could not get forum names'); bb_die('Could not get forum names');
@ -672,6 +672,7 @@ if ($e_mode == 'perm' && $group)
{ {
$forum_perm[$act_id]['forum_id'] = $row['forum_id']; $forum_perm[$act_id]['forum_id'] = $row['forum_id'];
$forum_perm[$act_id]['forum_name'] = $row['forum_name']; $forum_perm[$act_id]['forum_name'] = $row['forum_name'];
$forum_perm[$act_id]['forum_parent'] = $row['forum_parent'];
$act_id++; $act_id++;
} }
} }
@ -680,7 +681,7 @@ if ($e_mode == 'perm' && $group)
{ {
$template->assign_block_vars('allow_option_values', array( $template->assign_block_vars('allow_option_values', array(
'VALUE' => $forum_perm[$i]['forum_id'], 'VALUE' => $forum_perm[$i]['forum_id'],
'OPTION' => htmlCHR($forum_perm[$i]['forum_name'])) 'OPTION' => (($forum_perm[$i]['forum_parent']) ? HTML_SF_SPACER : '') . htmlCHR($forum_perm[$i]['forum_name']))
); );
} }
@ -690,9 +691,9 @@ if ($e_mode == 'perm' && $group)
'A_PERM_ACTION' => "admin_extensions.php?mode=groups&e_mode=perm&e_group=$group", 'A_PERM_ACTION' => "admin_extensions.php?mode=groups&e_mode=perm&e_group=$group",
)); ));
$forum_option_values = array(0 => $lang['PERM_ALL_FORUMS']); $forum_option_values = array(0 => array(0 => 0, 1 => $lang['PERM_ALL_FORUMS']));
$sql = "SELECT forum_id, forum_name FROM " . BB_FORUMS; $sql = "SELECT forum_id, forum_name, forum_parent FROM " . BB_FORUMS . " ORDER BY forum_order";
if (!($result = DB()->sql_query($sql))) if (!($result = DB()->sql_query($sql)))
{ {
@ -701,7 +702,7 @@ if ($e_mode == 'perm' && $group)
while ($row = DB()->sql_fetchrow($result)) while ($row = DB()->sql_fetchrow($result))
{ {
$forum_option_values[intval($row['forum_id'])] = $row['forum_name']; $forum_option_values[intval($row['forum_id'])] = array(0 => $row['forum_parent'], 1 => $row['forum_name']);
} }
DB()->sql_freeresult($result); DB()->sql_freeresult($result);
@ -709,7 +710,7 @@ if ($e_mode == 'perm' && $group)
{ {
$template->assign_block_vars('forum_option_values', array( $template->assign_block_vars('forum_option_values', array(
'VALUE' => $value, 'VALUE' => $value,
'OPTION' => htmlCHR($option)) 'OPTION' => (($option[0]) ? HTML_SF_SPACER : '') . htmlCHR($option[1]))
); );
} }