From 8f4d00c1cc679b1da662b94618596545704e378a Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Fri, 6 Oct 2023 18:43:56 +0700
Subject: [PATCH] Minor improvements (#960)

* Minor improvements

* Update admin_extensions.php

* Update Ajax.php
---
 admin/admin_extensions.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/admin/admin_extensions.php b/admin/admin_extensions.php
index 96a40c220..87229cbcd 100644
--- a/admin/admin_extensions.php
+++ b/admin/admin_extensions.php
@@ -569,7 +569,7 @@ if ($e_mode == 'perm' && $group) {
         $forum_p = [];
         $act_id = 0;
         $forum_p = auth_unpack($allowed_forums);
-        $sql = 'SELECT forum_id, forum_name, forum_parent FROM ' . BB_FORUMS . ' WHERE forum_id IN (' . implode(', ', $forum_p) . ') ORDER BY forum_order';
+        $sql = 'SELECT forum_id, forum_name FROM ' . BB_FORUMS . ' WHERE forum_id IN (' . implode(', ', $forum_p) . ')';
         if (!($result = DB()->sql_query($sql))) {
             bb_die('Could not get forum names');
         }
@@ -577,16 +577,15 @@ if ($e_mode == 'perm' && $group) {
         while ($row = DB()->sql_fetchrow($result)) {
             $forum_perm[$act_id]['forum_id'] = $row['forum_id'];
             $forum_perm[$act_id]['forum_name'] = $row['forum_name'];
-            $forum_perm[$act_id]['forum_parent'] = $row['forum_parent'];
             $act_id++;
         }
     }
 
     for ($i = 0, $iMax = count($forum_perm); $i < $iMax; $i++) {
-        $template->assign_block_vars('allow_option_values', [
-            'VALUE' => $forum_perm[$i]['forum_id'],
-            'OPTION' => (($forum_perm[$i]['forum_parent']) ? HTML_SF_SPACER : '') . htmlCHR($forum_perm[$i]['forum_name'])
-        ]);
+        $template->assign_block_vars('allow_option_values', array(
+                'VALUE' => $forum_perm[$i]['forum_id'],
+                'OPTION' => htmlCHR($forum_perm[$i]['forum_name']))
+        );
     }
 
     $template->assign_vars(array(
@@ -595,24 +594,24 @@ if ($e_mode == 'perm' && $group) {
         'A_PERM_ACTION' => "admin_extensions.php?mode=groups&amp;e_mode=perm&amp;e_group=$group",
     ));
 
-    $forum_option_values = array(0 => array('parent' => 0, 'name' => $lang['PERM_ALL_FORUMS']));
+    $forum_option_values = array(0 => $lang['PERM_ALL_FORUMS']);
 
-    $sql = 'SELECT forum_id, forum_name, forum_parent FROM ' . BB_FORUMS . ' ORDER BY forum_order';
+    $sql = 'SELECT forum_id, forum_name FROM ' . BB_FORUMS;
 
     if (!($result = DB()->sql_query($sql))) {
         bb_die('Could not get forums #1');
     }
 
     while ($row = DB()->sql_fetchrow($result)) {
-        $forum_option_values[(int)$row['forum_id']] = array('parent' => $row['forum_parent'], 'name' => $row['forum_name']);
+        $forum_option_values[(int)$row['forum_id']] = $row['forum_name'];
     }
     DB()->sql_freeresult($result);
 
     foreach ($forum_option_values as $value => $option) {
-        $template->assign_block_vars('forum_option_values', [
-            'VALUE' => $value,
-            'OPTION' => (($option['parent']) ? HTML_SF_SPACER : '') . htmlCHR($option['name'])
-        ]);
+        $template->assign_block_vars('forum_option_values', array(
+                'VALUE' => $value,
+                'OPTION' => htmlCHR($option))
+        );
     }
 
     $empty_perm_forums = [];