elkarte / Elkarte

sources/ext/PasswordHash.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 		$this->portable_hashes = $portable_hashes;
 
-		$this->random_state = microtime() . uniqid(rand(), TRUE);
+		$this->random_state = microtime() . uniqid(rand(), true);
 	}
 
 	private function get_random_bytes($count)
@@ -140,9 +140,9 @@ 
 		# consequently in lower iteration counts and hashes that are
 		# quicker to crack (by non-PHP code).
 		if (PHP_VERSION >= '5') {
-			$hash = md5($salt . $password, TRUE);
+			$hash = md5($salt . $password, true);
 			do {
-				$hash = md5($hash . $password, TRUE);
+				$hash = md5($hash . $password, true);
 			} while (--$count);
 		} else {
 			$hash = pack('H*', md5($salt . $password));

sources/ext/bad-behavior/bad-behavior/whitelist.inc.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 		}
 	}
 	if (@!empty($whitelists['url'])) {
-		if (strpos($package['request_uri'], "?") === FALSE) {
+		if (strpos($package['request_uri'], "?") === false) {
 			$request_uri = $package['request_uri'];
 		} else {
 			$request_uri = substr($package['request_uri'], 0, strpos($package['request_uri'], "?"));

sources/ext/bad-behavior/bad-behavior/core.inc.php

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -160,28 +160,28 @@ 
 		// Specific checks
 		@$ua = $package['user_agent'];
 		// Search engine checks come first
-		if (stripos($ua, "bingbot") !== FALSE || stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
+		if (stripos($ua, "bingbot") !== false || stripos($ua, "msnbot") !== false || stripos($ua, "MS Search") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_msnbot($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE || stripos($ua, "Google Web Preview") !== FALSE) {
+		} elseif (stripos($ua, "Googlebot") !== false || stripos($ua, "Mediapartners-Google") !== false || stripos($ua, "Google Web Preview") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_google($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Yahoo! Slurp") !== FALSE || stripos($ua, "Yahoo! SearchMonkey") !== FALSE) {
+		} elseif (stripos($ua, "Yahoo! Slurp") !== false || stripos($ua, "Yahoo! SearchMonkey") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_yahoo($package)) {
 				if ($r == 1) return false;	# whitelisted
 				return $r;
 			}
 			return false;
-		} elseif (stripos($ua, "Baidu") !== FALSE) {
+		} elseif (stripos($ua, "Baidu") !== false) {
 			require_once(BB2_CORE . "/searchengine.inc.php");
 			if ($r = bb2_baidu($package)) {
 				if ($r == 1) return false;	# whitelisted
@@ -190,34 +190,34 @@ 
 			return false;
 		}
 		// MSIE checks
-		if (stripos($ua, "; MSIE") !== FALSE) {
+		if (stripos($ua, "; MSIE") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
-			if (stripos($ua, "Opera") !== FALSE) {
+			if (stripos($ua, "Opera") !== false) {
 				if ($r = bb2_opera($package)) return $r;
 			} else {
 				if ($r = bb2_msie($package)) return $r;
 			}
-		} elseif (stripos($ua, "Konqueror") !== FALSE) {
+		} elseif (stripos($ua, "Konqueror") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_konqueror($package)) return $r;
-		} elseif (stripos($ua, "Opera") !== FALSE) {
+		} elseif (stripos($ua, "Opera") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_opera($package)) return $r;
-		} elseif (stripos($ua, "Safari") !== FALSE) {
+		} elseif (stripos($ua, "Safari") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_safari($package)) return $r;
-		} elseif (stripos($ua, "Lynx") !== FALSE) {
+		} elseif (stripos($ua, "Lynx") !== false) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_lynx($package)) return $r;
-		} elseif (stripos($ua, "MovableType") !== FALSE) {
+		} elseif (stripos($ua, "MovableType") !== false) {
 			require_once(BB2_CORE . "/movabletype.inc.php");
 			if ($r = bb2_movabletype($package)) return $r;
-		} elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla") == 0) {
+		} elseif (stripos($ua, "Mozilla") !== false && stripos($ua, "Mozilla") == 0) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/browser.inc.php");
 			if ($r = bb2_mozilla($package)) return $r;

sources/ext/bad-behavior/bad-behavior/searchengine.inc.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
 function bb2_google($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === FALSE) {
+	if (match_cidr($package['ip'], array("66.249.64.0/19", "64.233.160.0/19", "72.14.192.0/18", "203.208.32.0/19", "74.125.0.0/16", "216.239.32.0/19", "209.85.128.0/17")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return "f1182195";	# Hard fail
 	}
@@ -23,7 +23,7 @@ 
 function bb2_msnbot($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === FALSE) {
+	if (match_cidr($package['ip'], array("207.46.0.0/16", "65.52.0.0/14", "207.68.128.0/18", "207.68.192.0/20", "64.4.0.0/18", "157.54.0.0/15", "157.60.0.0/16", "157.56.0.0/14", "131.253.21.0/24", "131.253.22.0/23", "131.253.24.0/21", "131.253.32.0/20", "40.76.0.0/14")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return "e4de0453";	# Hard fail
 	}
@@ -39,7 +39,7 @@ 
 function bb2_yahoo($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === FALSE) {
+	if (match_cidr($package['ip'], array("202.160.176.0/20", "67.195.0.0/16", "203.209.252.0/24", "72.30.0.0/16", "98.136.0.0/14", "74.6.0.0/16")) === false) {
 		return false;	# Soft fail, must pass other screening
 		#return '71436a15';	# Hard fail
 	}
@@ -55,7 +55,7 @@ 
 function bb2_baidu($package)
 {
 	if (@is_ipv6($package['ip'])) return false;	# TODO
-	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === FALSE) {
+	if (match_cidr($package['ip'], array("119.63.192.0/21", "123.125.71.0/24", "180.76.0.0/16", "220.181.0.0/16")) === false) {
 		return false;	# Soft fail, must pass other screening
 	}
 	return 1;	# Real Baidu bot; bypass all other checks

sources/ext/bad-behavior/bad-behavior/post.inc.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -17,8 +17,8 @@ 
 	// Real ones do not contain Accept:, and have a charset defined
 	// Real WP trackbacks may contain Accept: depending on the HTTP
 	// transport being used by the sending host
-	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== FALSE) {
-		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "WordPress/") !== false) {
+		if (strpos($package['headers_mixed']['Content-Type'], "charset=") === false) {
 			return 'e3990b47';
 		}
 	}
@@ -33,7 +33,7 @@ 
 	// if ($r = bb2_blackhole($package)) return $r;
 
 	// MovableType needs specialized screening
-	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE) {
+	if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== false) {
 		if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
 			return "7d12528e";
 		}
@@ -48,7 +48,7 @@ 
 	// Catch a few completely broken spambots
 	foreach ($request_entity as $key => $value) {
 		$pos = strpos($key, "	document.write");
-		if ($pos !== FALSE) {
+		if ($pos !== false) {
 			return "dfd9b1ad";
 		}
 	}

sources/ext/bad-behavior/bad-behavior/common_tests.inc.php

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -5,14 +5,14 @@ 
 function bb2_protocol($settings, $package)
 {
 	// We should never see Expect: for HTTP/1.0 requests
-	if (array_key_exists('Expect', $package['headers_mixed']) && stripos($package['headers_mixed']['Expect'], "100-continue") !== FALSE && !strcmp($package['server_protocol'], "HTTP/1.0")) {
+	if (array_key_exists('Expect', $package['headers_mixed']) && stripos($package['headers_mixed']['Expect'], "100-continue") !== false && !strcmp($package['server_protocol'], "HTTP/1.0")) {
 		return "a0105122";
 	}
 
 	// Is it claiming to be HTTP/1.1?  Then it shouldn't do HTTP/1.0 things
 	// Blocks some common corporate proxy servers in strict mode
 	if ($settings['strict'] && !strcmp($package['server_protocol'], "HTTP/1.1")) {
-		if (array_key_exists('Pragma', $package['headers_mixed']) && strpos($package['headers_mixed']['Pragma'], "no-cache") !== FALSE && !array_key_exists('Cache-Control', $package['headers_mixed'])) {
+		if (array_key_exists('Pragma', $package['headers_mixed']) && strpos($package['headers_mixed']['Pragma'], "no-cache") !== false && !array_key_exists('Cache-Control', $package['headers_mixed'])) {
 			return "41feed15";
 		}
 	}
@@ -27,7 +27,7 @@ 
 	// First-gen Amazon Kindle is broken; Amazon has been notified 9/24/08
 	// NOTE: RFC 2965 is obsoleted by RFC 6265. Current software MUST NOT
 	// use Cookie2 or $Version in Cookie.
-	if (@strpos($package['headers_mixed']['Cookie'], '$Version=0') !== FALSE && !array_key_exists('Cookie2', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Kindle/") === FALSE) {
+	if (@strpos($package['headers_mixed']['Cookie'], '$Version=0') !== false && !array_key_exists('Cookie2', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Kindle/") === false) {
 		return '6c502ff1';
 	}
 	return false;
@@ -46,11 +46,11 @@ 
 	// Worse yet, some Javascript client-side apps do the same in
 	// blatant violation of the protocol and good sense.
 	// if (strpos($package['request_uri'], "#") !== FALSE || strpos($package['headers_mixed']['Referer'], "#") !== FALSE) {
-	if ($settings['strict'] && strpos($package['request_uri'], "#") !== FALSE) {
+	if ($settings['strict'] && strpos($package['request_uri'], "#") !== false) {
 		return "dfd9b1ad";
 	}
 	// A pretty nasty SQL injection attack on IIS servers
-	if (strpos($package['request_uri'], ";DECLARE%20@") !== FALSE) {
+	if (strpos($package['request_uri'], ";DECLARE%20@") !== false) {
 		return "dfd9b1ad";
 	}
 
@@ -59,7 +59,7 @@ 
 	// NOTE: this blocks the whois.sc bot. No big loss.
 	// Exceptions: MT (not fixable); LJ (refuses to fix; may be
 	// blocked again in the future); Facebook
-	if ($settings['strict'] && array_key_exists('Range', $package['headers_mixed']) && strpos($package['headers_mixed']['Range'], "=0-") !== FALSE) {
+	if ($settings['strict'] && array_key_exists('Range', $package['headers_mixed']) && strpos($package['headers_mixed']['Range'], "=0-") !== false) {
 		if (strncmp($ua, "MovableType", 11) && strncmp($ua, "URI::Fetch", 10) && strncmp($ua, "php-openid/", 11) && strncmp($ua, "facebookexternalhit", 19)) {
 			return "7ad04a8a";
 		}
@@ -75,14 +75,14 @@ 
 	// may be blocked again in the future)
 	if ($settings['strict'] &&
 		array_key_exists('via', $package['headers']) &&
-		strpos($package['headers']['via'],'Clearswift') === FALSE &&
-		strpos($ua,'CoralWebPrx') === FALSE) {
+		strpos($package['headers']['via'],'Clearswift') === false &&
+		strpos($ua,'CoralWebPrx') === false) {
 		return "9c9e4979";
 	}
 
 	// pinappleproxy is used by referrer spammers
 	if (array_key_exists('Via', $package['headers_mixed'])) {
-		if (stripos($package['headers_mixed']['Via'], "pinappleproxy") !== FALSE || stripos($package['headers_mixed']['Via'], "PCNETSERVER") !== FALSE || stripos($package['headers_mixed']['Via'], "Invisiware") !== FALSE) {
+		if (stripos($package['headers_mixed']['Via'], "pinappleproxy") !== false || stripos($package['headers_mixed']['Via'], "PCNETSERVER") !== false || stripos($package['headers_mixed']['Via'], "Invisiware") !== false) {
 			return "939a6fbb";
 		}
 	}
@@ -111,7 +111,7 @@ 
 			return "a52f0448";
 		}
 		// Keep-Alive format in RFC 2068; some bots mangle these headers
-		if (stripos($package['headers_mixed']['Connection'], "Keep-Alive: ") !== FALSE) {
+		if (stripos($package['headers_mixed']['Connection'], "Keep-Alive: ") !== false) {
 			return "b0924802";
 		}
 	}
@@ -137,7 +137,7 @@ 
 		// Referer, if it exists, must contain a :
 		// While a relative URL is technically valid in Referer, all known
 		// legitimate user-agents send an absolute URL
-		if (strpos($package['headers_mixed']['Referer'], ":") === FALSE) {
+		if (strpos($package['headers_mixed']['Referer'], ":") === false) {
 			return "45b35e30";
 		}
 	}

sources/ext/bad-behavior/bad-behavior/functions.inc.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 // Quick and dirty check for an IPv6 address
 function is_ipv6($address) {
-	return (strpos($address, ":")) ? TRUE : FALSE;
+	return (strpos($address, ":")) ? true : false;
 }
 
 // stripos() needed because stripos is only present on PHP 5

sources/ext/bad-behavior/bad-behavior/blacklist.inc.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -168,13 +168,13 @@ 
 
 	foreach ($bb2_spambots_0 as $spambot) {
 		$pos = strpos($ua, $spambot);
-		if ($pos !== FALSE && $pos == 0) {
+		if ($pos !== false && $pos == 0) {
 			return "17f4e8c8";
 		}
 	}
 
 	foreach ($bb2_spambots as $spambot) {
-		if (strpos($ua, $spambot) !== FALSE) {
+		if (strpos($ua, $spambot) !== false) {
 			return "17f4e8c8";
 		}
 	}
@@ -186,10 +186,10 @@ 
 	}
 
 	foreach ($bb2_spambots_url as $spambot) {
-		if (stripos($uri, $spambot) !== FALSE) {
+		if (stripos($uri, $spambot) !== false) {
 			return "96c0bd29";
 		}
 	}
 
-	return FALSE;
+	return false;
 }

sources/ext/bad-behavior/bad-behavior/browser.inc.php

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -6,7 +6,7 @@ 
 {
 	// CafeKelsa is a dev project at Yahoo which indexes job listings for
 	// Yahoo! HotJobs. It identifies as Konqueror so we skip these checks.
-	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE) {
+	if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === false || match_cidr($package['ip'], "209.73.160.0/19") === false) {
 		if (!array_key_exists('Accept', $package['headers_mixed'])) {
 			return "17566707";
 		}
@@ -32,7 +32,7 @@ 
 	// Google Desktop fixed it, but apparently some old versions are
 	// still out there. :(
 	// Always check accept header for Mozilla user agents
-	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === false && strpos($package['headers_mixed']['User-Agent'], "PLAYSTATION 3") === false) {
 		if (!array_key_exists('Accept', $package['headers_mixed'])) {
 			return "17566707";
 		}
@@ -49,14 +49,14 @@ 
 	}
 
 	// MSIE does NOT send "Windows ME" or "Windows XP" in the user agent
-	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE) {
+	if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== false || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== false || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== false || strpos($package['headers_mixed']['User-Agent'], "Win32") !== false) {
 		return "a1084bad";
 	}
 
 	// MSIE does NOT send Connection: TE but Akamai does
 	// Bypass this test when Akamai detected
 	// The latest version of IE for Windows CE also uses Connection: TE
-	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === false && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
 		return "2b90f772";
 	}
 
@@ -78,7 +78,7 @@ 
 function bb2_safari($package)
 {
 	// Bypass this test when Android is detected
-	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === FALSE) {
+	if (!array_key_exists('Accept', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "Android") === false) {
 		return "17566707";
 	}
 	return false;