extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

IE changed its USER_AGENT string; html:: report trident; change this to msie when detected, to match the use of msie throughout egroupware; use moonocolor as fallback skin, when ie anf ff are detected

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-17 13:56:17 +00:00
parent a861f16565
commit 1c013e92f0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -166,7 +166,7 @@ class egw_ckeditor_config
{ {
//Get the skin name //Get the skin name
$skin = $GLOBALS['egw_info']['user']['preferences']['common']['rte_skin']; $skin = $GLOBALS['egw_info']['user']['preferences']['common']['rte_skin'];
//error_log(__METHOD__.__LINE__.' UserAgent:'.html::$user_agent);
//Convert old fckeditor skin names to new ones //Convert old fckeditor skin names to new ones
switch ($skin) switch ($skin)
{ {
@ -178,7 +178,8 @@ class egw_ckeditor_config
case 'kama': case 'kama':
case 'default': case 'default':
$skin = "kama"; $skin = "kama";
if (html::$user_agent != 'firefox') break; // firefox and msie fail on kama skin
if (!(html::$user_agent == 'firefox' || html::$user_agent == 'msie')) break;
case 'moonocolor': case 'moonocolor':
$skin = "moonocolor"; $skin = "moonocolor";
break; break;

3
phpgwapi/inc/class.html.inc.php
View File

@ -69,6 +69,9 @@ class html
} }
list(,self::$user_agent,self::$ua_version) = $parts; list(,self::$user_agent,self::$ua_version) = $parts;
if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera'; if ((self::$user_agent = strtolower(self::$user_agent)) == 'version') self::$user_agent = 'opera';
// current IE may report its engine as USER_AGENT string
if (self::$user_agent=='trident') self::$user_agent='msie';
self::$ua_mobile = preg_match('/(iPhone|iPad|Android|SymbianOS)/i',$_SERVER['HTTP_USER_AGENT']); self::$ua_mobile = preg_match('/(iPhone|iPad|Android|SymbianOS)/i',$_SERVER['HTTP_USER_AGENT']);
self::$netscape4 = self::$user_agent == 'mozilla' && self::$ua_version < 5; self::$netscape4 = self::$user_agent == 'mozilla' && self::$ua_version < 5;