Performance 4 (plugins)

plugins/authentication/cookie/cookie.php

@@ -72,7 +72,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		$cookieArray = explode('.', $cookieValue);
 
 		// Check for valid cookie value
-		if (count($cookieArray) != 2)
+		if (count($cookieArray) !== 2)
 		{
 			// Destroy the cookie in the browser.
 			$this->app->input->cookie->set($cookieName, false, time() - 42000, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain'));
@@ -224,7 +224,7 @@ public function onUserAfterLogin($options)
 			return false;
 		}
 
-		if (isset($options['responseType']) && $options['responseType'] == 'Cookie')
+		if (isset($options['responseType']) && $options['responseType'] === 'Cookie')
 		{
 			// Logged in using a cookie
 			$cookieName = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
@@ -269,7 +269,7 @@ public function onUserAfterLogin($options)
 				{
 					$results = $this->db->setQuery($query)->loadResult();
 
-					if (is_null($results))
+					if ($results === null)
 					{
 						$unique = true;
 					}
@@ -279,7 +279,7 @@ public function onUserAfterLogin($options)
 					$errorCount++;
 
 					// We'll let this query fail up to 5 times before giving up, there's probably a bigger issue at this point
-					if ($errorCount == 5)
+					if ($errorCount === 5)
 					{
 						return false;
 					}

plugins/authentication/gmail/gmail.php

@@ -35,7 +35,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		$this->loadLanguage();
 
 		// No backend authentication
-		if (JFactory::getApplication()->isAdmin() && !$this->params->get('backendLogin', 0))
+		if (!$this->params->get('backendLogin', 0) && JFactory::getApplication()->isAdmin())
 		{
 			return;
 		}
@@ -65,7 +65,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		}
 
 		// Check if we have a username and password
-		if (strlen($credentials['username']) == 0 || strlen($credentials['password']) == 0)
+		if ($credentials['username'] === '' || $credentials['password'] === '')
 		{
 			$response->type          = 'GMail';
 			$response->status        = JAuthentication::STATUS_FAILURE;
@@ -191,7 +191,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 			foreach ($localUsers as $localUser)
 			{
 				// Local user exists with same username but different email address
-				if ($email != $localUser->email)
+				if ($email !== $localUser->email)
 				{
 					$response->status        = JAuthentication::STATUS_FAILURE;
 					$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('PLG_GMAIL_ERROR_LOCAL_USERNAME_CONFLICT'));

plugins/authentication/joomla/joomla.php

@@ -88,7 +88,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		}
 
 		// Check the two factor authentication
-		if ($response->status == JAuthentication::STATUS_SUCCESS)
+		if ($response->status === JAuthentication::STATUS_SUCCESS)
 		{
 			$methods = JAuthenticationHelper::getTwoFactorMethods();
 
@@ -115,7 +115,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 			}
 
 			// Check if the user has enabled two factor authentication
-			if (empty($otpConfig->method) || ($otpConfig->method == 'none'))
+			if (empty($otpConfig->method) || ($otpConfig->method === 'none'))
 			{
 				// Warn the user if they are using a secret code but they have not
 				// enabed two factor auth in their account.
@@ -166,7 +166,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 				// Did the user use an OTEP instead?
 				if (empty($otpConfig->otep))
 				{
-					if (empty($otpConfig->method) || ($otpConfig->method == 'none'))
+					if (empty($otpConfig->method) || ($otpConfig->method === 'none'))
 					{
 						// Two factor authentication is not enabled on this account.
 						// Any string is assumed to be a valid OTEP.

plugins/authentication/ldap/ldap.php

@@ -70,7 +70,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 			{
 				// Bind using Connect Username/password
 				// Force anon bind to mitigate misconfiguration like [#7119]
-				if (strlen($this->params->get('username')))
+				if ($this->params->get('username') !== '')
 				{
 					$bindtest = $ldap->bind();
 				}
@@ -82,9 +82,9 @@ public function onUserAuthenticate($credentials, $options, &$response)
 				if ($bindtest)
 				{
 					// Search for users DN
-					$binddata = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string')));
+					$binddata = $ldap->simple_search(str_replace('[search]', $credentials['username'], $this->params->get('search_string')));
 
-					if (isset($binddata[0]) && isset($binddata[0]['dn']))
+					if (isset($binddata[0], $binddata[0]['dn']))
 					{
 						// Verify Users Credentials
 						$success = $ldap->bind($binddata[0]['dn'], $credentials['password'], 1);
@@ -112,7 +112,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 
 				if ($success)
 				{
-					$userdetails = $ldap->simple_search(str_replace("[search]", $credentials['username'], $this->params->get('search_string')));
+					$userdetails = $ldap->simple_search(str_replace('[search]', $credentials['username'], $this->params->get('search_string')));
 				}
 				else
 				{
@@ -126,7 +126,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 		{
 			$response->status = JAuthentication::STATUS_FAILURE;
 
-			if (!strlen($response->error_message))
+			if ($response->error_message === '')
 			{
 				$response->error_message = JText::_('JGLOBAL_AUTH_INCORRECT');
 			}

plugins/captcha/recaptcha/recaptcha.php

@@ -40,12 +40,12 @@ public function onInit($id = 'dynamic_recaptcha_1')
 	{
 		$pubkey = $this->params->get('public_key', '');
 
-		if ($pubkey == null || $pubkey == '')
+		if ($pubkey === null || $pubkey === '')
 		{
 			throw new Exception(JText::_('PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY'));
 		}
 
-		if ($this->params->get('version', '1.0') == '1.0')
+		if ($this->params->get('version', '1.0') === '1.0')
 		{
 			JHtml::_('jquery.framework');
 
@@ -82,7 +82,7 @@ public function onInit($id = 'dynamic_recaptcha_1')
 	 */
 	public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = '')
 	{
-		if ($this->params->get('version', '1.0') == '1.0')
+		if ($this->params->get('version', '1.0') === '1.0')
 		{
 			return '<div id="' . $id . '" ' . $class . '></div>';
 		}
@@ -117,13 +117,13 @@ public function onCheckAnswer($code = null)
 			case '1.0':
 				$challenge = $input->get('recaptcha_challenge_field', '', 'string');
 				$response  = $input->get('recaptcha_response_field', '', 'string');
-				$spam      = ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0);
+				$spam      = ($challenge === null || $challenge === '' || $response === null || $response === '');
 				break;
 			case '2.0':
 				// Challenge Not needed in 2.0 but needed for getResponse call
 				$challenge = null;
 				$response  = $input->get('g-recaptcha-response', '', 'string');
-				$spam      = ($response == null || strlen($response) == 0);
+				$spam      = ($response === null || $response === '');
 				break;
 		}
 
@@ -226,7 +226,7 @@ private function getResponse($privatekey, $remoteip, $response, $challenge = nul
 	 */
 	private function _recaptcha_qsencode($data)
 	{
-		$req = "";
+		$req = '';
 
 		foreach ($data as $key => $value)
 		{
@@ -258,14 +258,14 @@ private function _recaptcha_http_post($host, $path, $data, $port = 80)
 		$http_request  = "POST $path HTTP/1.0\r\n";
 		$http_request .= "Host: $host\r\n";
 		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= 'Content-Length: ' . strlen($req) . "\r\n";
 		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
 		$http_request .= "\r\n";
 		$http_request .= $req;
 
 		$response = '';
 
-		if (($fs = @fsockopen($host, $port, $errno, $errstr, 10)) == false )
+		if (($fs = @fsockopen($host, $port, $errno, $errstr, 10)) === false )
 		{
 			die('Could not open socket');
 		}

plugins/captcha/recaptcha/recaptchalib.php

@@ -41,10 +41,10 @@ class JReCaptchaResponse
 
 class JReCaptcha
 {
-	private static $_signupUrl = "https://www.google.com/recaptcha/admin";
-	private static $_siteVerifyUrl = "https://www.google.com/recaptcha/api/siteverify";
+	private static $_signupUrl = 'https://www.google.com/recaptcha/admin';
+	private static $_siteVerifyUrl = 'https://www.google.com/recaptcha/api/siteverify';
 	private $_secret;
-	private static $_version = "php_1.0";
+	private static $_version = 'php_1.0';
 
 	/**
 	 * Constructor.
@@ -53,10 +53,10 @@ class JReCaptcha
 	 */
 	public function __construct($secret)
 	{
-		if ($secret == null || $secret == "")
+		if ($secret === null || $secret === '')
 		{
 			die("To use reCAPTCHA you must get an API key from <a href='"
-				. self::$_signupUrl . "'>" . self::$_signupUrl . "</a>");
+				. self::$_signupUrl . "'>" . self::$_signupUrl . '</a>');
 		}
 		$this->_secret = $secret;
 	}
@@ -70,7 +70,7 @@ public function __construct($secret)
 	 */
 	private function _encodeQS($data)
 	{
-		$req = "";
+		$req = '';
 		foreach ($data as $key => $value)
 		{
 			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
@@ -94,9 +94,8 @@ private function _submitHTTPGet($path, $data)
 	{
 		$req = $this->_encodeQS($data);
 		$http = JHttpFactory::getHttp();
-		$response = $http->get($path . '?' . $req)->body;
 
-		return $response;
+		return $http->get($path . '?' . $req)->body;
 	}
 
 	/**
@@ -111,7 +110,7 @@ private function _submitHTTPGet($path, $data)
 	public function verifyResponse($remoteIp, $response)
 	{
 		// Discard empty solution submissions
-		if ($response == null || strlen($response) == 0)
+		if ($response === null || $response === '')
 		{
 			$recaptchaResponse = new JReCaptchaResponse();
 			$recaptchaResponse->success = false;
@@ -132,7 +131,7 @@ public function verifyResponse($remoteIp, $response)
 		$answers = json_decode($getResponse, true);
 		$recaptchaResponse = new JReCaptchaResponse();
 
-		if (trim($answers['success']) == true)
+		if (trim($answers['success']) === true)
 		{
 			$recaptchaResponse->success = true;
 		}

plugins/content/contact/contact.php

@@ -98,7 +98,7 @@ protected function getContactId($created_by)
 		$query->where('contact.published = 1');
 		$query->where('contact.user_id = ' . (int) $created_by);
 
-		if (JLanguageMultilang::isEnabled() == 1)
+		if (JLanguageMultilang::isEnabled() === 1)
 		{
 			$query->where('(contact.language in '
 				. '(' . $this->db->quote(JFactory::getLanguage()->getTag()) . ',' . $this->db->quote('*') . ') '

plugins/content/emailcloak/emailcloak.php

@@ -29,7 +29,7 @@ class PlgContentEmailcloak extends JPlugin
 	public function onContentPrepare($context, &$row, &$params, $page = 0)
 	{
 		// Don't run this plugin when the content is being indexed
-		if ($context == 'com_finder.indexer')
+		if ($context === 'com_finder.indexer')
 		{
 			return true;
 		}
@@ -68,13 +68,13 @@ protected function _getPattern ($link, $text)
 	 */
 	protected function _addAttributesToEmail($jsEmail, $before, $after)
 	{
-		if ($before !== "")
+		if ($before !== '')
 		{
 			$before = str_replace("'", "\'", $before);
 			$jsEmail = str_replace(".innerHTML += '<a '", ".innerHTML += '<a {$before}'", $jsEmail);
 		}
 
-		if ($after !== "")
+		if ($after !== '')
 		{
 			$after = str_replace("'", "\'", $after);
 			$jsEmail = str_replace("'\'>'", "'\'{$after}>'", $jsEmail);
@@ -123,7 +123,7 @@ protected function _cloak(&$text, &$params)
 		$searchText = '((?:[\x20-\x7f]|[\xA1-\xFF]|[\xC2-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF4][\x80-\xBF]{3})[^<>]+)';
 
 		// Any Image link
-		$searchImage = "(<img[^>]+>)";
+		$searchImage = '(<img[^>]+>)';
 
 		// Any Text with <span or <strong
 		$searchTextSpan = '(<span[^>]+>|<span>|<strong>|<strong><span[^>]+>|<strong><span>)' . $searchText . '(</span>|</strong>|</span></strong>)';
@@ -283,12 +283,12 @@ protected function _cloak(&$text, &$params)
 		 * Search for derivatives of link code <a href="mailto:[email protected]">
 		 * <img anything>[email protected]</a>
 		 */
-		$pattern = $this->_getPattern($searchEmail, ($searchImage . $searchEmail));
+		$pattern = $this->_getPattern($searchEmail, $searchImage . $searchEmail);
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0] . ($regs[5][0]);
+			$mailText = $regs[4][0] . $regs[5][0];
 
 			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
 
@@ -303,7 +303,7 @@ protected function _cloak(&$text, &$params)
 		 * Search for derivatives of link code <a href="mailto:[email protected]">
 		 * <img anything>any text</a>
 		 */
-		$pattern = $this->_getPattern($searchEmail, ($searchImage . $searchText));
+		$pattern = $this->_getPattern($searchEmail, $searchImage . $searchText);
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
@@ -435,7 +435,7 @@ protected function _cloak(&$text, &$params)
 		 * Search for derivatives of link code
 		 * <a href="mailto:[email protected]?subject=Text"><img anything>[email protected]</a>
 		 */
-		$pattern = $this->_getPattern($searchEmailLink, ($searchImage . $searchEmail));
+		$pattern = $this->_getPattern($searchEmailLink, $searchImage . $searchEmail);
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
@@ -459,7 +459,7 @@ protected function _cloak(&$text, &$params)
 		 * Search for derivatives of link code
 		 * <a href="mailto:[email protected]?subject=Text"><img anything>any text</a>
 		 */
-		$pattern = $this->_getPattern($searchEmailLink, ($searchImage . $searchText));
+		$pattern = $this->_getPattern($searchEmailLink, $searchImage . $searchText);
 
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{

plugins/content/joomla/joomla.php

@@ -33,7 +33,7 @@ class PlgContentJoomla extends JPlugin
 	public function onContentAfterSave($context, $article, $isNew)
 	{
 		// Check we are handling the frontend edit form.
-		if ($context != 'com_content.form')
+		if ($context !== 'com_content.form')
 		{
 			return true;
 		}
@@ -108,7 +108,7 @@ public function onContentAfterSave($context, $article, $isNew)
 	public function onContentBeforeDelete($context, $data)
 	{
 		// Skip plugin if we are deleting something other than categories
-		if ($context != 'com_categories.category')
+		if ($context !== 'com_categories.category')
 		{
 			return true;
 		}

plugins/content/loadmodule/loadmodule.php

@@ -36,7 +36,7 @@ class PlgContentLoadmodule extends JPlugin
 	public function onContentPrepare($context, &$article, &$params, $page = 0)
 	{
 		// Don't run this plugin when the content is being indexed
-		if ($context == 'com_finder.indexer')
+		if ($context === 'com_finder.indexer')
 		{
 			return true;
 		}