diff --git a/about.html b/about.html index 1fd42b92..09e670b9 100644 --- a/about.html +++ b/about.html @@ -48,16 +48,20 @@

The HTML5 test – how well does your browser support HTML5?

- +
+ + +
-
+
  • Frequently asked questions
    • @@ -170,7 +174,7 @@

    What happens when a browser cheats?

    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 @@

    What kind of data is collected from visitors?

    Copyright 2010-2012 by Sights

    -

    April, 2012 - version 3.0

    +

    October, 2012 - version 4.0

    The HTML5 test is being developed at Github. 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 index d1e7b31c..4228f77a 100644 --- 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(); \ No newline at end of file + 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; + } + } + + + \ No newline at end of file diff --git a/backend/config.php b/backend/config.php index 66c85416..c621df03 100644 --- a/backend/config.php +++ b/backend/config.php @@ -1,7 +1,7 @@ $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; diff --git a/backend/results.php b/backend/results.php index 938d50fc..cee17a26 100644 --- a/backend/results.php +++ b/backend/results.php @@ -18,12 +18,12 @@ $res = mysql_query(" SELECT - b.status, b.unique, b.nickname, b.details, b.description, s.score, s.bonus, s.points, s.results + b.status, b.unique, b.nickname, b.details, b.description, 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 FIND_IN_SET('" . $type . "',type) @@ -37,9 +37,9 @@ $tpl->set('results', $results); - if (count($results['current']) > 0) $tpl->set('first', $results['current'][0]); - if (count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]); - if (count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]); + if (isset($results['current']) && count($results['current']) > 0) $tpl->set('first', $results['current'][0]); + if (isset($results['current']) && count($results['current']) > 1) $tpl->set('runnerup', $results['current'][1]); + if (isset($results['development']) && count($results['development']) > 0) $tpl->set('upcoming', $results['development'][0]); @@ -48,19 +48,22 @@ $res = mysql_query(" SELECT - b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, s.score + b.grouped, b.unique, b.nickname, b.details, IF(ISNULL(b.release),DATE(NOW()),b.release) AS `release`, b.status, f.score 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 (!ISNULL(b.release) OR b.status = 'development') AND s.version = '" . $version . "' AND - FIND_IN_SET('" . $type . "',type) + FIND_IN_SET('" . $type . "',type) AND + !ISNULL(f.score) ORDER BY b.grouped, `release` "); + echo mysql_error(); + while ($row = mysql_fetch_object($res)) { $sets[$row->grouped]['name'] = $row->grouped; $sets[$row->grouped]['data'][] = $row; diff --git a/backend/templates/browser.html b/backend/templates/browser.html index 4e0933f6..821f20bd 100644 --- a/backend/templates/browser.html +++ b/backend/templates/browser.html @@ -19,7 +19,7 @@ - + @@ -28,16 +28,20 @@

    The HTML5 test – how well does your browser support HTML5?

    - +
    + + +
    -
    +
    • Browsers
      • @@ -61,7 +65,7 @@

      About these scores