Skip to content
Permalink
Browse files

Prepare 3.8.13 release

  • Loading branch information...
mbabker committed Sep 30, 2018
1 parent ff3b587 commit 27ca70a097a3d64f958bfee77a21f33002c33bfc
@@ -26,6 +26,9 @@ class InstallerControllerDatabase extends JControllerLegacy
*/
public function fix()
{
// Check for request forgeries.
$this->checkToken();
$model = $this->getModel('database');
$model->fix();
@@ -25,6 +25,8 @@ class InstallerControllerDiscover extends JControllerLegacy
*/
public function refresh()
{
$this->checkToken();
$model = $this->getModel('discover');
$model->discover();
$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false));
@@ -39,6 +41,8 @@ public function refresh()
*/
public function install()
{
$this->checkToken();
$this->getModel('discover')->discover_install();
$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false));
}
@@ -52,6 +56,8 @@ public function install()
*/
public function purge()
{
$this->checkToken();
$model = $this->getModel('discover');
$model->purge();
$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false), $model->_message);
@@ -9,7 +9,7 @@
defined('_JEXEC') or die;
if (!JFactory::getUser()->authorise('core.manage', 'com_joomlaupdate'))
if (!JFactory::getUser()->authorise('core.admin', 'com_joomlaupdate'))
{
throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
}
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metafile version="3.8" client="administrator">
<name>English (en-GB)</name>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
@@ -2,8 +2,8 @@
<extension version="3.8" client="administrator" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
@@ -6,8 +6,8 @@
<authorUrl>www.joomla.org</authorUrl>
<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<description>FILES_JOOMLA_XML_DESCRIPTION</description>

<scriptfile>administrator/components/com_admin/script.php</scriptfile>
@@ -2,8 +2,8 @@
<extension type="package" version="3.8" method="upgrade">
<name>English (en-GB) Language Pack</name>
<packagename>en-GB</packagename>
<version>3.8.12.1</version>
<creationDate>August 2018</creationDate>
<version>3.8.13.1</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
@@ -318,6 +318,10 @@ protected function preprocess($items)
{
continue;
}
elseif ($item->element === 'com_joomlaupdate' && !$user->authorise('core.admin'))
{
continue;
}
elseif ($item->element === 'com_admin')
{
parse_str($item->link, $query);
@@ -51,10 +51,37 @@ public function submit()
$id = (int) $stub;
// Get the data from POST
$data = $this->input->post->get('jform', array(), 'array');
$data = $this->input->post->get('jform', array(), 'array');
// Get item
$model->setState('filter.published', 1);
$contact = $model->getItem($id);
$params->merge($contact->params);
// Get item params, take menu parameters into account if necessary
$active = $app->getMenu()->getActive();
$stateParams = clone $model->getState()->get('params');
// If the current view is the active item and a contact view for this contact, then the menu item params take priority
if ($active && strpos($active->link, 'view=contact') && strpos($active->link, '&id=' . (int) $contact->id))
{
// $item->params are the contact params, $temp are the menu item params
// Merge so that the menu item params take priority
$contact->params->merge($stateParams);
}
else
{
// Current view is not a single contact, so the contact params take priority here
$stateParams->merge($contact->params);
$contact->params = $stateParams;
}
// Check if the contact form is enabled
if (!$contact->params->get('show_email_form'))
{
$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contact&id=' . $stub, false));
return false;
}
// Check for a valid session cookie
if ($params->get('validate_session', 0))
@@ -34,6 +34,7 @@ public function searchAjax()
'flanguage' => $app->input->get('flanguage', null, 'word'),
'published' => $app->input->get('published', 1, 'int'),
'parent_id' => $app->input->get('parent_id', 0, 'int'),
'access' => $user->getAuthorisedViewLevels(),
);
if ((!$user->authorise('core.edit.state', 'com_tags')) && (!$user->authorise('core.edit', 'com_tags')))
@@ -58,6 +58,44 @@ public function activate()
return false;
}
// Get the User ID
$userIdToActivate = $model->getUserIdFromToken($token);
if (!$userIdToActivate)
{
JError::raiseError(403, JText::_('COM_USERS_ACTIVATION_TOKEN_NOT_FOUND'));
return false;
}
// Get the user we want to activate
$userToActivate = JFactory::getUser($userIdToActivate);
// Admin activation is on and admin is activating the account
if (($uParams->get('useractivation') == 2) && $userToActivate->getParam('activate', 0))
{
// If a user admin is not logged in, redirect them to the login page with a error message
if (!$user->authorise('core.create', 'com_users'))
{
$activationUrl = 'index.php?option=com_users&task=registration.activate&token=' . $token;
$loginUrl = 'index.php?option=com_users&view=login&return=' . base64_encode($activationUrl);
// In case we still run into this in the second step the user does not have the right permissions
$message = JText::_('COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION_PERMISSIONS');
// When we are not logged in we should login
if ($user->guest)
{
$message = JText::_('COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION');
}
$this->setMessage($message);
$this->setRedirect(JRoute::_($loginUrl, false));
return false;
}
}
// Attempt to activate the user.
$return = $model->activate($token);
@@ -43,18 +43,16 @@ public function __construct($config = array())
}
/**
* Method to activate a user account.
* Method to get the user ID from the given token
*
* @param string $token The activation token.
*
* @return mixed False on failure, user object on success.
* @return mixed False on failure, id of the user on success
*
* @since 1.6
* @since __DEPLOY_VERSION__
*/
public function activate($token)
public function getUserIdFromToken($token)
{
$config = JFactory::getConfig();
$userParams = JComponentHelper::getParams('com_users');
$db = $this->getDbo();
// Get the user id based on the token.
@@ -68,14 +66,30 @@ public function activate($token)
try
{
$userId = (int) $db->loadResult();
return (int) $db->loadResult();
}
catch (RuntimeException $e)
{
$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
return false;
}
}
/**
* Method to activate a user account.
*
* @param string $token The activation token.
*
* @return mixed False on failure, user object on success.
*
* @since 1.6
*/
public function activate($token)
{
$config = JFactory::getConfig();
$userParams = JComponentHelper::getParams('com_users');
$userId = $this->getUserIdFromToken($token);
// Check for a valid user id.
if (!$userId)
@@ -131,7 +145,8 @@ public function activate($token)
);
// Get all admin users
$query->clear()
$db = $this->getDbo();
$query = $db->getQuery(true)
->select($db->quoteName(array('name', 'email', 'sendEmail', 'id')))
->from($db->quoteName('#__users'))
->where($db->quoteName('sendEmail') . ' = 1')
@@ -3,8 +3,8 @@
version="3.8"
client="installation">
<name>English (United Kingdom)</name>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -114,6 +114,8 @@ COM_USERS_REGISTER_USERNAME_DESC="Enter your desired username."
COM_USERS_REGISTER_USERNAME_LABEL="Username"
COM_USERS_REGISTER_USERNAME_MESSAGE="The username you entered is not available. Please pick another username."
COM_USERS_REGISTRATION="User Registration"
COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION="Please log in to confirm that you are authorised to activate new accounts."
COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION_PERMISSIONS="You are not authorised to activate new accounts, please login with a privileged account."
COM_USERS_REGISTRATION_ACTIVATE_SUCCESS="Your Account has been activated. You can now log in using the username and password you chose during the registration."
COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED="An error was encountered while sending activation notification email"
COM_USERS_REGISTRATION_ACTIVATION_SAVE_FAILED="Failed to save activation data: %s"
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metafile version="3.8" client="site">
<name>English (en-GB)</name>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
@@ -2,8 +2,8 @@
<extension version="3.8" client="site" type="language" method="upgrade">
<name>English (en-GB)</name>
<tag>en-GB</tag>
<version>3.8.12</version>
<creationDate>August 2018</creationDate>
<version>3.8.13</version>
<creationDate>October 2018</creationDate>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
@@ -954,6 +954,13 @@ public static function searchTags($filters = array())
$query->where('a.published = ' . (int) $filters['published']);
}
// Filter on the access level
if (isset($filters['access']) && is_array($filters['access']) && count($filters['access']))
{
$groups = ArrayHelper::toInteger($filters['access']);
$query->where('a.access IN (' . implode(",", $groups) . ')');
}
// Filter by parent_id
if (isset($filters['parent_id']) && is_numeric($filters['parent_id']))
{
@@ -49,7 +49,7 @@ final class Version
* @var integer
* @since 3.8.0
*/
const PATCH_VERSION = 12;
const PATCH_VERSION = 13;
/**
* Extra release version info.
@@ -78,7 +78,7 @@ final class Version
* @since 3.5
* @deprecated 4.0 Use separated version constants instead
*/
const DEV_LEVEL = '12';
const DEV_LEVEL = '13';
/**
* Development status.
@@ -111,7 +111,7 @@ final class Version
* @var string
* @since 3.5
*/
const RELDATE = '28-August-2018';
const RELDATE = '9-October-2018';
/**
* Release time.

0 comments on commit 27ca70a

Please sign in to comment.
You can’t perform that action at this time.