partkeepr

commit 8bcde73443039c2aa1e456388f3ba92208be3dbc
parent b84bc9d1ef715f0adfa2f69493ecf43b8ccd544b
Author: Felicitus <felicitus@felicitus.org>
Date:   Sun,  3 Jan 2016 17:25:21 +0100

Properly assign new defaults for username and email ldap attributes

Diffstat:
M
src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
 | 
19
+++++++++++--------

1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php b/src/PartKeepr/SetupBundle/Services/ConfigSetupService.php
@@ -28,7 +28,8 @@ class ConfigSetupService
         $this->twig = $twig;
     }
 
-    public function getConfig ($config) {
+    public function getConfig($config)
+    {
         // Parameter defaults to ensure they exist
         $parameters = array(
             "database_driver" => null,
@@ -81,7 +82,7 @@ class ConfigSetupService
             "cache.dunglas" => false,
             "cache.doctrine" => "array",
             "partkeepr.parts.limit" => false,
-            "partkeepr.users.limit" => false
+            "partkeepr.users.limit" => false,
         );
 
         if (function_exists("apc_fetch")) {
@@ -91,15 +92,16 @@ class ConfigSetupService
 
         $this->applyIf($parameters, $config);
 
-        if ($config["fr3d_ldap.user.attribute.username"] === null) {
-            $config["fr3d_ldap.user.attribute.username"] = "samaccountname";
+        $parameters = array_merge($parameters, $config);
+
+        if ($parameters["fr3d_ldap.user.attribute.username"] === null) {
+            $parameters["fr3d_ldap.user.attribute.username"] = "samaccountname";
         }
 
-        if ($config["fr3d_ldap.user.attribute.email"] === null) {
-            $config["fr3d_ldap.user.attribute.email"] = "email";
+        if ($parameters["fr3d_ldap.user.attribute.email"] === null) {
+            $parameters["fr3d_ldap.user.attribute.email"] = "email";
         }
 
-        $parameters = array_merge($parameters, $config);
         array_walk_recursive($parameters, function (&$item) {
             $item = var_export($item, true);
         });
@@ -109,6 +111,7 @@ class ConfigSetupService
         return $this->twig->render('PartKeeprSetupBundle::parameters.php.twig',
             array("parameters" => $parameters));
     }
+
     public function legacyConfigParser()
     {
         if (file_exists($this->getLegacyConfigPath())) {
@@ -166,7 +169,7 @@ class ConfigSetupService
         return $target;
     }
 
-        public function generateSecret()
+    public function generateSecret()
     {
         $secret = "";
         for ($i = 0; $i < self::KEY_LENGTH; $i++) {