svn commit: r1205645 - /oodt/trunk/balance/lib/pear/Core/Application.class.php

[ahart]

Author: ahart
Date: Wed Nov 23 22:53:48 2011
New Revision: 1205645

URL: http://svn.apache.org/viewvc?rev=1205645&view=rev
Log:
resolve OODT-343: patch applied to trunk

Modified:
    oodt/trunk/balance/lib/pear/Core/Application.class.php

Modified: oodt/trunk/balance/lib/pear/Core/Application.class.php
URL: 
http://svn.apache.org/viewvc/oodt/trunk/balance/lib/pear/Core/Application.class.php?rev=1205645&r1=1205644&r2=1205645&view=diff
==============================================================================
--- oodt/trunk/balance/lib/pear/Core/Application.class.php (original)
+++ oodt/trunk/balance/lib/pear/Core/Application.class.php Wed Nov 23 22:53:48 
2011
@@ -181,7 +181,16 @@ class Org_Apache_Oodt_Balance_Core_Appli
 
                        // Read in the module config file and append to 
application config
                        if (file_exists($modulePath . '/config.ini')) {
-                               $moduleSettings   = parse_ini_file($modulePath 
. '/config.ini');
+                               // Get the raw contents of the config file
+                               $ini = file_get_contents($modulePath . 
'/config.ini');
+                               // Perform environment replacement
+                               $ini = str_replace('[MODULE_PATH]',  
$modClass->modulePath,   $ini);
+                               $ini = str_replace('[MODULE_ROOT]',  
$modClass->moduleRoot,   $ini);
+                               $ini = 
str_replace('[MODULE_STATIC]',$modClass->moduleStatic, $ini);
+                               // Parse the env-replaced content
+                               $moduleSettings   = parse_ini_string($ini);
+                               // Append (union) with global settings. += 
ensures that
+                               // application settings always override module 
settings.
                                $this->settings  += $moduleSettings;
                        }