From 90682b774af263a24ded9a4bbcd56701c4ec85dd Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 10 Apr 2022 14:32:43 +0200 Subject: [PATCH] fine-tuning configservices cli script Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cli/ConfigServices.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Cli/ConfigServices.php b/lib/Froxlor/Cli/ConfigServices.php index 16977eb9..dc445d80 100644 --- a/lib/Froxlor/Cli/ConfigServices.php +++ b/lib/Froxlor/Cli/ConfigServices.php @@ -9,6 +9,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; use Froxlor\FileDir; use Froxlor\Froxlor; +use Froxlor\PhpHelper; use Froxlor\Settings; use Froxlor\SImExporter; use Froxlor\Database\Database; @@ -51,6 +52,11 @@ final class ConfigServices extends Command return self::INVALID; } + if ($input->getOption('import-settings') == false && $input->getOption('create') == false && $input->getOption('apply') == false) { + $output->writeln('No option given to do something, exiting.'); + return self::INVALID; + } + include_once Froxlor::getInstallDir() . 'lng/english.lng.php'; include_once Froxlor::getInstallDir() . 'lng/lng_references.php'; @@ -104,7 +110,7 @@ final class ConfigServices extends Command // read in all the distros foreach ($distros as $_distribution) { // get configparser object - $dist = new \Froxlor\Config\ConfigParser($_distribution); + $dist = new ConfigParser($_distribution); // get distro-info $dist_display = $this->getCompleteDistroName($dist); // store in tmp array @@ -348,14 +354,14 @@ final class ConfigServices extends Command $nameserver = trim($nameserver); // DNS servers might be multi homed; allow transfer from all ip // addresses of the DNS server - $nameserver_ips = \Froxlor\PhpHelper::gethostbynamel6($nameserver); + $nameserver_ips = PhpHelper::gethostbynamel6($nameserver); // append dot to hostname if (substr($nameserver, -1, 1) != '.') { $nameserver .= '.'; } // ignore invalid responses if (!is_array($nameserver_ips)) { - // act like \Froxlor\PhpHelper::gethostbynamel6() and return unmodified hostname on error + // act like PhpHelper::gethostbynamel6() and return unmodified hostname on error $nameserver_ips = array( $nameserver );