projects
/
php-utility-classes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some data fetched from RRD; make RRD fetch actually return data correctly
[php-utility-classes.git]
/
include
/
classes
/
useragent.php-class
diff --git
a/include/classes/useragent.php-class
b/include/classes/useragent.php-class
index a70915de827d03b4f726f544e2a425e8c253d92e..9026179b8ed99bfe0855c769241ecb95020b207f 100755
(executable)
--- a/
include/classes/useragent.php-class
+++ b/
include/classes/useragent.php-class
@@
-363,6
+363,7
@@
class userAgent {
$this->brand = 'Edge';
$this->version = $regs[1];
$this->bot = false;
$this->brand = 'Edge';
$this->version = $regs[1];
$this->bot = false;
+ $this->mobile = preg_match('| Mobile |', $this->uastring);
}
elseif (preg_match('|Chromium/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
$this->brand = 'Chromium';
}
elseif (preg_match('|Chromium/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
$this->brand = 'Chromium';
@@
-410,6
+411,12
@@
class userAgent {
$this->bot = true;
$this->mobile = true;
}
$this->bot = true;
$this->mobile = true;
}
+ elseif (preg_match('|FxiOS/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
+ $this->brand = 'Firefox for iOS';
+ $this->version = $regs[1];
+ $this->bot = false;
+ $this->mobile = true;
+ }
elseif (preg_match('|Safari/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
if (preg_match('| Mobile(/[0-9a-zA-Z\.+]+)? ?Safari/|', $this->uastring)) {
$this->brand = 'Mobile Safari';
elseif (preg_match('|Safari/([0-9a-zA-Z\.+]+)|', $this->uastring, $regs)) {
if (preg_match('| Mobile(/[0-9a-zA-Z\.+]+)? ?Safari/|', $this->uastring)) {
$this->brand = 'Mobile Safari';
@@
-1197,6
+1204,11
@@
class userAgent {
$this->uadata['eng_version'] = $regs[2];
$this->mobile = ($regs[1] == 'Mobile');
}
$this->uadata['eng_version'] = $regs[2];
$this->mobile = ($regs[1] == 'Mobile');
}
+ elseif (preg_match('#Mozilla/5.0 \(([^;]+); Viera; rv:([^\);]+)\)#', $this->uastring, $regs)) {
+ $this->uadata['os'] = 'Firefox OS (TV, '.$regs[1].')';
+ $this->uadata['lang'] = null;
+ $this->uadata['eng_version'] = $regs[2];
+ }
elseif (preg_match('|Mozilla/5.0 \(([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) {
if ((strpos($regs[2], 'Linux') !== false) && ($regs[1] != 'X11')) {
$this->uadata['os'] = $regs[1].' ('.$regs[2].')';
elseif (preg_match('|Mozilla/5.0 \(([^;]+); ([^;]+); rv:([^\);]+)\)|', $this->uastring, $regs)) {
if ((strpos($regs[2], 'Linux') !== false) && ($regs[1] != 'X11')) {
$this->uadata['os'] = $regs[1].' ('.$regs[2].')';
@@
-1238,6
+1250,9
@@
class userAgent {
if (preg_match('#Mozilla/5.0 \(([^;]+); (WOW64|Win64); ([^\);]+)\)#', $this->uastring, $regs)) {
$this->uadata['os'] = $regs[1].' ('.$regs[2].')';
}
if (preg_match('#Mozilla/5.0 \(([^;]+); (WOW64|Win64); ([^\);]+)\)#', $this->uastring, $regs)) {
$this->uadata['os'] = $regs[1].' ('.$regs[2].')';
}
+ elseif (preg_match('#Mozilla/5.0 \(([^;]+Phone[^;]+); [^\)]+\)#i', $this->uastring, $regs)) {
+ $this->uadata['os'] = $regs[1];
+ }
}
elseif ($this->hasEngine('trident') || $this->hasEngine('tasman')) {
if (preg_match('/Mozilla\/[^\(]+ \((IE [^;]+[^\)]*; )?((?:Mac|Win)[^;]+); ?(Win64|WOW64); ?Trident\/([^;\)]+);/i', $this->uastring, $regs)) {
}
elseif ($this->hasEngine('trident') || $this->hasEngine('tasman')) {
if (preg_match('/Mozilla\/[^\(]+ \((IE [^;]+[^\)]*; )?((?:Mac|Win)[^;]+); ?(Win64|WOW64); ?Trident\/([^;\)]+);/i', $this->uastring, $regs)) {