diff --git a/utils.inc.php b/utils.inc.php index f0d972b..48b7f93 100644 --- a/utils.inc.php +++ b/utils.inc.php @@ -13,7 +13,8 @@ function domainIsOnServer($domain) function wikiIsOnServer($path) { - return glob('/home/*/'.$path.'/wakka.config.php'); + $configFile = glob('/home/*/'.$path.'/wakka.config.php')[0] ?? false; + return $configFile; } function checkIP($domain, $withWww = false, $noip6 = false) diff --git a/yeswiki-move.php b/yeswiki-move.php index 6acd69c..a311c91 100755 --- a/yeswiki-move.php +++ b/yeswiki-move.php @@ -60,7 +60,7 @@ if (!domainIsOnServer($fromDomainWithoutWww)) { $climate->error('ERROR : Domain '.$fromUrl['host'].' was not found on the server.'."\n"); exit; } -if (!wikiIsOnServer($fromDomainWithoutWww.($fromUrl['path'] ?? ''))) { +if (!$fromWiki = wikiIsOnServer($fromDomainWithoutWww.($fromUrl['path'] ?? ''))) { $climate->error('ERROR : no Yeswiki found '.$fromDomainWithoutWww.$fromUrl['path'].' on the server.'."\n"); exit; } @@ -76,7 +76,7 @@ if (!domainIsOnServer($toDomainWithoutWww)) { $climate->error('ERROR : Domain '.$toUrl['host'].' was not found on the server.'."\n"); exit; } -if (!wikiIsOnServer($toDomainWithoutWww.($toUrl['path'] ?? ''))) { +if (!$toWiki = wikiIsOnServer($toDomainWithoutWww.($toUrl['path'] ?? ''))) { $climate->error('ERROR : no Yeswiki found '.$toDomainWithoutWww.$toUrl['path'].' on the server.'."\n"); exit; }