Changeset 141 for trunk/lib/main.php

Timestamp:

06/12/08 09:04:03 (7 months ago)

Author:

root

Message:

testing major release 1.6

Files:

• trunk/lib/main.php (modified) (6 diffs)

trunk/lib/main.php

@@ -286 +286 @@
         function check_os($useragent) {
 
-                        $os = "N/A"; $version = "N/A";
+                        $os = "N/A"; $version = "";
 
                         if (preg_match("/Windows NT 5.1/",$useragent,$match)) {
-                                $os = "Windows"; $version = "XP";
+                                $os = "WinXP"; $version = "";
                         } elseif (preg_match("/Windows NT 5.2/",$useragent,$match)) {
-                                $os = "Windows"; $version = "Server 2003";
+                                $os = "Win2003"; $version = "";
                         } elseif (preg_match("/Windows NT 6.0/",$useragent,$match)) {
-                                $os = "Windows"; $version = "Vista";
+                                $os = "WinVista"; $version = "";
                         } elseif (preg_match("/(?:Windows NT 5.0|Windows 2000)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "2000";
+                                $os = "Win2000"; $version = "";
                         } elseif (preg_match("/Windows ME/",$useragent,$match)) {
-                                $os = "Windows"; $version = "ME";
+                                $os = "WinME"; $version = "";
                         } elseif (preg_match("/(?:WinNT|Windows\s?NT)\s?([0-9\.]+)?/",$useragent,$match)) {
-                                $os = "Windows"; $version = "NT ".$match[1];
+                                $os = "WinNT"; $version = $match[1];
                         } elseif (preg_match("/Mac OS X/",$useragent,$match)) {
-                                $os = "Mac OS"; $version = "X";
+                                $os = "MacOSX"; $version = "";
                         } elseif (preg_match("/(Mac_PowerPC|Macintosh)/",$useragent,$match)) {
-                                $os = "Mac OS"; $version = "";
+                                $os = "MacPPC"; $version = "";
                         } elseif (preg_match("/(?:Windows95|Windows 95|Win95|Win 95)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "95";
+                                $os = "Win95"; $version = "";
                         } elseif (preg_match("/(?:Windows98|Windows 98|Win98|Win 98|Win 9x)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "98";
+                                $os = "Win98"; $version = "";
                         } elseif (preg_match("/(?:WindowsCE|Windows CE|WinCE|Win CE)/",$useragent,$match)) {
-                                $os = "Windows"; $version = "CE";
+                                $os = "WinCE"; $version = "";
                         } elseif (preg_match("/PalmOS/",$useragent,$match)) {
                                 $os = "PalmOS";
@@ -342 +342 @@
                 function check_browser($useragent) {
 
-                        $browser = "N/A";
+                        $browser = "";
 
                         if (preg_match("/^Mozilla(?:.*)compatible;\sMSIE\s(?:.*)Opera\s([0-9\.]+)/",$useragent,$match)) {
@@ -353 +353 @@
                                 $browser = "iCab";
                         } elseif (preg_match("/^Mozilla(?:.*)compatible;\sMSIE\s([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "MSIE";
+                                $browser = "IE";
                         } elseif (preg_match("/^(?:.*)compatible;\sMSIE\s([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "MSIE";
+                                $browser = "IE";
                         } elseif (preg_match("/^Mozilla(?:.*)(?:.*)Safari/",$useragent,$match)) {
                                 $browser = "Safari";
@@ -366 +366 @@
                         } elseif (preg_match("/^Mozilla(?:.*)\(compatible;\sOmniWeb\/([0-9\.v-]+)/",$useragent,$match)) {
                                 $browser = "Omniweb";
+                        } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Camino|Chimera)\/([0-9\.]+)/",$useragent,$match)) {
+                                $browser = "Camino";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)Netscape\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "Netscape";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Fire(?:fox|bird)|Phoenix)\/([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "Mozilla Firefox";
+                                $browser = "Firefox";
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)Minefield\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "Minefield";
@@ -378 +380 @@
                         } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)K-Meleon\/([0-9\.]+)/",$useragent,$match)) {
                                 $browser = "K-Meleon";
-                        } elseif (preg_match("/^Mozilla(?:.*)Gecko(?:.*?)(?:Camino|Chimera)\/([0-9\.]+)/",$useragent,$match)) {
-                                $browser = "Camino";
                         } elseif (preg_match("/^Mozilla(?:.*)rv:([0-9\.]+)\)\sGecko/",$useragent,$match)) {
                                 $browser = "Mozilla";
@@ -422 +422 @@
                         }
 
-                        $version = $match[1];
+                        //$version = $match[1];
+                        //restrict version to major and minor version #'s
+                        preg_match("/^\d+(\.\d+)?/",$match[1],$majorvers);
+                        $version = $majorvers[0];
 
                         $this->browser = $browser;