autofill registration form email address if user has a ssl client certificate

diff --git a/data/templates/register.tpl.php b/data/templates/register.tpl.php
index da3deeca25438f571cda86fb1d1e82d440f89bfe..62cebada7fa7cd0dc68e8cd2da2fb7c48675a2ff 100644 (file)
--- a/data/templates/register.tpl.php
+++ b/data/templates/register.tpl.php
@@ -24,7 +24,7 @@ window.onload = function() {
 </tr>
 <tr>
     <th align="left"><label for="email"><?php echo T_('E-mail'); ?></label></th>
-    <td><input type="text" id="email" name="email" size="40" class="required" /></td>
+    <td><input type="text" id="email" name="email" size="40" class="required" value="<?php echo htmlspecialchars(POST_MAIL); ?>" /></td>
     <td><?php echo '←'.T_(' to send you your password if you forget it')?></td>
 </tr>
 

diff --git a/www/register.php b/www/register.php
index c01939a544a87ad9a271f84f2d14c3028161b3c9..dce65bac5a96e0b0d27a2a916e101540e0243b46 100644 (file)
--- a/www/register.php
+++ b/www/register.php
@@ -34,7 +34,13 @@ if (!$GLOBALS['enableRegistration']) {
 isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
 isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
 isset($_POST['password']) ? define('POST_PASS', $_POST['password']): define('POST_PASS', '');
-isset($_POST['email']) ? define('POST_MAIL', $_POST['email']): define('POST_MAIL', '');
+if (isset($_POST['email'])) {
+    define('POST_MAIL', $_POST['email']);
+} else if (isset($_SERVER['SSL_CLIENT_S_DN_Email'])) {
+    define('POST_MAIL', $_SERVER['SSL_CLIENT_S_DN_Email']);
+} else {
+    define('POST_MAIL', '');
+}
 isset($_POST['antispamAnswer']) ? define('POST_ANTISPAMANSWER', $_POST['antispamAnswer']): define('POST_ANTISPAMANSWER', '');