deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Renaming project.git_key and project.public_key to project.ssh_private_key and project.ssh_public_key respectively.

Browse source
This commit is contained in:
Dan Cryer 2014-05-13 15:15:33 +00:00
commit d639f4a324
6 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
PHPCI/Controller/ProjectController.php
View file

@ -187,8 +187,8 @@ class ProjectController extends \PHPCI\Controller
$values['reference'] = $matches[3]."/".$matches[4];
}
$values['git_key'] = $values['key'];
$values['public_key'] = $values['pubkey'];
$values['ssh_private_key'] = $values['key'];
$values['ssh_public_key'] = $values['pubkey'];
$project = new Project();
$project->setValues($values);
@ -218,8 +218,8 @@ class ProjectController extends \PHPCI\Controller
$this->config->set('page_title', 'Edit: ' . $project->getTitle());
$values = $project->getDataArray();
$values['key'] = $values['git_key'];
$values['pubkey'] = $values['public_key'];
$values['key'] = $values['ssh_private_key'];
$values['pubkey'] = $values['ssh_public_key'];
if ($values['type'] == "gitlab") {
$accessInfo = $project->getAccessInformation();
@ -244,8 +244,8 @@ class ProjectController extends \PHPCI\Controller
}
$values = $form->getValues();
$values['git_key'] = $values['key'];
$values['public_key'] = $values['pubkey'];
$values['ssh_private_key'] = $values['key'];
$values['ssh_public_key'] = $values['pubkey'];
if ($values['type'] == "gitlab") {
preg_match('`^(.*)@(.*):(.*)/(.*)\.git`', $values['reference'], $matches);