joomlatools · johanjanssens · Apr 20, 2017 · Jan 13, 2017 · Jan 13, 2017 · Jan 16, 2017
diff --git a/app/administrator/components/com_config/config.php b/app/administrator/components/com_config/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/app/administrator/components/com_config/config.xml b/app/administrator/components/com_config/config.xml
@@ -3,7 +3,7 @@
 	<name>com_config</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

diff --git a/app/administrator/components/com_config/controller.php b/app/administrator/components/com_config/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,8 @@
 /**
  * Config Component Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
  * @since       1.5
+ * @deprecated  4.0
  */
 class ConfigController extends JControllerLegacy
 {
@@ -41,7 +40,11 @@ public function display($cachable = false, $urlparams = array())
 		// Set the default view name and format from the Request.
 		$vName = $this->input->get('view', 'application');
 
-		JLog::add('ConfigController is deprecated. Use ConfigControllerApplicationDisplay or ConfigControllerComponentDisplay instead.', JLog::WARNING, 'deprecated');
+		JLog::add(
+			'ConfigController is deprecated. Use ConfigControllerApplicationDisplay or ConfigControllerComponentDisplay instead.',
+			JLog::WARNING,
+			'deprecated'
+		);
 
 		if (ucfirst($vName) == 'Application')
 		{

diff --git a/app/administrator/components/com_config/controller/application/cancel.php b/app/administrator/components/com_config/controller/application/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,7 @@
 /**
  * Cancel Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationCancel extends ConfigControllerCanceladmin
 {

diff --git a/app/administrator/components/com_config/controller/application/display.php b/app/administrator/components/com_config/controller/application/display.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  Joomla.Config
+ * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,10 +12,8 @@
 /**
  * Base Display Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
- * @note        Needed for front end view
+ * @since  3.2
+ * @note   Needed for front end view
  */
 class ConfigControllerApplicationDisplay extends ConfigControllerDisplay
 {

diff --git a/app/administrator/components/com_config/controller/application/save.php b/app/administrator/components/com_config/controller/application/save.php
@@ -3,17 +3,15 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
 
 /**
  * Save Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerApplicationSave extends JControllerBase
 {
@@ -37,14 +35,14 @@ public function execute()
 		// Check for request forgeries.
 		if (!JSession::checkToken())
 		{
-			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
 			$this->app->redirect('index.php');
 		}
 
 		// Check if the user is authorized to do this.
 		if (!JFactory::getUser()->authorise('core.admin'))
 		{
-			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 			$this->app->redirect('index.php');
 		}
 
@@ -88,7 +86,7 @@ public function execute()
 		}
 
 		// Attempt to save the configuration.
-		$data	= $return;
+		$data   = $return;
 		$return = $model->save($data);
 
 		// Check the return value.
@@ -106,7 +104,7 @@ public function execute()
 		}
 
 		// Set the success message.
-		$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'));
+		$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'), 'message');
 
 		// Set the redirect based on the task.
 		switch ($this->options[3])

diff --git a/app/administrator/components/com_config/controller/application/sendtestmail.php b/app/administrator/components/com_config/controller/application/sendtestmail.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Send Test Mail Controller from global configuration
+ *
+ * @since  3.5
+ */
+class ConfigControllerApplicationSendtestmail extends JControllerBase
+{
+	/**
+	 * Method to send the test mail.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function execute()
+	{
+		// Send json mime type.
+		$this->app->mimeType = 'application/json';
+		$this->app->setHeader('Content-Type', $this->app->mimeType . '; charset=' . $this->app->charSet);
+		$this->app->sendHeaders();
+
+		// Check if user token is valid.
+		if (!JSession::checkToken('get'))
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		$model = new ConfigModelApplication;
+		echo new JResponseJson($model->sendTestMail());
+		$this->app->close();
+	}
+}
diff --git a/app/administrator/components/com_config/controller/application/store.php b/app/administrator/components/com_config/controller/application/store.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Controller for global configuration, Store Permissions in Database
+ *
+ * @since  3.5
+ */
+class ConfigControllerApplicationStore extends JControllerBase
+{
+	/**
+	 * Method to GET permission value and give it to the model for storing in the database.
+	 *
+	 * @return  boolean  true on success, false when failed
+	 *
+	 * @since   3.5
+	 */
+	public function execute()
+	{
+		// Send json mime type.
+		$this->app->mimeType = 'application/json';
+		$this->app->setHeader('Content-Type', $this->app->mimeType . '; charset=' . $this->app->charSet);
+		$this->app->sendHeaders();
+
+		// Check if user token is valid.
+		if (!JSession::checkToken('get'))
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		$model = new ConfigModelApplication;
+		echo new JResponseJson($model->storePermissions());
+		$this->app->close();
+	}
+}
diff --git a/app/administrator/components/com_config/controller/cancel.php b/app/administrator/components/com_config/controller/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/app/administrator/components/com_config/controller/canceladmin.php b/app/administrator/components/com_config/controller/canceladmin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

diff --git a/app/administrator/components/com_config/controller/component/cancel.php b/app/administrator/components/com_config/controller/component/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,7 @@
 /**
  * Cancel Controller for global configuration components
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerComponentCancel extends ConfigControllerCanceladmin
 {

diff --git a/app/administrator/components/com_config/controller/component/display.php b/app/administrator/components/com_config/controller/component/display.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  Joomla.Config
+ * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,10 +12,8 @@
 /**
  * Base Display Controller
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
- * @note        Needed for front end view
+ * @since  3.2
+ * @note   Needed for front end view
  */
 class ConfigControllerComponentDisplay extends ConfigControllerDisplay
 {

diff --git a/app/administrator/components/com_config/controller/component/save.php b/app/administrator/components/com_config/controller/component/save.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,9 +12,7 @@
 /**
  * Save Controller for global configuration
  *
- * @package     Joomla.Administrator
- * @subpackage  com_config
- * @since       3.2
+ * @since  3.2
  */
 class ConfigControllerComponentSave extends JControllerBase
 {
@@ -38,7 +36,7 @@ public function execute()
 		// Check for request forgeries.
 		if (!JSession::checkToken())
 		{
-			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
 			$this->app->redirect('index.php');
 		}
 
@@ -50,14 +48,21 @@ public function execute()
 		$data   = $this->input->get('jform', array(), 'array');
 		$id     = $this->input->getInt('id');
 		$option = $this->input->get('component');
+		$user   = JFactory::getUser();
 
-		// Check if the user is authorized to do this.
-		if (!JFactory::getUser()->authorise('core.admin', $option))
+		// Check if the user is authorised to do this.
+		if (!$user->authorise('core.admin', $option) && !$user->authorise('core.options', $option))
 		{
-			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 			$this->app->redirect('index.php');
 		}
 
+		// Remove the permissions rules data if user isn't allowed to edit them.
+		if (!$user->authorise('core.admin', $option) && isset($data['params']) && isset($data['params']['rules']))
+		{
+			unset($data['params']['rules']);
+		}
+
 		$returnUri = $this->input->post->get('return', null, 'base64');
 
 		$redirect = '';
@@ -109,7 +114,7 @@ public function execute()
 		switch ($this->options[3])
 		{
 			case 'apply':
-				$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'));
+				$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'), 'message');
 				$this->app->redirect(JRoute::_('index.php?option=com_config&view=component&component=' . $option . $redirect, false));
 
 				break;
@@ -123,6 +128,12 @@ public function execute()
 					$redirect = base64_decode($returnUri);
 				}
 
+				// Don't redirect to an external URL.
+				if (!JUri::isInternal($redirect))
+				{
+					$redirect = JUri::base();
+				}
+
 				$this->app->redirect(JRoute::_($redirect, false));
 
 				break;

diff --git a/app/administrator/components/com_config/controller/display.php b/app/administrator/components/com_config/controller/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */