Jelajahi Sumber

! Moved browser detection to its own file and class Class-BrowserDetect.php. Supports newer versions of browsers and more mobile detection.
! Added id="" tag which has the users browser name for use in css files

Spuds 12 tahun lalu
induk
melakukan
822404765c
5 mengubah file dengan 389 tambahan dan 115 penghapusan
  1. 1 0
      SSI.php
  2. 380 0
      Sources/Class-BrowserDetect.php
  3. 5 113
      Sources/Load.php
  4. 2 2
      Themes/default/index.template.php
  5. 1 0
      index.php

+ 1 - 0
SSI.php

@@ -66,6 +66,7 @@ require_once($sourcedir . '/Errors.php');
 require_once($sourcedir . '/Logging.php');
 require_once($sourcedir . '/Load.php');
 require_once($sourcedir . '/Security.php');
+require_once($sourcedir . '/Class-BrowserDetect.php');
 
 // Using an pre-PHP 5.1 version?
 if (version_compare(PHP_VERSION, '5.1', '<'))

+ 380 - 0
Sources/Class-BrowserDetect.php

@@ -0,0 +1,380 @@
+<?php
+
+/**
+ * This class is an experiment for the job of correctly detecting browsers and settings
+ * needed for them.
+ * - Detects the following browsers
+ * - Opera, Webkit, Firefox, Web_tv, Konqueror, IE, Gecko
+ * - Webkit variants: Chrome, iphone, blackberry, android, safari, ipad, ipod
+ * - Opera Versions: 6, 7, 8, 9, 10 and mobile mini and mobi
+ * - Firefox Versions: 1, 2, 3 .... 11 ...
+ * - Chrome Versions: 1 ... 18 ...
+ * - IE Versions: 4, 5, 5.5, 6, 7, 8, 9, 10 mobile and Mac
+ * - Nokia 
+ */
+ 
+if (!defined('SMF'))
+	die('Hacking attempt...');
+
+class browser_detector
+{
+	/**
+	 * Holds all browsers information. Its contents will be placed into $context['browser'].
+	 *
+	 * @var array
+	 */
+	private $_browsers = null;
+	private $_is_mobile = null;
+
+	/**
+	 * The main method of this class, you know the one that does the job: detect the thing.
+	 *  - determines the user agent (browser) as best it can.
+	 */
+	function detectBrowser()
+	{
+		global $context, $user_info;
+
+		// Init
+		$this->_browsers = array();
+		$this->_is_mobile = false;
+
+		// Initialize some values we'll set differently if necessary...
+		$this->_browsers['needs_size_fix'] = false;
+
+		// One at a time, one at a time, and in this order too
+		if ($this->isOpera())
+			$this->setupOpera();
+		// Them webkits need to be set up too
+		elseif ($this->isWebkit())
+			$this->setupWebkit();
+		// We may have work to do on Firefox...
+		elseif ($this->isFirefox())
+			$this->setupFirefox();
+		// Old friend, old frenemy
+		elseif ($this->isIe())
+			$this->setupIe();
+		
+		// Just a few mobile checks
+		$this->isOperaMini();
+		$this->isOperaMobi();
+
+		// Be you robot or human?
+		if ($user_info['possibly_robot'])
+		{
+			// This isn't meant to be reliable, it's just meant to catch most bots to prevent PHPSESSID from showing up.
+			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
+
+			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register'))) || !$user_info['is_guest'])
+				$this->_browsers['possibly_robot'] = false;
+		}
+		else
+			$this->_browsers['possibly_robot'] = false;
+
+		// Fill out the historical array as needed to support old mods that don't use isBrowser
+		$this->fillInformation();
+
+		// Last step ...
+		$this->setupBrowserPriority();
+
+		// Now see what you've done!
+		$context['browser'] = $this->_browsers;
+	}
+
+	/**
+	* Determine if the browser is Opera or not
+	* @return boolean true if the browser is Opera otherwise false
+	*/
+	function isOpera()
+	{
+		if (!isset($this->_browsers['is_opera']))
+			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		return $this->_browsers['is_opera'];
+	}
+
+	/**
+	* Determine if the browser is IE or not
+	* @return boolean true if the browser is IE otherwise false
+	*/
+	function isIe()
+	{
+		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
+		if (!isset($this->_browsers['is_ie']))
+			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		return $this->_browsers['is_ie'];
+	}
+
+	/**
+	* Determine if the browser is a Webkit based one or not
+	* @return boolean true if the browser is Webkit based otherwise false
+	*/
+	function isWebkit()
+	{
+		if (!isset($this->_browsers['is_webkit']))
+			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		return $this->_browsers['is_webkit'];
+	}
+
+	/**
+	* Determine if the browser is Firefox or one of its variants
+	* @return boolean true if the browser is Firefox otherwise false
+	*/
+	function isFirefox()
+	{
+		if (!isset($this->_browsers['is_firefox']))
+			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		return $this->_browsers['is_firefox'];
+	}
+
+	/**
+	* Determine if the browser is WebTv or not
+	* @return boolean true if the browser is WebTv otherwise false
+	*/
+	function isWebTv()
+	{
+		if (!isset($this->_browsers['is_web_tv']))
+			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		return $this->_browsers['is_web_tv'];
+	}
+
+	/**
+	* Determine if the browser is konqueror or not
+	* @return boolean true if the browser is konqueror otherwise false
+	*/
+	function isKonqueror()
+	{
+		if (!isset($this->_browsers['is_konqueror']))
+			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		return $this->_browsers['is_konqueror'];
+	}
+
+	/**
+	* Determine if the browser is Gecko or not
+	* @return boolean true if the browser is Gecko otherwise false
+	*/
+	function isGecko()
+	{
+		if (!isset($this->_browsers['is_gecko']))
+			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		return $this->_browsers['is_gecko'];
+	}
+
+	/**
+	* Determine if the browser is OperaMini or not
+	* @return boolean true if the browser is OperaMini otherwise false
+	*/
+	function isOperaMini()
+	{
+		if (!isset($this->_browsers['is_opera_mini']))
+			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		if ($this->_browsers['is_opera_mini'])
+			$this->_is_mobile = true;
+		return $this->_browsers['is_opera_mini'];
+	}
+
+	/**
+	* Determine if the browser is OperaMobi or not
+	* @return boolean true if the browser is OperaMobi otherwise false
+	*/
+	function isOperaMobi()
+	{
+		if (!isset($this->_browsers['is_opera_mobi']))
+			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		if ($this->_browsers['is_opera_mobi'])
+			$this->_is_mobile = true;
+		return $this->_browsers['is_opera_mini'];
+	}
+
+	/**
+	 * Detect Safari / Chrome / iP[ao]d / iPhone / Android / Blackberry from webkit.
+	 *  - set the browser version for Safari and Chrome
+	 *  - set the mobile flag for mobile based useragents
+	 */
+	private function setupWebkit()
+	{
+		$this->_browsers += array(
+			'is_chrome' => strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== false,
+			'is_iphone' => (strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'iPod') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') === false,
+			'is_blackberry' => stripos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'PlayBook') !== false,
+			'is_android' => strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false,
+			'is_nokia' => strpos($_SERVER['HTTP_USER_AGENT'], 'SymbianOS') !== false,
+		);
+
+		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
+			$this->_is_mobile = true;
+
+		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
+		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
+		$this->_browsers['is_ipad'] = strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false;
+
+		// if Chrome, get the major version
+		if ($this->_browsers['is_chrome'])
+		{
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+		}
+
+		// or if Safari get its major version
+		if ($this->_browsers['is_safari'])
+		{
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+		}
+	}
+
+	/**
+	 * Additional IE checks and settings.
+	 *  - determines the version of the IE browser in use
+	 *  - detects ie4 onward
+	 *  - attempts to distinguish between IE and IE in compatabilty view
+	 *  - checks for old IE on macs as well, since we can
+	 */
+	private function setupIe()
+	{
+		$this->_browsers['is_ie_compat_view'] = false;
+
+		// get the version of the browser from the msie tag
+		if (preg_match('~MSIE\s?([0-9][0-9]?.[0-9])~i', $_SERVER['HTTP_USER_AGENT'], $msie_match) === 1)
+		{
+			$msie_match[1] = trim($msie_match[1]);
+			$msie_match[1] = (($msie_match[1] - (int) $msie_match[1]) == 0) ? (int) $msie_match[1] : $msie_match[1];
+			$this->_browsers['is_ie' . $msie_match[1]] = true;
+		}
+
+		// "modern" ie uses trident 4=ie8, 5=ie9, 6=ie10, even in compatability view
+		if (preg_match('~Trident/([0-9.])~i', $_SERVER['HTTP_USER_AGENT'], $trident_match) === 1)
+		{
+			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
+
+			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatablity view
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
+				$this->_browsers['is_ie_compat_view'] = true;
+		}
+
+		// Detect true IE6 and IE7 and not IE in compat mode.
+		$this->_browsers['is_ie7'] = !empty($this->_browsers['is_ie7']) && ($this->_browsers['is_ie_compat_view'] === false);
+		$this->_browsers['is_ie6'] = !empty($this->_browsers['is_ie6']) && ($this->_browsers['is_ie_compat_view'] === false);
+
+		// IE mobile 7 or 9, ... shucks why not
+		if ((!empty($this->_browsers['is_ie7']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/7') !== false) || (!empty($this->_browsers['is_ie9']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/9') !== false))
+		{
+			$this->_browsers['is_ie_mobi'] = true;
+			$this->_is_mobile = true;
+		}
+
+		// And some throwbacks to a bygone era, deposited here like cholesterol in your arteries
+		$this->_browsers += array(
+			'is_ie4' => !empty($this->_browsers['is_ie4']) && !$this->_browsers['is_web_tv'],
+			'is_mac_ie' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false
+		);
+
+		// Before IE8 we need to fix IE... lots!
+		$this->_browsers['ie_standards_fix'] = (($this->_browsers['is_ie6'] === true) || ($this->_browsers['is_ie7'] === true)) ? true : false;
+
+		// We may even need a size fix...
+		$this->_browsers['needs_size_fix'] = (!empty($this->_browsers['is_ie5']) || !empty($this->_browsers['is_ie5.5']) || !empty($this->_browsers['is_ie4'])) && !$this->_browsers['is_mac_ie'];
+	}
+
+	/**
+	 * Additional firefox checks.
+	 * - Gets the version of the FF browser in use
+	 * - Considers all FF variants as FF including IceWeasel, IceCat, Shiretoko and Minefiled
+	 */
+	private function setupFirefox()
+	{
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+	}
+
+	/**
+	 * More Opera checks if we are opera.
+	 *  - checks for the version of Opera in use
+	 *  - uses checks for 10 first and falls through to <9
+	 */
+	private function setupOpera()
+	{
+		// Opera 10+ uses the version tag at the end of the string
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
+			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
+			$this->_browsers['is_opera' . (int) $match[1]] = true;
+
+		// Needs size fix?
+		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
+	}
+
+	/**
+	 * Get the browser name that we will use in the <body id="this_browser">
+	 *  - The order of each browser in $browser_priority is important
+	 *  - if you want to have id='ie6' and not id='ie' then it must appear first in the list of ie browsers
+	 *  - only sets browsers that may need some help via css for compatablity
+	 */
+	private function setupBrowserPriority()
+	{
+		global $context;
+
+		if ($this->_is_mobile)
+			$context['browser_body_id'] = 'mobile';
+		else
+		{
+			$browser_priority = array(
+				'is_ie6' => 'ie6',
+				'is_ie7' => 'ie7',
+				'is_ie' => 'ie',
+				'is_firefox3' => 'firefox3',
+				'is_firefox4' => 'firefox4',
+				'is_firefox' => 'firefox',
+				'is_chrome' => 'chrome',
+				'is_safari' => 'safari',
+				'is_opera8' => 'opera8',
+				'is_opera9' => 'opera9',
+				'is_opera10' => 'opera10',
+				'is_konqueror' => 'konqueror',
+			);
+
+			$context['browser_body_id'] = 'smf';
+			$active = array_reverse(array_keys($this->_browsers, true));
+			foreach ($active as $key => $browser)
+			{
+				if (array_key_exists($browser, $browser_priority))
+				{
+					$context['browser_body_id'] = $browser_priority[$browser];
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Fill out the historical array
+	 *  - needed to support old mods that don't use isBrowser
+	 */
+	function fillInformation()
+	{
+		$this->_browsers += array(
+			'is_webkit' => false,
+			'is_opera6' => false,
+			'is_opera7' => false,
+			'is_opera8' => false,
+			'is_opera9' => false,
+			'is_opera10' => false,
+			'is_ie4' => false,
+			'is_mac_ie' => false,
+			'is_firefox1' => false,
+			'is_firefox2' => false,
+			'is_firefox3' => false,
+			'is_iphone' => false,
+			'is_android' => false,
+			'is_chrome' => false,
+			'is_safari' => false,
+			'is_ie8' => false,
+			'is_ie7' => false,
+			'is_ie6' => false,
+			'is_ie5.5' => false,
+			'is_ie5' => false,
+			'ie_standards_fix' => false,
+		);
+	}
+}

+ 5 - 113
Sources/Load.php

@@ -392,7 +392,7 @@ function loadUserSettings()
 		else
 		{
 			$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-			$user_info['possibly_robot'] = (strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') === false) || strpos($ci_user_agent, 'googlebot') !== false || strpos($ci_user_agent, 'slurp') !== false || strpos($ci_user_agent, 'crawl') !== false;
+			$user_info['possibly_robot'] = (strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') === false) || strpos($ci_user_agent, 'googlebot') !== false || strpos($ci_user_agent, 'slurp') !== false || strpos($ci_user_agent, 'crawl') !== false || strpos($ci_user_agent, 'msnbot') !== false;
 		}
 	}
 
@@ -1225,122 +1225,14 @@ function loadMemberContext($user, $display_custom_fields = false)
 
 /**
  * Loads information about what browser the user is viewing with and places it in $context
+ *  - uses the class from Class-BrowerDetect.php
  *
  */
 function detectBrowser()
 {
-	global $context, $user_info;
-
-	// The following determines the user agent (browser) as best it can.
-	$context['browser'] = array(
-		'is_opera' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false,
-		'is_webkit' => strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false,
-		'is_firefox' => preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1,
-		'is_web_tv' => strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false,
-		'is_konqueror' => strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false,
-	);
-
-	// <Insert corny Geico gecko comment here>.
-	$context['browser']['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$context['browser']['is_webkit'] && !$context['browser']['is_konqueror'];
-
-	// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-	$context['browser']['is_ie'] = !$context['browser']['is_opera'] && !$context['browser']['is_gecko'] && !$context['browser']['is_web_tv'] && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
-
-	// Detect Safari/Chrome/iP[ao]d/iPhone from webkit.
-	if ($context['browser']['is_webkit'])
-	{
-		$context['browser'] += array(
-			'is_chrome' => $context['browser']['is_webkit'] && strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== false,
-			'is_iphone' => strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'iPod') !== false,
-			'is_blackberry' => strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'PlayBook') !== false,
-			'is_android' => strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false,
-		);
-
-		$context['browser']['is_safari'] = !$context['browser']['is_chrome'] && strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false;
-		$context['browser']['is_ipad'] = $context['browser']['is_iphone'] && strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false;
-	}
-
-	// More Opera checks if we are opera.
-	if ($context['browser']['is_opera'])
-		$context['browser'] += array(
-			'is_opera6' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera 6') !== false,
-			'is_opera7' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera 7') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera/7') !== false,
-			'is_opera8' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera 8') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera/8') !== false,
-			'is_opera9' => preg_match('~Opera[ /]9(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT']) === 1,
-			'is_opera10' => preg_match('~Opera[ /]10\\.~', $_SERVER['HTTP_USER_AGENT']) === 1 || (preg_match('~Opera[ /]9\\.[89]~', $_SERVER['HTTP_USER_AGENT']) === 1 && preg_match('~Version/1[0-9]\\.~', $_SERVER['HTTP_USER_AGENT']) === 1),
-			'is_opera_mobi' => strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false,
-		);
-
-	// Additional firefox checks.
-	if ($context['browser']['is_firefox'])
-		$context['browser'] += array(
-			'is_firefox1' => preg_match('~(?:Firefox|Ice[wW]easel|IceCat)/1\\.~', $_SERVER['HTTP_USER_AGENT']) === 1,
-			'is_firefox2' => preg_match('~(?:Firefox|Ice[wW]easel|IceCat)/2\\.~', $_SERVER['HTTP_USER_AGENT']) === 1,
-			'is_firefox3' => preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/3\\.~', $_SERVER['HTTP_USER_AGENT']) === 1,
-		);
-
-	// Additional IE checks.
-	if ($context['browser']['is_ie'])
-	{
-		$context['browser'] += array(
-			'is_ie9' => strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/5.0') !== false,
-			'is_ie8' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8') !== false,
-			'is_ie_mobi' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/7') !== false,
-			'is_ie5.5' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.5') !== false,
-			'is_ie5' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.0') !== false,
-			'is_ie4' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 4') !== false && !$context['browser']['is_web_tv'],
-			'is_mac_ie' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false,
-		);
-
-		// Detect IE7 and not IE8/IE9 in combat mode.
-		$context['browser']['is_ie7'] = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false && !($context['browser']['is_ie8'] || $context['browser']['is_ie9']);
-
-		// Before IE8 we need to fix IE... lots!
-		$context['browser']['ie_standards_fix'] = ($context['browser']['is_ie8'] || $context['browser']['is_ie9']) ? false : true;
-
-		$context['browser']['is_ie6'] = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') !== false && !$context['browser']['is_ie8'] && !$context['browser']['is_ie7'];
-	}
-
-	$context['browser']['needs_size_fix'] = false;
-	if ($context['browser']['is_ie'] || $context['browser']['is_opera'])
-		$context['browser']['needs_size_fix'] = (!empty($context['browser']['is_ie5']) || !empty($context['browser']['is_ie5.5']) || !empty($context['browser']['is_ie4']) || !empty($context['browser']['is_opera6'])) && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') === false;
-
-	// Be you robot or human?
-	if ($user_info['possibly_robot'])
-	{
-		// This isn't meant to be reliable, it's just meant to catch most bots to prevent PHPSESSID from showing up.
-		$context['browser']['possibly_robot'] = !empty($user_info['possibly_robot']);
-
-		// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-		if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register'))) || !$user_info['is_guest'])
-			$context['browser']['possibly_robot'] = false;
-	}
-	else
-		$context['browser']['possibly_robot'] = false;
-
-	// Fill out the rest as needed to support mods that don't use isBrowser
-	$context['browser'] += array(
-		'is_opera6' => false,
-		'is_opera7' => false,
-		'is_opera8' => false,
-		'is_opera9' => false,
-		'is_opera10' => false,
-		'is_ie4' => false,
-		'is_mac_ie' => false,
-		'is_firefox1' => false,
-		'is_firefox2' => false,
-		'is_firefox3' => false,
-		'is_iphone' => false,
-		'is_android' => false,
-		'is_chrome' => false,
-		'is_safari' => false,
-		'is_ie8' => false,
-		'is_ie7' => false,
-		'is_ie6' => false,
-		'is_ie5.5' => false,
-		'is_ie5' => false,
-		'ie_standards_fix' => false,
-	);
+	// Load the current user's browser of choice
+	$detector = new browser_detector;
+	$detector->detectBrowser();
 }
 
 /**

+ 2 - 2
Themes/default/index.template.php

@@ -155,7 +155,7 @@ function template_html_above()
 			$("ul.dropmenu").superfish(); 
 		});
 	// ]]></script>';
-		
+
 	// load in any javascript files from mods and themes
 	template_javascript();
 		
@@ -202,7 +202,7 @@ function template_html_above()
 
 	echo '
 </head>
-<body class="action_', !empty($context['current_action']) ? htmlspecialchars($context['current_action']) : (!empty($context['current_board']) ? 'messageindex' : (!empty($context['current_topic']) ? 'display' : 'home')),
+<body id="', $context['browser_body_id'], '" class="action_', !empty($context['current_action']) ? htmlspecialchars($context['current_action']) : (!empty($context['current_board']) ? 'messageindex' : (!empty($context['current_topic']) ? 'display' : 'home')),
 	!empty($context['current_board']) ? ' board_' . htmlspecialchars($context['current_board']) : '',
 	'"',
 	// Style per page.

+ 1 - 0
index.php

@@ -52,6 +52,7 @@ require_once($sourcedir . '/Errors.php');
 require_once($sourcedir . '/Logging.php');
 require_once($sourcedir . '/Load.php');
 require_once($sourcedir . '/Security.php');
+require_once($sourcedir . '/Class-BrowserDetect.php');
 
 // Using an pre-PHP 5.1 version?
 if (version_compare(PHP_VERSION, '5.1', '<'))