diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-07-16 10:40:57 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-08-03 11:49:20 -0400 |
| commit | 06faa35d77c5e7f0375bcc5ce8c94e750a8ea6dd (patch) | |
| tree | 208efd638a9a79f1d5e136d413215f40dfb6b45a /pts-core/functions/pts-functions_modules.php | |
| parent | 797eda058777aee486bbe53b69cf87cddcbfadc6 (diff) | |
| download | phoronix-test-suite-upstream-06faa35d77c5e7f0375bcc5ce8c94e750a8ea6dd.tar.gz phoronix-test-suite-upstream-06faa35d77c5e7f0375bcc5ce8c94e750a8ea6dd.tar.xz phoronix-test-suite-upstream-06faa35d77c5e7f0375bcc5ce8c94e750a8ea6dd.zip | |
pts-core: Move environmental variables to check for auto-loading of PTS
modules out to modules/module-variables.txt
Diffstat (limited to 'pts-core/functions/pts-functions_modules.php')
| -rw-r--r-- | pts-core/functions/pts-functions_modules.php | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/pts-core/functions/pts-functions_modules.php b/pts-core/functions/pts-functions_modules.php index f309003..bc4954e 100644 --- a/pts-core/functions/pts-functions_modules.php +++ b/pts-core/functions/pts-functions_modules.php @@ -38,19 +38,30 @@ function pts_module_start_process() } function pts_auto_detect_modules($load_here = FALSE) { - $modules_assoc = array("MONITOR" => "system_monitor", "FORCE_AA" => "graphics_override", "FORCE_AF" => "graphics_override", "HALT_SCREENSAVER" => "toggle_screensaver", "EMAIL_RESULTS_TO" => "email_results"); + $module_variables_file = @file_get_contents(MODULE_DIR . "module-variables.txt"); + $module_variables = explode("\n", $module_variables_file); - foreach($modules_assoc as $env_var => $module) - if(!in_array($module, $GLOBALS["PTS_MODULES"]) && ($e = getenv($env_var)) != FALSE && !empty($e)) + foreach($module_variables as $module_var) + { + $module_var = explode("=", $module_var); + + if(count($module_var) == 2) { - if(defined("PTS_DEBUG_MODE")) - echo "Attempting To Add Module: " . $module . "\n"; + $env_var = trim($module_var[0]); + $module = trim($module_var[1]); - array_push($GLOBALS["PTS_MODULES"], $module); + if(!in_array($module, $GLOBALS["PTS_MODULES"]) && ($e = getenv($env_var)) != FALSE && !empty($e)) + { + if(defined("PTS_DEBUG_MODE")) + echo "Attempting To Add Module: " . $module . "\n"; - if($load_here) - pts_load_module($module); + array_push($GLOBALS["PTS_MODULES"], $module); + + if($load_here) + pts_load_module($module); + } } + } } function pts_load_modules() { |