From 87d72e9d7b175142f8de9856a0e2e497646eda2f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 29 Nov 2012 17:11:58 -0500 Subject: [PATCH] Tweak css of short commit id in log and history views --- src/com/gitblit/utils/X509Utils.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/utils/X509Utils.java b/src/com/gitblit/utils/X509Utils.java index 1510b2c..24afb8d 100644 --- a/src/com/gitblit/utils/X509Utils.java +++ b/src/com/gitblit/utils/X509Utils.java @@ -561,7 +561,7 @@ new Certificate[] { cert, caCert }); saveKeyStore(targetStoreFile, serverStore, sslMetadata.password); - x509log.log(MessageFormat.format("New web certificate {0,number,0} [{1}]", cert.getSerialNumber(), cert.getSubjectDN().getName())); + x509log.log(MessageFormat.format("New SSL certificate {0,number,0} [{1}]", cert.getSerialNumber(), cert.getSubjectDN().getName())); return cert; } catch (Throwable t) { throw new RuntimeException("Failed to generate SSL certificate!", t); @@ -935,10 +935,18 @@ String message = FileUtils.readContent(template, "\n"); if (!StringUtils.isEmpty(message)) { content = message; - content = content.replace("$serverHostname", metadata.serverHostname); - content = content.replace("$username", metadata.commonName); - content = content.replace("$userDisplayname", metadata.userDisplayname); - content = content.replace("$storePasswordHint", metadata.passwordHint); + if (!StringUtils.isEmpty(metadata.serverHostname)) { + content = content.replace("$serverHostname", metadata.serverHostname); + } + if (!StringUtils.isEmpty(metadata.commonName)) { + content = content.replace("$username", metadata.commonName); + } + if (!StringUtils.isEmpty(metadata.userDisplayname)) { + content = content.replace("$userDisplayname", metadata.userDisplayname); + } + if (!StringUtils.isEmpty(metadata.passwordHint)) { + content = content.replace("$storePasswordHint", metadata.passwordHint); + } } } return content; -- Gitblit v1.9.1