mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-28 11:00:39 +00:00
Merge branch 'master' into api
# Conflicts: # .env.testing # public/mix-manifest.json # src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
This commit is contained in:
@@ -23,7 +23,7 @@ class SetupWebsocketEnvironment extends Command
|
||||
public function handle(): void
|
||||
{
|
||||
// Get allowed origins
|
||||
$origins = $this->ask('Type host of which you want to allow incoming requests. If you want to accept multiple hosts, separate them with comma(,)');
|
||||
$origins = $this->ask('Type the host of your VueFileManager front-end application to allow connection with your websocket server. If you want to accept multiple hosts, separate them with comma(,)');
|
||||
|
||||
// Store origins to the .env file
|
||||
setEnvironmentValue([
|
||||
|
||||
@@ -94,10 +94,15 @@ class UserLimitation extends Model
|
||||
$totalUsedEmails = $memberEmails->merge($InvitationEmails)
|
||||
->unique();
|
||||
|
||||
// Get usage in percent
|
||||
$percentage = (int) $this->max_team_members === 0
|
||||
? 100
|
||||
: ($totalUsedEmails->count() / $this->max_team_members) * 100;
|
||||
|
||||
return [
|
||||
'use' => $totalUsedEmails->count(),
|
||||
'total' => (int) $this->max_team_members,
|
||||
'percentage' => ($totalUsedEmails->count() / $this->max_team_members) * 100,
|
||||
'percentage' => $percentage,
|
||||
'meta' => [
|
||||
'allowed_emails' => $totalUsedEmails,
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user