PR amendments (+ update dicebear api url)

NamelessMC · tadhgboyle · Mar 7, 2023 · Sep 24, 2022 · Sep 24, 2022 · Jan 23, 2023
commit 9344bee7fc4a83aeef58c5a3540ef89e7cba4c04
diff --git a/Dockerfile.phpdoc b/Dockerfile.phpdoc
@@ -7,7 +7,8 @@ RUN mkdir /target && \
         -d /source/modules/Core/classes \
         -d "/source/modules/Discord Integration/classes" \
         -d "/source/modules/Cookie Consent/classes" \
-        -d /source/modules/Forum/classes -t /target -i /vendor
+        -d /source/modules/Forum/classes
+        -d /source/modules/Members/classes -t /target -i /vendor
 
 FROM nginxinc/nginx-unprivileged:stable
 

diff --git a/core/classes/Avatars/AvatarSource.php b/core/classes/Avatars/AvatarSource.php
@@ -89,7 +89,7 @@ public static function getAvatarFromUserData(object $data, bool $allow_gifs = fa
             }
         }
 
-        return "https://avatars.dicebear.com/api/initials/{$data->username}.png?size={$size}";
+        return "https://api.dicebear.com/5.x/initials/svg?seed={$data->username}&size={$size}";
     }
 
     /**

diff --git a/custom/panel_templates/Default/members/member_lists.tpl b/custom/panel_templates/Default/members/member_lists.tpl
@@ -37,31 +37,6 @@
                         <!-- Success and Error Alerts -->
                         {include file='includes/alerts.tpl'}
 
-                        <form id="toggleHideBannedUsers" action="" method="post">
-                            <input type="hidden" name="token" value="{$TOKEN}">
-                            <div class="form-group custom-control custom-switch">
-                                <input type="hidden" name="action" value="toggle_hide_banned_users">
-                                <input id="inputToggleHideBannedUsers" name="hide_banned_users" type="checkbox" class="custom-control-input js-check-change" value="1" {if $HIDE_BANNED_USERS_VALUE eq 1} checked{/if} />
-                                <label for="inputToggleHideBannedUsers" class="custom-control-label">
-                                    {$HIDE_BANNED_USERS}
-                                </label>
-                            </div>
-                        </form>
-
-                        <form action="" method="post">
-                            <input type="hidden" name="token" value="{$TOKEN}">
-                            <div class="form-group">
-                                <label for="groups">{$GROUPS}</label>
-                                <select name="groups[]" id="groups" class="form-control" multiple>
-                                    {foreach from=$GROUPS_ARRAY item=group}
-                                        <option value="{$group.id}" {if in_array($group.id, $GROUPS_VALUE)} selected{/if}>{$group.name}</option>
-                                    {/foreach}
-                                </select>
-                            </div>
-                        </form>
-
-                        <hr>
-
                         <div class="table-responsive">
                             <table class="table table-borderless table-striped">
                                 <thead>
@@ -122,36 +97,6 @@
 </div>
 
 {include file='scripts.tpl'}
-<script>
-    const groupSelector = $('#groups');
-    groupSelector.select2({
-        placeholder: "{$NO_ITEM_SELECTED}"
-    });
-    groupSelector.on('change', (e) => {
-        const selectedGroups = [];
-        const selectedOptions = e.delegateTarget.selectedOptions;
-        for (const group of selectedOptions) {
-            selectedGroups.push(group.value);
-        }
-
-        $.ajax({
-            url: "{$SELECT_CHANGE_URL}",
-            type: "POST",
-            data: {
-                token: "{$TOKEN}",
-                action: "update_groups",
-                groups: selectedGroups,
-            },
-            success: function (response) {
-                // Success
-            },
-            error: function (xhr) {
-                // Error
-                console.log(xhr);
-            }
-        });
-    });
-</script>
 
 </body>
 

diff --git a/custom/panel_templates/Default/members/members_settings.tpl b/custom/panel_templates/Default/members/members_settings.tpl
@@ -0,0 +1,112 @@
+{include file='header.tpl'}
+
+<body id="page-top">
+
+    <!-- Wrapper -->
+    <div id="wrapper">
+
+        <!-- Sidebar -->
+        {include file='sidebar.tpl'}
+
+        <!-- Content Wrapper -->
+        <div id="content-wrapper" class="d-flex flex-column">
+
+            <!-- Main content -->
+            <div id="content">
+
+                <!-- Topbar -->
+                {include file='navbar.tpl'}
+
+                <!-- Begin Page Content -->
+                <div class="container-fluid">
+
+                    <!-- Page Heading -->
+                    <div class="d-sm-flex align-items-center justify-content-between mb-4">
+                        <h1 class="h3 mb-0 text-gray-800">{$SETTINGS}</h1>
+                        <ol class="breadcrumb float-sm-right">
+                            <li class="breadcrumb-item"><a href="{$PANEL_INDEX}">{$DASHBOARD}</a></li>
+                            <li class="breadcrumb-item active">{$MEMBERS}</li>
+                            <li class="breadcrumb-item active">{$SETTINGS}</li>
+                        </ol>
+                    </div>
+
+                    <!-- Update Notification -->
+                    {include file='includes/update.tpl'}
+
+                    <div class="card shadow mb-4">
+                        <div class="card-body">
+
+                            <!-- Success and Error Alerts -->
+                            {include file='includes/alerts.tpl'}
+
+                            <form action="" method="post">
+                                <div class="form-group">
+                                    <label for="link_location">{$LINK_LOCATION}</label>
+                                    <select class="form-control" id="link_location" name="link_location">
+                                        <option value="1" {if $LINK_LOCATION_VALUE eq 1} selected{/if}>
+                                            {$LINK_NAVBAR}
+                                        </option>
+                                        <option value="2" {if $LINK_LOCATION_VALUE eq 2} selected{/if}>
+                                            {$LINK_MORE}
+                                        </option>
+                                        <option value="3" {if $LINK_LOCATION_VALUE eq 3} selected{/if}>
+                                            {$LINK_FOOTER}
+                                        </option>
+                                        <option value="4" {if $LINK_LOCATION_VALUE eq 4} selected{/if}>
+                                            {$LINK_NONE}
+                                        </option>
+                                    </select>
+                                </div>
+
+                                <div class="form-group custom-control custom-switch">
+                                    <input type="hidden" name="action" value="toggle_hide_banned_users">
+                                    <input id="inputToggleHideBannedUsers" name="hide_banned_users" type="checkbox" class="custom-control-input js-check-change" value="1" {if $HIDE_BANNED_USERS_VALUE eq 1} checked{/if} />
+                                    <label for="inputToggleHideBannedUsers" class="custom-control-label">
+                                        {$HIDE_BANNED_USERS}
+                                    </label>
+                                </div>
+
+                                <div class="form-group">
+                                    <label for="groups">{$GROUPS}</label>
+                                    <select name="groups[]" id="groups" class="form-control" multiple>
+                                        {foreach from=$GROUPS_ARRAY item=group}
+                                            <option value="{$group.id}" {if in_array($group.id, $GROUPS_VALUE)} selected{/if}>{$group.name}</option>
+                                        {/foreach}
+                                    </select>
+                                </div>
+
+                                <div class="form-group">
+                                    <input type="hidden" name="token" value="{$TOKEN}">
+                                    <input type="submit" class="btn btn-primary" value="{$SUBMIT}" />
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+
+                    <!-- Spacing -->
+                    <div style="height:1rem;"></div>
+
+                    <!-- End Page Content -->
+                </div>
+
+                <!-- End Main Content -->
+            </div>
+
+            {include file='footer.tpl'}
+
+            <!-- End Content Wrapper -->
+        </div>
+
+        <!-- End Wrapper -->
+    </div>
+
+    {include file='scripts.tpl'}
+    <script>
+        $('#groups').select2({
+            placeholder: "{$NO_ITEM_SELECTED}"
+        });
+    </script>
+
+</body>
+
+</html>
diff --git a/custom/templates/DefaultRevamp/members/members.tpl b/custom/templates/DefaultRevamp/members/members.tpl
@@ -214,7 +214,7 @@
                     url: 'profile_url',
                 },
                 apiSettings: {
-                    url: '{$SEARCH_URL}&search={literal}{query}{/literal}'
+                    url: '{$SEARCH_URL}&search={literal}{query}{/literal}&limit=5'
                 },
                 error: {
                     noResultsHeader: "{$NO_RESULTS_HEADER}",

diff --git a/modules/Core/queries/users.php b/modules/Core/queries/users.php
@@ -16,7 +16,8 @@
 
 $query = '%' . $_GET['search'] . '%';
 
-$users = DB::getInstance()->query('SELECT id, username, nickname, gravatar, email, has_avatar, avatar_updated FROM nl2_users WHERE username LIKE ? OR nickname LIKE ? LIMIT 5', [
+$limit = isset($_GET['limit']) ? 'LIMIT ' . (int) $_GET['limit'] : '';
+$users = DB::getInstance()->query("SELECT id, username, nickname, gravatar, email, has_avatar, avatar_updated FROM nl2_users WHERE username LIKE ? OR nickname LIKE ? $limit", [
     $query, $query
 ])->results();
 

diff --git a/modules/Members/classes/MemberListProvider.php b/modules/Members/classes/MemberListProvider.php
@@ -164,6 +164,10 @@ public function getMemberCount(): int {
      */
     private function filterBanned(array $rows, string $id_column): array {
         $ids = implode(',', array_map(static fn ($row) => $row->{$id_column}, $rows));
+        if (empty($ids)) {
+            return [];
+        }
+
         $bans = DB::getInstance()->query("SELECT id, isbanned FROM nl2_users WHERE id IN ($ids)")->results();
 
         return array_filter($rows, static function ($row) use ($bans, $id_column) {

diff --git a/modules/Members/init.php b/modules/Members/init.php
@@ -2,6 +2,6 @@
 
 require_once ROOT_PATH . '/modules/Members/module.php';
 
-$member_language = new Language(ROOT_PATH . '/modules/Members/language');
+$members_language = new Language(ROOT_PATH . '/modules/Members/language');
 
-$module = new Members_Module($language, $member_language, $pages);
+$module = new Members_Module($language, $members_language, $pages);
diff --git a/modules/Members/language/en_UK.json b/modules/Members/language/en_UK.json
@@ -14,5 +14,6 @@
   "members/viewable_groups": "Viewable groups",
   "members/no_results_header": "No results found",
   "members/no_results_text": "Your search returned no results",
-  "members/no_overview_lists_enabled": "No overview lists are enabled."
+  "members/no_overview_lists_enabled": "No overview lists are enabled.",
+  "members/settings_updated_successfully": "Settings updated successfully."
 }
diff --git a/modules/Members/module.php b/modules/Members/module.php
@@ -12,11 +12,11 @@
 class Members_Module extends Module {
 
     private Language $_language;
-    private Language $_member_language;
+    private Language $_members_language;
 
-    public function __construct(Language $language, Language $member_language, Pages $pages) {
+    public function __construct(Language $language, Language $members_language, Pages $pages) {
         $this->_language = $language;
-        $this->_member_language = $member_language;
+        $this->_members_language = $members_language;
 
         $name = 'Members';
         $author = '<a href="https://tadhg.sh" target="_blank" rel="nofollow noopener">Aberdeener</a>';
@@ -28,7 +28,8 @@ public function __construct(Language $language, Language $member_language, Pages
         // Define URLs which belong to this module
         $pages->add('Members', '/members', 'pages/members.php');
         $pages->add('Members', '/queries/member_list', 'queries/member_list.php');
-        $pages->add('Members', '/panel/core/member_lists', 'pages/panel/member_lists.php');
+        $pages->add('Members', '/panel/members/member_lists', 'pages/panel/member_lists.php');
+        $pages->add('Members', '/panel/members/settings', 'pages/panel/settings.php');
     }
 
     public function onInstall() {
@@ -52,7 +53,7 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
 
         // AdminCP
         PermissionHandler::registerPermissions($language->get('moderator', 'staff_cp'), [
-            'admincp.members' => $this->_member_language->get('members', 'member_lists')
+            'admincp.members' => $this->_members_language->get('members', 'member_lists')
         ]);
 
         if (defined('FRONT_END')) {
@@ -70,7 +71,29 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
             } else {
                 $members_icon = $cache->retrieve('members_icon');
             }
-            $navs[0]->add('members', $this->_member_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_order, $members_icon);
+
+            $cache->setCache('nav_location');
+            if (!$cache->isCached('members_location')) {
+                $link_location = 1;
+                $cache->store('members_location', 1);
+            } else {
+                $link_location = $cache->retrieve('members_location');
+            }
+
+            switch ($link_location) {
+                case 1:
+                    // Navbar
+                    $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_order, $members_icon);
+                    break;
+                case 2:
+                    // "More" dropdown
+                    $navs[0]->addItemToDropdown('more_dropdown', 'members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'top', null, $members_icon, $members_order);
+                    break;
+                case 3:
+                    // Footer
+                    $navs[0]->add('members', $this->_members_language->get('members', 'members'), URL::build('/members'), 'footer', null, $members_order, $members_icon);
+                    break;
+            }
         }
 
         if (defined('BACK_END')) {
@@ -85,15 +108,23 @@ public function onPageLoad(User $user, Pages $pages, Cache $cache, Smarty $smart
                     $order = $cache->retrieve('members_order');
                 }
 
-                if (!$cache->isCached('members_icon')) {
-                    $icon = '<i class="nav-icon fas fa-list"></i>';
-                    $cache->store('members_icon', $icon);
+                if (!$cache->isCached('members_settings_icon')) {
+                    $members_settings_icon = '<i class="nav-icon fas fa-cogs"></i>';
+                    $cache->store('members_settings_icon', $members_settings_icon);
+                } else {
+                    $members_settings_icon = $cache->retrieve('members_settings_icon');
+                }
+
+                if (!$cache->isCached('member_lists_icon')) {
+                    $member_lists_icon = '<i class="nav-icon fas fa-list"></i>';
+                    $cache->store('member_lists_icon', $member_lists_icon);
                 } else {
-                    $icon = $cache->retrieve('members_icon');
+                    $member_lists_icon = $cache->retrieve('member_lists_icon');
                 }
 
-                $navs[2]->add('members_divider', mb_strtoupper($this->_member_language->get('members', 'members'), 'UTF-8'), 'divider', 'top', null, $order);
-                $navs[2]->add('member_lists_settings', $this->_member_language->get('members', 'member_lists'), URL::build('/panel/core/member_lists'), 'top', null, $order + 0.1, $icon);
+                $navs[2]->add('members_divider', mb_strtoupper($this->_members_language->get('members', 'members'), 'UTF-8'), 'divider', 'top', null, $order);
+                $navs[2]->add('members_settings', $this->_language->get('admin', 'settings'), URL::build('/panel/members/settings'), 'top', null, $order + 0.1, $members_settings_icon);
+                $navs[2]->add('member_lists_settings', $this->_members_language->get('members', 'member_lists'), URL::build('/panel/members/member_lists'), 'top', null, $order + 0.2, $member_lists_icon);
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return "https://avatars.dicebear.com/api/initials/{$data->username}.png?size={$size}";
+            return "https://api.dicebear.com/5.x/initials/svg?seed={$data->username}&size={$size}";
         }
         /**
@@ Expand Down @@