diff --git a/src/app/Http/Controllers/API/V4/UsersController.php b/src/app/Http/Controllers/API/V4/UsersController.php --- a/src/app/Http/Controllers/API/V4/UsersController.php +++ b/src/app/Http/Controllers/API/V4/UsersController.php @@ -193,18 +193,18 @@ 'enableBeta' => $hasBeta, // TODO: This will change when we enable all users to create domains 'enableDomains' => $isController && $hasCustomDomain, - 'enableDistlists' => $isController && $hasCustomDomain, + 'enableDistlists' => $isController && $hasCustomDomain && \config('app.with_distlists'), 'enableFiles' => !$isDegraded && $hasBeta && \config('app.with_files'), - 'enableFolders' => $isController && $hasCustomDomain, - 'enableResources' => $isController && $hasCustomDomain && $hasBeta, - 'enableRooms' => $hasMeet, + 'enableFolders' => $isController && $hasCustomDomain && \config('app.with_shared_folders'), + 'enableResources' => $isController && $hasCustomDomain && $hasBeta && \config('app.with_resources'), + 'enableRooms' => $hasMeet && \config('app.with_meet'), 'enableSettings' => $isController, 'enableSubscriptions' => $isController && \config('app.with_subscriptions'), 'enableUsers' => $isController, 'enableWallets' => $isController && \config('app.with_wallet'), 'enableWalletMandates' => $isController, 'enableWalletPayments' => $isController && (!$plan || $plan->mode != Plan::MODE_MANDATE), - 'enableCompanionapps' => $hasBeta, + 'enableCompanionapps' => $hasBeta && \config('app.with_companion_app'), ]; return array_merge($process, $result); diff --git a/src/config/app.php b/src/config/app.php --- a/src/config/app.php +++ b/src/config/app.php @@ -245,6 +245,12 @@ 'with_subscriptions' => (bool) env('APP_WITH_SUBSCRIPTIONS', true), 'with_wallet' => (bool) env('APP_WITH_WALLET', true), + 'with_distlists' => (bool) env('APP_WITH_DISTLISTS', true), + 'with_shared_folders' => (bool) env('APP_WITH_SHARED_FOLDERS', true), + 'with_resources' => (bool) env('APP_WITH_RESOURCES', true), + 'with_meet' => (bool) env('APP_WITH_MEET', true), + 'with_companion_app' => (bool) env('APP_WITH_COMPANION_APP', true), + 'signup' => [ 'email_limit' => (int) env('SIGNUP_LIMIT_EMAIL', 0), 'ip_limit' => (int) env('SIGNUP_LIMIT_IP', 0),