diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php index 8698afbba43d47b8917546b9c3069ee824e1afc4..4742fb27c2965d8417610b40096c46d271cb4dca 100644 --- a/public_html/deployment/classes/actionlog.class.php +++ b/public_html/deployment/classes/actionlog.class.php @@ -282,7 +282,7 @@ class Actionlog { ); $aForms["filter"]["form"]['line'] = array( 'type' => 'markup', - 'value' => '</div><div><hr>', + 'value' => '<div><hr>', ); diff --git a/public_html/deployment/classes/formgen.class.php b/public_html/deployment/classes/formgen.class.php index 33dc0ce6a35a216bc380c261052872bcd4738117..c0de4abf34582ea02d0820a6e673eb86568a9957 100644 --- a/public_html/deployment/classes/formgen.class.php +++ b/public_html/deployment/classes/formgen.class.php @@ -226,7 +226,8 @@ class formgen { // HINWEIS optgroups werden nicht unterstuezt - nur einfache Listen $this->_checkReqiredKeys($elementData, array("name")); $sDivClass=(isset($elementData["inline"]) && $elementData["inline"])?"form-group":"col-sm-10"; - $sFormElement.='<div class="'.$sDivClass.'"><select id="' . $sId . '" class="form-control" '; + $elementData['class'].=" form-control"; + $sFormElement.='<div class="'.$sDivClass.'">'."\n".'<select id="' . $sId . '" '; $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,name,onchange"), $elementData); $sFormElement.=">\n"; foreach ($elementData["options"] as $idOption => $aOptionData) { diff --git a/public_html/deployment/classes/project_gui.class.php b/public_html/deployment/classes/project_gui.class.php index 9181581029a46dc7a516bcccdb95203ac58aa429..01fb6492639c6080334de3498d13adaf720dcd89 100644 --- a/public_html/deployment/classes/project_gui.class.php +++ b/public_html/deployment/classes/project_gui.class.php @@ -771,7 +771,7 @@ class projectgui extends project { $aRollout['project-config'].='' . '<div id="'.$sMyDivId.'" class="'.$sMyDivClass.' '.$sMyDivClassActive.'"' - . ($bActive ? '' : 'style="display: none;"' ) + . ($bActive ? '' : ' style="display: none;"' ) . '>' . $TmpRolloutPlugin->renderFormdata4Project() . '</div>' @@ -781,7 +781,7 @@ class projectgui extends project { foreach(array_keys($this->getPhases()) as $sMyPhase){ $aRollout[$sMyPhase].='' . '<div id="'.$sMyDivId.'-'.$sMyPhase.'" class="'.$sMyDivClass.' '.$sMyDivClassActive.'"' - . ($bActive ? '' : 'style="display: none;"' ) + . ($bActive ? '' : ' style="display: none;"' ) . '>' . $TmpRolloutPlugin->renderFormdata4Phase($sMyPhase) . '</div>' @@ -1229,7 +1229,7 @@ class projectgui extends project { $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup', 'value' => '' - . '<div id="' . $sDivId4PhaseSettings . '" ' . ($bActivePhase ? '' : ' style="display: none;"') . '">' + . '<div id="' . $sDivId4PhaseSettings . '" ' . ($bActivePhase ? '' : ' style="display: none;"') . '>' ); $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'text', @@ -1277,7 +1277,7 @@ class projectgui extends project { $aForms["setup"]["form"]['input' . $i++] = array( 'type' => 'markup', 'value' => '' - . '<div id="' . $sDivId4TargetHosts . '" ' . ($sDeploymethod !== "none" ? '' : ' style="display: none;"') . '">' + . '<div id="' . $sDivId4TargetHosts . '" ' . ($sDeploymethod !== "none" ? '' : ' style="display: none;"') . '>' ); // rollout plugin: phase specific overrides diff --git a/public_html/deployment/classes/rollout_base.class.php b/public_html/deployment/classes/rollout_base.class.php index 9ee6ba7d702308ebe6e89223406bd527c05c5db2..9ceeb6caf159ea20af7193777e583db5d6d63337 100644 --- a/public_html/deployment/classes/rollout_base.class.php +++ b/public_html/deployment/classes/rollout_base.class.php @@ -236,7 +236,7 @@ class rollout_base implements iRolloutplugin{ if(isset($aEffectiveConfig[$sVarname]) && isset($aCallbackData[$aEffectiveConfig[$sVarname]])){ $aCallbackData[$aEffectiveConfig[$sVarname]]['selected']='selected'; $aCallbackData[$aEffectiveConfig[$sVarname]]['checked']='checked'; - $aCallbackData[$aEffectiveConfig[$sVarname]]['label'].=' <<<'; + $aCallbackData[$aEffectiveConfig[$sVarname]]['label'].=' ««'; } elseif ($aVarinfos['type']==='select') { $aCallbackData=array_merge(array('NO_SELECTED_ITEM_YET'=>array('value'=>'', 'label'=>'...')), $aCallbackData); } diff --git a/public_html/deployment/index.php b/public_html/deployment/index.php index 15b6b397c936dac2745766c6f1a4f1dba2df9442..6b1887424b36eade5ccc69388fa6fcf7fef3ff98 100644 --- a/public_html/deployment/index.php +++ b/public_html/deployment/index.php @@ -39,19 +39,23 @@ $sAction = "overview"; // check params // ---------------------------------------------------------------------- +$oCLog->add("parsing params " + . '<pre>GET '.print_r($_GET, true).'</pre>' + . '<pre>POST '.print_r($_POST, true).'</pre>' + . '<pre>aParams: '.print_r($aParams, true).'</pre>' + ); + if (array_key_exists("prj", $aParams)) { $sPrj = $aParams["prj"]; } -if (array_key_exists("action", $aParams)) { - if (file_exists(__DIR__ . '/pages/act_' . $aParams["action"] . ".php")) { +if (isset($aParams["action"])) { + $sPagefile=__DIR__ . '/pages/act_' . $aParams["action"] . ".php"; + if (file_exists($sPagefile)) { $sAction = $aParams["action"]; + } else { + $oCLog->add("does not exist: $sPagefile"); } } -$oCLog->add("parsing params " - . '<pre>GET '.print_r($_GET, true).'</pre>' - . '<pre>POST '.print_r($_POST, true).'</pre>' - . '<pre>aParams: '.print_r($aParams, true).'</pre>' - ); if($bFirstRun){ $sAction='installer';