From a5813ca35f886603ebcba995c1563bc1e751c538 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 18 Mar 2004 20:40:28 +0000 Subject: [PATCH] add an MPL/LGPL/GPL tri-license boilerplate, also handle Camino and Firefox browsers as such (were detected as Mozilla previously) --- include/classes/useragent.php-class | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/classes/useragent.php-class b/include/classes/useragent.php-class index 9ac48da..a78c190 100755 --- a/include/classes/useragent.php-class +++ b/include/classes/useragent.php-class @@ -1,4 +1,40 @@ + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + class userAgent { // userAgent PHP class // get user agent and tell us what Browser is accessing @@ -53,12 +89,14 @@ class userAgent { // Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/51 (like Gecko) Safari/51 // Lynx/2.8.4rel.1 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/0.9.6g // Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.0.1) Gecko/20021109 Chimera/0.6+ + // Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.7b) Gecko/20040302 Camino/0.7+ // Mozilla/5.0 (Windows; U; Win 9x 4.90; en-US; rv:1.3a) Gecko/20021207 Phoenix/0.5 // Mozilla/5.0 Galeon/1.2.7 (X11; Linux i686; U;) Gecko/20021204 // Mozilla/4.0 (compatible; MSIE 5.0; Windows XP) Opera 6.05 [ja] // Mozilla/4.0 (compatible; MSIE 5.12; Mac_PowerPC) OmniWeb/4.1.1-v424.6 // Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4b) Gecko/20030516 Mozilla Firebird/0.6 // Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firebird/0.6.1 + // Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7a) Gecko/20040216 Firefox/0.8.0+ // Python-urllib/1.15 // *** search bots: *** // W3C_Validator/1.305.2.12 libwww-perl/5.64 @@ -142,6 +180,10 @@ class userAgent { $this->brand = "Chimera"; $this->version = $regs[1]; } + elseif (ereg("Camino/([0-9a-zA-Z\.+]+)", $this->uastring, $regs)) { + $this->brand = "Camino"; + $this->version = $regs[1]; + } elseif (ereg("Phoenix/([0-9a-zA-Z\.+]+)", $this->uastring, $regs)) { $this->brand = "Phoenix"; $this->version = $regs[1]; @@ -150,6 +192,10 @@ class userAgent { $this->brand = "Mozilla Firebird"; $this->version = $regs[1]; } + elseif (ereg("Firefox/([0-9a-zA-Z\.+]+)", $this->uastring, $regs)) { + $this->brand = "Firefox"; + $this->version = $regs[1]; + } elseif (ereg("Galeon/([0-9a-zA-Z\.+]+)", $this->uastring, $regs)) { $this->brand = "Galeon"; $this->version = $regs[1]; -- 2.43.0