Skip to content

Commit 560c6fd

Browse files
brianteemanbrianteeman
authored
[5.4] Improve ordering of settings in System Info (#46124)
* [5.4] System Info This is a cosmetic change to the order that settings are displayed in the System Information page. Joomla version is moved to the top as the highest priority Followed by php, database and web server Signed-off-by: BrianTeeman <brian@teeman.net> * update text download to new ordering Signed-off-by: BrianTeeman <brian@teeman.net> --------- Signed-off-by: BrianTeeman <brian@teeman.net>
1 parent bdb871c commit 560c6fd

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

‎administrator/components/com_admin/src/Model/SysinfoModel.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,19 +313,19 @@ public function &getInfo(): array
313313
$db = $this->getDatabase();
314314

315315
$this->info = [
316+
'version' => (new Version())->getLongVersion(),
317+
'compatpluginenabled' => PluginHelper::isEnabled('behaviour', 'compat'),
318+
'compatpluginparameters' => $this->getCompatPluginParameters(),
319+
'phpversion' => PHP_VERSION,
316320
'php' => php_uname(),
317321
'dbserver' => $db->getServerType(),
318322
'dbversion' => $db->getVersion(),
319323
'dbcollation' => $db->getCollation(),
320324
'dbconnectioncollation' => $db->getConnectionCollation(),
321325
'dbconnectionencryption' => $db->getConnectionEncryption(),
322326
'dbconnencryptsupported' => $db->isConnectionEncryptionSupported(),
323-
'phpversion' => PHP_VERSION,
324327
'server' => $_SERVER['SERVER_SOFTWARE'] ?? getenv('SERVER_SOFTWARE'),
325328
'sapi_name' => PHP_SAPI,
326-
'version' => (new Version())->getLongVersion(),
327-
'compatpluginenabled' => PluginHelper::isEnabled('behaviour', 'compat'),
328-
'compatpluginparameters' => $this->getCompatPluginParameters(),
329329
'useragent' => $_SERVER['HTTP_USER_AGENT'] ?? '',
330330
];
331331

‎administrator/components/com_admin/tmpl/sysinfo/default_system.php‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,98 +34,99 @@
3434
<tbody>
3535
<tr>
3636
<th scope="row">
37-
<?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
37+
<?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
3838
</th>
3939
<td>
40-
<?php echo $this->info['php']; ?>
40+
<?php echo $this->info['version']; ?>
4141
</td>
4242
</tr>
4343
<tr>
4444
<th scope="row">
45-
<?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
45+
<?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
4646
</th>
4747
<td>
48-
<?php echo $this->info['dbserver']; ?>
48+
<?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
4949
</td>
5050
</tr>
5151
<tr>
5252
<th scope="row">
53-
<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
53+
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
5454
</th>
5555
<td>
56-
<?php echo $this->info['dbversion']; ?>
56+
<?php echo $this->info['phpversion']; ?>
5757
</td>
5858
</tr>
5959
<tr>
6060
<th scope="row">
61-
<?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
61+
<?php echo Text::_('COM_ADMIN_PHP_BUILT_ON'); ?>
6262
</th>
6363
<td>
64-
<?php echo $this->info['dbcollation']; ?>
64+
<?php echo $this->info['php']; ?>
6565
</td>
6666
</tr>
6767
<tr>
6868
<th scope="row">
69-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
69+
<?php echo Text::_('COM_ADMIN_DATABASE_TYPE'); ?>
7070
</th>
7171
<td>
72-
<?php echo $this->info['dbconnectioncollation']; ?>
72+
<?php echo $this->info['dbserver']; ?>
7373
</td>
7474
</tr>
7575
<tr>
7676
<th scope="row">
77-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
77+
<?php echo Text::_('COM_ADMIN_DATABASE_VERSION'); ?>
7878
</th>
7979
<td>
80-
<?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
80+
<?php echo $this->info['dbversion']; ?>
8181
</td>
8282
</tr>
8383
<tr>
8484
<th scope="row">
85-
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
85+
<?php echo Text::_('COM_ADMIN_DATABASE_COLLATION'); ?>
8686
</th>
8787
<td>
88-
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
88+
<?php echo $this->info['dbcollation']; ?>
8989
</td>
9090
</tr>
9191
<tr>
9292
<th scope="row">
93-
<?php echo Text::_('COM_ADMIN_PHP_VERSION'); ?>
93+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?>
9494
</th>
9595
<td>
96-
<?php echo $this->info['phpversion']; ?>
96+
<?php echo $this->info['dbconnectioncollation']; ?>
9797
</td>
9898
</tr>
9999
<tr>
100100
<th scope="row">
101-
<?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
101+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION'); ?>
102102
</th>
103103
<td>
104-
<?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
104+
<?php echo $this->info['dbconnectionencryption'] ?: Text::_('JNONE'); ?>
105105
</td>
106106
</tr>
107107
<tr>
108108
<th scope="row">
109-
<?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
109+
<?php echo Text::_('COM_ADMIN_DATABASE_CONNECTION_ENCRYPTION_SUPPORTED'); ?>
110110
</th>
111111
<td>
112-
<?php echo $this->info['sapi_name']; ?>
112+
<?php echo $this->info['dbconnencryptsupported'] ? Text::_('JYES') : Text::_('JNO'); ?>
113113
</td>
114114
</tr>
115+
115116
<tr>
116117
<th scope="row">
117-
<?php echo Text::_('COM_ADMIN_JOOMLA_VERSION'); ?>
118+
<?php echo Text::_('COM_ADMIN_WEB_SERVER'); ?>
118119
</th>
119120
<td>
120-
<?php echo $this->info['version']; ?>
121+
<?php echo HTMLHelper::_('system.server', $this->info['server']); ?>
121122
</td>
122123
</tr>
123124
<tr>
124125
<th scope="row">
125-
<?php echo Text::_('COM_ADMIN_JOOMLA_COMPAT_PLUGIN'); ?>
126+
<?php echo Text::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?>
126127
</th>
127128
<td>
128-
<?php echo $this->info['compatpluginenabled'] ? Text::_('JENABLED') . ' (' . $this->info['compatpluginparameters'] . ')' : Text::_('JDISABLED'); ?>
129+
<?php echo $this->info['sapi_name']; ?>
129130
</td>
130131
</tr>
131132
<tr>

0 commit comments

Comments
 (0)