dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Browsers and OS updated

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17617 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-09-28 15:09:10 +00:00
parent 1e8536b6b3
commit 9ad0b29da0
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Guest.php
+12 -7
View File
@@ -102,14 +102,16 @@ class GuestCore extends ObjectModel
protected function getBrowser($userAgent)
{
$browserArray = array(
'Google Chrome' => 'Chrome/',
'Chrome' => 'Chrome/',
'Safari' => 'Safari',
'Firefox 3.x' => 'Firefox/3',
'Firefox 2.x' => 'Firefox/2',
'Safari iPad' => 'iPad',
'Firefox' => 'Firefox/',
'Opera' => 'Opera',
'IE 8.x' => 'MSIE 8',
'IE 7.x' => 'MSIE 7',
'IE 6.x' => 'MSIE 6'
'IE 10' => 'MSIE 10',
'IE 9' => 'MSIE 9',
'IE 8' => 'MSIE 8',
'IE 7' => 'MSIE 7',
'IE 6' => 'MSIE 6'
);
foreach ($browserArray as $k => $value)
if (strstr($userAgent, $value))
@@ -127,9 +129,12 @@ class GuestCore extends ObjectModel
protected function getOs($userAgent)
{
$osArray = array(
'Windows Vista' => 'Windows NT 6',
'Windows 8' => 'Windows NT 6.2',
'Windows 7' => 'Windows NT 6.1',
'Windows Vista' => 'Windows NT 6.0',
'Windows XP' => 'Windows NT 5',
'MacOsX' => 'Mac OS X',
'Android' => 'Android',
'Linux' => 'X11'
);
foreach ($osArray as $k => $value)
install-dev/data/xml/operating_system.xml
+9
View File
@@ -10,11 +10,20 @@
<operating_system id="Windows_Vista">
<name>Windows Vista</name>
</operating_system>
<operating_system id="Windows_7">
<name>Windows 7</name>
</operating_system>
<operating_system id="Windows_8">
<name>Windows 8</name>
</operating_system>
<operating_system id="MacOsX">
<name>MacOsX</name>
</operating_system>
<operating_system id="Linux">
<name>Linux</name>
</operating_system>
<operating_system id="Android">
<name>Android</name>
</operating_system>
</entities>
</entity_operating_system>
install-dev/data/xml/web_browser.xml
+18 -12
View File
@@ -7,26 +7,32 @@
<web_browser id="Safari">
<name>Safari</name>
</web_browser>
<web_browser id="Firefox_2_x">
<name>Firefox 2.x</name>
<web_browser id="Safari_ipad">
<name>Safari iPad</name>
</web_browser>
<web_browser id="Firefox_3_x">
<name>Firefox 3.x</name>
<web_browser id="Firefox">
<name>Firefox</name>
</web_browser>
<web_browser id="Opera">
<name>Opera</name>
</web_browser>
<web_browser id="IE_6_x">
<name>IE 6.x</name>
<web_browser id="IE_6">
<name>IE 6</name>
</web_browser>
<web_browser id="IE_7_x">
<name>IE 7.x</name>
<web_browser id="IE_7">
<name>IE 7</name>
</web_browser>
<web_browser id="IE_8_x">
<name>IE 8.x</name>
<web_browser id="IE_8">
<name>IE 8</name>
</web_browser>
<web_browser id="Google_Chrome">
<name>Google Chrome</name>
<web_browser id="IE_9">
<name>IE 9</name>
</web_browser>
<web_browser id="IE_10">
<name>IE 10</name>
</web_browser>
<web_browser id="Chrome">
<name>Chrome</name>
</web_browser>
</entities>
</entity_web_browser>