Skip to content

Commit 165351b

Browse files
zero-24richard67
zero-24
and
richard67
authored
[3.10] Handle the removal of the FTP support from Joomla 4 for com_joomlaupdate (#34253)
* hide FTP options when pointing to Joomla 4.0.0 * typo * add a generic ftp notice for manual uploads * Update administrator/language/en-GB/en-GB.com_joomlaupdate.ini * Update administrator/language/en-GB/en-GB.com_joomlaupdate.ini * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Richard Fath <[email protected]>
1 parent a707e91 commit 165351b

File tree

5 files changed

+63
-49
lines changed

5 files changed

+63
-49
lines changed

‎administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -64,54 +64,57 @@
6464
</td>
6565
</tr>
6666
<?php endif; ?>
67-
<tr>
68-
<td>
69-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD'); ?>
70-
</td>
71-
<td>
72-
<?php echo $this->methodSelect; ?>
73-
</td>
74-
</tr>
75-
<tr id="row_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
76-
<td>
77-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>
78-
</td>
79-
<td>
80-
<input type="text" name="ftp_host" value="<?php echo $this->ftp['host']; ?>" />
81-
</td>
82-
</tr>
83-
<tr id="row_ftp_port" <?php echo $this->ftpFieldsDisplay; ?>>
84-
<td>
85-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT'); ?>
86-
</td>
87-
<td>
88-
<input type="text" name="ftp_port" value="<?php echo $this->ftp['port']; ?>" />
89-
</td>
90-
</tr>
91-
<tr id="row_ftp_username" <?php echo $this->ftpFieldsDisplay; ?>>
92-
<td>
93-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME'); ?>
94-
</td>
95-
<td>
96-
<input type="text" name="ftp_user" value="<?php echo $this->ftp['username']; ?>" />
97-
</td>
98-
</tr>
99-
<tr id="row_ftp_password" <?php echo $this->ftpFieldsDisplay; ?>>
100-
<td>
101-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD'); ?>
102-
</td>
103-
<td>
104-
<input type="password" name="ftp_pass" value="<?php echo $this->ftp['password']; ?>" />
105-
</td>
106-
</tr>
107-
<tr id="row_ftp_directory" <?php echo $this->ftpFieldsDisplay; ?>>
108-
<td>
109-
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY'); ?>
110-
</td>
111-
<td>
112-
<input type="text" name="ftp_root" value="<?php echo $this->ftp['directory']; ?>" />
113-
</td>
114-
</tr>
67+
<?php // Hide FTP settings when updating to Joomla 4 given that the supporting code has been dropped there ?>
68+
<?php if (version_compare($this->updateInfo['latest'], '4', '<')) : ?>
69+
<tr>
70+
<td>
71+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD'); ?>
72+
</td>
73+
<td>
74+
<?php echo $this->methodSelect; ?>
75+
</td>
76+
</tr>
77+
<tr id="row_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
78+
<td>
79+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>
80+
</td>
81+
<td>
82+
<input type="text" name="ftp_host" value="<?php echo $this->ftp['host']; ?>" />
83+
</td>
84+
</tr>
85+
<tr id="row_ftp_port" <?php echo $this->ftpFieldsDisplay; ?>>
86+
<td>
87+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT'); ?>
88+
</td>
89+
<td>
90+
<input type="text" name="ftp_port" value="<?php echo $this->ftp['port']; ?>" />
91+
</td>
92+
</tr>
93+
<tr id="row_ftp_username" <?php echo $this->ftpFieldsDisplay; ?>>
94+
<td>
95+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME'); ?>
96+
</td>
97+
<td>
98+
<input type="text" name="ftp_user" value="<?php echo $this->ftp['username']; ?>" />
99+
</td>
100+
</tr>
101+
<tr id="row_ftp_password" <?php echo $this->ftpFieldsDisplay; ?>>
102+
<td>
103+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD'); ?>
104+
</td>
105+
<td>
106+
<input type="password" name="ftp_pass" value="<?php echo $this->ftp['password']; ?>" />
107+
</td>
108+
</tr>
109+
<tr id="row_ftp_directory" <?php echo $this->ftpFieldsDisplay; ?>>
110+
<td>
111+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY'); ?>
112+
</td>
113+
<td>
114+
<input type="text" name="ftp_root" value="<?php echo $this->ftp['directory']; ?>" />
115+
</td>
116+
</tr>
117+
<?php endif; ?>
115118
</tbody>
116119
<tfoot>
117120
<tr id="preupdateCheckWarning">

‎administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@
144144
<?php echo $this->methodSelectUpload; ?>
145145
</td>
146146
</tr>
147+
<tr id="upload_ftp_notice" <?php echo $this->ftpFieldsDisplay; ?>>
148+
<td>
149+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_NOTICE'); ?>
150+
</td>
151+
<td>
152+
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_NOTICE_MESSAGE'); ?>
153+
</td>
154+
</tr>
147155
<tr id="upload_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
148156
<td>
149157
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>

‎administrator/language/en-GB/en-GB.com_joomlaupdate.ini‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not suppor
9090
COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.<br>For further details take a look at <a href="_QQ_"https://downloads.joomla.org/technical-requirements"_QQ_">the minimum requirements for Joomla %1$s</a>."
9191
COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported"
9292
COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match <a href="_QQ_"https://downloads.joomla.org/technical-requirements"_QQ_">the minimum requirements for Joomla %1$s</a>."
93+
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_NOTICE="Warning"
94+
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_NOTICE_MESSAGE="The FTP method is not supported when you are upgrading to Joomla 4.0.0 or later."
9395
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP Host"
9496
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD="FTP Password"
9597
COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT="FTP Port"

‎media/com_joomlaupdate/js/default.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ function extractionMethodHandler(target, prefix)
44
$em = $(target);
55
displayStyle = ($em.val() === 'direct') ? 'none' : 'table-row';
66

7+
document.getElementById(prefix + '_notice').style.display = displayStyle;
78
document.getElementById(prefix + '_hostname').style.display = displayStyle;
89
document.getElementById(prefix + '_port').style.display = displayStyle;
910
document.getElementById(prefix + '_username').style.display = displayStyle;

0 commit comments

Comments
 (0)