diff options
| author | Romain d'Alverny <rda@mageia.org> | 2011-04-05 13:51:01 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2011-04-05 13:51:01 +0000 |
| commit | e15836fdf9b03b18369b938108611f93532a0e37 (patch) | |
| tree | f74493030d9a4f136474265dec187212fc6013e2 /lib | |
| parent | 933b71107bf1f4d850c5c0c23e214489d8375a91 (diff) | |
| download | www-e15836fdf9b03b18369b938108611f93532a0e37.tar www-e15836fdf9b03b18369b938108611f93532a0e37.tar.gz www-e15836fdf9b03b18369b938108611f93532a0e37.tar.bz2 www-e15836fdf9b03b18369b938108611f93532a0e37.tar.xz www-e15836fdf9b03b18369b938108611f93532a0e37.zip | |
fix for user-agent string format change
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Downloads.php | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/Downloads.php b/lib/Downloads.php index 25cfa89c3..e64c9ee45 100644 --- a/lib/Downloads.php +++ b/lib/Downloads.php @@ -20,6 +20,13 @@ class Downloads * @param string $ua * * @return array + * + * @todo unit tests or use something else + * Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; fr) AppleWebKit/533.18.1 (KHTML, like Gecko) Version/4.1.2 Safari/533.18.5 + * Mozilla/5.0 (X11; Linux i686; rv:2.0) Gecko/20110330 Firefox/4.0 + * other old ones + * + * @todo refactor this */ public static function get_platform($ua = null) { @@ -32,15 +39,21 @@ class Downloads ); $locale = null; + if (preg_match_all('/([.^\(^\)]*) \((.*)\) (.*)/', $ua, $r)) { $r = $r[2][0]; $r = explode(';', $r); - $r = explode(')', trim($r[3])); - if (strlen($r[0]) > 5) - $r = substr($r[0], 0, 5); + if (isset($r[3])) { + $r = explode(')', trim($r[3])); + if (strlen($r[0]) > 5) + $r = substr($r[0], 0, 5); + else + $r = $r[0]; + } else - $r = $r[0]; + $r = null; + $locale = $r; } @@ -70,7 +83,7 @@ class Downloads return array( 'arch' => $arch, 'system' => $sys, - 'locale' => $locale, + 'locale' => $locale, // FIXME (rda) use Accept-Language instead 'browser' => $browser ); } |