- params->get('list_show_votes', 0)) && ($this->vote)) : ?>
+ params->get('list_show_votes', 0) && $this->vote) : ?>
- params->get('list_show_ratings', 0)) && ($this->vote)) : ?>
+ params->get('list_show_ratings', 0) && $this->vote) : ?>
@@ -225,14 +225,14 @@
- params->get('list_show_votes', 0)) && ($this->vote)) : ?>
+ params->get('list_show_votes', 0) && $this->vote) : ?>
rating_count); ?>
|
- params->get('list_show_ratings', 0)) && ($this->vote)) : ?>
+ params->get('list_show_ratings', 0) && $this->vote) : ?>
rating); ?>
diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index cd76480c1096a..848b1e85e04dd 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -39,7 +39,7 @@ protected function reconcileNames($item)
$params = $app->getParams();
$item->description = '';
$obj = json_decode($item->images);
- $introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
+ $introImage = isset($obj->{'image_intro'}) ? $obj->{'image_intro'} : '';
if (isset($introImage) && ($introImage != ""))
{
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 4e9bb7e2a3fee..8a44da9a1ff49 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -84,7 +84,7 @@ public function display($tpl = null)
{
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
- $item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+ $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
// No link for ROOT category
if ($item->parent_alias == 'root')
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 14dfc3323cf60..e9a463d4026c8 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -43,7 +43,7 @@
intro_items));
+ $introcount = count($this->intro_items);
$counter = 0;
?>
intro_items)) : ?>
@@ -58,7 +58,7 @@
-
item = &$item;
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index 049a08cc672a8..f3728b9721a0f 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -61,7 +61,7 @@ public function display($tpl = null)
$description = '';
$obj = json_decode($row->images);
- $introImage = ( isset( $obj->{'image_intro'} ) ) ? $obj->{'image_intro'} : '';
+ $introImage = isset($obj->{'image_intro'}) ? $obj->{'image_intro'} : '';
if (isset($introImage) && ($introImage != ""))
{
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index b03e6d627237e..f2df737c4d7d2 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -75,8 +75,8 @@ public function display($tpl = null)
foreach ($items as &$item)
{
$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
- $item->catslug = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
- $item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+ $item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+ $item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
// No link for ROOT category
if ($item->parent_alias == 'root')
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index e456f4c291025..df154f0b87b6f 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -52,7 +52,7 @@ public function display($tpl = null)
if (empty($this->item->id))
{
- $authorised = $user->authorise('core.create', 'com_content') || (count($user->getAuthorisedCategories('com_content', 'core.create')));
+ $authorised = $user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create'));
}
else
{
diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php
index 55476b44a725d..6e4ae39933b9d 100644
--- a/components/com_finder/helpers/route.php
+++ b/components/com_finder/helpers/route.php
@@ -33,7 +33,7 @@ public static function getSearchRoute($f = null, $q = null)
$item = self::getItemid($query);
// Get the base route.
- $uri = clone(JUri::getInstance('index.php?option=com_finder&view=search'));
+ $uri = clone JUri::getInstance('index.php?option=com_finder&view=search');
// Add the pre-defined search filter if present.
if ($f !== null)
@@ -73,7 +73,7 @@ public static function getAdvancedRoute($f = null, $q = null)
$item = self::getItemid($query);
// Get the base route.
- $uri = clone(JUri::getInstance('index.php?option=com_finder&view=advanced'));
+ $uri = clone JUri::getInstance('index.php?option=com_finder&view=advanced');
// Add the pre-defined search filter if present.
if ($q !== null)
diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php
index 7a622b5defc89..154db7f286773 100644
--- a/components/com_finder/models/search.php
+++ b/components/com_finder/models/search.php
@@ -213,7 +213,7 @@ protected function getListQuery()
// Use the cached data if possible.
if ($this->retrieve($store, false))
{
- return clone($this->retrieve($store, false));
+ return clone $this->retrieve($store, false);
}
// Set variables
@@ -307,7 +307,7 @@ protected function getListQuery()
$this->store($store, $query, false);
// Return a copy of the query object.
- return clone($this->retrieve($store, false));
+ return clone $this->retrieve($store, false);
}
/**
@@ -343,7 +343,7 @@ protected function getResultsTotal()
if (empty($this->includedTerms))
{
// Adjust the query to join on the appropriate mapping table.
- $query = clone($base);
+ $query = clone $base;
$query->clear('select')
->select('COUNT(DISTINCT l.link_id)');
@@ -416,7 +416,7 @@ protected function getResultsTotal()
else
{
// Adjust the query to join on the appropriate mapping table.
- $query = clone($base);
+ $query = clone $base;
$query->join('INNER', '#__finder_links_terms' . $suffix . ' AS m ON m.link_id = l.link_id')
->where('m.term_id IN (' . implode(',', $ids) . ')');
@@ -527,7 +527,7 @@ protected function getResultsTotal()
$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
// Adjust the query to join on the appropriate mapping table.
- $query = clone($base);
+ $query = clone $base;
$query->join('INNER', '#__finder_links_terms' . $suffix . ' AS m ON m.link_id = l.link_id')
->where('m.term_id IN (' . implode(',', $required) . ')');
@@ -695,7 +695,7 @@ protected function getResultsData()
else
{
// Adjust the query to join on the appropriate mapping table.
- $query = clone($base);
+ $query = clone $base;
$query->join('INNER', $this->_db->quoteName('#__finder_links_terms' . $suffix) . ' AS m ON m.link_id = l.link_id')
->where('m.term_id IN (' . implode(',', $ids) . ')');
@@ -848,7 +848,7 @@ protected function getResultsData()
$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
// Adjust the query to join on the appropriate mapping table.
- $query = clone($base);
+ $query = clone $base;
$query->join('INNER', $this->_db->quoteName('#__finder_links_terms' . $suffix) . ' AS m ON m.link_id = l.link_id')
->where('m.term_id IN (' . implode(',', $required) . ')');
diff --git a/components/com_newsfeeds/helpers/legacyrouter.php b/components/com_newsfeeds/helpers/legacyrouter.php
index 12f61adedaa7e..fc4bdc26cbc98 100644
--- a/components/com_newsfeeds/helpers/legacyrouter.php
+++ b/components/com_newsfeeds/helpers/legacyrouter.php
@@ -70,8 +70,8 @@ public function build(&$query, &$segments)
$menuItem = $this->router->menu->getItem($query['Itemid']);
}
- $mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view'];
- $mId = (empty($menuItem->query['id'])) ? null : $menuItem->query['id'];
+ $mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+ $mId = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
if (isset($query['view']))
{
@@ -86,7 +86,7 @@ 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']) && ($mView == $query['view']) and isset($query['id']) and ($mId == (int) $query['id']))
{
unset($query['view']);
unset($query['catid']);
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
index 0b85d31983afc..b3adb45218385 100644
--- 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/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index 3449ba1eeff69..9b4b7ad6d654f 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -66,7 +66,7 @@
image_first) and !empty($images->image_first)) : ?>
- float_first)) ? $this->params->get('float_first') : $images->float_first; ?>
+ float_first) ? $this->params->get('float_first') : $images->float_first; ?>
image_first_caption) :
echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"';
@@ -75,7 +75,7 @@
image_second) and !empty($images->image_second)) : ?>
- float_second)) ? $this->params->get('float_second') : $images->float_second; ?>
+ float_second) ? $this->params->get('float_second') : $images->float_second; ?>
image_second_caption) :
echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_second_caption) . '"';
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index ae163264506ed..f0c533cb92d45 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -96,7 +96,7 @@ public function display($tpl = null)
$currentLink = $active->link;
// If the current view is the active item and an newsfeed view for this feed, then the menu item params take priority
- if (strpos($currentLink, 'view=newsfeed') && (strpos($currentLink, '&id=' . (string) $item->id)))
+ if (strpos($currentLink, 'view=newsfeed') && strpos($currentLink, '&id=' . (string) $item->id))
{
// $item->params are the newsfeed params, $temp are the menu item params
// Merge so that the menu item params take priority
@@ -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) or (in_array($item->access, $levels) and (!in_array($item->category_access, $levels))))
{
$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
$app->setHeader('status', 403, true);
diff --git a/components/com_tags/router.php b/components/com_tags/router.php
index 9bec71e8c2bd2..995c0f4d579f8 100644
--- a/components/com_tags/router.php
+++ b/components/com_tags/router.php
@@ -44,8 +44,8 @@ public function build(&$query)
$menuItem = $this->menu->getItem($query['Itemid']);
}
- $mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view'];
- $mId = (empty($menuItem->query['id'])) ? null : $menuItem->query['id'];
+ $mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+ $mId = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
if (is_array($mId))
{
diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php
index ad97c39dacac7..3bdf7b5172e32 100644
--- a/components/com_tags/views/tag/tmpl/default.php
+++ b/components/com_tags/views/tag/tmpl/default.php
@@ -25,7 +25,7 @@
- item) == 1 && (($this->params->get('tag_list_show_tag_image', 1)) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+ item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
item[0]->images); ?>
params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php
index 4945e4fdadae7..5075e342885ab 100644
--- a/components/com_tags/views/tag/tmpl/list.php
+++ b/components/com_tags/views/tag/tmpl/list.php
@@ -26,7 +26,7 @@
- item) == 1 && (($this->params->get('tag_list_show_tag_image', 1)) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+ item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
item[0]->images); ?>
params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
index faf4826270b41..38ccc75039786 100644
--- a/components/com_tags/views/tag/view.html.php
+++ b/components/com_tags/views/tag/view.html.php
@@ -137,7 +137,7 @@ public function display($tpl = null)
$currentLink = $active->link;
// If the current view is the active item and an tag view for one tag, then the menu item params take priority
- if (strpos($currentLink, 'view=tag') && (strpos($currentLink, '&id[0]=' . (string) $item[0]->id)))
+ if (strpos($currentLink, 'view=tag') && strpos($currentLink, '&id[0]=' . (string) $item[0]->id))
{
// $item->params are the article params, $temp are the menu item params
// Merge so that the menu item params take priority
diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php
index f90d28195162a..3412e362c4b1a 100644
--- a/components/com_tags/views/tags/tmpl/default_items.php
+++ b/components/com_tags/views/tags/tmpl/default_items.php
@@ -99,7 +99,7 @@
images); ?>
image_intro)) : ?>
- float_intro)) ? $this->params->get('float_intro') : $images->float_intro; ?>
+ float_intro) ? $this->params->get('float_intro') : $images->float_intro; ?>
image_intro_caption) : ?>
diff --git a/components/com_users/models/reset.php b/components/com_users/models/reset.php
index ed37b3191e364..b9ecbf53124a7 100644
--- a/components/com_users/models/reset.php
+++ b/components/com_users/models/reset.php
@@ -307,7 +307,7 @@ public function processResetConfirm($data)
}
// Verify the token
- if (!(JUserHelper::verifyPassword($data['token'], $user->activation)))
+ if (!JUserHelper::verifyPassword($data['token'], $user->activation))
{
$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index 082f5b410614f..39a4db1df5fd9 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -29,7 +29,7 @@
params->get('login_description'); ?>
- params->get('login_image') != '')) : ?>
+ params->get('login_image') != '') : ?>
diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php
index e179c7f95485d..4fcb2bc7b60c0 100644
--- a/components/com_users/views/login/tmpl/default_logout.php
+++ b/components/com_users/views/login/tmpl/default_logout.php
@@ -26,7 +26,7 @@
params->get('logout_description'); ?>
- params->get('logout_image') != '')) : ?>
+ params->get('logout_image') != '') : ?>
|