From 751bb4209625e33450601e3098bede0144492d71 Mon Sep 17 00:00:00 2001
From: PlanetCloud <35788716+PlanetTheCloud@users.noreply.github.com>
Date: Thu, 13 Jul 2023 23:07:35 +0700
Subject: [PATCH] Fix #36

---
 sys-auth/api/signup.php        |  4 ++++
 sys-auth/app/config_parser.php |  2 +-
 sys-auth/config/system.php     |  3 +++
 sys-auth/pages/signup.php      | 17 ++++++++++++-----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sys-auth/api/signup.php b/sys-auth/api/signup.php
index 5e0474a..56ca189 100644
--- a/sys-auth/api/signup.php
+++ b/sys-auth/api/signup.php
@@ -64,6 +64,10 @@
             }
         }
         if ($data['domain_type'] === 'custom') {
+            if (!config('system.features.signup.use_own_domain', false)) {
+                throw new ValidationFailedException(__('Signups using custom domains are currently disabled. Please use a free subdomain and try again.'), 'custom_domain');
+            }
+
             $data['custom_domain'] = strtolower($data['custom_domain']);
             if (!preg_match('/^(?:[-A-Za-z0-9]+\.)+[A-Za-z]{2,6}$/', $data['custom_domain'])) {
                 throw new ValidationFailedException(__('The custom domain you provided is invalid. Please enter a valid custom domain and try again.'), 'custom_domain');
diff --git a/sys-auth/app/config_parser.php b/sys-auth/app/config_parser.php
index f72dc19..1caa8b6 100644
--- a/sys-auth/app/config_parser.php
+++ b/sys-auth/app/config_parser.php
@@ -19,7 +19,7 @@
 
 # Handle System Config
 $system = require SYSTEM . '/config/system.php';
-$required = ['development_mode', 'maintenance_mode', 'maintenance_key', 'lockdown_mode', 'language', 'use_https', 'cpanel_url', 'domain_selection'];
+$required = ['installation_url', 'development_mode', 'maintenance_mode', 'maintenance_key', 'lockdown_mode', 'language', 'use_https', 'cpanel_url', 'domain_selection', 'blacklisted_tld', 'default_plan', 'features'];
 foreach ($required as $key) {
     if (!isset($system[$key])) {
         throw new InvalidConfigException("Missing '{$key}' field in 'system' config.");
diff --git a/sys-auth/config/system.php b/sys-auth/config/system.php
index 92fda88..e22d03d 100644
--- a/sys-auth/config/system.php
+++ b/sys-auth/config/system.php
@@ -31,6 +31,9 @@
         'login' => [
             'language_selector' => true,
             'remember_me' => true,
+        ],
+        'signup' => [
+            'use_own_domain' => false,
         ]
     ],
 ];
diff --git a/sys-auth/pages/signup.php b/sys-auth/pages/signup.php
index c8975a3..75a96df 100644
--- a/sys-auth/pages/signup.php
+++ b/sys-auth/pages/signup.php
@@ -1,3 +1,8 @@
+<?php
+    // Optimizations for the form state in case the use own domain feature is disabled.
+    // Automatically selects the free subdomain option and keeps the element hidden.
+    $useOwnDomainBool = (config('system.features.signup.use_own_domain', false));
+?>
 <div class="body">
     <div id="a_response" class="alert alert-danger mb-3 hidden">{{MESSAGE}}</div>
     <div class="msg"><?= __('Sign up for a free account') ?></div>
@@ -41,15 +46,17 @@
             </div>
             <small class="col-pink hidden" id="warn_password_confirm">{{WARNING}}</small>
         </div>
-        <div class="form-group" style="margin-bottom: 10px;">
+
+        <div class="form-group <?= (!$useOwnDomainBool) ? 'hidden' : '' ?>" style="margin-bottom: 10px;">
             <i class="material-icons" style="position: absolute;z-index:10;margin-top:14px;margin-left:425px;" data-toggle="tooltip" data-placement="right" data-html="true" data-template="<div class='tooltip' role='tooltip'><div class='arrow'></div><div class='tooltip-inner' style='max-width: 250px;max-height:300px;'></div></div>" title="<?= __('If you already have a domain that you want to use with us, please select \'I have my own domain\'.<br><br>If you don\'t have a domain right now, you can choose \'I want to use a free subdomain\'.<br><br>Don\'t worry, you can always add more domains (including your own domain) later on from the Control Panel.') ?>">help</i>
             <input type="radio" name="domain_type" value="custom" class="with-gap radio-col-<?= config('branding.accent_color'); ?>" id="i_domain_type_own">
             <label for="i_domain_type_own"><?= __('I have my own domain') ?></label>
             <br>
-            <input type="radio" name="domain_type" value="subdomain" class="with-gap radio-col-<?= config('branding.accent_color'); ?>" id="i_domain_type_sub">
+            <input type="radio" name="domain_type" value="subdomain" class="with-gap radio-col-<?= config('branding.accent_color'); ?>" id="i_domain_type_sub" <?= (!$useOwnDomainBool) ? 'checked="checked"' : '' ?>>
             <label class="p-l-20" for="i_domain_type_sub"><?= __('I want to use a free subdomain') ?></label>
         </div>
         <small class="col-pink hidden" id="warn_domain_type">{{WARNING}}</small>
+
         <div id="s_custom_domain" class="hidden">
             <div class="infobox">
                 <?= __('To use your domain with us, point it to these nameservers:') ?><br>
@@ -67,7 +74,8 @@
                 <small class="col-pink hidden" id="warn_custom_domain">{{WARNING}}</small>
             </div>
         </div>
-        <div id="s_subdomain" class="hidden">
+
+        <div id="s_subdomain" class="<?= ($useOwnDomainBool) ? 'hidden' : '' ?>">
             <div class="infobox" id="infobox_subdomain">
                 <?= __('Choose a subdomain and extension') ?>
             </div>
@@ -94,7 +102,7 @@
                 </div>
             </div>
         </div>
-        <div id="s_others" class="hidden">
+        <div id="s_others" class="<?= ($useOwnDomainBool) ? 'hidden' : '' ?>">
             <div class="form-group form-float">
                 <div style="margin-bottom: 20px;">
                     <img width="50%" src="https://ifastnet.com/image.php?id=<?= Page::param('captcha_id') ?>">
@@ -114,5 +122,4 @@
             <a href="/auth/login"><?= __('Sign in to your account(s)') ?></a>
         </div>
     </form>
-    <script src="assets/signup.js"></script>
 </div>
\ No newline at end of file