partkeepr

commit d5f381d8417af357d517b44a9448b5c0c5d6bf94
parent 5ad54c8750eb0e93831681189e2a6734d3b9e209
Author: Felicitus <felicitus@felicitus.org>
Date:   Tue, 22 Dec 2015 14:19:11 +0100

Actually use the attibutes configured within the parameters.php file, related to #542

Diffstat:
M
app/config/config_ldap.yml
 | 
6
+++---
M
app/config/parameters.php.dist
 | 
7
++++---
M
src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
 | 
1
-

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/config/config_ldap.yml b/app/config/config_ldap.yml
@@ -17,6 +17,6 @@ fr3d_ldap:
         enabled: "%fr3d_ldap.user.enabled%"
         baseDn: "%fr3d_ldap.user.baseDn%"
         filter: "%fr3d_ldap.user.filter%"
-        attributes: # Specify ldap attributes mapping [ldap attribute, user object method]
-           - { ldap_attr: samaccountname,  user_method: setUsername }
-           - { ldap_attr: email,  user_method: setEmail }
+        attributes:
+           - { ldap_attr: %fr3d_ldap.user.attribute.username%,  user_method: setUsername }
+           - { ldap_attr: %fr3d_ldap.user.attribute.email%,  user_method: setEmail }
diff --git a/app/config/parameters.php.dist b/app/config/parameters.php.dist
@@ -79,7 +79,6 @@ $container->setParameter('fr3d_ldap.user.enabled', false);
 $container->setParameter('fr3d_ldap.user.baseDn', 'dc=blabla,dc=com');
 $container->setParameter('fr3d_ldap.user.filter', null);
 $container->setParameter('fr3d_ldap.user.attribute.username', null);
-$container->setParameter('fr3d_ldap.user.attribute.name', null);
 $container->setParameter('fr3d_ldap.user.attribute.email', null);
 
 /**
@@ -103,9 +102,11 @@ $container->setParameter('partkeepr.frontend.auto_login.password', 'admin');
 $container->setParameter('partkeepr.category.path_separator', ' ➤ ');
 
 /**
- * Specifies a message of the day
+ * Specifies a message of the day. Set to any string instead of false
+ * to display a MOTD. Example
+ * $container->setParameter('partkeepr.frontend.motd', "This is a MOTD");
  */
-$container->setParameter('partkeepr.frontend.motd', "This is a MOTD");
+$container->setParameter('partkeepr.frontend.motd', false);
 
 /**
  * Specifies if a quota should be used.
diff --git a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
@@ -68,7 +68,6 @@ class ConfigSetupService
             "fr3d_ldap.user.baseDn" => "dc=example,dc=com",
             "fr3d_ldap.user.filter" => null,
             "fr3d_ldap.user.attribute.username" => null,
-            "fr3d_ldap.user.attribute.name" => null,
             "fr3d_ldap.user.attribute.email" => null,
 
             "partkeepr.filesystem.data_directory" => "%kernel.root_dir%/../data/",