diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2009-01-07 20:53:08 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2009-01-07 20:53:08 -0500 |
| commit | f6e646cf3ca36cc73a55608177a3d5ca9b112202 (patch) | |
| tree | 411a0a7bf6ae5972e5a07a921a5585e100d209b7 /pts-core | |
| parent | 540e0f5c2dd907ebc77609ef28843b30abc59241 (diff) | |
| download | phoronix-test-suite-upstream-f6e646cf3ca36cc73a55608177a3d5ca9b112202.tar.gz phoronix-test-suite-upstream-f6e646cf3ca36cc73a55608177a3d5ca9b112202.tar.xz phoronix-test-suite-upstream-f6e646cf3ca36cc73a55608177a3d5ca9b112202.zip | |
pts-core: Miscellaneous fixes
Diffstat (limited to 'pts-core')
| -rw-r--r-- | pts-core/functions/pts-functions.php | 13 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions_shell.php | 2 | ||||
| -rw-r--r-- | pts-core/functions/pts.php | 12 | ||||
| -rw-r--r-- | pts-core/objects/pts_test_results_details.php | 2 |
4 files changed, 27 insertions, 2 deletions
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php index a164b47..7b047c4 100644 --- a/pts-core/functions/pts-functions.php +++ b/pts-core/functions/pts-functions.php @@ -376,5 +376,18 @@ function pts_user_message($message) } } } +function pts_load_pdf_generator() +{ + if(is_file("/usr/share/php/fpdf/fpdf.php")) + { + $pdf_loader = "/usr/share/php/fpdf/fpdf.php"; + } + else + { + $pdf_loader = false; + } + + return $pdf_loader && include_once($pdf_loader); +} ?> diff --git a/pts-core/functions/pts-functions_shell.php b/pts-core/functions/pts-functions_shell.php index 7c4c715..f5588a1 100644 --- a/pts-core/functions/pts-functions_shell.php +++ b/pts-core/functions/pts-functions_shell.php @@ -52,7 +52,7 @@ function pts_download($download, $to) $to_file = basename($to); $to_dir = dirname($to); $download_output = ""; - $user_agent = "PhoronixTestSuite/" . PTS_CODENAME; + $user_agent = pts_codename(true); if(strpos($to_file, ".") === false) { diff --git a/pts-core/functions/pts.php b/pts-core/functions/pts.php index 0a67bae..ade01e1 100644 --- a/pts-core/functions/pts.php +++ b/pts-core/functions/pts.php @@ -25,4 +25,16 @@ define("PTS_VERSION", "1.6.0b2"); define("PTS_CODENAME", "TYDAL"); define("PTS_TYPE", "DESKTOP"); +function pts_codename($full_string = false) +{ + $codename = PTS_CODENAME; + + if($full_string) + { + $codename = "PhoronixTestSuite/" . ucwords(strtolower($codename)); + } + + return $codename; +} + ?> diff --git a/pts-core/objects/pts_test_results_details.php b/pts-core/objects/pts_test_results_details.php index 534156b..86eb6a2 100644 --- a/pts-core/objects/pts_test_results_details.php +++ b/pts-core/objects/pts_test_results_details.php @@ -31,7 +31,7 @@ class pts_test_results_details { $this->saved_identifier = array_pop(explode("/", dirname($saved_results_file))); - $xml_parser = new tandem_XmlReader($saved_results_file); + $xml_parser = new pts_results_tandem_XmlReader($saved_results_file); $this->title = $xml_parser->getXMLValue(P_RESULTS_SUITE_TITLE); $this->suite = $xml_parser->getXMLValue(P_RESULTS_SUITE_NAME); |