elkarte / Elkarte

sources/BrowserDetector.class.php

Braces +85 added lines, -30 removed lines

@@ -88,16 +88,24 @@ 
 
 		// One at a time, one at a time, and in this order too
 		if ($this->isOpera())
-			$this->_setupOpera();
+		{
+					$this->_setupOpera();
+		}
 		// Them webkits need to be set up too
 		elseif ($this->isWebkit())
-			$this->_setupWebkit();
+		{
+					$this->_setupWebkit();
+		}
 		// We may have work to do on Firefox...
 		elseif ($this->isFirefox())
-			$this->_setupFirefox();
+		{
+					$this->_setupFirefox();
+		}
 		// Old friend, old frenemy
 		elseif ($this->isIe())
-			$this->_setupIe();
+		{
+					$this->_setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -120,7 +128,9 @@ 
 	public function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($this->_ua, 'Opera') !== false;
+		{
+					$this->_browsers['is_opera'] = strpos($this->_ua, 'Opera') !== false;
+		}
 
 		return $this->_browsers['is_opera'];
 	}
@@ -134,7 +144,9 @@ 
 	{
 		// 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('~Trident/\d+~', $this->_ua) === 1 || preg_match('~MSIE \d+~', $this->_ua) === 1);
+		{
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && (preg_match('~Trident/\d+~', $this->_ua) === 1 || preg_match('~MSIE \d+~', $this->_ua) === 1);
+		}
 
 		return $this->_browsers['is_ie'];
 	}
@@ -147,7 +159,9 @@ 
 	public function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($this->_ua, 'AppleWebKit') !== false;
+		{
+					$this->_browsers['is_webkit'] = strpos($this->_ua, 'AppleWebKit') !== false;
+		}
 
 		return $this->_browsers['is_webkit'];
 	}
@@ -160,7 +174,9 @@ 
 	public function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $this->_ua) === 1 && $this->isGecko();
+		{
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $this->_ua) === 1 && $this->isGecko();
+		}
 
 		return $this->_browsers['is_firefox'];
 	}
@@ -173,7 +189,9 @@ 
 	public function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($this->_ua, 'WebTV') !== false;
+		{
+					$this->_browsers['is_web_tv'] = strpos($this->_ua, 'WebTV') !== false;
+		}
 
 		return $this->_browsers['is_web_tv'];
 	}
@@ -186,7 +204,9 @@ 
 	public function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($this->_ua, 'Konqueror') !== false;
+		{
+					$this->_browsers['is_konqueror'] = strpos($this->_ua, 'Konqueror') !== false;
+		}
 
 		return $this->_browsers['is_konqueror'];
 	}
@@ -199,7 +219,9 @@ 
 	public function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($this->_ua, 'Gecko') !== false && strpos($this->_ua, 'like Gecko') === false && !$this->isWebkit() && !$this->isKonqueror();
+		{
+					$this->_browsers['is_gecko'] = strpos($this->_ua, 'Gecko') !== false && strpos($this->_ua, 'like Gecko') === false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 
 		return $this->_browsers['is_gecko'];
 	}
@@ -212,9 +234,13 @@ 
 	public function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($this->_ua, 'opera mini') !== false);
+		{
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($this->_ua, 'opera mini') !== false);
+		}
 		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		{
+					$this->_is_mobile = true;
+		}
 
 		return $this->_browsers['is_opera_mini'];
 	}
@@ -227,9 +253,13 @@ 
 	public function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($this->_ua, 'opera mobi') !== false;
+		{
+					$this->_browsers['is_opera_mobi'] = stripos($this->_ua, 'opera mobi') !== false;
+		}
 		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		{
+					$this->_is_mobile = true;
+		}
 
 		return $this->_browsers['is_opera_mini'];
 	}
@@ -246,16 +276,20 @@ 
 		// Be you robot or human?
 		if (!isset($this->_browsers['possibly_robot']))
 		{
-			if (isset($user_info['possibly_robot'])) {
+			if (isset($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;
+				{
+									$this->_browsers['possibly_robot'] = false;
+				}
+			}
+			else {
+							$this->_browsers['possibly_robot'] = false;
 			}
-			else
-				$this->_browsers['possibly_robot'] = false;
 		}
 
 		return $this->_browsers['possibly_robot'];
@@ -281,12 +315,16 @@ 
 
 		// 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;
+		{
+					$this->_is_mobile = true;
+		}
 
 		// iPad and droid tablets get a tablet flag
 		$this->_browsers['is_android_tablet'] = $this->_browsers['is_android'] && strpos($this->_ua, 'Mobile') === false;
 		if ($this->_browsers['is_ipad'] || $this->_browsers['is_android_tablet'])
-			$this->_is_tablet = true;
+		{
+					$this->_is_tablet = true;
+		}
 
 		// Prevent some repetition here
 		$_chrome = strpos($this->_ua, 'Chrome');
@@ -312,27 +350,36 @@ 
 		if ($this->_browsers['is_chrome'])
 		{
 			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			{
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 		elseif ($this->_browsers['is_edge'])
 		{
 			$this->_browsers['is_webkit'] = false;
 			if (preg_match('~edge[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_edge' . (int) $match[1]] = true;
+			{
+							$this->_browsers['is_edge' . (int) $match[1]] = true;
+			}
 		}
 		elseif ($this->_browsers['is_safari'])
 		{
 			if (preg_match('~version/?(.*)safari.*~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			{
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 		elseif ($this->_browsers['is_opera'])
 		{
-			if (preg_match('~OPR[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1) {
+			if (preg_match('~OPR[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
+			{
 				$this->_browsers['is_opera' . (int) trim($match[1])] = true;
 
 				// Since opera >= 15 wants to look like chrome, set the body to do just that
 				if (trim($match[1]) >= 15)
-					$this->_browsers['is_chrome'] = true;
+				{
+									$this->_browsers['is_chrome'] = true;
+				}
 			}
 		}
 	}
@@ -366,7 +413,9 @@ 
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
 			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			{
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// IE mobile, ... shucks why not
@@ -395,7 +444,9 @@ 
 	private function _setupFirefox()
 	{
 		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $this->_ua, $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		{
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 
 		// Firefox mobile
 		if (strpos($this->_ua, 'Android; Mobile;') !== false)
@@ -424,10 +475,14 @@ 
 	{
 		// Opera 10+ uses the version tag at the end of the string
 		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $this->_ua, $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		{
+					$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])~', $this->_ua, $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		{
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 	}
 
 	/**