This repository has been archived by the owner on Feb 4, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #316 from joomlatools/feature/315-joomla-3.6.5-upg…
…rade Upgrade to Joomla 3.6.5
- Loading branch information
Showing
1,415 changed files
with
67,965 additions
and
37,487 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
app/administrator/components/com_config/controller/application/sendtestmail.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| } | ||
| } |
44 changes: 44 additions & 0 deletions
44
app/administrator/components/com_config/controller/application/store.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.