diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 30c980072da3476af5df58cbbf5ac8738c60c532..de5e16cf1dce77be61f26511ed11cd43a02b19cd 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -894,7 +894,7 @@ class project {
public function getBox($sWarnlevel, $sMessage) {
$aCfg = array(
"error" => array("class" => "alert alert-error", "prefix" => t("error")),
- "success" => array("class" => "alert alert-success", "prefix" => t("sucess")),
+ "success" => array("class" => "alert alert-success", "prefix" => t("success")),
"info" => array("class" => "alert alert-info", "prefix" => t("info")),
"warning" => array("class" => "alert alert-block", "prefix" => t("warning")),
);
@@ -1209,7 +1209,7 @@ class project {
}
$this->_TempFill($sReturn, $aActionList);
- $sReturn.="<br>".t("Info").":<br>";
+ $sReturn.="<br>".t("info").":<br>";
$sReturn.=$this->_execAndSend("ls -l " . $this->_getArchiveDir($sTs2));
if (!$this->_iRcAll == 0) {
diff --git a/public_html/deployment/inc_functions.php b/public_html/deployment/inc_functions.php
index a31bb53fb5e49fed9d2df8af0417132807917718..ab7585283440e6954cfbf398f6d7ed3c2ec4efdc 100644
--- a/public_html/deployment/inc_functions.php
+++ b/public_html/deployment/inc_functions.php
@@ -61,7 +61,7 @@ $aImages = array(
function aHome($sClass = "btn") {
global $aParams;
// if (!array_key_exists("prj", $aParams)) return false;
- return '<a href="/deployment/?" class="' . $sClass . '"><i class="icon-home"></i> '.t("menu-overview").'</a>';
+ return '<a href="/deployment/?" class="' . $sClass . '"><i class="icon-home"></i> ' . t("menu-overview") . '</a>';
}
/**
@@ -79,7 +79,7 @@ function aPrjHome($sClass = "btn") {
require_once("./config/inc_projects_config.php");
require_once("./classes/project.class.php");
$oPrj = new project($aParams["prj"]);
- return '<a href="/deployment/' . $aParams["prj"] . '/" class="' . $sClass . '"><i class="icon-book"></i> '.t("menu-project-home").' <strong>' . $oPrj->getLabel() . '</strong></a>';
+ return '<a href="/deployment/' . $aParams["prj"] . '/" class="' . $sClass . '"><i class="icon-book"></i> ' . t("menu-project-home") . ' <strong>' . $oPrj->getLabel() . '</strong></a>';
}
/**
@@ -104,7 +104,7 @@ function getTopArea() {
$sMyRev = $aJson["date"];
}
$sPhase = '(unknown)';
-
+
// TODO - Phasen nach Hostname - das kann nicht public gehen
$aPhases = array(
'dev.ci.iml.unibe.ch' => array('phase' => 'dev',),
@@ -127,7 +127,7 @@ function getTopArea() {
<!-- list of projects -->
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">'.t("menu-projects").'<b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . t("menu-projects") . '<b class="caret"></b></a>
<ul class="dropdown-menu">
';
$oPrj1 = new project();
@@ -137,7 +137,7 @@ function getTopArea() {
}
$sReturn.='
<li class="divider"></li>
- <li><a href="' . $sBaseUrl . 'all/setup/">'.t("menu-new-project").'</a></li>
+ <li><a href="' . $sBaseUrl . 'all/setup/">' . t("menu-new-project") . '</a></li>
</ul>
</li>';
if (array_key_exists("prj", $aParams) && $aParams["prj"] <> "all") {
@@ -150,21 +150,20 @@ function getTopArea() {
} else {
$sReturn.='
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">'.t("menu-project-actions").'<b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . t("menu-project-actions") . '<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="' . $sBaseUrl . $aParams["prj"] . '/build/">'.t("menu-project-build").'</a></li>
- <li><a href="' . $sBaseUrl . $aParams["prj"] . '/cleanup/">'.t("menu-project-cleanup").'</a></li>
- <li><a href="' . $sBaseUrl . $aParams["prj"] . '/setup/">'.t("menu-project-settings").'</a></li>
+ <li><a href="' . $sBaseUrl . $aParams["prj"] . '/build/">' . t("menu-project-build") . '</a></li>
+ <li><a href="' . $sBaseUrl . $aParams["prj"] . '/cleanup/">' . t("menu-project-cleanup") . '</a></li>
+ <li><a href="' . $sBaseUrl . $aParams["prj"] . '/setup/">' . t("menu-project-settings") . '</a></li>
';
$sReturn.='</ul></li>';
$aPhases = $oPrj->getActivePhases();
if (count($aPhases)) {
$sReturn.='<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">'.t("menu-project-phases").'<b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">' . t("menu-project-phases") . '<b class="caret"></b></a>
<ul class="dropdown-menu">';
foreach ($aPhases as $sPhase) {
-
$sReturn.='<li><a href="' . $sBaseUrl . $aParams["prj"] . '/phase/' . $sPhase . '/">' . $sPhase . '</a></li>';
}
$sReturn.='</ul></li>';
@@ -181,13 +180,13 @@ function getTopArea() {
</ul>
<ul class="nav pull-right">
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-question-sign"></i> '.t("menu-help").'<b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class=" icon-question-sign"></i> ' . t("menu-help") . '<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="' . $sWikiBaseUrl . '/it/entwicklung/continuous_deployment">WIKI: Übersicht Continous Deployment</a></li>
<li><a href="' . $sWikiBaseUrl . '/it/entwicklung/continuous_deployment#konventionen">WIKI: Konventionen für Entwickler</a></li>
<li><a href="' . $sWikiBaseUrl . '/it/infrastruktur/dienste/puppet/snippets#iml-deployment">WIKI (Admin): Puppet-Snippets für den Sysadmin</a></li>
<li><a href="' . $sWikiBaseUrl . '/it/infrastruktur/dienste/imldeployment">WIKI (Admin): Verzeichnisse und Dateien</a></li>
- <li><a href="/deployment/all/doc/">'.t("menu-help-classes").'</a></li>
+ <li><a href="/deployment/all/doc/">' . t("menu-help-classes") . '</a></li>
</ul>
</li>
</ul>
@@ -196,7 +195,7 @@ function getTopArea() {
if (!array_key_exists("prj", $aParams)) {
$sReturn.='<img src="' . $sImageBase . $aImages['overview'] . '" id="imgtop" alt="">'
- . '<h1>'.t("overview-label").'</h1><span class="description">'.t("overview-hint").'</span>';
+ . '<h1>' . t("overview-label") . '</h1><span class="description">' . t("overview-hint") . '</span>';
} else {
if ($aParams["prj"] <> "all") {
$oPrj = new project($aParams["prj"]);
@@ -234,32 +233,6 @@ function getAction() {
return $sReturn;
}
-/**
- * get html code of a div around a message
- * @param string $sWarnlevel one of error|success|info|warning to get a colored box
- * @param string $sMessage message txt
- * @return string
- */
-function getBox($sWarnlevel, $sMessage) {
- $aCfg = array(
- "error" => array("class" => "alert alert-error", "prefix" => "ERROR :-("),
- "success" => array("class" => "alert alert-success", "prefix" => "SUCCESS :-)"),
- "info" => array("class" => "alert alert-info", "prefix" => "INFO"),
- "warning" => array("class" => "alert alert-block", "prefix" => "WARNUNG"),
- );
- $sClass = "";
- $sPrefix = "";
- if (array_key_exists($sWarnlevel, $aCfg)) {
- $sClass = $aCfg[$sWarnlevel]["class"];
- $sPrefix = $aCfg[$sWarnlevel]["prefix"];
- $sMessage = '<strong>' . $aCfg[$sWarnlevel]["prefix"] . '</strong> ' . $sMessage;
- }
- return '
- <div class="' . $sClass . '">
- ' . $sMessage . '
- </div>';
-}
-
/**
* translate function
* @global type $aConfig
@@ -267,22 +240,26 @@ function getBox($sWarnlevel, $sMessage) {
* @param string $s text
* @return string
*/
-function t($s){
+function t($s) {
global $aConfig;
- static $aLang=array();
- if (!count($aLang)){
- $aLang=json_decode(file_get_contents(__DIR__."/config/lang/".$aConfig["lang"].".json"), true);
+ static $aLang = array();
+ if (!count($aLang)) {
+ $aLang = json_decode(file_get_contents(__DIR__ . "/config/lang/" . $aConfig["lang"] . ".json"), true);
}
-
- if (!array_key_exists($s, $aLang)){
- return '<span class="warning">'. $s.'</span>';
+
+ if (!array_key_exists($s, $aLang)) {
+ return '<span class="warning">' . $s . '</span>';
}
- return $aLang[$s].' ('.$s.')';
- // return '<span class="ok">'. $aLang[$s].'</span>';
- // return $aLang[$s];
+ // return $aLang[$s].' ('.$s.')';
+ return $aLang[$s];
}
-function UNUSED__enterDeployinfos() {
+/**
+ * enter user and comment
+ * @global type $aParams
+ * @return string
+ */
+function enterDeployinfos() {
global $aParams;
$sIdUser = "inputUser";
$sIdComment = "inputComment";
@@ -307,7 +284,4 @@ function UNUSED__enterDeployinfos() {
return $sOut;
}
-
-
-
?>
diff --git a/public_html/deployment/pages/act_accept.php b/public_html/deployment/pages/act_accept.php
index 08c1cc2c96bd0e231035ccbf2176aa3a1d0f9f01..ae1220d841536733bcab5e9801bde4df2d0108e8 100644
--- a/public_html/deployment/pages/act_accept.php
+++ b/public_html/deployment/pages/act_accept.php
@@ -47,13 +47,13 @@ if (array_key_exists("confirm", $aParams)) {
array_key_exists("revision", $aPhaseData2["onhold"])
&& $aPhaseData2["onhold"]["revision"]==$aPhaseData["deployed"]["revision"]
){
- $sOut.=getBox("warning", sprintf(t("page-accept-warning-version-exists-in-next-queue"), $sNext, $sPhase));
+ $sOut.=$oPrj->getBox("warning", sprintf(t("page-accept-warning-version-exists-in-next-queue"), $sNext, $sPhase));
}
if (
array_key_exists("revision", $aPhaseData2["ready2install"])
&& $aPhaseData2["ready2install"]["revision"]==$aPhaseData["deployed"]["revision"]
){
- $sOut.=getBox("warning", sprintf(t("page-accept-warning-version-exists-in-next-repo"), $sNext, $sPhase));
+ $sOut.=$oPrj->getBox("warning", sprintf(t("page-accept-warning-version-exists-in-next-repo"), $sNext, $sPhase));
}
$sOut.='
<table>
diff --git a/public_html/deployment/pages/act_build.php b/public_html/deployment/pages/act_build.php
index 88eacf947dd6a5e3616bbbfc0f9acbd112e66a78..fd87cb60e327b4afd39616e78de05f28aca8023f 100644
--- a/public_html/deployment/pages/act_build.php
+++ b/public_html/deployment/pages/act_build.php
@@ -35,12 +35,12 @@ if (!array_key_exists("confirm", $aParams)) {
if (
array_key_exists("revision", $aPhaseData2["onhold"]) && $aPhaseData2["onhold"]["revision"] == $sRevison
) {
- $sOut.=getBox("warning", "In der Queue von [$sNext] ist die Version bereits $sRevison vorhanden!");
+ $sOut.=$oPrj->getBox("warning", "In der Queue von [$sNext] ist die Version bereits $sRevison vorhanden!");
}
if (
array_key_exists("revision", $aPhaseData2["ready2install"]) && $aPhaseData2["ready2install"]["revision"] == $sRevison
) {
- $sOut.=getBox("warning", "Im Repo von [$sNext] ist die Version $sRevison bereits vorhanden!");
+ $sOut.=$oPrj->getBox("warning", "Im Repo von [$sNext] ist die Version $sRevison bereits vorhanden!");
}
}
$sOut.='
diff --git a/public_html/deployment/pages/act_deploy.php b/public_html/deployment/pages/act_deploy.php
index 46ac973b6e40d7a3b3b453feb4393194e3a75e09..85b92dc163f93533947bed15e26bc2234d5b3a30 100644
--- a/public_html/deployment/pages/act_deploy.php
+++ b/public_html/deployment/pages/act_deploy.php
@@ -58,7 +58,7 @@ if (array_key_exists("confirm", $aParams)) {
</form>
';
} else {
- $sOut.=getBox("error", t("error-no-phase"));
+ $sOut.=$oPrj->getBox("error", t("error-no-phase"));
}
}
diff --git a/public_html/deployment/pages/act_doc.php b/public_html/deployment/pages/act_doc.php
index 3bc9a46c3c972456e0d5c1ff3cada9fa7c728cc4..79e02a2a4fa5e8f8f8ed31710d9b5c9d667facee 100644
--- a/public_html/deployment/pages/act_doc.php
+++ b/public_html/deployment/pages/act_doc.php
@@ -27,7 +27,7 @@ $sOut.= '<hr>';
if (array_key_exists("par3", $aParams)) {
$sClass=$aParams["par3"];
if (!array_key_exists($sClass, $aClasses)){
- $sOut.= getBox("error", sprintf(t("page-doc-error-class-not-configured"), $sClass, __FILE__ ));
+ $sOut.= $oPrj->getBox("error", sprintf(t("page-doc-error-class-not-configured"), $sClass, __FILE__ ));
} else {
require_once("./classes/$sClass.class.php");
$o=new classinfos($aClasses[$sClass]["name"]);
diff --git a/public_html/deployment/pages/act_overview.php b/public_html/deployment/pages/act_overview.php
index 9fe20d8c53e82fcc7f25a0497b3469e79999f94a..96031a5762d1350641330334716fde59af89f816 100644
--- a/public_html/deployment/pages/act_overview.php
+++ b/public_html/deployment/pages/act_overview.php
@@ -51,7 +51,7 @@ if (!array_key_exists("prj", $aParams)) {
</div>
</div>';
} else {
- $sOut.=getBox("info", t("page-overview-no-phase")) .
+ $sOut.=$oPrj->getBox("info", t("page-overview-no-phase")) .
$oPrj->renderLink("setup");
}
$sOut .= '<div style="clear: both"></div><hr>' . aHome();
diff --git a/public_html/deployment/pages/act_setup.php b/public_html/deployment/pages/act_setup.php
index 245ccdd2cff4694c72acc452ec7c9dc0105071ee..2a827250d373bc5d06b410614621f9b988363bf8 100644
--- a/public_html/deployment/pages/act_setup.php
+++ b/public_html/deployment/pages/act_setup.php
@@ -28,7 +28,7 @@ if ($aParams["prj"] == "all") {
if (!$sError) {
header("location: /deployment/" . $aParams["id"] . "/setup/");
}
- $sOut.=getBox("error", $sError);
+ $sOut.=$oPrj->getBox("error", $sError);
}
$sOut.=$oPrj->renderNewProject();
} else {
@@ -39,9 +39,9 @@ if ($aParams["prj"] == "all") {
if (array_key_exists("setupaction", $aParams) && $aParams["setupaction"] == "save") {
if ($oPrj->saveConfig()) {
- $sOut.=getBox("success", t("page-setup-info-settings-were-saved")) . aPrjHome() . '<br><br>';
+ $sOut.=$oPrj->getBox("success", t("page-setup-info-settings-were-saved")) . aPrjHome() . '<br><br>';
} else {
- $sOut.=getBox("error", t("page-setup-error-settings-were-not-saved"));
+ $sOut.=$oPrj->getBox("error", t("page-setup-error-settings-were-not-saved"));
}
}