diff options
| author | Benny Baumann <BenBE@geshi.org> | 2015-07-29 19:28:04 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2015-07-29 19:28:04 +0200 |
| commit | 008a344ffb238e916db4556a4e9cadf689ab38fd (patch) | |
| tree | 68cb2e70ae8a04dfbf46fda0d5f1ba4406d7c274 | |
| parent | 3d8eec2fc1060e2307d8cd127e7f1ae331fc9c44 (diff) | |
| parent | 9085fb415d2252657d6d3151ee00b1d96fde8abb (diff) | |
| download | cacert-devel-008a344ffb238e916db4556a4e9cadf689ab38fd.tar.gz cacert-devel-008a344ffb238e916db4556a4e9cadf689ab38fd.tar.xz cacert-devel-008a344ffb238e916db4556a4e9cadf689ab38fd.zip | |
Merge branch 'bug-1394' into testserver-stable
| -rw-r--r-- | includes/account.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php index 2eeca73..bc90314 100644 --- a/includes/account.php +++ b/includes/account.php @@ -116,7 +116,8 @@ function buildSubjectFromSession() { if(strstr($_REQUEST['newemail'], "xn--") && $_SESSION['profile']['codesign'] <= 0) { showheader(_("My CAcert.org Account!")); - echo _("Due to the possibility for punycode domain exploits we currently do not allow any certificates to sign punycode domains or email addresses."); + echo _("Due to the possibility for punycode domain exploits we currently only offer the use of IDN domains if your account has the code signing flag.") . "\n"; + printf(_("More information can be found %sin our wiki%s."), '<a href="//wiki.cacert.org/FAQ/Privilege">', '</a>'); showfooter(); exit; } @@ -541,7 +542,8 @@ function buildSubjectFromSession() { if(strstr($newdomain, "xn--") && $_SESSION['profile']['codesign'] <= 0) { showheader(_("My CAcert.org Account!")); - echo _("Due to the possibility for punycode domain exploits we currently do not allow any certificates to sign punycode domains or email addresses."); + echo _("Due to the possibility for punycode domain exploits we currently only offer the use of IDN domains if your account has the code signing flag.") . "\n"; + printf(_("More information can be found %sin our wiki%s."),'<a href="//wiki.cacert.org/FAQ/Privilege">', '</a>'); showfooter(); exit; } |