Skip to content
Snippets Groups Projects
Commit b70c0d24 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

remove php warning if there is no config yet

parent b5658186
No related branches found
No related tags found
1 merge request!2fix loop over config with missing regex section.
......@@ -17,6 +17,7 @@ require_once 'redirect.class.php';
* 2022-02-03 v1.5 ah add method isEnabled
* 2022-05-23 v1.6 ah add http head check+render output;
* 2022-05-31 v1.7 ah optical changes
* 2023-08-28 v1.8 ah remove php warning if there is no config yet
*/
/**
......@@ -149,21 +150,23 @@ class redirectadmin extends redirect {
}
}
$aAliases=$this->_getAliases();
foreach($aAliases as $sAlias=>$sConfig){
if(isset($aReturn[$sAlias])){
$aErrors[]="alias.json: A configuration for alias [$sAlias] is useless. There exists a file redirects_{$sAlias}.json (which has priority).";
} else {
if(!isset($aReturn[$sConfig])){
$aErrors[]="alias.json: [$sAlias] points to a non existing host [$sConfig] - a file redirects_$sConfig.yml does not exist.";
if(is_array($aAliases) && count($aAliases)){
foreach($aAliases as $sAlias=>$sConfig){
if(isset($aReturn[$sAlias])){
$aErrors[]="alias.json: A configuration for alias [$sAlias] is useless. There exists a file redirects_{$sAlias}.json (which has priority).";
} else {
$aReturn[$sConfig]['aliases'][]=$sAlias;
$aReturn[$sAlias]=array(
'type'=>'alias',
'target'=>$sConfig,
'ip'=> $this->_getIp($sAlias),
);
if (!$aReturn[$sAlias]['ip']){
$aErrors[]='alias.json: The hostname was not found in DNS: '.$sAlias;
if(!isset($aReturn[$sConfig])){
$aErrors[]="alias.json: [$sAlias] points to a non existing host [$sConfig] - a file redirects_$sConfig.yml does not exist.";
} else {
$aReturn[$sConfig]['aliases'][]=$sAlias;
$aReturn[$sAlias]=array(
'type'=>'alias',
'target'=>$sConfig,
'ip'=> $this->_getIp($sAlias),
);
if (!$aReturn[$sAlias]['ip']){
$aErrors[]='alias.json: The hostname was not found in DNS: '.$sAlias;
}
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment