reworked most of the check commands

composer.json

@@ -2,7 +2,7 @@
   "name": "24unix/bindapi",
   "description": "manage Bind9 DNS server via REST API",
   "version": "2023.0.1",
-  "build_number": "332",
+  "build_number": "333",
   "authors": [
     {
       "name": "Micha Espey",

src/Controller/BindAPI.php

@@ -53,8 +53,9 @@ class BindAPI
 			ConfigController::class => autowire()
                 ->constructorParameter(parameter: 'quiet', value: $quiet),
 			CLIController::class      => autowire()
-				->constructorParameter(parameter: 'logger', value: $this->logger),
+				->constructorParameter(parameter: 'logger', value: $this->logger)
-			DomainController::class   => autowire()
+                ->constructorParameter(parameter: 'quiet', value: $quiet),
+            DomainController::class   => autowire()
 				->constructorParameter(parameter: 'logger', value: $this->logger)
                 ->constructorParameter(parameter: 'quiet', value: $quiet),
             DomainRepository::class   => autowire()

src/Controller/DomainController.php

@@ -78,12 +78,17 @@ class DomainController
 		}
 		
 		$domains = $this->domainRepository->findAll();
+        $longestEntry = $this->domainRepository->getLongestEntry('name');
 		
 		foreach ($domains as $domain) {
             if (!$this->quiet) {
-                echo 'Create zone: ' . $domain->getName() . PHP_EOL;
+                echo '   ' . COLOR_YELLOW . str_pad($domain->getName(), $longestEntry + 1, " ", STR_PAD_RIGHT) ;
+            }
+			if ($this->createSlaveZoneFile(domain: $domain)) {
+                if (!$this->quiet) {
+                    echo COLOR_GREEN . ' OK' . COLOR_DEFAULT . PHP_EOL;
+                }
             }
-			$this->createSlaveZoneFile(domain: $domain);
 		}
 
 		$this->createIncludeFile();
@@ -234,7 +239,9 @@ class DomainController
 	function checkDomains(): void
 	{
 		if (!file_exists(filename: $this->localZoneFile)) {
-			echo COLOR_DEFAULT . 'Local Zone file ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT . ' does not exist.' . PHP_EOL;
+            if (!$this->quiet) {
+                echo COLOR_DEFAULT . 'Local Zone file ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT . ' does not exist.' . PHP_EOL;
+            }
 			exit(1);
 		}
 		$localZones = file_get_contents(filename: $this->localZoneFile);
@@ -243,20 +250,28 @@ class DomainController
 		
 		foreach ($domains as $domain) {
             $idString = '(' . $domain->getId() . ') ';
-			echo COLOR_YELLOW .
+            if (!$this->quiet) {
-                str_pad(string: $domain->getName(), length: $maxNameLength + 1)
+                echo COLOR_YELLOW .
-                . COLOR_DEFAULT
+                    str_pad(string: $domain->getName(), length: $maxNameLength + 1)
-                . str_pad(string: $idString, length: 7, pad_type: STR_PAD_LEFT);
+                    . COLOR_DEFAULT
+                    . str_pad(string: $idString, length: 7, pad_type: STR_PAD_LEFT);
+            }
 
             $hasError = false;
 			if ($this->isMasterZone(domain: $domain)) {
-				echo 'Master Zone lies on this panel.';
+                if (!$this->quiet) {
+                    echo COLOR_GREEN . 'Master Zone';
+                }
 			} else {
 				if (!str_contains(haystack: $localZones, needle: $domain->getName())) {
-					echo COLOR_RED . 'is missing in ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT;
+                    if (!$this->quiet) {
+                        echo COLOR_RED . 'is missing in ' . COLOR_YELLOW . $this->localZoneFile . COLOR_DEFAULT;
+                    }
                     $hasError = true;
 				} else {
-					echo COLOR_GREEN . 'OK';
+                    if (!$this->quiet) {
+                        echo COLOR_GREEN . 'OK';
+                    }
 				}
 				
 				$zoneFile = $this->localZonesDir . $domain->getName();
@@ -270,7 +285,9 @@ class DomainController
                     echo " Update zone (Domain) to create it.";
                 }
 			}
-			echo COLOR_DEFAULT . PHP_EOL;
+            if (!$this->quiet) {
+                echo COLOR_DEFAULT . PHP_EOL;
+            }
 		}
 		
 	}
@@ -281,7 +298,7 @@ class DomainController
 	 *
 	 * @return void
 	 */
-	public function createSlaveZoneFile(Domain $domain): void
+	public function createSlaveZoneFile(Domain $domain): bool
 	{
 		$domainName = $domain->getName();
 		$this->logger->info(message: "createZoneFile($domainName)");
@@ -289,14 +306,16 @@ class DomainController
 		// check if we're a master zone
 		if ($this->isMasterZone(domain: $domain)) {
 			//echo 'We are zone master for ' . $domainName . PHP_EOL;
-			return;
+			return true;
 		}
 		
 		if ($zoneFile = fopen(filename: $this->localZonesDir . $domainName, mode: 'w')) {
 			$panelName = $domain->getPanel();
 			if (!$panel = $this->panelRepository->findByName(name: $panelName)) {
-				echo "Error: Panel $panelName doesn't exist." . PHP_EOL;
+                if (!$this->quiet) {
-				exit(1);
+                    echo "Error: Panel $panelName doesn't exist." . PHP_EOL;
+                }
+                return false;
 			}
 			$a = $panel->getA();
 			$aaaa = $panel->getAaaa();
@@ -312,7 +331,13 @@ class DomainController
 			}
 			fputs(stream: $zoneFile, data: "\t};" . PHP_EOL);
 			fputs(stream: $zoneFile, data: "};" . PHP_EOL);
-		}
+            return true;
+		} else {
+            if (!$this->quiet) {
+                echo COLOR_RED . ' Error: ' . COLOR_DEFAULT . 'unable to create ' . COLOR_YELLOW . $this->localZonesDir . $domainName . COLOR_DEFAULT . PHP_EOL;
+            }
+            return false;
+        }
 	}
 	
 	

src/Repository/DomainRepository.php

@@ -219,6 +219,7 @@ readonly class DomainRepository
 		$domainName = $domain->getName();
 		$this->logger->debug(message: "delete($domainName)");
 
+        // FIXME, add force parameter, reject deletion if domains left on panel
 		$sql = "
             DELETE FROM " . DatabaseConnection::TABLE_DOMAINS . "
             WHERE id = :id";