diff --git a/config/lang/de.json b/config/lang/de.json index 5f18339c9708ef221a3661044baa8dd87ca51399..6c7373f9b79ca6ba97717a24f9291e2c9007e22a 100644 --- a/config/lang/de.json +++ b/config/lang/de.json @@ -242,7 +242,7 @@ "repository-access-browser": "Browserzugriff auf das Repo", "repository-url": "URL zum Repository", "repository-urlwebgui": "URL zur Web GUI des Repositorys", - "repository-privkey": "Dateiname zum SSH-Private-Key", + "repository-privkey": "Authentifizierung/ Dateiname zum SSH-Private-Key", "revision": "Revision", "rollback": "Rollback", "rollback-hint": "Rollback der Phase [%s] auf Version [%s]", diff --git a/config/lang/en.json b/config/lang/en.json index 35ac3d3b868232cacd02829019dbf9921a9c0669..2bd2e203eb671df4f7f5eca83fa5da0e28f867f6 100644 --- a/config/lang/en.json +++ b/config/lang/en.json @@ -244,7 +244,7 @@ "repository-access-browser": "Browser access to sources", "repository-url": "URL to repository", "repository-urlwebgui": "URL zur Web GUI des Repositorys", - "repository-privkey": "Dateiname zum SSH-Private-Key", + "repository-privkey": "Authentication/ filename of ssh private key", "revision": "Revision", "rollback": "Rollback", "rollback-hint": "Rollback of phase [%s] to version [%s]", diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index fb2f3bd435cbdf2eb76da3b37a3d7895206b5030..7ae645a4b285a2171cd38edd97febf67cb431635 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -1600,7 +1600,7 @@ class project { "build" => array( "type" => "", "ssh" => "", - "keyfile" => "", + "auth" => "", "webaccess" => "", ), "phases" => array( @@ -2188,7 +2188,7 @@ class project { <div class="details"> '.$sRepoBar.'<br> <a href="#h3repo" class="scroll-link">' . t("repositoryinfos") . '</a><br> - <strong>'. $this->_aPrjConfig["build"]["type"].'</strong> '.preg_replace('/.*\@(.*):.*/','($1)',$this->_aPrjConfig["build"]["ssh"]).'<br> + <strong>'. $this->_aPrjConfig["build"]["type"].'</strong> '.preg_replace('/.*\@(.*):.*/','($1)',$this->_aPrjConfig["build"]["url"]).'<br> </div> <div> <img src="/deployment/images/process/bg_vcs.png" alt="'.t("versioncontrol").'"> @@ -2351,9 +2351,9 @@ class project { ), 'input' . $i++ => array( 'type' => 'text', - 'name' => 'build[ssh]', + 'name' => 'build[url]', 'label' => t("repository-url"), - 'value' => $this->_aPrjConfig["build"]["ssh"], + 'value' => $this->_aPrjConfig["build"]["url"], // 'required' => 'required', 'validate' => 'isastring', 'size' => 100, @@ -2361,9 +2361,9 @@ class project { ), 'input' . $i++ => array( 'type' => 'text', - 'name' => 'build[keyfile]', - 'label' => t("repository-privkey"), - 'value' => $this->_aPrjConfig["build"]["keyfile"], + 'name' => 'build[auth]', + 'label' => t("repository-auth"), + 'value' => $this->_aPrjConfig["build"]["auth"], // 'required' => 'required', 'validate' => 'isastring', 'size' => 100, diff --git a/public_html/deployment/classes/sws.class.php b/public_html/deployment/classes/sws.class.php index 21b9f8f53fa746b68dacc9c19e2e0d915e1b60ce..64ef326103ab7a42ab9bf38773dc8af9f743b3d7 100644 --- a/public_html/deployment/classes/sws.class.php +++ b/public_html/deployment/classes/sws.class.php @@ -34,7 +34,7 @@ * - configuration: option area * - configuration: examples of a class + of actions * - * @version 0.05 + * @version 0.06 * @author Axel Hahn * @link http://www.axel-hahn.de/php_sws * @license GPL @@ -103,7 +103,7 @@ class sws { * version * @var string */ - private $_sVersion = "0.05 (beta)"; + private $_sVersion = "0.06 (beta)"; /** * title @@ -410,7 +410,7 @@ class sws { $RefClass["actions"][$sAction]['active']=$bActive; $RefClass["actions"][$sAction]['phpdoc']=$sComment; $RefClass["actions"][$sAction]['params']=$aParams; - $RefClass["actions"][$sAction]['value']=($bActive && count($this->_aArgs))?$this->_aParams["args"]:false; + $RefClass["actions"][$sAction]['value']=($bActive && array_key_exists("args", $this->_aParams))?$this->_aParams["args"]:''; if($sAction==="__construct"){ $RefClass["actions"][$sAction]['value']=(array_key_exists("init", $this->_aParams))?$this->_aParams["init"]:''; @@ -678,7 +678,7 @@ class sws { . 'h2{margin: 3em 0 1em; }' . 'h3,h4{margin: 0;}' . 'fieldset{border: 1px solid rgba(0,0,0,0.2); background: rgba(0,0,0,0.05); }' - . 'input {border: 2px solid #ddd; padding: 0.3em; border-radius: 0.5em; color: #348; font-size: 100%;}' + . 'input {border: 0px solid #ccc; padding: 0.1em; border-radius: 0.2em; color: #348; font-size: 100%;}' . 'label{width: 10em; float: left; text-align: right;}' . 'ul{padding-left: 0; margin: 0; border-radius: 0.5em;}' . 'ul ul{margin: 1em;}' @@ -761,7 +761,7 @@ class sws { if (document.getElementById(sIdPrefix+arguments[i]) && document.getElementById(sIdPrefix+arguments[i]).value ){ - sUrl+="&"+arguments[i]+"="+escape(document.getElementById(sIdPrefix+arguments[i]).value); + sUrl+="&"+arguments[i]+"="+document.getElementById(sIdPrefix+arguments[i]).value; } } document.getElementById(sIdPrefix+"url").value=sUrl; diff --git a/public_html/deployment/classes/vcs.git.class.php b/public_html/deployment/classes/vcs.git.class.php index 894dbf137f4b415caa4a28bbf7c8f71d575aaf3b..5e167636b98d5e23e91413f3a6a1421a648286ec 100644 --- a/public_html/deployment/classes/vcs.git.class.php +++ b/public_html/deployment/classes/vcs.git.class.php @@ -53,7 +53,7 @@ class vcs implements iVcs { public function setConfig($aRepoConfig=array()){ // checks - foreach(array("type", "ssh") as $key){ + foreach(array("type", "url") as $key){ if (!array_key_exists($key, $aRepoConfig)){ die("ERROR: key $key does not exist in config <pre>". print_r($aRepoConfig, true)."</pre>"); } @@ -69,10 +69,10 @@ class vcs implements iVcs { $this->_aCfg=$aRepoConfig; // define temp dir - $this->_sTempDir=$this->_aCfg["ssh"]; + $this->_sTempDir=$this->_aCfg["url"]; $this->_sTempDir=preg_replace('/[\@\.\:\/]/', '_', $this->_sTempDir); $this->_sTempDir=(getenv("temp")?getenv("temp"):"/tmp").'/checkout_vcsgit_'. $this->_sTempDir . "/"; - $this->_sKeyfile = $this->_aCfg["appRootDir"] . "/" . $this->_aCfg["keyfile"]; + $this->_sKeyfile = $this->_aCfg["appRootDir"] . "/" . $this->_aCfg["auth"]; $this->_sWrapper = $this->_aCfg["appRootDir"] . "/shellscripts/gitsshwrapper.sh"; return $this->_aCfg=$aRepoConfig; @@ -198,7 +198,7 @@ class vcs implements iVcs { * return url to vcs sources */ public function getUrl() { - return $this->_aCfg["ssh"]; + return $this->_aCfg["url"]; } /**