X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Fuseragent.php-class;h=12293d5f1139519fc7baacefd843e55d8a1b7c18;hp=d1fd4351826959d1dfb6cb2bed32d94465d7e4c0;hb=1d38ad3ee1a46eccab547c04f66072d99f323f60;hpb=bf78d3ed3249c9c7fdf38737f6c14f04b21b5330

diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class
index d1fd435..12293d5 100755
--- a/include/classes/useragent.php-class
+++ b/include/classes/useragent.php-class
@@ -68,7 +68,7 @@ class userAgent {
   //
   // function getEngine()
   //   returns a string telling the detected rendering engine, null if we can't detect
-  //     one of gecko|khtml|trident|tasman|nscp|presto|gzilla|gtkhtml|links|unkown
+  //     one of gecko|khtml|trident|tasman|nscp|presto|gzilla|gtkhtml|links|unknown
   //
   // function hasEngine($rnd_engine)
   //   returns true if the given rendering engine was detected
@@ -83,7 +83,7 @@ class userAgent {
   //
   // function getPlatform()
   //   returns a string telling the detected OS platform, null if we can't detect
-  //     one of windows|linux|mac|solaris|unkown
+  //     one of windows|linux|mac|solaris|unknown
   //
   // function getLanguage() {
   //   returns a string telling the detected browser UI language, null if we can't detect
@@ -135,7 +135,7 @@ class userAgent {
     // get UA brand and version
     $this->brand = 'Unknown'; $this->version = null;
     // find reasonable defaults
-    if (preg_match('|([0-9a-zA-Z\.()_ -]+)/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+    if (preg_match('|([0-9a-zA-Z\.:()_ -]+)/([0-9a-zA-Z\._+-]+)|', $this->uastring, $regs)) {
       $this->brand = trim($regs[1]);
       $this->version = $regs[2];
     }
@@ -147,82 +147,145 @@ class userAgent {
       $this->brand = trim($regs[1]);
       $this->version = null;
     }
+    $this->bot = (strpos(strtolower($this->brand), 'bot') !== false)
+                 || (strpos(strtolower($this->brand), 'crawler') !== false)
+                 || (strpos(strtolower($this->brand), 'spider') !== false);
+
     // search for any real and/or special UAs
     if (preg_match('|Netscape6/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Netscape';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Netscape/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Netscape';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Chimera/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Chimera';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Camino/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Camino';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Phoenix/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Phoenix';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Mozilla Firebird/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Mozilla Firebird';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Firefox/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Firefox';
       $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|SeaMonkey/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'SeaMonkey';
+      $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Galeon/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Galeon';
       $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|Epiphany/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'Epiphany';
+      $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|K-Meleon/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'K-Meleon';
+      $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|AOL[/ ]([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'AOL';
+      $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|rv:([0-9a-zA-Z\.+]+)|', $this->uastring, $regs) && strstr($this->uastring, "Mozilla/") && strstr($this->uastring, "Gecko/")) {
       $this->brand = 'Mozilla';
       $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|m([0-9]+)\)|', $this->uastring, $regs) && strstr($this->uastring, "Mozilla/") && strstr($this->uastring, "Gecko/")) {
+      $this->brand = 'Mozilla';
+      $this->version = 'M'.$regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Opera[ /]([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Opera';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|OmniWeb/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'OmniWeb';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Konqueror/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Konqueror';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Safari/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Safari';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|AppleWebKit/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'AppleWebKit';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|MSFrontPage/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Microsoft FrontPage';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|iCab[/ ]([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'iCab';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|IBrowse[/ ]([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'IBrowse';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|Configuration/CLDC-([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'CLDC';
       $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|UP.Browser/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'UP.Browser';
+      $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|ELinks \(([0-9a-zA-Z\.+]+);|', $this->uastring, $regs)) {
       $this->brand = 'ELinks';
       $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|Links \(([0-9a-zA-Z\.+]+);|', $this->uastring, $regs)) {
+      $this->brand = 'Links';
+      $this->version = $regs[1];
+      $this->bot = false;
+    }
+    elseif (preg_match('|wget[/ ]([0-9a-zA-Z\.+]+)|i', $this->uastring, $regs)) {
+      $this->brand = 'wget';
+      $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|ZyBorg/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'ZyBorg';
@@ -239,9 +302,9 @@ class userAgent {
       $this->version = $regs[1];
       $this->bot = true;
     }
-    elseif (preg_match('|Slurp/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+    elseif (preg_match('|Slurp|', $this->uastring, $regs)) {
       $this->brand = 'Slurp';
-      $this->version = $regs[1];
+      $this->version = null;
       $this->bot = true;
     }
     elseif (preg_match('|Gulper Web Bot ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
@@ -254,6 +317,11 @@ class userAgent {
       $this->version = $regs[1];
       $this->bot = true;
     }
+    elseif (preg_match('|([0-9a-zA-Z\.+]+)_AC-Plug|', $this->uastring, $regs)) {
+      $this->brand = 'AC-Plug';
+      $this->version = $regs[1];
+      $this->bot = true;
+    }
     elseif (preg_match('|^Internet Explorer 5.5|', $this->uastring)) {
       $this->brand = 'Unknown bot (IE5.5)';
       $this->version = null;
@@ -289,45 +357,86 @@ class userAgent {
       $this->version = null;
       $this->bot = true;
     }
+    elseif (preg_match('|42_HAL|', $this->uastring)) {
+      $this->brand = '42_HAL';
+      $this->version = null;
+      $this->bot = true;
+    }
+    elseif (preg_match('|Baiduspider|i', $this->uastring)) {
+      $this->brand = 'BaiDuSpider';
+      $this->version = null;
+      $this->bot = true;
+    }
+    elseif (preg_match('|Indy Library|', $this->uastring)) {
+      $this->brand = 'Indy Library';
+      $this->version = null;
+      $this->bot = true;
+    }
     elseif (preg_match('|^Firefly|', $this->uastring)) {
       // comes here with correct value but would be detected as MSIE
     }
+    elseif (preg_match('|Steganos Internet Anonym([0-9a-zA-Z\. +]*)|', $this->uastring, $regs)) {
+      $this->brand = 'Steganos Internet Anonym';
+      $this->version = $regs[1];
+      $this->bot = false;
+    }
     elseif (preg_match('|Avant Browser[^/]|', $this->uastring)) {
       $this->brand = 'Avant Browser';
       $this->version = null;
+      $this->bot = false;
+    }
+    elseif (preg_match('|Maxthon|', $this->uastring)) {
+      $this->brand = 'Maxthon';
+      $this->version = null;
+      $this->bot = false;
+    }
+    elseif (preg_match('|MyIE2|', $this->uastring)) {
+      $this->brand = 'MyIE2';
+      $this->version = null;
+      $this->bot = false;
     }
     elseif (preg_match('|Crazy Browser ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Crazy Browser';
       $this->version = $regs[1];
+      $this->bot = false;
     }
-    elseif (preg_match('|AOL ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
-      $this->brand = 'AOL';
+    elseif (preg_match('|AvantGo ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+      $this->brand = 'AvantGo';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|MSN ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'MSN';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|MS FrontPage ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Microsoft FrontPage';
       $this->version = $regs[1];
+      $this->bot = false;
     }
     elseif (preg_match('|MSIE ([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
       $this->brand = 'Microsoft Internet Explorer';
       $this->version = $regs[1];
+      $this->bot = false;
     }
-    elseif (preg_match('|Mozilla/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs) && !strstr($this->uastring, "compatible;") && !strstr($this->uastring, "Gecko/")) {
+    elseif (preg_match('|Mozilla/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs) && (strpos($this->uastring, 'compatible;') === false) && (strpos($this->uastring, 'Gecko/') === false)) {
       $this->brand = 'Netscape';
       $this->version = $regs[1];
       if (intval($this->version) == 4) { $this->brand .= ' Communicator'; }
+      $this->bot = false;
+    }
+    elseif (preg_match('|Mozilla/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs) && (strpos($this->uastring, 'compatible;') !== false)) {
+      $this->brand = 'Mozilla-compatible (unknown)';
+      $this->version = null;
+      $this->bot = false;
     }
 
-    $botArray = array('Scooter','Spinne','Vagabondo','TurnitinBot','FAST-WebCrawler','Firefly','Googlebot',
-                      'Scrubby','psbot','NG','URL_Spider_Pro','Pompos','Szukacz','ASPseek','NPBot-1',
-                      'dloader(NaverRobot)','NetResearchServer','HeinrichderMiragoRobot','LinkWalker',
-                      'Openbot','W3C_Validator','ZyBorg','Ask Jeeves','dumbBot','BaiDuSpider','ia_archiver',
-                      'PingALink Monitoring Services','IlTrovatore-Setaccio','Nutch','Mercator','OWR_Crawler',
-                      'search.ch','WebFilter Robot','appie','larbin','','','','','','','','');
+    $botArray = array('Scooter','Spinne','Vagabondo','Firefly','Scrubby','NG','Pompos','Szukacz','ASPseek',
+                      'NetResearchServer','LinkWalker','Zeus','W3C_Validator','ZyBorg','Ask Jeeves','ia_archiver',
+                      'PingALink Monitoring Services','IlTrovatore-Setaccio','Nutch','Mercator','search.ch',
+                      'appie','larbin','NutchCVS','ObjectsSearch','Webchat','Mediapartners-Google','Schmozilla',
+                      'FavOrg','findlinks','DataCha0s','','','','','','','','','');
 
     if (in_array($this->brand, $botArray)) {
       $this->bot = true;
@@ -345,7 +454,7 @@ class userAgent {
       foreach ($accLcomp as $lcomp) {
         if (strlen($lcomp)) {
           $ldef = explode(';', $lcomp);
-          $accLang[$ldef[0]] = (float)((strpos($ldef[1],'q=')===0)?substr($ldef[1],2):1);
+          $accLang[$ldef[0]] = (float)((strpos(@$ldef[1],'q=')===0)?substr($ldef[1],2):1);
         }
       }
       $this->uadata['accept-languages'] = $accLang;
@@ -356,16 +465,16 @@ class userAgent {
   function getUAString() { return $this->uastring; }
 
   function getEngine() {
-    // return gecko|khtml|trident|tasman|nscp|presto|gzilla|gtkhtml|links|unkown
+    // return gecko|khtml|trident|tasman|nscp|presto|gzilla|gtkhtml|links|unknown
     if (!isset($this->uadata['engine'])) {
-      $this->uadata['engine'] = 'unkown';
+      $this->uadata['engine'] = 'unknown';
       $this->uadata['geckodate'] = null;
       if (preg_match('|Gecko/([0-9]+)|', $this->uastring, $regs)) {
         $this->uadata['engine'] = 'gecko';
         $this->uadata['geckodate'] = $regs[1];
       }
       elseif ((strpos($this->brand, 'Internet Explorer') !== false) ||  (strpos($this->brand, 'FrontPage') !== false)) {
-        if (($this->uadata['platform'] == 'mac') && (intval($this->version) >= 5)) {
+        if ((strpos(strtolower($this->uastring), 'mac') !== false) && (intval($this->getVersion()) >= 5)) {
           $this->uadata['engine'] = 'tasman';
         }
         else {
@@ -375,8 +484,14 @@ class userAgent {
       elseif ((strpos($this->brand, 'Konqueror') !== false) || (strpos($this->brand, 'Safari') !== false) || (strpos($this->brand, 'AppleWebKit') !== false) || (strpos($this->brand, 'OmniWeb') !== false)) {
         $this->uadata['engine'] = 'khtml';
       }
-      elseif ((strpos($this->brand, 'Netscape') !== false) && (intval($this->version) <= 4)) {
-        $this->uadata['engine'] = 'nscp';
+      elseif (strpos($this->brand, 'Netscape') !== false) {
+        // non-Gecko Netscape browsers
+        if (intval($this->version) <= 4) {
+          $this->uadata['engine'] = 'nscp';
+        }
+        elseif (strpos($this->uastring, 'MSIE') !== false) {
+          $this->uadata['engine'] = 'trident';
+        }
       }
       elseif (strpos($this->brand, 'Opera') !== false) {
         $this->uadata['engine'] = 'presto';
@@ -387,7 +502,9 @@ class userAgent {
       elseif ((strpos($this->brand, 'ELinks') !== false) || (strpos($this->brand, 'Links') !== false)) {
         $this->uadata['engine'] = 'links';
       }
-      elseif ((strpos($this->brand, 'Avant') !== false) || (strpos($this->brand, 'Crazy Browser') !== false) || (strpos($this->brand, 'AOL') !== false) || (strpos($this->brand, 'MSN') !== false)) {
+      elseif ((strpos($this->brand, 'Avant') !== false) || (strpos($this->brand, 'Crazy Browser') !== false) ||
+              (strpos($this->brand, 'AOL') !== false) || (strpos($this->brand, 'MSN') !== false) ||
+              (strpos($this->brand, 'MyIE2') !== false) || (strpos($this->brand, 'Maxthon') !== false)) {
         $this->uadata['engine'] = 'trident';
       }
       elseif (strpos($this->brand, 'Galeon') !== false) {
@@ -412,17 +529,37 @@ class userAgent {
     if (!isset($this->uadata['os'])) {
       $this->uadata['os'] = null;
       if ($this->hasEngine('gecko')) {
-        if (preg_match('|Mozilla/5.0 \(([^;]+); U; ([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) {
+        if (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); ([^;]+); rv:([^\);]+)(; [^\)]+)?\)|', $this->uastring, $regs)) {
           $this->uadata['os'] = $regs[2];
-          $this->uadata['lang'] = $regs[3];
+          $this->uadata['lang'] = (strpos($regs[3],'chrome://')===false)?$regs[3]:null;
           $this->uadata['eng_version'] = $regs[4];
         }
-        elseif (preg_match('|Mozilla/5.0 \(([^;]+); U; ([^;]+); ([^;]+); m([^\);]+)\)|', $this->uastring, $regs)) {
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); rv:([^\);]+)(; [^\)]+)?\)|', $this->uastring, $regs)) {
+          $this->uadata['os'] = $regs[2];
+          $this->uadata['lang'] = null;
+          $this->uadata['eng_version'] = $regs[3];
+        }
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); ([^;]+); m([^\);]+)\)|', $this->uastring, $regs)) {
           $this->uadata['os'] = $regs[2];
           $this->uadata['lang'] = $regs[3];
           $this->uadata['eng_version'] = 'M'.$regs[4];
         }
-        elseif (preg_match('|Mozilla/5.0 \(([^;]+); U; ([^\);]+)\)|', $this->uastring, $regs)) {
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); m([^\);]+)\)|', $this->uastring, $regs)) {
+          $this->uadata['os'] = $regs[1];
+          $this->uadata['lang'] = $regs[2];
+          $this->uadata['eng_version'] = 'M'.$regs[3];
+        }
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^;]+); ([^\);]+)\)|', $this->uastring, $regs)) {
+          $this->uadata['os'] = $regs[2];
+          $this->uadata['lang'] = $regs[3];
+          $this->uadata['eng_version'] = null;
+        }
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) {
+          $this->uadata['os'] = $regs[2];
+          $this->uadata['lang'] = null;
+          $this->uadata['eng_version'] = $regs[3];
+        }
+        elseif (preg_match('|Mozilla/5.0 \(([^;]+); [^;]+; ([^\);]+)\)|', $this->uastring, $regs)) {
           $this->uadata['os'] = $regs[2];
           $this->uadata['lang'] = null;
           $this->uadata['eng_version'] = null;
@@ -438,26 +575,26 @@ class userAgent {
           $this->uadata['eng_version'] = null;
         }
       }
-      elseif ($this->hasEngine('trident')) {
-        if (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE ([^;]+); [^\)]*((?:Mac|Win)[^;]+)[^\)]*\)/i', $this->uastring, $regs)) {
+      elseif ($this->hasEngine('trident') || $this->hasEngine('tasman')) {
+        if (preg_match('/Mozilla\/[^\(]+ \(compatible *; MSIE ([^;]+)[^\)]*; ?((?:Mac|Win)[^;]+)[^\)]*\)/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $regs[1];
           $this->uadata['os'] = $regs[2];
           $this->uadata['lang'] = null;
         }
-        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE ([^;]+)[^\)]*\)/i', $this->uastring, $regs)) {
+        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible *; MSIE ([^;]+)[^\)]*\)/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $regs[1];
           $this->uadata['os'] = null;
           $this->uadata['lang'] = null;
         }
       }
       elseif ($this->hasEngine('khtml')) {
-        if (preg_match('/Mozilla\/[^\(]+ \(compatible; Konqueror\/([^;]+); ([^;]+); ([^;]+); ([^;]+); ([^\);]+)\)/i', $this->uastring, $regs)) {
-          $this->uadata['eng_version'] = $regs[1];
+        if (preg_match('/Mozilla\/[^\(]+ \(compatible; Konqueror\/([^;]+); ([^;]+); ([^;]+); ([^;]+); ([^\);]+)\)(?: KHTML\/([0-9a-zA-Z\.+]+))?/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = strlen($regs[6])?$regs[6]:$regs[1];
           $this->uadata['os'] = $regs[2];
           $this->uadata['lang'] = $regs[5];
         }
-        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; Konqueror\/([^;]+); ([^\);]+)([^\)]+)\)/i', $this->uastring, $regs)) {
-          $this->uadata['eng_version'] = $regs[1];
+        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; Konqueror\/([^;]+); ([^\);]+)[^\)]*\)(?: KHTML\/([0-9a-zA-Z\.+]+))?/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = strlen($regs[3])?$regs[3]:$regs[1];
           $this->uadata['os'] = $regs[2];
           $this->uadata['lang'] = null;
         }
@@ -473,24 +610,45 @@ class userAgent {
         }
       }
       elseif ($this->hasEngine('presto')) {
-        if (preg_match('/Opera\/[^\(]+ \(([^;]+)[^\)]+\) +\[([a-z_-]+)\]/i', $this->uastring, $regs)) {
+        if (preg_match('/Opera\/[^\(]+ \((?:X11; )?([^;]+)[^\)]+\) +\[([a-z_-]+)\]/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $this->getVersion();
           $this->uadata['os'] = $regs[1];
           $this->uadata['lang'] = $regs[2];
         }
-        elseif (preg_match('/Opera\/[^\(]+ \(([^;]+); [^\)]+; ([a-z_-]+)\)/i', $this->uastring, $regs)) {
+        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE [^;]+; (?:X11; )?([^;\)]+)[^\)]*\) Opera [^ ]+ +\[([a-z_-]+)\]/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $this->getVersion();
           $this->uadata['os'] = $regs[1];
           $this->uadata['lang'] = $regs[2];
         }
-        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; [^;]+; ([^;]+)\) Opera [^ ]+ \[([a-z_-]+)\]/i', $this->uastring, $regs)) {
+        elseif (preg_match('/Mozilla\/[^\(]+ \((?:X11; )?([^;]+);.+\) Opera [^ ]+ \[([a-z_-]+)\]/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = $this->getVersion();
+          $this->uadata['os'] = $regs[1];
+          $this->uadata['lang'] = $regs[2];
+        }
+        // Opera 8
+        elseif (preg_match('/Opera\/[^\(]+ \((?:X11; )?([^;]+); [^\)]+; ([a-z_-]+)\)/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = $this->getVersion();
+          $this->uadata['os'] = $regs[1];
+          $this->uadata['lang'] = $regs[2];
+        }
+        elseif (preg_match('/Mozilla\/[^\(]+ \(compatible; MSIE [^;]+; (?:X11; )?([^;]+); ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = $this->getVersion();
+          $this->uadata['os'] = $regs[1];
+          $this->uadata['lang'] = $regs[2];
+        }
+        elseif (preg_match('/Mozilla\/[^\(]+ \((?:X11; )?([^;]+);.+; ([a-z_-]+)\) Opera [^ ]+/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $this->getVersion();
           $this->uadata['os'] = $regs[1];
           $this->uadata['lang'] = $regs[2];
         }
       }
       elseif ($this->hasEngine('nscp')) {
-        if (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) \[([a-z_-]+)\] \(([^;]+); [^\)]+\)/i', $this->uastring, $regs)) {
+        if (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) (?:\[([a-z_-]+)\][^\(]+)?\(X11; [^;]+; ([^\)]+)\)/i', $this->uastring, $regs)) {
+          $this->uadata['eng_version'] = $regs[1];
+          $this->uadata['os'] = $regs[3];
+          $this->uadata['lang'] = $regs[2];
+        }
+        elseif (preg_match('/Mozilla\/([0-9a-zA-Z\.+]+) (?:\[([a-z_-]+)\][^\(]+)?\(([^;]+);[^\)]+\)/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = $regs[1];
           $this->uadata['os'] = $regs[3];
           $this->uadata['lang'] = $regs[2];
@@ -502,7 +660,7 @@ class userAgent {
         $this->uadata['lang'] = null;
       }
       elseif ($this->hasEngine('links')) {
-        if (preg_match('/ELinks[^\(]+\([^;]+; ([^;]+);[^\)]+\)/i', $this->uastring, $regs)) {
+        if (preg_match('/E?Links[^\(]+\([^;]+; ([^;]+)[^\)]+\)/i', $this->uastring, $regs)) {
           $this->uadata['eng_version'] = null;
           $this->uadata['os'] = $regs[1];
           $this->uadata['lang'] = null;
@@ -517,27 +675,54 @@ class userAgent {
         elseif (preg_match('/curl\/[^\(]+\(([^\);]+)/i', $this->uastring, $regs)) {
           $this->uadata['os'] = $regs[1];
         }
+        elseif (preg_match('/NCSA[_ ]Mosaic\/[^\(]+\((?:.*;)?([^\);]+)/i', $this->uastring, $regs)) {
+          $this->uadata['os'] = trim($regs[1]);
+        }
+        elseif (preg_match('/iCab.*(Mac[^\);]+).*?\)/i', $this->uastring, $regs)) {
+          $this->uadata['os'] = trim($regs[1]);
+        }
+        elseif (preg_match('/SymbianOS\/([^ ]+)/i', $this->uastring, $regs)) {
+          $this->uadata['os'] = 'SymbianOS '.$regs[1];
+        }
       }
       if ($this->uadata['os'] == 'Win 9x 4.90') { $this->uadata['os'] = 'Windows ME'; }
       elseif ($this->uadata['os'] == 'WinNT4.0') { $this->uadata['os'] = 'Windows ME'; }
       elseif ($this->uadata['os'] == 'Windows NT 5.0') { $this->uadata['os'] = 'Windows 2000'; }
       elseif ($this->uadata['os'] == 'Windows NT 5.1') { $this->uadata['os'] = 'Windows XP'; }
       elseif ($this->uadata['os'] == 'Windows NT 5.2') { $this->uadata['os'] = 'Windows 2003'; }
+      elseif ($this->uadata['os'] == 'Windows NT 5.2 x64') { $this->uadata['os'] = 'Windows 2003 (64bit)'; }
+      elseif ($this->uadata['os'] == 'Windows NT 6.0') { $this->uadata['os'] = 'Windows Vista'; }
       elseif ($this->uadata['os'] == 'Win95') { $this->uadata['os'] = 'Windows 95'; }
       elseif ($this->uadata['os'] == 'Win98') { $this->uadata['os'] = 'Windows 98'; }
+      elseif ($this->uadata['os'] == 'WinNT') { $this->uadata['os'] = 'Windows NT'; }
+      elseif ($this->uadata['os'] == 'Win32') { $this->uadata['os'] = 'Windows (32bit)'; }
+      elseif ($this->uadata['os'] == 'Win64') { $this->uadata['os'] = 'Windows (64bit)'; }
       elseif (preg_match('/Mac ?OS ?X/i',$this->uadata['os'])) { $this->uadata['os'] = 'MacOS X'; }
       elseif (preg_match('/Mac_P(ower|)PC/i',$this->uadata['os'])) { $this->uadata['os'] = 'MacOS'; }
       elseif (strpos($this->uadata['os'], 'darwin') !== false) { $this->uadata['os'] = 'MacOS X'; }
+      elseif (strpos($this->uadata['os'], 'Darwin') !== false) { $this->uadata['os'] = 'MacOS X'; }
       elseif (strpos($this->uadata['os'], 'apple') !== false) { $this->uadata['os'] = 'MacOS'; }
+      elseif (strpos($this->uadata['os'], 'Macintosh') !== false) { $this->uadata['os'] = 'MacOS'; }
       elseif (strpos($this->uadata['os'], 'linux') !== false) { $this->uadata['os'] = 'Linux'; }
 
-      if (strpos($this->uadata['os'], 'Win') !== false) { $this->uadata['platform'] = 'windows'; }
-      elseif (strpos($this->uadata['os'], 'Mac') !== false) { $this->uadata['platform'] = 'mac'; }
-      elseif (strpos($this->uadata['os'], 'Linux') !== false) { $this->uadata['platform'] = 'linux'; }
-      elseif (strpos($this->uadata['os'], 'Solaris') !== false) { $this->uadata['platform'] = 'solaris'; }
-      elseif (strpos($this->uadata['os'], 'FreeBSD') !== false) { $this->uadata['platform'] = 'freebsd'; }
-      elseif (strpos($this->uadata['os'], 'AmigaOS') !== false) { $this->uadata['platform'] = 'amiga'; }
-      else { $this->uadata['platform'] = null; }
+      if (strpos($this->uadata['os'], 'Win') !== false) { $this->uadata['platform'] = 'Windows'; }
+      elseif (strpos($this->uadata['os'], 'Mac') !== false) { $this->uadata['platform'] = 'Macintosh'; }
+      elseif (strpos($this->uadata['os'], 'Linux') !== false) { $this->uadata['platform'] = 'Linux'; }
+      elseif (strpos($this->uadata['os'], 'Solaris') !== false) { $this->uadata['platform'] = 'Solaris'; }
+      elseif (strpos($this->uadata['os'], 'SunOS') !== false) { $this->uadata['platform'] = 'Solaris'; }
+      elseif (strpos($this->uadata['os'], 'BeOS') !== false) { $this->uadata['platform'] = 'BeOS'; }
+      elseif (strpos($this->uadata['os'], 'FreeBSD') !== false) { $this->uadata['platform'] = 'FreeBSD'; }
+      elseif (strpos($this->uadata['os'], 'OpenBSD') !== false) { $this->uadata['platform'] = 'OpenBSD'; }
+      elseif (strpos($this->uadata['os'], 'NetBSD') !== false) { $this->uadata['platform'] = 'NetBSD'; }
+      elseif (strpos($this->uadata['os'], 'AIX') !== false) { $this->uadata['platform'] = 'AIX'; }
+      elseif (strpos($this->uadata['os'], 'IRIX') !== false) { $this->uadata['platform'] = 'IRIX'; }
+      elseif (strpos($this->uadata['os'], 'HP-UX') !== false) { $this->uadata['platform'] = 'HP-UX'; }
+      elseif (strpos($this->uadata['os'], 'AmigaOS') !== false) { $this->uadata['platform'] = 'Amiga'; }
+      elseif (strpos($this->uadata['os'], 'OpenVMS') !== false) { $this->uadata['platform'] = 'OpenVMS'; }
+      elseif (strpos($this->uadata['os'], 'Warp') !== false) { $this->uadata['platform'] = 'OS/2'; }
+      elseif (strpos($this->uadata['os'], 'SymbianOS') !== false) { $this->uadata['platform'] = 'SymbianOS'; }
+      elseif (strpos($this->uadata['os'], 'CYGWIN') !== false) { $this->uadata['platform'] = 'Windows'; }
+      else { $this->uadata['platform'] = $this->uadata['os']; }
 
       $this->uadata['lang'] = str_replace('_', '-', $this->uadata['lang']);
     }