diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index d1621df455691bfd2ecf990b55bebb148add7a51..80dbfac1f5e7f7a9701d083b4a28e091bd683e0c 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -3010,26 +3010,12 @@ class project extends base { ), ); foreach (array_keys($this->getPhases()) as $sPhase) { - - - // for migration - take "puppethost": - $sUrl = array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["url"] : ""; - $sPuppethost = array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["puppethost"] : ""; - $bActivePhase = $sUrl>''; - $bActivePhase = array_key_exists("active", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["active"][0] : $bActivePhase; - $sDeployhosts = array_key_exists("puppethost", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["puppethost"] : ""; - $sDeployhosts = array_key_exists("hosts", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["hosts"] : $sDeployhosts; - $sDeploymethod = $sPuppethost ? "puppet" : "none"; - $sDeploymethod = array_key_exists("deploymethod", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploymethod"] : $sDeploymethod; - - // TODO: - /* - $bActivePhase = $this->isActivePhase(); + $bActivePhase = $this->isActivePhase($sPhase); $sUrl = array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["url"] : ""; $sDeploymethod = array_key_exists("deploymethod", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploymethod"] : ""; $sDeployhosts = array_key_exists("hosts", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["hosts"] : "none"; - */ + $sDeploytimes = array_key_exists("deploytimes", $this->_aPrjConfig["phases"][$sPhase]) ? $this->_aPrjConfig["phases"][$sPhase]["deploytimes"] : ""; $sDivId4PhaseSettings='divSettings'.$sPhase; @@ -3041,11 +3027,11 @@ class project extends base { // .'<pre>'.print_r($this->_aPrjConfig["phases"][$sPhase], 1).'</pre>' . '<a class="'.$sPhase.'">' . t("phase") . ' ' . $sPhase - . ($sUrl . $sPuppethost ? '' : ' (' . t("inactive") . ')') + . ($bActivePhase ? '' : ' (' . t("inactive") . ')') . '</a>' . '<table class="table">' . '<tbody>' - . '<tr><td class="' . ($sUrl . $sPuppethost ? $sPhase : '') . '">' + . '<tr><td class="' . ($bActivePhase ? $sPhase : '') . '">' ); $aForms["setup"]["form"]['input' . $i++] = array( @@ -3153,6 +3139,11 @@ class project extends base { } */ + $aForms["setup"]["form"]['input' . $i++] = array( + 'type' => 'markup', + 'value' => '' + .'</div>' + ); // when to deploy $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'text', @@ -3167,7 +3158,7 @@ class project extends base { $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup', 'value' => '' - .'</div></div>' + .'</div>' ); $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup',