Added domain create page

cp/app/Controllers/DomainsController.php

@@ -58,6 +58,610 @@ class DomainsController extends Controller
     
     public function create(Request $request, Response $response)
     {
+        if ($request->getMethod() === 'POST') {
+            // Retrieve POST data
+            $data = $request->getParsedBody();
+            $db = $this->container->get('db');
+            $domainName = $data['domainName'] ?? null;
+            $registrar_id = $data['registrar'] ?? null;
+            $registrars = $db->select("SELECT id, clid, name FROM registrar");
+            
+            $registrationYears = $data['registrationYears'];
+            
+            $contactRegistrant = $data['contactRegistrant'] ?? null;
+            $contactAdmin = $data['contactAdmin'] ?? null;
+            $contactTech = $data['contactTech'] ?? null;
+            $contactBilling = $data['contactBilling'] ?? null;
+            
+            $nameservers = $data['nameserver'] ?? [];
+
+            $dsKeyTag = $data['dsKeyTag'] ?? null;
+            $dsAlg = $data['dsAlg'] ?? null;
+            $dsDigestType = $data['dsDigestType'] ?? null;
+            $dsDigest = $data['dsDigest'] ?? null;
+			
+            $dnskeyFlags = $data['dnskeyFlags'] ?? null;
+            $dnskeyProtocol = $data['dnskeyProtocol'] ?? null;
+            $dnskeyAlg = $data['dnskeyAlg'] ?? null;
+            $dnskeyPubKey = $data['dnskeyPubKey'] ?? null;
+			
+            $authInfo = $data['authInfo'] ?? null;
+			
+			list($label, $domain_extension) = explode('.', $domainName, 2);
+			$invalid_domain = validate_label($domainName, $db);
+
+			if ($invalid_domain) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Invalid domain name',
+                    'registrars' => $registrars
+                ]);
+			}
+			
+			$valid_tld = false;
+			$result = $db->select('SELECT id, tld FROM domain_tld');
+
+			foreach ($result as $row) {
+				if ('.' . strtoupper($domain_extension) === strtoupper($row['tld'])) {
+					$valid_tld = true;
+					$tld_id = $row['id'];
+					break;
+				}
+			}
+
+			if (!$valid_tld) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Invalid domain extension',
+                    'registrars' => $registrars
+                ]);
+			}
+
+			$domain_already_exist = $db->selectValue(
+				'SELECT id FROM domain WHERE name = ? LIMIT 1',
+				[$domainName]
+			);
+
+			if ($domain_already_exist) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Domain name already exists',
+                    'registrars' => $registrars
+                ]);
+			}
+
+			$domain_already_reserved = $db->selectValue(
+				'SELECT id FROM reserved_domain_names WHERE name = ? LIMIT 1',
+				[$domainName]
+			);
+
+			if ($domain_already_reserved) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Domain name is reserved or restricted',
+                    'registrars' => $registrars
+                ]);
+			}
+			
+			if ($registrationYears && (($registrationYears < 1) || ($registrationYears > 10))) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Domain period must be from 1 to 10',
+                    'registrars' => $registrars
+                ]);
+			} elseif (!$registrationYears) {
+				$registrationYears = 1;
+			}
+			
+			$date_add = 0;
+			$date_add = ($registrationYears * 12);
+	
+            $result = $db->select('SELECT registrar_id FROM registrar_users WHERE user_id = ?', [$_SESSION['auth_user_id']]);
+
+            if (is_array($result)) {
+                $clid = $result['registrar_id'];
+            } else if (is_object($result) && method_exists($result, 'fetch')) {
+                $clid = $result->fetch();
+            } else {
+                $clid = $registrar_id;
+            }
+			
+            $result = $db->selectRow('SELECT accountBalance, creditLimit FROM registrar WHERE id = ?', [$clid]);
+
+			$registrar_balance = $result['accountBalance'];
+			$creditLimit = $result['creditLimit'];
+
+			$priceColumn = "m" . $date_add;
+			$price = $db->selectValue(
+				'SELECT ' . $db->quoteIdentifier($priceColumn) . ' FROM domain_price WHERE tldid = ? AND command = "create" LIMIT 1',
+				[$tld_id]
+			);
+
+			if (!$price) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'The price, period and currency for such TLD are not declared',
+                    'registrars' => $registrars
+                ]);
+			}
+
+			if (($registrar_balance + $creditLimit) < $price) {
+                return view($response, 'admin/domains/create.twig', [
+                    'domainName' => $domainName,
+                    'error' => 'Low credit: minimum threshold reached',
+                    'registrars' => $registrars
+                ]);
+			}
+			
+			if (count($nameservers) !== count(array_unique($nameservers))) {
+				return view($response, 'admin/domains/create.twig', [
+					'domainName' => $domainName,
+					'error' => 'Duplicate nameservers detected. Please provide unique nameservers.',
+					'registrars' => $registrars
+				]);
+			}
+			
+            foreach ($nameservers as $index => $nameserver) {
+                if (preg_match("/^-|^\.-|-\.$|^\.$/", $nameserver)) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid hostName',
+						'registrars' => $registrars
+					]);
+                }
+				
+                if (!preg_match('/^([A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9]){0,1}\.){1,125}[A-Z0-9]([A-Z0-9-]{0,61}[A-Z0-9])$/i', $nameserver) && strlen($nameserver) < 254) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid hostName',
+						'registrars' => $registrars
+					]);
+				}
+            }
+			
+			if ($contactRegistrant) {
+				$validRegistrant = validate_identifier($contactRegistrant);
+				$row = $db->selectRow('SELECT id, clid FROM contact WHERE identifier = ?', [$contactRegistrant]);
+
+				if (!$row) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Registrant does not exist',
+						'registrars' => $registrars
+					]);
+				}
+
+				if ($clid != $row['clid']) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'The contact requested in the command does NOT belong to the current registrar',
+						'registrars' => $registrars
+					]);
+				}
+			}
+			
+			if ($contactAdmin) {
+				$validAdmin = validate_identifier($contactAdmin);
+				$row = $db->selectRow('SELECT id, clid FROM contact WHERE identifier = ?', [$contactAdmin]);
+
+				if (!$row) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Admin contact does not exist',
+						'registrars' => $registrars
+					]);
+				}
+
+				if ($clid != $row['clid']) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'The contact requested in the command does NOT belong to the current registrar',
+						'registrars' => $registrars
+					]);
+				}
+			}
+			
+			if ($contactTech) {
+				$validTech = validate_identifier($contactTech);
+				$row = $db->selectRow('SELECT id, clid FROM contact WHERE identifier = ?', [$contactTech]);
+
+				if (!$row) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Tech contact does not exist',
+						'registrars' => $registrars
+					]);
+				}
+
+				if ($clid != $row['clid']) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'The contact requested in the command does NOT belong to the current registrar',
+						'registrars' => $registrars
+					]);
+				}
+			}
+			
+			if ($contactBilling) {
+				$validBilling = validate_identifier($contactBilling);
+				$row = $db->selectRow('SELECT id, clid FROM contact WHERE identifier = ?', [$contactBilling]);
+
+				if (!$row) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Billing contact does not exist',
+						'registrars' => $registrars
+					]);
+				}
+
+				if ($clid != $row['clid']) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'The contact requested in the command does NOT belong to the current registrar',
+						'registrars' => $registrars
+					]);
+				}
+			}
+			
+			if (!$authInfo) {
+				return view($response, 'admin/domains/create.twig', [
+					'domainName' => $domainName,
+					'error' => 'Missing domain authinfo',
+					'registrars' => $registrars
+				]);
+			}
+
+			if (strlen($authInfo) < 6 || strlen($authInfo) > 16) {
+				return view($response, 'admin/domains/create.twig', [
+					'domainName' => $domainName,
+					'error' => 'Password needs to be at least 6 and up to 16 characters long',
+					'registrars' => $registrars
+				]);
+			}
+
+			if (!preg_match('/[A-Z]/', $authInfo)) {
+				return view($response, 'admin/domains/create.twig', [
+					'domainName' => $domainName,
+					'error' => 'Password should have both upper and lower case characters',
+					'registrars' => $registrars
+				]);
+			}
+			
+			$registrant_id = $db->selectValue(
+				'SELECT id FROM contact WHERE identifier = ? LIMIT 1',
+				[$contactRegistrant]
+			);
+
+			try {
+				$db->beginTransaction();
+				
+				$crdate = date('Y-m-d H:i:s'); // Current timestamp
+				$exdate = date('Y-m-d H:i:s', strtotime("+$date_add months")); // Expiry timestamp after $date_add months
+
+				$db->insert('domain', [
+					'name' => $domainName,
+					'tldid' => $tld_id,
+					'registrant' => $registrant_id,
+					'crdate' => $crdate,
+					'exdate' => $exdate,
+					'update' => null,
+					'clid' => $clid,
+					'crid' => $clid,
+					'upid' => null,
+					'trdate' => null,
+					'trstatus' => null,
+					'reid' => null,
+					'redate' => null,
+					'acid' => null,
+					'acdate' => null,
+					'rgpstatus' => 'addPeriod',
+					'addPeriod' => $date_add
+				]);
+				$domain_id = $db->getlastInsertId();
+
+				$db->insert(
+					'domain_authInfo',
+					[
+						'domain_id' => $domain_id,
+						'authtype' => 'pw',
+						'authinfo' => $authInfo
+					]
+				);
+				
+				// Data sanity checks
+				// Validate keyTag
+				if (!empty($dsKeyTag)) {
+					if (!is_int($dsKeyTag)) {
+						return view($response, 'admin/domains/create.twig', [
+							'domainName' => $domainName,
+							'error' => 'Incomplete key tag provided',
+							'registrars' => $registrars
+						]);
+					}
+				
+					if ($dsKeyTag < 0 || $dsKeyTag > 65535) {
+						return view($response, 'admin/domains/create.twig', [
+							'domainName' => $domainName,
+							'error' => 'Incomplete key tag provided',
+							'registrars' => $registrars
+						]);
+					}
+				}
+
+				// Validate alg
+				$validAlgorithms = [2, 3, 5, 6, 7, 8, 10, 13, 14, 15, 16];
+				if (!empty($dsAlg) && !in_array($dsAlg, $validAlgorithms)) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Incomplete algorithm provided',
+						'registrars' => $registrars
+					]);
+				}
+
+				// Validate digestType and digest
+				if (!empty($dsDigestType) && !is_int($dsDigestType)) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Incomplete digest type provided',
+						'registrars' => $registrars
+					]);
+				}
+				$validDigests = [
+				1 => 40,  // SHA-1
+				2 => 64,  // SHA-256
+				4 => 96   // SHA-384
+				];
+				if (!empty($validDigests[$dsDigestType])) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Unsupported digest type',
+						'registrars' => $registrars
+					]);
+				}
+				if (!empty($dsDigest)) {
+					if (strlen($dsDigest) != $validDigests[$dsDigestType] || !ctype_xdigit($dsDigest)) {
+						return view($response, 'admin/domains/create.twig', [
+							'domainName' => $domainName,
+							'error' => 'Invalid digest length or format',
+							'registrars' => $registrars
+						]);
+					}
+				}
+
+				// Data sanity checks for keyData
+				// Validate flags
+				$validFlags = [256, 257];
+				if (!empty($dnskeyFlags) && !in_array($dnskeyFlags, $validFlags)) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid flags provided',
+						'registrars' => $registrars
+					]);
+				}
+
+				// Validate protocol
+				if (!empty($dnskeyProtocol) && $dnskeyProtocol != 3) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid protocol provided',
+						'registrars' => $registrars
+					]);
+				}
+
+				// Validate algKeyData
+				if (!empty($dnskeyAlg)) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid algorithm encoding',
+						'registrars' => $registrars
+					]);
+				}
+
+				// Validate pubKey
+				if (!empty($dnskeyPubKey) && base64_encode(base64_decode($dnskeyPubKey, true)) !== $dnskeyPubKey) {
+					return view($response, 'admin/domains/create.twig', [
+						'domainName' => $domainName,
+						'error' => 'Invalid public key encoding',
+						'registrars' => $registrars
+					]);
+				}
+
+				if (!empty($dsKeyTag) || !empty($dnskeyFlags)) {
+					$db->insert('secdns', [
+						'domain_id' => $domain_id,
+						'maxsiglife' => $maxSigLife,
+						'interface' => 'dsData',
+						'keytag' => $dsKeyTag,
+						'alg' => $dsAlg,
+						'digesttype' => $dsDigestType,
+						'digest' => $dsDigest,
+						'flags' => $dnskeyFlags ?? null,
+						'protocol' => $dnskeyProtocol ?? null,
+						'keydata_alg' => $dnskeyAlg ?? null,
+						'pubkey' => $dnskeyPubKey ?? null
+					]);
+				}
+				
+				$db->exec(
+					'UPDATE registrar SET accountBalance = accountBalance - ? WHERE id = ?',
+					[$price, $clid]
+				);
+
+				$db->exec(
+					'INSERT INTO payment_history (registrar_id, date, description, amount) VALUES (?, CURRENT_TIMESTAMP, ?, ?)',
+					[$clid, "create domain $domainName for period $date_add MONTH", "-$price"]
+				);
+
+				$row = $db->selectRow(
+					'SELECT crdate, exdate FROM domain WHERE name = ? LIMIT 1',
+					[$domainName]
+				);
+				$from = $row['crdate'];
+				$to = $row['exdate'];
+
+				$db->insert(
+					'statement',
+					[
+						'registrar_id' => $clid,
+						'date' => date('Y-m-d H:i:s'),
+						'command' => 'create',
+						'domain_name' => $domainName,
+						'length_in_months' => $date_add,
+						'from' => $from,
+						'to' => $to,
+						'amount' => $price
+					]
+				);
+
+				foreach ($nameservers as $index => $nameserver) {
+					$hostName_already_exist = $db->selectValue(
+						'SELECT id FROM host WHERE name = ? LIMIT 1',
+						[$nameserver]
+					);
+
+					if ($hostName_already_exist) {
+						$domain_host_map_id = $db->selectValue(
+							'SELECT domain_id FROM domain_host_map WHERE domain_id = ? AND host_id = ? LIMIT 1',
+							[$domain_id, $hostName_already_exist]
+						);
+
+						if (!$domain_host_map_id) {
+							$db->insert(
+								'domain_host_map',
+								[
+									'domain_id' => $domain_id,
+									'host_id' => $hostName_already_exist
+								]
+							);
+						} else {
+							$db->insert(
+								'error_log',
+								[
+									'registrar_id' => $clid,
+									'log' => "Domain : $domainName ; hostName : $nameserver - is duplicated",
+									'date' => date('Y-m-d H:i:s')
+								]
+							);
+						}
+					} else {
+						$host_id = $db->insert(
+							'host',
+							[
+								'name' => $nameserver,
+								'domain_id' => $domain_id,
+								'clid' => $clid,
+								'crid' => $clid,
+								'crdate' => date('Y-m-d H:i:s')
+							]
+						);
+
+						$db->insert(
+							'domain_host_map',
+							[
+								'domain_id' => $domain_id,
+								'host_id' => $host_id
+							]
+						);
+						
+						if (isset($nameserver_ipv4[$index]) && !empty($nameserver_ipv4[$index])) {
+							$ipv4 = normalize_v4_address($nameserver_ipv4[$index]);
+							
+							$db->insert(
+								'host_addr',
+								[
+									'host_id' => $host_id,
+									'addr' => $ipv4,
+									'ip' => 'v4'
+								]
+							);
+						}
+
+						if (isset($nameserver_ipv6[$index]) && !empty($nameserver_ipv6[$index])) {
+							$ipv6 = normalize_v6_address($nameserver_ipv6[$index]);
+							
+							$db->insert(
+								'host_addr',
+								[
+									'host_id' => $host_id,
+									'addr' => $ipv6,
+									'ip' => 'v6'
+								]
+							);
+						}
+						
+					}
+				}
+				
+				$contacts = [
+					'admin' => $data['contactAdmin'] ?? null,
+					'tech' => $data['contactTech'] ?? null,
+					'billing' => $data['contactBilling'] ?? null
+				];
+
+				foreach ($contacts as $type => $contact) {
+					if ($contact !== null) {
+						$contact_id = $db->selectValue(
+							'SELECT id FROM contact WHERE identifier = ? LIMIT 1',
+							[$contact]
+						);
+
+						// Check if $contact_id is not null before insertion
+						if ($contact_id !== null) {
+							$db->insert(
+								'domain_contact_map',
+								[
+									'domain_id' => $domain_id,
+									'contact_id' => $contact_id,
+									'type' => $type
+								]
+							);
+						}
+					}
+				}
+
+				$result = $db->selectRow(
+					'SELECT crdate,exdate FROM domain WHERE name = ? LIMIT 1',
+					[$domainName]
+				);
+				$crdate = $result['crdate'];
+				$exdate = $result['exdate'];
+
+				$curdate_id = $db->selectValue(
+					'SELECT id FROM statistics WHERE date = CURDATE()'
+				);
+
+				if (!$curdate_id) {
+					$db->exec(
+						'INSERT IGNORE INTO statistics (date) VALUES(CURDATE())'
+					);
+				}
+
+				$db->exec(
+					'UPDATE statistics SET created_domains = created_domains + 1 WHERE date = CURDATE()'
+				);
+				
+				$db->commit();
+			} catch (Exception $e) {
+				$db->rollBack();
+				return view($response, 'admin/domains/create.twig', [
+					'domainName' => $domainName,
+					'error' => 'Database failure: ' . $e->getMessage(),
+					'registrars' => $registrars
+				]);
+			}
+			
+            $crdate = $db->selectValue(
+                "SELECT crdate FROM domain WHERE id = ? LIMIT 1",
+                [$domain_id]
+            );
+            
+            return view($response, 'admin/domains/create.twig', [
+                'domainName' => $domainName,
+                'crdate' => $crdate,
+                'registrars' => $registrars
+            ]);
+        }
+
         $db = $this->container->get('db');
         $registrars = $db->select("SELECT id, clid, name FROM registrar");
 

cp/resources/views/admin/domains/create.twig

@@ -24,12 +24,38 @@
         <div class="page-body">
           <div class="container-xl">
             <div class="col-12">
+              {% if domainName is defined and crdate is defined %}
+                  <div class="alert alert-important alert-success alert-dismissible" role="alert">
+                    <div class="d-flex">
+                      <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10" /></svg>
+                      </div>
+                      <div>
+                        &nbsp;{{ __('Domain') }} <strong>{{ domainName }}</strong> {{ __('has been created successfully on') }} <strong>{{ crdate|date("Y-m-d H:i:s") }}!</strong>
+                      </div>
+                    </div>
+                    <a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
+                  </div>
+              {% elseif error is defined %}
+                  <div class="alert alert-important alert-danger alert-dismissible" role="alert">
+                    <div class="d-flex">
+                      <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0" /><path d="M12 8v4" /><path d="M12 16h.01" /></svg>
+                      </div>
+                      <div>
+                        &nbsp;{{ __('Domain') }} <strong>{{ domainName }}</strong> {{ __('can not be created') }}: <strong>{{ error }}</strong>
+                      </div>
+                    </div>
+                    <a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
+                  </div>
+              {% endif %}
                 <div class="card">
                     <div class="card-body">
-                        <form id="domainCreateForm" action="/your_endpoint" method="post">
+                        <form id="domainCreateForm" action="/domain/create" method="post">
+                        {{ csrf.field | raw }}
                             <div class="mb-3">
                                 <label for="domainName" class="form-label required">Your Domain Name</label>
-                                <input type="text" class="form-control mb-2" placeholder="example.com" name="domainName" id="domainName" required>
+                                <input type="text" class="form-control mb-2" placeholder="example.com" name="domainName" id="domainName" required="required">
                             </div>
                             
                             {% if registrars %}
@@ -58,18 +84,40 @@
                             <!-- Fields for 4 contacts with roles -->
                             <div class="mb-3">
                                 <label for="contactRegistrant" class="form-label required">Contacts</label>
-                                <input type="text" class="form-control mb-2" placeholder="Registrant Contact" name="contactRegistrant" id="contactRegistrant" required>
+                                <input type="text" class="form-control mb-2" placeholder="Registrant Contact" name="contactRegistrant" id="contactRegistrant" required="required">
-                                <input type="text" class="form-control mb-2" placeholder="Admin Contact" name="contactAdmin" required>
+                                <input type="text" class="form-control mb-2" placeholder="Admin Contact" name="contactAdmin">
-                                <input type="text" class="form-control mb-2" placeholder="Tech Contact" name="contactTech" required>
+                                <input type="text" class="form-control mb-2" placeholder="Tech Contact" name="contactTech">
-                                <input type="text" class="form-control mb-2" placeholder="Billing Contact" name="contactBilling" required>
+                                <input type="text" class="form-control mb-2" placeholder="Billing Contact" name="contactBilling">
                             </div>
 
                             <!-- Fields for nameservers -->
-                            <div id="nameserverFields">
+							<div id="nameserverFields">
-                                <label for="nameserver1" class="form-label">Nameservers</label>
+								<label class="form-label">Nameservers</label>
-                                <input type="text" class="form-control mb-2" placeholder="Nameserver 1" name="nameserver1" id="nameserver1" required>
+
-                                <input type="text" class="form-control mb-2" placeholder="Nameserver 2" name="nameserver2" required>
+								<div class="nameserver-group mb-1 row">
-                            </div>
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 1" name="nameserver[]" required>
+									</div>
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 1 - IPv4" name="nameserver_ipv4[]">
+									</div>
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 1 - IPv6" name="nameserver_ipv6[]">
+									</div>
+								</div>
+
+								<div class="nameserver-group mb-1 row">
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 2" name="nameserver[]" required>
+									</div>
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 2 - IPv4" name="nameserver_ipv4[]">
+									</div>
+									<div class="col-md-4">
+										<input type="text" class="form-control mb-1" placeholder="Nameserver 2 - IPv6" name="nameserver_ipv6[]">
+									</div>
+								</div>
+							</div>
                             <button type="button" id="addNameserver" class="btn btn-success btn-sm mb-2">+</button>
                             <button type="button" id="removeNameserver" class="btn btn-danger btn-sm mb-2">-</button>
 
@@ -158,27 +206,64 @@ document.addEventListener("DOMContentLoaded", function() {
         yearValueDisplay.textContent = `${yearSlider.value} Year${yearSlider.value > 1 ? 's' : ''}`;
     });
 
-    // Add nameserver field
+	function createNameserverGroup(count) {
-    let nameserverCount = 2;
+		const group = document.createElement('div');
-    addNameserverBtn.addEventListener('click', function() {
+		group.className = 'nameserver-group mb-1 row';
-        if (nameserverCount < 13) {
-            nameserverCount++;
-            const newField = document.createElement('input');
-            newField.type = 'text';
-            newField.className = 'form-control mb-2';
-            newField.placeholder = `Nameserver ${nameserverCount}`;
-            newField.name = `nameserver${nameserverCount}`;
-            nameserverFields.appendChild(newField);
-        }
-    });
 
-    // Remove nameserver field
+		const nameserverCol = document.createElement('div');
-    removeNameserverBtn.addEventListener('click', function() {
+		nameserverCol.className = 'col-md-4';
-        if (nameserverCount > 2) {
+		const nameserverField = document.createElement('input');
-            nameserverFields.removeChild(nameserverFields.lastChild);
+		nameserverField.type = 'text';
-            nameserverCount--;
+		nameserverField.className = 'form-control mb-1';
-        }
+		nameserverField.placeholder = `Nameserver ${count}`;
-    });
+		nameserverField.name = `nameserver[]`;
+		nameserverCol.appendChild(nameserverField);
+
+		const ipv4Col = document.createElement('div');
+		ipv4Col.className = 'col-md-4';
+		const ipv4Field = document.createElement('input');
+		ipv4Field.type = 'text';
+		ipv4Field.className = 'form-control mb-1';
+		ipv4Field.placeholder = `Nameserver ${count} - IPv4`;
+		ipv4Field.name = `nameserver_ipv4[]`;
+		ipv4Col.appendChild(ipv4Field);
+
+		const ipv6Col = document.createElement('div');
+		ipv6Col.className = 'col-md-4';
+		const ipv6Field = document.createElement('input');
+		ipv6Field.type = 'text';
+		ipv6Field.className = 'form-control mb-1';
+		ipv6Field.placeholder = `Nameserver ${count} - IPv6`;
+		ipv6Field.name = `nameserver_ipv6[]`;
+		ipv6Col.appendChild(ipv6Field);
+
+		group.appendChild(nameserverCol);
+		group.appendChild(ipv4Col);
+		group.appendChild(ipv6Col);
+
+		return group;
+	}
+
+	// Add nameserver fields
+	let nameserverCount = 2;
+	addNameserverBtn.addEventListener('click', function() {
+		if (nameserverCount < 13) {
+			nameserverCount++;
+			const nameserverGroup = createNameserverGroup(nameserverCount);
+			nameserverFields.appendChild(nameserverGroup);
+		}
+	});
+
+	// Remove nameserver group
+	removeNameserverBtn.addEventListener('click', function() {
+		if (nameserverCount > 2) {
+			const lastGroup = nameserverFields.querySelector('.nameserver-group:last-child');
+			if (lastGroup) {
+				nameserverFields.removeChild(lastGroup);
+				nameserverCount--;
+			}
+		}
+	});
 
     // Generate random AuthInfo and set it to the field
     function generateAuthInfo() {