zhangjunah · zhangjunah · Jul 9, 2012 · Jul 9, 2012 · Jul 9, 2012 · Jul 9, 2012
diff --git a/about.html b/about.html
@@ -48,16 +48,20 @@
 	<body>
 		<div class='header'>
 			<h1 data-i18n>The HTML5 test <em>&ndash; how well does your browser support HTML5?</em></h1>
-			<ul>
-				<li><a href='/index.html' data-i18n>Your browser</a></li>
-				<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
-				<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
-
-				<li class='right selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
-			</ul>
+			<div class='navigation'>
+				<ul class='left'>
+					<li><a href='/index.html' data-i18n>Your browser</a></li>
+					<li><a href='/results/desktop.html' data-i18n>Other<span> browser</span>s</a></li>
+					<li><a href='/compare/browser/index.html' data-i18n>Compare</a></li>
+				</ul>
+				<ul class='right'>
+					<li><a href='http://blog.html5test.com/' data-i18n>News</a></li>
+					<li class='selected'><a href='/about.html' data-i18n>About<span> the test</span></a></li>
+				</ul>
+			</div>
 		</div>
 
-		<div class='page'>
+		<div class='page hasNavigation'>
 			<div class='paper'>
 				<ul>
 					<li class='selected'><a href='about.html' data-i18n>Frequently asked questions</a></li>
@@ -170,7 +174,7 @@ <h3>What happens when a browser cheats?</h3>
 						<p>
 							We cannot distinguish between a browser that supports a particular feature and a browser that lies about supporting
 							that feature. The only way do deal with these situations it to manually confirm the test results. And if a browser
-							is found to be overly confidant about claiming support for certain features we can put that browser on a blacklist. 
+							is found to be overly confident about claiming support for certain features we can put that browser on a blacklist. 
 							That means that that even though the browser claims to support a particular feature, we ignore what the browser says and do
 							not give any points. This is usually just a temporary problem and once the browser has been fixed we will remove
 							the new version from the blacklist.
@@ -256,7 +260,7 @@ <h3>What kind of data is collected from visitors?</h3>
 
 				<div class='copyright'>
 					<p>Copyright 2010-2012 by Sights</p>
-					<p>April, 2012 - version 3.0</p>
+					<p>October, 2012 - version 4.0</p>
 					<p data-i18n='footer'>
 						The HTML5 test is being developed at <a href='http://github.com/NielsLeenheer/html5test'>Github</a>. Please file an issue there if you find any bugs or think of any improvements to this test.
 						Please note that the HTML5 test is not affiliated with the W3C or the HTML5 working group.

diff --git a/backend/browser.php b/backend/browser.php
@@ -15,18 +15,20 @@
 			SELECT 
 				b.unique AS id, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
 				s.version = '" . $version . "' AND
-				s.points != ''
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 
+		echo mysql_error();
+
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -38,62 +40,87 @@
 		$show = explode('/', $_REQUEST['show']);
 
 		if (isset($show[0])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[0]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[0])) {
+				if ($row = getResultsForUniqueId($show[0])) {
+					$tpl->set('one', json_encode($row));
+				}
+			}
 
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('one', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[0], $version)) {
+					$tpl->set('one', json_encode($row));
+				}
 			}
 		}
 
 		if (isset($show[1])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[1]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[1])) {
+				if ($row = getResultsForUniqueId($show[1])) {
+					$tpl->set('two', json_encode($row));
+				}
+			}
 
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('two', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[1], $version)) {
+					$tpl->set('two', json_encode($row));
+				}
 			}
 		}
 
 		if (isset($show[2])) {
-			$res = mysql_query("
-				SELECT 
-					b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
-				FROM 
-					browsers AS b, 
-					scores AS s 
-				WHERE 
-					b.unique = s.id AND 
-					b.listed = 1 AND
-					s.version = '" . $version . "' AND
-					b.unique ='" . mysql_real_escape_string($show[2]) . "'
-			");
+			if (preg_match("/^[0-9]+\_[a-f0-9]{4,4}$/", $show[2])) {
+				if ($row = getResultsForUniqueId($show[2])) {
+					$tpl->set('three', json_encode($row));
+				}
+			}
 
-			if ($row = mysql_fetch_object($res)) {
-				$tpl->set('three', json_encode($row));
+			else {
+				if ($row = getResultsForBrowser($show[2], $version)) {
+					$tpl->set('three', json_encode($row));
+				}
 			}
 		}
 	}
 
 
-	echo $tpl->fetch();
+	echo $tpl->fetch();
+
+
+	function getResultsForBrowser($browser, $version) {
+		$res = mysql_query("
+			SELECT 
+				b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
+			FROM 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
+			WHERE 
+				b.listed = 1 AND
+				s.version = '" . $version . "' AND
+				b.unique ='" . mysql_real_escape_string($browser) . "'
+		");
+
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+
+
+
+	function getResultsForUniqueId($id) {
+		$res = mysql_query("
+			SELECT 
+				r.uniqueid AS id, 'Unique id' AS nickname, r.score, r.bonus, r.points, r.results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight 
+			FROM 
+				results AS r
+			WHERE 
+				r.uniqueid ='" . mysql_real_escape_string($id) . "'
+		");
+
+		if ($row = mysql_fetch_object($res)) {
+			return $row;
+		}		
+	}
+
+
+
diff --git a/backend/config.php b/backend/config.php
@@ -1,7 +1,7 @@
 <?php
 
-	$version = '3.00';
 	$readonly = false;
+	$version = '4.00';
 
 	$mysql['server'] = 'localhost';
 	$mysql['username'] = '*****';

diff --git a/backend/feature.php b/backend/feature.php
@@ -15,18 +15,21 @@
 			SELECT 
 				b.unique AS id, CONCAT(b.unique,'-" . $type . "-',b.id) AS uid, b.nickname, b.details, '" . $type . "' AS type
 			FROM 
-				browsers AS b, 
-				scores AS s 
+				browsers AS b
+				LEFT JOIN scores AS s ON (b.unique = s.id)
+				LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 			WHERE 
-				b.unique = s.id AND
 				b.listed = 1 AND
 				FIND_IN_SET('" . $type . "',b.type) AND
-				s.version = '" . $version . "' AND
-				s.points != ''
+				f.version = '" . $version . "' AND
+				f.points != ''
 			ORDER BY 
 				id, nickname
 		");
 
+			echo mysql_error();
+
+
 		while ($row = mysql_fetch_object($res)) {
 			$results[] = $row;
 		}
@@ -42,12 +45,12 @@
 
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[0]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b			
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -67,12 +70,12 @@
 
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[1]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b 
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -92,12 +95,12 @@
 
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
+					IF(f.results LIKE '%" . mysql_real_escape_string($show[2]) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid 
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");

diff --git a/backend/index.php b/backend/index.php
@@ -23,12 +23,12 @@
 
 			$res = mysql_query("
 				SELECT 
-					IF(s.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
+					IF(f.results LIKE '%" . mysql_real_escape_string($_REQUEST['id']) . "=1%',1,0) AS supported, b.unique AS id, CONCAT(b.unique,'-',b.id) AS uid
 				FROM 
-					browsers AS b, 
-					scores AS s 
+					browsers AS b
+					LEFT JOIN scores AS s ON (b.unique = s.id)
+					LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 				WHERE 
-					b.unique = s.id AND 
 					b.listed = 1 AND
 					s.version = '" . $version . "'
 			");
@@ -48,7 +48,7 @@
 			if (substr($_REQUEST['id'], 0, 7) == 'custom:') {
 				$res = mysql_query("
 					SELECT 
-						'custom' AS id, 'Unique id'  AS nickname, score, bonus, points, results 
+						uniqueid AS id, 'Unique id'  AS nickname, score, bonus, points, results, humanReadable, useragentHeader AS useragent, deviceWidth, deviceHeight
 					FROM 
 						results 
 					WHERE 
@@ -57,12 +57,12 @@
 			} else {
 				$res = mysql_query("
 					SELECT 
-						b.unique AS id, b.nickname, s.score, s.bonus, s.points, s.results 
+						b.unique AS id, b.nickname, f.score, f.bonus, f.points, f.results 
 					FROM 
-						browsers AS b, 
-						scores AS s 
+						browsers AS b 
+						LEFT JOIN scores AS s ON (b.unique = s.id)
+						LEFT JOIN fingerprints AS f ON (f.fingerprint = s.fingerprint)
 					WHERE 
-						b.unique = s.id AND 
 						b.listed = 1 AND
 						s.version = '" . $version . "' AND
 						b.unique ='" . mysql_real_escape_string($_REQUEST['id']) . "'
@@ -79,10 +79,26 @@
 			$payload = json_decode($_REQUEST['payload']);
 			$headers = apache_request_headers();
 
-			$xWapProfile = isset($headers['x-wap-profile']) ? $headers['x-wap-profile'] : '';
-			$xOperaMiniPhoneUA = isset($headers['X-OperaMini-Phone-UA']) ? $headers['X-OperaMini-Phone-UA'] : '';
+			$filteredHeaders = '';
+
+			foreach($headers as $key => $value) {
+				if (!in_array(strtolower($key), array(
+					'accept', 'host', 'connection', 'dnt', 'user-agent', 'accept-encoding', 'accept-language', 
+					'accept-charset', 'referer', 'cookie', 'content-type', 'content-length', 'content-transfer-encoding', 
+					'origin', 'pragma', 'cache-control', 'via', 'clientip', 'x-bluecoat-via', 'x-piper-id',
+					'x-forwarded-for', 'x-teacup', 'x-saucer', 'isajaxrequest', 'keep-alive', 'max-forwards',
+					'xroxy-connection', 'client-ip', 'cookie2', 'x-via', 'x-imforwards', 'http-client-id',
+					'x-proxy-id', 'z-forwarded-for', 'expect', 'x-ip-address', 'x-rbt-optimized-by', 'qpr-loop',
+					'cuda_cliip', 'x-source-id', 'x-clickoncesupport'
+				))) {
+					$filteredHeaders .= $key . ": " . $value . "\n";
+				}
+			}
+
+			if (!$readonly && intval($payload->version) >= 4) {
+				$useragentHeader = $_SERVER['HTTP_USER_AGENT'];
+				$useragentId = preg_replace("/(; ?)[a-z][a-z](?:-[a-zA-Z][a-zA-Z])?([;)])/", '$1xx$2', $useragentHeader);
 
-			if (!$readonly) {
 				mysql_query('
 					INSERT INTO 
 						results
@@ -113,13 +129,27 @@
 						deviceHeight = "' . mysql_real_escape_string($payload->deviceHeight) . '",
 						deviceType = "' . mysql_real_escape_string($payload->deviceType) . '",
 						useragent = "' . mysql_real_escape_string($payload->useragent) . '",
+						useragentHeader = "' . mysql_real_escape_string($useragentHeader) . '",
+						useragentId = "' . mysql_real_escape_string(md5($useragentId)) . '",
 						humanReadable = "' . mysql_real_escape_string($payload->humanReadable) . '",
-						xWapProfile = "' . mysql_real_escape_string($xWapProfile) . '",
-						xOperaMiniPhoneUA = "' . mysql_real_escape_string($xOperaMiniPhoneUA) . '",
+						headers = "' . mysql_real_escape_string($filteredHeaders) . '",
 						results = "' . mysql_real_escape_string($payload->results) . '",
 						points = "' . mysql_real_escape_string($payload->points) . '",
+						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
 						status = 0
 				');
+
+				mysql_query('
+					INSERT INTO 
+						fingerprints
+					SET 
+						fingerprint = "' . mysql_real_escape_string(md5($payload->results.$payload->points)) . '",
+						version = "' . mysql_real_escape_string($payload->version) . '",
+						score = "' . mysql_real_escape_string($payload->score) . '",
+						bonus = "' . mysql_real_escape_string($payload->bonus) . '",
+						results = "' . mysql_real_escape_string($payload->results) . '",
+						points = "' . mysql_real_escape_string($payload->points) . '"
+				');
 			}
 
 			break;