From 1feeef1020ccb5d6f1d6daa214531f3f3a012961 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 27 May 2016 15:46:17 +0200 Subject: [PATCH] ResourceStep: Show encryption settings refs #11115 --- .../library/Setup/Steps/ResourceStep.php | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/modules/setup/library/Setup/Steps/ResourceStep.php b/modules/setup/library/Setup/Steps/ResourceStep.php index 9c6fb39e0..0792077b0 100644 --- a/modules/setup/library/Setup/Steps/ResourceStep.php +++ b/modules/setup/library/Setup/Steps/ResourceStep.php @@ -89,7 +89,45 @@ class ResourceStep extends Step . '' . '' . t('Password') . '' . '' . str_repeat('*', strlen($this->data['dbResourceConfig']['password'])) . '' - . '' + . ''; + + if (isset($this->data['dbResourceConfig']['ssl_key']) && $this->data['dbResourceConfig']['ssl_key']) { + $dbHtml .= '' + .'' + . '' . t('SSL Key') . '' + . '' . $this->data['dbResourceConfig']['ssl_key'] . '' + . ''; + } + if (isset($this->data['dbResourceConfig']['ssl_cert']) && $this->data['dbResourceConfig']['ssl_cert']) { + $dbHtml .= '' + . '' + . '' . t('SSL Cert') . '' + . '' . $this->data['dbResourceConfig']['ssl_cert'] . '' + . ''; + } + if (isset($this->data['dbResourceConfig']['ssl_ca']) && $this->data['dbResourceConfig']['ssl_ca']) { + $dbHtml .= '' + . '' + . '' . t('CA') . '' + . '' . $this->data['dbResourceConfig']['ssl_ca'] . '' + . ''; + } + if (isset($this->data['dbResourceConfig']['ssl_capath']) && $this->data['dbResourceConfig']['ssl_capath']) { + $dbHtml .= '' + . '' + . '' . t('CA Path') . '' + . '' . $this->data['dbResourceConfig']['ssl_capath'] . '' + . ''; + } + if (isset($this->data['dbResourceConfig']['ssl_cipher']) && $this->data['dbResourceConfig']['ssl_cipher']) { + $dbHtml .= '' + . '' + . '' . t('Cipher') . '' + . '' . $this->data['dbResourceConfig']['ssl_cipher'] . '' + . ''; + } + + $dbHtml .= '' . '' . ''; }