joomla · wilsonge · Aug 15, 2016 · Aug 14, 2016 · Aug 14, 2016 · Aug 14, 2016
diff --git a/administrator/components/com_banners/banners.php b/administrator/components/com_banners/banners.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_banners'))
 {
-	throw new JControllerExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 // Execute the task.

diff --git a/administrator/components/com_cache/cache.php b/administrator/components/com_cache/cache.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_cache'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Cache');

diff --git a/administrator/components/com_categories/categories.php b/administrator/components/com_categories/categories.php
@@ -18,7 +18,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', $component))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 JLoader::register('JHtmlCategoriesAdministrator', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/html/categoriesadministrator.php');

diff --git a/administrator/components/com_checkin/checkin.php b/administrator/components/com_checkin/checkin.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_checkin'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Checkin');

diff --git a/administrator/components/com_contact/contact.php b/administrator/components/com_contact/contact.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_contact'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('contact');

diff --git a/administrator/components/com_content/content.php b/administrator/components/com_content/content.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_content'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 JLoader::register('ContentHelper', __DIR__ . '/helpers/content.php');

diff --git a/administrator/components/com_contenthistory/contenthistory.php b/administrator/components/com_contenthistory/contenthistory.php
@@ -12,7 +12,7 @@
 // Disallow unauthenticated users
 if (JFactory::getUser()->guest)
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Contenthistory', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR));

diff --git a/administrator/components/com_finder/finder.php b/administrator/components/com_finder/finder.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_finder'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Finder');

diff --git a/administrator/components/com_installer/installer.php b/administrator/components/com_installer/installer.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_installer'))
 {
-	return JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Installer');

diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.php b/administrator/components/com_joomlaupdate/joomlaupdate.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_joomlaupdate'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Joomlaupdate');

diff --git a/administrator/components/com_languages/languages.php b/administrator/components/com_languages/languages.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_languages'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Languages');

diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php
@@ -20,7 +20,7 @@
 	&& count($user->getAuthorisedCategories($asset, 'core.create')) == 0)
 	&& !($user->id == $author && $user->authorise('core.edit.own', $asset))))
 {
-	return JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $params = JComponentHelper::getParams('com_media');

diff --git a/administrator/components/com_menus/menus.php b/administrator/components/com_menus/menus.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_menus'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Menus');

diff --git a/administrator/components/com_messages/messages.php b/administrator/components/com_messages/messages.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_messages'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $task       = JFactory::getApplication()->input->get('task');

diff --git a/administrator/components/com_modules/modules.php b/administrator/components/com_modules/modules.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_modules'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Modules');

diff --git a/administrator/components/com_newsfeeds/newsfeeds.php b/administrator/components/com_newsfeeds/newsfeeds.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_newsfeeds'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Newsfeeds');

diff --git a/administrator/components/com_plugins/plugins.php b/administrator/components/com_plugins/plugins.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_plugins'))
 {
-	throw new JControllerExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Plugins');

diff --git a/administrator/components/com_redirect/redirect.php b/administrator/components/com_redirect/redirect.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_redirect'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Redirect');

diff --git a/administrator/components/com_search/search.php b/administrator/components/com_search/search.php
@@ -11,7 +11,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_search'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Search');

diff --git a/administrator/components/com_tags/tags.php b/administrator/components/com_tags/tags.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_tags'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 $controller = JControllerLegacy::getInstance('Tags');

diff --git a/administrator/components/com_templates/templates.php b/administrator/components/com_templates/templates.php
@@ -10,14 +10,9 @@
 defined('_JEXEC') or die;
 JHtml::_('behavior.tabstate');
 
-$app  = JFactory::getApplication();
-$user = JFactory::getUser();
-
-if (!$user->authorise('core.manage', 'com_templates'))
+if (!JFactory::getUser()->authorise('core.manage', 'com_templates'))
 {
-	$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
-
-	return false;
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 JLoader::register('TemplatesHelper', __DIR__ . '/helpers/templates.php');

diff --git a/administrator/components/com_users/users.php b/administrator/components/com_users/users.php
@@ -12,7 +12,7 @@
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 }
 
 JLoader::register('UsersHelper', __DIR__ . '/helpers/users.php');

diff --git a/...oomla/controller/exception/notallowed.php → ...es/joomla/access/exception/notallowed.php b/...oomla/controller/exception/notallowed.php → ...es/joomla/access/exception/notallowed.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Platform
- * @subpackage  Controller
+ * @subpackage  Access
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
@@ -10,10 +10,10 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * Exception class defining an not allowed controller access
+ * Exception class defining an not allowed access
  *
  * @since  __DEPLOY_VERSION__
  */
-class JControllerExceptionNotallowed extends RuntimeException
+class JAccessExceptionNotallowed extends RuntimeException
 {
 }