[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.browser.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.browser.inc.php |
Date: |
Tue, 29 Aug 2006 08:03:38 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/08/29 08:03:38
Modified files:
inc : class.browser.inc.php
Log message:
E_NOTICE, fix version for gecko brosers, clean up is_mobile
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.browser.inc.php?cvsroot=phpgwapi&r1=1.20&r2=1.21
Patches:
Index: class.browser.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.browser.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.browser.inc.php 28 Aug 2006 13:39:18 -0000 1.20
+++ class.browser.inc.php 29 Aug 2006 08:03:37 -0000 1.21
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage network
- * @version $Id: class.browser.inc.php,v 1.20 2006/08/28 13:39:18
sigurdne Exp $
+ * @version $Id: class.browser.inc.php,v 1.21 2006/08/29 08:03:37
skwashd Exp $
* @internal Majority of code borrowed from Sourceforge 2.5
*/
@@ -48,9 +48,9 @@
$this->BROWSER_VER = $log_version[1];
$this->BROWSER_AGENT = 'iCab';
}
-
elseif(ereg('Gecko',$_SERVER['HTTP_USER_AGENT'],$log_version))
+ elseif(eregi('Gecko/([0-9]{8})',
$_SERVER['HTTP_USER_AGENT'], $log_version))
{
- $this->BROWSER_VER = $log_version[1];
+ $this->BROWSER_VER = $log_version[1];//this
is the gecko engine date, not the derivative product version number
$this->BROWSER_AGENT = 'MOZILLA';
}
elseif(ereg('Konqueror/([0-9].[0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version)
||
@@ -292,18 +292,12 @@
/**
* Determine whether the browser is wml-capable or not
+ *
* @return bool is wml-capable
*/
function is_mobile()
{
- if (stripos ( $_SERVER['HTTP_ACCEPT'],
'text/vnd.wap.wml' ))
- {
- return true;
- }
- else
- {
- return false;
- }
+ return stripos($_SERVER['HTTP_ACCEPT'],
'text/vnd.wap.wml') > 0;
}
}
?>
- [Phpgroupware-cvs] phpgwapi/inc class.browser.inc.php,
Dave Hall <=