deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #464 from bweston92/master

Browse source 
SSH issues.
This commit is contained in:
Steve B 2014-06-27 14:55:41 +01:00
parent 9e146a275d 3cc1cba8b1
commit 4a7495a75d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PHPCI/Controller/ProjectController.php
View file

@ -166,9 +166,9 @@ class ProjectController extends \PHPCI\Controller
$sshKey = new SshKey();
$key = $sshKey->generate();
$values['key'] = $key ? $key['private_key'] : '';
$values['pubkey'] = $key ? $key['public_key'] : '';
$pub = $key ? $key['public_key'] : '';
$values['key'] = isset($key['private_key']) ? $key['private_key'] : '';
$values['pubkey'] = isset($key['public_key']) ? $key['public_key'] : '';
$pub = isset($key['public_key']) ? $key['public_key'] : '';
}
$form = $this->projectForm($values);

2
PHPCI/Helper/SshKey.php
View file

@ -45,7 +45,7 @@ class SshKey
public function canGenerateKeys()
{
$keygen = @shell_exec('ssh-keygen');
$keygen = @shell_exec('ssh-keygen -h');
$canGenerateKeys = !empty($keygen);
return $canGenerateKeys;