summaryrefslogtreecommitdiffstats
path: root/pts-core/functions/pts-functions_modules.php
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-08-06 17:52:45 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-08-06 17:52:45 -0400
commit0a76507207676c5bf6029d1b00772a18481fe435 (patch)
tree8161a4924df15a98fc6d0650f63b8333f4298dbb /pts-core/functions/pts-functions_modules.php
parent1b4a836eba3632dbc65c5d4986517cad5f048676 (diff)
downloadphoronix-test-suite-upstream-0a76507207676c5bf6029d1b00772a18481fe435.tar.gz
phoronix-test-suite-upstream-0a76507207676c5bf6029d1b00772a18481fe435.tar.xz
phoronix-test-suite-upstream-0a76507207676c5bf6029d1b00772a18481fe435.zip
pts-core: Few PTS module architecture updates
Plus other fixes in this update
Diffstat (limited to 'pts-core/functions/pts-functions_modules.php')
-rw-r--r--pts-core/functions/pts-functions_modules.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/pts-core/functions/pts-functions_modules.php b/pts-core/functions/pts-functions_modules.php
index e716a35..8dd1985 100644
--- a/pts-core/functions/pts-functions_modules.php
+++ b/pts-core/functions/pts-functions_modules.php
@@ -58,7 +58,7 @@ function pts_auto_detect_modules($load_here = FALSE)
if(IS_DEBUG_MODE)
echo "Attempting To Add Module: " . $module . "\n";
- array_push($GLOBALS["PTS_MODULES"], $module);
+ pts_attach_module($module);
if($load_here)
pts_load_module($module);
@@ -77,7 +77,7 @@ function pts_load_modules()
if(count($module_r) == 2)
pts_module_set_environment_variable(trim($module_r[0]), trim($module_r[1]));
else
- array_push($GLOBALS["PTS_MODULES"], trim($module));
+ pts_attach_module($module);
}
// Check for modules to load manually in PTS_MODULES
@@ -87,7 +87,7 @@ function pts_load_modules()
$module = trim($module);
if(!in_array($module, $GLOBALS["PTS_MODULES"]))
- array_push($GLOBALS["PTS_MODULES"], trim($module));
+ pts_attach_module($module);
}
// Detect modules to load automatically
@@ -128,6 +128,10 @@ function pts_load_modules()
array_push($GLOBALS["PTS_MODULE_VAR_STORE"], $var . "=" . $var_value);
}
}
+function pts_attach_module($module)
+{
+ array_push($GLOBALS["PTS_MODULES"], trim($module));
+}
function pts_load_module($module)
{
if(pts_module_type($module) == "PHP")