+
$this)); ?>
items)) : ?>
+
-
+
+
+ ,
+
- |
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
- |
- showIpColumn) : ?>
-
-
- |
-
-
-
- |
-
-
- |
- pagination->getListFooter(); ?>
+ |
+
|
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+ showIpColumn) : ?>
+
+
+ |
+
+
+
+ |
-
+
items as $i => $item) :
$extension = strtok($item->extension, '.');
ActionlogsHelper::loadTranslationFiles($extension); ?>
-
+
|
id); ?>
|
-
+ |
-
+ |
escape(Text::_($extension)); ?>
|
-
- log_date); ?>
-
+ log_date); ?>
+
+ log_date, Text::_('DATE_FORMAT_LC6')); ?>
+
|
name; ?>
@@ -130,6 +128,10 @@
|
+
+
+ pagination->getListFooter(); ?>
+
diff --git a/administrator/components/com_actionlogs/views/actionlogs/tmpl/default.xml b/administrator/components/com_actionlogs/tmpl/actionlogs/default.xml
similarity index 100%
rename from administrator/components/com_actionlogs/views/actionlogs/tmpl/default.xml
rename to administrator/components/com_actionlogs/tmpl/actionlogs/default.xml
diff --git a/administrator/components/com_admin/Model/SysinfoModel.php b/administrator/components/com_admin/Model/SysinfoModel.php
index acb50cf8eb7be..0bba09c258748 100644
--- a/administrator/components/com_admin/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/Model/SysinfoModel.php
@@ -24,7 +24,7 @@
*
* @since 1.6
*/
-class SysInfoModel extends BaseDatabaseModel
+class SysinfoModel extends BaseDatabaseModel
{
/**
* Some PHP settings
@@ -530,7 +530,7 @@ public function getDirectory($public = false)
foreach ($admin_langs as $folder)
{
- if (!$folder->isDir() || $folder->isDot())
+ if ($folder->isDot() || !$folder->isDir())
{
continue;
}
@@ -546,7 +546,7 @@ public function getDirectory($public = false)
foreach ($manifests as $folder)
{
- if (!$folder->isDir() || $folder->isDot())
+ if ($folder->isDot() || !$folder->isDir())
{
continue;
}
@@ -569,7 +569,7 @@ public function getDirectory($public = false)
foreach ($image_folders as $folder)
{
- if (!$folder->isDir() || $folder->isDot())
+ if ($folder->isDot() || !$folder->isDir())
{
continue;
}
@@ -587,7 +587,7 @@ public function getDirectory($public = false)
foreach ($site_langs as $folder)
{
- if (!$folder->isDir() || $folder->isDot())
+ if ($folder->isDot() || !$folder->isDir())
{
continue;
}
@@ -605,7 +605,7 @@ public function getDirectory($public = false)
foreach ($plugin_groups as $folder)
{
- if (!$folder->isDir() || $folder->isDot())
+ if ($folder->isDot() || !$folder->isDir())
{
continue;
}
diff --git a/administrator/components/com_admin/View/Help/HtmlView.php b/administrator/components/com_admin/View/Help/HtmlView.php
index 086ce8e1e3c14..b7decaebae9d3 100644
--- a/administrator/components/com_admin/View/Help/HtmlView.php
+++ b/administrator/components/com_admin/View/Help/HtmlView.php
@@ -11,9 +11,11 @@
defined('_JEXEC') or die;
+use Exception;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Admin\Administrator\Model\HelpModel;
/**
* HTML View class for the Admin component
@@ -28,7 +30,7 @@ class HtmlView extends BaseHtmlView
* @var string
* @since 1.6
*/
- protected $help_search = null;
+ protected $helpSearch = null;
/**
* The page to be viewed
@@ -44,7 +46,7 @@ class HtmlView extends BaseHtmlView
* @var string
* @since 1.6
*/
- protected $lang_tag = null;
+ protected $languageTag = null;
/**
* Table of contents
@@ -52,7 +54,7 @@ class HtmlView extends BaseHtmlView
* @var array
* @since 1.6
*/
- protected $toc = array();
+ protected $toc = [];
/**
* URL for the latest version check
@@ -60,36 +62,32 @@ class HtmlView extends BaseHtmlView
* @var string
* @since 1.6
*/
- protected $latest_version_check = 'https://downloads.joomla.org/latest';
-
- /**
- * URL for the start here link
- *
- * @var string
- * @since 1.6
- */
- protected $start_here = null;
+ protected $latestVersionCheck = 'https://downloads.joomla.org/latest';
/**
* Execute and display a template script.
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
- * @return mixed A string if successful, otherwise an Error object.
+ * @return void
*
* @since 1.6
+ *
+ * @throws Exception
*/
- public function display($tpl = null)
+ public function display($tpl = null): void
{
- $this->help_search = $this->get('HelpSearch');
- $this->page = $this->get('Page');
- $this->toc = $this->get('Toc');
- $this->lang_tag = $this->get('LangTag');
- $this->latest_version_check = $this->get('LatestVersionCheck');
+ /** @var HelpModel $model */
+ $model = $this->getModel();
+ $this->helpSearch = $model->getHelpSearch();
+ $this->page = $model->getPage();
+ $this->toc = $model->getToc();
+ $this->languageTag = $model->getLangTag();
+ $this->latestVersionCheck = $model->getLatestVersionCheck();
$this->addToolbar();
- return parent::display($tpl);
+ parent::display($tpl);
}
/**
@@ -99,7 +97,7 @@ public function display($tpl = null)
*
* @since 1.6
*/
- protected function addToolbar()
+ protected function addToolbar(): void
{
ToolbarHelper::title(Text::_('COM_ADMIN_HELP'), 'support help_header');
}
diff --git a/administrator/components/com_admin/View/Sysinfo/HtmlView.php b/administrator/components/com_admin/View/Sysinfo/HtmlView.php
index f361e6c184690..098395038294c 100644
--- a/administrator/components/com_admin/View/Sysinfo/HtmlView.php
+++ b/administrator/components/com_admin/View/Sysinfo/HtmlView.php
@@ -11,12 +11,14 @@
defined('_JEXEC') or die;
+use Exception;
use Joomla\CMS\Access\Exception\Notallowed;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@@ -31,7 +33,7 @@ class HtmlView extends BaseHtmlView
* @var array
* @since 1.6
*/
- protected $php_settings = array();
+ protected $phpSettings = [];
/**
* Config values
@@ -39,7 +41,7 @@ class HtmlView extends BaseHtmlView
* @var array
* @since 1.6
*/
- protected $config = array();
+ protected $config = [];
/**
* Some system values
@@ -47,7 +49,7 @@ class HtmlView extends BaseHtmlView
* @var array
* @since 1.6
*/
- protected $info = array();
+ protected $info = [];
/**
* PHP info
@@ -55,7 +57,7 @@ class HtmlView extends BaseHtmlView
* @var string
* @since 1.6
*/
- protected $php_info = null;
+ protected $phpInfo = null;
/**
* Information about writable state of directories
@@ -63,18 +65,20 @@ class HtmlView extends BaseHtmlView
* @var array
* @since 1.6
*/
- protected $directory = array();
+ protected $directory = [];
/**
* Execute and display a template script.
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
- * @return mixed A string if successful, otherwise an Error object.
+ * @return void
*
* @since 1.6
+ *
+ * @throws Exception
*/
- public function display($tpl = null)
+ public function display($tpl = null): void
{
// Access check.
if (!Factory::getUser()->authorise('core.admin'))
@@ -82,15 +86,17 @@ public function display($tpl = null)
throw new Notallowed(Text::_('JERROR_ALERTNOAUTHOR'), 403);
}
- $this->php_settings = $this->get('PhpSettings');
- $this->config = $this->get('config');
- $this->info = $this->get('info');
- $this->php_info = $this->get('PhpInfo');
- $this->directory = $this->get('directory');
+ /** @var SysinfoModel $model */
+ $model = $this->getModel();
+ $this->phpSettings = $model->getPhpSettings();
+ $this->config = $model->getconfig();
+ $this->info = $model->getinfo();
+ $this->phpInfo = $model->getPhpInfo();
+ $this->directory = $model->getdirectory();
$this->addToolbar();
- return parent::display($tpl);
+ parent::display($tpl);
}
/**
@@ -100,11 +106,19 @@ public function display($tpl = null)
*
* @since 1.6
*/
- protected function addToolbar()
+ protected function addToolbar(): void
{
ToolbarHelper::title(Text::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo');
- ToolbarHelper::link(Route::_('index.php?option=com_admin&view=sysinfo&format=text'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT', 'download');
- ToolbarHelper::link(Route::_('index.php?option=com_admin&view=sysinfo&format=json'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON', 'download');
+ ToolbarHelper::link(
+ Route::_('index.php?option=com_admin&view=sysinfo&format=text'),
+ 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT',
+ 'download'
+ );
+ ToolbarHelper::link(
+ Route::_('index.php?option=com_admin&view=sysinfo&format=json'),
+ 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON',
+ 'download'
+ );
ToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
}
}
diff --git a/administrator/components/com_admin/View/Sysinfo/JsonView.php b/administrator/components/com_admin/View/Sysinfo/JsonView.php
index f92afdfc71e4b..22cec05a34f10 100644
--- a/administrator/components/com_admin/View/Sysinfo/JsonView.php
+++ b/administrator/components/com_admin/View/Sysinfo/JsonView.php
@@ -11,10 +11,12 @@
defined('_JEXEC') or die;
+use Exception;
use Joomla\CMS\Access\Exception\Notallowed;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\AbstractView;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@@ -28,11 +30,13 @@ class JsonView extends AbstractView
*
* @param string $tpl The name of the template file to parse; automatically searches through the template paths.
*
- * @return mixed A string if successful, otherwise an Error object.
+ * @return void
*
* @since 3.5
+ *
+ * @throws Exception
*/
- public function display($tpl = null)
+ public function display($tpl = null): void
{
// Access check.
if (!Factory::getUser()->authorise('core.admin'))
@@ -58,18 +62,18 @@ public function display($tpl = null)
*
* @since 3.5
*/
- protected function getLayoutData()
+ protected function getLayoutData(): array
{
- /* @var \Joomla\Component\Admin\Administrator\Model\SysInfoModel $model */
+ /** @var SysinfoModel $model */
$model = $this->getModel();
- return array(
+ return [
'info' => $model->getSafeData('info'),
'phpSettings' => $model->getSafeData('phpSettings'),
'config' => $model->getSafeData('config'),
'directories' => $model->getSafeData('directory', true),
'phpInfo' => $model->getSafeData('phpInfoArray'),
'extensions' => $model->getSafeData('extensions')
- );
+ ];
}
}
diff --git a/administrator/components/com_admin/View/Sysinfo/TextView.php b/administrator/components/com_admin/View/Sysinfo/TextView.php
index 3f7af346b5e8e..cc12bf42ac3bf 100644
--- a/administrator/components/com_admin/View/Sysinfo/TextView.php
+++ b/administrator/components/com_admin/View/Sysinfo/TextView.php
@@ -11,10 +11,12 @@
defined('_JEXEC') or die;
+use Exception;
use Joomla\CMS\Access\Exception\Notallowed;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\AbstractView;
+use Joomla\Component\Admin\Administrator\Model\SysinfoModel;
/**
* Sysinfo View class for the Admin component
@@ -31,8 +33,10 @@ class TextView extends AbstractView
* @return mixed A string if successful, otherwise an Error object.
*
* @since 3.5
+ *
+ * @throws Exception
*/
- public function display($tpl = null)
+ public function display($tpl = null): void
{
// Access check.
if (!Factory::getUser()->authorise('core.admin'))
@@ -47,7 +51,7 @@ public function display($tpl = null)
$data = $this->getLayoutData();
- $lines = array();
+ $lines = [];
foreach ($data as $sectionName => $section)
{
@@ -75,37 +79,37 @@ public function display($tpl = null)
*
* @since 3.5
*/
- protected function getLayoutData()
+ protected function getLayoutData(): array
{
- /* @var \Joomla\Component\Admin\Administrator\Model\SysInfoModel $model */
+ /** @var SysinfoModel $model */
$model = $this->getModel();
- return array(
- 'info' => array(
+ return [
+ 'info' => [
'title' => Text::_('COM_ADMIN_SYSTEM_INFORMATION', true),
'data' => $model->getSafeData('info')
- ),
- 'phpSettings' => array(
+ ],
+ 'phpSettings' => [
'title' => Text::_('COM_ADMIN_PHP_SETTINGS', true),
'data' => $model->getSafeData('phpSettings')
- ),
- 'config' => array(
+ ],
+ 'config' => [
'title' => Text::_('COM_ADMIN_CONFIGURATION_FILE', true),
'data' => $model->getSafeData('config')
- ),
- 'directories' => array(
+ ],
+ 'directories' => [
'title' => Text::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true),
'data' => $model->getSafeData('directory', true)
- ),
- 'phpInfo' => array(
+ ],
+ 'phpInfo' => [
'title' => Text::_('COM_ADMIN_PHP_INFORMATION', true),
'data' => $model->getSafeData('phpInfoArray')
- ),
- 'extensions' => array(
+ ],
+ 'extensions' => [
'title' => Text::_('COM_ADMIN_EXTENSIONS', true),
'data' => $model->getSafeData('extensions')
- )
- );
+ ]
+ ];
}
/**
@@ -119,9 +123,9 @@ protected function getLayoutData()
*
* @since 3.5
*/
- protected function renderSection($sectionName, $sectionData, $level = 0)
+ protected function renderSection(string $sectionName, array $sectionData, int $level = 0): string
{
- $lines = array();
+ $lines = [];
$margin = ($level > 0) ? str_repeat("\t", $level) : null;
@@ -172,7 +176,7 @@ protected function renderSection($sectionName, $sectionData, $level = 0)
*
* @since 3.5
*/
- protected function renderDirectories($sectionName, $sectionData, $level = -1)
+ protected function renderDirectories(string $sectionName, array $sectionData, int $level = -1): string
{
foreach ($sectionData as $directory => $data)
{
diff --git a/administrator/components/com_admin/postinstall/addnosniff.php b/administrator/components/com_admin/postinstall/addnosniff.php
new file mode 100644
index 0000000000000..83d7780fa8072
--- /dev/null
+++ b/administrator/components/com_admin/postinstall/addnosniff.php
@@ -0,0 +1,27 @@
+setQuery('UPDATE ' . $db->quoteName('#__utf8_conversion')
- . ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';')->execute();
+ . ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';'
+ )->execute();
}
/**
diff --git a/administrator/components/com_admin/services/provider.php b/administrator/components/com_admin/services/provider.php
index 1d3e4f9e6436c..d22033ad9f84e 100644
--- a/administrator/components/com_admin/services/provider.php
+++ b/administrator/components/com_admin/services/provider.php
@@ -1,7 +1,7 @@