Merge pull request #24375 from wilsonge/390-merge6

Joomla 3.9.0 Part #6
joomla · Mar 28, 2019 · 81ed3dd · 81ed3dd
2 parents f2454ff + e07e3a5
commit 81ed3dd
Show file tree

Hide file tree

Showing 100 changed files with 2,578 additions and 329 deletions.
diff --git a/administrator/components/com_actionlogs/access.xml b/administrator/components/com_actionlogs/access.xml
diff --git a/administrator/components/com_actionlogs/config.xml b/administrator/components/com_actionlogs/config.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>
diff --git a/administrator/components/com_actionlogs/controller.php b/administrator/components/com_actionlogs/controller.php
@@ -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();
 	}
 }
diff --git a/administrator/components/com_actionlogs/controllers/actionlogs.php b/administrator/components/com_actionlogs/controllers/actionlogs.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();
 	}
 

diff --git a/administrator/components/com_actionlogs/helpers/actionlogs.php b/administrator/components/com_actionlogs/helpers/actionlogs.php
@@ -189,4 +189,74 @@ public static function getContentTypeLink($component, $contentType, $id, $urlVar
 		// Return default link to avoid having to implement getContentTypeLink in most of our components
 		return 'index.php?option=' . $component . '&task=' . $contentType . '.edit&' . $urlVar . '=' . $id;
 	}
+
+	/**
+	 * Load both enabled and disabled actionlog plugins language file. It is used to make sure actions log is
+	 * displayed properly instead of only language items displayed when a plugin is disabled
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function loadActionLogPluginsLanguage()
+	{
+		$lang = JFactory::getLanguage();
+		$db   = JFactory::getDbo();
+
+		// Get all (both enabled and disabled) actionlog plugins
+		$query = $db->getQuery(true)
+			->select(
+				$db->quoteName(
+					array(
+						'folder',
+						'element',
+						'params',
+						'extension_id'
+					),
+					array(
+						'type',
+						'name',
+						'params',
+						'id'
+					)
+				)
+			)
+			->from('#__extensions')
+			->where('type = ' . $db->quote('plugin'))
+			->where('folder = ' . $db->quote('actionlog'))
+			->where('state IN (0,1)')
+			->order('ordering');
+		$db->setQuery($query);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+		}
+
+		if (empty($rows))
+		{
+			return;
+		}
+
+		foreach ($rows as $row)
+		{
+			$name      = $row->name;
+			$type      = $row->type;
+			$extension = 'Plg_' . $type . '_' . $name;
+			$extension = strtolower($extension);
+
+			// If language already loaded, don't load it again.
+			if ($lang->getPaths($extension))
+			{
+				continue;
+			}
+
+			$lang->load($extension, JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($extension, JPATH_PLUGINS . '/' . $type . '/' . $name, null, false, true);
+		}
+	}
 }
diff --git a/administrator/components/com_actionlogs/layouts/logstable.php b/administrator/components/com_actionlogs/layouts/logstable.php
@@ -12,6 +12,7 @@
 JFactory::getLanguage()->load("com_actionlogs", JPATH_ADMINISTRATOR, null, false, true);
 
 $messages = $displayData['messages'];
+$showIpColumn = $displayData['showIpColumn'];
 ?>
 <h1>
 	<?php echo JText::_('COM_ACTIONLOGS_EMAIL_SUBJECT'); ?>
@@ -25,22 +26,21 @@
 		<th><?php echo JText::_('COM_ACTIONLOGS_DATE'); ?></th>
 		<th><?php echo JText::_('COM_ACTIONLOGS_EXTENSION'); ?></th>
 		<th><?php echo JText::_('COM_ACTIONLOGS_NAME'); ?></th>
-		<th><?php echo JText::_('COM_ACTIONLOGS_IP_ADDRESS'); ?></th>
+		<?php if ($showIpColumn) : ?>
+			<th><?php echo JText::_('COM_ACTIONLOGS_IP_ADDRESS'); ?></th>
+		<?php endif; ?>
 	</thead>
 	<tbody>
-        <?php
-            foreach ($messages as $message)
-            {
-            ?>
-                <tr>
-                    <td><?php echo $message->message; ?></td>
-                    <td><?php echo $message->log_date; ?></td>
-                    <td><?php echo $message->extension; ?></td>
-                    <td><?php echo $displayData['username']; ?></td>
-                    <td><?php echo $message->ip_address; ?></td>
-                </tr>
-            <?php
-            }
-        ?>
+		<?php foreach ($messages as $message) : ?>
+			<tr>
+				<td><?php echo $message->message; ?></td>
+				<td><?php echo $message->log_date; ?></td>
+				<td><?php echo $message->extension; ?></td>
+				<td><?php echo $displayData['username']; ?></td>
+				<?php if ($showIpColumn) : ?>
+					<td><?php echo JText::_($message->ip_address); ?></td>
+				<?php endif; ?>
+			</tr>
+		<?php endforeach; ?>
 	</tbody>
 </table>
diff --git a/administrator/components/com_actionlogs/models/actionlog.php b/administrator/components/com_actionlogs/models/actionlog.php
@@ -90,8 +90,10 @@ public function addLogsToDb($messages, $messageLanguageKey, $context, $userId =
 	 */
 	protected function sendNotificationEmails($messages, $username, $context)
 	{
-		$db = $this->getDbo();
-		$query = $db->getQuery(true);
+		$db           = $this->getDbo();
+		$query        = $db->getQuery(true);
+		$params       = ComponentHelper::getParams('com_actionlogs');
+		$showIpColumn = (bool) $params->get('ip_logging', 0);
 
 		$query->select($db->quoteName(array('email', 'params')))
 			->from($db->quoteName('#__users'))
@@ -138,8 +140,9 @@ protected function sendNotificationEmails($messages, $username, $context)
 		}
 
 		$displayData = array(
-			'messages' => $messages,
-			'username' => $username,
+			'messages'     => $messages,
+			'username'     => $username,
+			'showIpColumn' => $showIpColumn,
 		);
 
 		$body   = $layout->render($displayData);

diff --git a/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php b/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.php
@@ -62,7 +62,7 @@
 					<th>
 						<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_NAME', 'a.user_id', $listDirn, $listOrder); ?>
 					</th>
-					<?php if ($this->ip) : ?>
+					<?php if ($this->showIpColumn) : ?>
 						<th>
 							<?php echo JHtml::_('searchtools.sort', 'COM_ACTIONLOGS_IP_ADDRESS', 'a.ip_address', $listDirn, $listOrder); ?>
 						</th>
@@ -96,7 +96,7 @@
 							<td>
 								<?php echo $item->name; ?>
 							</td>
-							<?php if ($this->ip) : ?>
+							<?php if ($this->showIpColumn) : ?>
 								<td>
 									<?php echo JText::_($this->escape($item->ip_address)); ?>
 								</td>

diff --git a/administrator/components/com_actionlogs/views/actionlogs/view.html.php b/administrator/components/com_actionlogs/views/actionlogs/view.html.php
@@ -9,6 +9,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\Registry\Registry;
 use Joomla\CMS\Plugin\PluginHelper;
 
@@ -66,17 +67,14 @@ class ActionlogsViewActionlogs extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		if (PluginHelper::isEnabled('system', 'actionlogs'))
-		{
-			$params   = new Registry(PluginHelper::getPlugin('system', 'actionlogs')->params);
-			$this->ip = (bool) $params->get('ip_logging', 0);
-		}
+		$params = ComponentHelper::getParams('com_actionlogs');
 
 		$this->items         = $this->get('Items');
 		$this->state         = $this->get('State');
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
 		$this->pagination    = $this->get('Pagination');
+		$this->showIpColumn  = (bool) $params->get('ip_logging', 0);
 
 		if (count($errors = $this->get('Errors')))
 		{
@@ -87,6 +85,9 @@ public function display($tpl = null)
 
 		$this->addToolBar();
 
+		// Load all actionlog plugins language files
+		ActionlogsHelper::loadActionLogPluginsLanguage();
+
 		parent::display($tpl);
 	}
 
@@ -101,18 +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);
 	}

diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-05-24.sql
@@ -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;
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-13.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-13.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-17.sql b/administrator/components/com_admin/sql/updates/mysql/3.9.0-2018-06-17.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-03.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-03.sql
@@ -1,2 +1,2 @@
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(481, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(482, 0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-19.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-19.sql
@@ -1,2 +1,2 @@
 INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(482, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(481, 0, 'plg_fields_repeatable', 'plugin', 'repeatable', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-05-24.sql b/administrator/components/com_admin/sql/updates/postgresql/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");
diff --git a/...sql/updates/sqlazure/3.9.0-2018-06-12.sql → ...l/updates/postgresql/3.9.0-2018-06-13.sql b/...sql/updates/sqlazure/3.9.0-2018-06-12.sql → ...l/updates/postgresql/3.9.0-2018-06-13.sql
@@ -1,3 +1,2 @@
-INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state")
-VALUES
-(320, 0, 'mod_privacy_dashboard', 'module', 'mod_privacy_dashboard', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0);
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(488, 0, 'plg_quickicon_privacycheck', 'plugin', 'privacycheck', 'quickicon', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-17.sql b/administrator/components/com_admin/sql/updates/postgresql/3.9.0-2018-06-17.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(489, 0, 'plg_user_terms', 'plugin', 'terms', 'user', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-06-14.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.9.0-2018-06-14.sql
diff --git a/administrator/components/com_installer/Model/InstallModel.php b/administrator/components/com_installer/Model/InstallModel.php
@@ -183,29 +183,6 @@ public function install()
 			}
 		}
 
-		// Check the package
-		$children = $installer->manifest->updateservers->children();
-
-		foreach ($children as $child)
-		{
-			$check = InstallerHelper::isChecksumValid($package['packagefile'], (string) $child);
-
-			switch ($check)
-			{
-				case 0:
-					$app->enqueueMessage(Text::_('COM_INSTALLER_INSTALL_CHECKSUM_WRONG'), 'warning');
-					break;
-
-				case 1:
-					$app->enqueueMessage(Text::_('COM_INSTALLER_INSTALL_CHECKSUM_CORRECT'), 'message');
-					break;
-
-				case 2:
-					$app->enqueueMessage(Text::_('COM_INSTALLER_INSTALL_CHECKSUM_NOT_FOUND'), 'notice');
-					break;
-			}
-		}
-
 		// Was the package unpacked?
 		if (!$package || !$package['type'])
 		{