Performance 4 (plugins)

plugins/authentication/cookie/cookie.php

@@ -269,7 +269,7 @@ public function onUserAfterLogin($options)
 				{
 					$results = $this->db->setQuery($query)->loadResult();
 
-					if (is_null($results))
+					if ($results === null)
 					{
 						$unique = true;
 					}

plugins/authentication/gmail/gmail.php

@@ -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;

plugins/authentication/joomla/joomla.php

@@ -92,7 +92,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();
 

plugins/authentication/ldap/ldap.php

@@ -72,7 +72,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();
 				}
@@ -86,7 +86,7 @@ public function onUserAuthenticate($credentials, $options, &$response)
 					// Search for users DN
 					$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);
@@ -128,7 +128,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,7 +40,7 @@ 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'));
 		}
@@ -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;
 		}
 
@@ -268,7 +268,7 @@ private function _recaptcha_http_post($host, $path, $data, $port = 80)
 
 		$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

@@ -53,7 +53,7 @@ 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>");
@@ -110,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;
@@ -131,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']))
 		{
 			$recaptchaResponse->success = true;
 		}

plugins/content/contact/contact.php

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

plugins/content/pagebreak/pagebreak.php

@@ -92,7 +92,7 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 			$page = 0;
 		}
 
-		if ($params->get('intro_only') || $params->get('popup') || $full || $view !== 'article')
+		if ($full || $view !== 'article' || $params->get('intro_only') || $params->get('popup'))
 		{
 			$row->text = preg_replace($regex, '', $row->text);
 
@@ -144,19 +144,13 @@ public function onContentPrepare($context, &$row, &$params, $page = 0)
 			$hasToc = $this->params->get('multipage_toc', 1);
 
 			// Adds heading or title to <site> Title.
-			if ($title)
+			if ($title && $page && @$matches[$page - 1][2])
 			{
-				if ($page)
-				{
-					if ($page && @$matches[$page - 1][2])
-					{
-						$attrs = JUtility::parseAttributes($matches[$page - 1][1]);
+				$attrs = JUtility::parseAttributes($matches[$page - 1][1]);
 
-						if (@$attrs['title'])
-						{
-							$row->page_title = $attrs['title'];
-						}
-					}
+				if (@$attrs['title'])
+				{
+					$row->page_title = $attrs['title'];
 				}
 			}
 

plugins/content/pagenavigation/pagenavigation.php

@@ -39,7 +39,7 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
 			return false;
 		}
 
-		if (($context === 'com_content.article') && ($view === 'article') && $params->get('show_item_navigation'))
+		if (($context === 'com_content.article') && $view === 'article' && $params->get('show_item_navigation'))
 		{
 			$db       = JFactory::getDbo();
 			$user     = JFactory::getUser();
@@ -217,8 +217,6 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
 				$row->paginationrelative = $this->params->get('relative', 0);
 			}
 		}
-
-		return;
 	}
 
 	/**

plugins/editors/codemirror/codemirror.php

@@ -78,7 +78,7 @@ public function onInit()
 		{
 			if (isset($fontInfo->url))
 			{
-				$doc->addStylesheet($fontInfo->url);
+				$doc->addStyleSheet($fontInfo->url);
 			}
 
 			if (isset($fontInfo->css))

plugins/editors/tinymce/field/skins.php

@@ -37,7 +37,7 @@ public function getOptions()
 
 		$directories = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
 
-		for ($i = 0; $i < count($directories); ++$i)
+		for ($i = 0, $iMax = count($directories); $i < $iMax; ++$i)
 		{
 			$dir = basename($directories[$i]);
 			$options[] = JHtml::_('select.option', $i, $dir);

plugins/editors/tinymce/tinymce.php

@@ -267,7 +267,6 @@ public function onDisplay(
 		// Set the selected skin
 		$skin = 'lightgray';
 		$side = $app->isClient('administrator') ? 'skin_admin' : 'skin';
-
 		if ((int) $levelParams->get($side, 0) < count($skindirs))
 		{
 			$skin = basename($skindirs[(int) $levelParams->get($side, 0)]);
@@ -490,6 +489,7 @@ public function onDisplay(
 			}
 		}
 
+
 		// Template
 		$templates = array();
 
@@ -760,7 +760,7 @@ private function tinyButtons($name, $excluded)
 				// Set some vars
 				$name    = 'button-' . $i . str_replace(' ', '', $button->get('text'));
 				$title   = $button->get('text');
-				$onclick = $button->get('onclick') ? $button->get('onclick') : null;
+				$onclick = $button->get('onclick') ?: null;
 				$options = $button->get('options');
 				$icon    = $button->get('name');
 
@@ -801,7 +801,7 @@ private function tinyButtons($name, $excluded)
 					icon: \"" . $icon . "\",
 					onclick: function () {";
 
-				if ($button->get('modal') || $href)
+				if ($href || $button->get('modal'))
 				{
 					$tempConstructor .= "
 							var modalOptions = {
@@ -823,21 +823,21 @@ private function tinyButtons($name, $excluded)
 					if ($onclick && ($button->get('modal') || $href))
 					{
 						$tempConstructor .= "\r\n
-						" . $onclick . "
-							";
+						" . $onclick . '
+							';
 					}
 				}
 				else
 				{
 					$tempConstructor .= "\r\n
-						" . $onclick . "
-							";
+						" . $onclick . '
+							';
 				}
 
-				$tempConstructor .= "
+				$tempConstructor .= '
 					}
 				});
-			})();";
+			})();';
 
 				// The array with the toolbar buttons
 				$btnsNames[] = $name . ' | ';

plugins/extension/joomla/joomla.php

@@ -254,7 +254,7 @@ private function processUpdateSites()
 		{
 			$data = trim((string) $updateservers);
 
-			if (strlen($data))
+			if ($data !== '')
 			{
 				// We have a single entry in the update server line, let us presume this is an extension line
 				$this->addUpdateSite(JText::_('PLG_EXTENSION_JOOMLA_UNKNOWN_SITE'), 'extension', $data, true);

plugins/finder/categories/categories.php

@@ -244,13 +244,13 @@ public function onFinderChangeState($context, $pks, $value)
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
 		// Check if the extension is enabled.
-		if (JComponentHelper::isEnabled($this->extension) === false)
+		if (!JComponentHelper::isEnabled($this->extension))
 		{
 			return;
 		}
 
 		// Check if the extension that owns the category is also enabled.
-		if (JComponentHelper::isEnabled($item->extension) === false)
+		if (!JComponentHelper::isEnabled($item->extension))
 		{
 			return;
 		}

plugins/finder/contacts/contacts.php

@@ -251,7 +251,7 @@ public function onFinderChangeState($context, $pks, $value)
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
 		// Check if the extension is enabled
-		if (JComponentHelper::isEnabled($this->extension) === false)
+		if (!JComponentHelper::isEnabled($this->extension))
 		{
 			return;
 		}

plugins/finder/content/content.php

@@ -246,7 +246,7 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		$item->setLanguage();
 
 		// Check if the extension is enabled.
-		if (JComponentHelper::isEnabled($this->extension) == false)
+		if (!JComponentHelper::isEnabled($this->extension))
 		{
 			return;
 		}

plugins/finder/newsfeeds/newsfeeds.php

@@ -252,7 +252,7 @@ public function onFinderChangeState($context, $pks, $value)
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
 		// Check if the extension is enabled.
-		if (JComponentHelper::isEnabled($this->extension) === false)
+		if (!JComponentHelper::isEnabled($this->extension))
 		{
 			return;
 		}

plugins/finder/tags/tags.php

@@ -206,7 +206,7 @@ public function onFinderChangeState($context, $pks, $value)
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
 		// Check if the extension is enabled
-		if (JComponentHelper::isEnabled($this->extension) === false)
+		if (!JComponentHelper::isEnabled($this->extension))
 		{
 			return;
 		}

plugins/search/categories/categories.php

@@ -65,12 +65,9 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$groups = implode(',', $user->getAuthorisedViewLevels());
 		$searchText = $text;
 
-		if (is_array($areas))
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
 		{
-			if (!array_intersect($areas, array_keys($this->onContentSearchAreas())))
-			{
-				return array();
-			}
+			return array();
 		}
 
 		$sContent = $this->params->get('search_content', 1);

plugins/search/contacts/contacts.php

@@ -64,12 +64,9 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$user   = JFactory::getUser();
 		$groups = implode(',', $user->getAuthorisedViewLevels());
 
-		if (is_array($areas))
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
 		{
-			if (!array_intersect($areas, array_keys($this->onContentSearchAreas())))
-			{
-				return array();
-			}
+			return array();
 		}
 
 		$sContent  = $this->params->get('search_content', 1);

plugins/search/content/content.php

@@ -59,12 +59,9 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 
 		$searchText = $text;
 
-		if (is_array($areas))
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
 		{
-			if (!array_intersect($areas, array_keys($this->onContentSearchAreas())))
-			{
-				return array();
-			}
+			return array();
 		}
 
 		$sContent  = $this->params->get('search_content', 1);

plugins/search/newsfeeds/newsfeeds.php

@@ -62,12 +62,9 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$user = JFactory::getUser();
 		$groups = implode(',', $user->getAuthorisedViewLevels());
 
-		if (is_array($areas))
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
 		{
-			if (!array_intersect($areas, array_keys($this->onContentSearchAreas())))
-			{
-				return array();
-			}
+			return array();
 		}
 
 		$sContent = $this->params->get('search_content', 1);

plugins/search/tags/tags.php

@@ -66,12 +66,9 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$section = JText::_('PLG_SEARCH_TAGS_TAGS');
 		$limit   = $this->params->def('search_limit', 50);
 
-		if (is_array($areas))
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
 		{
-			if (!array_intersect($areas, array_keys($this->onContentSearchAreas())))
-			{
-				return array();
-			}
+			return array();
 		}
 
 		$text = trim($text);