From 877dd337d3bc73dfe001f843a7365f514d37a7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Wed, 22 Jun 2011 16:27:27 +0000
Subject: [PATCH] Add mailSessionKey in Manager (#332)

---
 .../lib/Lemonldap/NG/Manager/_Struct.pm                   | 8 ++++++--
 .../lib/Lemonldap/NG/Manager/_i18n.pm                     | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
index 437310697..b0f58fdd2 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -810,11 +810,13 @@ sub struct {
                         mailConfirmBody    => 'textarea:/mailConfirmBody',
                     },
                     mailOther => {
-                        _nodes =>
-                          [qw(mailUrl randomPasswordRegexp mailTimeout)],
+                        _nodes => [
+                            qw(mailUrl randomPasswordRegexp mailTimeout mailSessionKey)
+                        ],
                         mailUrl              => 'text:/mailUrl',
                         randomPasswordRegexp => 'text:/randomPasswordRegexp',
                         mailTimeout          => 'int:/mailTimeout',
+                        mailSessionKey       => 'text:/mailSessionKey',
                     },
                 },
 
@@ -1240,6 +1242,7 @@ sub testStruct {
         notificationStorage  => $testNotDefined,
         mailUrl              => $testNotDefined,
         mailTimeout          => $integer,
+        mailSessionKey       => $testNotDefined,
         mailConfirmSubject   => $testNotDefined,
         mailConfirmBody      => $testNotDefined,
         authentication       => {
@@ -1802,6 +1805,7 @@ sub defaultConf {
         ldapVersion                 => '3',
         mailCharset                 => 'utf-8',
         mailTimeout                 => '0',
+        mailSessionKey              => 'mail',
         managerDn                   => '',
         managerPassword             => '',
         notification                => '0',
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
index 73ec16d04..051d1ae13 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -193,6 +193,7 @@ sub en {
         mailLDAPFilter               => 'Mail filter',
         mailOther                    => 'Other',
         mailReplyTo                  => 'Reply address',
+        mailSessionKey               => 'Session key containing mail address',
         mailSubject                  => 'Success mail subject',
         mailTimeout            => 'Validity time of a password reset request',
         mailUrl                => 'Page URL',
@@ -609,7 +610,8 @@ sub fr {
         mailLDAPFilter               => 'Filtre mail',
         mailOther                    => 'Autres',
         mailReplyTo                  => 'Adresse de réponse',
-        mailSubject                  => 'Sujet du message de succès',
+        mailSessionKey => 'Clé de session contenant l\'adresse email',
+        mailSubject    => 'Sujet du message de succès',
         mailTimeout => "Durée de validité d'une demande de réinitialisation",
         mailUrl     => 'URL de la page',
         managerDn   => 'Compte de connexion LDAP',