pts-core: Clean up Display / X.Org server reported string

4 files changed, 7 insertions, 2 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index fcbc4d3..c8f5291 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -8,6 +8,7 @@ Phoronix Test Suite (Git)
 - pts-core: Improve motherboard southbridge detection for some Intel ICH Chipsets
 - pts-core: Add pts_test_installed() boolean function
 - pts-core: Add pts_installed_test_tandem_XmlReader object
+- pts-core: Clean up Display / X.Org server reported string
 - pts: Add UXA acceleration check to GtkPerf test note reporting
 - pts: Add 2d-test base profile that reports 2D acceleration mode using Cascading Test Profiles
 - pts_Graph: Tweak formatting of basic graph attributes
diff --git a/pts-core/functions/pts-functions_system.php b/pts-core/functions/pts-functions_system.php
index 253d0a5..5dc01db 100644
--- a/pts-core/functions/pts-functions_system.php
+++ b/pts-core/functions/pts-functions_system.php
@@ -55,7 +55,7 @@ function pts_sw_string()
 		array_push($software, "Desktop: " . $desktop);
 	}
 
-	array_push($software, "X.Org Server: " . sw_os_graphics_subsystem());
+	array_push($software, "Display Server: " . sw_os_graphics_subsystem());
 
 	if(($ddx = sw_xorg_ddx_driver_info()) != "")
 	{
diff --git a/pts-core/functions/pts-functions_system_software.php b/pts-core/functions/pts-functions_system_software.php
index eb5e7fd..01bc701 100644
--- a/pts-core/functions/pts-functions_system_software.php
+++ b/pts-core/functions/pts-functions_system_software.php
@@ -422,6 +422,11 @@ function sw_os_graphics_subsystem()
 		$info = trim(substr($info, strrpos($info, "Server") + 6));
 	}
 
+	if($info != "Unknown")
+	{
+		$info = "X.Org Server " . $info;
+	}
+
 	return $info;
 }
 function sw_os_username()
diff --git a/pts-core/objects/pts_Graph/pts_Graph.php b/pts-core/objects/pts_Graph/pts_Graph.php
index 6e8a907..c152511 100644
--- a/pts-core/objects/pts_Graph/pts_Graph.php
+++ b/pts-core/objects/pts_Graph/pts_Graph.php
@@ -546,7 +546,6 @@ abstract class pts_Graph
 	}
 	protected function return_graph_image()
 	{
-
 		$this->graph_image->render_image($this->graph_output, 5);
 		$this->graph_image->destroy_image();
 	}