diff --git a/public_html/deployment/classes/build_base.class.php b/public_html/deployment/classes/build_base.class.php index 08832899a3ee5dec7478d60725040e40da08b703..07c9009fec78cc46b3ef332d6ac548966e5037ce 100644 --- a/public_html/deployment/classes/build_base.class.php +++ b/public_html/deployment/classes/build_base.class.php @@ -11,6 +11,8 @@ class build_base implements iBuildplugin{ protected $_sBuildDir = false; protected $_sOutfile = false; + + protected $_aPlugininfos = false; protected $_sLang = "en-en"; protected $_aLang = []; diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 88576602eae27141645f1700aa4d909e66245775..6b163e3e65b54b366a2c9eca435f3db32d81e76c 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -647,7 +647,7 @@ class project extends base { $this->getAllPhaseInfos(); foreach ($this->_aData["phases"] as $sPhase => $aData) { foreach (array_keys($this->_aPlaces) as $sPlace) { - if (array_key_exists($sPlace, $aData) && array_key_exists("version", $aData[$sPlace])) { + if (isset($aData[$sPlace]["version"])) { $this->_aVersions[$aData[$sPlace]["version"]][] = array('phase' => $sPhase, 'place' => $sPlace); } } diff --git a/public_html/deployment/plugins/rollout/awx/rollout_awx.php b/public_html/deployment/plugins/rollout/awx/rollout_awx.php index 41919f55bd53d82f3d09614f4add82c720eb5577..6c6df0d6bd4b1f255edf319fceba3fe07a791406 100644 --- a/public_html/deployment/plugins/rollout/awx/rollout_awx.php +++ b/public_html/deployment/plugins/rollout/awx/rollout_awx.php @@ -176,7 +176,7 @@ class rollout_awx extends rollout_base { // ----- Checks: $sCmdChecks=''; - if($aConfig['extravars']){ + if(isset($aConfig['extravars']) && $aConfig['extravars']){ $aTmp=json_decode($aConfig['extravars'], 1); if (!$aTmp || !is_array($aTmp) || !count($aTmp) ){ $sCmdChecks.='echo "ERROR: Value in extravars has wrong Syntax - this is no JSON: '.$aConfig['extravars'].'"; exit 1; '; @@ -184,14 +184,14 @@ class rollout_awx extends rollout_base { $aConfig['extravars']=json_encode($aTmp); } - if(!(int)$aConfig['inventory']){ + if(!isset($aConfig['inventory']) || !(int)$aConfig['inventory']){ $sCmdChecks.='echo "ERROR: no inventory was given."; exit 1; '; } // ----- Send variables having values only $aBodyvars=array(); foreach(['inventory'=>'inventory', 'limit'=>'limit', 'job_tags'=>'tags', 'extra_vars'=>'extravars'] as $sParam=>$sVarkey){ - if ($aConfig[$sVarkey]) { + if (isset($aConfig[$sVarkey]) && $aConfig[$sVarkey]) { $aBodyvars[$sParam]=$aConfig[$sVarkey]; } }