removed unnecessary ACL checks (pagebreak, article XTD btns & content)

joomla · Sep 3, 2017 · c855a9b · c855a9b
1 parent cbff398
commit c855a9b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 56 deletions.
diff --git a/components/com_content/content.php b/components/com_content/content.php
@@ -13,28 +13,6 @@
 JLoader::register('ContentHelperQuery', JPATH_SITE . '/components/com_content/helpers/query.php');
 JLoader::register('ContentHelperAssociation', JPATH_SITE . '/components/com_content/helpers/association.php');
 
-$input = JFactory::getApplication()->input;
-$user  = JFactory::getUser();
-
-if ($input->get('view') === 'article' && $input->get('layout') === 'pagebreak')
-{
-	if (!$user->authorise('core.create', 'com_content'))
-	{
-		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
-
-		return;
-	}
-}
-elseif ($input->get('view') === 'articles' && $input->get('layout') === 'modal')
-{
-	if (!$user->authorise('core.create', 'com_content'))
-	{
-		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
-
-		return;
-	}
-}
-
 $controller = JControllerLegacy::getInstance('Content');
 $controller->execute(JFactory::getApplication()->input->get('task'));
 $controller->redirect();
diff --git a/plugins/editors-xtd/article/article.php b/plugins/editors-xtd/article/article.php
@@ -35,25 +35,17 @@ class PlgButtonArticle extends JPlugin
 	 */
 	public function onDisplay($name)
 	{
+		$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;'
+			. JSession::getFormToken() . '=1&amp;editor=' . $name;
 
-		$user  = JFactory::getUser();
-
-		if ($user->authorise('core.create', 'com_content')
-			|| $user->authorise('core.edit', 'com_content')
-			|| $user->authorise('core.edit.own', 'com_content'))
-		{
-			$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;'
-				. JSession::getFormToken() . '=1&amp;editor=' . $name;
-
-			$button = new JObject;
-			$button->modal   = true;
-			$button->class   = 'btn';
-			$button->link    = $link;
-			$button->text    = JText::_('PLG_ARTICLE_BUTTON_ARTICLE');
-			$button->name    = 'file-add';
-			$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+		$button = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_ARTICLE_BUTTON_ARTICLE');
+		$button->name    = 'file-add';
+		$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
 
 		return $button;
-		}
 	}
 }
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.php b/plugins/editors-xtd/pagebreak/pagebreak.php
@@ -35,24 +35,17 @@ class PlgButtonPagebreak extends JPlugin
 	 */
 	public function onDisplay($name)
 	{
-		$user  = JFactory::getUser();
+		JFactory::getDocument()->addScriptOptions('xtd-pagebreak', array('editor' => $name));
+		$link = 'index.php?option=com_content&amp;view=article&amp;layout=pagebreak&amp;tmpl=component&amp;e_name=' . $name;
 
-		if ($user->authorise('core.create', 'com_content')
-			|| $user->authorise('core.edit', 'com_content')
-			|| $user->authorise('core.edit.own', 'com_content'))
-		{
-			JFactory::getDocument()->addScriptOptions('xtd-pagebreak', array('editor' => $name));
-			$link = 'index.php?option=com_content&amp;view=article&amp;layout=pagebreak&amp;tmpl=component&amp;e_name=' . $name;
+		$button          = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
+		$button->name    = 'copy';
+		$button->options = "{handler: 'iframe', size: {x: 500, y: 300}}";
 
-			$button          = new JObject;
-			$button->modal   = true;
-			$button->class   = 'btn';
-			$button->link    = $link;
-			$button->text    = JText::_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
-			$button->name    = 'copy';
-			$button->options = "{handler: 'iframe', size: {x: 500, y: 300}}";
-
-			return $button;
-		}
+		return $button;
 	}
 }