tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-09-22 17:37:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Respect Travis CI's pedanticness

Browse Source 
refs #3016
This commit is contained in:
Alexander A. Klimov 2017-11-24 10:36:47 +01:00
parent f449f621e2
commit 97534a36cd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/TlsclientidentityController.php
View File

@ -88,7 +88,9 @@ class TlsclientidentityController extends Controller
$clientIdentities->resolvePath($fileName, true); $clientIdentities->resolvePath($fileName, true);
$this->view->form = $form = new ConfirmRemovalForm(); $this->view->form = $form = new ConfirmRemovalForm();
$form->setOnSuccess(function (ConfirmRemovalForm $form) use ($name, $fileName, $clientIdentities) { $form
->setRedirectUrl('config/tls')
->setOnSuccess(function (ConfirmRemovalForm $form) use ($name, $fileName, $clientIdentities) {
foreach (Hook::all('TlsClientIdentity') as $hook) { foreach (Hook::all('TlsClientIdentity') as $hook) {
/** @var Hook\TlsClientIdentityHook $hook */ /** @var Hook\TlsClientIdentityHook $hook */
@ -112,7 +114,6 @@ class TlsclientidentityController extends Controller
); );
return true; return true;
}) })
->setRedirectUrl('config/tls')
->handleRequest(); ->handleRequest();
$this->addTitleTab( $this->addTitleTab(

6
application/controllers/TlsrootcacollectionController.php
View File

@ -78,7 +78,7 @@ class TlsrootcacollectionController extends Controller
$cert['removalForm']->handleRequest(); $cert['removalForm']->handleRequest();
} }
usort($certs, function($a, $b) { usort($certs, function ($a, $b) {
$a = $a['info']['name']; $a = $a['info']['name'];
$b = $b['info']['name']; $b = $b['info']['name'];
@ -106,7 +106,8 @@ class TlsrootcacollectionController extends Controller
$rootCaCollections->resolvePath($fileName, true); $rootCaCollections->resolvePath($fileName, true);
$this->view->form = $form = new ConfirmRemovalForm(); $this->view->form = $form = new ConfirmRemovalForm();
$form->setOnSuccess(function (ConfirmRemovalForm $form) use ($name, $fileName, $rootCaCollections) { $form->setRedirectUrl('config/tls')
->setOnSuccess(function (ConfirmRemovalForm $form) use ($name, $fileName, $rootCaCollections) {
foreach (Hook::all('TlsRootCACertificateCollection') as $hook) { foreach (Hook::all('TlsRootCACertificateCollection') as $hook) {
/** @var Hook\TlsRootCACertificateCollectionHook $hook */ /** @var Hook\TlsRootCACertificateCollectionHook $hook */
@ -130,7 +131,6 @@ class TlsrootcacollectionController extends Controller
); );
return true; return true;
}) })
->setRedirectUrl('config/tls')
->handleRequest(); ->handleRequest();
$this->addTitleTab( $this->addTitleTab(