Author: ralfbecker
New Revision: 54056
URL: http://svn.stylite.de/viewvc/egroupware?rev=54056&view=rev
Log:
detecting MS Edge as html::$user_agent=“edge” and html::$ua_version=“12.*”, even if some report only “Mozilla/5.0 (Windows NT 10.0; Win64; x64)”
Modified:
trunk/phpgwapi/ (props changed)
trunk/phpgwapi/inc/class.html.inc.php
Propchange: trunk/phpgwapi/
— svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 22:43:08 2015
@@ -1,1 +1,1 @@
-/branches/14.2/phpgwapi:51494,51820,52602,52965,53099,53272,53317,53388,53515,53517
+/branches/14.2/phpgwapi:51494,51820,52602,52965,53099,53272,53317,53388,53515,53517,53634,54053,54055
Modified: trunk/phpgwapi/inc/class.html.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.html.inc.php?rev=54056&r1=54055&r2=54056&view=diff
— trunk/phpgwapi/inc/class.html.inc.php (original)
+++ trunk/phpgwapi/inc/class.html.inc.php Mon Oct 26 22:43:08 2015
@@ -69,7 +69,7 @@
$parts = array_pop($all_parts);
foreach($all_parts as $p)
{
-
if ($p[1] == 'Chrome')
-
if ($p[1] == 'Chrome' && $parts[1] != 'Edge') { $parts = $p; break;
@@ -90,6 +90,12 @@
if (self::$user_agent == ‘iceweasel’)
{
self::$user_agent = ‘firefox’;
-
} -
// MS Edge sometimes reports just "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" -
if (self::$user_agent == 'mozilla' && self::$ua_version == '5.0') -
{ -
self::$user_agent = 'edge'; -
self::$ua_version = '12.0'; } self::$ua_mobile = preg_match('/(iPhone|iPod|iPad|Android|SymbianOS|Blackberry|Kindle|Opera Mobi|Windows Phone)/i', $_SERVER['HTTP_USER_AGENT'], $matches) ? strtolower($matches[1]) : null;
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs