// appends an ExtendedDocument::createElementInputRange() as a child of this document (see there for params)
// returns the new child
//
+ // public function appendInputSearch($name, $maxlength, $size, [$id], [$value])
+ // appends an ExtendedDocument::createElementInputSearch() as a child of this document (see there for params)
+ // returns the new child
+ //
// public function appendInputUrl($name, $maxlength, $size, [$id], [$value])
// appends an ExtendedDocument::createElementInputUrl() as a child of this document (see there for params)
// returns the new child
// appends an ExtendedDocument::createElementLabel() as a child of this document (see there for params)
// returns the new child
//
+ // public function appendElementDatalist([$id], [$options])
+ // appends an ExtendedDocument::createElementDatalist() as a child of this document (see there for params)
+ // returns the new child
+ //
// public function appendText($text)
// appends a DOMDocument::createTextNode() as a child of this document (see there for params)
// returns the new child
// returns an ExtendedElement that is an HTML <input> of type 'url' with the given name, maxlength, size,
// and optionally id and value
//
+ // public function createElementInputSearch($name, $maxlength, $size, [$id], [$value])
+ // returns an ExtendedElement that is an HTML <input> of type 'search' with the given name, maxlength, size,
+ // and optionally id and value
+ //
// public function createElementInputEmail($name, $maxlength, $size, [$id], [$value])
// returns an ExtendedElement that is an HTML <input> of type 'email' with the given name, maxlength, size,
// and optionally id and value
// public function createElementLabel($for_id, $value)
// returns an ExtendedElement that is an HTML <label> with the given 'for' and value
//
+ // public function createElementDatalist([$id], [$options])
+ // returns an ExtendedElement that is an HTML <datalist> with optionally the given id and array of options (key => description)
+ //
// public function createElementStyle($styledata)
// returns an ExtendedElement that is an HTML <style> of CSS type with the style data inside
//
static function initHTML5($doc = null) {
if (is_null($doc)) { $doc = new ExtendedDocument(); }
- $doc->loadHTML5('<?xml version="1.0" encoding="utf-8"?><!DOCTYPE html><html></html>'); // this seems to be the only way to get the DOCTYPE set properly.
+ $doc->loadHTML5('<?xml version="1.0" encoding="utf-8"?>'."\n".'<!DOCTYPE html>'."\n".'<html></html>'); // this seems to be the only way to get the DOCTYPE set properly.
// Created basic HTML document structure.
$root = $doc->getElementsByTagName('html')->item(0);
public function loadHTML5($source) {
// Do our own handling of DOMDocument error reporting so we can ignore "unknown tags" which are usually fine in HTML5.
libxml_use_internal_errors(true);
- if (!preg_match('/^\s*<?xml /', $source)) {
+ if (!preg_match('/^\s*<\?xml /', $source)) {
// Add an XML declaration to force DOMDocument into UTF-8 mode.
$source = '<?xml version="1.0" encoding="utf-8"?>'."\n".$source;
}
$result = $this->loadHTML($source);
+ // Set encoding directly a,d remove any processing node that isn't the first node
+ $this->encoding = 'utf-8';
+ foreach ($this->childNodes as $i => $child) {
+ if ($i && $child->nodeType == XML_PI_NODE) {
+ $this->removeChild($child);
+ }
+ }
// Handle DOMDocument loading errors, throw away warnings on unknown tags as HTML5 allows all kinds.
$errseverity = array(LIBXML_ERR_WARNING => 'Warning', LIBXML_ERR_ERROR => 'Error', LIBXML_ERR_FATAL => 'Fatal');
foreach (libxml_get_errors() as $error) {
public function appendInputRange($name, $id, $min, $max, $step = null, $value = null) {
return $this->appendChild($this->createElementInputRange($name, $id, $min, $max, $step, $value));
}
+ public function appendInputSearch($name, $maxlength, $size, $id = null, $value = null) {
+ return $this->appendChild($this->createElementInputSearch($name, $maxlength, $size, $id, $value));
+ }
public function appendInputUrl($name, $maxlength, $size, $id = null, $value = null) {
return $this->appendChild($this->createElementInputUrl($name, $maxlength, $size, $id, $value));
}
public function appendLabel($for_id, $value) {
return $this->appendChild($this->createElementLabel($for_id, $value));
}
+ public function appendElementDatalist($id = null, $options = array()) {
+ return $this->appendChild($this->createElementDatalist($id, $options));
+ }
public function appendText($text) {
return $this->appendChild($this->createTextNode($text));
}
// Use loadHTML5() to parse and turn the markup into proper HTML.
$tmpdoc = new ExtendedDocument;
// The XML line is needed to tell the parser that we need UTF-8 parsing.
- $tmpdoc->loadHTML5('<?xml version="1.0" encoding="utf-8"?><!DOCTYPE html><html><body>'.$htmldata.'</body></html>');
+ $tmpdoc->loadHTML5('<?xml version="1.0" encoding="utf-8"?>'."\n".'<!DOCTYPE html>'."\n".'<html><body>'.$htmldata.'</body></html>');
foreach ($tmpdoc->getElementsByTagName('body')->item(0)->childNodes as $child) {
$parentNode->appendChild($this->importNode($child, true));
}
public function createElement($name, $value = '') {
// Adding the $value in DOMDocument's createElement does NOT escape it, so override it and use appendText to support that.
$aelem = parent::createElement($name);
- if (strlen($value)) { $aelem->appendText($value); }
+ if (strlen($value ?? '')) { $aelem->appendText($value); }
return $aelem;
}
return $rgfield;
}
+ public function createElementInputSearch($name, $maxlength, $size, $id = null, $value = null) {
+ $urlfield = $this->createElement('input');
+ $urlfield->setAttribute('type', 'search');
+ if (!is_null($id)) { $urlfield->setAttribute('id', $id); }
+ $urlfield->setAttribute('name', $name);
+ $urlfield->setAttribute('maxlength', $maxlength);
+ $urlfield->setAttribute('size', $size);
+ if (!is_null($value)) { $urlfield->setAttribute('value', $value); }
+ return $urlfield;
+ }
+
public function createElementInputUrl($name, $maxlength, $size, $id = null, $value = null) {
$urlfield = $this->createElement('input');
$urlfield->setAttribute('type', 'url');
public function createElementOption($key, $desc, $selected = false) {
$option = $this->createElement('option', $desc);
- $option->setAttribute('value', $key);
- if ($selected) { $option->setAttribute('selected', ''); }
+ if (is_numeric($key) || is_string($key)) {
+ $option->setAttribute('value', $key);
+ }
+ if ($selected) {
+ $option->setAttribute('selected', '');
+ }
return $option;
}
return $label;
}
+ public function createElementDatalist($id = null, $options = array()) {
+ $select = $this->createElement('datalist');
+ if (!is_null($id)) { $select->setAttribute('id', $id); }
+ foreach ($options as $key => $desc) {
+ $select->appendElementOption($key, $desc);
+ }
+ return $select;
+ }
+
public function createElementStyle($styledata) {
$style_elem = $this->createElement('style');
// Note: type can/should be left out for HTML5.
// appends an ExtendedDocument::createElementInputRange() as a child of this element (see there for params)
// returns the new child
//
+ // public function appendInputSearch($name, $maxlength, $size, [$id], [$value])
+ // appends an ExtendedDocument::createElementInputSearch() as a child of this element (see there for params)
+ // returns the new child
+ //
// public function appendInputUrl($name, $maxlength, $size, [$id], [$value])
// appends an ExtendedDocument::createElementInputUrl() as a child of this element (see there for params)
// returns the new child
// appends an ExtendedDocument::createElementLabel() as a child of this element (see there for params)
// returns the new child
//
+ // public function appendElementDatalist([$id], [$options])
+ // appends an ExtendedDocument::createElementDatalist() as a child of this element (see there for params)
+ // returns the new child
+ //
// public function appendText($text)
// appends a DOMDocument::createTextNode() as a child of this element (see there for params)
// returns the new child
public function appendInputRange($name, $id, $min, $max, $step = null, $value = null) {
return $this->appendChild($this->ownerDocument->createElementInputRange($name, $id, $min, $max, $step, $value));
}
+ public function appendInputSearch($name, $maxlength, $size, $id = null, $value = null) {
+ return $this->appendChild($this->ownerDocument->createElementInputSearch($name, $maxlength, $size, $id, $value));
+ }
public function appendInputUrl($name, $maxlength, $size, $id = null, $value = null) {
return $this->appendChild($this->ownerDocument->createElementInputUrl($name, $maxlength, $size, $id, $value));
}
public function appendLabel($for_id, $value) {
return $this->appendChild($this->ownerDocument->createElementLabel($for_id, $value));
}
+ public function appendElementDatalist($id = null, $options = array()) {
+ return $this->appendChild($this->ownerDocument->createElementDatalist($id, $options));
+ }
public function appendText($text) {
- return $this->appendChild($this->ownerDocument->createTextNode($text));
+ return $this->appendChild($this->ownerDocument->createTextNode($text ?? ''));
}
public function appendLinebreak() {
return $this->appendChild($this->ownerDocument->createElement('br'));
// appends an ExtendedDocument::createElementInputRange() as a child of this fragment (see there for params)
// returns the new child
//
+ // public function appendInputSearch($name, $maxlength, $size, [$id], [$value])
+ // appends an ExtendedDocument::createElementInputSearch() as a child of this fragment (see there for params)
+ // returns the new child
+ //
// public function appendInputUrl($name, $maxlength, $size, [$id], [$value])
// appends an ExtendedDocument::createElementInputUrl() as a child of this fragment (see there for params)
// returns the new child
// appends an ExtendedDocument::createElementLabel() as a child of this fragment (see there for params)
// returns the new child
//
+ // public function appendElementDatalist([$id], [$options])
+ // appends an ExtendedDocument::createElementDatalist() as a child of this fragment (see there for params)
+ // returns the new child
+ //
// public function appendText($text)
// appends a DOMDocument::createTextNode() as a child of this fragment (see there for params)
// returns the new child
public function appendInputRange($name, $id, $min, $max, $step = null, $value = null) {
return $this->appendChild($this->ownerDocument->createElementInputRange($name, $id, $min, $max, $step, $value));
}
+ public function appendInputSearch($name, $maxlength, $size, $id = null, $value = null) {
+ return $this->appendChild($this->ownerDocument->createElementInputSearch($name, $maxlength, $size, $id, $value));
+ }
public function appendInputUrl($name, $maxlength, $size, $id = null, $value = null) {
return $this->appendChild($this->ownerDocument->createElementInputUrl($name, $maxlength, $size, $id, $value));
}
public function appendLabel($for_id, $value) {
return $this->appendChild($this->ownerDocument->createElementLabel($for_id, $value));
}
+ public function appendElementDatalist($id = null, $options = array()) {
+ return $this->appendChild($this->ownerDocument->createElementDatalist($id, $options));
+ }
public function appendText($text) {
return $this->appendChild($this->ownerDocument->createTextNode($text));
}
if (in_array('to', $addrtype)) {
foreach ($this->recipients as $address) {
- if (strlen(@$address['mail'])) {
+ if (strlen($address['mail'] ?? '')) {
$mailaddresses[] = array('mail'=>$address['mail'],
'name'=>strlen($address['name'])?$address['name']:'',
'addrtype'=>'to');
}
if (in_array('cc', $addrtype)) {
foreach ($this->cc as $address) {
- if (strlen(@$address['mail'])) {
+ if (strlen($address['mail'] ?? '')) {
$mailaddresses[] = array('mail'=>$address['mail'],
'name'=>strlen($address['name'])?$address['name']:'',
'addrtype'=>'cc');
}
if (in_array('bcc', $addrtype)) {
foreach ($this->bcc as $address) {
- if (strlen(@$address['mail'])) {
+ if (strlen($address['mail'] ?? '')) {
$mailaddresses[] = array('mail'=>$address['mail'],
'name'=>strlen($address['name'])?$address['name']:'',
'addrtype'=>'bcc');
if (count($this->recipients)) {
$recpt = '';
foreach ($this->recipients as $address) {
- if (strlen(@$address['mail'])) {
+ if (strlen($address['mail'] ?? '')) {
if (strlen($address['name'])) { $recpt .= $this->mimeencode($address['name'], true).' <'.$address['mail'].'>,'; }
else { $recpt .= $address['mail'].','; }
}
// assemble configuration
$gconf = (array)$extra;
- if (!is_null($sub) && is_array($this->config_raw['graph.'.$sub])) {
+ if (!is_null($sub) && array_key_exists('graph.'.$sub, $this->config_raw) && is_array($this->config_raw['graph.'.$sub])) {
$gconf = $gconf + $this->config_raw['graph.'.$sub];
}
$gconf = $gconf + (array)$this->config_graph;
}
foreach (array('scale_time_src','scale_time_tgt') as $st) {
if (!isset($erow[$st]) || !is_numeric($erow[$st])) {
- switch (@$erow[$st]) {
+ switch ($erow[$st] ?? null) {
case 'dyn':
case 'auto':
$erow[$st] = $slice;
$legendlines = '';
foreach ($graphrows as $grow) {
$legendline = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
- $legendline .= '|'.@$grow['color'];
+ $legendline .= '|'.($grow['color'] ?? '');
$legendline .= '|'.(isset($grow['color_bg'])?$grow['color_bg']:'');
$legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:'');
$legendlines .= 'legend:'.$legendline."\n";
$pconf = $pconf + (array)$this->config_page;
$return = null;
- switch (@$pconf['type']) {
+ switch ($pconf['type'] ?? null) {
case 'index':
$return = $this->page_index($pconf);
break;
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
else { $sURL_add = '&sub=%s'; }
- $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
- $num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
- $num_rows = ceil(count($stats)/$num_cols);
+ $default_num_cols = $GLOBALS['ua']->isMobile() ? 1 : 2;
+ $num_cols = is_numeric($pconf['num_rows'] ?? null) ? $pconf['num_rows'] : $default_num_cols;
+ $num_rows = ceil(count($stats) / $num_cols);
$out .= '<table class="overview">'."\n";
for ($row = 0; $row < $num_rows; $row++) {
if ($idx < count($stats)) {
@list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2);
$s_psname = 'page'.(isset($s_psub)?'.'.$s_psub:'');
- $g_sub = @$this->config_all[$sname][$s_psname]['graph_sub'];
+ $g_sub = $this->config_all[$sname][$s_psname]['graph_sub'] ?? '';
if (isset($this->config_all[$sname][$s_psname]['title_page'])) {
$s_ptitle = $this->config_all[$sname][$s_psname]['title_page'];
foreach ($snames as $iname) {
$newstat = array('name'=>$iname);
$sfiles[] = isset($this->config_all[$iname]['file'])?$this->config_all[$iname]['file']:$iname.'.rrd';
- if (is_array(@$this->config_all[$iname])) {
+ if (is_array($this->config_all[$iname] ?? null)) {
foreach ($this->config_all[$iname] as $key=>$val) {
if (substr($key, 0, 5) == 'page.') { $newstat['sub'][] = substr($key, 5); }
}
private $version;
private $bot = false;
private $mobile = false;
- private $uadata = array();
+ private $uadata = [];
function __construct($ua_string = '') {
// *** constructor ***
$this->bot = false;
}
- $botArray = array('Scooter','Spinne','Vagabondo','Firefly','Scrubby','NG','Pompos','Szukacz','Schmozilla','42_HAL',
- 'NetResearchServer','LinkWalker','Zeus','W3C_Validator','ZyBorg','Ask Jeeves','ia_archiver',
- 'PingALink Monitoring Services','IlTrovatore-Setaccio','Nutch','Mercator','search.ch',
- 'appie','larbin','NutchCVS','Webchat','Mediapartners-Google','sitecheck.internetseer.com',
- 'FavOrg','findlinks','DataCha0s','ichiro','Francis','CoralWebPrx','DoCoMo','Ocelli','Sogou Video',
- 'Yandex','Yeti','Austronaut-URL-Checker');
+ $botArray = [
+ 'Scooter', 'Spinne', 'Vagabondo', 'Firefly', 'Scrubby', 'NG', 'Pompos', 'Szukacz', 'Schmozilla', '42_HAL',
+ 'NetResearchServer', 'LinkWalker', 'Zeus', 'W3C_Validator', 'ZyBorg', 'Ask Jeeves', 'ia_archiver', 'ichiro',
+ 'PingALink Monitoring Services', 'IlTrovatore-Setaccio', 'Nutch', 'Mercator', 'search.ch', 'appie', 'larbin',
+ 'NutchCVS', 'Webchat', 'Mediapartners-Google', 'sitecheck.internetseer.com', 'FavOrg', 'findlinks', 'DataCha0s',
+ 'Francis', 'CoralWebPrx', 'DoCoMo', 'Ocelli', 'Sogou Video', 'Yandex', 'Yeti', 'SEO Scanner', 'Feedbin feed-id',
+ 'Austronaut-URL-Checker', 'check_ssl_cert', 'check_http', 'vdirsyncer', 'FreshRSS', 'UniversalFeedParser',
+ 'Cloudflare Custom Hostname Verification', 'Scoop.it',
+ ];
if (in_array($this->brand, $botArray)) {
$this->bot = true;
}
}
- public function getBrand() { return $this->brand; }
- public function getVersion() { return $this->version; }
+ public function getBrand() {
+ return $this->brand;
+ }
+
+ public function getVersion() {
+ return $this->version;
+ }
public function getAcceptLanguages() {
if (!isset($this->uadata['accept-languages'])) {
$headers = getAllHeaders();
- $accLcomp = explode(',', @$headers['Accept-Language']);
- $accLang = array();
+ $accLcomp = explode(',', ($headers['Accept-Language'] ?? ''));
+ $accLang = [];
foreach ($accLcomp as $lcomp) {
if (strlen($lcomp)) {
$ldef = explode(';', $lcomp);
- $accLang[$ldef[0]] = (float)((strpos(@$ldef[1],'q=')===0)?substr($ldef[1],2):1);
+ if (count($ldef) > 1 && strpos($ldef[1], 'q=') === 0) {
+ $accLang[$ldef[0]] = substr($ldef[1], 2);
+ }
+ else {
+ $accLang[$ldef[0]] = 1;
+ }
}
}
$this->uadata['accept-languages'] = $accLang;
}
- return $this->uadata['accept-languages'];
+ return $this->uadata['accept-languages'];
}
- public function getUAString() { return $this->uastring; }
+ public function getUAString() {
+ return $this->uastring;
+ }
public function getEngine() {
// return gecko|khtml|trident|tasman|nscp|presto|gzilla|gtkhtml|links|icestorm|netfront|unknown
}
}
}
- return $this->uadata['engine'];
+ return $this->uadata['engine'];
}
- public function hasEngine($rnd_engine) { return ($this->getEngine() == $rnd_engine); }
+ public function hasEngine($rnd_engine) {
+ return ($this->getEngine() == $rnd_engine);
+ }
public function getEngineVersion() {
if (!isset($this->uadata['eng_version'])) {
// getOS() should get the date for us
$this->getOS();
}
- return $this->uadata['eng_version'];
+ return $this->uadata['eng_version'];
}
public function getOS() {
$this->uadata['lang'] = null;
$this->uadata['eng_version'] = null;
}
+ if (($this->brand == 'Firefox') && (intval($this->version) >= 110)) {
+ $this->uadata['eng_version'] = $this->version;
+ }
}
elseif ($this->hasEngine('edgehtml')) {
if (preg_match('#Mozilla/5.0 \(([^;]+); (WOW64|Win64); ([^\);]+)\)#', $this->uastring, $regs)) {
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('/iPhone OS ([\d_]+)/i', $this->uadata['os'], $regs)) { $this->uadata['os'] = 'iOS '.str_replace('_', '.', $regs[1]); }
- 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 (preg_match('/(?:web|hpw)OS\/([0-9a-zA-Z\._+]+)/i', $this->uadata['os'], $regs)) { $this->uadata['os'] = 'webOS '.$regs[1]; }
- elseif (preg_match('/Android \(Linux (.+)\)/i', $this->uadata['os'], $regs)) { $this->uadata['os'] = 'Android '.$regs[1]; }
- elseif (strpos($this->uadata['os'], 'linux') !== false) { $this->uadata['os'] = 'Linux'; }
+ elseif (preg_match('/iPhone OS ([\d_]+)/i', ($this->uadata['os'] ?? ''), $regs)) { $this->uadata['os'] = 'iOS '.str_replace('_', '.', $regs[1]); }
+ 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 (preg_match('/(?:web|hpw)OS\/([0-9a-zA-Z\._+]+)/i', ($this->uadata['os'] ?? ''), $regs)) { $this->uadata['os'] = 'webOS '.$regs[1]; }
+ elseif (preg_match('/Android \(Linux (.+)\)/i', ($this->uadata['os'] ?? ''), $regs)) { $this->uadata['os'] = 'Android '.$regs[1]; }
+ elseif (strpos($this->uadata['os'] ?? '', 'linux') !== false) { $this->uadata['os'] = 'Linux'; }
elseif (preg_match('/SymbianOS[\/ ]([0-9a-zA-Z\._+]+)/i', $this->uastring, $regs)) { $this->uadata['os'] = 'SymbianOS '.$regs[1]; }
- elseif (preg_match('/Symbian ?OS/i', $this->uadata['os'])) { $this->uadata['os'] = 'SymbianOS'; }
+ elseif (preg_match('/Symbian ?OS/i', ($this->uadata['os'] ?? ''))) { $this->uadata['os'] = 'SymbianOS'; }
- 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'], 'iOS') !== false) { $this->uadata['platform'] = 'Macintosh'; }
- elseif (strpos($this->uadata['os'], 'Linux') !== false) { $this->uadata['platform'] = 'Linux'; }
- elseif (strpos($this->uadata['os'], 'MeeGo') !== false) { $this->uadata['platform'] = 'Linux'; }
- elseif (strpos($this->uadata['os'], 'webOS') !== false) { $this->uadata['platform'] = 'Linux'; }
- elseif (strpos($this->uadata['os'], 'Android') !== false) { $this->uadata['platform'] = 'Android'; }
- elseif (strpos($this->uadata['os'], 'Firefox OS') !== false) { $this->uadata['platform'] = 'Firefox OS'; }
- 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'], 'BePC') !== 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'], 'webOS') !== false) { $this->uadata['platform'] = 'webOS'; }
- elseif (strpos($this->uadata['os'], 'Commodore 64') !== false) { $this->uadata['platform'] = 'C64'; }
- 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'], 'OS/2') !== false) { $this->uadata['platform'] = 'OS/2'; }
- elseif (strpos($this->uadata['os'], 'SymbianOS') !== false) { $this->uadata['platform'] = 'SymbianOS'; }
- elseif (strpos($this->uadata['os'], 'BlackBerry') !== false) { $this->uadata['platform'] = 'BlackBerry'; }
- elseif (strpos($this->uadata['os'], 'Gameboy') !== false) { $this->uadata['platform'] = 'Nintendo'; }
- elseif (strpos($this->uadata['os'], 'Wii') !== false) { $this->uadata['platform'] = 'Nintendo'; }
- elseif (strpos($this->uadata['os'], 'Nintendo') !== false) { $this->uadata['platform'] = 'Nintendo'; }
- elseif (strpos($this->uadata['os'], 'J2ME') !== false) { $this->uadata['platform'] = 'Java'; }
- elseif (strpos($this->uadata['os'], 'CYGWIN') !== false) { $this->uadata['platform'] = 'Windows'; }
- elseif (strpos($this->uadata['os'], 'mingw') !== false) { $this->uadata['platform'] = 'Windows'; }
+ 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'] ?? '', 'iOS') !== false) { $this->uadata['platform'] = 'Macintosh'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Linux') !== false) { $this->uadata['platform'] = 'Linux'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'MeeGo') !== false) { $this->uadata['platform'] = 'Linux'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'webOS') !== false) { $this->uadata['platform'] = 'Linux'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Android') !== false) { $this->uadata['platform'] = 'Android'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Firefox OS') !== false) { $this->uadata['platform'] = 'Firefox OS'; }
+ 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'] ?? '', 'BePC') !== 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'] ?? '', 'webOS') !== false) { $this->uadata['platform'] = 'webOS'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Commodore 64') !== false) { $this->uadata['platform'] = 'C64'; }
+ 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'] ?? '', 'OS/2') !== false) { $this->uadata['platform'] = 'OS/2'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'SymbianOS') !== false) { $this->uadata['platform'] = 'SymbianOS'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'BlackBerry') !== false) { $this->uadata['platform'] = 'BlackBerry'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Gameboy') !== false) { $this->uadata['platform'] = 'Nintendo'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Wii') !== false) { $this->uadata['platform'] = 'Nintendo'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Nintendo') !== false) { $this->uadata['platform'] = 'Nintendo'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'J2ME') !== false) { $this->uadata['platform'] = 'Java'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'CYGWIN') !== false) { $this->uadata['platform'] = 'Windows'; }
+ elseif (strpos($this->uadata['os'] ?? '', 'mingw') !== false) { $this->uadata['platform'] = 'Windows'; }
else { $this->uadata['platform'] = $this->uadata['os']; }
- if (strpos($this->uadata['os'], 'Windows Phone OS') !== false) { $this->mobile = true; }
- elseif (strpos($this->uadata['os'], 'Gameboy') !== false) { $this->mobile = true; }
+ if (strpos($this->uadata['os'] ?? '', 'Windows Phone OS') !== false) { $this->mobile = true; }
+ elseif (strpos($this->uadata['os'] ?? '', 'Gameboy') !== false) { $this->mobile = true; }
- $this->uadata['lang'] = str_replace('_', '-', @$this->uadata['lang']);
+ $this->uadata['lang'] = str_replace('_', '-', ($this->uadata['lang'] ?? ''));
}
}
- return $this->uadata['os'];
+ return $this->uadata['os'];
}
public function getPlatform() {
// getOS() should get the date for us
$this->getOS();
}
- return $this->uadata['platform'];
+ return $this->uadata['platform'];
}
public function getLanguage() {
// getOS() should get the date for us
$this->getOS();
}
- return $this->uadata['lang'];
+ return $this->uadata['lang'];
}
public function getGeckoDate() {
// getEngine() should get the date for us
$this->getEngine();
}
- return $this->uadata['geckodate'];
+ return $this->uadata['geckodate'];
}
public function getGeckoTime() {
if ($use_time) { date_default_timezone_set($old_tz); }
}
}
- return $this->uadata['geckotime'];
+ return $this->uadata['geckotime'];
}
- public function isBot() { return $this->bot; }
+ public function isBot() {
+ return $this->bot;
+ }
public function isMobile() {
if (!isset($this->uadata['os'])) {
projects / php-utility-classes.git / commitdiff