Merge commit '9a760bb' into 390-merge6

Author: wilsonge

administrator/components/com_actionlogs/access.xml

@@ -31,20 +31,4 @@
 			default="com_banners,com_cache,com_categories,com_config,com_contact,com_content,com_installer,com_media,com_menus,com_messages,com_modules,com_newsfeeds,com_plugins,com_redirect,com_tags,com_templates,com_users"
 		/>
 	</fieldset>
-	<fieldset
-		name="permissions"
-		label="JCONFIG_PERMISSIONS_LABEL"
-		description="JCONFIG_PERMISSIONS_DESC"
-	>
-		<field
-			name="rules"
-			type="rules"
-			label="JCONFIG_PERMISSIONS_LABEL"
-			class="inputbox"
-			validate="rules"
-			filter="rules"
-			component="com_actionlogs"
-			section="component"
-		/>
-	</fieldset>
-</config>
+</config>

administrator/components/com_actionlogs/config.xml

@@ -28,18 +28,6 @@ class ActionlogsController extends JControllerLegacy
 	 */
 	public function display($cachable = false, $urlparams = array())
 	{
-		$view = $this->input->get('view', 'actionlogs');
-
-		switch ($view)
-		{
-			case 'actionlogs':
-				if (!JFactory::getUser()->authorise('core.viewlogs', 'com_actionlogs'))
-				{
-					throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
-				}
-				break;
-		}
-
 		return parent::display();
 	}
 }

administrator/components/com_actionlogs/controller.php

@@ -110,13 +110,6 @@ public function exportLogs()
 	 */
 	public function delete()
 	{
-		if (!JFactory::getUser()->authorise('core.delete', $this->option))
-		{
-			JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
-
-			return;
-		}
-
 		parent::delete();
 	}
 

administrator/components/com_actionlogs/controllers/actionlogs.php

@@ -102,19 +102,11 @@ protected function addToolbar()
 	{
 		JToolbarHelper::title(JText::_('COM_ACTIONLOGS_MANAGER_USERLOGS'));
 
-		if (JFactory::getUser()->authorise('core.delete', 'com_actionlogs'))
-		{
-			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'actionlogs.delete');
-			$bar = JToolbar::getInstance('toolbar');
-			$bar->appendButton('Confirm', 'COM_ACTIONLOGS_PURGE_CONFIRM', 'delete', 'COM_ACTIONLOGS_TOOLBAR_PURGE', 'actionlogs.purge', false);
-		}
-
-		if (JFactory::getUser()->authorise('core.admin', 'com_actionlogs') || JFactory::getUser()->authorise('core.options', 'com_actionlogs'))
-		{
-			JToolbarHelper::preferences('com_actionlogs');
-		}
+		JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'actionlogs.delete');
+		$bar = JToolbar::getInstance('toolbar');
+		$bar->appendButton('Confirm', 'COM_ACTIONLOGS_PURGE_CONFIRM', 'delete', 'COM_ACTIONLOGS_TOOLBAR_PURGE', 'actionlogs.purge', false);
+		JToolbarHelper::preferences('com_actionlogs');
 		JToolbarHelper::help('JHELP_COMPONENTS_ACTIONLOGS');
-
 		JToolBarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
 		JToolBarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);
 	}

administrator/components/com_actionlogs/views/actionlogs/view.html.php

@@ -7,6 +7,8 @@ CREATE TABLE IF NOT EXISTS `#__privacy_consents` (
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `subject` varchar(25) NOT NULL DEFAULT '',
   `body` text NOT NULL,
+  `remind` tinyint(4) NOT NULL DEFAULT '0',
+  `token` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql

@@ -11,6 +11,8 @@ CREATE TABLE "#__privacy_consents" (
   "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
   "subjext" varchar(255) DEFAULT '' NOT NULL,
   "body" text NOT NULL,
+  "remind" smallint DEFAULT 0 NOT NULL,
+  "token" varchar(100) DEFAULT '' NOT NULL,
   PRIMARY KEY ("id")
 );
 CREATE INDEX "#__privacy_consents_idx_user_id" ON "#__privacy_consents" ("user_id");

administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-24.sql

@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_privacy
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Table interface class for the #__privacy_consents table
+ *
+ * @property   integer  $id                        Item ID (primary key)
+ * @property   integer  $remind                    The status of the reminder request
+ * @property   string   $token                     Hashed token for the reminder request
+ * @property   integer  $user_id                   User ID (pseudo foreign key to the #__users table) if the request is associated to a user account
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PrivacyTableConsent extends JTable
+{
+	/**
+	 * The class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct(JDatabaseDriver $db)
+	{
+		parent::__construct('#__privacy_consents', 'id', $db);
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+
+		// Set default values for new records
+		if (!$this->id)
+		{
+			if (!$this->remind)
+			{
+				$this->remind = '0';
+			}
+
+			if (!$this->created)
+			{
+				$this->created = $date->toSql();
+			}
+		}
+
+		return parent::store($updateNulls);
+	}
+}

administrator/components/com_privacy/tables/consent.php

@@ -79,7 +79,6 @@
 				<tbody>
 					<?php foreach ($this->items as $i => $item) : ?>
 						<?php
-						$canView         = $user->authorise('core.manage', 'com_privacy');
 						$itemRequestedAt = new JDate($item->requested_at);
 						?>
 						<tr class="row<?php echo $i % 2; ?>">
@@ -98,13 +97,9 @@
 								<?php echo JHtml::_('PrivacyHtml.helper.statusLabel', $item->status); ?>
 							</td>
 							<td>
-								<?php if ($canView) : ?>
-									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=request&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_VIEW'); ?>">
-										<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
-									</a>
-								<?php else : ?>
+								<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=request&id=' . (int) $item->id); ?>" title="<?php echo JText::_('COM_PRIVACY_ACTION_VIEW'); ?>">
 									<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
-								<?php endif; ?>
+								</a>
 								<?php if ($item->status == 1 && $urgentRequestDate >= $itemRequestedAt) : ?>
 									<span class="label"><?php echo JText::_('COM_PRIVACY_BADGE_URGENT_REQUEST'); ?></span>
 								<?php endif; ?>

administrator/components/com_privacy/views/requests/tmpl/default.php

@@ -11,6 +11,8 @@ COM_PRIVACY_CONSENTS_VIEW_DEFAULT_DESC="Shows a list of user consents"
 COM_PRIVACY_CONSENTS_VIEW_DEFAULT_TITLE="Privacy: Consents"
 COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_DESC="A dashboard related to the site's privacy settings and information requests."
 COM_PRIVACY_DASHBOARD_VIEW_DEFAULT_TITLE="Privacy: Dashboard"
+COM_PRIVACY_REMIND_VIEW_DEFAULT_DESC="Displays a form to extend the privacy consent"
+COM_PRIVACY_REMIND_VIEW_DEFAULT_TITLE="Extend Consent"
 COM_PRIVACY_REQUEST_VIEW_DEFAULT_DESC="Displays a form to submit an information request."
 COM_PRIVACY_REQUEST_VIEW_DEFAULT_OPTION="Default"
 COM_PRIVACY_REQUEST_VIEW_DEFAULT_TITLE="Create Request"