Changeset 3051

Timestamp:

10/18/08 23:23:27 (3 months ago)

Author:

david

Message:

changed module config handler not to enforce a module.lala. prefix for all <settings> and refactored it a bit to deal with multiple <settings> blocks more elegantly, refs #519

Files:

• branches/1.0/src/config/AgaviModuleConfigHandler.class.php (modified) (1 diff)

branches/1.0/src/config/AgaviModuleConfigHandler.class.php

@@ -69 +69 @@
       $enabled = (bool) AgaviToolkit::literalize($module->getAttribute('enabled'));
       
-      // loop over <settings> elements; there can be many of them
-      foreach($module as $settings) {
-        $localPrefix = $settings->getAttribute('prefix', $prefix);
-        // <settings> has <setting> children
-        foreach($settings as $setting) {
-          $settingName = $localPrefix . $setting->getAttribute('name');
-          if($setting->hasAgaviParameters()) {
-            $data[$settingName] = $setting->getAgaviParameters();
-          } else {
-            $data[$settingName] = $setting->getValue();
+      // loop over <setting> elements; there can be many of them
+      foreach($module->get('settings') as $setting) {
+        $localPrefix = $prefix;
+        
+        // let's see if this buddy has a <settings> parent with valuable information
+        if($setting->parentNode->localName == 'settings') {
+          if($setting->parentNode->hasAttribute('prefix')) {
+            $localPrefix = $setting->parentNode->getAttribute('prefix');
           }
+        }
+        
+        $settingName = $localPrefix . $setting->getAttribute('name');
+        if($setting->hasAgaviParameters()) {
+          $data[$settingName] = $setting->getAgaviParameters();
+        } else {
+          $data[$settingName] = $setting->getValue();
         }
       }