diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index cab5b6ac5f6494606db803771fa54d8274dd3e33..af26e3be641930a6c9c2a77477fd58e5d93e68c2 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -411,8 +411,9 @@ class project extends base { mkdir($this->_aConfig['packageDir'] . "/" . $sPhase); } - if ($sPlace == "onhold") + if ($sPlace == "onhold"){ $sBase.="_onhold"; + } // $sBase .= "/" . $this->_aPrjConfig["fileprefix"]; // url for deployed if ($sPlace == "deployed") { @@ -424,6 +425,7 @@ class project extends base { } } + // echo "DEBUG: ".__METHOD__."($sPhase, $sPlace) --> $sBase<br>"; return $sBase; } @@ -976,20 +978,20 @@ class project extends base { $sJsonfile = $this->_getInfofile($sPhase, $sKey); $aTmp[$sKey] = array(); if (file_exists($sJsonfile)) { - $sPkgfile = $this->_getPackagefile($sPhase, $sKey); - if (file_exists($sPkgfile)) { + // $sPkgfile = $this->_getPackagefile($sPhase, $sKey); + // if (file_exists($sPkgfile)) { $aJson = json_decode(file_get_contents($sJsonfile), true); if (is_array($aJson) && array_key_exists("version", $aJson)) { $aTmp[$sKey] = $aJson; $aTmp[$sKey]["infofile"] = $sJsonfile; - $aTmp[$sKey]["packagefile"] = $sPkgfile; + // $aTmp[$sKey]["packagefile"] = $sPkgfile; $aTmp[$sKey]["ok"] = 1; } else { $aTmp[$sKey]["error"] = sprintf(t("class-project-error-metafile-has-no-version"), $sJsonfile, print_r($aJson, true)); } - } else { - $aTmp[$sKey]["error"] = sprintf(t("class-project-error-getPhaseInfos-package-not-found"), $sPkgfile); - } + // } else { + // $aTmp[$sKey]["error"] = sprintf(t("class-project-error-getPhaseInfos-package-not-found"), $sPkgfile); + // } } else { $aTmp[$sKey]["error"] = sprintf(t("class-project-error-metafile-does-not-exist"), $sJsonfile); } @@ -1043,6 +1045,7 @@ class project extends base { $this->_aData["phases"][$sPhase] = $aTmp; } + // echo '<pre>'.print_r($this->_aData["phases"][$sPhase], 1).'</pre>'.__METHOD__.'<br>'; return $this->_aData["phases"][$sPhase]; } @@ -1521,7 +1524,7 @@ class project extends base { $this->oRolloutPlugin = new $sPluginClassname(array( 'lang'=>$this->_aConfig['lang'], 'phase'=>false, - 'globalcfg'=>$this->_aConfig['plugins']['rollout'][$sPluginName], + 'globalcfg'=>isset($this->_aConfig['plugins']['rollout'][$sPluginName]) ? $this->_aConfig['plugins']['rollout'][$sPluginName] : [], 'projectcfg'=>$this->_aPrjConfig, )); // print_r($this->_oRolloutPlugin->getPluginfos()); @@ -3130,7 +3133,8 @@ class project extends base { $bIsError = false; $this->_oHtml = new htmlguielements(); - $sInfos.=''; + $sInfos=''; + $sTitle=''; if (array_key_exists("title", $aOptions) && $aOptions["title"]) { $sTitle.=$aOptions["title"]; }