Cleanups, fixes and a bit of optimizations for site/components batch #4 (#12293)

frankmayer · rdeutz · commit 778153e63c94 · 2017-06-08T08:45:20.000+02:00
* Cleanups, fixes and a bit of optimizations for site/components batch #4 - com_mailto - com_newsfeeds - com_search Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole * Missed to convert `and` and `or` * Some more fixes after conflict resolution * - Changed some things according to reviewer's suggestions - Some more changes in updated stuff * Reversed a change according to reviewer's correct comment.
diff --git a/components/com_newsfeeds/controller.php b/components/com_newsfeeds/controller.php
@@ -36,7 +36,7 @@ public function display($cachable = false, $urlparams = false)
 
 		$user = JFactory::getUser();
 
-		if ($user->get('id') || ($this->input->getMethod() == 'POST' && $vName == 'category' ))
+		if ($user->get('id') || ($this->input->getMethod() === 'POST' && $vName === 'category'))
 		{
 			$cachable = false;
 		}
diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php
@@ -33,10 +33,10 @@ abstract class NewsfeedsHelperAssociation extends CategoryHelperAssociation
 	public static function getAssociations($id = 0, $view = null)
 	{
 		$jinput = JFactory::getApplication()->input;
-		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
-		if ($view == 'newsfeed')
+		if ($view === 'newsfeed')
 		{
 			if ($id)
 			{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
 			}
 		}
 
-		if ($view == 'category' || $view == 'categories')
+		if ($view === 'category' || $view === 'categories')
 		{
 			return self::getCategoryAssociations($id, 'com_newsfeeds');
 		}
diff --git a/components/com_newsfeeds/helpers/legacyrouter.php b/components/com_newsfeeds/helpers/legacyrouter.php
@@ -77,7 +77,7 @@ public function build(&$query, &$segments)
 		{
 			$view = $query['view'];
 
-			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component != 'com_newsfeeds')
+			if (empty($menuItem) || $menuItem->component !== 'com_newsfeeds' || empty($query['Itemid']))
 			{
 				$segments[] = $query['view'];
 			}
@@ -86,18 +86,18 @@ public function build(&$query, &$segments)
 		}
 
 		// Are we dealing with an newsfeed that is attached to a menu item?
-		if (isset($query['view']) && ($mView == $query['view']) and isset($query['id']) and ($mId == (int) $query['id']))
+		if (isset($query['view'], $query['id']) && $mView == $query['view'] && $mId == (int) $query['id'])
 		{
 			unset($query['view'], $query['catid'], $query['id']);
 
 			return;
 		}
 
-		if (isset($view) and ($view == 'category' or $view == 'newsfeed'))
+		if (isset($view) && ($view === 'category' || $view === 'newsfeed'))
 		{
 			if ($mId != (int) $query['id'] || $mView != $view)
 			{
-				if ($view == 'newsfeed' && isset($query['catid']))
+				if ($view === 'newsfeed' && isset($query['catid']))
 				{
 					$catid = $query['catid'];
 				}
@@ -119,7 +119,7 @@ public function build(&$query, &$segments)
 
 					foreach ($path as $id)
 					{
-						if ((int) $id == (int) $menuCatid)
+						if ((int) $id === (int) $menuCatid)
 						{
 							break;
 						}
@@ -135,7 +135,7 @@ public function build(&$query, &$segments)
 					$segments = array_merge($segments, array_reverse($array));
 				}
 
-				if ($view == 'newsfeed')
+				if ($view === 'newsfeed')
 				{
 					if ($advanced)
 					{
@@ -164,7 +164,7 @@ public function build(&$query, &$segments)
 			}
 			else
 			{
-				if ($query['layout'] == 'default')
+				if ($query['layout'] === 'default')
 				{
 					unset($query['layout']);
 				}
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
@@ -35,7 +35,7 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 			$link .= '&catid=' . $catid;
 		}
 
-		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 		}
@@ -71,7 +71,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			// Create the link
 			$link = 'index.php?option=com_newsfeeds&view=category&id=' . $id;
 
-			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 			}
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
@@ -127,7 +127,7 @@ public function &getItem($pk = null)
 
 				// Check for published state if filter set.
 
-				if ((is_numeric($published) || is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))
+				if ((is_numeric($published) || is_numeric($archived)) && $data->published != $published && $data->published != $archived)
 				{
 					JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));
 				}
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
@@ -147,7 +147,7 @@ public function getCategoryId($segment, $query)
 			{
 				if ($this->noIDs)
 				{
-					if ($child->alias == $segment)
+					if ($child->alias === $segment)
 					{
 						return $child->id;
 					}
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -12,7 +12,7 @@
 JHtml::_('bootstrap.tooltip');
 
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
diff --git a/components/com_newsfeeds/views/category/tmpl/default.php b/components/com_newsfeeds/views/category/tmpl/default.php
@@ -46,7 +46,7 @@
 
 	<?php echo $this->loadTemplate('items'); ?>
 
-	<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 		<div class="cat-children">
 			<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
 			<?php echo $this->loadTemplate('children'); ?>
diff --git a/components/com_newsfeeds/views/category/tmpl/default_children.php b/components/com_newsfeeds/views/category/tmpl/default_children.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
diff --git a/components/com_newsfeeds/views/category/tmpl/default_items.php b/components/com_newsfeeds/views/category/tmpl/default_items.php
@@ -20,9 +20,9 @@
 <?php else : ?>
 
 <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if (($this->params->get('filter_field') != 'hide') || $this->params->get('show_pagination_limit')) : ?>
+	<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
 	<fieldset class="filters btn-toolbar">
-		<?php if (($this->params->get('filter_field') != 'hide') && ($this->params->get('filter_field') == '1')) : ?>
+		<?php if ($this->params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
 			<div class="btn-group">
 				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?></label>
 				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" />
diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
@@ -72,12 +72,12 @@ protected function prepareDocument()
 		$menu = $this->menu;
 		$id = (int) @$menu->query['id'];
 
-		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $this->category->id))
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $this->category->id))
 		{
 			$path = array(array('title' => $this->category->title, 'link' => ''));
 			$category = $this->category->getParent();
 
-			while (($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -19,15 +19,17 @@
 	$myrtl     = $this->newsfeed->rtl;
 	$direction = ' ';
 
-		if ($lang->isRtl() && $myrtl == 0)
+	$isRtl = $lang->isRtl();
+
+		if ($isRtl && $myrtl == 0)
 		{
 			$direction = ' redirect-rtl';
 		}
-		elseif ($lang->isRtl() && $myrtl == 1)
+		elseif ($isRtl && $myrtl == 1)
 		{
 			$direction = ' redirect-ltr';
 		}
-		elseif ($lang->isRtl() && $myrtl == 2)
+		elseif ($isRtl && $myrtl == 2)
 		{
 			$direction = ' redirect-rtl';
 		}
@@ -93,7 +95,7 @@
 	<?php endif; ?>
 
 	<!-- Show Image -->
-	<?php if (isset($this->rssDoc->image) && isset($this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
+	<?php if (isset($this->rssDoc->image, $this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
 	<div>
 			<img src="<?php echo $this->rssDoc->image; ?>" alt="<?php echo $this->rssDoc->image->decription; ?>" />
 </div>
@@ -110,9 +112,9 @@
 		}
 		?>
 		<?php
-			$uri   = !empty($this->rssDoc[$i]->guid) || !is_null($this->rssDoc[$i]->guid) ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
-			$uri   = substr($uri, 0, 4) != 'http' ? $this->item->link : $uri;
-			$text  = !empty($this->rssDoc[$i]->content) || !is_null($this->rssDoc[$i]->content) ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
+			$uri   = !empty($this->rssDoc[$i]->guid) || $this->rssDoc[$i]->guid !== null ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
+			$uri   = strpos($uri, 'http') !== 0 ? $this->item->link : $uri;
+			$text  = !empty($this->rssDoc[$i]->content) || $this->rssDoc[$i]->content !== null ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
 			$title = trim($this->rssDoc[$i]->title);
 		?>
 			<li>
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -139,7 +139,7 @@ public function display($tpl = null)
 		// Check the access to the newsfeed
 		$levels = $user->getAuthorisedViewLevels();
 
-		if (!in_array($item->access, $levels) or (in_array($item->access, $levels) and (!in_array($item->category_access, $levels))))
+		if (!in_array($item->access, $levels) || (in_array($item->access, $levels) && (!in_array($item->category_access, $levels))))
 		{
 			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 			$app->setHeader('status', 403, true);
@@ -175,7 +175,7 @@ public function display($tpl = null)
 
 		$feed_display_order = $params->get('feed_display_order', 'des');
 
-		if ($feed_display_order == 'asc')
+		if ($feed_display_order === 'asc')
 		{
 			$this->rssDoc->reverseItems();
 		}
@@ -240,7 +240,7 @@ protected function _prepareDocument()
 		$id = (int) @$menu->query['id'];
 
 		// If the menu item does not concern this newsfeed
-		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] != 'newsfeed' || $id != $this->item->id))
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] !== 'newsfeed' || $id != $this->item->id))
 		{
 			// If this is not a single newsfeed menu item, set the page title to the newsfeed title
 			if ($this->item->name)
@@ -251,7 +251,7 @@ protected function _prepareDocument()
 			$path = array(array('title' => $this->item->name, 'link' => ''));
 			$category = JCategories::getInstance('Newsfeeds')->get($this->item->catid);
 
-			while (($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
@@ -48,7 +48,7 @@ public function search()
 		$searchword = trim(str_replace($badchars, '', $this->input->getString('searchword', null, 'post')));
 
 		// If searchword enclosed in double quotes, strip quotes and do exact match
-		if (substr($searchword, 0, 1) == '"' && substr($searchword, -1) == '"')
+		if (substr($searchword, 0, 1) === '"' && substr($searchword, -1) === '"')
 		{
 			$post['searchword'] = substr($searchword, 1, -1);
 			$this->input->set('searchphrase', 'exact');
@@ -86,7 +86,7 @@ public function search()
 		$item = $menu->getItem($post['Itemid']);
 
 		// The requested Item is not a search page so we need to find one
-		if ($item && ($item->component != 'com_search' || $item->query['view'] != 'search'))
+		if ($item && ($item->component !== 'com_search' || $item->query['view'] !== 'search'))
 		{
 			// Get item based on component, not link. link is not reliable.
 			$item = $menu->getItems('component', 'com_search', true);
diff --git a/components/com_search/models/search.php b/components/com_search/models/search.php
@@ -107,7 +107,7 @@ public function setSearch($keyword, $match = 'all', $ordering = 'newest')
 
 			if ($match !== 'exact')
 			{
-				$keyword = preg_replace('#\xE3\x80\x80#s', ' ', $keyword);
+				$keyword = preg_replace('#\xE3\x80\x80#', ' ', $keyword);
 			}
 
 			$this->setState('keyword', $keyword);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function display($cachable = false, $urlparams = false)`
`36`	`36`
`37`	`37`	`$user = JFactory::getUser();`
`38`	`38`
`39`		`- if ($user->get('id') \|\| ($this->input->getMethod() == 'POST' && $vName == 'category' ))`
	`39`	`+ if ($user->get('id') \|\| ($this->input->getMethod() === 'POST' && $vName === 'category'))`
`40`	`40`	`{`
`41`	`41`	`$cachable = false;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ abstract class NewsfeedsHelperAssociation extends CategoryHelperAssociation`
`33`	`33`	`public static function getAssociations($id = 0, $view = null)`
`34`	`34`	`{`
`35`	`35`	`$jinput = JFactory::getApplication()->input;`
`36`		`- $view = is_null($view) ? $jinput->get('view') : $view;`
	`36`	`+ $view = $view === null ? $jinput->get('view') : $view;`
`37`	`37`	`$id = empty($id) ? $jinput->getInt('id') : $id;`
`38`	`38`
`39`		`- if ($view == 'newsfeed')`
	`39`	`+ if ($view === 'newsfeed')`
`40`	`40`	`{`
`41`	`41`	`if ($id)`
`42`	`42`	`{`
`@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- if ($view == 'category' \|\| $view == 'categories')`
	`56`	`+ if ($view === 'category' \|\| $view === 'categories')`
`57`	`57`	`{`
`58`	`58`	`return self::getCategoryAssociations($id, 'com_newsfeeds');`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function build(&$query, &$segments)`
`77`	`77`	`{`
`78`	`78`	`$view = $query['view'];`
`79`	`79`
`80`		`- if (empty($query['Itemid']) \|\| empty($menuItem) \|\| $menuItem->component != 'com_newsfeeds')`
	`80`	`+ if (empty($menuItem) \|\| $menuItem->component !== 'com_newsfeeds' \|\| empty($query['Itemid']))`
`81`	`81`	`{`
`82`	`82`	`$segments[] = $query['view'];`
`83`	`83`	`}`
`@@ -86,18 +86,18 @@ public function build(&$query, &$segments)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// Are we dealing with an newsfeed that is attached to a menu item?`
`89`		`- if (isset($query['view']) && ($mView == $query['view']) and isset($query['id']) and ($mId == (int) $query['id']))`
	`89`	`+ if (isset($query['view'], $query['id']) && $mView == $query['view'] && $mId == (int) $query['id'])`
`90`	`90`	`{`
`91`	`91`	`unset($query['view'], $query['catid'], $query['id']);`
`92`	`92`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (isset($view) and ($view == 'category' or $view == 'newsfeed'))`
	`96`	`+ if (isset($view) && ($view === 'category' \|\| $view === 'newsfeed'))`
`97`	`97`	`{`
`98`	`98`	`if ($mId != (int) $query['id'] \|\| $mView != $view)`
`99`	`99`	`{`
`100`		`- if ($view == 'newsfeed' && isset($query['catid']))`
	`100`	`+ if ($view === 'newsfeed' && isset($query['catid']))`
`101`	`101`	`{`
`102`	`102`	`$catid = $query['catid'];`
`103`	`103`	`}`
`@@ -119,7 +119,7 @@ public function build(&$query, &$segments)`
`119`	`119`
`120`	`120`	`foreach ($path as $id)`
`121`	`121`	`{`
`122`		`- if ((int) $id == (int) $menuCatid)`
	`122`	`+ if ((int) $id === (int) $menuCatid)`
`123`	`123`	`{`
`124`	`124`	`break;`
`125`	`125`	`}`
`@@ -135,7 +135,7 @@ public function build(&$query, &$segments)`
`135`	`135`	`$segments = array_merge($segments, array_reverse($array));`
`136`	`136`	`}`
`137`	`137`
`138`		`- if ($view == 'newsfeed')`
	`138`	`+ if ($view === 'newsfeed')`
`139`	`139`	`{`
`140`	`140`	`if ($advanced)`
`141`	`141`	`{`
`@@ -164,7 +164,7 @@ public function build(&$query, &$segments)`
`164`	`164`	`}`
`165`	`165`	`else`
`166`	`166`	`{`
`167`		`- if ($query['layout'] == 'default')`
	`167`	`+ if ($query['layout'] === 'default')`
`168`	`168`	`{`
`169`	`169`	`unset($query['layout']);`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)`
`35`	`35`	`$link .= '&catid=' . $catid;`
`36`	`36`	`}`
`37`	`37`
`38`		`- if ($language && $language != '*' && JLanguageMultilang::isEnabled())`
	`38`	`+ if ($language && $language !== '*' && JLanguageMultilang::isEnabled())`
`39`	`39`	`{`
`40`	`40`	`$link .= '&lang=' . $language;`
`41`	`41`	`}`
`@@ -71,7 +71,7 @@ public static function getCategoryRoute($catid, $language = 0)`
`71`	`71`	`// Create the link`
`72`	`72`	`$link = 'index.php?option=com_newsfeeds&view=category&id=' . $id;`
`73`	`73`
`74`		`- if ($language && $language != '*' && JLanguageMultilang::isEnabled())`
	`74`	`+ if ($language && $language !== '*' && JLanguageMultilang::isEnabled())`
`75`	`75`	`{`
`76`	`76`	`$link .= '&lang=' . $language;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function &getItem($pk = null)`
`127`	`127`
`128`	`128`	`// Check for published state if filter set.`
`129`	`129`
`130`		`- if ((is_numeric($published) \|\| is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))`
	`130`	`+ if ((is_numeric($published) \|\| is_numeric($archived)) && $data->published != $published && $data->published != $archived)`
`131`	`131`	`{`
`132`	`132`	`JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function getCategoryId($segment, $query)`
`147`	`147`	`{`
`148`	`148`	`if ($this->noIDs)`
`149`	`149`	`{`
`150`		`- if ($child->alias == $segment)`
	`150`	`+ if ($child->alias === $segment)`
`151`	`151`	`{`
`152`	`152`	`return $child->id;`
`153`	`153`	`}`