summaryrefslogtreecommitdiffstats
path: root/pts-core/functions/pts-functions_modules.php
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-11-12 10:40:51 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-11-13 10:34:15 -0500
commit1565a6a86684615ff7bcd2f34950ed0465904e1d (patch)
tree46a65176f4a67abee305a9731fd7013f76204bb3 /pts-core/functions/pts-functions_modules.php
parente86cd227a3acd75c9c79a365e0c2ed4e3b4e3dbe (diff)
downloadphoronix-test-suite-upstream-1565a6a86684615ff7bcd2f34950ed0465904e1d.tar.gz
phoronix-test-suite-upstream-1565a6a86684615ff7bcd2f34950ed0465904e1d.tar.xz
phoronix-test-suite-upstream-1565a6a86684615ff7bcd2f34950ed0465904e1d.zip
pts-core: Add pts_user_module_details class
Diffstat (limited to 'pts-core/functions/pts-functions_modules.php')
-rw-r--r--pts-core/functions/pts-functions_modules.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/pts-core/functions/pts-functions_modules.php b/pts-core/functions/pts-functions_modules.php
index 030d6e5..f67aabe 100644
--- a/pts-core/functions/pts-functions_modules.php
+++ b/pts-core/functions/pts-functions_modules.php
@@ -193,7 +193,7 @@ function pts_module_call($module, $process, $object_pass = null)
{
$module_response = pts_php_module_call($module, $process, $object_pass);
}
- else if(in_array($process, pts_module_processes()))
+ else if(pts_module_type($module) == "SH")
{
$module_response = pts_sh_module_call($module, $process);
}
@@ -203,8 +203,14 @@ function pts_module_call($module, $process, $object_pass = null)
function pts_sh_module_call($module, $process)
{
$module_file = MODULE_DIR . $module . ".sh";
+ $module_return = "";
- return is_file($module_file) && trim(shell_exec("sh " . $module_file . " " . $process . " 2>&1"));
+ if(is_file($module_file))
+ {
+ $module_return = trim(shell_exec("sh " . $module_file . " " . $process . " 2>&1"));
+ }
+
+ return $module_return;
}
function pts_php_module_call($module, $process, $object_pass = null)
{