Bugfixes in server settings, site creation

app/Http/Controllers/SiteController.php

@@ -38,7 +38,17 @@ class SiteController extends Controller
         } else {
             $server = Server::query()
                 ->where('maximum_sites', '>', 0)
-                ->doesntHave('users')
+                ->where(function ($query) {
+                    return $query
+                        ->where(function ($query) {
+                            return $query->whereHas('users', function ($query) {
+                                return $query->where('user_id', auth()->id());
+                            });
+                        })
+                        ->orWhere(function ($query) {
+                            return $query->doesntHave('users');
+                        });
+                })
                 ->withCount('sites')
                 ->inRandomOrder()
                 ->first();

resources/js/Pages/Servers/Settings.vue

@@ -6,7 +6,7 @@
             <Container>
                 <PageHeader>
                     <template #start>
-                        <PageHeaderTitle>{{ __('Settings') }}</PageHeaderTitle>
+                        <PageHeaderTitle>{{ server.name }}</PageHeaderTitle>
                     </template>
                 </PageHeader>
 

resources/js/Pages/Servers/Tabs.vue

@@ -26,11 +26,11 @@
                         to: this.route('servers.show', this.server.id),
                         active: this.route().current('servers.show')
                     },
-                    {
+                    this.can('servers', 'update') ? {
                         title: this.__('Settings'),
                         to: this.route('servers.settings.show', this.server.id),
                         active: this.route().current('servers.settings.show')
-                    },
+                    } : null,
                 ],
             }
         },

resources/js/Pages/Sites/Index.vue

@@ -157,7 +157,7 @@
             }
 
             // If it includes a create true parameter, then we open the creation modal
-            if(window.location.search.includes('create=true')){
+            if(window.location.search.includes('create=')){
                 this.modalIsOpen = true;
             }
             if(window.location.search.includes('server=')){